Merge branch 'master' into build/work000 r72334 #158

source/.github/scripts/build-tl.sh

@@ -56,7 +56,9 @@ then
      solaris)
        # pkg install pkg://solaris/developer/gcc-5
        # maybe only the following is enough, and fortran and gobjc needs not be installed?
-       pkg install pkg://solaris/developer/gcc/gcc-c++-5
+       # pkg install pkg://solaris/developer/gcc/gcc-c++-5
+       /opt/csw/bin/pkgutil -U
+       /opt/csw/bin/pkgutil -y -i autoconf automake gcc5core libtool
        ;;
      *)
        echo "Unsupported build system: $buildsys" >&2

source/texk/web2c/ChangeLog

@@ -1,6 +1,7 @@
 2024-09-16  TANAKA Takuji  <[email protected]>
 
-	* tests/ec-lmr10.tfm: Add for tests of pTeX family
+	* tests/ec-lmr10.tfm, tests/dump-basic.tex:
+	Add for tests of pTeX family
 
 2024-09-07  Karl Berry  <[email protected]>
 

source/texk/web2c/Makefile.in

@@ -3274,6 +3274,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	ptexdir/tests/endlinechar.tex ptexdir/tests/endline.log \
 	ptexdir/tests/control-symbol.tex ptexdir/tests/jctrlsym.log \
 	ptexdir/tests/p-endlinea.typ ptexdir/tests/p-jctrlsyma.typ \
+	ptexdir/tests/let_char_token.tex ptexdir/tests/chartoken.log \
+	ptexdir/tests/ptexlineendmode.tex ptexdir/tests/p-lineenda.typ \
 	ptexdir/tests/printkanji.tex ptexdir/tests/pknj-s.log \
 	ptexdir/tests/pknj-e.log ptexdir/tests/p-pknj-sa.typ \
 	ptexdir/tests/p-pknj-ea.typ ptexdir/tests/ucs.tex \
@@ -3619,20 +3621,21 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
 	ptests/xcmr10.pl ptests/xsample*.typ ptests/x*min10.* \
 	ptests/xchcode*.* ptests/xskipjfmp.* ptrip.diffs p-ctrlsym.log \
 	p-ctrlsym.out p-ctrlsym.tex p-endline*.* p-jctrlsym*.* \
