summaryrefslogtreecommitdiff
path: root/tex/generic/context
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2018-10-03 16:44:19 +0200
committerContext Git Mirror Bot <phg@phi-gamma.net>2018-10-03 16:44:19 +0200
commit753dd0cbafc567d4960c5fc4888ccb4e2302c64d (patch)
tree6fe5c8e25d597f535b4c7d6b6d254445f79a1e6d /tex/generic/context
parent551c89289d267c2d8901f3375e57ed1fe2508de5 (diff)
downloadcontext-753dd0cbafc567d4960c5fc4888ccb4e2302c64d.tar.gz
2018-10-03 16:11:00
Diffstat (limited to 'tex/generic/context')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua14
1 files changed, 11 insertions, 3 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index ccf6d3a7c..adc2c6202 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 10/02/18 23:17:57
+-- merge date : 10/03/18 16:02:19
do -- begin closure to overcome local limits and interference
@@ -306,10 +306,18 @@ function lpeg.instringchecker(p)
end
end
function lpeg.splitter(pattern,action)
- return (((1-P(pattern))^1)/action+1)^0
+ if action then
+ return (((1-P(pattern))^1)/action+1)^0
+ else
+ return (Cs((1-P(pattern))^1)+1)^0
+ end
end
function lpeg.tsplitter(pattern,action)
- return Ct((((1-P(pattern))^1)/action+1)^0)
+ if action then
+ return Ct((((1-P(pattern))^1)/action+1)^0)
+ else
+ return Ct((Cs((1-P(pattern))^1)+1)^0)
+ end
end
local splitters_s,splitters_m,splitters_t={},{},{}
local function splitat(separator,single)