summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/supp-box.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-11-16 01:02:47 +0000
committerKarl Berry <karl@freefriends.org>2006-11-16 01:02:47 +0000
commit3c85b55e2f245fb7edac7e445f107e6d0bb423ae (patch)
treec62b7f80edafe0455310d08e09f4218127bf9e87 /Master/texmf-dist/tex/context/base/supp-box.tex
parente5ecff27a26ef59e1dbe9702677687fd7107be3a (diff)
context update
git-svn-id: svn://tug.org/texlive/trunk@2444 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/supp-box.tex')
-rw-r--r--Master/texmf-dist/tex/context/base/supp-box.tex37
1 files changed, 30 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/context/base/supp-box.tex b/Master/texmf-dist/tex/context/base/supp-box.tex
index 4b451a6bfab..76c71c1994d 100644
--- a/Master/texmf-dist/tex/context/base/supp-box.tex
+++ b/Master/texmf-dist/tex/context/base/supp-box.tex
@@ -453,10 +453,13 @@
{\beginofshapebox
\unvbox\nextbox
\endofshapebox
- \global\count1\zerocount
- \reshapebox{\global\advance\count1\plusone}%
- \egroup\noflines\count1 }%
- \vbox}
+ % \global\count1\zerocount
+ % \reshapebox{\global\advance\count1\plusone}%
+ % \egroup\noflines\count1 }%
+ \scratchcounter\zerocount
+ \reshapebox{\global\advance\scratchcounter\plusone}%
+ \expandafter\egroup\expandafter\noflines\the\scratchcounter\relax
+ }\vbox}
%D \macros
%D {doiftextelse, doiftext}
@@ -1023,8 +1026,8 @@
\def\obeyedspace{\hskip\zeropoint\hbox to \onepoint{}\hskip\zeropoint}%
\let\obeyedline \obeyedspace
\ifcase-#1\or
- \def\next{#3}\scantokens\expandafter{\next}%
- % also ok: \scantokens{#3}%
+ \def\next{#3\relax}\scantokens\expandafter{\next}% relax catches lookahead problem
+ % also ok: \scantokens{#3}% % as in \hyphenatedword{spanish|?|}
\or
\readfile{#3}\donothing\donothing
\else
@@ -1802,7 +1805,7 @@
%D
%D \normalvbox
%D \bgroup
-%D \converthboxtovbox
+%D \convertvboxtohbox
%D \egroup
%D \stoptyping
%D
@@ -1878,6 +1881,26 @@
\setbox0\normalhbox{\box2\unhbox0}%
\repeat}
+% \def\makehboxofhboxes
+% {\setbox0\normalhbox{}%
+% \doloop % \doloop { .. \exitloop .. }
+% {% \dorecurse{3}{\unskip\unpenalty}% get rid of ... (better do this in a shapeloop)
+% \setbox2\lastbox
+% \ifhbox2
+% \setbox0\normalhbox{\box2\unhbox0}%
+% \else
+% \exitloop
+% \fi}}
+
+% \def\flushboxesonly % feed this into \makehboxofhboxes
+% {\dowithnextbox
+% {\beginofshapebox
+% \unvbox\nextbox
+% \endofshapebox
+% \doreshapebox{\box\shapebox}{}{}{}% get rid of penalties etc
+% \innerflushshapebox}
+% \vbox}
+
\def\removehboxes
{\setbox0\lastbox
\ifhbox0