[latex3-commits] [git/LaTeX3-latex3-iftex] master: testing against scrbase issue #7 (9c75988)
David Carlisle
d.p.carlisle at gmail.com
Tue Nov 5 10:32:55 CET 2019
Repository : https://github.com/latex3/iftex
On branch : master
Link : https://github.com/latex3/iftex/commit/9c759882e8fc69269fb520897465dbb3016a4bee
>---------------------------------------------------------------
commit 9c759882e8fc69269fb520897465dbb3016a4bee
Author: David Carlisle <d.p.carlisle at gmail.com>
Date: Tue Nov 5 09:32:55 2019 +0000
testing against scrbase issue #7
>---------------------------------------------------------------
9c759882e8fc69269fb520897465dbb3016a4bee
iftex.sty | 21 ++++++++++-----------
.../scrbase1.luatex.tlg | 2 +-
testfiles/scrbase1.lvt | 13 +++++++++++++
.../scrbase1.ptex.tlg | 2 +-
testfiles/{ifxetex1.xetex.tlg => scrbase1.tlg} | 2 +-
.../scrbase1.uptex.tlg | 2 +-
.../scrbase1.xetex.tlg | 2 +-
.../scrbase2.luatex.tlg | 4 ++--
testfiles/scrbase2.lvt | 15 +++++++++++++++
.../scrbase2.ptex.tlg | 4 ++--
.../scrbase2.tlg | 3 ++-
.../scrbase2.uptex.tlg | 4 ++--
.../scrbase2.xetex.tlg | 4 ++--
13 files changed, 53 insertions(+), 25 deletions(-)
diff --git a/iftex.sty b/iftex.sty
index 51be751..4c1923c 100644
--- a/iftex.sty
+++ b/iftex.sty
@@ -53,17 +53,6 @@
}
-% special compat for scrbase
-\ifx\scr at ifpdftex\ifpdftex
- \AtEndOfPackage{%
- \expandafter\let\csname ifpdftex\endcsname\scr at ifpdftex
- \IFTEX at protected\def\RequirePDFTeX{\IFTEX at Require\ifPDFTeX{pdfTeX}\fi}}
-\fi
-\ifx\scr at ifVTeX\ifVTeX
- \AtEndOfPackage{%
- \expandafter\let\csname ifVTeX\endcsname\scr at ifVTeX}
-\fi
-
% eTeX \protected if available.
\ifx\protected\@undefined
\let\IFTEX at protected\relax
@@ -118,6 +107,7 @@
\IFTEX at let{eTeX}{etex}
% pdftex (including in dvi mode)
+\IFTEX at let{IFTEX at savedpdftex}{pdftex}
\ifx\pdftexversion\@undefined
\IFTEX at let{pdftex}{false}
\else
@@ -183,6 +173,7 @@
\IFTEX at let{pTeXng}{ptexng}
% vtex
+\IFTEX at let{IFTEX at savedVTeX}{VTeX}
\ifx\VTeXversion\@undefined
\IFTEX at let{vtex}{false}
\else
@@ -238,6 +229,14 @@ end
\fi
+% special compat for scrbase
+\ifx\scr at ifpdftex\@undefined\else\ifx\ifIFTEX at savedpdftex\relax\else
+ \IFTEX at let{pdftex}{IFTEX at savedpdftex}
+ \IFTEX at protected\def\RequirePDFTeX{\IFTEX at Require\ifPDFTeX{pdfTeX}\fi}
+\fi\fi
+\ifx\scr at ifVTeX\@undefined\else\ifx\ifIFTEX at savedVTeX\relax\else
+ \IFTEX at let{VTeX}{IFTEX at savedVTeX}
+\fi\fi
% restore things
\catcode64 \IFTEX at atcatcode
diff --git a/testfiles-plain/plain-ifxetex1.tlg b/testfiles/scrbase1.luatex.tlg
similarity index 90%
copy from testfiles-plain/plain-ifxetex1.tlg
copy to testfiles/scrbase1.luatex.tlg
index 5ecadde..5840d21 100644
--- a/testfiles-plain/plain-ifxetex1.tlg
+++ b/testfiles/scrbase1.luatex.tlg
@@ -1,3 +1,3 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-Not XeTeX
+not pdftex
diff --git a/testfiles/scrbase1.lvt b/testfiles/scrbase1.lvt
new file mode 100644
index 0000000..c93e9bf
--- /dev/null
+++ b/testfiles/scrbase1.lvt
@@ -0,0 +1,13 @@
+\documentclass{scrartcl}
+\usepackage{iftex}
+
+\input{regression-test}
+
+\START
+\ifpdftex{
+\typeout{pdftex}
+}{
+\typeout{not pdftex}
+}
+
+\END
\ No newline at end of file
diff --git a/testfiles-plain/plain-ifxetex1.tlg b/testfiles/scrbase1.ptex.tlg
similarity index 90%
copy from testfiles-plain/plain-ifxetex1.tlg
copy to testfiles/scrbase1.ptex.tlg
index 5ecadde..5840d21 100644
--- a/testfiles-plain/plain-ifxetex1.tlg
+++ b/testfiles/scrbase1.ptex.tlg
@@ -1,3 +1,3 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-Not XeTeX
+not pdftex
diff --git a/testfiles/ifxetex1.xetex.tlg b/testfiles/scrbase1.tlg
similarity index 93%
copy from testfiles/ifxetex1.xetex.tlg
copy to testfiles/scrbase1.tlg
index cf28c05..c650352 100644
--- a/testfiles/ifxetex1.xetex.tlg
+++ b/testfiles/scrbase1.tlg
@@ -1,3 +1,3 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-XeTeX
+pdftex
diff --git a/testfiles-plain/plain-ifxetex1.tlg b/testfiles/scrbase1.uptex.tlg
similarity index 90%
copy from testfiles-plain/plain-ifxetex1.tlg
copy to testfiles/scrbase1.uptex.tlg
index 5ecadde..5840d21 100644
--- a/testfiles-plain/plain-ifxetex1.tlg
+++ b/testfiles/scrbase1.uptex.tlg
@@ -1,3 +1,3 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-Not XeTeX
+not pdftex
diff --git a/testfiles-plain/plain-ifxetex1.tlg b/testfiles/scrbase1.xetex.tlg
similarity index 90%
copy from testfiles-plain/plain-ifxetex1.tlg
copy to testfiles/scrbase1.xetex.tlg
index 5ecadde..5840d21 100644
--- a/testfiles-plain/plain-ifxetex1.tlg
+++ b/testfiles/scrbase1.xetex.tlg
@@ -1,3 +1,3 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-Not XeTeX
+not pdftex
diff --git a/testfiles-etex-plain/active1.luatex.tlg b/testfiles/scrbase2.luatex.tlg
similarity index 83%
copy from testfiles-etex-plain/active1.luatex.tlg
copy to testfiles/scrbase2.luatex.tlg
index 5755a15..afbccfd 100644
--- a/testfiles-etex-plain/active1.luatex.tlg
+++ b/testfiles/scrbase2.luatex.tlg
@@ -1,4 +1,4 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-(iftex.sty)
-yes
+\iffalse
+not pdftex
diff --git a/testfiles/scrbase2.lvt b/testfiles/scrbase2.lvt
new file mode 100644
index 0000000..3c6faa1
--- /dev/null
+++ b/testfiles/scrbase2.lvt
@@ -0,0 +1,15 @@
+\documentclass{article}
+\usepackage[internalonly=/ifpdftex]{scrbase}
+\usepackage{iftex}
+\show\ifpdftex
+\input{regression-test}
+
+\START
+\typeout{\meaning\ifpdftex}
+\ifpdftex
+\typeout{pdftex}
+\else
+\typeout{not pdftex}
+\fi
+
+\END
\ No newline at end of file
diff --git a/testfiles-etex-plain/active1.luatex.tlg b/testfiles/scrbase2.ptex.tlg
similarity index 83%
copy from testfiles-etex-plain/active1.luatex.tlg
copy to testfiles/scrbase2.ptex.tlg
index 5755a15..afbccfd 100644
--- a/testfiles-etex-plain/active1.luatex.tlg
+++ b/testfiles/scrbase2.ptex.tlg
@@ -1,4 +1,4 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-(iftex.sty)
-yes
+\iffalse
+not pdftex
diff --git a/testfiles-etex-plain/test-require-luatex.luatex.tlg b/testfiles/scrbase2.tlg
similarity index 86%
copy from testfiles-etex-plain/test-require-luatex.luatex.tlg
copy to testfiles/scrbase2.tlg
index 0ffa5a2..4f87b6f 100644
--- a/testfiles-etex-plain/test-require-luatex.luatex.tlg
+++ b/testfiles/scrbase2.tlg
@@ -1,3 +1,4 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-This is LuaTeX
+\iftrue
+pdftex
diff --git a/testfiles-etex-plain/active1.luatex.tlg b/testfiles/scrbase2.uptex.tlg
similarity index 83%
copy from testfiles-etex-plain/active1.luatex.tlg
copy to testfiles/scrbase2.uptex.tlg
index 5755a15..afbccfd 100644
--- a/testfiles-etex-plain/active1.luatex.tlg
+++ b/testfiles/scrbase2.uptex.tlg
@@ -1,4 +1,4 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-(iftex.sty)
-yes
+\iffalse
+not pdftex
diff --git a/testfiles-etex-plain/active1.luatex.tlg b/testfiles/scrbase2.xetex.tlg
similarity index 83%
copy from testfiles-etex-plain/active1.luatex.tlg
copy to testfiles/scrbase2.xetex.tlg
index 5755a15..afbccfd 100644
--- a/testfiles-etex-plain/active1.luatex.tlg
+++ b/testfiles/scrbase2.xetex.tlg
@@ -1,4 +1,4 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-(iftex.sty)
-yes
+\iffalse
+not pdftex
More information about the latex3-commits
mailing list