beta 2012.06.13 23:46

1 files changed, 11 insertions, 32 deletions

diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv
index 0e43a6202..a29fbefee 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/syst-aux.mkiv
@@ -4183,7 +4183,7 @@
 %D
 %D \starttyping
 %D \def\rightword%
-%D   {\groupedcommand{\hfill\hbox}{\parfillskip\!!zeropoint}}
+%D   {\groupedcommand{\hfill\hbox}{\parfillskip\zeropoint}}
 %D
 %D .......... \rightword{the right way}
 %D \stoptyping
@@ -5133,49 +5133,28 @@
 %D These examples show us that an optional can be used. The
 %D value provided is added to \type{\localhsize}.
 
-% todo: a fast non argument variant
-
 \newdimen\localhsize
 
-% \def\complexsetlocalhsize[#1]% don't change !
-%   {\localhsize\hsize
-%    \ifnum\hangafter<\zerocount
-%      \advance\localhsize\ifdim\hangindent>\zeropoint-\fi\hangindent
-%    \fi
-%    \advance\localhsize -\leftskip
-%    \advance\localhsize -\rightskip
-%    \advance\localhsize #1\relax}
-%
-% \def\simplesetlocalhsize
-%   {\complexsetlocalhsize[\zeropoint]}
-%
-% \definecomplexorsimple\setlocalhsize
-
 \unexpanded\def\setlocalhsize % don't change !
   {\doifnextoptionalelse
      \syst_helpers_set_local_hsize_yes
      \syst_helpers_set_local_hsize_nop}
 
-% \def\syst_helpers_set_local_hsize_nop
-%   {\localhsize\hsize
-%    \ifnum\hangafter<\zerocount
-%      \advance\localhsize\ifdim\hangindent>\zeropoint-\fi\hangindent
-%    \fi
-%    \advance\localhsize -\leftskip
-%    \advance\localhsize -\rightskip}
-
 \def\syst_helpers_set_local_hsize_nop
-  {\localhsize\dimexpr
-     \hsize -\leftskip -\rightskip
-     \ifnum\hangafter<\zerocount
-       \ifdim\hangindent>\zeropoint-\else+\fi\hangindent
-     \fi
-   \relax}
+  {\localhsize\availablehsize}
 
 \def\syst_helpers_set_local_hsize_yes[#1]%
   {\syst_helpers_set_local_hsize_nop
    \advance\localhsize#1\relax}
 
+\def\availablehsize
+  {\dimexpr
+     \hsize-\leftskip-\rightskip
+     \ifnum\hangafter<\zerocount
+       \ifdim\hangindent>\zeropoint-\else+\fi\hangindent
+     \fi
+   \relax}
+
 %D \macros
 %D   {doifvalue,doifnotvalue,doifelsevalue,
 %D    doifnothing,doifsomething,doifelsenothing,
@@ -6735,7 +6714,7 @@
 \def\gobbleassigndimen#1\\{}
 
 \def\assigndimen#1#2%
-  {\afterassignment\gobbleassigndimen#1=#2\!!zeropoint\\}
+  {\afterassignment\gobbleassigndimen#1=#2\zeropoint\\}
 
 \def\setusage#1%
   {\expandafter\let\csname#1\endcsname\iftrue}