texlive[72531] Build/source/texk/web2c: {,e}uptex: Add new tests,

commits+takuji at tug.org commits+takuji at tug.org
Sat Oct 12 03:06:08 CEST 2024


Revision: 72531
          https://tug.org/svn/texlive?view=revision&revision=72531
Author:   takuji
Date:     2024-10-12 03:06:08 +0200 (Sat, 12 Oct 2024)
Log Message:
-----------
{,e}uptex: Add new tests, Bump version to euptex u1.35-240930

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/texk/web2c/euptexdir/ChangeLog
    trunk/Build/source/texk/web2c/euptexdir/am/euptex.am
    trunk/Build/source/texk/web2c/euptexdir/eptex.ech
    trunk/Build/source/texk/web2c/euptexdir/eptex_version.h
    trunk/Build/source/texk/web2c/ptexdir/tests/pknj-e.log
    trunk/Build/source/texk/web2c/ptexdir/tests/pknj-s.log
    trunk/Build/source/texk/web2c/uptexdir/ChangeLog
    trunk/Build/source/texk/web2c/uptexdir/am/uptex.am
    trunk/Build/source/texk/web2c/uptexdir/kanji.c
    trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch

Added Paths:
-----------
    trunk/Build/source/texk/web2c/euptexdir/euptex-prim.test
    trunk/Build/source/texk/web2c/euptexdir/tests/eup-prim.log
    trunk/Build/source/texk/web2c/euptexdir/tests/eup-prim.tex
    trunk/Build/source/texk/web2c/uptexdir/tests/up-prim.log
    trunk/Build/source/texk/web2c/uptexdir/tests/up-prim.tex
    trunk/Build/source/texk/web2c/uptexdir/uptex-prim.test

Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2024-10-11 23:41:58 UTC (rev 72530)
+++ trunk/Build/source/texk/web2c/Makefile.in	2024-10-12 01:06:08 UTC (rev 72531)
@@ -3298,8 +3298,9 @@
 	uptexdir/tests/gkhugeok.tfm uptexdir/tests/gkhugeng.tfm \
 	uptexdir/tests/gkhugeng.err uptexdir/tests/gk256g.tfm \
 	uptexdir/tests/gk256k.tfm uptexdir/uptrip/uptrip.diffs \
-	uptexdir/uptrip/texmf.cnf $(euptex_web_srcs) $(euptex_ch_srcs) \
-	euptexdir/euptex.defines euptexdir/COPYRIGHT \
+	uptexdir/uptrip/texmf.cnf uptexdir/tests/up-prim.tex \
+	uptexdir/tests/up-prim.log $(euptex_web_srcs) \
+	$(euptex_ch_srcs) euptexdir/euptex.defines euptexdir/COPYRIGHT \
 	euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \
 	euptexdir/EUPTEX.txt $(euptex_tests) \
 	euptexdir/eptrip/eptrip.log euptexdir/eptrip/eptrip.tex \
@@ -3324,24 +3325,26 @@
 	euptexdir/tests/kinsoku-table.tex \
 	euptexdir/tests/kinsoku-table.log \
 	euptexdir/tests/kinsoku-search.tex \
