diff options
author | Hans Hagen <pragma@wxs.nl> | 2011-01-14 14:32:00 +0100 |
---|---|---|
committer | Hans Hagen <pragma@wxs.nl> | 2011-01-14 14:32:00 +0100 |
commit | 237091b7a4e3a7e2e6601cfe246dac4b4b1ff988 (patch) | |
tree | c4135682b1fd54c266d318ed406ef4bc9e0d629f /tex/generic | |
parent | 8980a62e6a345d2f2746bdca2d207d6cf78aab5f (diff) | |
download | context-237091b7a4e3a7e2e6601cfe246dac4b4b1ff988.tar.gz |
beta 2011.01.14 14:32
Diffstat (limited to 'tex/generic')
-rw-r--r-- | tex/generic/context/luatex-fonts-merged.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index 65f20d760..71ebb60fb 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 01/13/11 10:20:58 +-- merge date : 01/14/11 14:32:03 do -- begin closure to overcome local limits and interference @@ -173,9 +173,6 @@ local squote = P("'") local dquote = P('"') local space = P(" ") -patterns.somecontent = (anything - newline - space)^1 -patterns.beginline = #(1-newline) - local utfbom_32_be = P('\000\000\254\255') local utfbom_32_le = P('\255\254\000\000') local utfbom_16_be = P('\255\254') @@ -248,6 +245,9 @@ patterns.undouble = (dquote/"") * patterns.nodquote * (dquote/"") patterns.unquoted = patterns.undouble + patterns.unsingle -- more often undouble patterns.unspacer = ((patterns.spacer^1)/"")^0 +patterns.somecontent = (anything - newline - space)^1 -- (utf8char - newline - space)^1 +patterns.beginline = #(1-newline) + local unquoted = Cs(patterns.unquoted * endofstring) -- not C function string.unquoted(str) |