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 | 4074 -> 4076 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 105987 -> 106067 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-brk.mkiv | 19 | ||||
| -rw-r--r-- | tex/context/base/s-mat-12.mkiv | 5 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24309 -> 24320 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 173212 -> 173210 bytes | |||
| -rw-r--r-- | tex/context/base/type-imp-texgyre.mkiv | 4 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
12 files changed, 25 insertions, 13 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index ed1570142..650befb25 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{2012.04.25 17:29} +\newcontextversion{2012.04.26 22:27} %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 5c0e28728..472a0d8f2 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{2012.04.25 17:29} +\newcontextversion{2012.04.26 22:27} %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 886694098..df7ff1d8b 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 6b0c3e583..4ada51703 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 92e318a15..ac11dd9f9 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{2012.04.25 17:29} +\edef\contextversion{2012.04.26 22:27} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index b40f857b9..168aca76c 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -23,7 +23,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.04.25 17:29} +\edef\contextversion{2012.04.26 22:27} %D For those who want to use this: diff --git a/tex/context/base/page-brk.mkiv b/tex/context/base/page-brk.mkiv index 82aa809e8..722556760 100644 --- a/tex/context/base/page-brk.mkiv +++ b/tex/context/base/page-brk.mkiv @@ -203,20 +203,27 @@ % \installpagebreakmethod \v!empty {} % defined in page-txt.mkiv % \installpagebreakmethod \v!header{} % defined in page-txt.mkiv % \installpagebreakmethod \v!footer{} % defined in page-txt.mkiv -% \installpagebreakmethod \v!left {} % defined in page-txt.mkiv + +\def\page_reset_marks_and_insert_dummy + {\resetcurrentstructuremarkswithpage\page_otr_insert_dummy_page} + +\installpagebreakmethod \v!left + {\page_otr_flush_all_floats + \page_otr_command_next_page_and_inserts + \doifbothsidesoverruled\donothing\page_reset_marks_and_insert_dummy\donothing} \installpagebreakmethod \v!right {\page_otr_flush_all_floats \page_otr_command_next_page_and_inserts - \doifbothsidesoverruled{}{}{\resetcurrentstructuremarkswithpage\page_otr_insert_dummy_page}} + \doifbothsidesoverruled\donothing\donothing\page_reset_marks_and_insert_dummy} \installpagebreakmethod \v!even {\page - \doifoddpageelse{\resetcurrentstructuremarkswithpage\page_otr_insert_dummy_page}\donothing} + \doifoddpageelse\page_reset_marks_and_insert_dummy\donothing} \installpagebreakmethod \v!odd {\page - \doifoddpageelse\donothing{\resetcurrentstructuremarkswithpage\page_otr_insert_dummy_page}} + \doifoddpageelse\donothing\page_reset_marks_and_insert_dummy} \installpagebreakmethod \v!quadruple % not yet ok inside columnsets {\ifdoublesided @@ -232,8 +239,8 @@ \page_otr_command_next_page_and_inserts \relax \doifbothsidesoverruled - {\page_facings_flush}% hm - {} + \page_facings_flush % hm + \donothing {\noheaderandfooterlines \page_otr_insert_dummy_page}% \filluparrangedpages} diff --git a/tex/context/base/s-mat-12.mkiv b/tex/context/base/s-mat-12.mkiv index 632162b5d..deb28975c 100644 --- a/tex/context/base/s-mat-12.mkiv +++ b/tex/context/base/s-mat-12.mkiv @@ -387,7 +387,7 @@ \continueifinputfile{s-mat-12.mkiv} -\setmathfontlistbodyfonts{lucidanova,cambria,xits,modern} +\setmathfontlistbodyfonts{lucidanova,cambria,xits,modern,pagella} \starttext % \setupbodyfont[cambria, 12pt] \showmathfontcharacters @@ -400,6 +400,7 @@ % \setupbodyfont[stix, 12pt] \showmathfontcharacters % \setupbodyfont[xits, 12pt] \showmathfontcharacters % \setupbodyfont[lucida, 12pt] \showmathfontcharacters - \setupbodyfont[lucidanova, 12pt] \showmathfontcharacters +% \setupbodyfont[lucidanova, 12pt] \showmathfontcharacters + \setupbodyfont[pagella, 12pt] \showmathfontcharacters \stoptext diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 7472631b5..4c4671ed0 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 e14c390fb..d35e114f5 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/type-imp-texgyre.mkiv b/tex/context/base/type-imp-texgyre.mkiv index e133cd2d4..19534f8fb 100644 --- a/tex/context/base/type-imp-texgyre.mkiv +++ b/tex/context/base/type-imp-texgyre.mkiv @@ -215,4 +215,8 @@ % \definefontsynonym[\s!MathRomanBold][MathRoman] \stoptypescript +% \starttypescript [\s!math][palatino][\s!all] +% \definefontsynonym[\s!MathRoman][file:texgyrepagella-math.otf][\s!features=\s!math\mathsizesuffix] +% \stoptypescript + \stoptypescriptcollection diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 13dd898e3..ce79a9e82 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 : 04/25/12 17:29:34 +-- merge date : 04/26/12 22:27:59 do -- begin closure to overcome local limits and interference |
