diff options
author | Karl Berry <karl@freefriends.org> | 2016-11-22 22:50:16 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-11-22 22:50:16 +0000 |
commit | f476e2547d6f421f3f59e812adb855596f668eb5 (patch) | |
tree | 859e615afe313dc934f3ca679cd4ea760e356f98 /Master/texmf-dist/tex/latex/l3build | |
parent | 4061b69b7a85fc322821dbfc8beb83b498542e45 (diff) |
l3 (22nov16)
git-svn-id: svn://tug.org/texlive/trunk@42556 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 | 17 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3build/regression-test.tex | 13 |
2 files changed, 13 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua index f75a96959be..06f6942ace5 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 = "2016/10/19" -release_ver = "6730" +release_date = "2016/11/21" +release_ver = "6760" -- "module" is a deprecated function in Lua 5.2: as we want the name -- for other purposes, and it should eventually be 'free', simply @@ -792,19 +792,6 @@ function formatlog(logfile, newfile, engine) if checksearch then line = string.gsub(line, "%(.*/([%w-]+%.[%w-]+)%)?%s*$", "(../%1") end - -- Deal with the map line: some wrapping then a zap - if string.match(lastline, "*pdftex%.map") then - print("MAP ELONG") - line = lastline .. line - lastline = "" - end - if string.match(line, "%{[^%}]*pdftex%.map%}") then - if string.match(line, "pdftex%.map%}%s*%(") and - not string.match(line, "%)%s*$") then - return "", line - end - end - line = string.gsub(line, "%{[^%}]*/pdftex%.map%}", "") -- Deal with the fact that "(.aux)" may have still a leading space line = string.gsub(line, "^ %(%.aux%)", "(.aux)") -- Merge all of .fd data into one line so will be removed later diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex index 3d10ca5e1f8..ade132e225a 100644 --- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex +++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex @@ -166,7 +166,6 @@ \ifx#1\@undefined\LONGTYPEOUT{Undefined \string#1}\else \ifx#1\relax\LONGTYPEOUT{Relaxed \space\space\string#1}\else \LONGTYPEOUT{Defined \space\space\string#1}\fi\fi} -\OMIT \ifx\InputIfFileExists\@undefined \newread\@inputcheck \long\def\InputIfFileExists#1#2#3{% @@ -181,7 +180,17 @@ \fi \InputIfFileExists{regression-test.cfg} {\LONGTYPEOUT{^^J***^^Jregression-test.cfg in operation^^J***^^J}}{} -\TIMO +\ifdefined\pdfoutput + \ifnum\pdfoutput>0 % + \pdfmapfile{pdftex.map}% + \fi +\else + \ifdefined\outputmode + \ifnum\outputmode>0 % + \pdfextension mapfile{pdftex.map}% + \fi + \fi +\fi \newcount \gTESTint \def\SEPARATOR{% \TYPE{% |