lualibs (2dec15)

git-svn-id: svn://tug.org/texlive/trunk@38998 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 27 insertions, 37 deletions

diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-md5.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-md5.lua
index 8ac20a5a5fb..00272c873f1 100644
--- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-md5.lua
+++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-md5.lua
@@ -19,48 +19,38 @@ if not md5 then
 end
 
 local md5, file = md5, file
-local gsub, format, byte = string.gsub, string.format, string.byte
-local md5sum = md5.sum
+local gsub = string.gsub
 
-local function convert(str,fmt)
-    return (gsub(md5sum(str),".",function(chr) return format(fmt,byte(chr)) end))
-end
-
-if not md5.HEX then function md5.HEX(str) return convert(str,"%02X") end end
-if not md5.hex then function md5.hex(str) return convert(str,"%02x") end end
-if not md5.dec then function md5.dec(str) return convert(str,"%03i") end end
-
--- local P, Cs, lpegmatch = lpeg.P, lpeg.Cs,lpeg.match
---
--- if not md5.HEX then
---     local function remap(chr) return format("%02X",byte(chr)) end
---     function md5.HEX(str) return (gsub(md5.sum(str),".",remap)) end
--- end
+-- local gsub, format, byte = string.gsub, string.format, string.byte
 --
--- if not md5.hex then
---     local function remap(chr) return format("%02x",byte(chr)) end
---     function md5.hex(str) return (gsub(md5.sum(str),".",remap)) end
+-- local function convert(str,fmt)
+--     return (gsub(md5sum(str),".",function(chr) return format(fmt,byte(chr)) end))
 -- end
 --
--- if not md5.dec then
---     local function remap(chr) return format("%03i",byte(chr)) end
---     function md5.dec(str) return (gsub(md5.sum(str),".",remap)) end
--- end
+-- if not md5.HEX then function md5.HEX(str) return convert(str,"%02X") end end
+-- if not md5.hex then function md5.hex(str) return convert(str,"%02x") end end
+-- if not md5.dec then function md5.dec(str) return convert(str,"%03i") end end
 
--- if not md5.HEX then
---     local pattern_HEX = Cs( ( P(1) / function(chr) return format("%02X",byte(chr)) end)^0 )
---     function md5.HEX(str) return lpegmatch(pattern_HEX,md5.sum(str)) end
--- end
---
--- if not md5.hex then
---     local pattern_hex = Cs( ( P(1) / function(chr) return format("%02x",byte(chr)) end)^0 )
---     function md5.hex(str) return lpegmatch(pattern_hex,md5.sum(str)) end
--- end
---
--- if not md5.dec then
---     local pattern_dec = Cs( ( P(1) / function(chr) return format("%02i",byte(chr)) end)^0 )
---     function md5.dec(str) return lpegmatch(pattern_dec,md5.sum(str)) end
--- end
+do
+
+    local patterns = lpeg and lpeg.patterns
+
+    if patterns then
+
+        local bytestoHEX = patterns.bytestoHEX
+        local bytestohex = patterns.bytestohex
+        local bytestodec = patterns.bytestodec
+
+        local lpegmatch = lpeg.match
+        local md5sum    = md5.sum
+
+        if not md5.HEX then function md5.HEX(str) if str then return lpegmatch(bytestoHEX,md5sum(str)) end end end
+        if not md5.hex then function md5.hex(str) if str then return lpegmatch(bytestohex,md5sum(str)) end end end
+        if not md5.dec then function md5.dec(str) if str then return lpegmatch(bytestodec,md5sum(str)) end end end
+
+    end
+
+end
 
 function file.needsupdating(oldname,newname,threshold) -- size modification access change
     local oldtime = lfs.attributes(oldname,"modification")