diff options
| author | Philipp Gesang <phg42.2a@gmail.com> | 2014-05-15 20:15:30 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg42.2a@gmail.com> | 2014-05-15 20:15:30 +0200 |
| commit | dfffd3b6d1e0acc5d7bf11457debcc8506d199b4 (patch) | |
| tree | ed269200974b7fc482b3615470976890e3dbe909 /src | |
| parent | 60e5dfe5a271997fe530197bbd810862125fb795 (diff) | |
| download | luaotfload-dfffd3b6d1e0acc5d7bf11457debcc8506d199b4.tar.gz | |
[fontloader] sync with Context as of 2014-05-15
Diffstat (limited to 'src')
| -rw-r--r-- | src/luaotfload-fontloader.lua | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/luaotfload-fontloader.lua b/src/luaotfload-fontloader.lua index 381c5ca..51d861a 100644 --- a/src/luaotfload-fontloader.lua +++ b/src/luaotfload-fontloader.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 05/12/14 16:53:28 +-- merge date : 05/15/14 19:52:15 do -- begin closure to overcome local limits and interference @@ -125,7 +125,7 @@ local uppercase=R("AZ") local underscore=P("_") local hexdigit=digit+lowercase+uppercase local cr,lf,crlf=P("\r"),P("\n"),P("\r\n") -local newline=crlf+S("\r\n") +local newline=P("\r")*(P("\n")+P(true))+P("\n") local escaped=P("\\")*anything local squote=P("'") local dquote=P('"') @@ -147,8 +147,8 @@ patterns.utfbom_32_le=utfbom_32_le patterns.utfbom_16_be=utfbom_16_be patterns.utfbom_16_le=utfbom_16_le patterns.utfbom_8=utfbom_8 -patterns.utf_16_be_nl=P("\000\r\000\n")+P("\000\r")+P("\000\n") -patterns.utf_16_le_nl=P("\r\000\n\000")+P("\r\000")+P("\n\000") +patterns.utf_16_be_nl=P("\000\r\000\n")+P("\000\r")+P("\000\n") +patterns.utf_16_le_nl=P("\r\000\n\000")+P("\r\000")+P("\n\000") patterns.utf8one=R("\000\127") patterns.utf8two=R("\194\223")*utf8next patterns.utf8three=R("\224\239")*utf8next*utf8next @@ -4170,7 +4170,7 @@ function constructors.scale(tfmdata,specification) if changed then local c=changed[unicode] if c then -local ligatures=character.ligatures + local ligatures=character.ligatures description=descriptions[c] or descriptions[unicode] or character character=characters[c] or character index=description.index or c @@ -4182,9 +4182,9 @@ local ligatures=character.ligatures touni=tounicode[i] end end -if ligatures and not character.ligatures then - character.ligatures=ligatures -end + if ligatures and not character.ligatures then + character.ligatures=ligatures + end else description=descriptions[unicode] or character index=description.index or unicode |