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

source/texk/texlive/linked_scripts/Makefile.in

@@ -443,6 +443,7 @@ texmf_other_scripts = \
 	runtexshebang/runtexshebang.lua \
 	spix/spix.py \
 	splitindex/splitindex.pl \
+	sqltex/sqltex \
 	srcredact/srcredact.pl \
 	sty2dtx/sty2dtx.pl \
 	svn-multi/svn-multi.pl \

source/texk/web2c/Makefile.in

@@ -3307,23 +3307,41 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	euptexdir/pdfprimitive.test \
 	euptexdir/tests/pdfprimitive-test.tex \
 	euptexdir/tests/pdfprimitive-euptex.log \
-	euptexdir/tests/ctrlsym.log euptexdir/tests/ctrlsym.tex \
-	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/ctrlsym.tex euptexdir/tests/ctrlsym.log \
+	euptexdir/tests/endlinechar.tex euptexdir/tests/endline.log \
+	euptexdir/tests/control-symbol.tex \
+	euptexdir/tests/jctrlsym.log euptexdir/tests/eup-endlinea.typ \
+	euptexdir/tests/eup-jctrlsyma.typ \
+	euptexdir/tests/printkanji.tex euptexdir/tests/pknj-s.log \
+	euptexdir/tests/pknj-e.log euptexdir/tests/pknj-u.log \
+	euptexdir/tests/eup-pknj-sa.typ \
+	euptexdir/tests/eup-pknj-ea.typ \
+	euptexdir/tests/eup-pknj-ua.typ euptexdir/tests/postpena.tex \
+	euptexdir/tests/postpena.log euptexdir/tests/free_ixsp.tex \
+	euptexdir/tests/free_ixsp.log euptexdir/tests/free_pena.tex \
+	euptexdir/tests/free_pena.log euptexdir/tests/inhibitglue.tex \
+	euptexdir/tests/eup-inhibitgluea.typ \
+	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 \
 	luatexdir/luasocket/src/headers_lua.c \
 	luatexdir/luasocket/src/http_lua.c \
 	luatexdir/luasocket/src/ltn12_lua.c \
@@ -3636,41 +3654,42 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
 	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) \
-	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
+	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
 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) \
@@ -4586,10 +4605,13 @@ euptex_ch_srcs = \
 euptex_tests = \
 	euptexdir/euptriptest.test euptexdir/eptriptest.test \
 	euptexdir/pdfprimitive.test \
-	euptexdir/euptex-ctrlsym.test \
 	euptexdir/eupver.test \
 	euptexdir/upkcat.test \
-	euptexdir/wcfname.test euptexdir/wcfname0.test
+	euptexdir/wcfname.test euptexdir/wcfname0.test \
+	euptexdir/euptex-ctrlsym.test \
+	euptexdir/euptex-prntknj.test \
+	euptexdir/euptex-kinsoku.test \
+	euptexdir/euptex-ucs.test
 
 
 # At the moment, these are the only man pages handled in the
@@ -22139,9 +22161,12 @@ euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
 euptexdir/euptriptest.log euptexdir/eptriptest.log: \
 	euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 euptexdir/pdfprimitive.log: euptex$(EXEEXT)
-euptexdir/euptex-ctrlsym.log \
-	euptexdir/eupver.log euptexdir/upkcat.log \
-	euptexdir/wcfname.log euptexdir/wcfname0.log: euptex$(EXEEXT)
+euptexdir/eupver.log euptexdir/upkcat.log \
+	euptexdir/wcfname.log euptexdir/wcfname0.log \
+	euptexdir/euptex-ctrlsym.log euptexdir/euptex-prntknj.log \
+	euptexdir/euptex-kinsoku.log \
+	euptexdir/euptex-ucs.log: euptex$(EXEEXT)
+
 euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: euptrip-clean

source/texk/web2c/euptexdir/ChangeLog

