diff options
author | Karl Berry <karl@freefriends.org> | 2015-09-06 23:19:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-09-06 23:19:17 +0000 |
commit | 3cb4e75696df6c7abebf17fbc606ca86dcdfb520 (patch) | |
tree | 729978e0726cdb9d9f34a3d2e249c71a82e07f97 /Master/texmf-dist/tex/latex/l3build | |
parent | 32f50b97c2ae44e93225d1024afab9727fc02e00 (diff) |
l3 (6sep15)
git-svn-id: svn://tug.org/texlive/trunk@38305 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3build')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3build/l3build.lua | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua index c939faf11e6..62728f04072 100644 --- a/Master/texmf-dist/tex/latex/l3build/l3build.lua +++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua @@ -17,8 +17,8 @@ --]] -- Version information: should be identical to that in l3build.dtx -release_date = "2015/08/18" -release_ver = "5866" +release_date = "2015/09/06" +release_ver = "5925" -- "module" is a deprecated function in Lua 5.2: as we want the name -- for other purposes, and it should eventually be 'free', simply @@ -372,7 +372,7 @@ end -- Support items are defined here for cases where a single string can cover -- both Windows and Unix cases: more complex situations are handled inside -- the support functions -if string.sub(package.config, 1, 1) == "\\" then +if os.type == "windows" then os_concat = "&" os_diffext = ".fc" os_diffexe = "fc /n" @@ -583,7 +583,7 @@ function checkinit() for _,i in ipairs(filelist(localdir)) do cp(i, localdir, testdir) end - bundleunpack() + bundleunpack({".", testfiledir}) for _,i in ipairs(installfiles) do cp(i, unpackdir, testdir) end @@ -722,6 +722,11 @@ function formatlog(logfile, newfile, engine) end -- Zap map loading of map line = string.gsub(line, "%{[%w/%-]*/pdftex%.map%}", "") + -- Merge all of .fd data into one line so will be removed later + if string.match(line, "^%([%.%/%w]+%.fd[^%)]*$") then + lastline = (lastline or "") .. line + return "" + end -- TeX90/XeTeX knows only the smaller set of dimension units line = string.gsub( line, "cm, mm, dd, cc, bp, or sp", "cm, mm, dd, cc, nd, nc, bp, or sp" @@ -979,6 +984,12 @@ function runtest(name, engine, hide, ext) else format = "" end + -- Special casing for e-LaTeX format + if + string.match(checkformat, "^latex$") and + string.match(engine, "^etex$") then + format = " -fmt=latex" + end -- Special casing for (u)pTeX LaTeX formats if string.match(checkformat, "^latex$") and @@ -1197,7 +1208,7 @@ function check(names) print("Duplicate test file: " .. i) return 1 else - table.insert(stripext(i)) + table.insert(names, stripext(i)) end end end @@ -1503,11 +1514,13 @@ end -- Split off from the main unpack so it can be used on a bundle and not -- leave only one modules files -bundleunpack = bundleunpack or function() +bundleunpack = bundleunpack or function(sourcedir) mkdir(localdir) cleandir(unpackdir) - for _,i in ipairs(sourcefiles) do - cp(i, ".", unpackdir) + for _,i in ipairs(sourcedir or {"."}) do + for _,j in ipairs(sourcefiles) do + cp(j, i, unpackdir) + end end for _,i in ipairs(unpacksuppfiles) do cp(i, supportdir, localdir) |