summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2012-10-06 17:00:14 +0300
committerMarius <mariausol@gmail.com>2012-10-06 17:00:14 +0300
commitf5507b17b30a20c0e3c279291ce448b7886e3b0c (patch)
tree77ba7cf932694debf45cd6235bf100ffcd83789a /tex/generic
parente420836b84231f486ddaa65089ed3fde00372699 (diff)
downloadcontext-f5507b17b30a20c0e3c279291ce448b7886e3b0c.tar.gz
beta 2012.10.06 15:31
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua20
1 files changed, 11 insertions, 9 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 37b52d9fc..c2719a495 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 : 10/06/12 14:55:25
+-- merge date : 10/06/12 15:31:31
do -- begin closure to overcome local limits and interference
@@ -9206,16 +9206,18 @@ end
-- iteration this becomes a KAF-LAM-ALEF with a SHADDA on the second and a FATHA on the
-- third component.
-local function getcomponentindex(start) -- so we cannot remove components !
- local i = 0
- if start.subtype == ligature_code then
- local comp = start.components
- while comp do
- i = i + getcomponentindex(comp)
- comp = comp.next
+local function getcomponentindex(start)
+ if start.id ~= glyph_code then
+ return 0
+ elseif start.subtype == ligature_code then
+ local i = 0
+ local components = start.components
+ while components do
+ i = i + getcomponentindex(components)
+ components = components.next
end
return i
- elseif not marks[start.char] then
+ elseif not marks[start.char] then
return 1
else
return 0