diff options
| author | Marius <mariausol@gmail.com> | 2011-05-19 06:40:13 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2011-05-19 06:40:13 +0300 |
| commit | b17f22aa285224dcf5b1dbccd795bc73b9a16426 (patch) | |
| tree | 22984b597d5aacec58ceaf1cd7138c8bb1a5c892 /scripts/context/lua | |
| parent | b714ce8e20b324368a7ab233be6fa9a0e50befa4 (diff) | |
| download | context-b17f22aa285224dcf5b1dbccd795bc73b9a16426.tar.gz | |
beta 2011.05.18 22:26
Diffstat (limited to 'scripts/context/lua')
| -rw-r--r-- | scripts/context/lua/mtx-epub.lua | 2 | ||||
| -rw-r--r-- | scripts/context/lua/mtxrun.lua | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/scripts/context/lua/mtx-epub.lua b/scripts/context/lua/mtx-epub.lua index 70ee7828c..b047d4d16 100644 --- a/scripts/context/lua/mtx-epub.lua +++ b/scripts/context/lua/mtx-epub.lua @@ -92,7 +92,7 @@ local mimetypes = { local idmakers = { ncx = function(filename) return "ncx" end, -- css = function(filename) return "stylesheet" end, - default = function(filename) return dubmid(filename) end, + default = function(filename) return dumbid(filename) end, } -- specification = { diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index cc5ebb478..23a957f92 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -675,6 +675,7 @@ local type, next, tostring, tonumber, ipairs, table, string = type, next, tostri local concat, sort, insert, remove = table.concat, table.sort, table.insert, table.remove local format, find, gsub, lower, dump, match = string.format, string.find, string.gsub, string.lower, string.dump, string.match local getmetatable, setmetatable = getmetatable, setmetatable +local getinfo = debug.getinfo -- Starting with version 5.2 Lua no longer provide ipairs, which makes -- sense. As we already used the for loop and # in most places the @@ -1022,6 +1023,8 @@ end -- problem: there no good number_to_string converter with the best resolution +local function dummy() end + local function do_serialize(root,name,depth,level,indexed) if level > 0 then depth = depth .. " " @@ -1214,19 +1217,20 @@ local function do_serialize(root,name,depth,level,indexed) end elseif t == "function" then if functions then + local f = getinfo(v).what == "C" and dump(dummy) or dump(v) + -- local f = getinfo(v).what == "C" and dump(function(...) return v(...) end) or dump(v) if tk == "number" then -- or find(k,"^%d+$") then if hexify then - handle(format("%s [0x%04X]=loadstring(%q),",depth,k,dump(v))) + handle(format("%s [0x%04X]=loadstring(%q),",depth,k,f)) else - handle(format("%s [%s]=loadstring(%q),",depth,k,dump(v))) + handle(format("%s [%s]=loadstring(%q),",depth,k,f)) end elseif tk == "boolean" then - handle(format("%s [%s]=loadstring(%q),",depth,tostring(k),dump(v))) + handle(format("%s [%s]=loadstring(%q),",depth,tostring(k),f)) elseif noquotes and not reserved[k] and find(k,"^%a[%w%_]*$") then - handle(format("%s %s=loadstring(%q),",depth,k,dump(v))) + handle(format("%s %s=loadstring(%q),",depth,k,f)) else - -- handle(format("%s [%q]=loadstring(%q),",depth,k,dump(v))) - handle(format("%s [%q]=loadstring(%q),",depth,k,debug.getinfo(v).what == "C" and "C code" or dump(v))) + handle(format("%s [%q]=loadstring(%q),",depth,k,f)) end end else |