diff options
author | Marius <mariausol@gmail.com> | 2012-10-19 01:20:13 +0300 |
---|---|---|
committer | Marius <mariausol@gmail.com> | 2012-10-19 01:20:13 +0300 |
commit | 69d2352af4b60929b37fc49f3bdb263977016244 (patch) | |
tree | db5eb11398e345dfa23b4c4500fb93575d2afb7c /tex/context/base/page-mak.mkvi | |
parent | c18f7cbe51449a611ea1819fedd9a4ff18529b7d (diff) | |
download | context-69d2352af4b60929b37fc49f3bdb263977016244.tar.gz |
stable 2012.05.30 11:26
Diffstat (limited to 'tex/context/base/page-mak.mkvi')
-rw-r--r-- | tex/context/base/page-mak.mkvi | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/tex/context/base/page-mak.mkvi b/tex/context/base/page-mak.mkvi index 6120f56bb..f37c4f613 100644 --- a/tex/context/base/page-mak.mkvi +++ b/tex/context/base/page-mak.mkvi @@ -88,10 +88,7 @@ \newbox \b_page_makeup \newtoks\t_page_makeup_every_setup -\def\page_makeup_start_yes[#name]% [#settings]% - {\doifelsecommandhandler\??makeup{#name}\page_makeup_start_indeed\page_makeup_start_nop[#name]}% - -\def\page_makeup_start_indeed[#name][#settings]% +\def\page_makeup_start_yes[#name][#settings]% {\doifelsenothing{\namedmakeupparameter{#name}\c!page} {\page}% new, so best not have dangling mess here like references (we could capture then and flush embedded) {\page[\namedmakeupparameter{#name}\c!page]}% @@ -116,23 +113,22 @@ {\endgraf \makeupparameter\c!bottom \egroup - \strc_pagenumbers_page_state_push % new - \makeupparameter\c!before\relax - \begingroup - \ifdim\ht\b_page_makeup>\vsize - \ht\b_page_makeup\vsize % is already set to \textheight (maybe set dp to 0) - \fi - \setuppagenumber[\c!state=\makeupparameter\c!pagestate]% - \doif{\makeupparameter\c!location}\v!top{\topskip\zeropoint}% - \box\b_page_makeup - \the\t_page_makeup_every_setup - \page - \endgroup - \makeupparameter\c!after\relax + \pushpagestate % new + \makeupparameter\c!before + \relax % to be sure we don't enter the \if + \ifdim\ht\b_page_makeup>\vsize + \ht\b_page_makeup\vsize % is already set to \textheight (maybe set dp to 0) + \fi + \setuppagenumber[\c!state=\makeupparameter\c!pagestate]% + \box\b_page_makeup + \the\t_page_makeup_every_setup + \page + \makeupparameter\c!after + \relax % to be sure we don't enter the \if \ifdoublesided \ifodd\realpageno \else \getvalue{\??makeupdoublesided\makeupparameter\c!doublesided}% \fi \fi - \strc_pagenumbers_page_state_pop % new + \poppagestate % new \egroup \stoplayout} % includes \page @@ -170,7 +166,6 @@ %\c!align=, %\c!before=, %\c!after=, - %\c!location=, \c!page=\v!right, \c!doublesided=\v!empty, \c!top=\vss, |