diff options
author | Marius <mariausol@gmail.com> | 2013-09-20 15:00:28 +0300 |
---|---|---|
committer | Marius <mariausol@gmail.com> | 2013-09-20 15:00:28 +0300 |
commit | df1ef72f7d17b4d6a0368ba1290e083b08280cc5 (patch) | |
tree | d78b63f738350b59fa7b0b792f6eccf19a8dd5e0 /tex/context/base/l-url.lua | |
parent | 5be028e9e8cad8e72967191716ba3974bb7832db (diff) | |
download | context-df1ef72f7d17b4d6a0368ba1290e083b08280cc5.tar.gz |
beta 2013.09.20 14:01
Diffstat (limited to 'tex/context/base/l-url.lua')
-rw-r--r-- | tex/context/base/l-url.lua | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tex/context/base/l-url.lua b/tex/context/base/l-url.lua index 4624a0507..7b7910fa7 100644 --- a/tex/context/base/l-url.lua +++ b/tex/context/base/l-url.lua @@ -79,12 +79,18 @@ setmetatable(escapes, { __index = function(t,k) return v end }) -local escaper = Cs((R("09","AZ","az")^1 + P(" ")/"%%20" + S("-./_")^1 + P(1) / escapes)^0) -- space happens most -local unescaper = Cs((escapedchar + 1)^0) +local escaper = Cs((R("09","AZ","az")^1 + P(" ")/"%%20" + S("-./_")^1 + P(1) / escapes)^0) -- space happens most +local unescaper = Cs((escapedchar + 1)^0) +local getcleaner = Cs((P("+++") / "%%2B" + P("+") / "%%20" + P(1))^1) -lpegpatterns.urlunescaped = escapedchar -lpegpatterns.urlescaper = escaper -lpegpatterns.urlunescaper = unescaper +lpegpatterns.urlunescaped = escapedchar +lpegpatterns.urlescaper = escaper +lpegpatterns.urlunescaper = unescaper +lpegpatterns.urlgetcleaner = getcleaner + +function url.unescapeget(str) + return lpegmatch(getcleaner,str) +end -- todo: reconsider Ct as we can as well have five return values (saves a table) -- so we can have two parsers, one with and one without |