From c98294bb885c3de180d966fa15772008efaa570c Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 3 Jan 2014 02:00:23 +0200 Subject: stable 2014.01.03 00:40 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4113 -> 4115 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/pack-rul.lua | 2 +- tex/context/base/status-files.pdf | Bin 24544 -> 24556 bytes tex/context/base/status-lua.pdf | Bin 228188 -> 228200 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index f6060b838..134b1f08a 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.02 20:05} +\newcontextversion{2014.01.03 00:40} %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 1b10c6818..30d18d29b 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 26e0d4e62..0214c2bfa 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.02 20:05} +\edef\contextversion{2014.01.03 00:40} \edef\contextkind {current} %D For those who want to use this: diff --git a/tex/context/base/pack-rul.lua b/tex/context/base/pack-rul.lua index 1f41b505a..329ea63b8 100644 --- a/tex/context/base/pack-rul.lua +++ b/tex/context/base/pack-rul.lua @@ -53,7 +53,7 @@ function commands.doreshapeframedbox(n) if repack then local subtype = n.subtype if subtype == box_code or subtype == line_code then - lastlinelength = node_dimensions(l,l.dir) -- used to be: hpack(copy(l)).width + lastlinelength = node_dimensions(l,n.dir) -- used to be: hpack(copy(l)).width else lastlinelength = n.width end diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 354441a11..a74501e41 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 1f2ce679a..a591afb75 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 59a4c0d3b..24e49308c 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/02/14 20:05:20 +-- merge date : 01/03/14 00:40:35 do -- begin closure to overcome local limits and interference -- cgit v1.2.3