diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/page-num.tex')
-rw-r--r-- | Master/texmf-dist/tex/context/base/page-num.tex | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/context/base/page-num.tex b/Master/texmf-dist/tex/context/base/page-num.tex index 358a30275fa..b5a90fe6be3 100644 --- a/Master/texmf-dist/tex/context/base/page-num.tex +++ b/Master/texmf-dist/tex/context/base/page-num.tex @@ -343,10 +343,10 @@ % so far \def\checkpagecounter - {\checknummer{\s!page}} + {\checknumber[\s!page]} % \getpagestatus -% \ifrightpage als odd/enkelzijdig +% \ifrightpage als odd/singlesided \newif\ifrightpage \rightpagetrue @@ -365,7 +365,7 @@ \writepagref} \def\getpagestatus % hierboven gebruiken - {\ifdubbelzijdig + {\ifdoublesided \gettwopassdata\s!page \iftwopassdatafound \else \let\twopassdata\realpageno @@ -402,8 +402,8 @@ \v!right=>\dododosetpagenumberlocation{\v!text\c!righttext}, \v!inleft=>\dododosetpagenumberlocation{\v!margin\c!lefttext}, \v!inright=>\dododosetpagenumberlocation{\v!margin\c!righttext}, - \v!inmargin=>\dododosetpagenumberlocation{\v!margin\ifdubbelzijdig\c!margintext\else\c!righttext\fi}, - \v!margin=>\dododosetpagenumberlocation{\v!margin\ifdubbelzijdig\c!margintext\else\c!righttext\fi}, + \v!inmargin=>\dododosetpagenumberlocation{\v!margin\ifdoublesided\c!margintext\else\c!righttext\fi}, + \v!margin=>\dododosetpagenumberlocation{\v!margin\ifdoublesided\c!margintext\else\c!righttext\fi}, \v!atmargin=>\dododosetpagenumberlocation{\v!text\c!marginedgetext}, \v!marginedge=>\dododosetpagenumberlocation{\v!text\c!marginedgetext}]% \ifdone \else @@ -419,14 +419,14 @@ \def\dosetuppagenumbering[#1]% {\getparameters[\??nm][#1]% \preparepageprefix\??nm - \enkelzijdigfalse - \dubbelzijdigfalse + \singlesidedfalse + \doublesidedfalse \ExpandFirstAfter\processallactionsinset [\@@nmalternative] - [ \v!singlesided=>\enkelzijdigtrue, - \v!doublesided=>\dubbelzijdigtrue]% + [ \v!singlesided=>\singlesidedtrue, + \v!doublesided=>\doublesidedtrue]% \ifx\trackingmarginnotestrue\undefined\else - \ifdubbelzijdig + \ifdoublesided \trackingmarginnotestrue \else \trackingmarginnotesfalse @@ -489,13 +489,19 @@ {\dodopageprefix{#1}% \donexttracklevel{#1}} +\chardef\pageprefixmode\plusone + \def\pageprefix#1[#2]% - {\bgroup - \edef\pageprefixtype{#1}% - \edef\postprefix{\@@filternumberpart[#2]}% - \let\donexttrackcommando\dopageprefix - \donexttrackcommando\firstsection - \egroup} + {\ifcase\pageprefixmode + % skip + \or + \bgroup + \edef\pageprefixtype{#1}% + \edef\postprefix{\@@filternumberpart[#2]}% + \let\donexttrackcommando\dopageprefix + \donexttrackcommando\firstsection + \egroup + \fi} %D It was Marco Kuhlmann who uncovered the missing strut. This %D was a pretty old bug kind of covered up by the fact that non |