-	euptexdir/tests/kinsoku-search.log euptexdir/tests/ucs.tex \
-	euptexdir/tests/ucs-s.log euptexdir/tests/ucs-e.log \
-	euptexdir/tests/ucs-u.log hitexdir/ChangeLog $(hitex_web) \
-	$(hitex_tests) hitexdir/tests/hello.tex \
-	hitexdir/tests/rule.tex pdftexdir/regex/COPYING.LIB \
-	pdftexdir/regex/README $(pdftex_ch_srcs) \
-	pdftexdir/pdftex.defines pdftexdir/ChangeLog pdftexdir/NEWS \
-	pdftexdir/README pdftexdir/change-files.txt $(pdftex_tests) \
-	tests/wprob.tex pdftexdir/tests/pdfimage.tex tests/1-4.jpg \
-	tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png \
-	tests/expanded.tex tests/expanded.txt tests/cnfline.tex \
-	tests/partoken-ok.tex tests/partoken-xfail.tex \
-	$(ttf2afm_tests) pdftexdir/tests/postV3.afm \
-	pdftexdir/tests/postV3.ttf pdftexdir/tests/postV7.afm \
-	pdftexdir/tests/postV7.ttf $(pdftosrc_tests) \
-	pdftexdir/tests/test-13.pdf pdftexdir/tests/test-13.xref \
-	pdftexdir/tests/test-15.pdf pdftexdir/tests/test-15.xref \
-	$(libluasocket_sources) luatexdir/luasocket/src/ftp_lua.c \
+	euptexdir/tests/kinsoku-search.log \
+	euptexdir/tests/eup-prim.tex euptexdir/tests/eup-prim.log \
+	euptexdir/tests/ucs.tex euptexdir/tests/ucs-s.log \
+	euptexdir/tests/ucs-e.log euptexdir/tests/ucs-u.log \
+	hitexdir/ChangeLog $(hitex_web) $(hitex_tests) \
+	hitexdir/tests/hello.tex hitexdir/tests/rule.tex \
+	pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
+	$(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/ChangeLog \
+	pdftexdir/NEWS pdftexdir/README pdftexdir/change-files.txt \
+	$(pdftex_tests) tests/wprob.tex pdftexdir/tests/pdfimage.tex \
+	tests/1-4.jpg tests/B.pdf tests/basic.tex \
+	tests/lily-ledger-broken.png tests/expanded.tex \
+	tests/expanded.txt tests/cnfline.tex tests/partoken-ok.tex \
+	tests/partoken-xfail.tex $(ttf2afm_tests) \
+	pdftexdir/tests/postV3.afm pdftexdir/tests/postV3.ttf \
+	pdftexdir/tests/postV7.afm pdftexdir/tests/postV7.ttf \
+	$(pdftosrc_tests) pdftexdir/tests/test-13.pdf \
+	pdftexdir/tests/test-13.xref pdftexdir/tests/test-15.pdf \
+	pdftexdir/tests/test-15.xref $(libluasocket_sources) \
+	luatexdir/luasocket/src/ftp_lua.c \
 	luatexdir/luasocket/src/headers_lua.c \
 	luatexdir/luasocket/src/http_lua.c \
 	luatexdir/luasocket/src/ltn12_lua.c \
@@ -3651,45 +3654,46 @@
 	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 \
+	uptests/ygk256*.* uptests/xskipjfmp.* uptrip.diffs up-prim.* \
 	$(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
 	euptex.p euptex.pool euptex-tangle euptrip.diffs \
 	pdfprimitive-euptex.* eup-ctrlsym.log eup-ctrlsym.out \
 	eup-ctrlsym.tex eup-endline*.* eup-jctrlsym*.* eup-pknj-*.* \
 	eup-postpena*.* eup-free_*.* eup-inhibitglue*.* eup-kinsoku*.* \
-	eup-ucs*.* $(nodist_hitex_SOURCES) $(nodist_hishrink_SOURCES) \
-	$(nodist_histretch_SOURCES) hiformat-tangle hitex-tangle \
-	hello.log rule.log $(nodist_pdftex_SOURCES) pdftex-final.ch \
-	pdftex-web2c pdftex.p pdftex.pool pdftex-tangle pwprob.log \
-	pwprob.tex pdfimage.fmt pdfimage.log pdfimage.pdf expanded.log \
-	cnfline.log partoken-ok.log partoken-xfail.log pdftests/fn*.* \
-	postV3.afm postV7.afm test-13.pdf test-13.xref test-15.pdf \
-	test-15.xref $(nodist_libluatex_sources) luaimage.* \
-	luajitimage.* $(nodist_texprof_SOURCES) texprofile-tangle \
-	texprof-tangle $(nodist_xetex_SOURCES) xetex.web \
-	xetex-final.ch xetex-web2c xetex.p xetex.pool xetex-tangle \
-	bug73.fmt bug73.log bug73.out bug73.tex filedump.log \
-	filedump.out filedump.tex xe-ctrlsym.fmt xe-ctrlsym.log \
-	xe-ctrlsym.out xe-ctrlsym.tex xetests/fn*.* \
-	$(omegaware_programs:=.c) $(omegaware_programs:=.h) \
-	$(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
-	ofm2opl.web opl2ofm.web ovf2ovp.web ovp2ovf.web \
-	omegaware/bad*.* omegaware/tests/charwdr.* \
-	omegaware/tests/charwdv.* omegaware/tests/xcheck* \
-	omegaware/tests/xlevel1.* omegaware/tests/xlig*.* ofont*vf \
-	omegaware/tests/xpagenum.* omegaware/tests/xofont* \
-	omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
-	omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
-	omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
-	ocftest.* omegaware/tests/xinbmp* omegaware/tests/xoverbmp* \
-	omegaware/tests/xrealnum.* omegaware/tests/xrepeated.* \
-	omegaware/tests/sample*.ofm omegaware/tests/sample*.ovf \
-	omegaware/tests/sample1-h.opl omegaware/tests/xsample*.out \
-	omegaware/tests/shortend.* omegaware/tests/specialhex.ofm \
-	omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
-	omegaware/tests/xspecialhex.* omegaware/tests/yrepeat* \
-	omegaware/tests/*yarabic* $(nodist_aleph_SOURCES) aleph.web \
-	aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
+	eup-prim.* eup-ucs*.* $(nodist_hitex_SOURCES) \
+	$(nodist_hishrink_SOURCES) $(nodist_histretch_SOURCES) \
+	hiformat-tangle hitex-tangle hello.log rule.log \
+	$(nodist_pdftex_SOURCES) pdftex-final.ch pdftex-web2c pdftex.p \
+	pdftex.pool pdftex-tangle pwprob.log pwprob.tex pdfimage.fmt \
+	pdfimage.log pdfimage.pdf expanded.log cnfline.log \
+	partoken-ok.log partoken-xfail.log pdftests/fn*.* postV3.afm \
+	postV7.afm test-13.pdf test-13.xref test-15.pdf test-15.xref \
+	$(nodist_libluatex_sources) luaimage.* luajitimage.* \
+	$(nodist_texprof_SOURCES) texprofile-tangle texprof-tangle \
+	$(nodist_xetex_SOURCES) xetex.web xetex-final.ch xetex-web2c \
+	xetex.p xetex.pool xetex-tangle bug73.fmt bug73.log bug73.out \
+	bug73.tex filedump.log filedump.out filedump.tex \
+	xe-ctrlsym.fmt xe-ctrlsym.log xe-ctrlsym.out xe-ctrlsym.tex \
+	xetests/fn*.* $(omegaware_programs:=.c) \
+	$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
+	$(omegaware_programs:=-web2c) ofm2opl.web opl2ofm.web \
+	ovf2ovp.web ovp2ovf.web omegaware/bad*.* \
+	omegaware/tests/charwdr.* omegaware/tests/charwdv.* \
+	omegaware/tests/xcheck* omegaware/tests/xlevel1.* \
+	omegaware/tests/xlig*.* ofont*vf omegaware/tests/xpagenum.* \
+	omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
+	omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
+	omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
+	omegaware/tests/xOCherokee.* ocftest.* omegaware/tests/xinbmp* \
+	omegaware/tests/xoverbmp* omegaware/tests/xrealnum.* \
+	omegaware/tests/xrepeated.* omegaware/tests/sample*.ofm \
+	omegaware/tests/sample*.ovf omegaware/tests/sample1-h.opl \
+	omegaware/tests/xsample*.out omegaware/tests/shortend.* \
+	omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
+	omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
+	omegaware/tests/yrepeat* omegaware/tests/*yarabic* \
+	$(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
+	aleph.pool aleph-tangle
 CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES)
 TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_27) \
 	$(am__append_36) $(am__append_44) $(am__append_60) \
@@ -4544,7 +4548,8 @@
 	uptexdir/uptriptest.test uptexdir/ptriptest.test \
 	uptexdir/upver.test \
 	uptexdir/upkcat.test \
-	uptexdir/wcfname.test uptexdir/wcfname0.test
+	uptexdir/wcfname.test uptexdir/wcfname0.test \
+	uptexdir/uptex-prim.test
 
 # uppPLtoTF/upTFtoPL
 upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \
@@ -4611,6 +4616,7 @@
 	euptexdir/euptex-ctrlsym.test \
 	euptexdir/euptex-prntknj.test \
 	euptexdir/euptex-kinsoku.test \
+	euptexdir/euptex-prim.test \
 	euptexdir/euptex-ucs.test
 
 
@@ -22115,7 +22121,8 @@
 uptexdir/uptriptest.log uptexdir/ptriptest.log: \
 	uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 uptexdir/upver.log uptexdir/upkcat.log \
-	uptexdir/wcfname.log uptexdir/wcfname0.log: uptex$(EXEEXT)
+	uptexdir/wcfname.log uptexdir/wcfname0.log \
+	uptexdir/uptex-prim.log: uptex$(EXEEXT)
 uptexdir/upbibtex.log: upbibtex$(EXEEXT)
 uptexdir/updvitype.log: updvitype$(EXEEXT)
 uptexdir/uppltotf.log: uppltotf$(EXEEXT)
@@ -22165,6 +22172,7 @@
 	euptexdir/wcfname.log euptexdir/wcfname0.log \
 	euptexdir/euptex-ctrlsym.log euptexdir/euptex-prntknj.log \
 	euptexdir/euptex-kinsoku.log \
+	euptexdir/euptex-prim.log \
 	euptexdir/euptex-ucs.log: euptex$(EXEEXT)
 
 euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)

Modified: trunk/Build/source/texk/web2c/euptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/ChangeLog	2024-10-11 23:41:58 UTC (rev 72530)
+++ trunk/Build/source/texk/web2c/euptexdir/ChangeLog	2024-10-12 01:06:08 UTC (rev 72531)
@@ -1,3 +1,10 @@
+2024-10-12  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* euptex-prim.test, tests/eup-prim.{tex,log},
+	am/euptex.am: Add a test.
+	* eptex_version.h, eptex.ech:
+	Bump version to 240930.
+
 2024-09-30  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* eptex.ech: kcatcode (latin_ucs(14)) is removed

Modified: trunk/Build/source/texk/web2c/euptexdir/am/euptex.am
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/am/euptex.am	2024-10-11 23:41:58 UTC (rev 72530)
+++ trunk/Build/source/texk/web2c/euptexdir/am/euptex.am	2024-10-12 01:06:08 UTC (rev 72531)
@@ -104,6 +104,7 @@
 	euptexdir/euptex-ctrlsym.test \
 	euptexdir/euptex-prntknj.test \
 	euptexdir/euptex-kinsoku.test \
+	euptexdir/euptex-prim.test \
 	euptexdir/euptex-ucs.test
 euptexdir/euptriptest.log euptexdir/eptriptest.log: \
 	euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
@@ -112,6 +113,7 @@
 	euptexdir/wcfname.log euptexdir/wcfname0.log \
 	euptexdir/euptex-ctrlsym.log euptexdir/euptex-prntknj.log \
 	euptexdir/euptex-kinsoku.log \
+	euptexdir/euptex-prim.log \
 	euptexdir/euptex-ucs.log: euptex$(EXEEXT)
 
 EXTRA_DIST += $(euptex_tests)
@@ -159,6 +161,9 @@
 	euptexdir/tests/kinsoku-table.tex euptexdir/tests/kinsoku-table.log \
 	euptexdir/tests/kinsoku-search.tex euptexdir/tests/kinsoku-search.log
 DISTCLEANFILES += eup-postpena*.* eup-free_*.* eup-inhibitglue*.* eup-kinsoku*.*
+## euptex-prim.test
+EXTRA_DIST += euptexdir/tests/eup-prim.tex euptexdir/tests/eup-prim.log
+DISTCLEANFILES += eup-prim.*
 ## euptex-ucs.test
 EXTRA_DIST += euptexdir/tests/ucs.tex euptexdir/tests/ucs-s.log \
 	euptexdir/tests/ucs-e.log euptexdir/tests/ucs-u.log

Modified: trunk/Build/source/texk/web2c/euptexdir/eptex.ech
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/eptex.ech	2024-10-11 23:41:58 UTC (rev 72530)
+++ trunk/Build/source/texk/web2c/euptexdir/eptex.ech	2024-10-12 01:06:08 UTC (rev 72531)
@@ -33,8 +33,8 @@
 @y
 @d eTeX_version_string=='-2.6' {current \eTeX\ version}
 @#
- at d epTeX_version_string=='-230214'
- at d epTeX_version_number==230214
+ at d epTeX_version_string=='-240930'
+ at d epTeX_version_number==240930
 @z
 
 @x e-upTeX: banner

Modified: trunk/Build/source/texk/web2c/euptexdir/eptex_version.h
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/eptex_version.h	2024-10-11 23:41:58 UTC (rev 72530)
+++ trunk/Build/source/texk/web2c/euptexdir/eptex_version.h	2024-10-12 01:06:08 UTC (rev 72531)
@@ -1 +1 @@
-#define EPTEX_VERSION "230214"
+#define EPTEX_VERSION "240930"

Added: trunk/Build/source/texk/web2c/euptexdir/euptex-prim.test
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/euptex-prim.test	                        (rev 0)
+++ trunk/Build/source/texk/web2c/euptexdir/euptex-prim.test	2024-10-12 01:06:08 UTC (rev 72531)
@@ -0,0 +1,30 @@
+#! /bin/sh -vx
+# Copyright 2024 Japanese TeX Development Community <issue at texjp.org>
+# You may freely use, modify and/or distribute this file.
+
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_euptex=$BinDir/euptex$ExeExt
+
+LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
+
+TEXMFCNF=$srcdir/../kpathsea;export TEXMFCNF
+OFMFONTS=".;$srcdir/tests"; export OFMFONTS
+TEXINPUTS=".;$srcdir/tests"; export TEXINPUTS
+TEXFORMATS=.; export TEXFORMATS
+
+# get same filename in log
+rm -f eup-prim.*
+$LN_S $srcdir/euptexdir/tests/eup-prim.tex ./eup-prim.tex
+
+if test ! -f ./eup-basic.fmt; then
+  cp $srcdir/tests/dump-basic.tex ./eup-basic.tex
+  $_euptex -ini -etex eup-basic || exit 1
+fi
+
+$_euptex -fmt=eup-basic -interaction=batchmode eup-prim || :
+
+sed 1d eup-prim.log >eup-prim.out
+
+diff $srcdir/euptexdir/tests/eup-prim.log eup-prim.out || exit 3
+


Property changes on: trunk/Build/source/texk/web2c/euptexdir/euptex-prim.test
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Build/source/texk/web2c/euptexdir/tests/eup-prim.log
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/tests/eup-prim.log	                        (rev 0)
+++ trunk/Build/source/texk/web2c/euptexdir/tests/eup-prim.log	2024-10-12 01:06:08 UTC (rev 72531)
@@ -0,0 +1,10 @@
+entering extended mode
+ restricted \write18 enabled.
+ %&-line parsing enabled.
+**eup-prim
+(./eup-prim.tex 
+15: \^^c5^^93. \^^c5^^93.  
+18: \œ. \œ.  
+15: \^^c3^^a6. \^^c3^^a6. 195^^a6. 
+18: \æ. \æ. 230. )
+No pages of output.

Added: trunk/Build/source/texk/web2c/euptexdir/tests/eup-prim.tex
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/tests/eup-prim.tex	                        (rev 0)
+++ trunk/Build/source/texk/web2c/euptexdir/tests/eup-prim.tex	2024-10-12 01:06:08 UTC (rev 72531)
@@ -0,0 +1,33 @@
+% Copyright 2024 Japanese TeX Development Community <issue at texjp.org>
+% You may freely use, modify and/or distribute this file.
+%
+\tracingmacros=2
+\tracingonline=1
+%----
+\newlinechar=10
+
+%\catcode"0153=12
+\kcatcode"0153=15\relax
+\message{^^J\the\kcatcode"153:
+  \string\œ. \expandafter\string\csname œ\endcsname. %
+  }
+
+\kcatcode"0153=18\relax
+\message{^^J\the\kcatcode"153:
+  \string\œ. \expandafter\string\csname œ\endcsname. %
+  }
+
+%\catcode"E6=12
+\kcatcode"E6=15\relax
+\message{^^J\the\kcatcode"E6:
+  \string\æ. \expandafter\string\csname æ\endcsname. %
+  \the\numexpr`\æ.}
+
+\kcatcode"E6=18\relax
+\message{^^J\the\kcatcode"E6:
+  \string\æ. \expandafter\string\csname æ\endcsname. %
+  \the\numexpr`\æ.}
+%----
+\setbox0=\vbox{} % no dvi output
+
+\end

Modified: trunk/Build/source/texk/web2c/ptexdir/tests/pknj-e.log
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/tests/pknj-e.log	2024-10-11 23:41:58 UTC (rev 72530)
+++ trunk/Build/source/texk/web2c/ptexdir/tests/pknj-e.log	2024-10-12 01:06:08 UTC (rev 72531)
@@ -213,7 +213,7 @@
  ) 
 Here is how much of TeX's memory you used:
  25 strings out of 497935
- 137 string characters out of 6219478
+ 137 string characters out of 6219477
  7541 words of memory out of 5000000
  969 multiletter control sequences out of 15000+600000
  3271 words of font info for 2 fonts, out of 8000000 for 9000

Modified: trunk/Build/source/texk/web2c/ptexdir/tests/pknj-s.log
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/tests/pknj-s.log	2024-10-11 23:41:58 UTC (rev 72530)
+++ trunk/Build/source/texk/web2c/ptexdir/tests/pknj-s.log	2024-10-12 01:06:08 UTC (rev 72531)
@@ -213,7 +213,7 @@
  ) 
 Here is how much of TeX's memory you used:
  24 strings out of 497935
- 135 string characters out of 6219475
+ 135 string characters out of 6219474
  7544 words of memory out of 5000000
  968 multiletter control sequences out of 15000+600000
  3271 words of font info for 2 fonts, out of 8000000 for 9000

Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2024-10-11 23:41:58 UTC (rev 72530)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2024-10-12 01:06:08 UTC (rev 72531)
@@ -1,3 +1,10 @@
+2024-10-12  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* uptex-prim.test, tests/up-prim.{tex,log},
+	am/uptex.am: Add a test.
+	* uptex-m.ch: revision date.
+	* COPYRIGHT.ja: copyright year.
+
 2024-09-30  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* uptex-m.ch: kcatcode (latin_ucs(14)) is removed

Modified: trunk/Build/source/texk/web2c/uptexdir/am/uptex.am
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/am/uptex.am	2024-10-11 23:41:58 UTC (rev 72530)
+++ trunk/Build/source/texk/web2c/uptexdir/am/uptex.am	2024-10-12 01:06:08 UTC (rev 72531)
@@ -171,11 +171,13 @@
 	uptexdir/uptriptest.test uptexdir/ptriptest.test \
 	uptexdir/upver.test \
 	uptexdir/upkcat.test \
-	uptexdir/wcfname.test uptexdir/wcfname0.test
+	uptexdir/wcfname.test uptexdir/wcfname0.test \
+	uptexdir/uptex-prim.test
 uptexdir/uptriptest.log uptexdir/ptriptest.log: \
 	uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 uptexdir/upver.log uptexdir/upkcat.log \
-	uptexdir/wcfname.log uptexdir/wcfname0.log: uptex$(EXEEXT)
+	uptexdir/wcfname.log uptexdir/wcfname0.log \
+	uptexdir/uptex-prim.log: uptex$(EXEEXT)
 upweb_tests = \
 	uptexdir/upbibtex.test \
 	uptexdir/updvitype.test \
@@ -265,6 +267,10 @@
 EXTRA_DIST += uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf
 DISTCLEANFILES += uptrip.diffs
 
+## uptexdir/uptex-prim.test
+EXTRA_DIST += uptexdir/tests/up-prim.tex uptexdir/tests/up-prim.log
+DISTCLEANFILES += up-prim.*
+
 uptrip.diffs: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: uptrip-clean

Modified: trunk/Build/source/texk/web2c/uptexdir/kanji.c
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/kanji.c	2024-10-11 23:41:58 UTC (rev 72530)
+++ trunk/Build/source/texk/web2c/uptexdir/kanji.c	2024-10-12 01:06:08 UTC (rev 72531)
@@ -45,7 +45,7 @@
 
 boolean is_char_kanji(integer c)
 {
-    if (is_internalUPTEX()) 
+    if (is_internalUPTEX())
         return ((c >= 0)&&(c<IVS_CHAR_LIMIT));
     else
         return iskanji1(Hi(c)) && iskanji2(Lo(c));

Added: trunk/Build/source/texk/web2c/uptexdir/tests/up-prim.log
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/tests/up-prim.log	                        (rev 0)
+++ trunk/Build/source/texk/web2c/uptexdir/tests/up-prim.log	2024-10-12 01:06:08 UTC (rev 72531)
@@ -0,0 +1,9 @@
+ restricted \write18 enabled.
+ %&-line parsing enabled.
+**up-prim
+(./up-prim.tex 
+15: \^^c5^^93. \^^c5^^93.  
+18: \œ. \œ.  
+15: \^^c3^^a6. \^^c3^^a6.  
+18: \æ. \æ.  )
+No pages of output.

Added: trunk/Build/source/texk/web2c/uptexdir/tests/up-prim.tex
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/tests/up-prim.tex	                        (rev 0)
+++ trunk/Build/source/texk/web2c/uptexdir/tests/up-prim.tex	2024-10-12 01:06:08 UTC (rev 72531)
@@ -0,0 +1,33 @@
+% Copyright 2024 Japanese TeX Development Community <issue at texjp.org>
+% You may freely use, modify and/or distribute this file.
+%
+\tracingmacros=2
+\tracingonline=1
+%----
+\newlinechar=10
+
+%\catcode"0153=12
+\kcatcode"0153=15\relax
+\message{^^J\the\kcatcode"153:
+  \string\œ. \expandafter\string\csname œ\endcsname. %
+  }
+
+\kcatcode"0153=18\relax
+\message{^^J\the\kcatcode"153:
+  \string\œ. \expandafter\string\csname œ\endcsname. %
+  }
+
+%\catcode"E6=12
+\kcatcode"E6=15\relax
+\message{^^J\the\kcatcode"E6:
+  \string\æ. \expandafter\string\csname æ\endcsname. %
+  }
+
+\kcatcode"E6=18\relax
+\message{^^J\the\kcatcode"E6:
+  \string\æ. \expandafter\string\csname æ\endcsname. %
+  }
+%----
+\setbox0=\vbox{} % no dvi output
+
+\end

Modified: trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch	2024-10-11 23:41:58 UTC (rev 72530)
+++ trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch	2024-10-12 01:06:08 UTC (rev 72531)
@@ -48,7 +48,7 @@
 % (2022-07-23) TTK  upTeX u1.29
 % (2022-12-09) HK   Hironori Kitagawa fixed a bug in \char, \kchar.
 % (2023-09-16) TTK  upTeX u1.30
-% (2024-05-01) TTK  upTeX u1.35
+% (2024-09-30) TTK  upTeX u1.35
 
 @x
 \def\pTeX{p\kern-.15em\TeX}

Added: trunk/Build/source/texk/web2c/uptexdir/uptex-prim.test
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/uptex-prim.test	                        (rev 0)
+++ trunk/Build/source/texk/web2c/uptexdir/uptex-prim.test	2024-10-12 01:06:08 UTC (rev 72531)
@@ -0,0 +1,30 @@
+#! /bin/sh -vx
+# Copyright 2024 Japanese TeX Development Community <issue at texjp.org>
+# You may freely use, modify and/or distribute this file.
+
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_uptex=$BinDir/uptex$ExeExt
+
+LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
+
+TEXMFCNF=$srcdir/../kpathsea;export TEXMFCNF
+OFMFONTS=".;$srcdir/tests"; export OFMFONTS
+TEXINPUTS=".;$srcdir/tests"; export TEXINPUTS
+TEXFORMATS=.; export TEXFORMATS
+
+# get same filename in log
+rm -f up-prim.*
+$LN_S $srcdir/uptexdir/tests/up-prim.tex ./up-prim.tex
+
+if test ! -f ./up-basic.fmt; then
+  cp $srcdir/tests/dump-basic.tex ./up-basic.tex
+  $_uptex -ini up-basic || exit 1
+fi
+
+$_uptex -fmt=up-basic -interaction=batchmode up-prim || :
+
+sed 1d up-prim.log >up-prim.out
+
+diff $srcdir/uptexdir/tests/up-prim.log up-prim.out || exit 3
+


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


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