l3 (15sep14)

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

2 files changed, 13 insertions, 4 deletions

diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua
index 9e6bd7d8c59..3abb619392b 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 = "2014/08/25"
-release_ver  = "5378"
+release_date = "2014/09/15"
+release_ver  = "5423"
 
 -- "module" is a deprecated function in Lua 5.2: as we want the name
 -- for other purposes, and it should eventually be 'free', simply
@@ -129,6 +129,7 @@ end
 
 -- Other required settings
 checkruns   = checkruns   or 1
+packtdszip  = packtdszip  or false -- Not actually needed but clearer
 scriptname  = scriptname  or "build.lua" -- Script used in each directory
 typesetcmds = typesetcmds or ""
 
@@ -472,6 +473,10 @@ function formatlog (logfile, newfile)
     line = string.gsub (
         line, "cm, mm, dd, cc, bp, or sp", "cm, mm, dd, cc, nd, nc, bp, or sp"
       )
+    -- Normalise a case where a LuaTeX bug misprints \csname\endcsname
+    -- This comes before the normalisation of the appearance of 
+    -- \csname\endcsname in case we alter that!
+    line = string.gsub (line, "\\ycsnam\\rendcsnam", "\\csname\\endcsname")
     -- Normalise a case where fixing a TeX bug changes the message text
     line = string.gsub (line, "\\csname\\endcsname ", "\\csname\\endcsname")
     -- Zap "on line <num>" and replace with "on line ..."
@@ -646,7 +651,6 @@ help = help or function ()
     print " build save <name>           - save test log for <name> for all engines  "
     print " build save <name> <engine>  - save test log for <name> for <engine>     "
   end
-  print " build unpack                - extract packages                          "
   print ""
 end
 
@@ -817,7 +821,9 @@ function ctan (standalone)
       end
     end
     dirzip (tdsdir, bundle .. ".tds")
-    cp (bundle .. ".tds.zip", tdsdir, ctandir)
+    if packtdszip then
+      cp (bundle .. ".tds.zip", tdsdir, ctandir)
+    end
     dirzip (ctandir, bundle)
     cp (bundle .. ".zip", ctandir, ".")
   else
diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
index 83c29d157bc..660c8ff4a2a 100644
--- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex
+++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
@@ -55,6 +55,9 @@
 \errorcontextlines=-1 %
 \showboxbreadth=\maxdimen
 \showboxdepth=\maxdimen
+\def\loggingoutput{\tracingoutput1
+    \showboxbreadth\maxdimen\showboxdepth\maxdimen}
+
 \newlinechar=`\^^J
 \long\def\LONGTYPEOUT#1{%
   \begingroup