diff options
author | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
commit | 1314fbe93790c501dc436a5cf99f106b9e5c0f63 (patch) | |
tree | 04dc7734c8be8ffe385d41f4388826ef5857b6f9 /Master/texmf-dist/tex/context/base/mkiv/strc-pag.mkiv | |
parent | eb80ce7b34f59896a1dfee5ca422495394d6677f (diff) |
Revert "ConTeXt version 2019.02.22 19:35"
This reverts commit 5c6357cdb820b4f628d036ba7b2248f221d50c0b.
git-svn-id: svn://tug.org/texlive/trunk@50112 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/strc-pag.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/strc-pag.mkiv | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/strc-pag.mkiv b/Master/texmf-dist/tex/context/base/mkiv/strc-pag.mkiv index 01361e2c53b..d56f0de544e 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/strc-pag.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/strc-pag.mkiv @@ -152,7 +152,7 @@ \setupsubpagenumber [\c!way=\v!by\v!part, - \c!state=\v!start] % was stop but start looks better in logging + \c!state=\v!stop] % Counters @@ -263,7 +263,7 @@ \def\currentpage{\the\realpageno}% rather useless \appendtoks - \ifnum\realpageno>\lastpage \glet\lastpage\lastrealpage \fi + \ifnum\realpageno>\lastpage \globallet\lastpage\lastrealpage \fi \to \everyinitializepagecounters % States: @@ -309,8 +309,6 @@ % some day ifsinglesided and ifdoublesided will become obsolete -\newtoks\everysidedswitch - \appendtoks \singlesidedfalse \setfalse\layoutisdoublesided \doublesidedfalse \setfalse\layoutissinglesided @@ -319,7 +317,13 @@ \processallactionsinset[\directpagenumberingparameter\c!alternative] [ \v!singlesided=>\setsystemmode\v!singlesided\singlesidedtrue\settrue\layoutissinglesided, \v!doublesided=>\setsystemmode\v!doublesided\doublesidedtrue\settrue\layoutisdoublesided]% - \the\everysidedswitch + \ifdefined\trackingmarginnotestrue + \ifdoublesided + \trackingmarginnotestrue + \else + \trackingmarginnotesfalse + \fi + \fi \pageduplexmode \ifsinglesided \ifdoublesided\plustwo\else\zerocount\fi @@ -330,16 +334,6 @@ \strc_pagenumbers_set_location \to \everysetuppagenumbering -\appendtoks - \ifdefined\trackingmarginnotestrue - \ifdoublesided - \trackingmarginnotestrue - \else - \trackingmarginnotesfalse - \fi - \fi -\to \everysidedswitch - \ifdefined \page_backgrounds_recalculate \else \let\page_backgrounds_recalculate\relax \fi @@ -407,10 +401,11 @@ \unexpanded\def\strc_pagenumbers_check_state_change#1#2% {\edef\m_strc_pagenumbers_state_new{\namedcounterparameter#1\c!state}% \ifx\m_strc_pagenumbers_state_new\m_strc_pagenumbers_state_old \else - #2\ifx\m_strc_pagenumbers_state_new\v!start\plustwo\else\zerocount\fi + \doifelse\m_strc_pagenumbers_state_new\v!start + {#2\plustwo}% + {#2\zerocount}% \fi} - \appendtoks % todo: set state: none, start, stop, reset \strc_pagenumbers_check_state_change\s!realpage\c_strc_pagenumbers_state_realpage \to \everysetuprealpagenumber |