diff options
author | Karl Berry <karl@freefriends.org> | 2020-03-05 00:48:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-03-05 00:48:46 +0000 |
commit | f210bce174e1f2f05305ab03e88e120a1cbfc4da (patch) | |
tree | 5c4e2ad096b5c745e859516ac3196fa0864292d5 /Master/texmf-dist/tex/context/base/mkiv/page-lay.mkiv | |
parent | 35fd641a3546acc0c62e0aa7f134888e36da30d4 (diff) |
context (from cont-tmf.zip of Feb 17 16:00, size 116339406)
git-svn-id: svn://tug.org/texlive/trunk@54086 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/page-lay.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/page-lay.mkiv | 72 |
1 files changed, 45 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/page-lay.mkiv b/Master/texmf-dist/tex/context/base/mkiv/page-lay.mkiv index 02cc5aa17f2..d115b588d6f 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/page-lay.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/page-lay.mkiv @@ -166,6 +166,8 @@ \def\layoutdistance#1#2{\ifdim\zeropoint<#1#2\else\zeropoint\fi} +% \newconditional\reverselayout + \def\page_layouts_set_dimensions {\global\naturalmarginwidth \layoutparameter\c!margin \global\naturaledgewidth \layoutparameter\c!edge @@ -194,8 +196,7 @@ \global\headerdistance \layoutdistance\headerheight \naturalheaderdistance \global\textdistance \naturaltextdistance \global\footerdistance \layoutdistance\footerheight \naturalfooterdistance - \global\bottomdistance \layoutdistance\bottomheight \naturalbottomdistance - } + \global\bottomdistance \layoutdistance\bottomheight \naturalbottomdistance} \def\page_layouts_set_distances % local in \setreducedvsize {\headerdistance\layoutdistance\headerheight\naturalheaderdistance @@ -367,16 +368,16 @@ {\edef\currentlayouttarget{#1}% \ifx\currentlayouttarget\empty % invalid target + \else\ifcondition\validassignment{#2}% + \definelayouttarget[#1][#2]% \else - \doifelseassignment{#2} - {\definelayouttarget[#1][#2]} - {\setevalue{\??layoutpaper#1}{#2}% - \ifthirdargument - \setevalue{\??layoutprint#1}{#3}% - \else - \setevalue{\??layoutprint#1}{#2}% - \fi}% - \fi} + \setevalue{\??layoutpaper#1}{#2}% + \ifthirdargument + \setevalue{\??layoutprint#1}{#3}% + \else + \setevalue{\??layoutprint#1}{#2}% + \fi + \fi\fi} \appendtoks \letvalue{\??layoutcurrent\currentlayouttarget}\relax @@ -400,11 +401,13 @@ \unexpanded\def\page_paper_setup_size[#1][#2]% {\iffirstargument - \doifelseassignment{#1} - {\page_paper_setup_size_settings[#1]} - {\doifelseassignment{#2} - {\page_paper_setup_size_settings_by_name[#1][#2]} - {\page_paper_setup_size_change_size[#1][#2]}}% + \ifcondition\validassignment{#1}% + \page_paper_setup_size_settings[#1]% + \else\ifcondition\validassignment{#2}% + \page_paper_setup_size_settings_by_name[#1][#2]% + \else + \page_paper_setup_size_change_size[#1][#2]% + \fi\fi \else \page_paper_restore \fi} @@ -612,10 +615,6 @@ \fi -\ifdefined\setups \else - \unexpanded\def\setups[#1]{\setdefaultpenalties} % still needed? -\fi - \ifdefined\synchronizegridsnapping \else \let\synchronizegridsnapping\relax \fi @@ -644,12 +643,12 @@ \global\cutspace\layoutparameter\c!cutspace\relax \edef\p_page_layouts_width{\layoutparameter\c!width}% \ifx\p_page_layouts_width\v!middle - \ifdim\cutspace=\zeropoint + \ifzeropt\cutspace \global\cutspace\backspace \fi \global\makeupwidth\dimexpr\paperwidth-\backspace-\cutspace\relax \else\ifx\p_page_layouts_width\v!fit - \ifdim\cutspace=\zeropoint + \ifzeropt\cutspace \global\cutspace\backspace \fi \global\makeupwidth\dimexpr\paperwidth-\cutspace\relax @@ -665,7 +664,7 @@ -\scratchdimen\relax \else \global\makeupwidth\p_page_layouts_width\relax - \ifdim\cutspace=\zeropoint + \ifzeropt\cutspace \global\cutspace\dimexpr\paperwidth-\makeupwidth-\backspace\relax % \else % A kind of inconsistent specification, but used @@ -675,7 +674,7 @@ \fi \fi\fi \scratchdimen\layoutparameter\c!bottomspace\relax - %\ifdim\scratchdimen=\zeropoint + %\ifzeropt\scratchdimen % \scratchdimen\topspace %\fi \global\bottomspace\layoutparameter\c!bottomspace\relax @@ -683,12 +682,12 @@ \ifcase\layoutlines \edef\p_page_layouts_height{\layoutparameter\c!height}% \ifx\p_page_layouts_height\v!middle - \ifdim\bottomspace=\zeropoint + \ifzeropt\bottomspace \global\bottomspace\topspace \fi \global\makeupheight\dimexpr\paperheight-\topspace-\bottomspace\relax \else\ifx\p_page_layouts_height\v!fit - \ifdim\bottomspace=\zeropoint + \ifzeropt\bottomspace \global\bottomspace\topspace \fi \global\makeupheight\dimexpr\paperheight-\bottomspace\relax @@ -699,7 +698,7 @@ \global\advance\makeupheight\dimexpr-\bottomdistance-\bottomheight-\scratchdimen\relax \else \global\makeupheight\layoutparameter\c!height\relax - \ifdim\bottomspace=\zeropoint + \ifzeropt\bottomspace \global\bottomspace\dimexpr\paperheight-\makeupheight-\topspace\relax % \else % inconsistent specification @@ -731,6 +730,7 @@ +\rightedgetotal \relax % \page_layouts_check_next % here ? + \page_layouts_check_direction \page_layouts_calculate_extras \page_target_check_centering \calculatehsizes @@ -738,6 +738,21 @@ \page_layouts_check_pseudo_columns \page_backgrounds_recalculate} +\def\page_layouts_check_direction + {\edef\p_direction{\layoutparameter\c!direction}% + \ifx\p_direction\v!reverse + \globalswapdimens\naturalleftedgedistance \naturalrightedgedistance + \globalswapdimens\naturalleftmargindistance\naturalrightmargindistance + \globalswapdimens\leftedgedistance \rightedgedistance + \globalswapdimens\leftmargindistance \rightmargindistance + \globalswapdimens\leftmarginwidth \rightmarginwidth + \globalswapdimens\leftedgewidth \rightedgewidth + \globalswapdimens\backspace \cutspace + \expandafter\setsystemmode + \else + \expandafter\resetsystemmode + \fi{reverselayout}} + \def\page_layouts_check_pseudo_columns {\global\layoutcolumns\layoutparameter\c!columns \global\layoutcolumndistance\layoutparameter\c!columndistance @@ -1340,6 +1355,7 @@ %D \showsetup{showsetups} %D %showsetup{showmargins} %D %showsetup{showgrid} +%D %showsetup{showusage} \fetchruntimecommand \showprint \f!page_run \fetchruntimecommand \showframe \f!page_run @@ -1347,6 +1363,7 @@ \fetchruntimecommand \showsetups \f!page_run \fetchruntimecommand \showmargins \f!page_run \fetchruntimecommand \showgrid \f!page_run +\fetchruntimecommand \showusage \f!page_run \glet\page_grids_add_to_box\gobbleoneargument \glet\page_grids_add_to_one\gobbleoneargument @@ -1408,6 +1425,7 @@ \c!dx=\zeropoint, \c!dy=\zeropoint, \c!grid=\v!no, + \c!direction=\v!normal, \c!preset=, \c!setups=\systemsetupsprefix\s!default, \c!clipoffset=\zeropoint, |