texlive[62223] Build/source/texk/dvipsk: dvips: Interpret FONTDIR RT
commits+takuji at tug.org
commits+takuji at tug.org
Sun Feb 27 11:34:32 CET 2022
Revision: 62223
http://tug.org/svn/texlive?view=revision&revision=62223
Author: takuji
Date: 2022-02-27 11:34:32 +0100 (Sun, 27 Feb 2022)
Log Message:
-----------
dvips: Interpret FONTDIR RT in OFM as pTeX vertical writing
Modified Paths:
--------------
trunk/Build/source/texk/dvipsk/ChangeLog
trunk/Build/source/texk/dvipsk/Makefile.am
trunk/Build/source/texk/dvipsk/Makefile.in
trunk/Build/source/texk/dvipsk/testdata/Makefile_upjf
trunk/Build/source/texk/dvipsk/tfmload.c
trunk/Build/source/texk/dvipsk/uptex-vf.test
Added Paths:
-----------
trunk/Build/source/texk/dvipsk/testdata/upjf-g00.ofm
trunk/Build/source/texk/dvipsk/testdata/upjf-g00.opl
trunk/Build/source/texk/dvipsk/testdata/upjv-g00.ofm
trunk/Build/source/texk/dvipsk/testdata/upjv-g00.opl
Modified: trunk/Build/source/texk/dvipsk/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipsk/ChangeLog 2022-02-27 10:34:28 UTC (rev 62222)
+++ trunk/Build/source/texk/dvipsk/ChangeLog 2022-02-27 10:34:32 UTC (rev 62223)
@@ -1,3 +1,13 @@
+2022-02-27 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * tfmload.c:
+ Interpret FONTDIR RT in OFM as pTeX vertical writing.
+ https://github.com/texjporg/tex-jp-build/issues/135
+ * Makefile.{am,in}, uptex-vf.test,
+ testdata/Makefile_upjf, testdata/upjf-g00.{opl,ofm},
+ testdata/upjf-g00.{opl,ofm}:
+ Add a new test for pTeX & OFM FONTDIR.
+
2022-02-24 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* Makefile.{am,in}, uptex-vf.test,
Modified: trunk/Build/source/texk/dvipsk/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvipsk/Makefile.am 2022-02-27 10:34:28 UTC (rev 62222)
+++ trunk/Build/source/texk/dvipsk/Makefile.am 2022-02-27 10:34:32 UTC (rev 62223)
@@ -191,8 +191,10 @@
testdata/upjf_full.vf testdata/upjf_omit.vf \
testdata/upjv.tfm testdata/upjv-g.tfm testdata/upjv-r.tfm \
testdata/upjv_full.vf testdata/upjv_omit.vf \
+ testdata/upjf-g00.opl testdata/upjf-g00.ofm \
+ testdata/upjv-g00.opl testdata/upjv-g00.ofm \
testdata/upjf_full.cnf testdata/upjf_omit.cnf
-DISTCLEANFILES += upjf.vf upjv.vf upjf_full.ps upjf_omit.ps
+DISTCLEANFILES += upjf.vf upjv.vf upjf-g.ofm upjv-g.ofm upjf_full.ps upjf_omit.ps
EXTRA_DIST += \
NEWS \
Modified: trunk/Build/source/texk/dvipsk/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvipsk/Makefile.in 2022-02-27 10:34:28 UTC (rev 62222)
+++ trunk/Build/source/texk/dvipsk/Makefile.in 2022-02-27 10:34:32 UTC (rev 62223)
@@ -722,8 +722,8 @@
DISTCLEANFILES = $(DVIS) $(PSS) beginfontk1.ps eepic-nan.ps pfbincl.ps \
*badnews* same-name.out afmtest.tfm dvipstst.ps missfont.log \
mtest.ps missing-image.ps overflow-color-push.ps \
- overflow-epsfile.ps overflow-psbox.ps upjf.vf upjf_full.ps \
- upjf_omit.ps
+ overflow-epsfile.ps overflow-psbox.ps upjf.vf upjf-g.ofm \
+ upjv-g.ofm upjf_full.ps upjf_omit.ps
enc_DATA = dvips-all.enc
prolog_DATA = $(prologues)
dist_prologues = \
@@ -763,7 +763,9 @@
testdata/upjf_omit.vf testdata/upjf_full.cnf \
testdata/upjf_omit.cnf testdata/upjv.tfm testdata/upjv-g.tfm \
testdata/upjv-r.tfm testdata/upjv_full.vf \
- testdata/upjv_omit.vf testdata/upjf_full.cnf \
+ testdata/upjv_omit.vf testdata/upjf-g00.opl \
+ testdata/upjf-g00.ofm testdata/upjv-g00.opl \
+ testdata/upjv-g00.ofm testdata/upjf_full.cnf \
testdata/upjf_omit.cnf NEWS TODO testdata/intoverflow.dvi \
testdata/vfnameoverflow.dvi atari cmfonts.map config.ps \
contrib/afm-extra contrib/colorsep.lpro contrib/configs \
Modified: trunk/Build/source/texk/dvipsk/testdata/Makefile_upjf
===================================================================
--- trunk/Build/source/texk/dvipsk/testdata/Makefile_upjf 2022-02-27 10:34:28 UTC (rev 62222)
+++ trunk/Build/source/texk/dvipsk/testdata/Makefile_upjf 2022-02-27 10:34:32 UTC (rev 62223)
@@ -26,6 +26,12 @@
makejvf -i -u custom -e -t upjf_omit.cnf upjv.tfm -K upjv-g upjv-r
mv upjv.vf upjv_omit.vf
+upjf-g00.ofm:
+ opl2ofm upjf-g00.opl
+
+upjv-g00.ofm:
+ opl2ofm upjv-g00.opl
+
upjf.dvi: upjf.tex
uplatex upjf.tex
dvispc -a upjf.dvi upjf.dvitxt
Added: trunk/Build/source/texk/dvipsk/testdata/upjf-g00.ofm
===================================================================
--- trunk/Build/source/texk/dvipsk/testdata/upjf-g00.ofm (rev 0)
+++ trunk/Build/source/texk/dvipsk/testdata/upjf-g00.ofm 2022-02-27 10:34:32 UTC (rev 62223)
@@ -0,0 +1 @@
+ I & \xFF\xFF /
\xA0
UNSPECIFIED UPJF
.\xFE \x9E\xFF \xFF ff \x99\x9A \x99\x9A
\ No newline at end of file
Added: trunk/Build/source/texk/dvipsk/testdata/upjf-g00.opl
===================================================================
--- trunk/Build/source/texk/dvipsk/testdata/upjf-g00.opl (rev 0)
+++ trunk/Build/source/texk/dvipsk/testdata/upjf-g00.opl 2022-02-27 10:34:32 UTC (rev 62223)
@@ -0,0 +1,33 @@
+(OFMLEVEL H 1)
+(FONTDIR TL)
+(FAMILY UPJF)
+(FACE F MRR)
+(CODINGSCHEME UNSPECIFIED)
+(DESIGNSIZE R 10.0)
+(COMMENT DESIGNSIZE IS IN POINTS)
+(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)
+(CHECKSUM H 0)
+(SEVENBITSAFEFLAG FALSE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.0)
+ (STRETCH R 0.1)
+ (SHRINK R 0.0)
+ (XHEIGHT R 1.0)
+ (QUAD R 1.0)
+ )
+(CHARREPEAT H 2600 H B00
+ (CHARWD R 1.0)
+ (CHARHT R 0.9)
+ (CHARDP R 0.1)
+ )
+(CHARREPEAT H 6000 H 9EFF
+ (CHARWD R 1.0)
+ (CHARHT R 0.9)
+ (CHARDP R 0.1)
+ )
+(CHARREPEAT H FF00 H FF
+ (CHARWD R 0.5)
+ (CHARHT R 0.9)
+ (CHARDP R 0.1)
+ )
Added: trunk/Build/source/texk/dvipsk/testdata/upjv-g00.ofm
===================================================================
--- trunk/Build/source/texk/dvipsk/testdata/upjv-g00.ofm (rev 0)
+++ trunk/Build/source/texk/dvipsk/testdata/upjv-g00.ofm 2022-02-27 10:34:32 UTC (rev 62223)
@@ -0,0 +1 @@
+ E & \xFF\xFF / \xA0
UNSPECIFIED UPJF
.\xFE \x9F\xFF \x99\x9A
\ No newline at end of file
Added: trunk/Build/source/texk/dvipsk/testdata/upjv-g00.opl
===================================================================
--- trunk/Build/source/texk/dvipsk/testdata/upjv-g00.opl (rev 0)
+++ trunk/Build/source/texk/dvipsk/testdata/upjv-g00.opl 2022-02-27 10:34:32 UTC (rev 62223)
@@ -0,0 +1,28 @@
+(OFMLEVEL H 1)
+(FONTDIR RT)
+(FAMILY UPJF)
+(FACE F MRR)
+(CODINGSCHEME UNSPECIFIED)
+(DESIGNSIZE R 10.0)
+(COMMENT DESIGNSIZE IS IN POINTS)
+(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)
+(CHECKSUM H 0)
+(SEVENBITSAFEFLAG FALSE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.0)
+ (STRETCH R 0.1)
+ (SHRINK R 0.0)
+ (XHEIGHT R 1.0)
+ (QUAD R 1.0)
+ )
+(CHARREPEAT H 2600 H B00
+ (CHARWD R 1.0)
+ (CHARHT R 0.5)
+ (CHARDP R 0.5)
+ )
+(CHARREPEAT H 6000 H 9FFF
+ (CHARWD R 1.0)
+ (CHARHT R 0.5)
+ (CHARDP R 0.5)
+ )
Modified: trunk/Build/source/texk/dvipsk/tfmload.c
===================================================================
--- trunk/Build/source/texk/dvipsk/tfmload.c 2022-02-27 10:34:28 UTC (rev 62222)
+++ trunk/Build/source/texk/dvipsk/tfmload.c 2022-02-27 10:34:32 UTC (rev 62223)
@@ -175,6 +175,11 @@
bc = tfm32(); ec = tfm32();
nw = tfm32();
for (i=0; i<8; i++) li=tfm32();
+ if (!noptex && font_level==1 && ec>=0x2E00) {
+ curfnt->iswide = 1;
+ if (li==5) /* interpret FONTDIR RT as pTeX vertical writing */
+ curfnt->dir = 9;
+ }
if (font_level>1 || hd<2 || bc<0 || ec<0 || nw<0
|| bc>ec+1 || ec>65535 || nw>65536)
badtfm("header");
Modified: trunk/Build/source/texk/dvipsk/uptex-vf.test
===================================================================
--- trunk/Build/source/texk/dvipsk/uptex-vf.test 2022-02-27 10:34:28 UTC (rev 62222)
+++ trunk/Build/source/texk/dvipsk/uptex-vf.test 2022-02-27 10:34:32 UTC (rev 62223)
@@ -7,6 +7,8 @@
SOURCE_DATE_EPOCH=1588474800
export TEXFONTS SOURCE_DATE_EPOCH
+rm -f upjf.vf upjv.vf upjf-g.ofm upjv-g.ofm
+
cp $srcdir/testdata/upjf_full.vf ./upjf.vf && \
cp $srcdir/testdata/upjv_full.vf ./upjv.vf && \
./dvips -d 4 $srcdir/testdata/upjf.dvi -o upjf.ps -u $srcdir/testdata/upjf.map && \
@@ -14,6 +16,8 @@
cp $srcdir/testdata/upjf_omit.vf ./upjf.vf && \
cp $srcdir/testdata/upjv_omit.vf ./upjv.vf && \
+cp $srcdir/testdata/upjf-g00.ofm ./upjf-g.ofm && \
+cp $srcdir/testdata/upjv-g00.ofm ./upjv-g.ofm && \
./dvips -d 4 $srcdir/testdata/upjf.dvi -o upjf.ps -u $srcdir/testdata/upjf.map && \
mv upjf.ps upjf_omit.ps || exit 2
More information about the tex-live-commits
mailing list.