diff options
Diffstat (limited to 'tex/context/base/page-lay.mkiv')
-rw-r--r-- | tex/context/base/page-lay.mkiv | 77 |
1 files changed, 23 insertions, 54 deletions
diff --git a/tex/context/base/page-lay.mkiv b/tex/context/base/page-lay.mkiv index febabdac4..78839ea70 100644 --- a/tex/context/base/page-lay.mkiv +++ b/tex/context/base/page-lay.mkiv @@ -576,7 +576,7 @@ %\writestatus{layout target}{(\the\paperwidth,\the\paperheight) -> (\the\printpaperwidth,\the\printpaperheight)}% \page_layouts_synchronize} -\ifdefined\page_paper_set_offsets \else +\ifx\page_paper_set_offsets\undefined \def\page_paper_set_offsets % will move {\global\paperoffset\v_page_target_offset @@ -585,13 +585,8 @@ \fi -\ifdefined\setups \else - \unexpanded\def\setups[#1]{\setdefaultpenalties} % still needed? -\fi - -\ifdefined\synchronizegridsnapping \else - \let\synchronizegridsnapping\relax -\fi +\ifdefined\setups \else \unexpanded\def\setups[#1]{\setdefaultpenalties} \fi % still needed? +\ifdefined\synchronizegridsnapping \else \let\synchronizegridsnapping\relax \fi \let\p_page_layouts_width \empty \let\p_page_layouts_height\empty @@ -811,7 +806,7 @@ \page_layouts_check_revert \fi\fi\fi\fi\fi\fi} -\unexpanded\def\installlayoutmethod#1#2% +\def\installlayoutmethod#1#2% {\setgvalue{\??layoutmethod#1}{#2}} \installlayoutmethod\v!default{\page_layouts_check_default} @@ -931,11 +926,8 @@ %D \macros %D {adaptlayout} -\installcorenamespace{adaptlayout} \installcorenamespace{pageadaptations} -\installsetuponlycommandhandler \??adaptlayout {adaptlayout} - \newdimen\d_page_adepts_pushed_text_height \newdimen\d_page_adepts_pushed_footer_height \newdimen\d_page_adepts_height @@ -954,33 +946,27 @@ \def\page_adapts_layout_register#1#2% {\setgvalue{\??pageadaptations#2}{\page_adapts_layout_indeed{#1}}} -\let\p_adapts_height\zeropoint -\let\p_adapts_lines \zerocount - \def\page_adapts_layout_indeed#1% - {\setupcurrentadaptlayout[\c!height=\zeropoint,\c!lines=\zerocount,#1]% + {\getparameters[\??za][\c!height=\zeropoint,\c!lines=0,#1]% \page_adepts_push - \edef\p_adapts_height{\adaptlayoutparameter\c!height}% - \edef\p_adapts_lines {\adaptlayoutparameter\c!lines}% - \ifx\p_adapts_height\v!max - \global\d_page_adepts_height\footerheight - \else - \global\d_page_adepts_height\dimexpr - \ifnum\p_adapts_lines=\zerocount - \p_adapts_height + \doifelse\@@zaheight\v!max + {\global\d_page_adepts_height\footerheight} + {\global\d_page_adepts_height\dimexpr + \ifnum\@@zalines=\zerocount + \@@zaheight \else - \p_adapts_lines\openlineheight + \@@zalines\openlineheight \fi \relax \ifdim\d_page_adepts_height>\footerheight \global\d_page_adepts_height\footerheight - \fi - \fi + \fi} \global\advance\textheight \d_page_adepts_height \global\advance\footerheight-\d_page_adepts_height \showmessage\m!layouts1{\the\d_page_adepts_height,\the\realpageno}% % this will become a better one (do we need insert correction?) \page_otr_command_set_vsize + \global\pagegoal\vsize % \page_backgrounds_recalculate \global\let\page_adepts_push\relax @@ -1119,50 +1105,33 @@ % #single #left #right -\def\doifoddpageelse - {\ifodd\pagenoshift - \expandafter\page_layouts_if_odd_else_yes - \else - \expandafter\page_layouts_if_odd_else_nop - \fi} - -\def\page_layouts_if_odd_else_yes - {\ifodd\realpageno - \expandafter\secondoftwoarguments - \else - \expandafter\firstoftwoarguments - \fi} - -\def\page_layouts_if_odd_else_nop - {\ifodd\realpageno - \expandafter\firstoftwoarguments - \else - \expandafter\secondoftwoarguments - \fi} +\def\doifoddpageelse {\ifodd\pagenoshift\expandafter\doifoddpageelseyes \else\expandafter\doifoddpageelsenop \fi} +\def\doifoddpageelseyes{\ifodd\realpageno \expandafter\secondoftwoarguments\else\expandafter\firstoftwoarguments \fi} +\def\doifoddpageelsenop{\ifodd\realpageno \expandafter\firstoftwoarguments \else\expandafter\secondoftwoarguments\fi} \let\doifonevenpaginaelse\doifoddpageelse -\def\page_layouts_if_odd_else_again#1{\doifoddpageelse} +\def\redoifoddpageelse#1{\doifoddpageelse} \def\doifbothsidesoverruled {\ifdoublesided - \expandafter\page_layouts_if_odd_else_again + \expandafter\redoifoddpageelse \else \expandafter\firstofthreearguments \fi} \def\doifbothsides% #1 #2 #3 {\ifdoublesided - \expandafter\page_layouts_if_both_sides + \expandafter\doifbothsidesindeed \else \expandafter\firstofthreearguments \fi} -\def\page_layouts_if_both_sides +\def\doifbothsidesindeed {\ifsinglesided \expandafter\firstofthreearguments \else - \expandafter\page_layouts_if_odd_else_again + \expandafter\redoifoddpageelse \fi} \newdimen\texthoffset @@ -1210,12 +1179,12 @@ \def\rightorleftpageaction {\ifdoublesided - \expandafter\page_layouts_right_or_left_page_action + \expandafter\rightorleftpageactionindeed \else \expandafter\firstoftwoarguments \fi} -\def\page_layouts_right_or_left_page_action +\def\rightorleftpageactionindeed {\ifsinglesided \expandafter\firstoftwoarguments \else |