l3build (25jun17)

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

1 files changed, 58 insertions, 113 deletions

diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
index b11581fae21..eae274e09f6 100644
--- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex
+++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
@@ -18,10 +18,15 @@
 %% This file is part of the "l3build bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
 %% 
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname eTeXversion\endcsname\relax
+  \errmessage{e-TeX is required to use regression-test.tex}%
+  \expandafter\endinput
+\fi
 \ifx\unprotect\undefined
   \expandafter\edef\csname reset\string @catcodes\endcsname{%
     \catcode`\noexpand\@=\the\catcode`\@\relax
-  }
+  }%
   \catcode`\@=11 %
 \else
   \unprotect
@@ -31,8 +36,11 @@
 \errorcontextlines=-1 %
 \showboxbreadth=\maxdimen
 \showboxdepth=\maxdimen
-\def\loggingoutput{\tracingoutput1
-    \showboxbreadth\maxdimen\showboxdepth\maxdimen}
+\def\loggingoutput{%
+  \tracingoutput=1 %
+  \showboxbreadth=\maxdimen
+  \showboxdepth=\maxdimen
+}
 \newlinechar=`\^^J
 \long\def\LONGTYPEOUT#1{%
   \begingroup
@@ -42,146 +50,71 @@
 }
 \let\TYPE\LONGTYPEOUT
 \def\STARTMESSAGE{This is a generated file for the l3build validation system.}
