summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/page-mak.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-11-16 01:02:47 +0000
committerKarl Berry <karl@freefriends.org>2006-11-16 01:02:47 +0000
commit3c85b55e2f245fb7edac7e445f107e6d0bb423ae (patch)
treec62b7f80edafe0455310d08e09f4218127bf9e87 /Master/texmf-dist/tex/context/base/page-mak.tex
parente5ecff27a26ef59e1dbe9702677687fd7107be3a (diff)
context update
git-svn-id: svn://tug.org/texlive/trunk@2444 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/page-mak.tex')
-rw-r--r--Master/texmf-dist/tex/context/base/page-mak.tex16
1 files changed, 12 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/context/base/page-mak.tex b/Master/texmf-dist/tex/context/base/page-mak.tex
index a6e5a66fd0a..807d77fc07f 100644
--- a/Master/texmf-dist/tex/context/base/page-mak.tex
+++ b/Master/texmf-dist/tex/context/base/page-mak.tex
@@ -127,9 +127,10 @@
\setupmakeuplayout
\makeupparameter\c!commands % hm, what is this one doing here ?
\startregistercolor[\makeupparameter\c!color]%
+ \forgetall % else indented flush
\global\setbox\makeupbox\vbox to \makeupparameter\c!height
\bgroup
- \forgetall
+% \forgetall
\setups[\makeupparameter\c!setups]%
\hsize\makeupparameter\c!width
\doifsomething{\makeupparameter\c!align}
@@ -141,7 +142,7 @@
\makeupparameter\c!bottom
\egroup
\flushmarks % new, here, else empty pages
-\stopregistercolor
+ \stopregistercolor
\doflushmakeup
\egroup
\calculatehsizes
@@ -166,13 +167,20 @@
\def\doshipoutmakeup
{\globalpushmacro\@@pnstate % new
\makeupparameter\c!before
- \vbox{\hbox{\color[\makeupparameter\c!color]{\box\makeupbox}}}%
+ \setbox\makeupbox\vbox{\hbox{\color[\makeupparameter\c!color]{\box\makeupbox}}}%
+ % \ifgridsnapping
+ % new per 22/6/2006
+ \ifdim\ht\makeupbox>\vsize
+ \ht\makeupbox\vsize
+ \fi
+ % \fi
+ \box\makeupbox
\setuppagenumber[\c!state=\makeupparameter\c!pagestate]%
\setupmakeuplayout
\page
\makeupparameter\c!after
\relax % voor fi
- \ifdubbelzijdig \ifodd\realpageno\else
+ \ifdoublesided \ifodd\realpageno\else
\processaction
[\makeupparameter\c!doublesided]
[ \v!yes=>\null