stable 2013.05.28 00:36

1 files changed, 17 insertions, 50 deletions

diff --git a/tex/context/base/strc-con.mkvi b/tex/context/base/strc-con.mkvi
index 75519b8ce..11cd31983 100644
--- a/tex/context/base/strc-con.mkvi
+++ b/tex/context/base/strc-con.mkvi
@@ -246,24 +246,6 @@
 
 \newconditional\c_strc_constructions_distance_none
 
-\def\strc_constructions_set_width_and_distance
-  {\assignwidth
-     \p_strc_constructions_width
-     \constructionsheadwidth
-     {\unhcopy\constructionheadbox}
-     \constructionsheaddistance}
-
-\def\strc_constructions_preroll_head#content%
-  {\setbox\constructionheadbox\hbox
-     {\forgetall
-      \dontcomplain
-      \settrialtypesetting
-      \csname\??constructionmainhandler\currentconstructionhandler\endcsname#content}}
-
-\def\strc_constructions_ignore_head
-  {\constructionsheaddistance\zeropoint
-   \constructionsheadwidth   \zeropoint}
-
 \unexpanded\setvalue{\??constructionstarthandler\v!construction}% this will be redone (reorganized) .. too much boxing
   {\dostarttagged\t!construction\currentconstruction
    \dotagsetconstruction
@@ -301,34 +283,21 @@
    \fi
    % inefficient and not always needed, for instance not with margins so we will make checkers
    % per alternative some day (especially in labels this is unwanted overhead)
-   %
-   % maybe we should have an option as i cannot oversee the consequences now
-   %
-   % \edef\p_strc_constructions_sample{\constructionparameter\c!sample}%
-   % \ifx\p_strc_constructions_sample\empty
-   %   \strc_constructions_preroll_head\currentconstructiontext
-   % \else
-   %   \strc_constructions_preroll_head\currentconstructiontextsample
-   % \fi
-   % \strc_constructions_set_width_and_distance
-   %
-   \strc_constructions_preroll_head\currentconstructiontext
-   \ifzeropt\wd\constructionheadbox
-     \strc_constructions_ignore_head
-   \else
-     \edef\p_strc_constructions_sample{\constructionparameter\c!sample}%
-     \ifx\p_strc_constructions_sample\empty
-       \strc_constructions_set_width_and_distance
-     \else
-       \strc_constructions_preroll_head\currentconstructionsample
-       \ifzeropt\wd\constructionheadbox
-     \strc_constructions_ignore_head
-       \else
-         \strc_constructions_set_width_and_distance
-       \fi
-     \fi
-   \fi
-   %
+   \setbox\constructionheadbox\hbox
+     {\forgetall
+      \dontcomplain
+      \settrialtypesetting
+      \edef\p_strc_constructions_sample{\constructionparameter\c!sample}%
+      \ifx\p_strc_constructions_sample\empty
+        \csname\??constructionmainhandler\currentconstructionhandler\endcsname\currentconstructiontext
+      \else
+        \csname\??constructionmainhandler\currentconstructionhandler\endcsname\currentconstructionsample
+      \fi}%
+   \assignwidth
+     \p_strc_constructions_width
+     \constructionsheadwidth
+     {\unhcopy\constructionheadbox}
+     \constructionsheaddistance
    \dostarttagged\t!constructiontag\empty % todo
    \setbox\constructionheadbox\hbox
      {\forgetall
@@ -740,8 +709,7 @@
 \startsetups[\??constructionrenderings:\v!serried:\v!fit]
     \let\\=\crlf
     \noindent
-    \ifhbox\constructionheadbox\unhcopy\else\copy\fi\constructionheadbox % why copy? leftover?
-    \penalty\plustenthousand % new
+    \ifhbox\constructionheadbox\unhcopy\else\copy\fi\constructionheadbox
     \hskip\constructionsheaddistance\relax
     \useconstructionstyleandcolor\c!style\c!color
     \ignorespaces
@@ -750,9 +718,8 @@
 \startsetups[\??constructionrenderings:\v!serried:\v!broad]
     \let\\=\crlf
     \noindent
-    \ifhbox\constructionheadbox\unhcopy\else\copy\fi\constructionheadbox % why copy? leftover?
+    \ifhbox\constructionheadbox\unhcopy\else\copy\fi\constructionheadbox
     \ifconditional\c_strc_constructions_distance_none \else
-      \penalty\plustenthousand % new
       \hskip\constructionsheaddistance \!!plus .5\constructionsheaddistance \!!minus .25\constructionsheaddistance\relax
     \fi
     \useconstructionstyleandcolor\c!style\c!color