-\def\START{\LONGTYPEOUT{^^JSTART-TEST-LOG^^J^^J%
-   \STARTMESSAGE%
-^^J^^JDon't change this file in any respect.%
-^^J^^J}}
-\begingroup
-\catcode`\^^\=0
-\catcode`\^^A=\catcode`\%
-^^\catcode`^^\ =11
-^^\catcode`^^\%=11
-^^\catcode`^^\#=11
-^^\catcode`^^\~=11
-^^\endlinechar=`^^\^^J
-^^\catcode`^^\\=11^^A
-^^\gdef^^\CTable{
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
-}^^A
-^^\endgroup{}%
+\def\START{%
+  \LONGTYPEOUT{^^JSTART-TEST-LOG^^J}%
+  \LONGTYPEOUT{^^J%
+     \STARTMESSAGE%
+     ^^J^^JDon't change this file in any respect.%
+     ^^J^^J%
+  }%
+}
 \ifx\@@end\@undefined
   \let\@@@end\end
 \else
   \let\@@@end\@@end
 \fi
-\def\END
-  {%
-    \ifx\currentiflevel\@undefined\else
-      \ifnum\currentgrouplevel>0 %
-        \LONGTYPEOUT{Bad grouping: \the\currentgrouplevel!}%
-      \fi
-      \ifnum\currentiflevel>2 %
-        \LONGTYPEOUT{Bad conditionals: \the\numexpr\currentiflevel-2!}%
-      \fi
-    \fi
-    \LONGTYPEOUT{^^JEND-TEST-LOG^^J}\@@@end
-  }
+\def\END{%
+  \ifnum\currentgrouplevel>0 %
+    \LONGTYPEOUT{Bad grouping: \the\currentgrouplevel!}%
+  \fi
+  \ifnum\currentiflevel>2 %
+    \LONGTYPEOUT{Bad conditionals: \the\numexpr\currentiflevel-2!}%
+  \fi
+  \LONGTYPEOUT{^^JEND-TEST-LOG^^J}%
+  \@@@end
+}
 \ifx\@@end\@undefined
   \let\end\END
 \else
   \let\@@end\END
 \fi
-\def\FORMAT#1{\LONGTYPEOUT{Format: #1}%
-  \def\@tempa{#1}\ifx\@tempa\@EJ\else
-   \OMIT\TYPE{WARNING: Declared format #1,^^JActual format \@EJ}\TIMO\fi}
-\edef\@EJ{\fmtname <\fmtversion>}
-\def\AUTHOR#1{\LONGTYPEOUT{Author: #1}}
 \def\OMIT{\LONGTYPEOUT{OMIT}}
 \def\TIMO{\LONGTYPEOUT{TIMO}}
-\def\CLASS{\@ifnextchar[\OPTCLASS\XCLASS}
-\def\OPTCLASS[#1]#2{%
-  \TYPE{Main Class: #2^^J\space\space\space\space Options: #1}}
-\def\XCLASS#1{%
-  \TYPE{Main Class: #1}}
-\def\PACKAGE{\@ifnextchar[\OPTPACKAGE\XPACKAGE}
-\def\OPTPACKAGE[#1]#2{%
-  \TYPE{Package: #2^^J\space\space\space\space Options: #1}}
-\def\XPACKAGE#1{%
-  \TYPE{Package: #1}}
-\ifx\@ifnextchar\@undefined
-\long\def\@ifnextchar#1#2#3{%
-  \let\reserved@d=#1%
-  \def\reserved@a{#2}%
-  \def\reserved@b{#3}%
-  \futurelet\@let@token\@ifnch}
-\def\@ifnch{%
-  \ifx\@let@token\@sptoken
-    \let\reserved@c\@xifnch
-  \else
-    \ifx\@let@token\reserved@d
-      \let\reserved@c\reserved@a
+\ifx\InputIfFileExists\@undefined
+  \newread\@inputcheck
+  \long\def\InputIfFileExists#1#2#3{%
+    \openin\@inputcheck#1\relax
+    \ifeof\@inputcheck
+      \def\reserved@a{#3}%
     \else
-      \let\reserved@c\reserved@b
+      \def\reserved@a{#2\input #1\relax}%
     \fi
-  \fi
-  \reserved@c}
-\def\:{\let\@sptoken= } \: % this makes \@sptoken a space token
-\def\:{\@xifnch} \expandafter\def\: {\futurelet\@let@token\@ifnch}
-\fi
-\def\CHECKCOMMAND#1{%
-  \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}
-\ifx\InputIfFileExists\@undefined
-\newread\@inputcheck
-\long\def\InputIfFileExists#1#2#3{%
-  \openin\@inputcheck#1\relax
-  \ifeof\@inputcheck
-    \def\reserved@a{#3}%
-  \else
-    \def\reserved@a{#2\input #1\relax}%
-  \fi
-  \closein\@inputcheck
-  \reserved@a}
+    \closein\@inputcheck
+    \reserved@a
+  }%
 \fi
 \InputIfFileExists{regression-test.cfg}
-      {\LONGTYPEOUT{^^J***^^Jregression-test.cfg in operation^^J***^^J}}{}
-\ifdefined\pdfoutput
-  \ifnum\pdfoutput>0 %
-    \pdfmapfile{pdftex.map}%
-  \fi
-\else
-  \ifdefined\outputmode
-  \ifnum\outputmode>0 %
-    \pdfextension mapfile{pdftex.map}%
-  \fi
-  \fi
-\fi
-\newcount \gTESTint
+  {\LONGTYPEOUT{^^J***^^Jregression-test.cfg in operation^^J***^^J}}{}
+\newcount\gTESTint
 \def\SEPARATOR{%
   \TYPE{%
     ============================================================%
   }%
 }
 \long\def\TEST#1#2{%
-  \advance \gTESTint 1 %
+  \global\advance\gTESTint by 1 %
   \SEPARATOR
-  \LONGTYPEOUT{%
-    TEST \the\gTESTint: \detokenize{#1}}%
+  \LONGTYPEOUT{TEST \the\gTESTint: \detokenize{#1}}%
   \SEPARATOR
   \begingroup
     \let\TYPE\LONGTYPEOUT
     #2%
   \endgroup
-  \SEPARATOR \LONGTYPEOUT{}%
+  \SEPARATOR
+  \LONGTYPEOUT{}%
 }
 \long\def\TESTEXP#1#2{%
-  \advance \gTESTint 1 %
+  \global\advance\gTESTint by 1 %
   \SEPARATOR
   \LONGTYPEOUT{%
     TEST \the\gTESTint: \detokenize{#1}}%
@@ -198,6 +131,18 @@
 \def \YES   {\TYPE{YES}}
 \def \NO    {\TYPE{NO}}
 \def \NEWLINE {\TYPE{^^J}}
+\ifx\pdfoutput\@undefined
+  \ifx\outputmode\@undefined
+  \else
+    \ifnum\outputmode>0 %
+      \pdfextension mapfile{pdftex.map}%
+    \fi
+  \fi
+\else
+  \ifnum\pdfoutput>0 %
+    \pdfmapfile{pdftex.map}%
+  \fi
+\fi
 \ifnum 0%
   \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>0 1\fi\fi
   \ifx\outputmode\@undefined\else\ifnum\outputmode>0 1\fi\fi