@@ -1,3 +1,19 @@
+2024-09-21  TANAKA Takuji  <[email protected]>
+
+	* eptex.ech, pdfutils.ch:
+	Better support for kcatcode=20 (modifier).
+	* euptex-{ctrlsym,kinsoku,prntknj,ucs}.test,
+	tests/{control-symbol,ctrlsym.tex,endlinechar,free_{ixsp,pena},
+	inhibitglue,kinsoku_{search,table},postpena,printkanji,ucs}.tex,
+	tests/eup-{endline,inhibitglue,jctrlsym,pknj-{e,s,u}}a.typ,
+	tests/{endline,free_{ixsp,pena},jctrlsym,kinsoku_{search,table},
+	pknj-{e,s,u},postpena,ucs-{e,s,u}}.log:
+	Add regression tests by using Kitagawa-san's and
+	Yamashita-san's sample files.
+	* tests/{free_{ixsp,pena},inhibitglue,kinsoku_{search,table},
+	postpena}.tex: Move from ../ptexdir/tests .
+	* am/euptex.am: Adjust.
+
 2024-06-04  Akira Kakuto  <[email protected]>
 
 	* unbalanced-braces-eptex.ch, suppresserrors.ch: sync with the upstream

source/texk/web2c/euptexdir/am/euptex.am

@@ -98,16 +98,21 @@ EXTRA_DIST += \
 euptex_tests = \
 	euptexdir/euptriptest.test euptexdir/eptriptest.test \
 	euptexdir/pdfprimitive.test \
-	euptexdir/euptex-ctrlsym.test \
 	euptexdir/eupver.test \
 	euptexdir/upkcat.test \
-	euptexdir/wcfname.test euptexdir/wcfname0.test
+	euptexdir/wcfname.test euptexdir/wcfname0.test \
+	euptexdir/euptex-ctrlsym.test \
+	euptexdir/euptex-prntknj.test \
+	euptexdir/euptex-kinsoku.test \
+	euptexdir/euptex-ucs.test
 euptexdir/euptriptest.log euptexdir/eptriptest.log: \
 	euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 euptexdir/pdfprimitive.log: euptex$(EXEEXT)
-euptexdir/euptex-ctrlsym.log \
-	euptexdir/eupver.log euptexdir/upkcat.log \
-	euptexdir/wcfname.log euptexdir/wcfname0.log: euptex$(EXEEXT)
+euptexdir/eupver.log euptexdir/upkcat.log \
+	euptexdir/wcfname.log euptexdir/wcfname0.log \
+	euptexdir/euptex-ctrlsym.log euptexdir/euptex-prntknj.log \
+	euptexdir/euptex-kinsoku.log \
+	euptexdir/euptex-ucs.log: euptex$(EXEEXT)
 
 EXTRA_DIST += $(euptex_tests)
 
@@ -125,11 +130,6 @@ EXTRA_DIST += \
 	euptexdir/eptrip/eptrip.tex \
 	euptexdir/euptrip/euptrip.diffs \
 	euptexdir/euptrip/texmf.cnf
-euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
-	$(triptrap_diffs) $@
-.PHONY: euptrip-clean
-euptrip-clean:
-	rm -rf euptripdir
 DISTCLEANFILES += euptrip.diffs
 ## euptexdir/pdfprimitive.test
 EXTRA_DIST += \
@@ -139,7 +139,35 @@ EXTRA_DIST += \
 DISTCLEANFILES += pdfprimitive-euptex.*
 
 ## euptex-ctrlsym.test
