diff options
| author | Marius <mariausol@gmail.com> | 2013-05-27 10:20:22 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2013-05-27 10:20:22 +0300 |
| commit | 6b2f7c5fd7a3e465f4e2662b1e5bd2c9d5cce8f8 (patch) | |
| tree | ea2c6131288b8e0f494e6cc695ec6a3f6733a07f /tex/generic | |
| parent | a61813ccdd4b7bcc81932317e1360fda6c79962d (diff) | |
| download | context-6b2f7c5fd7a3e465f4e2662b1e5bd2c9d5cce8f8.tar.gz | |
stable 2013.05.27 09:10
Diffstat (limited to 'tex/generic')
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 5789db6c8..6813389a9 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 : 05/22/13 19:28:51 +-- merge date : 05/27/13 09:05:55 do -- begin closure to overcome local limits and interference @@ -4691,9 +4691,9 @@ mappings.makenameparser=makenameparser mappings.tounicode16=tounicode16 mappings.tounicode16sequence=tounicode16sequence mappings.fromunicode16=fromunicode16 -local separator=S("_.") -local other=C((1-separator)^1) -local ligsplitter=Ct(other*(separator*other)^0) +local ligseparator=P("_") +local varseparator=P(".") +local namesplitter=Ct(C((1-ligseparator-varseparator)^1)*(ligseparator*C((1-ligseparator-varseparator)^1))^0) function mappings.addtounicode(data,filename) local resources=data.resources local properties=data.properties @@ -4778,11 +4778,11 @@ function mappings.addtounicode(data,filename) end end if not unicode or unicode=="" then - local split=lpegmatch(ligsplitter,name) - local nplit=split and #split or 0 - if nplit>=2 then + local split=lpegmatch(namesplitter,name) + local nsplit=split and #split or 0 + if nsplit>=2 then local t,n={},0 - for l=1,nplit do + for l=1,nsplit do local base=split[l] local u=unicodes[base] or unicodevector[base] if not u then |