diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2016-01-22 00:51:55 +0100 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2016-01-22 00:51:55 +0100 |
| commit | 7b982d37f58b36e8d8dd2580893e89430c576ca9 (patch) | |
| tree | f3f5944bace136a2c878c82fd2bc882fc9a5ce42 /src/fontloader/runtime/fontloader-reference.lua | |
| parent | 07cc29d8658360e9e6ddecf7f251e518b9ea99c9 (diff) | |
| parent | 55799dad5b8a2716aea1cfee28b4ce093e587f8a (diff) | |
| download | luaotfload-7b982d37f58b36e8d8dd2580893e89430c576ca9.tar.gz | |
Merge pull request #320 from phi-gamma/master
fixes
Diffstat (limited to 'src/fontloader/runtime/fontloader-reference.lua')
| -rw-r--r-- | src/fontloader/runtime/fontloader-reference.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fontloader/runtime/fontloader-reference.lua b/src/fontloader/runtime/fontloader-reference.lua index 9208e52..b135c44 100644 --- a/src/fontloader/runtime/fontloader-reference.lua +++ b/src/fontloader/runtime/fontloader-reference.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 12/22/15 10:50:54 +-- merge date : 01/08/16 19:09:31 do -- begin closure to overcome local limits and interference @@ -144,7 +144,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=P("\r")*(P("\n")+P(true))+P("\n") +local newline=P("\r")*(P("\n")+P(true))+P("\n") local escaped=P("\\")*anything local squote=P("'") local dquote=P('"') @@ -9571,6 +9571,8 @@ otf.coverup={ multiple=justset, ligature=justset, kern=justset, + chainsubstitution=justset, + chainposition=justset, }, register=function(coverage,lookuptype,format,feature,n,descriptions,resources) local name=formatters["ctx_%s_%s_%s"](feature,lookuptype,n) |