[latex3-commits] [git/LaTeX3-latex3-l3build] master: More work on e-TeX free testing (6a3c450)
Joseph Wright
joseph.wright at morningstar2.co.uk
Fri Nov 1 20:01:04 CET 2019
Repository : https://github.com/latex3/l3build
On branch : master
Link : https://github.com/latex3/l3build/commit/6a3c45000af126c92a54465f90f1e8d49352743a
>---------------------------------------------------------------
commit 6a3c45000af126c92a54465f90f1e8d49352743a
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Nov 1 18:09:47 2019 +0000
More work on e-TeX free testing
>---------------------------------------------------------------
6a3c45000af126c92a54465f90f1e8d49352743a
l3build.dtx | 99 +++++++++++++++++++++-------------
testfiles-plain/plain-pdftex.ptex.tlg | 17 ++++++
testfiles-plain/plain-pdftex.uptex.tlg | 17 ++++++
testfiles/support/regression-test.cfg | 7 ++-
4 files changed, 100 insertions(+), 40 deletions(-)
diff --git a/l3build.dtx b/l3build.dtx
index 9623707..a2f4812 100644
--- a/l3build.dtx
+++ b/l3build.dtx
@@ -2064,7 +2064,11 @@
% Put \TeX{} into scroll mode, and stop it showing the
% implementation details of macros in error messages.
% \begin{macrocode}
-\ifnum\interactionmode>1 \scrollmode\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname interactionmode\endcsname\relax
+\else
+ \ifnum\interactionmode>1 \scrollmode\fi
+\fi
\errorcontextlines=-1 %
% \end{macrocode}
%
@@ -2146,6 +2150,13 @@
\LONGTYPEOUT{^^JEND-TEST-LOG^^J}%
\@@@end
}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname currentgrouplevel\endcsname\relax
+ \def\END{%
+ \LONGTYPEOUT{^^JEND-TEST-LOG^^J}%
+ \@@@end
+ }
+\fi
\ifx\@@end\@undefined
\let\end\END
\else
@@ -2161,14 +2172,7 @@
\def\OMIT{\LONGTYPEOUT{OMIT}}
\def\TIMO{\LONGTYPEOUT{TIMO}}
% \end{macrocode}
-% \end{macro}% We require \eTeX{}.
-% \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname eTeXversion\endcsname\relax
- \errmessage{e-TeX is required to use regression-test.tex}%
- \expandafter\endinput
-\fi
-% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\SHOWFILE}
% Load a file (e.g.,| \jobname.toc|) into the .log file with the usual special
@@ -2192,7 +2196,7 @@
}%
\endgroup
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname \everyeof\endcsname\relax
+\expandafter\ifx\csname everyeof\endcsname\relax
\def\SHOWFILE#1{\TYPE{FEATURE UNAVAILABLE}}
\fi
% \end{macrocode}
@@ -2257,6 +2261,20 @@
\begingroup
\let\TYPE\LONGTYPEOUT
}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname detokenize\endcsname\relax
+ \long\def\BEGINTEST#1{%
+ \global\advance\gTESTint by 1 %
+ \SEPARATOR
+ \begingroup
+ \toks0={#1}%
+ \LONGTYPEOUT{TEST \the\gTESTint: \the\toks0 }%
+ \endgroup
+ \SEPARATOR
+ \begingroup
+ \let\TYPE\LONGTYPEOUT
+ }
+\fi
\csname protected\endcsname\long\def\ENDTEST{%
\endgroup
\SEPARATOR
@@ -2282,6 +2300,39 @@
%
% \subsection{Suppressing variable data in output}
%
+% Disable compression in PDF output.
+% \begin{macrocode}
+\ifnum 0%
+ \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>0 1\fi\fi
+ \ifx\outputmode\@undefined\else\ifnum\outputmode>0 1\fi\fi
+ >0 %
+ \ifx\pdfvariable\@undefined
+ \pdfcompresslevel=0 %
+ \pdfobjcompresslevel=0 %
+ \else
+ \pdfvariable compresslevel=0 %
+ \pdfvariable objcompresslevel=0 %
+ \fi
+\else
+ \ifnum 0%
+ \ifx\XeTeXversion\@undefined\else 1\fi
+ \ifx\kanjiskip\@undefined\else 1\fi
+ >0 %
+ \special{dvipdfmx:config z 0}% Compress level
+ \special{dvipdfmx:config C 0x40}% Object compression
+ \fi
+\fi
+% \end{macrocode}
+%
+% \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname protected\endcsname\relax
+ \reset at catcodes
+ \let\protected\undefined
+ \expandafter\endinput
+\fi
+% \end{macrocode}
+%
% Load the map file early so it does not appear in the log.
% \begin{macrocode}
\ifx\pdfoutput\@undefined
@@ -2350,36 +2401,8 @@
\fi
% \end{macrocode}
%
-% Disable compression in PDF output.
-% \begin{macrocode}
-\ifnum 0%
- \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>0 1\fi\fi
- \ifx\outputmode\@undefined\else\ifnum\outputmode>0 1\fi\fi
- >0 %
- \ifx\pdfvariable\@undefined
- \pdfcompresslevel=0 %
- \pdfobjcompresslevel=0 %
- \else
- \pdfvariable compresslevel=0 %
- \pdfvariable objcompresslevel=0 %
- \fi
-\else
- \ifnum 0%
- \ifx\XeTeXversion\@undefined\else 1\fi
- \ifx\kanjiskip\@undefined\else 1\fi
- >0 %
- \special{dvipdfmx:config z 0}% Compress level
- \special{dvipdfmx:config C 0x40}% Object compression
- \fi
-\fi
-% \end{macrocode}
-%
% Finish up.
% \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname protected\endcsname\relax
- \let\protected\undefined
-\fi
\reset at catcodes
% \end{macrocode}
%
diff --git a/testfiles-plain/plain-pdftex.ptex.tlg b/testfiles-plain/plain-pdftex.ptex.tlg
index e69de29..eaffdfd 100644
--- a/testfiles-plain/plain-pdftex.ptex.tlg
+++ b/testfiles-plain/plain-pdftex.ptex.tlg
@@ -0,0 +1,17 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+============================================================
+CFG FILE IS LOADED
+============================================================
+============================================================
+TEST 1: \afterassignment
+============================================================
+> hello.
+<argument> ...d}}\foo } \x ={hello} \showthe \foo
+ \show \y
+l. ...}
+> \y=macro:
+->world.
+<argument> ... \x ={hello} \showthe \foo \show \y
+l. ...}
+============================================================
diff --git a/testfiles-plain/plain-pdftex.uptex.tlg b/testfiles-plain/plain-pdftex.uptex.tlg
index e69de29..eaffdfd 100644
--- a/testfiles-plain/plain-pdftex.uptex.tlg
+++ b/testfiles-plain/plain-pdftex.uptex.tlg
@@ -0,0 +1,17 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+============================================================
+CFG FILE IS LOADED
+============================================================
+============================================================
+TEST 1: \afterassignment
+============================================================
+> hello.
+<argument> ...d}}\foo } \x ={hello} \showthe \foo
+ \show \y
+l. ...}
+> \y=macro:
+->world.
+<argument> ... \x ={hello} \showthe \foo \show \y
+l. ...}
+============================================================
diff --git a/testfiles/support/regression-test.cfg b/testfiles/support/regression-test.cfg
index 32f4c50..0d19f02 100644
--- a/testfiles/support/regression-test.cfg
+++ b/testfiles/support/regression-test.cfg
@@ -47,6 +47,11 @@
%%
%% -----------------------------------------------------------------------
%%
+\def\ISCFGLOADED{\SEPARATOR\TYPE{CFG FILE IS LOADED}\SEPARATOR}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname protected\endcsname\relax
+ \expandafter\endinput
+\fi
\ifx\RequirePackage\@undefined\else
\OMIT
\RequirePackage{etex}
@@ -78,8 +83,6 @@
\regression at test@alloc {30} \newmuskip
\regression at test@alloc {30} \newskip
-\def\ISCFGLOADED{\SEPARATOR\TYPE{CFG FILE IS LOADED}\SEPARATOR}
-
%%
%%
%% End of file `regression-test-l3.cfg'.
More information about the latex3-commits
mailing list