diff options
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4081 -> 4087 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/page-brk.mkiv | 16 | ||||
| -rw-r--r-- | tex/context/base/s-inf-03.pdf | bin | 1977 -> 1975 bytes | |||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24802 -> 24825 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.log | 2 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index e01596804..ee2159d43 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{2014.01.30 22:19} +\newcontextversion{2014.01.30 22:59} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 337e02978..b1080ff77 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index db52afdf5..23a0e4ff1 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.01.30 22:19} +\edef\contextversion{2014.01.30 22:59} \edef\contextkind {beta} %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 2b89f5b4f..82bde2f67 100644 --- a/tex/context/base/page-brk.mkiv +++ b/tex/context/base/page-brk.mkiv @@ -403,7 +403,7 @@ \pagecheckerparameter\c!lines\lineheight +\pagetotal \ifdim\lastskip<\parskip+\parskip\fi - \ifsecondargument+\pagecheckerparameter\v!offset\fi + +\pagecheckerparameter\c!offset \relax} \unexpanded\def\checkpage @@ -501,14 +501,14 @@ \pagecheckerparameter\c!inbetween \fi} -\definepagechecker[\s!unknown:0] [\c!method=0,\c!before=,\c!after=,\c!inbetween=] -\definepagechecker[\s!unknown:1][]\s!unknown:0][\c!method=1] -\definepagechecker[\s!unknown:2][]\s!unknown:0][\c!method=2] -\definepagechecker[\s!unknown:3][]\s!unknown:0][\c!method=3] +\definepagechecker[\s!unknown:0] [\c!method=0,\c!before=,\c!after=,\c!inbetween=] +\definepagechecker[\s!unknown:1][\s!unknown:0][\c!method=1] +\definepagechecker[\s!unknown:2][\s!unknown:0][\c!method=2] +\definepagechecker[\s!unknown:3][\s!unknown:0][\c!method=3] -\def\page_tests_test_a[#1][#2]{\checkpage[\s!unknown:1][\c!lines=#1,\c!voffset=\ifsecondargument#2\else\zeropoint\fi]} -\def\page_tests_test_b[#1][#2]{\checkpage[\s!unknown:2][\c!lines=#1,\c!voffset=\ifsecondargument#2\else\zeropoint\fi]} -\def\page_tests_test_c[#1][#2]{\checkpage[\s!unknown:3][\c!lines=#1,\c!voffset=\ifsecondargument#2\else\zeropoint\fi]} +\def\page_tests_test_a[#1][#2]{\checkpage[\s!unknown:1][\c!lines=#1,\c!offset=\ifsecondargument#2\else\zeropoint\fi]} +\def\page_tests_test_b[#1][#2]{\checkpage[\s!unknown:2][\c!lines=#1,\c!offset=\ifsecondargument#2\else\zeropoint\fi]} +\def\page_tests_test_c[#1][#2]{\checkpage[\s!unknown:3][\c!lines=#1,\c!offset=\ifsecondargument#2\else\zeropoint\fi]} \unexpanded\def\testpage {\dodoubleempty\page_tests_test_a} % \unexpanded\def\testpageonly{\dodoubleempty\page_tests_test_b} % no penalties added to the mvl diff --git a/tex/context/base/s-inf-03.pdf b/tex/context/base/s-inf-03.pdf Binary files differindex ed1d6e12a..56e5500ef 100644 --- a/tex/context/base/s-inf-03.pdf +++ b/tex/context/base/s-inf-03.pdf diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 2752ed563..8827cf080 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log index e9ce12329..be3607805 100644 --- a/tex/context/base/status-lua.log +++ b/tex/context/base/status-lua.log @@ -1,6 +1,6 @@ (cont-yes.mkiv -ConTeXt ver: 2014.01.30 22:19 MKIV beta fmt: 2014.1.30 int: english/english +ConTeXt ver: 2014.01.30 22:59 MKIV beta fmt: 2014.1.30 int: english/english system > 'cont-new.mkiv' loaded (cont-new.mkiv) diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 2c3daf4be..ec052a5c1 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 : 01/30/14 22:19:30 +-- merge date : 01/30/14 22:59:52 do -- begin closure to overcome local limits and interference |