beta 2009.05.28 11:23

1 files changed, 28 insertions, 26 deletions

diff --git a/tex/context/base/l-url.lua b/tex/context/base/l-url.lua
index 3bb2b1f11..097c94467 100644
--- a/tex/context/base/l-url.lua
+++ b/tex/context/base/l-url.lua
@@ -1,10 +1,13 @@
--- filename : l-url.lua
--- author   : Hans Hagen, PRAGMA-ADE, Hasselt NL
--- copyright: PRAGMA ADE / ConTeXt Development Team
--- license  : see context related readme files
+if not modules then modules = { } end modules ['l-url'] = {
+    version   = 1.001,
+    comment   = "companion to luat-lib.tex",
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files"
+}
 
-if not versions then versions = { } end versions['l-url'] = 1.001
-if not url      then url      = { } end
+local char, gmatch = string.char, string.gmatch
+local tonumber, type = tonumber, type
 
 -- from the spec (on the web):
 --
@@ -16,29 +19,28 @@ if not url      then url      = { } end
 --     / \ /                        \
 --     urn:example:animal:ferret:nose
 
-do
+url = url or { }
 
-    local function tochar(s)
-        return string.char(tonumber(s,16))
-    end
+local function tochar(s)
+    return char(tonumber(s,16))
+end
 
-    local colon, qmark, hash, slash, percent, endofstring = lpeg.P(":"), lpeg.P("?"), lpeg.P("#"), lpeg.P("/"), lpeg.P("%"), lpeg.P(-1)
+local colon, qmark, hash, slash, percent, endofstring = lpeg.P(":"), lpeg.P("?"), lpeg.P("#"), lpeg.P("/"), lpeg.P("%"), lpeg.P(-1)
 
-    local hexdigit  = lpeg.R("09","AF","af")
-    local escaped   = percent * lpeg.C(hexdigit * hexdigit) / tochar
+local hexdigit  = lpeg.R("09","AF","af")
+local plus      = lpeg.P("+")
+local escaped   = (plus / " ") + (percent * lpeg.C(hexdigit * hexdigit) / tochar)
 
-    local scheme    =                 lpeg.Cs((escaped+(1-colon-slash-qmark-hash))^0) * colon + lpeg.Cc("")
-    local authority = slash * slash * lpeg.Cs((escaped+(1-      slash-qmark-hash))^0)         + lpeg.Cc("")
-    local path      = slash *         lpeg.Cs((escaped+(1-            qmark-hash))^0)         + lpeg.Cc("")
-    local query     = qmark         * lpeg.Cs((escaped+(1-                  hash))^0)         + lpeg.Cc("")
-    local fragment  = hash          * lpeg.Cs((escaped+(1-           endofstring))^0)         + lpeg.Cc("")
+local scheme    =                 lpeg.Cs((escaped+(1-colon-slash-qmark-hash))^0) * colon + lpeg.Cc("")
+local authority = slash * slash * lpeg.Cs((escaped+(1-      slash-qmark-hash))^0)         + lpeg.Cc("")
+local path      = slash *         lpeg.Cs((escaped+(1-            qmark-hash))^0)         + lpeg.Cc("")
+local query     = qmark         * lpeg.Cs((escaped+(1-                  hash))^0)         + lpeg.Cc("")
+local fragment  = hash          * lpeg.Cs((escaped+(1-           endofstring))^0)         + lpeg.Cc("")
 
-    local parser = lpeg.Ct(scheme * authority * path * query * fragment)
-
-    function url.split(str)
-        return (type(str) == "string" and parser:match(str)) or str
-    end
+local parser = lpeg.Ct(scheme * authority * path * query * fragment)
 
+function url.split(str)
+    return (type(str) == "string" and parser:match(str)) or str
 end
 
 function url.hashed(str)
@@ -61,7 +63,7 @@ end
 function url.query(str)
     if type(str) == "string" then
         local t = { }
-        for k, v in str:gmatch("([^&=]*)=([^&=]*)") do
+        for k, v in gmatch(str,"([^&=]*)=([^&=]*)") do
             t[k] = v
         end
         return t
@@ -76,12 +78,12 @@ end
 --~ print(url.filename("file:///etc/test.txt"))
 --~ print(url.filename("/oeps.txt"))
 
---  from the spec on the web (sort of):
+--~ from the spec on the web (sort of):
 --~
 --~ function test(str)
 --~     print(table.serialize(url.hashed(str)))
 --~ end
----~
+--~
 --~ test("%56pass%20words")
 --~ test("file:///c:/oeps.txt")
 --~ test("file:///c|/oeps.txt")