9 files changed, 483 insertions, 2 deletions

diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog
index 6c6e82471fd..b95236439c0 100644
--- a/Build/source/texk/web2c/alephdir/ChangeLog
+++ b/Build/source/texk/web2c/alephdir/ChangeLog
@@ -1,3 +1,9 @@
+2024-10-20  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* aleph-{ofm,lmr}.test, tests/lmr1.tex,
+	tests/al-ofm.tex, tests/al-lmr1.log, tests/al-ofm.log,
+	tests/inutf8.ocp, am/aleph.am: Add tests for OFM.
+
 2024-03-10  Karl Berry  <karl@tug.org>
 
 	* TL'24 release.
diff --git a/Build/source/texk/web2c/alephdir/aleph-lmr.test b/Build/source/texk/web2c/alephdir/aleph-lmr.test
new file mode 100755
index 00000000000..9fe4f41933a
--- /dev/null
+++ b/Build/source/texk/web2c/alephdir/aleph-lmr.test
@@ -0,0 +1,33 @@
+#! /bin/sh -vx
+# Copyright 2024 Japanese TeX Development Community <issue@texjp.org>
+# You may freely use, modify and/or distribute this file.
+
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_aleph=$BinDir/aleph$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
+OCPINPUTS=".;$srcdir/alephdir/tests"; export OCPINPUTS
+TEXFORMATS=.; export TEXFORMATS
+
+# get same filename in log
+rm -f al-lmr*.*
+$LN_S $srcdir/alephdir/tests/lmr1.tex ./al-lmr1.tex
+
+if test ! -f ./al-basic.tex; then
+  cp $srcdir/tests/dump-basic.tex ./al-basic.tex
+fi
+if test ! -f ./al-basic.fmt; then
+  $_aleph -ini -etex al-basic || exit 1
+fi
+
+$_aleph -fmt=al-basic -interaction=batchmode al-lmr1.tex || :
+
+sed '1d;3d;4d' al-lmr1.log >al-lmr1.out
+
+diff $srcdir/alephdir/tests/al-lmr1.log al-lmr1.out || exit 3
+
diff --git a/Build/source/texk/web2c/alephdir/aleph-ofm.test b/Build/source/texk/web2c/alephdir/aleph-ofm.test
new file mode 100755
index 00000000000..c05bdb2ed7d
--- /dev/null
+++ b/Build/source/texk/web2c/alephdir/aleph-ofm.test
@@ -0,0 +1,33 @@
+#! /bin/sh -vx
+# Copyright 2024 Japanese TeX Development Community <issue@texjp.org>
+# You may freely use, modify and/or distribute this file.
+
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_aleph=$BinDir/aleph$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
+OCPINPUTS=".;$srcdir/alephdir/tests"; export OCPINPUTS
+TEXFORMATS=.; export TEXFORMATS
+
+# get same filename in log
+rm -f al-ofm.*
+$LN_S $srcdir/alephdir/tests/al-ofm.tex ./al-ofm.tex
+
+if test ! -f ./al-basic.tex; then
+  cp $srcdir/tests/dump-basic.tex ./al-basic.tex
+fi
+if test ! -f ./al-basic.fmt; then
+  $_aleph -ini -etex al-basic || exit 1
+fi
+
+$_aleph -fmt=al-basic -interaction=batchmode al-ofm || :
+
+sed '1d;3d;4d' al-ofm.log >al-ofm.out
+
+diff $srcdir/alephdir/tests/al-ofm.log al-ofm.out || exit 3
+
diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am
index a79c10c3a27..0e43452ea4a 100644
--- a/Build/source/texk/web2c/alephdir/am/aleph.am
+++ b/Build/source/texk/web2c/alephdir/am/aleph.am
@@ -104,11 +104,21 @@ EXTRA_DIST += \
 
 # Aleph Tests
 #
-aleph_tests = alephdir/aleph.test
-alephdir/aleph.log: aleph$(EXEEXT)
+aleph_tests = alephdir/aleph.test \
+	alephdir/aleph-ofm.test alephdir/aleph-lmr.test
+alephdir/aleph.log \
+	alephdir/aleph-ofm.log alephdir/aleph-lmr.log \
+	: aleph$(EXEEXT)
 
 EXTRA_DIST += $(aleph_tests)
 
+## alephdir/aleph-ofm.test
+EXTRA_DIST += alephdir/tests/al-ofm.tex alephdir/tests/al-ofm.log
+DISTCLEANFILES += al-ofm.*
+## alephdir/aleph-lmr.test
+EXTRA_DIST += alephdir/tests/lmr1.tex alephdir/tests/al-lmr1.log
+DISTCLEANFILES += al-lmr*.*
+
 if ALEPH
 TESTS += $(aleph_tests)
 endif ALEPH
