diff options
author | Andreas Scherer <andreas_tex@freenet.de> | 2020-06-01 09:19:05 +0000 |
---|---|---|
committer | Andreas Scherer <andreas_tex@freenet.de> | 2020-06-01 09:19:05 +0000 |
commit | e2b52cddbb0327f7ab9cb453f8cc8bc4e5820da5 (patch) | |
tree | 1b9cc539754984c9541f9dfd4d143f732e54dcb5 | |
parent | 8b48dc22f21d8e495468ca78772c567993a4346d (diff) |
[CWEB] Adapt 'pdfwebtocfront' to 'pwebmac' 4.5.2.
Headline '\mark's now have two parts: (a) the section number and (b) the
group title. This makes them more like CWEB's three-part top marks.
The inner logic to detect 'TeX and friends' has been changed from
'numeric' to 'boolean'.
git-svn-id: svn://tug.org/texlive/trunk@55371 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/web2c/cwebdir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex | 19 |
2 files changed, 13 insertions, 10 deletions
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 0c169a199c1..51c8d0ed710 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,7 @@ +2020-06-01 Andreas Scherer <https://ascherer.github.io> + + * texinputs/pdfwebtocfront.tex: Adapt to 'pwebmac.tex 4.5.2. + 2020-05-31 Andreas Scherer <https://ascherer.github.io> * comm-w2c.ch: Sanitize command for PDF outlines. diff --git a/Build/source/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex b/Build/source/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex index 49e5f5b288a..54531a25764 100644 --- a/Build/source/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex +++ b/Build/source/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex @@ -1,6 +1,6 @@ % pdfwebtofront.tex % Code from knuth.drv in https://github.com/oberdiek/latex-tds -% 2020/05/21 v1.0 by Andreas Scherer. +% 2020/05/30 v1.1 by Andreas Scherer. % % This file is part of project https://github.com/ascherer/cwebbin % and may be distributed under the MIT License or the LaTeX Project @@ -12,7 +12,7 @@ % \ifx\detokenize\undefined\endinput\fi \def\contentsfile{\jobname.toc} % file that gets table of contents info -\def\readcontents{\input \contentsfile} +\newif\iftexmf\texmffalse % special toc treatment for TeX, Metafont, etc. \newread\testread \openin\testread=\contentsfile\relax \ifeof\testread % First run @@ -31,7 +31,7 @@ \let\end\relax \ORGcon % let's start with section '1', the 'Introduction'. - \ifx\undefined\grouptitle \mark{1} % WEB + \ifx\undefined\gdepth \mark{{{\tensy x}1}{Introduction}} % WEB \else \mark{{{\tensy x}1}0{Introduction}}\fi % CWEB \eject % set '\botmark' on TOC, hence '\topmark' on next page. \endgroup @@ -48,19 +48,18 @@ \csname N\endcsname }% % Special variant of the above for 'mf.web' and 'tex.web'. They put - % their tables-of-contents on a sparce 'page 2' and start on page '3'. + % their tables-of-contents on a sparse 'page 2' and start on page '3'. \begingroup - \def\num{0}% \edef\x{\jobname}% \edef\y{\detokenize{tex}}% - \ifx\x\y \def\num{1}\else + \ifx\x\y \texmftrue\else \edef\y{\detokenize{mf}}% - \ifx\x\y \def\num{1}\else + \ifx\x\y \texmftrue\else \edef\y{\detokenize{pdftex}}% - \ifx\x\y \def\num{1}\else + \ifx\x\y \texmftrue\else \edef\y{\detokenize{xetex}}% - \ifx\x\y \def\num{1}\fi\fi\fi\fi - \expandafter\endgroup\ifnum\num=1 % + \ifx\x\y \texmftrue\fi\fi\fi\fi + \expandafter\endgroup\iftexmf % \def\contentspagenumber{2}% \let\ORGpageno\pageno \def\pageno{% |