diff options
author | Karl Berry <karl@freefriends.org> | 2013-04-08 00:43:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-04-08 00:43:40 +0000 |
commit | 824f7b0903de8ad7f6ee3d7656005e4c59155e06 (patch) | |
tree | abfc8673ef9916f3ab7074e811207384c301492b /Master/texmf-dist/tex/context/base/supp-box.mkiv | |
parent | 689aefb0727676ed3cddf331337b4be226495e72 (diff) |
context import for TL13, from www.pragma-ade.com/context/beta/cont-tmf.zip
git-svn-id: svn://tug.org/texlive/trunk@29731 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/supp-box.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/supp-box.mkiv | 100 |
1 files changed, 65 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/context/base/supp-box.mkiv b/Master/texmf-dist/tex/context/base/supp-box.mkiv index de1da677a88..25c7764f8d9 100644 --- a/Master/texmf-dist/tex/context/base/supp-box.mkiv +++ b/Master/texmf-dist/tex/context/base/supp-box.mkiv @@ -75,9 +75,10 @@ %D core macros \type {\strutdepth} and alike, which are %D values. -\def\strutdp{\dp\strutbox} -\def\strutht{\ht\strutbox} -\def\strutwd{\wd\strutbox} +\def\strutdp {\dp\strutbox} +\def\strutht {\ht\strutbox} +\def\strutwd {\wd\strutbox} +\def\struthtdp{\dimexpr\ht\strutbox+\dp\strutbox\relax} %D \macros %D {voidbox,nextbox} @@ -1236,7 +1237,7 @@ \ifdone \else \parfillskip\zeropoint \rightskip\zeropoint - \hskip\zeropoint \!!plus 1\!!fill % \hsize + \hskip\zeropoint \s!plus 1\s!fill % \hsize \fi \unhcopy0}% \ifdim\ht\nextbox>\strutht @@ -1423,12 +1424,27 @@ {\setbox\nextbox\hbox {\strut \dp\nextbox\zeropoint - \lower\strutdepth\box\nextbox}% - \dp\nextbox\strutdepth - \ht\nextbox\strutheight + \lower\strutdp\box\nextbox}% + \dp\nextbox\strutdp + \ht\nextbox\strutht \box\nextbox \egroup} +%D A variant on this: + +\unexpanded\def\inlinedbox + {\bgroup + \dowithnextbox + {\setbox\nextbox\hbox + {\lower + \dimexpr(\htdp\nextbox-\lineheight)/\plustwo+\strutdp\relax + \box\nextbox}% + \ht\nextbox\strutht + \dp\nextbox\strutdp + \box\nextbox + \egroup}% + \hbox} + %D \macros %D {struttedbox} %D @@ -1440,10 +1456,10 @@ \dowithnextboxcs\syst_boxes_struttedbox_finish\hbox} \def\syst_boxes_struttedbox_finish - {\ht\nextbox\strutdepth + {\dp\nextbox\strutdepth \ht\nextbox\strutheight \box\nextbox - \egroup}% + \egroup} %D \macros %D {topskippedbox} @@ -1513,8 +1529,8 @@ \bgroup \dontcomplain \forgetall - \setbox0\hbox{\vrule\!!width \zeropoint#1}% - \setbox2\vbox{\hrule\!!height\zeropoint#1}% + \setbox0\hbox{\vrule\s!width \zeropoint#1}% + \setbox2\vbox{\hrule\s!height\zeropoint#1}% \advance\vsize \ht2 \advance\hsize \wd0 \vbox to \vsize @@ -1573,9 +1589,9 @@ {\bgroup \dowithnextbox {\setlocalhsize - \setbox\scratchbox\hbox{\vrule\!!width \zeropoint#1}% + \setbox\scratchbox\hbox{\vrule\s!width \zeropoint#1}% \ifzeropt\wd\scratchbox\else\hsize\wd\scratchbox\fi - \setbox\scratchbox\vbox{\hrule\!!height\zeropoint#1}% + \setbox\scratchbox\vbox{\hrule\s!height\zeropoint#1}% \ifzeropt\ht\scratchbox\else\vsize\ht\scratchbox\fi \vbox to \vsize{\vss\hbox to \hsize{\hss\box\nextbox\hss}\vss}% \egroup}% @@ -1783,7 +1799,7 @@ \ht\hhbox\strutht \dp\hhbox\strutdp \ifzeropt\hhboxindent\else % \ifdim\hhboxindent=\zeropoint\else - \setbox\hhbox\hbox{\hskip-\hhboxindent\box\hhbox}% + \setbox\hhbox\hbox{\kern-\hhboxindent\box\hhbox}% \hhboxindent\zeropoint \fi \global\lasthhboxwidth\wd\hhbox @@ -1791,7 +1807,7 @@ \ifvoid\unhhedbox \exitloop \else - \hskip\zeropoint \!!plus \zeropoint + \hskip\zeropoint \s!plus \zeropoint \fi}% \egroup} @@ -1973,7 +1989,7 @@ \scratchwidth\wd\ifdim\wd\nextbox>\wd\processbox\nextbox\else\processbox\fi \setbox\processbox\hbox to \scratchwidth {\hbox to \scratchwidth{\hss\box\processbox\hss}% - \hskip-\scratchwidth + \kern-\scratchwidth \hbox to \scratchwidth{\hss\box\nextbox \hss}}} \unexpanded\def\startoverlay @@ -2169,7 +2185,7 @@ \newbox\fakedboxcursor \setbox\fakedboxcursor\hbox - {\vrule\!!width\zeropoint\!!height\zeropoint\!!depth\zeropoint} + {\vrule\s!width\zeropoint\s!height\zeropoint\s!depth\zeropoint} \unexpanded\def\boxcursor % overloaded in core-vis {\iftraceboxplacement @@ -2178,9 +2194,9 @@ \setbox\scratchbox\hbox to \zeropoint {\hss \vrule - \!!width \scratchdimen - \!!height\scratchdimen - \!!depth \scratchdimen + \s!width \scratchdimen + \s!height\scratchdimen + \s!depth \scratchdimen \hss}% \smashedbox\scratchbox \egroup @@ -2213,7 +2229,7 @@ {\global\boxhdisplacement\boxoffset \global\boxvdisplacement.5\ht\nextbox \global\advance\boxvdisplacement-.5\dp\nextbox - \boxcursor\hskip\boxhdisplacement\lower\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\lower\boxvdisplacement\box\nextbox \egroup} \def\syst_boxes_leftbox_finish @@ -2221,21 +2237,21 @@ \global\advance\boxhdisplacement-\boxoffset \global\boxvdisplacement.5\ht\nextbox \global\advance\boxvdisplacement-.5\dp\nextbox - \boxcursor\hskip\boxhdisplacement\lower\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\lower\boxvdisplacement\box\nextbox \egroup} \def\syst_boxes_topbox_finish {\global\boxhdisplacement-.5\wd\nextbox \global\boxvdisplacement-\dp\nextbox \global\advance\boxvdisplacement-\boxoffset - \boxcursor\hskip\boxhdisplacement\raise-\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\raise-\boxvdisplacement\box\nextbox \egroup} \def\syst_boxes_bottombox_finish {\global\boxhdisplacement-.5\wd\nextbox \global\boxvdisplacement\ht\nextbox \global\advance\boxvdisplacement\boxoffset - \boxcursor\hskip\boxhdisplacement\lower\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\lower\boxvdisplacement\box\nextbox \egroup} \def\syst_boxes_lefttopbox_finish @@ -2243,14 +2259,14 @@ \global\advance\boxhdisplacement-\boxoffset \global\boxvdisplacement-\dp\nextbox \global\advance\boxvdisplacement-\boxoffset - \boxcursor\hskip\boxhdisplacement\raise-\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\raise-\boxvdisplacement\box\nextbox \egroup} \def\syst_boxes_righttopbox_finish {\global\boxhdisplacement\boxoffset \global\boxvdisplacement-\dp\nextbox \global\advance\boxvdisplacement-\boxoffset - \boxcursor\hskip\boxhdisplacement\raise-\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\raise-\boxvdisplacement\box\nextbox \egroup} \def\syst_boxes_leftbottombox_finish @@ -2258,14 +2274,14 @@ \global\advance\boxhdisplacement-\boxoffset \global\boxvdisplacement\ht\nextbox \global\advance\boxvdisplacement\boxoffset - \boxcursor\hskip\boxhdisplacement\lower\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\lower\boxvdisplacement\box\nextbox \egroup} \def\syst_boxes_rightbottombox_finish {\global\boxhdisplacement\boxoffset \global\boxvdisplacement\ht\nextbox \global\advance\boxvdisplacement\boxoffset - \boxcursor\hskip\boxhdisplacement\lower\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\lower\boxvdisplacement\box\nextbox \egroup} \unexpanded\def\middlebox {\hbox\bgroup\dowithnextboxcs\syst_boxes_middlebox_finish \placedbox} @@ -2277,27 +2293,27 @@ {\global\boxhdisplacement-.5\wd\nextbox \global\boxvdisplacement.5\ht\nextbox \global\advance\boxvdisplacement-.5\dp\nextbox - \boxcursor\hskip\boxhdisplacement\lower\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\lower\boxvdisplacement\box\nextbox \egroup} \def\syst_boxes_baselinemiddlebox_finish {\global\boxhdisplacement-.5\wd\nextbox \global\advance\boxhdisplacement-\boxoffset \global\boxvdisplacement-\boxoffset - \boxcursor\hskip\boxhdisplacement\raise-\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\raise-\boxvdisplacement\box\nextbox \egroup} \def\syst_boxes_baselineleftbox_finish {\global\boxhdisplacement-\wd\nextbox \global\advance\boxhdisplacement-\boxoffset \global\boxvdisplacement-\boxoffset - \boxcursor\hskip\boxhdisplacement\raise-\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\raise-\boxvdisplacement\box\nextbox \egroup} \def\syst_boxes_baselinerightbox_finish {\global\boxhdisplacement\boxoffset \global\boxvdisplacement-\boxoffset - \boxcursor\hskip\boxhdisplacement\raise-\boxvdisplacement\box\nextbox + \boxcursor\kern\boxhdisplacement\raise-\boxvdisplacement\box\nextbox \egroup} %D \macros @@ -2431,15 +2447,14 @@ %D \macros %D {makestrutofbox} %D -%D This macro sets the dimensions of a box to those of a -%D strut. +%D This macro sets the dimensions of a box to those of a strut. \def\domakestrutofbox {\ht\c_boxes_register\strutht \dp\c_boxes_register\strutdp \wd\c_boxes_register\zeropoint} -\unexpanded\def\makestrutofbox +\unexpanded\def\makestrutofbox % not used {\afterassignment\domakestrutofbox\c_boxes_register} %D \macros @@ -2615,6 +2630,21 @@ % \showboxbreadth\maxdimen % \showboxdepth \maxdimen +%D Moved from cont-new: +%D +%D \starttyping +%D \minimalhbox 100pt {test} +%D \stoptyping + +\unexpanded\def\minimalhbox#1#% + {\dowithnextbox + {\bgroup + \setbox\scratchbox\hbox#1{\hss}% + \ifdim\wd\nextbox<\wd\scratchbox\wd\nextbox\wd\scratchbox\fi + \box\nextbox + \egroup} + \hbox} + \protect \endinput % a bit of test code: |