summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2010-01-04 19:48:00 +0100
committerHans Hagen <pragma@wxs.nl>2010-01-04 19:48:00 +0100
commit20c4037f15e32fe45d05807514f75249d7d416e8 (patch)
tree95c8263be9c48adac48d89eabf6a24a2b6d883cc /tex/generic
parent19719774e5f0a521cb21bc09f26a8f82f4dab56c (diff)
downloadcontext-20c4037f15e32fe45d05807514f75249d7d416e8.tar.gz
beta 2010.01.04 19:48
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex-fonts-merged.lua11
1 files changed, 7 insertions, 4 deletions
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 6449817db..e6da53fad 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts.lua
--- merge date : 01/03/10 13:02:01
+-- merge date : 01/04/10 19:52:31
do -- begin closure to overcome local limits and interference
@@ -3810,7 +3810,7 @@ t.colorscheme = tfmtable.colorscheme
--~ end
local s = sharedkerns[vk]
if not s then
- local s = {}
+ s = { }
for k,v in next, vk do s[k] = v*hdelta end
sharedkerns[vk] = s
end
@@ -5380,7 +5380,7 @@ otf.features.default = otf.features.default or { }
otf.enhancers = otf.enhancers or { }
otf.glists = { "gsub", "gpos" }
-otf.version = 2.642 -- beware: also sync font-mis.lua
+otf.version = 2.643 -- beware: also sync font-mis.lua
otf.pack = true -- beware: also sync font-mis.lua
otf.syncspace = true
otf.notdef = false
@@ -5826,6 +5826,7 @@ otf.enhancers["analyse unicodes"] = function(data,filename)
end
local cidinfo, cidnames, cidcodes = data.cidinfo
local usedmap = cidinfo and cidinfo.usedname
+ usedmap = usedmap and lower(usedmap)
usedmap = usedmap and fonts.cid.map[usedmap]
if usedmap then
oparser = usedmap and fonts.map.make_name_parser(cidinfo.ordering)
@@ -5847,7 +5848,9 @@ otf.enhancers["analyse unicodes"] = function(data,filename)
local foundindex = lpegmatch(oparser,name)
if foundindex then
unicode = cidcodes[foundindex] -- name to number
- if not unicode then
+ if unicode then
+ originals[index], tounicode[index], ns = unicode, tounicode16(unicode), ns + 1
+ else
local reference = cidnames[foundindex] -- number to name
if reference then
local foundindex = lpegmatch(oparser,reference)