texlive[55617] Build/source/texk/web2c/cwebdir: [C/WEB] Start main

[commits+ascherer at tug.org]

Revision: 55617
          http://tug.org/svn/texlive?view=revision&revision=55617
Author:   ascherer
Date:     2020-06-21 14:10:18 +0200 (Sun, 21 Jun 2020)
Log Message:
-----------
[C/WEB] Start main body on pageno 3.

Don't fiddle with '\{U+00A2}ontentspagenumber' _before_ the table-of-contents,
but set '\pageno=3' _after_ the toc has been typeset.  This makes the
mechanism for Metafont, TeX, pdfTeX, and XeTeX independent of the length
of the table-of-contents.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/cwebdir/ChangeLog
    trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex

Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2020-06-21 10:54:25 UTC (rev 55616)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2020-06-21 12:10:18 UTC (rev 55617)
@@ -1,3 +1,8 @@
+2020-06-21  Andreas Scherer  <https://ascherer.github.io>
+
+	* texinputs/pdfwebtocfront.tex: Fix start pageno after dynamic to.
+	MF and [{pdf|Xe}]TeX start their main body on pageno 3.
+
 2020-06-20  Andreas Scherer  <https://ascherer.github.io>
 
 	* texinputs/pdfwebtocfront.tex: Generic solution for the headers in

Modified: trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex	2020-06-21 10:54:25 UTC (rev 55616)
+++ trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex	2020-06-21 12:10:18 UTC (rev 55617)
@@ -13,7 +13,6 @@
 \ifx\detokenize\undefined\endinput\fi
 \def\contentsfile{\jobname.toc} % file that gets table of contents info
 \newif\iftexmf\texmffalse % special toc treatment for TeX, Metafont, etc.
-\newif\ifpdfxe\pdfxefalse % superspecial toc treatment for pdfTeX, XeTeX.
 \newread\testread
 \openin\testread=\contentsfile\relax
 \ifeof\testread % First run
@@ -43,15 +42,14 @@
   \edef\y{\detokenize{mf}}%
   \ifx\x\y \texmftrue\else
   \edef\y{\detokenize{pdftex}}%
-  \ifx\x\y \texmftrue \pdfxetrue\else
+  \ifx\x\y \texmftrue\else
   \edef\y{\detokenize{xetex}}%
   \ifx\x\y \texmftrue\fi\fi\fi\fi
   \iftexmf
-    \ifpdfxe \def\contentspagenumber{1} \else \def\contentspagenumber{2} \fi
     \expandafter\let\csname ORGN\expandafter\endcsname
                     \csname N\endcsname
     \expandafter\outer\expandafter\def\csname N\endcsname{%
-      \titletrue \pageno=\contentspagenumber \con
+      \titletrue \con \pageno=2
       \expandafter\let\csname N\expandafter\endcsname
                       \csname ORGN\endcsname
       \csname N\endcsname