From ba7a533d2793a7bc818793ee21435064706085b0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 May 2013 22:49:27 +0000 Subject: lualibs (9may13) git-svn-id: svn://tug.org/texlive/trunk@30350 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/lualibs/lualibs-basic-merged.lua | 2 +- .../tex/luatex/lualibs/lualibs-basic.lua | 53 ----- .../tex/luatex/lualibs/lualibs-extended-merged.lua | 2 +- .../tex/luatex/lualibs/lualibs-extended.lua | 53 ----- .../tex/luatex/lualibs/lualibs-util-fmt.lua | 76 +++++++ .../tex/luatex/lualibs/lualibs-util-mrg.lua | 228 --------------------- Master/texmf-dist/tex/luatex/lualibs/lualibs.lua | 73 +------ 7 files changed, 88 insertions(+), 399 deletions(-) create mode 100644 Master/texmf-dist/tex/luatex/lualibs/lualibs-util-fmt.lua delete mode 100644 Master/texmf-dist/tex/luatex/lualibs/lualibs-util-mrg.lua (limited to 'Master/texmf-dist/tex/luatex/lualibs') diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic-merged.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic-merged.lua index 2eb45011f43..19c148ca3e8 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic-merged.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic-merged.lua @@ -1,6 +1,6 @@ -- merged file : lualibs-basic-merged.lua -- parent file : lualibs-basic.lua --- merge date : Sun May 5 19:13:07 2013 +-- merge date : Thu May 9 16:30:14 2013 do -- begin closure to overcome local limits and interference diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic.lua index 25b2cec3ba1..4530756fdb8 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic.lua @@ -16,59 +16,6 @@ -- -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --- By default, \identifier{lualibs} will not load the libraries individually. --- Instead, it includes two \emphasis{merged packages} that have been compiled --- from the original files. --- This is achieved by means of \identifier{mtx-package}, a script for bundling --- \LUA code shipped with \CONTEXT. --- This concatenates the code of several \LUA files into a single file that is --- both easier to distribute and loading (marginally) faster. --- \identifier{mtx-package} ensures that the code from each file gets its --- own closure and strips newlines and comments, resulting in a smaller payload. --- Another package that relies on it heavily is the font loader as contained in --- \identifier{luaotfload} and \identifier{luatex-fonts}. --- --- If \CONTEXT is installed on the system, the merge files can be created --- by running: --- --- \begin{quote}\begin{verbatim} --- mtxrun --script package --merge lualibs-basic.lua --- mtxrun --script package --merge lualibs-extended.lua --- \end{verbatim}\end{quote} --- --- \noindent --- Of course there is a make target for that: --- --- \begin{quote}\begin{verbatim} --- make merge --- \end{verbatim}\end{quote} --- \noindent --- will take care of assembling the packages from the files distributed with --- \identifier{lualibs}. --- --- For this to work, the syntax of the \LUA file needs to be well-formed: --- files that should be merged must be included via a function --- \verb|loadmodule()|. --- It doesn’t matter if the function actually does something; a dummy will --- suffice. --- Also, the argument to \verb|loadmodule()| must be wrapped in parentheses. --- This rule is quite convenient, actually, since it allows excluding files --- from the merge while still using \verb|loadmodule()| consistently. --- --- \begin{quote}\begin{verbatim} --- ... --- loadmodule("my-lua-file.lua") -- <= will be merged --- loadmodule('my-2nd-file.lua') -- <= will be merged --- loadmodule "my-3rd-file.lua" -- <= will be ignored --- ... --- \end{verbatim}\end{quote} --- --- Note that there is one exception to the packaging: --- \fileent{lualibs-util-jsn.lua} cannot be successfully packaged because --- it follows a different coding convention, returning a \LUA table on exit. --- Therefore, the file is loaded separately as part of the \identifier{extended} --- set like any other \LUA module. --- -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua index 8f3d2542ac8..4df0eb6f9cd 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua @@ -1,6 +1,6 @@ -- merged file : lualibs-extended-merged.lua -- parent file : lualibs-extended.lua --- merge date : Sun May 5 19:13:07 2013 +-- merge date : Thu May 9 16:30:14 2013 do -- begin closure to overcome local limits and interference diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended.lua index 91020868fc8..edd0a215b56 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended.lua @@ -16,59 +16,6 @@ -- -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --- By default, \identifier{lualibs} will not load the libraries individually. --- Instead, it includes two \emphasis{merged packages} that have been compiled --- from the original files. --- This is achieved by means of \identifier{mtx-package}, a script for bundling --- \LUA code shipped with \CONTEXT. --- This concatenates the code of several \LUA files into a single file that is --- both easier to distribute and loading (marginally) faster. --- \identifier{mtx-package} ensures that the code from each file gets its --- own closure and strips newlines and comments, resulting in a smaller payload. --- Another package that relies on it heavily is the font loader as contained in --- \identifier{luaotfload} and \identifier{luatex-fonts}. --- --- If \CONTEXT is installed on the system, the merge files can be created --- by running: --- --- \begin{quote}\begin{verbatim} --- mtxrun --script package --merge lualibs-basic.lua --- mtxrun --script package --merge lualibs-extended.lua --- \end{verbatim}\end{quote} --- --- \noindent --- Of course there is a make target for that: --- --- \begin{quote}\begin{verbatim} --- make merge --- \end{verbatim}\end{quote} --- \noindent --- will take care of assembling the packages from the files distributed with --- \identifier{lualibs}. --- --- For this to work, the syntax of the \LUA file needs to be well-formed: --- files that should be merged must be included via a function --- \verb|loadmodule()|. --- It doesn’t matter if the function actually does something; a dummy will --- suffice. --- Also, the argument to \verb|loadmodule()| must be wrapped in parentheses. --- This rule is quite convenient, actually, since it allows excluding files --- from the merge while still using \verb|loadmodule()| consistently. --- --- \begin{quote}\begin{verbatim} --- ... --- loadmodule("my-lua-file.lua") -- <= will be merged --- loadmodule('my-2nd-file.lua') -- <= will be merged --- loadmodule "my-3rd-file.lua"-- -- <= will be ignored --- ... --- \end{verbatim}\end{quote} --- --- Note that there is one exception to the packaging: --- \fileent{lualibs-util-jsn.lua} cannot be successfully packaged because --- it follows a different coding convention, returning a \LUA table on exit. --- Therefore, the file is loaded separately as part of the \identifier{extended} --- set like any other \LUA module. --- -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-fmt.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-fmt.lua new file mode 100644 index 00000000000..371a5dfcece --- /dev/null +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-fmt.lua @@ -0,0 +1,76 @@ +if not modules then modules = { } end modules ['util-fmt'] = { + version = 1.001, + comment = "companion to luat-lib.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +utilities = utilities or { } +utilities.formatters = utilities.formatters or { } +local formatters = utilities.formatters + +local concat, format = table.concat, string.format +local tostring, type = tostring, type +local strip = string.strip + +local lpegmatch = lpeg.match +local stripper = lpeg.patterns.stripzeros + +function formatters.stripzeros(str) + return lpegmatch(stripper,str) +end + +function formatters.formatcolumns(result,between) + if result and #result > 0 then + between = between or " " + local widths, numbers = { }, { } + local first = result[1] + local n = #first + for i=1,n do + widths[i] = 0 + end + for i=1,#result do + local r = result[i] + for j=1,n do + local rj = r[j] + local tj = type(rj) + if tj == "number" then + numbers[j] = true + end + if tj ~= "string" then + rj = tostring(rj) + r[j] = rj + end + local w = #rj + if w > widths[j] then + widths[j] = w + end + end + end + for i=1,n do + local w = widths[i] + if numbers[i] then + if w > 80 then + widths[i] = "%s" .. between + else + widths[i] = "%0" .. w .. "i" .. between + end + else + if w > 80 then + widths[i] = "%s" .. between + elseif w > 0 then + widths[i] = "%-" .. w .. "s" .. between + else + widths[i] = "%s" + end + end + end + local template = strip(concat(widths)) + for i=1,#result do + local str = format(template,unpack(result[i])) + result[i] = strip(str) + end + end + return result +end diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-mrg.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-mrg.lua deleted file mode 100644 index 690188ef879..00000000000 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-mrg.lua +++ /dev/null @@ -1,228 +0,0 @@ -if not modules then modules = { } end modules ['util-mrg'] = { - version = 1.001, - comment = "companion to luat-lib.mkiv", - author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", - copyright = "PRAGMA ADE / ConTeXt Development Team", - license = "see context related readme files" -} - --- hm, quite unreadable - -local gsub, format = string.gsub, string.format -local concat = table.concat -local type, next = type, next - -local P, R, S, V, Ct, C, Cs, Cc, Cp, Cmt, Cb, Cg = lpeg.P, lpeg.R, lpeg.S, lpeg.V, lpeg.Ct, lpeg.C, lpeg.Cs, lpeg.Cc, lpeg.Cp, lpeg.Cmt, lpeg.Cb, lpeg.Cg -local lpegmatch, patterns = lpeg.match, lpeg.patterns - -utilities = utilities or { } -local merger = utilities.merger or { } -utilities.merger = merger -merger.strip_comment = true - -local report = logs.reporter("system","merge") -utilities.report = report - -local m_begin_merge = "begin library merge" -local m_end_merge = "end library merge" -local m_begin_closure = "do -- create closure to overcome 200 locals limit" -local m_end_closure = "end -- of closure" - -local m_pattern = - "%c+" .. - "%-%-%s+" .. m_begin_merge .. - "%c+(.-)%c+" .. - "%-%-%s+" .. m_end_merge .. - "%c+" - -local m_format = - "\n\n-- " .. m_begin_merge .. - "\n%s\n" .. - "-- " .. m_end_merge .. "\n\n" - -local m_faked = - "-- " .. "created merged file" .. "\n\n" .. - "-- " .. m_begin_merge .. "\n\n" .. - "-- " .. m_end_merge .. "\n\n" - -local m_report = [[ --- used libraries : %s --- skipped libraries : %s --- original bytes : %s --- stripped bytes : %s -]] - -local m_preloaded = [[package.loaded[%q] = package.loaded[%q] or true]] - -local function self_fake() - return m_faked -end - -local function self_nothing() - return "" -end - -local function self_load(name) - local data = io.loaddata(name) or "" - if data == "" then - report("unknown file %a",name) - else - report("inserting file %a",name) - end - return data or "" -end - --- -- saves some 20K .. scite comments --- data = gsub(data,"%-%-~[^\n\r]*[\r\n]","") --- -- saves some 20K .. ldx comments --- data = gsub(data,"%-%-%[%[ldx%-%-.-%-%-ldx%]%]%-%-","") - -local space = patterns.space -local eol = patterns.newline -local equals = P("=")^0 -local open = P("[") * Cg(equals,"init") * P("[") * P("\n")^-1 -local close = P("]") * C(equals) * P("]") -local closeeq = Cmt(close * Cb("init"), function(s,i,a,b) return a == b end) -local longstring = open * (1 - closeeq)^0 * close - -local quoted = patterns.quoted -local digit = patterns.digit -local emptyline = space^0 * eol -local operator1 = P("<=") + P(">=") + P("~=") + P("..") + S("/^<>=*+%%") -local operator2 = S("*+/") -local operator3 = S("-") -local operator4 = P("..") -local separator = S(",;") - -local ignore = (P("]") * space^1 * P("=") * space^1 * P("]")) / "]=[" + - (P("=") * space^1 * P("{")) / "={" + - (P("(") * space^1) / "(" + - (P("{") * (space+eol)^1 * P("}")) / "{}" -local strings = quoted -- / function (s) print("<<"..s..">>") return s end -local longcmt = (emptyline^0 * P("--") * longstring * emptyline^0) / "" -local longstr = longstring -local comment = emptyline^0 * P("--") * P("-")^0 * (1-eol)^0 * emptyline^1 / "\n" -local optionalspaces = space^0 / "" -local mandatespaces = space^1 / "" -local optionalspacing = (eol+space)^0 / "" -local mandatespacing = (eol+space)^1 / "" -local pack = digit * space^1 * operator4 * optionalspacing + - optionalspacing * operator1 * optionalspacing + - optionalspacing * operator2 * optionalspaces + - mandatespacing * operator3 * mandatespaces + - optionalspaces * separator * optionalspaces -local lines = emptyline^2 / "\n" -local spaces = (space * space) / " " ------ spaces = ((space+eol)^1 ) / " " - -local compact = Cs ( ( - ignore + - strings + - longcmt + - longstr + - comment + - pack + - lines + - spaces + - 1 -)^1 ) - -local strip = Cs((emptyline^2/"\n" + 1)^0) -local stripreturn = Cs((1-P("return") * space^1 * P(1-space-eol)^1 * (space+eol)^0 * P(-1))^1) - -function merger.compact(data) - return lpegmatch(strip,lpegmatch(compact,data)) -end - -local function self_compact(data) - local delta = 0 - if merger.strip_comment then - local before = #data - data = lpegmatch(compact,data) - data = lpegmatch(strip,data) -- also strips in longstrings ... alas - -- data = string.strip(data) - local after = #data - delta = before - after - report("original size %s, compacted to %s, stripped %s",before,after,delta) - data = format("-- original size: %s, stripped down to: %s\n\n%s",before,after,data) - end - return lpegmatch(stripreturn,data) or data, delta -end - -local function self_save(name, data) - if data ~= "" then - io.savedata(name,data) - report("saving %s with size %s",name,#data) - end -end - -local function self_swap(data,code) - return data ~= "" and (gsub(data,m_pattern, function() return format(m_format,code) end, 1)) or "" -end - -local function self_libs(libs,list) - local result, f, frozen, foundpath = { }, nil, false, nil - result[#result+1] = "\n" - if type(libs) == 'string' then libs = { libs } end - if type(list) == 'string' then list = { list } end - for i=1,#libs do - local lib = libs[i] - for j=1,#list do - local pth = gsub(list[j],"\\","/") -- file.clean_path - report("checking library path %a",pth) - local name = pth .. "/" .. lib - if lfs.isfile(name) then - foundpath = pth - end - end - if foundpath then break end - end - if foundpath then - report("using library path %a",foundpath) - local right, wrong, original, stripped = { }, { }, 0, 0 - for i=1,#libs do - local lib = libs[i] - local fullname = foundpath .. "/" .. lib - if lfs.isfile(fullname) then - report("using library %a",fullname) - local preloaded = file.nameonly(lib) - local data = io.loaddata(fullname,true) - original = original + #data - local data, delta = self_compact(data) - right[#right+1] = lib - result[#result+1] = m_begin_closure - result[#result+1] = format(m_preloaded,preloaded,preloaded) - result[#result+1] = data - result[#result+1] = m_end_closure - stripped = stripped + delta - else - report("skipping library %a",fullname) - wrong[#wrong+1] = lib - end - end - right = #right > 0 and concat(right," ") or "-" - wrong = #wrong > 0 and concat(wrong," ") or "-" - report("used libraries: %a",right) - report("skipped libraries: %a",wrong) - report("original bytes: %a",original) - report("stripped bytes: %a",stripped) - result[#result+1] = format(m_report,right,wrong,original,stripped) - else - report("no valid library path found") - end - return concat(result, "\n\n") -end - -function merger.selfcreate(libs,list,target) - if target then - self_save(target,self_swap(self_fake(),self_libs(libs,list))) - end -end - -function merger.selfmerge(name,libs,list,target) - self_save(target or name,self_swap(self_load(name),self_libs(libs,list))) -end - -function merger.selfclean(name) - self_save(name,self_swap(self_load(name),self_nothing())) -end diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua index c6f4d8a3963..ae498b20de5 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua @@ -16,59 +16,6 @@ -- -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --- By default, \identifier{lualibs} will not load the libraries individually. --- Instead, it includes two \emphasis{merged packages} that have been compiled --- from the original files. --- This is achieved by means of \identifier{mtx-package}, a script for bundling --- \LUA code shipped with \CONTEXT. --- This concatenates the code of several \LUA files into a single file that is --- both easier to distribute and loading (marginally) faster. --- \identifier{mtx-package} ensures that the code from each file gets its --- own closure and strips newlines and comments, resulting in a smaller payload. --- Another package that relies on it heavily is the font loader as contained in --- \identifier{luaotfload} and \identifier{luatex-fonts}. --- --- If \CONTEXT is installed on the system, the merge files can be created --- by running: --- --- \begin{quote}\begin{verbatim} --- mtxrun --script package --merge lualibs-basic.lua --- mtxrun --script package --merge lualibs-extended.lua --- \end{verbatim}\end{quote} --- --- \noindent --- Of course there is a make target for that: --- --- \begin{quote}\begin{verbatim} --- make merge --- \end{verbatim}\end{quote} --- \noindent --- will take care of assembling the packages from the files distributed with --- \identifier{lualibs}. --- --- For this to work, the syntax of the \LUA file needs to be well-formed: --- files that should be merged must be included via a function --- \verb|loadmodule()|. --- It doesn’t matter if the function actually does something; a dummy will --- suffice. --- Also, the argument to \verb|loadmodule()| must be wrapped in parentheses. --- This rule is quite convenient, actually, since it allows excluding files --- from the merge while still using \verb|loadmodule()| consistently. --- --- \begin{quote}\begin{verbatim} --- ... --- loadmodule("my-lua-file.lua") -- <= will be merged --- loadmodule('my-2nd-file.lua') -- <= will be merged --- loadmodule "my-3rd-file.lua" -- <= will be ignored --- ... --- \end{verbatim}\end{quote} --- --- Note that there is one exception to the packaging: --- \fileent{lualibs-util-jsn.lua} cannot be successfully packaged because --- it follows a different coding convention, returning a \LUA table on exit. --- Therefore, the file is loaded separately as part of the \identifier{extended} --- set like any other \LUA module. --- -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% lualibs = lualibs or { } @@ -87,13 +34,9 @@ lualibs.module_info = { config = config or { } config.lualibs = config.lualibs or { } -if config.lualibs.prefer_merged == nil then - lualibs.prefer_merged = true -end -if config.lualibs.load_extended == nil then - lualibs.load_extended = true -end -config.lualibs.verbose = config.lualibs.verbose == false +lualibs.prefer_merged = config.lualibs.prefer_merged or true +lualibs.load_extended = config.lualibs.load_extended or true +config.lualibs.verbose = config.lualibs.verbose or false local dofile = dofile @@ -141,13 +84,17 @@ end lualibs.loadmodule = loadmodule -if lualibs.basic_loaded ~= true then +if lualibs.basic_loaded ~= true +or config.lualibs.force_reload == true +then loadmodule"lualibs-basic.lua" loadmodule"lualibs-compat.lua" --- restore stuff gone since v1.* end -if lualibs.load_extended == true -and lualibs.extended_loaded ~= true then +if lualibs.load_extended == true +and lualibs.extended_loaded ~= true +or config.lualibs.force_reload == true +then loadmodule"lualibs-extended.lua" end -- cgit v1.2.3