diff --git a/Build/source/texk/web2c/alephdir/tests/al-lmr1.log b/Build/source/texk/web2c/alephdir/tests/al-lmr1.log
new file mode 100644
index 00000000000..4581ddde28e
--- /dev/null
+++ b/Build/source/texk/web2c/alephdir/tests/al-lmr1.log
@@ -0,0 +1,90 @@
+ restricted \write18 enabled.
+Copyright (C) 1994--2000 John Plaice and Yannis Haralambous
+Copyright (C) 2002--2021 Aleph task force
+entering extended mode
+**al-lmr1.tex
+(al-lmr1.tex
+\ChrA=\count26
+\ChrB=\count27
+> \box0=
+\hbox(6.88875+0.0)x14.16666, direction TLT
+.\eulmr Y
+.\kern-0.83334
+.\eulmr A
+
+! OK.
+l.67 \showbox0
+              
+
+> \box1=
+\hbox(6.88875+1.94443)x14.16666, direction TLT
+.\eulmr Y
+.\kern-0.83334
+.\eulmr ^^^^0104
+
+! OK.
+l.69 \showbox1
+              
+
+> \box2=
+\hbox(8.29999+1.94443)x14.16666, direction TLT
+.\eulmr ^^^^0178
+.\kern-0.83334
+.\eulmr ^^^^0104
+
+! OK.
+l.71 \showbox2
+              
+
+> \box3=
+\hbox(9.20499+0.0)x14.16666, direction TLT
+.\eulmr ^^dd
+.\kern-0.83334
+.\eulmr ^^c5
+
+! OK.
+l.73 \showbox3
+              
+
+> \box0=
+\hbox(6.88875+0.0)x14.16666, direction TLT
+.\eclmr Y
+.\kern-0.83334
+.\eclmr A
+
+! OK.
+l.83 \showbox0
+              
+
+> \box1=
+\hbox(6.88875+1.94443)x14.16666, direction TLT
+.\eclmr Y
+.\kern-0.83334
+.\eclmr ^^81
+
+! OK.
+l.85 \showbox1
+              
+
+> \box2=
+\hbox(8.29999+1.94443)x14.16666, direction TLT
+.\eclmr ^^98
+.\kern-0.83334
+.\eclmr ^^81
+
+! OK.
+l.87 \showbox2
+              
+
+> \box3=
+\hbox(9.20499+0.0)x14.16666, direction TLT
+.\eclmr ^^dd
+.\kern-0.83334
+.\eclmr ^^c5
+
+! OK.
+l.89 \showbox3
+              
+
+[1] )
+Output written on al-lmr1.dvi (1 page, 7960 bytes).
diff --git a/Build/source/texk/web2c/alephdir/tests/al-ofm.log b/Build/source/texk/web2c/alephdir/tests/al-ofm.log
new file mode 100644
index 00000000000..4220eea5ba4
--- /dev/null
+++ b/Build/source/texk/web2c/alephdir/tests/al-ofm.log
@@ -0,0 +1,26 @@
+ restricted \write18 enabled.
+Copyright (C) 1994--2000 John Plaice and Yannis Haralambous
+Copyright (C) 2002--2021 Aleph task force
+entering extended mode
+**al-ofm
+(al-ofm.tex cmtt10 uctt10x
+> \box0=
+\hbox(6.94+0.0)x15.74995, direction TLT
+.\uctt [
+.\uctt ^^c6
+.\uctt ]
+
+! OK.
+l.44 \showbox0
+              
+
+
+\AAA ->^^c6^^a1
+
+\mAAA ->macro:->^^c6^^a1
+
+\AAA ->^^^^0152 ^^^^0152 ^^c6^^a1
+
+\mAAA ->macro:->^^^^0152 ^^^^0152 ^^c6^^a1
+We have "2010. We do not have "2014. [1] )
+Output written on al-ofm.dvi (1 page, 884 bytes).
diff --git a/Build/source/texk/web2c/alephdir/tests/al-ofm.tex b/Build/source/texk/web2c/alephdir/tests/al-ofm.tex
new file mode 100644
index 00000000000..a3ffe471900
--- /dev/null
+++ b/Build/source/texk/web2c/alephdir/tests/al-ofm.tex
@@ -0,0 +1,90 @@
+% Copyright 2024 Japanese TeX Development Community <issue@texjp.org>
+% You may freely use, modify and/or distribute this file.
+%
+\ifx\fmtname\undefined
+  \input basic
+  \def\fmtname{basic}
+  \expandafter\dump
+\fi
+%==================
+\begingroup % Just there to minimize tracing output
+  \tracingmacros=2
+  \tracingonline=1
+%----
+\ocp\ORGin=inutf8
+\InputTranslation currentfile \ORGin
+\message{cmtt10}
+\font\cmtt=cmtt10
+\cmtt
+\char"21\char"22\char"23\char"24\char"25
+
+\char"30\char"31\char"32\char"33 \char"41\char"42\char"43 \char"64\char"65\char"66
+
+0123 ABC def
+
+
+\message{uctt10x}
+\font\uctt=uctt10x
+\uctt
+\char"21\char"22\char"23\char"24\char"25
+
+\char"30\char"31\char"32\char"33 \char"41\char"42\char"43 \char"64\char"65\char"66
+
+0123 ABC def
+
+
+\catcode"C6=11  \catcode"D8=11  \catcode"DF=11
+\catcode"E6=11  \catcode"F8=11
+
+\char"C6\char"D8\char"DF^^e6^^^^00f8
+
+ÆØßæø
+
+\setbox0\hbox{[Æ]}
+\showbox0
+
+\catcode"2DA=11
+
+\char"C6\char"A1^^c6\char"BF
+
+\def\AAA{^^c6^^a1}\AAA
+\edef\mAAA{\meaning\AAA}\mAAA
+
+\catcode"123=11  \catcode"131=11  \catcode"152=11
+\catcode"153=11
+
+\char"123\char"131\char"152^^^^0153
+
+ģıŒœ
+
+\def\AAA{Π^^^^0152 ^^c6^^a1}\AAA
+\edef\mAAA{\meaning\AAA}\mAAA
+
+\catcode"393=11  \catcode"394=11  \catcode"398=11
+\catcode"39B=11  \catcode"39E=11
+
+\char"393\char"394\char`Θ\char"39B^^^^039e
+
+ΓΔΘΛΞ
+
+\catcode"2010=11  \catcode"2018=11  \catcode"2019=11
+
+\char"2010\char"2018^^^^2019
+
+‐‘’
+
+\lccode"C6="E6
+\uccode"E6="C6
+\lccode`Œ=`œ
+\uccode`œ=`Œ
+
+\uppercase{[aeoe æœ]}
+\lowercase{[AEOE ƌ]}
+
+\message{We}\iffontchar\font"2010\else\message{do not}\fi\message{have "2010.}
+\message{We}\iffontchar\font"2014\else\message{do not}\fi\message{have "2014.}
+
+%----
+\setbox0=\vbox{} % no dvi output
+\endgroup
+\end
diff --git a/Build/source/texk/web2c/alephdir/tests/inutf8.ocp b/Build/source/texk/web2c/alephdir/tests/inutf8.ocp
new file mode 100644
index 00000000000..92f9886b79f
--- /dev/null
+++ b/Build/source/texk/web2c/alephdir/tests/inutf8.ocp
diff --git a/Build/source/texk/web2c/alephdir/tests/lmr1.tex b/Build/source/texk/web2c/alephdir/tests/lmr1.tex
new file mode 100644
index 00000000000..9ac307fcdf6
--- /dev/null
+++ b/Build/source/texk/web2c/alephdir/tests/lmr1.tex
@@ -0,0 +1,193 @@
+%!uptex
+
+% Copyright 2024 Japanese TeX Development Community <issue@texjp.org>
+% You may freely use, modify and/or distribute this file.
+%
+\parindent=0pt
+\ocp\ORGin=inutf8
+\InputTranslation currentfile \ORGin
+
+\font\eulmr=eu3-lmr10
+\font\eclmr=ec-lmr10
+\eulmr
+
+\catcode"C0=11
+
+\newcount\ChrA\newcount\ChrB
+\def\SetCatCode#1{%
+ \loop\ifnum\ChrA<\ChrB
+  \catcode\ChrA=#1
+  \sfcode\ChrA=1000
+  \advance\ChrA 1\relax \repeat
+}
+
+\ChrA="100 \ChrB="180
+\SetCatCode{11}
+
+Ă㥹 ĆćČč ĎďĐđ ĘęĚě Ğğ İıIJij Ĺ弾Łł ŃńŇňŊŋ
+ŐőŒœ ŔŕŘř ŚśŞşŠš ŢţŤť ŮůŰű Ÿ ŹźŻżŽž
+
+eu3-lmr10:
+
+AT AŤ AY AÝ AŸ AV AW Av Aw Ay Aý Aÿ
+
+ÀT ÀŤ ÀY ÀÝ ÀŸ ÀV ÀW Àv Àw Ày Àý Àÿ
+
+ÁT ÁŤ ÁY ÁÝ ÁŸ ÁV ÁW Áv Áw Áy Áý Áÿ
+
+ÂT ÂŤ ÂY ÂÝ ÂŸ ÂV ÂW Âv Âw Ây Âý Âÿ
+
+ÃT ÃŤ ÃY ÃÝ ÃŸ ÃV ÃW Ãv Ãw Ãy Ãý Ãÿ
+
+ÄT ÄŤ ÄY ÄÝ ÄŸ ÄV ÄW Äv Äw Äy Äý Äÿ
+
+ÅT ÅŤ ÅY ÅÝ ÅŸ ÅV ÅW Åv Åw Åy Åý Åÿ
+
+ĂT ĂŤ ĂY ĂÝ ĂŸ ĂV ĂW Ăv Ăw Ăy Ăý Ăÿ
+
+ĄT ĄŤ ĄY ĄÝ ĄŸ ĄV ĄW Ąv Ąw Ąy Ąý Ąÿ
+
+{
+\eclmr
+
+ec-lmr10:
+
+AT A^^94 AY A^^dd A^^98 AV AW Av Aw Ay A^^fd A^^b8
+
+^^c5T ^^c5^^94 ^^c5Y ^^c5^^dd ^^c5^^98 ^^c5V ^^c5W ^^c5v ^^c5w ^^c5y ^^c5^^fd ^^c5^^b8
+
+^^81T ^^81^^94 ^^81Y ^^81^^dd ^^81^^98 ^^81V ^^81W ^^81v ^^81w ^^81y ^^81^^fd ^^81^^b8
+}
+
+eu3-lmr10:
+
+FA FÀ FÁ F Fà FÄ FÅ FĂ FĄ FÆ FŒ Fa Fą Fæ Fc Fç Fd Fe Fm Fn Fo Fø Fp Fr Fs Fş Fu Fv Fw Fy Fz
+
+\setbox0\hbox{YA}
+\showbox0
+\setbox1\hbox{YĄ}
+\showbox1
+\setbox2\hbox{ŸĄ}
+\showbox2
+\setbox3\hbox{ÝÅ}
+\showbox3
+
+{
+\eclmr
+
+ec-lmr10:
+
+FA F^^c0 F^^c1 F^^c2 F^^c3 F^^c4 F^^c5 F^^80 F^^81 F^^c6 F^^d7 Fa F^^a1 F^^e6 Fc F^^e7 Fd Fe Fm Fn Fo F^^f8 Fp Fr Fs F^^b3 Fu Fv Fw Fy Fz
+
+\setbox0\hbox{YA}
+\showbox0
+\setbox1\hbox{Y^^81}
+\showbox1
+\setbox2\hbox{^^98^^81}
+\showbox2
+\setbox3\hbox{^^dd^^c5}
+\showbox3
+}
+
+eu3-lmr10:
+
+TA TÀ TÁ TÂ TÃ TÄ TÅ TĂ TĄ TÆ
+
+ŤA ŤÀ ŤÁ ŤÂ ŤÃ ŤÄ ŤÅ ŤĂ ŤĄ ŤÆ
+
+{
+\eclmr
+
+ec-lmr10:
+
+TA T^^c0 T^^c1 T^^c2 T^^c3 T^^c4 T^^c5 T^^80 T^^81 T^^c6
+
+^^94A ^^94^^c0 ^^94^^c1 ^^94^^c2 ^^94^^c3 ^^94^^c4 ^^94^^c5 ^^94^^80 ^^94^^81 ^^94^^c6
+}
+
+eu3-lmr10:
+
+Ta Tæ Tą Tc Tç Td Tđ Tı Te Tę Tg Tn To Tœ Tø Tp Tr Ts Tu Tv Tw Tx Tz
+
+Ťa Ťæ Ťą Ťc Ťç Ťd Ťđ Ťı Ťe Ťę Ťg Ťn Ťo Ťœ Ťø Ťp Ťr Ťs Ťu Ťv Ťw Ťx Ťz
+
+{
+\eclmr
+
+ec-lmr10:
+
+Ta T^^e6 T^^a1 Tc T^^e7 Td T^^9e T^^19 Te T^^a6 Tg Tn To T^^f7 T^^f8 Tp Tr Ts Tu Tv Tw Tx Tz
+
+^^94a ^^94^^e6 ^^94^^a1 ^^94c ^^94^^e7 ^^94d ^^94^^9e ^^94^^19 ^^94e ^^94^^a6 ^^94g ^^94n ^^94o ^^94^^f7 ^^94^^f8 ^^94p ^^94r ^^94s ^^94u ^^94v ^^94w ^^94x ^^94z
+}
+
+eu3-lmr10:
+
+YA YÀ YÁ YÂ YÃ YÄ YÅ YĂ YĄ YÆ
+
+ÝA ÝÀ ÝÁ ÝÂ ÝÃ ÝÄ ÝÅ ÝĂ ÝĄ ÝÆ
+
+ŸA ŸÀ ŸÁ ŸÂ ŸÃ ŸÄ ŸÅ ŸĂ ŸĄ ŸÆ
+
+{
+\eclmr
+
+ec-lmr10:
+
+YA Y^^c0 Y^^c1 Y^^c2 Y^^c3 Y^^c4 Y^^c5 Y^^80 Y^^81 Y^^c6
+
+^^ddA ^^dd^^c0 ^^dd^^c1 ^^dd^^c2 ^^dd^^c3 ^^dd^^c4 ^^dd^^c5 ^^dd^^80 ^^dd^^81 ^^dd^^c6
+
+^^98A ^^98^^c0 ^^98^^c1 ^^98^^c2 ^^98^^c3 ^^98^^c4 ^^98^^c5 ^^98^^80 ^^98^^81 ^^98^^c6
+}
+
+eu3-lmr10:
+
+Ya Yæ Yą Yc Yç Yd Yđ Yı Ye Yę Yg Yn Yo Yœ Yø Yp Yr Ys Yu Yv Yw Yx Yz
+
+Ýa Ýæ Ýą Ýc Ýç Ýd Ýđ Ýı Ýe Ýę Ýg Ýn Ýo Ýœ Ýø Ýp Ýr Ýs Ýu Ýv Ýw Ýx Ýz
+
+Ÿa Ÿæ Ÿą Ÿc Ÿç Ÿd Ÿđ Ÿı Ÿe Ÿę Ÿg Ÿn Ÿo Ÿœ Ÿø Ÿp Ÿr Ÿs Ÿu Ÿv Ÿw Ÿx Ÿz
+
+{
+\eclmr
+
+ec-lmr10:
+
+Ya Y^^e6 Y^^a1 Yc Y^^e7 Yd Y^^9e Y^^19 Ye Y^^a6 Yg Yn Yo Y^^f7 Y^^f8 Yp Yr Ys Yu Yv Yw Yx Yz
+
+^^dda ^^dd^^e6 ^^dd^^a1 ^^ddc ^^dd^^e7 ^^ddd ^^dd^^9e ^^dd^^19 ^^dde ^^dd^^a6 ^^ddg ^^ddn ^^ddo ^^dd^^f7 ^^dd^^f8 ^^ddp ^^ddr ^^dds ^^ddu ^^ddv ^^ddw ^^ddx ^^ddz
+
+^^98a ^^98^^e6 ^^98^^a1 ^^98c ^^98^^e7 ^^98d ^^98^^9e ^^98^^19 ^^98e ^^98^^a6 ^^98g ^^98n ^^98o ^^98^^f7 ^^98^^f8 ^^98p ^^98r ^^98s ^^98u ^^98v ^^98w ^^98x ^^98z
+}
+
+\sfcode"C6=999
+\sfcode"152=999
+\lccode"C6="E6 % Æ -> æ
+\lccode"152="153 % Œ -> œ
+\lccode"153="153
+
+% do not use U+BF, U+2019, U+201C, U+201D
+``?`But aren't Kafka's Schloß and Æsop's Œuvres
+often naïve vis-à-vis the dæmonic phœnix's official rôle
+in fluffy soufflés?''
+
+\catcode"2019=11
+\catcode"201C=11
+\catcode"201D=11
+
+“¿But aren’t Kafka’s Schloß and Æsop’s Œuvres
+often naïve vis-à-vis the dæmonic phœnix’s official rôle
+in fluffy soufflés?”
+
+{
+\eclmr
+\lccode"D7="F7 % Œ -> œ in T1 encoding
+\lccode"F7="F7
+
+``?`But aren't Kafka's Schlo^^ff and ^^c6sop's ^^d7uvres
+often na^^efve vis-^^e0-vis the d^^e6monic ph^^f7nix's official r^^f4le
+in fluffy souffl^^e9s?''
+}
+
+\bye