summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-02-14 08:03:12 +0100
committerPhilipp Gesang <phg42.2a@gmail.com>2014-02-14 08:03:12 +0100
commit06f156fb85fd63147b1ed51fce1bfe497d088fdc (patch)
tree19ac148d8cb7a09f790db6db5bf1f58d1ea5db20
parent6184dd4e08a8af39f02ab6bc44f3b56835d5c390 (diff)
downloadluaotfload-06f156fb85fd63147b1ed51fce1bfe497d088fdc.tar.gz
[fontloader] sync with Context as of 2014-02-14
-rw-r--r--src/luaotfload-fontloader.lua11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/luaotfload-fontloader.lua b/src/luaotfload-fontloader.lua
index 8c31750..d475be6 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 : 02/07/14 00:57:35
+-- merge date : 02/13/14 11:27:58
do -- begin closure to overcome local limits and interference
@@ -82,6 +82,7 @@ function optionalrequire(...)
return result
end
end
+lua.mask=load([[τεχ = 1]]) and "utf" or "ascii"
end -- closure
@@ -172,9 +173,11 @@ patterns.spacer=spacer
patterns.whitespace=whitespace
patterns.nonspacer=nonspacer
patterns.nonwhitespace=nonwhitespace
-local stripper=spacer^0*C((spacer^0*nonspacer^1)^0)
+local stripper=spacer^0*C((spacer^0*nonspacer^1)^0)
+local fullstripper=whitespace^0*C((whitespace^0*nonwhitespace^1)^0)
local collapser=Cs(spacer^0/""*nonspacer^0*((spacer^0/" "*nonspacer^1)^0))
patterns.stripper=stripper
+patterns.fullstripper=fullstripper
patterns.collapser=collapser
patterns.lowercase=lowercase
patterns.uppercase=uppercase
@@ -754,11 +757,15 @@ function string.limit(str,n,sentinel)
end
end
local stripper=patterns.stripper
+local fullstripper=patterns.fullstripper
local collapser=patterns.collapser
local longtostring=patterns.longtostring
function string.strip(str)
return lpegmatch(stripper,str) or ""
end
+function string.fullstrip(str)
+ return lpegmatch(fullstripper,str) or ""
+end
function string.collapsespaces(str)
return lpegmatch(collapser,str) or ""
end