summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorContext Git Mirror Bot <phg42.2a@gmail.com>2016-07-11 15:16:51 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2016-07-11 15:16:51 +0200
commit74326d3975653dbc32ce3cd8b431dba40917e7dc (patch)
treead16fccb5e232ebcb1e14f0cf3287dc5cc15bcbc /tex/generic
parent3691e25e611249750a260ec00aa139ba82a37bca (diff)
downloadcontext-74326d3975653dbc32ce3cd8b431dba40917e7dc.tar.gz
2016-07-11 13:48:00
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 178757a7d..7aad6aade 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 07/08/16 17:19:16
+-- merge date : 07/11/16 13:44:22
do -- begin closure to overcome local limits and interference
@@ -17149,6 +17149,10 @@ local function inject_everything(head,where)
nofmarks=nofmarks+1
marks[nofmarks]=current
else
+local yoffset=i.yoffset
+if yoffset and yoffset~=0 then
+ setfield(current,"yoffset",yoffset)
+end
if hascursives then
local cursivex=i.cursivex
if cursivex then
@@ -17200,10 +17204,6 @@ local function inject_everything(head,where)
cursiveanchor=nil
end
end
- local yoffset=i.yoffset
- if yoffset and yoffset~=0 then
- setfield(current,"yoffset",yoffset)
- end
local leftkern=i.leftkern
if leftkern and leftkern~=0 then
insert_node_before(head,current,newkern(leftkern))