From 94624fa8edb58a31e8e2999570ab392f346607da Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 4 Apr 2014 00:08:00 +0200 Subject: beta 2014.04.04 00:08 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4057 -> 4057 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/page-mix.mkiv | 4 ++-- tex/context/base/status-files.pdf | Bin 24610 -> 24644 bytes tex/context/base/status-lua.pdf | Bin 252866 -> 241355 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 52c8ff998..c48611177 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.04.03 16:20} +\newcontextversion{2014.04.04 00:08} %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 index 8e1997c1f..969fdfcda 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 03cb4131e..627a00ac0 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.04.03 16:20} +\edef\contextversion{2014.04.04 00:08} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/page-mix.mkiv index 671f01ea3..41897f6dd 100644 --- a/tex/context/base/page-mix.mkiv +++ b/tex/context/base/page-mix.mkiv @@ -542,8 +542,8 @@ {\ctxcommand{mixfinalize()}% \setbox\b_page_mix_collected\vbox \bgroup \ifvoid\b_page_mix_preceding \else - \page_lines_add_numbers_to_box\b_page_mix_preceding\plusone\plusone\plusone - %\box\b_page_mix_preceding + \page_postprocessors_linenumbers_deepbox\b_page_mix_preceding + \box\b_page_mix_preceding \global\d_page_mix_preceding_height\zeropoint \nointerlineskip \fi diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index cffb13476..670a0ca1d 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index fc471de22..dae52d6c4 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index c52bae2de..fa61668b0 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/03/14 16:20:04 +-- merge date : 04/04/14 00:08:59 do -- begin closure to overcome local limits and interference -- cgit v1.2.3