summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorContext Git Mirror Bot <phg42.2a@gmail.com>2015-09-04 11:15:09 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2015-09-04 11:15:09 +0200
commitcf4c4c56e5748e91ecc28f8126f5fc6eadfd73fa (patch)
treeca9c7f5782d3622203ade72f1d2d32f6c463bc98 /tex/generic
parentf4508b5b95b4fc2b3ed59aaa28a8dfc1a667360a (diff)
downloadcontext-cf4c4c56e5748e91ecc28f8126f5fc6eadfd73fa.tar.gz
2015-09-04 11:02:00
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-inj.lua16
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua30
2 files changed, 39 insertions, 7 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-inj.lua b/tex/generic/context/luatex/luatex-fonts-inj.lua
index cdf14b935..10108a271 100644
--- a/tex/generic/context/luatex/luatex-fonts-inj.lua
+++ b/tex/generic/context/luatex/luatex-fonts-inj.lua
@@ -549,9 +549,19 @@ local function inject_marks(marks,marki,nofmarks)
else
-- kern(x) glyph(p) kern(w-x) mark(n)
-- ox = px - getfield(p,"width") + pn.markx - pp.leftkern
- local leftkern = pp.leftkern
- if leftkern then
- ox = px - pn.markx - leftkern
+ --
+ -- According to Kai we don't need to handle leftkern here but I'm
+ -- pretty sure I've run into a case where it was needed so maybe
+ -- some day we need something more clever here.
+ --
+ if false then
+ -- a mark with kerning
+ local leftkern = pp.leftkern
+ if leftkern then
+ ox = px - pn.markx - leftkern
+ else
+ ox = px - pn.markx
+ end
else
ox = px - pn.markx
end
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index da21fa6d8..7d3e981fe 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 : 09/01/15 11:10:11
+-- merge date : 09/04/15 11:00:13
do -- begin closure to overcome local limits and interference
@@ -9496,6 +9496,22 @@ function otf.getmultiple(tfmdata,k,kind)
end
return { k }
end
+function otf.getkern(tfmdata,left,right,kind)
+ local kerns=getgsub(tfmdata,left,kind or "kern",true)
+ if kerns then
+ local found=kerns[right]
+ local kind=type(found)
+ if kind=="table" then
+ found=found[1][3]
+ elseif kind~="number" then
+ found=false
+ end
+ if found then
+ return found*tfmdata.parameters.factor
+ end
+ end
+ return 0
+end
end -- closure
@@ -10572,9 +10588,15 @@ local function inject_marks(marks,marki,nofmarks)
if pn.markdir<0 then
ox=px-pn.markx-rightkern
else
- local leftkern=pp.leftkern
- if leftkern then
- ox=px-pn.markx-leftkern
+
+
+ if false then
+ local leftkern=pp.leftkern
+ if leftkern then
+ ox=px-pn.markx-leftkern
+ else
+ ox=px-pn.markx
+ end
else
ox=px-pn.markx
end