2018-02-21 18:27:00

1 files changed, 26 insertions, 84 deletions

diff --git a/tex/context/base/mkiv/strc-ren.mkiv b/tex/context/base/mkiv/strc-ren.mkiv
index 90ad2252d..89aa6f55a 100644
--- a/tex/context/base/mkiv/strc-ren.mkiv
+++ b/tex/context/base/mkiv/strc-ren.mkiv
@@ -221,24 +221,6 @@
    \let\localheadsetup  \strc_rendering_initialize_spacing % historic name
    \let\headsetupspacing\strc_rendering_initialize_spacing}
 
-\def\strc_rendering_initialize_hsize_local
-  {\global\d_strc_rendering_local_leftoffset \leftskip
-   \global\d_strc_rendering_local_rightoffset\rightskip
- % \forgetall
- % \leftskip \d_strc_rendering_local_leftoffset  % no stretch
- % \rightskip\d_strc_rendering_local_rightoffset % no stretch
- % \setlocalhsize
- % \hsize\localhsize
- % \forgetbothskips}
-   \scratchwidth\availablehsize
-   \forgetall
-   \hsize\scratchwidth}
-
-\def\strc_rendering_initialize_hsize_global
-  {\global\d_strc_rendering_local_leftoffset \zeropoint
-   \global\d_strc_rendering_local_rightoffset\zeropoint
-   \forgetall}
-
 \def\strc_rendering_initialize_interaction
   {\resetinteractionparameter\c!style
    \resetinteractionparameter\c!color
@@ -308,73 +290,32 @@
       \d_strc_rendering_hang_height\zeropoint
     \fi}
 
-% \def\strc_rendering_stop_placement
-%   {\n_strc_rendering_hang_lines\zerocount
-%    \ifconditional\headisdisplay
-%      \strc_rendering_initialize_line_hang
-%      % kind of special, we want to snap heads also according to local specs local
-%      \ifgridsnapping
-%        \hbox\bgroup % extra hbox will trigger global snapper on top of local
-%          \edef\p_grid{\headparameter\c!grid}%
-%          \ifconditional\headisdisplay
-%            \ifx\p_grid\empty\else
-%              \useheadstyleandcolor\c!style\c!color
-%              \setupinterlinespace
-%              \useheadstyleandcolor\c!textstyle\c!textcolor
-%              \setupinterlinespace
-%            \fi
-%          \fi
-%          \snaptogrid[\p_grid]\hbox
-%            {\hskip\dimexpr\d_strc_rendering_local_leftoffset+\headparameter\c!margin\relax\box\b_strc_rendering_head}%
-%        \egroup
-%      \else
-%        \hbox
-%          {\hskip\dimexpr\d_strc_rendering_local_leftoffset+\headparameter\c!margin\relax\box\b_strc_rendering_head}%
-%      \fi
-%      \flushnotes % new, not really needed
-%      \endgraf
-%      \ifvmode
-%        \ifnum\n_strc_rendering_hang_lines>\zerocount
-%          \dorecurse\n_strc_rendering_hang_lines{\nointerlineskip\dosomebreak\nobreak\strut\endgraf}% to be checked
-%        \fi
-%        \nointerlineskip
-%        \dosomebreak\nobreak
-%      \fi
-%      \getheadsyncs
-%    \else
-%      % somehow this goes ok even when we push in the margin probably because we gobble pars
-%      % in the process of collecting index entries etc
-%      \strut
-%      \flushnotes % new, here since we're in par mode
-%      \unhbox\b_strc_rendering_head
-%      \getheadsyncs
-%      \ifconditional\headissomewhere
-%         % nothing special
-%      \else
-%       %\hskip\headnumberdistance\s!plus\headnumberdistance\s!minus.25\dimexpr\headnumberdistance\relax
-%        \hskip\headtextdistance\relax
-%        \strc_sectioning_inject_continuous_signal
-%      \fi
-%    \fi
-%    \ifconditional\headisdisplay
-%      \ifvmode
-%        \ifgridsnapping % important, font related depth, see comment
-%          \prevdepth\strutdp
-%        \else
-%          \prevdepth\d_strc_rendering_local_depth
-%        \fi
-%      \fi
-%    \fi
-%    \egroup
-%    \egroup
-%    \ifconditional\headisdisplay
-%      \useindentnextparameter\headparameter
-%    \else
-%      \nonoindentation % recently added, was a bug
-%    \fi}
+\def\strc_rendering_initialize_hsize_local
+  {\global\d_strc_rendering_local_leftoffset \leftskip
+   \global\d_strc_rendering_local_rightoffset\rightskip
+ % \forgetall
+ % \leftskip \d_strc_rendering_local_leftoffset  % no stretch
+ % \rightskip\d_strc_rendering_local_rightoffset % no stretch
+ % \setlocalhsize
+ % \hsize\localhsize
+ % \forgetbothskips}
+   \scratchwidth\availablehsize
+   \forgetall
+   \hsize\scratchwidth}
+
+\def\strc_rendering_initialize_hsize_global
+  {\global\d_strc_rendering_local_leftoffset \zeropoint
+   \global\d_strc_rendering_local_rightoffset\zeropoint
+   \forgetall}
+
+% \def\strc_sectioning_stay_on_this_line
+%   {\directcheckedvspacing{-\v!line,\v!samepage,\v!nowhite}%
+%    \directcheckedvspacing\v!disable}
+%
+% we now use \ignoreparskip, so:
 
 \def\strc_sectioning_stay_on_this_line
-  {\directcheckedvspacing{\v!samepage,-\v!line}%
+  {\directcheckedvspacing{-\v!line,\v!samepage}%
    \directcheckedvspacing\v!disable}
 
 \def\strc_rendering_stop_placement
@@ -434,7 +375,8 @@
    \ifconditional\headisdisplay
      \useindentnextparameter\headparameter
    \else
-     \nonoindentation % recently added, was a bug
+     \ignoreparskip
+     \noindentation % recently added, was a bug
    \fi}
 
 % nice testcase