diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/page-ini.tex')
-rw-r--r-- | Master/texmf-dist/tex/context/base/page-ini.tex | 51 |
1 files changed, 39 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/context/base/page-ini.tex b/Master/texmf-dist/tex/context/base/page-ini.tex index 180b5ca4fda..b3cab9bdc71 100644 --- a/Master/texmf-dist/tex/context/base/page-ini.tex +++ b/Master/texmf-dist/tex/context/base/page-ini.tex @@ -92,7 +92,7 @@ \startmessages german library: systems title: system - 1: Laden der Hilfsdatei verschoben (tippenmodus) + 1: Laden der Hilfsdatei aufgeschoben (Eingabe-Modus) 2: -- geladen % 3: Versuche LaTeX 4: Befehl -- ist bereits definiert @@ -519,7 +519,7 @@ 8: balanced in -- step(s) 9: check raggedness 10: (less than) 1 line left - 11: float to wide for column + 11: float too wide for column 12: float moved to next column / -- 13: wide float moved to top of columns \stopmessages @@ -632,6 +632,10 @@ \fi +\ifx\mkprocesscolumncontents\undefined\let\mkprocesscolumncontents\gobbleoneargument\fi +\ifx\mkprocesspagecontents \undefined\let\mkprocesspagecontents \gobbleoneargument\fi +\ifx\mkprocessboxcontents \undefined\let\mkprocessboxcontents \gobbleoneargument\fi + \def\normalejectpenalty{-\@M} \let\ejectpenalty\normalejectpenalty \def\normalsuperpenalty{-\@MM} \let\superpenalty\normalsuperpenalty @@ -774,9 +778,18 @@ \outputmessage-{normal}\outputpenalty} \mainoutput{\invokeoutputroutine} \output{\inotrtrue\the\mainoutput} + +%D Some hooks: + +\output{\inotrtrue\the\everybeforeoutput\the\mainoutput\the\everyafteroutput} +\ifx\pagediscards\undefined \let\pagediscards\relax \fi + \installoutput\synchronizeoutput % maybe add pagediscards - {\ifvoid\normalpagebox\else\unvbox\normalpagebox\fi} + {\ifvoid\normalpagebox\else + \unvbox\normalpagebox + \pagediscards % maybe not needed ? + \fi} \installoutput\discardpage {\setbox\scratchbox\box\normalpagebox} @@ -1000,7 +1013,7 @@ \def\dofinaloutput#1#2% \vbox: prevents spurious spaces in every..pagebody {\beforefinaloutput - \the\everybeforeshipout + \the\everybeforeshipout % brrr not in shipout \ifspecialbasedsettings \myshipout{\hbox{\hbox to \zeropoint{\the\pageboundsettings}% \hbox{\vbox{\dopagebody#1#2\setpagecounters}}}}% @@ -1066,7 +1079,7 @@ \def\doplaceversiontext#1#2% {\doifsomething{#2} - {\@EA\convertargument#2\to\ascii + {\defconvertedcommand\ascii{#2}% \space#1:\space\ascii\space \!!doneatrue}} @@ -1123,13 +1136,13 @@ \hsize\paperwidth \hfill\hbox{\placetestinfo\hskip.5cm}\vss \settexthoffset\hskip\texthoffset % brrrr - %\tlap{\placeversioninfo}\vskip.5cm}} + %\tlap{\placeversioninfo}\vskip.5cm \vbox to 1cm{\vss\placeversioninfo\vss}}} \def\dotestinfo#1#2#3% {\ifinpagebody\else\ifnum\conceptmode=\plusthree \begingroup - \@EA\convertargument#3\to\ascii + \defconvertedcommand\ascii{#3}% \xdef\extratestinfo {#2\space\ascii}% \gdef\totaltestinfo @@ -1455,11 +1468,12 @@ \chardef\testpagemethod \zerocount % todo: \testnewpage[method=,lines=,voffset=] \chardef\testpagetrigger\zerocount -\def\testpage {\dotripleempty\dotestpage[\plusone]} % -\def\testpageonly{\dotripleempty\dotestpage[\plustwo]} % no penalties added to the mvl +\def\testpage {\dotripleempty\dotestpage[\plusone ]} % +\def\testpageonly{\dotripleempty\dotestpage[\plustwo ]} % no penalties added to the mvl +\def\testpagesync{\dotripleempty\dotestpage[\plusthree]} % force sync \def\dotestpage[#1][#2][#3]% don't change, only add more methods - {%\relax % needed before \if + {\relax % needed before \if \ifpaginageblokkeerd \endgraf \else @@ -1508,13 +1522,25 @@ \fi \fi \else - % force page break / new / does not work as expected - % never: \penalty-\!!tenthousand\relax + \ifnum#1=\plusthree + \flushpagesofar + \fi \fi \else \ifnum#1=\plusone\goodbreak\fi \fi \fi} + +\def\flushpagesofar + {\endgraf + \ifdim\pagetotal>\pagegoal + \ifdim\dimexpr\pagetotal-\pageshrink\relax>\pagegoal + \goodbreak % \penalty0 + \else + \page + \fi + \else + \fi} \def\testcolumn {\dodoubleempty\dotestcolumn} @@ -1823,6 +1849,7 @@ \def\noshipout {\writestatus\m!systems{ignoring further shipouts}% + \global\advance\realpageno\minusone % else no flush of resources \dowithnextbox{\deadcycles\zerocount}} % \def\doignorerestoftext |