2016-11-01 10:15:00

1 files changed, 28 insertions, 21 deletions

diff --git a/tex/context/base/mkiv/strc-ren.mkiv b/tex/context/base/mkiv/strc-ren.mkiv
index 6bdd05de9..507cb9921 100644
--- a/tex/context/base/mkiv/strc-ren.mkiv
+++ b/tex/context/base/mkiv/strc-ren.mkiv
@@ -167,18 +167,6 @@
 
 % helpers
 
-% \defineinmargin [ChapterInMargin] [outer] [normal] [distance=0.3em]
-%
-% \defineheadplacement[MyTest][horizontal]#1#2%
-%   {\startlocalheadsetup
-%   %\ChapterInMargin{\headhbox{\strut#2}}% proper destination, ref okay
-%    \ChapterInMargin{\strut#2}% zero destination, ref okay
-%    \stoplocalheadsetup}
-%
-% \setuphead
-%   [chapter]
-%   [alternative=MyTest]
-
 \unexpanded\def\headhbox{\hbox\headreferenceattributes}
 \unexpanded\def\headvbox{\vbox\headreferenceattributes}
 
@@ -354,12 +342,19 @@
      \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
-     \hskip\headnumberdistance\s!plus\headnumberdistance\s!minus.25\dimexpr\headnumberdistance\relax
-     \strc_sectioning_inject_continuous_signal
+     \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
@@ -453,6 +448,7 @@
 
 \newdimen\headwidth
 \newdimen\headtextwidth
+\newskip \headtextdistance
 \newdimen\headnumberdistance
 \newdimen\headnumberwidth
 
@@ -470,16 +466,22 @@
      \let\currentheadrenderingalternative\v!vertical
    \fi
    \ifx\currentheadrenderingalternative\v!horizontal
-     \global\setfalse\headisdisplay % global
+     \global\setfalse\headisdisplay   % global
+     \global\setfalse\headissomewhere % global
+   \else\ifx\currentheadrenderingalternative\v!somewhere
+     \global\setfalse\headisdisplay   % global
+     \global\settrue \headissomewhere % global
    \else
-     \global\settrue\headisdisplay  % global
-   \fi}
+     \global\settrue \headisdisplay   % global
+     \global\setfalse\headissomewhere % global
+   \fi\fi}
 
 \unexpanded\def\strc_rendering_initialize_dimensions
-  {\headwidth         \headparameter\c!width      \relax  % \zeropoint == unset
-   \headnumberwidth   \headparameter\c!numberwidth\relax  % \zeropoint == unset
-   \headnumberdistance\headparameter\c!distance   \relax
-   \headtextwidth     \headparameter\c!textwidth  \relax} % \zeropoint == unset
+  {\headwidth         \headparameter\c!width       \relax  % \zeropoint == unset
+   \headnumberwidth   \headparameter\c!numberwidth \relax  % \zeropoint == unset
+   \headnumberdistance\headparameter\c!distance    \relax
+   \headtextdistance  \headparameter\c!textdistance\relax
+   \headtextwidth     \headparameter\c!textwidth   \relax} % \zeropoint == unset
 
 \unexpanded\def\headtextcontent
   {\begingroup
@@ -786,4 +788,9 @@
     \fi
 \stopsetups
 
+% see typo-mar.mkiv:
+%
+% \defineheadalternative
+%   [\v!margintext]
+
 \protect \endinput