-EXTRA_DIST += euptexdir/tests/ctrlsym.log euptexdir/tests/ctrlsym.tex
-DISTCLEANFILES += eup-ctrlsym.fmt eup-ctrlsym.log eup-ctrlsym.out eup-ctrlsym.tex
+EXTRA_DIST += euptexdir/tests/ctrlsym.tex euptexdir/tests/ctrlsym.log \
+	euptexdir/tests/endlinechar.tex euptexdir/tests/endline.log \
+	euptexdir/tests/control-symbol.tex euptexdir/tests/jctrlsym.log \
+	euptexdir/tests/eup-endlinea.typ euptexdir/tests/eup-jctrlsyma.typ
+DISTCLEANFILES += eup-ctrlsym.log eup-ctrlsym.out eup-ctrlsym.tex \
+	eup-endline*.* eup-jctrlsym*.*
+## euptex-prntknj.test
+EXTRA_DIST += euptexdir/tests/printkanji.tex euptexdir/tests/pknj-s.log \
+	euptexdir/tests/pknj-e.log euptexdir/tests/pknj-u.log \
+	euptexdir/tests/eup-pknj-sa.typ euptexdir/tests/eup-pknj-ea.typ \
+	euptexdir/tests/eup-pknj-ua.typ
+DISTCLEANFILES += eup-pknj-*.*
+## euptex-kinsoku.test
+EXTRA_DIST += euptexdir/tests/postpena.tex euptexdir/tests/postpena.log \
+	euptexdir/tests/free_ixsp.tex euptexdir/tests/free_ixsp.log \
+	euptexdir/tests/free_pena.tex euptexdir/tests/free_pena.log \
+	euptexdir/tests/inhibitglue.tex euptexdir/tests/eup-inhibitgluea.typ \
+	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-ucs.test
+EXTRA_DIST += euptexdir/tests/ucs.tex euptexdir/tests/ucs-s.log \
+	euptexdir/tests/ucs-e.log euptexdir/tests/ucs-u.log
+DISTCLEANFILES += eup-ucs*.*
+
+euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+	$(triptrap_diffs) $@
+.PHONY: euptrip-clean
+euptrip-clean:
+	rm -rf euptripdir
 
 # (end of euptex.am)

source/texk/web2c/euptexdir/eptex.ech

