summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2023-06-17 18:28:47 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2023-06-17 18:28:47 +0000
commitebced8cc3f15c064aea238ccb0f6f2019373e866 (patch)
tree6e6be149cb9dd452341428353b1540b96865728c
parentcee95fdd7fbac77374bdacc9414b486b7b5acfac (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
-rw-r--r--Build/source/texk/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/Makefile.in29
-rw-r--r--Build/source/texk/web2c/cwebdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/cwebdir/ctwill-hint.ch5
-rw-r--r--Build/source/texk/web2c/cwebdir/ctwill-mini.ch5
-rwxr-xr-x[-rw-r--r--]Build/source/texk/web2c/cwebdir/ctwill.test8
6 files changed, 34 insertions, 22 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index a341eb42d74..72a9f16ad4a 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2023-06-17 Andreas Scherer <https://ascherer.github.io>
+
+ * Makefile.in: Integrate cwebdir/ctwill.test; run reautoconf.
+
2023-03-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* tests/fn-generate.perl:
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 5969a04dbf7..3c9d5cce770 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -119,15 +119,16 @@ noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
$(am__EXEEXT_38) $(am__EXEEXT_39) $(am__EXEEXT_40) \
$(am__EXEEXT_41) $(am__EXEEXT_42)
TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
- cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
- $(am__append_16) $(am__append_25) $(am__append_34) \
- $(am__append_42) $(am__append_55) $(am__append_56) \
- $(am__append_58) $(am__append_62) $(am__EXEEXT_46) \
- $(am__append_68) $(am__append_73) $(am__append_76) \
- $(am__append_79) $(am__append_84) $(am__append_87) \
- $(am__append_108) $(am__append_109) $(am__append_110) \
- $(am__append_111) $(am__append_119) $(am__append_121) \
- $(am__append_123) $(am__append_150) libmd5/md5.test
+ cwebdir/ctwill.test cwebdir/cweave.test tiedir/tie.test \
+ $(am__append_6) $(am__append_16) $(am__append_25) \
+ $(am__append_34) $(am__append_42) $(am__append_55) \
+ $(am__append_56) $(am__append_58) $(am__append_62) \
+ $(am__EXEEXT_46) $(am__append_68) $(am__append_73) \
+ $(am__append_76) $(am__append_79) $(am__append_84) \
+ $(am__append_87) $(am__append_108) $(am__append_109) \
+ $(am__append_110) $(am__append_111) $(am__append_119) \
+ $(am__append_121) $(am__append_123) $(am__append_150) \
+ libmd5/md5.test
@WEB_TRUE@am__append_1 = $(web_programs)
@WEB_TRUE@am__append_2 = $(web_tests)
@TEX_TRUE@am__append_3 = tex
@@ -3544,9 +3545,11 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
tests/xtexpool.typ badtfm.* tests/xcmr10*.pl badvf.* \
tests/xptmr*.vpl badvpl.* tests/yptmr*.* pooltype.tex ctie.c \
cweave.c ctwill.c ctwill-refsort.c ctwill-twinx.c tie.c \
- ctie.outc ctie.outm common.tex common.scn common.idx tie.outc \
- tie.outm $(nodist_tex_SOURCES) tex-final.ch tex-web2c tex.p \
- tex.pool tex-tangle trip.diffs write18-quote.log mftrap.diffs \
+ ctie.outc ctie.outm ctwill.w ctwill.tex ctwill.aux ctwill.idx \
+ ctwill.scn ctwill.ref ctwill.sref ctwill.dvi ctwill-sorted.tex \
+ common.tex common.scn common.idx tie.outc tie.outm \
+ $(nodist_tex_SOURCES) tex-final.ch tex-web2c tex.p tex.pool \
+ tex-tangle trip.diffs write18-quote.log mftrap.diffs \
$(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c mf.p mf.pool \
mf-tangle mfluatrap.diffs $(nodist_libmflua_a_SOURCES) \
mflua.web mflua.ch mflua-web2c mflua.p mflua.pool mflua-tangle \
@@ -21510,8 +21513,6 @@ tie.c: ctangle$(EXEEXT) tiedir/tie.w tiedir/tie-w2c.ch
ctiedir/ctie.log: ctie$(EXEEXT)
cwebdir/cweave.log: cweave$(EXEEXT)
cwebdir/ctwill.log: ctwill$(EXEEXT)
-cwebdir/ctwill-refsort.log: ctwill-refsort$(EXEEXT)
-cwebdir/ctwill-twinx.log: ctwill-twinx$(EXEEXT)
tiedir/tie.log: tie$(EXEEXT)
$(tex_OBJECTS): $(tex_prereq)
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!