summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-05-12 22:38:39 +0000
committerKarl Berry <karl@freefriends.org>2017-05-12 22:38:39 +0000
commitf919f6d183be1bd4cabea1e9cfb7c9036fecd8fb (patch)
treec15add3fdff015ef2d1efddfd247ea59cc95081b /Master/texmf-dist/tex/generic
parent8985692c4e7f95a1f6e69213cc73e25e232734c4 (diff)
context (May 10 10:50)
git-svn-id: svn://tug.org/texlive/trunk@44310 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua b/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua
index 90e4e762443..953d2bf008b 100644
--- a/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 05/09/17 10:14:12
+-- merge date : 05/10/17 10:41:46
do -- begin closure to overcome local limits and interference
@@ -19827,7 +19827,7 @@ local function inject_everything(head,where)
ox=px-pn.markx
if pn.checkmark then
local wn=getwidth(n)
- if wn~=0 then
+ if wn and wn~=0 then
wn=wn/2
if trace_injections then
report_injections("correcting non zero width mark %C",getchar(n))
@@ -20014,7 +20014,7 @@ local function inject_everything(head,where)
if hasmarks then
local pm=i.markbasenode
if pm then
- processmark(pm,current,i)
+ processmark(pm,n,i)
end
end
end
@@ -20044,7 +20044,7 @@ local function inject_everything(head,where)
if hasmarks then
local pm=i.markbasenode
if pm then
- processmark(pm,current,i)
+ processmark(pm,n,i)
end
end
end
@@ -20074,7 +20074,7 @@ local function inject_everything(head,where)
if hasmarks then
local pm=i.markbasenode
if pm then
- processmark(pm,current,i)
+ processmark(pm,n,i)
end
end
end