@@ -309,6 +309,14 @@ end
 @d if_tdir_code=if_case_code+4 { `\.{\\iftdir}' }
 @z
 
+@x procedure conditional
+@!m,@!n:integer; {to be tested against the second operand}
+@!p,@!q:pointer; {for traversing token lists in \.{\\ifx} tests}
+@y
+@!m,@!n,@!s,@!v,@!nn,@!jj:integer; {to be tested against the second operand}
+@!p,@!q:pointer; {for traversing token lists in \.{\\ifx} tests}
+@z
+
 @x [30.???] |scan_font_ident|: recognize \lastnodefont
 else  begin print_err("Missing font identifier");
 @y
@@ -736,13 +744,35 @@ if j=1 then
 @y
   if check_kanji(info(p)) then {|wchar_token|}
     begin
-    if BYTE1(toBUFF(info(p) mod max_cjk_val))<>0 then
-      begin buffer[m]:=BYTE1(toBUFF(info(p) mod max_cjk_val)); buffer2[m]:=1; incr(m); end;
-    if BYTE2(toBUFF(info(p) mod max_cjk_val))<>0 then
-      begin buffer[m]:=BYTE2(toBUFF(info(p) mod max_cjk_val)); buffer2[m]:=1; incr(m); end;
-    if BYTE3(toBUFF(info(p) mod max_cjk_val))<>0 then
-      begin buffer[m]:=BYTE3(toBUFF(info(p) mod max_cjk_val)); buffer2[m]:=1; incr(m); end;
-    buffer[m]:=BYTE4(toBUFF(info(p) mod max_cjk_val)); buffer2[m]:=1; incr(m);
+    if (isinternalUPTEX) then begin
+      s:=toUCS(ktokentochr(info(p)));
+      nn:=UVSgetcodepointlength(s);
+      jj:=1;
+      while jj<=nn do begin
+      v:=UVSgetcodepointinsequence(s,jj);
+      if (v>0) then begin
+        v:=UCStoUTF8(v);
+        if BYTE1(v)<>0 then
+          begin buffer[m]:=BYTE1(v); buffer2[m]:=1; incr(m); end;
+        if BYTE2(v)<>0 then
+          begin buffer[m]:=BYTE2(v); buffer2[m]:=1; incr(m); end;
+        if BYTE3(v)<>0 then
+          begin buffer[m]:=BYTE3(v); buffer2[m]:=1; incr(m); end;
+                buffer[m]:=BYTE4(v); buffer2[m]:=1; incr(m);
+        end;
+        incr(jj);
+      end
+    end
+    else begin
+      v:=toBUFF(info(p) mod max_cjk_val);
+      if BYTE1(v)<>0 then
+        begin buffer[m]:=BYTE1(v); buffer2[m]:=1; incr(m); end;
+      if BYTE2(v)<>0 then
+        begin buffer[m]:=BYTE2(v); buffer2[m]:=1; incr(m); end;
+      if BYTE3(v)<>0 then
+        begin buffer[m]:=BYTE3(v); buffer2[m]:=1; incr(m); end;
+              buffer[m]:=BYTE4(v); buffer2[m]:=1; incr(m);
+    end;
     p:=link(p);
     end
   else

source/texk/web2c/euptexdir/euptex-ctrlsym.test

@@ -5,24 +5,55 @@
 BinDir=${BinDir:-.}
 ExeExt=${ExeExt:-}
 _euptex=$BinDir/euptex$ExeExt
+_updvitype=$BinDir/updvitype$ExeExt
 
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
 TEXMFCNF=$srcdir/../kpathsea;export TEXMFCNF
 TEXINPUTS=".;$srcdir/tests"; export TEXINPUTS
+TEXFONTS=".;$srcdir//tests"; export TEXFONTS
 TEXFORMATS=.; export TEXFORMATS
 
-# get same filename in log
-rm -f eup-ctrlsym.tex
-$LN_S $srcdir/euptexdir/tests/ctrlsym.tex ./eup-ctrlsym.tex
-
-#exit 77
+rm -f eup-ctrlsym.* eup-endline*.* eup-jctrlsym*.*
 
-$_euptex -ini -etex eup-ctrlsym || exit 1
+if test ! -f ./eup-basic.tex; then
+  cp $srcdir/tests/dump-basic.tex ./eup-basic.tex
+fi
+if test ! -f ./eup-basic.fmt; then
+  $_euptex -ini -etex eup-basic || exit 1
+fi
 
-$_euptex -etex -fmt=eup-ctrlsym eup-ctrlsym || exit 2
+# ctrlsym.tex
+$LN_S $srcdir/euptexdir/tests/ctrlsym.tex ./eup-ctrlsym.tex
+$_euptex -etex -fmt=eup-basic eup-ctrlsym || exit 2
 
 sed 1d eup-ctrlsym.log >eup-ctrlsym.out
 
 diff $srcdir/euptexdir/tests/ctrlsym.log eup-ctrlsym.out || exit 3
 
+
+# endlinchar.tex
+$LN_S $srcdir/euptexdir/tests/endlinechar.tex ./eup-endline.tex
+$_euptex -fmt=eup-basic -interaction=batchmode eup-endline.tex || :
+
+sed 1d eup-endline.log >eup-endline.out
+
+diff $srcdir/euptexdir/tests/endline.log eup-endline.out || exit 4
+
+$_updvitype ./eup-endline.dvi >euptests/xeup-endline.typ
+sed "1d;s/TeX output 20[23].\...\...:.*'/TeX output 20XX.XX.XX'/" euptests/xeup-endline.typ >euptests/xeup-endlinea.typ
+diff $srcdir/euptexdir/tests/eup-endlinea.typ euptests/xeup-endlinea.typ || exit 5
+
+
+# control-symbol.tex
+$LN_S $srcdir/euptexdir/tests/control-symbol.tex ./eup-jctrlsym.tex
+$_euptex -fmt=eup-basic -interaction=batchmode eup-jctrlsym.tex || :
+
+sed 1d eup-jctrlsym.log >eup-jctrlsym.out
+
+diff $srcdir/euptexdir/tests/jctrlsym.log eup-jctrlsym.out || exit 6
+
+$_updvitype ./eup-jctrlsym.dvi >euptests/xeup-jctrlsym.typ
+sed "1d;s/TeX output 20[23].\...\...:.*'/TeX output 20XX.XX.XX'/" euptests/xeup-jctrlsym.typ >euptests/xeup-jctrlsyma.typ
+diff $srcdir/euptexdir/tests/eup-jctrlsyma.typ euptests/xeup-jctrlsyma.typ || exit 7
+