summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2020-05-07 09:50:33 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2020-05-07 09:50:33 +0000
commitd5779c7be35c03b028dd9f236df32d5e0819fdec (patch)
tree76bb63980c679234321ec5cb3dc87d7f9e71ddf4
parentf67ca3681e284eb8278ae1625f10c2127787531f (diff)
[CWEB] Reorder TeX macro inclusion.
The new feature to place the table-of-contents page to the start of PDF ducements now also works for German, French, and Italian WEB codes. git-svn-id: svn://tug.org/texlive/trunk@55051 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/cwebdir/texinputs/Xcwebmac.tex3
-rw-r--r--Build/source/texk/web2c/cwebdir/texinputs/dcwebmac.tex6
-rw-r--r--Build/source/texk/web2c/cwebdir/texinputs/fcwebmac.tex4
-rw-r--r--Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex4
4 files changed, 11 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/cwebdir/texinputs/Xcwebmac.tex b/Build/source/texk/web2c/cwebdir/texinputs/Xcwebmac.tex
index cba1c005971..7659bf0a87e 100644
--- a/Build/source/texk/web2c/cwebdir/texinputs/Xcwebmac.tex
+++ b/Build/source/texk/web2c/cwebdir/texinputs/Xcwebmac.tex
@@ -26,8 +26,7 @@
% Version 3.64 [p21] --- Andreas Scherer, Octobre 2005
% Version 3.64 [2018] --- Andreas Scherer, Octobre 2018
-\ifx\undefined\documentclass\input cwebmac.tex
-\else\endinput\fi % LaTeX will use other macros
+\ifx\undefined\botofcontents\input cwebmac.tex\fi
\xdef\fmtversion{\fmtversion[2018]}
diff --git a/Build/source/texk/web2c/cwebdir/texinputs/dcwebmac.tex b/Build/source/texk/web2c/cwebdir/texinputs/dcwebmac.tex
index 564e7a9c84d..0eff8e38524 100644
--- a/Build/source/texk/web2c/cwebdir/texinputs/dcwebmac.tex
+++ b/Build/source/texk/web2c/cwebdir/texinputs/dcwebmac.tex
@@ -28,10 +28,10 @@
% Version 3.64 [p21] --- Andreas Scherer, Octobre 2005
% Version 3.64 [p22] --- Andreas Scherer, March 2016
-\ifx\undefined\documentclass\input Xcwebmac.tex
+\ifx\undefined\botofcontents\input cwebmac.tex
\else\endinput\fi % LaTeX will use other macros
-\input dcwebstrings.tex
+\input dcwebstrings.tex % German translations for some tags and strings
\def\.#1{\leavevmode\hbox{\tentex % typewriter type for strings
\ifx\Cstringchars\undefined\else\Cstringchars\fi % special string characters
@@ -104,3 +104,5 @@
\centerline{\covernote}
\bigskip
\leftline{\sc\today\ um \hours}}} % timestamps the contents page
+
+\input Xcwebmac.tex % Some formatting alternatives and PDF trickery
diff --git a/Build/source/texk/web2c/cwebdir/texinputs/fcwebmac.tex b/Build/source/texk/web2c/cwebdir/texinputs/fcwebmac.tex
index 3e0892eb091..0716016b430 100644
--- a/Build/source/texk/web2c/cwebdir/texinputs/fcwebmac.tex
+++ b/Build/source/texk/web2c/cwebdir/texinputs/fcwebmac.tex
@@ -30,7 +30,7 @@
% french translations --- Denis Roegel, 18 September 1994
-\ifx\undefined\documentclass\input Xcwebmac.tex
+\ifx\undefined\botofcontents\input cwebmac.tex
\else\endinput\fi % LaTeX will use other macros
\def\.#1{\leavevmode\hbox{\tentex % typewriter type for strings
@@ -135,3 +135,5 @@
\centerline{\covernote}
\bigskip
\leftline{\sc\today\ \`a \hours}}} % timestamps the contents page
+
+\input Xcwebmac.tex % Some formatting alternatives and PDF trickery
diff --git a/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex b/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex
index 7d605c9fe42..8d0d5711c7f 100644
--- a/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex
+++ b/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex
@@ -28,7 +28,7 @@
% Version 3.64 [p21] --- Andreas Scherer, Octobre 2005
% Version 3.64 [p22] --- Andreas Scherer, March 2016
-\ifx\undefined\documentclass\input Xcwebmac.tex
+\ifx\undefined\botofcontents\input cwebmac.tex
\else\endinput\fi % LaTeX will use other macros
\def\.#1{\leavevmode\hbox{\tentex % typewriter type for strings
@@ -155,3 +155,5 @@
\centerline{\covernote}
\bigskip
\leftline{\sc\today, ore \hours}}} % timestamps the contents page
+
+\input Xcwebmac.tex % Some formatting alternatives and PDF trickery