diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/page-txt.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/page-txt.mkiv | 114 |
1 files changed, 29 insertions, 85 deletions
diff --git a/Master/texmf-dist/tex/context/base/page-txt.mkiv b/Master/texmf-dist/tex/context/base/page-txt.mkiv index bdc7c1bb6cd..dc516a94e33 100644 --- a/Master/texmf-dist/tex/context/base/page-txt.mkiv +++ b/Master/texmf-dist/tex/context/base/page-txt.mkiv @@ -172,8 +172,8 @@ {\c!rightstyle\c!rightcolor\c!rightwidth}{#3}% {\c!rightstyle\c!rightcolor\c!rightwidth}{#3}}% \else\ifsecondargument % new - \letvalue{\??tk#1\v!text\c!lefttext }\empty - \letvalue{\??tk#1\v!text\c!righttext }\empty + \letvalueempty{\??tk#1\v!text\c!lefttext}% + \letvalueempty{\??tk#1\v!text\c!righttext}% \setvalue{\??tk#1\v!text\c!middletext}{\dosingletexts{#1}\v!text\c!style\c!color\c!width{#2}}% \else \dosixtupleempty\dosetuptexts[#1][\v!text ][][][][]% @@ -305,7 +305,8 @@ \setvalue{\??tk::\v!nomarking}#1#2% {\bgroup \resettextlinestatus#1% - \let\dogetmarking\nogetmarking + \settrue\inhibitgetmarking + \let\dogetmarking\nogetmarking % obsolete in new marking mechanism \doplacelayouttextline#1#2% \egroup} @@ -367,19 +368,19 @@ \def\doresettextcontent[#1][#2][#3]% header text middle {\ifthirdargument - \letvalue{\??tk#1#2\executeifdefined{:\c!text:#3:}\c!middletext}\empty + \letvalueempty{\??tk#1#2\executeifdefined{:\c!text:#3:}\c!middletext}% \else\ifsecondargument - \letvalue{\??tk#1#2\c!lefttext }\empty - \letvalue{\??tk#1#2\c!middletext}\empty - \letvalue{\??tk#1#2\c!righttext }\empty + \letvalueempty{\??tk#1#2\c!lefttext}% + \letvalueempty{\??tk#1#2\c!middletext}% + \letvalueempty{\??tk#1#2\c!righttext}% \fi\fi} \let\settext \settextcontent % downward compatibility \let\resettext\resettextcontent % downward compatibility -\setvalue{:\c!middle:\c!text:}{\c!middletext} -\setvalue{:\c!left :\c!text:}{\c!lefttext } -\setvalue{:\c!right :\c!text:}{\c!righttext } +\letvalue{:\c!middle:\c!text:}\c!middletext +\letvalue{:\c!left :\c!text:}\c!lefttext +\letvalue{:\c!right :\c!text:}\c!righttext %D The next series of macros is not that easy to read, %D because they hook into the main page building macros. By @@ -392,12 +393,28 @@ \newbox\scratchpagebox +% \newbox\collectedprepagecontent % only for delayed stuff + +% \def\flushcollectedpagecontent +% {\ifvoid\collectedprepagecontent \else +% \smashbox\collectedprepagecontent +% \box\collectedprepagecontent +% \fi} + +% \def\delaytillpageisflushhed#1% +% {\global\setbox\collectedprepagecontent\hbox +% {\ifvoid\collectedprepagecontent \else +% \unhbox\collectedprepagecontent +% \fi % ignore and remove not really needed +% \ignorespaces#1\removeunwantedspaces}} + \def\gettextboxes {\setbox\scratchpagebox\vbox {\dontcomplain \calculatereducedvsizes \swapmargins \offinterlineskip +% \flushcollectedpagecontent \vskip\dimexpr-\topheight-\topdistance\relax \the\toptextcontent \vskip\dimexpr\topheight+\topdistance\relax @@ -487,79 +504,6 @@ \def\ignoredlinebreak{\unskip\space\ignorespaces} -% \def\doplacelayouttextline#1#2% -% {\ifdim#2>\zeropoint\relax % prevents pagenumbers when zero height -% \goleftonpage -% \hbox -% {\setbox\scratchpagebox\vbox to #2 -% {\vsize#2\relax -% \normalbaselines -% \let\\\ignoredlinebreak -% \let\crlf\ignoredlinebreak -% \csname\??tk#1\c!before\endcsname -% \doifbothsidesoverruled -% {\dodoplacelayouttextline#1\c!lefttext \c!middletext\c!righttext\zerocount\plusone} -% {\dodoplacelayouttextline#1\c!lefttext \c!middletext\c!righttext\zerocount\plusone} -% {\dodoplacelayouttextline#1\c!righttext\c!middletext\c!lefttext \plusone\zerocount}% -% \csname\??tk#1\c!after\endcsname -% \kern\zeropoint}% keep the \dp, beware of \vtops, never change this! -% \dp\scratchpagebox\zeropoint -% \box\scratchpagebox}% -% \vskip-#2\relax -% \fi} -% -% \def\dodoplacelayouttextline#1#2#3#4#5#6% \hsize toegevoegd, \hss's niet meer wijzigen -% {\hbox -% {\ifdim\leftedgewidth>\zeropoint -% \dododoplacelayouttextline\leftedgewidth#1\v!edge -% {\hss\csname\??tk#1\v!edge#2\endcsname}% -% \hskip\leftedgedistance -% \fi -% \ifdim\leftmarginwidth>\zeropoint -% \dododoplacelayouttextline\leftmarginwidth#1\v!margin -% {\hbox to \leftmarginwidth -% {\hss\csname\??tk#1\v!margin#2\endcsname}% -% \hskip-\leftmarginwidth -% \hbox to \leftmarginwidth -% {\hss\ifcase#5\or\csname\??tk#1\v!margin\c!margintext\endcsname\fi}}% -% \hskip\leftmargindistance -% \fi -% \ifdim\makeupwidth>\zeropoint -% \dododoplacelayouttextline\makeupwidth{#1}\v!text -% {\hbox to \makeupwidth -% {\ifcase#5\or\@@nmpre{\csname\??tk#1\v!text\c!marginedgetext\endcsname}\fi -% \csname\??tk#1\v!text#2\endcsname\hss}% -% \hskip-\makeupwidth -% \hbox to \makeupwidth -% {\hss\csname\??tk#1\v!text#3\endcsname\hss}% -% \hskip-\makeupwidth -% \hbox to \makeupwidth -% {\hss\csname\??tk#1\v!text#4\endcsname -% \ifcase#6\or\@@nmpos{\csname\??tk#1\v!text\c!marginedgetext\endcsname}\fi}}% -% \fi -% \ifdim\rightmarginwidth>\zeropoint -% \hskip\rightmargindistance -% \dododoplacelayouttextline\rightmarginwidth{#1}\v!margin -% {\hbox to \rightmarginwidth -% {\csname\??tk#1\v!margin#4\endcsname\hss}% -% \hskip-\rightmarginwidth -% \hbox to \rightmarginwidth -% {\ifcase#6\or\csname\??tk#1\v!margin\c!margintext\endcsname\fi\hss}}% -% \fi -% \ifdim\rightedgewidth>\zeropoint -% \hskip\rightedgedistance -% \dododoplacelayouttextline\rightedgewidth{#1}\v!edge -% {\csname\??tk#1\v!edge#4\endcsname\hss}% -% \fi}} -% -% \def\dododoplacelayouttextline#1#2#3#4% -% {\vbox % to \vsize -% {\hsize#1\relax -% \csname\??tk#2#3\c!before\endcsname -% \setlayoutcomponentattribute#2#3% -% \hbox \layoutcomponentboxattribute to #1{#4}% -% \csname\??tk#2#3\c!after\endcsname}} - \def\doplacelayouttextline#1#2% {\let\currentlayouttextline#1% \ifdim#2>\zeropoint\relax % prevents pagenumbers when zero height @@ -682,7 +626,7 @@ \def\@@nmpre#1% {\begingroup - \setbox\scratchbox\normalhbox{\trialtypesettingtrue\ignorespaces#1\removeunwantedspaces}% + \setbox\scratchbox\normalhbox{\settrialtypesetting\ignorespaces#1\removeunwantedspaces}% \ifzeropt\wd\scratchbox\else \doifelsenothing\@@nmwidth {\box\scratchbox\tfskip} @@ -692,7 +636,7 @@ \def\@@nmpos#1% {\begingroup - \setbox\scratchbox\normalhbox{\trialtypesettingtrue\ignorespaces#1\removeunwantedspaces}% + \setbox\scratchbox\normalhbox{\settrialtypesetting\ignorespaces#1\removeunwantedspaces}% \ifzeropt\wd\scratchbox\else \doifelsenothing\@@nmwidth {\tfskip\box\scratchbox} |