-	p-pknj-*.* p-ucs*.* $(nodist_uptex_SOURCES) uptex.web uptex.ch \
-	uptex-web2c uptex.p uptex.pool uptex-tangle \
-	$(upweb_programs:=.c) $(upweb_programs:=.h) \
-	$(upweb_programs:=.p) $(upweb_programs:=-web2c) \
-	$(upweb_programs:=.web) uptests/nissya_bib.* \
-	uptests/xexampl.aux uptests/xexampl.bbl uptests/xexampl.blg \
-	uptests/xenc*.* uptests/fn*.* uptests/memtest.bib \
-	uptests/memtest?.* uptests/xstory.dvityp uptests/xpagenum.typ \
-	uptests/x*ptex[345]*.typ uptests/xcmr10.tfm uptests/xcmr10.pl \
-	uptests/xsample*.typ uptests/x*min10.* uptests/xchcode*.* \
-	uptests/xtestnewu*.* uptests/xuparse.* uptests/yuparse.* \
-	uptests/ygkhuge*.* uptests/ygk256*.* uptests/xskipjfmp.* \
-	uptrip.diffs $(nodist_euptex_SOURCES) euptex.web euptex.ch \
-	euptex-web2c euptex.p euptex.pool euptex-tangle euptrip.diffs \
+	p-chartoken.* p-lineend.* p-pknj-*.* p-ucs*.* \
+	$(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c uptex.p \
+	uptex.pool uptex-tangle $(upweb_programs:=.c) \
+	$(upweb_programs:=.h) $(upweb_programs:=.p) \
+	$(upweb_programs:=-web2c) $(upweb_programs:=.web) \
+	uptests/nissya_bib.* uptests/xexampl.aux uptests/xexampl.bbl \
+	uptests/xexampl.blg uptests/xenc*.* uptests/fn*.* \
+	uptests/memtest.bib uptests/memtest?.* uptests/xstory.dvityp \
+	uptests/xpagenum.typ uptests/x*ptex[345]*.typ \
+	uptests/xcmr10.tfm uptests/xcmr10.pl uptests/xsample*.typ \
+	uptests/x*min10.* uptests/xchcode*.* uptests/xtestnewu*.* \
+	uptests/xuparse.* uptests/yuparse.* uptests/ygkhuge*.* \
+	uptests/ygk256*.* uptests/xskipjfmp.* uptrip.diffs \
+	$(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
+	euptex.p euptex.pool euptex-tangle euptrip.diffs \
 	pdfprimitive-euptex.* eup-ctrlsym.fmt eup-ctrlsym.log \
 	eup-ctrlsym.out eup-ctrlsym.tex $(nodist_hitex_SOURCES) \
 	$(nodist_hishrink_SOURCES) $(nodist_histretch_SOURCES) \

source/texk/web2c/ptexdir/ChangeLog

@@ -1,3 +1,13 @@
+2024-09-21  TANAKA Takuji  <[email protected]>
+
+	* ptex-base.ch:
+	Fix a bug in initialization of inhibit_xsp/kinsoku tables
+	(Bug introduced on commit 2022-12-12 r65248).
+	* ptex-ctrlsym.test, tests/{ptexlineendmode,ucs}.tex,
+	(chartoken,ucs-{e,s}}.log, p-lineenda.typ:
+	Add more regression tests.
+	* am/ptex.am: Adjust.
+
 2024-09-16  TANAKA Takuji  <[email protected]>
 
 	* ptex-base.ch: Use constants enc_jis and enc_ucs.

source/texk/web2c/ptexdir/am/ptex.am

@@ -177,10 +177,12 @@ DISTCLEANFILES += ptrip.diffs
 EXTRA_DIST += ptexdir/tests/ctrlsym.tex ptexdir/tests/ctrlsym.log \
 	ptexdir/tests/endlinechar.tex ptexdir/tests/endline.log \
 	ptexdir/tests/control-symbol.tex ptexdir/tests/jctrlsym.log \
-	ptexdir/tests/p-endlinea.typ ptexdir/tests/p-jctrlsyma.typ
+	ptexdir/tests/p-endlinea.typ ptexdir/tests/p-jctrlsyma.typ \
+	ptexdir/tests/let_char_token.tex ptexdir/tests/chartoken.log \
+	ptexdir/tests/ptexlineendmode.tex ptexdir/tests/p-lineenda.typ
 DISTCLEANFILES += p-ctrlsym.log p-ctrlsym.out p-ctrlsym.tex \
-	p-endline*.* p-jctrlsym*.*
-## ptexdir/ptex-prntknj.test
+	p-endline*.* p-jctrlsym*.* p-chartoken.* p-lineend.*
+## ptex-prntknj.test
 EXTRA_DIST += ptexdir/tests/printkanji.tex \
 	ptexdir/tests/pknj-s.log ptexdir/tests/pknj-e.log \
 	ptexdir/tests/p-pknj-sa.typ ptexdir/tests/p-pknj-ea.typ

source/texk/web2c/ptexdir/ptex-base.ch

@@ -1305,10 +1305,11 @@ for k:=0 to 255 do
   begin cat_code(k):=other_char; kcat_code(k):=other_kchar;
   math_code(k):=hi(k); sf_code(k):=1000;
   auto_xsp_code(k):=0;
+  inhibit_xsp_type(k):=0; kinsoku_type(k):=0;
   end;
 for k:=0 to 1023 do
-  begin inhibit_xsp_code(k):=0; inhibit_xsp_type(k):=0;
-  kinsoku_code(k):=0; kinsoku_type(k):=0;
+  begin inhibit_xsp_code(k):=0;
+  kinsoku_code(k):=0;
   end;
 @z
 @x [17.232] l.4971 - pTeX: initialize cat_code, cur_jfont, cur_tfont

source/texk/web2c/ptexdir/ptex-ctrlsym.test

@@ -14,7 +14,7 @@ TEXINPUTS=".;$srcdir/tests"; export TEXINPUTS
 TEXFONTS=".;$srcdir//tests"; export TEXFONTS
 TEXFORMATS=.; export TEXFORMATS
 
-rm -f p-ctrlsym.tex p-endline*.* p-jctrlsym*.*
+rm -f p-ctrlsym.tex p-endline*.* p-jctrlsym*.* p-chartoken.* p-lineend.*
 
 if test ! -f ./p-basic.tex; then
   cp $srcdir/tests/dump-basic.tex ./p-basic.tex
@@ -57,3 +57,21 @@ $_updvitype ./p-jctrlsym.dvi >ptests/xp-jctrlsym.typ
 sed "1d;s/TeX output 20[23].\...\...:.*'/TeX output 20XX.XX.XX'/" ptests/xp-jctrlsym.typ >ptests/xp-jctrlsyma.typ
 diff $srcdir/ptexdir/tests/p-jctrlsyma.typ ptests/xp-jctrlsyma.typ || exit 7
 
+
+# let_char_token.tex
+$LN_S $srcdir/ptexdir/tests/let_char_token.tex ./p-chartoken.tex
+$_ptex -fmt=p-basic-euc -interaction=batchmode p-chartoken.tex || :
+
+sed 1d p-chartoken.log >p-chartoken.out
+
+diff $srcdir/ptexdir/tests/chartoken.log p-chartoken.out || exit 8
+
+
+# ptexlineendmode.tex
+$LN_S $srcdir/ptexdir/tests/ptexlineendmode.tex ./p-lineend.tex
+$_ptex -fmt=p-basic-euc -kanji=utf8 -interaction=batchmode p-lineend.tex || :
+
+$_updvitype -kanji=utf8 ./p-lineend.dvi >ptests/xp-lineend.typ
+sed "1d;s/TeX output 20[23].\...\...:.*'/TeX output 20XX.XX.XX'/" ptests/xp-lineend.typ >ptests/xp-lineenda.typ
+diff $srcdir/ptexdir/tests/p-lineenda.typ ptests/xp-lineenda.typ || exit 9
+

source/texk/web2c/ptexdir/tests/chartoken.log

@@ -0,0 +1,41 @@
+ restricted \write18 enabled.
+ %&-line parsing enabled.
+**p-chartoken.tex
+(./p-chartoken.tex
+\x=\count26
+
+! Improper alphabetic or KANJI constant.
+<to be read again> 
+                   \aaa 
+\T #1->\x =`#1
+               \message {\the \x }
+l.6 \def\aaa{西}\T{\aaa}
+                        % err
+A one-character control sequence belongs after a ` mark.
+So I'm essentially inserting \0 here.
+
+48
+! Improper alphabetic or KANJI constant.
+<to be read again> 
+                   \AAA 
+\T #1->\x =`#1
+               \message {\the \x }
+l.7 \def\AAA{s}\T{\AAA}
+                        % err
+A one-character control sequence belongs after a ` mark.
+So I'm essentially inserting \0 here.
+
+Missing character: There is no s in font nullfont!
+48
+! Improper alphabetic or KANJI constant.
+<to be read again> 
+                   \ccc 
+\T #1->\x =`#1
+               \message {\the \x }
+l.8 \let\ccc=西\relax\T{\ccc}
+                              % err
+A one-character control sequence belongs after a ` mark.
+So I'm essentially inserting \0 here.
+
+48 126 97 46273 46273 [1] )
+Output written on p-chartoken.dvi (1 page, 152 bytes).