diff options
author | Andreas Scherer <andreas_tex@freenet.de> | 2023-06-17 18:28:47 +0000 |
---|---|---|
committer | Andreas Scherer <andreas_tex@freenet.de> | 2023-06-17 18:28:47 +0000 |
commit | ebced8cc3f15c064aea238ccb0f6f2019373e866 (patch) | |
tree | 6e6be149cb9dd452341428353b1540b96865728c /Build/source/texk/web2c/cwebdir | |
parent | cee95fdd7fbac77374bdacc9414b486b7b5acfac (diff) |
[CWEB] Run ctwill.test.
Recreate Makefile.in by running reautoconf.
Adjust ctwill.tex until all tests succeed.
Adjust ctwill.tex to plain TeX; it complains about the \ifx construct.
git-svn-id: svn://tug.org/texlive/trunk@67390 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/cwebdir')
-rw-r--r-- | Build/source/texk/web2c/cwebdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/ctwill-hint.ch | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/ctwill-mini.ch | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | Build/source/texk/web2c/cwebdir/ctwill.test | 8 |
4 files changed, 15 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 62eba2edb21..72fcd02e71e 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,8 @@ +2023-06-17 Andreas Scherer <https://ascherer.github.io> + + * ctwill-{mini,hint}.ch: Make ctwill.w plain-TeX-able again. + * ctwill.test: Make script executable and fix ./ctwill calls. + 2023-06-16 Andreas Scherer <https://ascherer.github.io> * ctwill-proofsort: Rename from 'proofsort'. diff --git a/Build/source/texk/web2c/cwebdir/ctwill-hint.ch b/Build/source/texk/web2c/cwebdir/ctwill-hint.ch index db8cd4f1e21..0863d1a24f6 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-hint.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-hint.ch @@ -1,12 +1,13 @@ Section 1. @x -\ifacro \ifx\undefined\pdfpagewidth\else +\ifx\undefined\pdfpagewidth +\else \pdfpagewidth=\pagewd \advance\pdfpagewidth by 2cm \pdfpageheight=\pageht \advance\pdfpageheight by 5cm \ifpdftex \pdfhorigin=1cm \pdfvorigin=1cm \else \global\hoffset=-1.54cm \global\voffset=-1.54cm \fi -\fi\fi +\fi @y @z diff --git a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch index 78531c036d0..b9dc31516a6 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch @@ -3,12 +3,13 @@ Section 1. @x @** Introduction. @y -\ifacro \ifx\undefined\pdfpagewidth\else +\ifx\undefined\pdfpagewidth +\else \pdfpagewidth=\pagewd \advance\pdfpagewidth by 2cm \pdfpageheight=\pageht \advance\pdfpageheight by 5cm \ifpdftex \pdfhorigin=1cm \pdfvorigin=1cm \else \global\hoffset=-1.54cm \global\voffset=-1.54cm \fi -\fi\fi +\fi @** Introduction. @z diff --git a/Build/source/texk/web2c/cwebdir/ctwill.test b/Build/source/texk/web2c/cwebdir/ctwill.test index f1accfe452d..a0c0677778a 100644..100755 --- a/Build/source/texk/web2c/cwebdir/ctwill.test +++ b/Build/source/texk/web2c/cwebdir/ctwill.test @@ -12,10 +12,10 @@ TEXMFCNF=$srcdir/../kpathsea \ # Prime the pump by running CTWILL twice TEXMFCNF=$srcdir/../kpathsea \ - CWEBINPUTS=$srcdir/cwebdir ./ctwill ctwill.w || exit 1 + CWEBINPUTS=$srcdir/cwebdir: ./ctwill +lpdf ctwill.w || exit 1 TEXMFCNF=$srcdir/../kpathsea \ - CWEBINPUTS=$srcdir/cwebdir ./ctwill ctwill.w || exit 1 + CWEBINPUTS=$srcdir/cwebdir: ./ctwill +lpdf ctwill.w || exit 1 # Run TeX for the first time TEXMFCNF=$srcdir/../kpathsea \ @@ -39,11 +39,11 @@ TEXMFCNF=$srcdir/../kpathsea \ # Running CTWILL once again, but with options +P +lpdf TEXMFCNF=$srcdir/../kpathsea \ - CWEBINPUTS=$srcdir/cwebdir ./ctwill +P +lpdf ctwill.w || exit 1 + CWEBINPUTS=$srcdir/cwebdir: ./ctwill +P +lpdf ctwill.w || exit 1 # Test CTWILL-PROOFSORT TEXMFCNF=$srcdir/../kpathsea \ - ./ctwill-proofsort ctwill.tex > ctwill-sorted.tex || exit 1 + $srcdir/cwebdir/ctwill-proofsort ctwill.tex > ctwill-sorted.tex || exit 1 #mv ctwill-sorted.tex ctwill.tex || exit 1 # -- NOT! # Run pdfTeX once -- NOT! |