summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2019-07-04 13:50:48 +0200
committerContext Git Mirror Bot <phg@phi-gamma.net>2019-07-04 13:50:48 +0200
commit4bc28891615011ed3581836e9259434720e25830 (patch)
tree4a753013e7b1e5b83a76c2708939d40b13972240 /tex/generic
parent739710f590371de17ae0debb4dc38b0de270b9f3 (diff)
downloadcontext-4bc28891615011ed3581836e9259434720e25830.tar.gz
2019-07-04 12:36:00
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-basics-chr.lua4
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua13
2 files changed, 10 insertions, 7 deletions
diff --git a/tex/generic/context/luatex/luatex-basics-chr.lua b/tex/generic/context/luatex/luatex-basics-chr.lua
index 9036b2977..0ac0eab14 100644
--- a/tex/generic/context/luatex/luatex-basics-chr.lua
+++ b/tex/generic/context/luatex/luatex-basics-chr.lua
@@ -3614,6 +3614,6 @@ characters.indicgroups={
},
}
--- done
+-- done, uncomment for testing:
-return characters.indicgroups
+-- return characters.indicgroups
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b72b1a888..6bd9bbd59 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 : 06/20/19 18:47:00
+-- merge date : 07/04/19 12:29:22
do -- begin closure to overcome local limits and interference
@@ -977,9 +977,11 @@ function string.is_empty(str)
end
end
local anything=patterns.anything
-local allescapes=Cc("%")*S(".-+%?()[]*")
-local someescapes=Cc("%")*S(".-+%()[]")
-local matchescapes=Cc(".")*S("*?")
+local moreescapes=Cc("%")*S(".-+%?()[]*$^{}")
+local allescapes=Cc("%")*S(".-+%?()[]*")
+local someescapes=Cc("%")*S(".-+%()[]")
+local matchescapes=Cc(".")*S("*?")
+local pattern_m=Cs ((moreescapes+anything )^0 )
local pattern_a=Cs ((allescapes+anything )^0 )
local pattern_b=Cs ((someescapes+matchescapes+anything )^0 )
local pattern_c=Cs (Cc("^")*(someescapes+matchescapes+anything )^0*Cc("$") )
@@ -989,6 +991,8 @@ end
function string.topattern(str,lowercase,strict)
if str=="" or type(str)~="string" then
return ".*"
+ elseif strict=="all" then
+ str=lpegmatch(pattern_m,str)
elseif strict then
str=lpegmatch(pattern_c,str)
else
@@ -8591,7 +8595,6 @@ characters.indicgroups={
[43249]=true,
},
}
-return characters.indicgroups
end -- closure