diff options
| -rw-r--r-- | tex/context/base/cont-new.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4096 -> 4114 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 106307 -> 105691 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/page-lay.mkiv | 10 | ||||
| -rw-r--r-- | tex/context/base/page-mak.mkvi | 7 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 23992 -> 24078 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 163916 -> 163863 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
11 files changed, 19 insertions, 8 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 4adfaa39f..13dad229b 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.10.20 13:25} +\newcontextversion{2011.10.20 15:49} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index ca3e082ec..f4840be48 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.10.20 13:25} +\newcontextversion{2011.10.20 15:49} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex c39413995..5c6e35416 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex 7897c85a0..c85f3d479 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index e2a7afbdf..f7fe26995 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.10.20 13:25} +\edef\contextversion{2011.10.20 15:49} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index e6063d376..9147474d8 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.10.20 13:25} +\edef\contextversion{2011.10.20 15:49} %D For those who want to use this: diff --git a/tex/context/base/page-lay.mkiv b/tex/context/base/page-lay.mkiv index 7ff3420d9..b3c2f535c 100644 --- a/tex/context/base/page-lay.mkiv +++ b/tex/context/base/page-lay.mkiv @@ -135,6 +135,13 @@ \presetcenterpagebox \to \everysetuplayout +\def\doiflayoutdefinedelse#1% + {\ifcsname\??ly#1\c!state\endcsname % maybe a helper + \expandafter\firstoftwoarguments + \else + \expandafter\secondoftwoarguments + \fi} + \def\layoutdistance#1#2{\ifdim\zeropoint<#1#2\else\zeropoint\fi} \def\setlayoutdimensions @@ -834,12 +841,13 @@ \unexpanded\def\startlayout[#1]% {\page \pushmacro\currentlayout - \setuplayout[#1]} + \doiflayoutdefinedelse{#1}{\setuplayout[#1]}\donothing} % {\setuplayout[\currentlayout]}} \unexpanded\def\stoplayout {\page \popmacro\currentlayout \setuplayout[\currentlayout]} + % describe interface diff --git a/tex/context/base/page-mak.mkvi b/tex/context/base/page-mak.mkvi index 53385ff72..9cefa9ab2 100644 --- a/tex/context/base/page-mak.mkvi +++ b/tex/context/base/page-mak.mkvi @@ -89,7 +89,7 @@ {\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]}% - \startlayout[#name]% + \startlayout[#name]% includes \page \bgroup \edef\currentmakeup{#name}% \setupcurrentmakeup[#settings]% @@ -127,7 +127,7 @@ \global\pageselectedfalse \fi \egroup - \stoplayout} + \stoplayout} % includes \page \def\page_makeup_flush_box {\pushpagestate % new @@ -216,4 +216,7 @@ \c!top=\pseudostrut\ignorespaces, \c!bottom=\obeydepth\vss] +% \definelayout[standard] +% \definelayout[text] + \protect diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex c11cdfba7..52c33d9e6 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex 3a1740a99..38cfa4611 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 37d2a49f7..e55076710 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 10/20/11 13:25:49 +-- merge date : 10/20/11 15:49:15 do -- begin closure to overcome local limits and interference |
