texlive[67390] [CWEB] Run ctwill.test.

commits+ascherer at tug.org commits+ascherer at tug.org
Sat Jun 17 20:28:47 CEST 2023 

Revision: 67390
          http://tug.org/svn/texlive?view=revision&revision=67390
Author:   ascherer
Date:     2023-06-17 20:28:47 +0200 (Sat, 17 Jun 2023)
Log Message:
-----------
[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.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/ChangeLog
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/texk/web2c/cwebdir/ChangeLog
    trunk/Build/source/texk/web2c/cwebdir/ctwill-hint.ch
    trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
    trunk/Build/source/texk/web2c/cwebdir/ctwill.test

Property Changed:
----------------
    trunk/Build/source/texk/web2c/cwebdir/ctwill.test

Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog	2023-06-16 23:43:10 UTC (rev 67389)
+++ trunk/Build/source/texk/web2c/ChangeLog	2023-06-17 18:28:47 UTC (rev 67390)
@@ -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 at t-lab.opal.ne.jp>
 
 	* tests/fn-generate.perl:

Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2023-06-16 23:43:10 UTC (rev 67389)
+++ trunk/Build/source/texk/web2c/Makefile.in	2023-06-17 18:28:47 UTC (rev 67390)
@@ -119,15 +119,16 @@
 	$(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 at am__append_1 = $(web_programs)
 @WEB_TRUE at am__append_2 = $(web_tests)
 @TEX_TRUE at am__append_3 = tex
@@ -3544,9 +3545,11 @@
 	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 @@
 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)
 

Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2023-06-16 23:43:10 UTC (rev 67389)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2023-06-17 18:28:47 UTC (rev 67390)
@@ -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'.

Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-hint.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-hint.ch	2023-06-16 23:43:10 UTC (rev 67389)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-hint.ch	2023-06-17 18:28:47 UTC (rev 67390)
@@ -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

Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch	2023-06-16 23:43:10 UTC (rev 67389)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch	2023-06-17 18:28:47 UTC (rev 67390)
@@ -3,12 +3,13 @@
 @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

Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill.test
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill.test	2023-06-16 23:43:10 UTC (rev 67389)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill.test	2023-06-17 18:28:47 UTC (rev 67390)
@@ -12,10 +12,10 @@
 
 # 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 @@
 
 # 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!


Property changes on: trunk/Build/source/texk/web2c/cwebdir/ctwill.test
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property

More information about the tex-live-commits mailing list.