summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-04-26 15:13:00 +0200
committerHans Hagen <pragma@wxs.nl>2013-04-26 15:13:00 +0200
commit9a215b83b9b1ba7d2389ae324e838ae145d9d7da (patch)
treef41adc1563f5253ba4d8b9940be41ee76995ee13 /tex
parentc34c2f8a578e27af9b715aa0ccf48c7e365ab1e5 (diff)
downloadcontext-9a215b83b9b1ba7d2389ae324e838ae145d9d7da.tar.gz
beta 2013.04.26 15:13
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4136 -> 4134 bytes
-rw-r--r--tex/context/base/context-version.pngbin40499 -> 40309 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/node-inj.lua9
-rw-r--r--tex/context/base/status-files.pdfbin24726 -> 24733 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin211579 -> 211433 bytes
-rw-r--r--tex/context/base/util-lib.lua12
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua7
9 files changed, 18 insertions, 14 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index e53a2201d..2628ed729 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{2013.04.25 18:50}
+\newcontextversion{2013.04.26 15:13}
%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 9d1236a83..cbfbbd551 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 6e4197107..a1b580233 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 4d9101353..b35c8d445 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2013.04.25 18:50}
+\edef\contextversion{2013.04.26 15:13}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/node-inj.lua b/tex/context/base/node-inj.lua
index a53b5df50..91c5d1414 100644
--- a/tex/context/base/node-inj.lua
+++ b/tex/context/base/node-inj.lua
@@ -385,10 +385,10 @@ function injections.handler(head,where,keep)
local w = k[4]
if w then
if rlmode and rlmode >= 0 then
- -- kern(x) glyph(p) kern(w-x)
- n.xoffset = p.xoffset - p.width + d[1] - x
+ -- kern(x) glyph(p) kern(w-x) mark(n)
+ n.xoffset = p.xoffset - p.width + d[1] - (w-x)
else
- -- kern(w-x) glyph(p) kern(x)
+ -- kern(w-x) glyph(p) kern(x) mark(n)
n.xoffset = p.xoffset - d[1] - x
end
else
@@ -432,7 +432,8 @@ function injections.handler(head,where,keep)
if next(wx) then
for n, k in next, wx do
-- only w can be nil (kernclasses), can be sped up when w == nil
- local x, w = k[2] or 0, k[4]
+ local x = k[2]
+ local w = k[4]
if w then
local rl = k[1] -- r2l = k[6]
local wx = w - x
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 63a039b77..045dc3eb1 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 0464bf88c..3839f0116 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/util-lib.lua b/tex/context/base/util-lib.lua
index 2ec3d395c..c5c999113 100644
--- a/tex/context/base/util-lib.lua
+++ b/tex/context/base/util-lib.lua
@@ -160,12 +160,12 @@ local function requireswiglib(required,version)
return found
end
end
- -- Check clib paths using name and version.
+ -- Check lib paths using name and version.
if trace_swiglib then
- report_swiglib("checking clib paths")
+ report_swiglib("checking lib paths")
end
- package.extraclibpath(environment.ownpath)
- local paths = package.clibpaths()
+ package.extralibpath(environment.ownpath)
+ local paths = package.libpaths()
for i=1,#paths do
local found = check(lfs.isfile)
if found and (not checkpattern or find(found,checkpattern)) then
@@ -258,7 +258,9 @@ function swiglib(name,version)
local library = swiglibs[name]
if not library then
statistics.starttiming(swiglibs)
- report_swiglib("loading %a",name)
+ if trace_swiglib then
+ report_swiglib("loading %a",name)
+ end
library = requireswiglib("swiglib." .. name,version)
swiglibs[name] = library
statistics.stoptiming(swiglibs)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index bb89e3902..0cf2ce466 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/13 18:50:39
+-- merge date : 04/26/13 15:13:48
do -- begin closure to overcome local limits and interference
@@ -7705,7 +7705,7 @@ function injections.handler(head,where,keep)
local w=k[4]
if w then
if rlmode and rlmode>=0 then
- n.xoffset=p.xoffset-p.width+d[1]-x
+ n.xoffset=p.xoffset-p.width+d[1]-(w-x)
else
n.xoffset=p.xoffset-d[1]-x
end
@@ -7745,7 +7745,8 @@ function injections.handler(head,where,keep)
end
if next(wx) then
for n,k in next,wx do
- local x,w=k[2] or 0,k[4]
+ local x=k[2]
+ local w=k[4]
if w then
local rl=k[1]
local wx=w-x