From 5837565307206d06f408fd7bc573853c5aef0133 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 17 Dec 2013 13:03:55 +0000 Subject: uptexdir: Add a test for upPLtoTF/upTFtoPL with yoko and tate fonts git-svn-id: svn://tug.org/texlive/trunk@32429 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/Makefile.in | 26 +- Build/source/texk/web2c/ptexdir/ChangeLog | 5 + Build/source/texk/web2c/ptexdir/ppltotf.ch | 28 +- Build/source/texk/web2c/uptexdir/ChangeLog | 7 + Build/source/texk/web2c/uptexdir/am/uptex.am | 6 + Build/source/texk/web2c/uptexdir/tests/min10.pl | 393 ++++++++++++++++++++++ Build/source/texk/web2c/uptexdir/tests/min10.tfm | Bin 0 -> 1196 bytes Build/source/texk/web2c/uptexdir/tests/tmin10.pl | 286 ++++++++++++++++ Build/source/texk/web2c/uptexdir/tests/tmin10.tfm | Bin 0 -> 856 bytes Build/source/texk/web2c/uptexdir/yokotate.test | 28 ++ 10 files changed, 740 insertions(+), 39 deletions(-) create mode 100644 Build/source/texk/web2c/uptexdir/tests/min10.pl create mode 100644 Build/source/texk/web2c/uptexdir/tests/min10.tfm create mode 100644 Build/source/texk/web2c/uptexdir/tests/tmin10.pl create mode 100644 Build/source/texk/web2c/uptexdir/tests/tmin10.tfm create mode 100755 Build/source/texk/web2c/uptexdir/yokotate.test diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index a71b58dd601..42e52ddfb08 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -1800,7 +1800,9 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ uptexdir/upbibtex.ch ptexdir/pdvitype.ch uptexdir/updvitype.ch \ ptexdir/ppltotf.ch uptexdir/uppltotf.ch ptexdir/ptftopl.ch \ uptexdir/uptftopl.ch uptexdir/COPYRIGHT uptexdir/COPYRIGHT.jis \ - uptexdir/ChangeLog uptexdir/uptrip/uptrip.diffs \ + uptexdir/ChangeLog uptexdir/tests/min10.pl \ + uptexdir/tests/min10.tfm uptexdir/tests/tmin10.pl \ + uptexdir/tests/tmin10.tfm uptexdir/uptrip/uptrip.diffs \ uptexdir/uptrip/texmf.cnf $(euptex_tests) $(euptex_web_srcs) \ $(euptex_ch_srcs) euptexdir/euptex.defines euptexdir/COPYRIGHT \ euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \ @@ -2002,12 +2004,13 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \ uptex.ch uptex-web2c uptex.p uptex.pool uptex-tangle \ uptests/xexampl.aux uptests/xexampl.bbl uptests/xexampl.blg \ uptests/xstory.dvityp uptests/xpagenum.typ uptests/xcmr10.tfm \ - uptests/xcmr10.pl uptrip.diffs $(nodist_euptex_SOURCES) \ - euptex.web euptex.ch euptex-web2c euptex.p euptex.pool \ - euptex-tangle euptrip.diffs $(nodist_pdftex_SOURCES) pdftex.ch \ - pdftex-web2c pdftex.p pdftex.pool pdftex-tangle pwprob.log \ - pwprob.tex pdfimage.fmt pdfimage.log pdfimage.pdf postV3.afm \ - postV7.afm test-13.pdf test-13.xref test-15.pdf test-15.xref \ + uptests/xcmr10.pl uptests/x*min10.* uptrip.diffs \ + $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \ + euptex.p euptex.pool euptex-tangle euptrip.diffs \ + $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \ + pdftex.pool pdftex-tangle pwprob.log pwprob.tex pdfimage.fmt \ + pdfimage.log pdfimage.pdf postV3.afm postV7.afm test-13.pdf \ + test-13.xref test-15.pdf test-15.xref \ $(nodist_libluatex_a_SOURCES) luaimage.fmt luaimage.log \ luaimage.pdf txt2zlib.c $(nodist_xetex_SOURCES) xetex.web \ xetex.ch xetex-web2c xetex.p xetex.pool xetex-tangle \ @@ -2358,12 +2361,9 @@ upweb_programs = upbibtex updvitype uppltotf uptftopl # upTeX Tests uptex_tests = uptexdir/uptrip.test -upweb_tests = \ - uptexdir/upbibtex.test \ - uptexdir/updvitype.test \ - uptexdir/uppltotf.test \ - uptexdir/uptftopl.test - +upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \ + uptexdir/uppltotf.test uptexdir/uptftopl.test \ + uptexdir/yokotate.test libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c libukanji_a_CPPFLAGS = $(uptex_cppflags) uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_93) diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index c8eeb015152..2d51e373116 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,8 @@ +2013-12-17 Peter Breitenlohner + + * ppltotf.ch: Drop one unused change set (is in ../pltotf.ch). + Print DIRECTION value with print_ln() instead of err_print(). + 2013-11-18 Peter Breitenlohner * ptex-base.ch: Simplify a few change sets. diff --git a/Build/source/texk/web2c/ptexdir/ppltotf.ch b/Build/source/texk/web2c/ptexdir/ppltotf.ch index 1ca61bdb0e2..1747546668e 100644 --- a/Build/source/texk/web2c/ptexdir/ppltotf.ch +++ b/Build/source/texk/web2c/ptexdir/ppltotf.ch @@ -56,30 +56,6 @@ else begin while (limit; -% end; -% end; -% @y -% buffer[limit+1]:=' '; right_ln:=eoln(pl_file); -% if right_ln then begin incr(limit); buffer[limit+1]:=' '; -% end; -% if left_ln then @; -% end; -% end; -% @z - @x [36] l.754 - pTeX: May have to increase some numbers to fit new commands @d max_name_index=88 {upper bound on the number of keywords} @d max_letters=600 {upper bound on the total length of all keywords} @@ -584,11 +560,11 @@ property (|dir_code| command). @= begin while cur_char=" " do get_next; if cur_char="T" then - begin if verbose then err_print('This is tatekumi format'); + begin if verbose then print_ln('This is tatekumi format'); file_format:=vfm_format; end else if cur_char="Y" then - begin if verbose then err_print('This is yokokumi format'); + begin if verbose then print_ln('This is yokokumi format'); file_format:=jfm_format; end else err_print('The dir value should be "TATE" or "YOKO"'); diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 0c46092ccc4..bd495677693 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,10 @@ +2013-12-17 Peter Breitenlohner + + * yokotate.test (new): Shell scripts to test upPLtoTF/upTFtoPL + with yoko and tate fonts. + * tests/{min10,tmin10}.{pl,tfm} (new): Data for yokotate.test. + * am/uptex.am: Add the new tests. + 2013-08-12 TANAKA Takuji * kanji.h, uptex.defines: Allow file names with 0x5c diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am index 4c99f54aa7d..6b486f73962 100644 --- a/Build/source/texk/web2c/uptexdir/am/uptex.am +++ b/Build/source/texk/web2c/uptexdir/am/uptex.am @@ -161,6 +161,8 @@ uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch ptexdir/ptftopl.ch $(tie) -m uptftopl.web tftopl.web tftopl.ch ptexdir/ptftopl.ch EXTRA_DIST += ptexdir/ptftopl.ch uptexdir/uptftopl.ch +upweb_tests += uptexdir/yokotate.test + ## EXTRA_DIST += \ uptexdir/COPYRIGHT \ @@ -187,6 +189,10 @@ DISTCLEANFILES += uptests/xstory.dvityp uptests/xpagenum.typ DISTCLEANFILES += uptests/xcmr10.tfm ## uptexdir/uptftopl.test DISTCLEANFILES += uptests/xcmr10.pl +## uptexdir/yokotate.test +EXTRA_DIST += uptexdir/tests/min10.pl uptexdir/tests/min10.tfm +EXTRA_DIST += uptexdir/tests/tmin10.pl uptexdir/tests/tmin10.tfm +DISTCLEANFILES += uptests/x*min10.* ## uptexdir/uptrip.test EXTRA_DIST += uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf uptrip.diffs: uptex$(EXEEXT) diff --git a/Build/source/texk/web2c/uptexdir/tests/min10.pl b/Build/source/texk/web2c/uptexdir/tests/min10.pl new file mode 100644 index 00000000000..8a17f8d878e --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/tests/min10.pl @@ -0,0 +1,393 @@ +(COMMENT THIS IS A KANJI FORMAT FILE) +(FAMILY MINCHO) +(FACE F MRR) +(CODINGSCHEME TEX KANJI TEXT) +(DESIGNSIZE R 10.0) +(COMMENT DESIGNSIZE IS IN POINTS) +(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) +(CHECKSUM O 35147750366) +(SEVENBITSAFEFLAG TRUE) +(FONTDIMEN + (SLANT R 0.0) + (SPACE R 0.0) + (STRETCH R 0.091641) + (SHRINK R 0.0) + (XHEIGHT R 0.916443) + (QUAD R 0.962216) + (EXTRASPACE R 0.229101) + (EXTRASTRETCH R 0.183283) + (EXTRASHRINK R 0.114551) + ) +(GLUEKERN + (LABEL O 0) + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (STOP) + (LABEL O 7) + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (KRN O 10 R -0.048114) + (KRN O 11 R -0.048114) + (STOP) + (LABEL O 12) + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (KRN O 10 R -0.096228) + (KRN O 11 R -0.096228) + (STOP) + (LABEL O 13) + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (KRN O 10 R -0.144327) + (KRN O 11 R -0.144327) + (STOP) + (LABEL O 14) + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (KRN O 10 R -0.192441) + (KRN O 11 R -0.192441) + (STOP) + (LABEL O 2) + (LABEL O 10) + (GLUE O 0 R 0.608551 R 0.0 R 0.229101) + (GLUE O 7 R 0.608551 R 0.0 R 0.229101) + (GLUE O 12 R 0.608551 R 0.0 R 0.229101) + (GLUE O 13 R 0.608551 R 0.0 R 0.229101) + (GLUE O 14 R 0.608551 R 0.0 R 0.229101) + (GLUE O 10 R 0.0 R 0.3042755 R 0.0) + (GLUE O 2 R 0.0 R 0.3042755 R 0.0) + (GLUE O 4 R 0.458203 R 0.0 R 0.229101) + (GLUE O 5 R 0.458203 R 0.0 R 0.229101) + (GLUE O 3 R 0.458203 R 0.0 R 0.229101) + (GLUE O 6 R 0.229101 R 0.229101 R 0.229101) + (STOP) + (LABEL O 4) + (GLUE O 0 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 7 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 12 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 13 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 14 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 10 R 0.0 R 0.3042755 R 0.0) + (GLUE O 2 R 0.0 R 0.3042755 R 0.0) + (GLUE O 4 R 0.0 R 0.3042755 R 0.0) + (GLUE O 5 R 0.0 R 0.3042755 R 0.0) + (GLUE O 3 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 6 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 11 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 1 R 0.3042755 R 0.0 R 0.3042755) + (STOP) + (LABEL O 5) + (GLUE O 0 R 0.229101 R 0.0 R 0.229101) + (GLUE O 7 R 0.229101 R 0.0 R 0.229101) + (GLUE O 12 R 0.229101 R 0.0 R 0.229101) + (GLUE O 13 R 0.229101 R 0.0 R 0.229101) + (GLUE O 14 R 0.229101 R 0.0 R 0.229101) + (GLUE O 10 R 0.0 R 0.3042755 R 0.0) + (GLUE O 2 R 0.0 R 0.3042755 R 0.0) + (GLUE O 4 R 0.0 R 0.3042755 R 0.0) + (GLUE O 5 R 0.0 R 0.3042755 R 0.0) + (GLUE O 3 R 0.229101 R 0.0 R 0.229101) + (GLUE O 6 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 11 R 0.229101 R 0.0 R 0.229101) + (GLUE O 1 R 0.229101 R 0.0 R 0.229101) + (STOP) + (LABEL O 3) + (GLUE O 0 R 0.107391 R 0.0 R 0.107391) + (GLUE O 7 R 0.107391 R 0.0 R 0.107391) + (GLUE O 12 R 0.107391 R 0.0 R 0.107391) + (GLUE O 13 R 0.107391 R 0.0 R 0.107391) + (GLUE O 14 R 0.107391 R 0.0 R 0.107391) + (GLUE O 10 R 0.0 R 0.3042755 R 0.0) + (GLUE O 2 R 0.0 R 0.3042755 R 0.0) + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (GLUE O 11 R 0.107391 R 0.0 R 0.107391) + (GLUE O 1 R 0.107391 R 0.0 R 0.107391) + (STOP) + (LABEL O 6) + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.0 R 0.458203 R 0.0) + (STOP) + (LABEL O 1) + (LABEL O 11) + (GLUE O 0 R 0.458203 R 0.0 R 0.229101) + (GLUE O 7 R 0.458203 R 0.0 R 0.229101) + (GLUE O 12 R 0.458203 R 0.0 R 0.229101) + (GLUE O 13 R 0.458203 R 0.0 R 0.229101) + (GLUE O 14 R 0.458203 R 0.0 R 0.229101) + (GLUE O 10 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 2 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 4 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 5 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 3 R 0.458203 R 0.0 R 0.229101) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (GLUE O 11 R 0.0 R 0.458203 R 0.0) + (GLUE O 1 R 0.0 R 0.458203 R 0.0) + (STOP) + ) +(CHARSINTYPE O 1 + U 214B U 214D U 214F U 2151 U 2153 U 2155 U 2157 U 2159 U 215B + ) +(CHARSINTYPE O 2 + U 212B U 212C + ) +(CHARSINTYPE O 3 + U 2136 U 2137 U 2139 U 2168 U 2169 U 216A U 2170 U 2171 U 2172 U 2421 + U 2423 U 2425 U 2427 U 2429 U 2443 U 2463 U 2465 U 2467 U 246E U 2521 + U 2523 U 2525 U 2527 U 2529 U 2543 U 2563 U 2565 U 2567 U 256E U 2575 + U 2576 + ) +(CHARSINTYPE O 4 + U 2126 U 2127 U 2128 U 212A U 212D U 212E U 213E U 2142 U 2143 U 2146 + U 2147 + ) +(CHARSINTYPE O 5 + U 2129 U 212F U 2130 U 2133 U 2135 U 2148 U 2149 U 216B U 216C U 216D + U 2178 + ) +(CHARSINTYPE O 6 + U 214A U 214C U 214E U 2150 U 2152 U 2154 U 2156 U 2158 U 215A + ) +(CHARSINTYPE O 7 + U 2426 U 242F U 2430 U 2431 U 2432 U 2439 U 243A U 246A U 2546 U 2547 + U 2564 + ) +(CHARSINTYPE O 10 + U 2124 U 2125 + ) +(CHARSINTYPE O 11 + U 2122 U 2123 + ) +(CHARSINTYPE O 12 + U 2522 U 2524 U 2526 U 252A U 2531 U 2532 U 2535 U 2536 U 253D U 253E + U 2541 U 2542 U 2544 U 2545 U 2548 U 2549 U 254A U 2555 U 2556 U 2557 + U 255F U 2561 U 2569 U 256A U 256F U 2572 + ) +(CHARSINTYPE O 13 + U 252F U 2530 U 253F U 2540 + ) +(CHARSINTYPE O 14 + U 254E + ) +(TYPE O 0 + (CHARWD R 0.962216) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + ) + ) +(TYPE O 1 + (CHARWD R 0.504013) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 0 R 0.458203 R 0.0 R 0.229101) + (GLUE O 7 R 0.458203 R 0.0 R 0.229101) + (GLUE O 12 R 0.458203 R 0.0 R 0.229101) + (GLUE O 13 R 0.458203 R 0.0 R 0.229101) + (GLUE O 14 R 0.458203 R 0.0 R 0.229101) + (GLUE O 10 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 2 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 4 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 5 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 3 R 0.458203 R 0.0 R 0.229101) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (GLUE O 11 R 0.0 R 0.458203 R 0.0) + (GLUE O 1 R 0.0 R 0.458203 R 0.0) + ) + ) +(TYPE O 2 + (CHARWD R 0.353665) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 0 R 0.608551 R 0.0 R 0.229101) + (GLUE O 7 R 0.608551 R 0.0 R 0.229101) + (GLUE O 12 R 0.608551 R 0.0 R 0.229101) + (GLUE O 13 R 0.608551 R 0.0 R 0.229101) + (GLUE O 14 R 0.608551 R 0.0 R 0.229101) + (GLUE O 10 R 0.0 R 0.3042755 R 0.0) + (GLUE O 2 R 0.0 R 0.3042755 R 0.0) + (GLUE O 4 R 0.458203 R 0.0 R 0.229101) + (GLUE O 5 R 0.458203 R 0.0 R 0.229101) + (GLUE O 3 R 0.458203 R 0.0 R 0.229101) + (GLUE O 6 R 0.229101 R 0.229101 R 0.229101) + ) + ) +(TYPE O 3 + (CHARWD R 0.747434) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 0 R 0.107391 R 0.0 R 0.107391) + (GLUE O 7 R 0.107391 R 0.0 R 0.107391) + (GLUE O 12 R 0.107391 R 0.0 R 0.107391) + (GLUE O 13 R 0.107391 R 0.0 R 0.107391) + (GLUE O 14 R 0.107391 R 0.0 R 0.107391) + (GLUE O 10 R 0.0 R 0.3042755 R 0.0) + (GLUE O 2 R 0.0 R 0.3042755 R 0.0) + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (GLUE O 11 R 0.107391 R 0.0 R 0.107391) + (GLUE O 1 R 0.107391 R 0.0 R 0.107391) + ) + ) +(TYPE O 4 + (CHARWD R 0.353665) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 0 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 7 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 12 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 13 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 14 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 10 R 0.0 R 0.3042755 R 0.0) + (GLUE O 2 R 0.0 R 0.3042755 R 0.0) + (GLUE O 4 R 0.0 R 0.3042755 R 0.0) + (GLUE O 5 R 0.0 R 0.3042755 R 0.0) + (GLUE O 3 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 6 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 11 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 1 R 0.3042755 R 0.0 R 0.3042755) + ) + ) +(TYPE O 5 + (CHARWD R 0.504013) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 0 R 0.229101 R 0.0 R 0.229101) + (GLUE O 7 R 0.229101 R 0.0 R 0.229101) + (GLUE O 12 R 0.229101 R 0.0 R 0.229101) + (GLUE O 13 R 0.229101 R 0.0 R 0.229101) + (GLUE O 14 R 0.229101 R 0.0 R 0.229101) + (GLUE O 10 R 0.0 R 0.3042755 R 0.0) + (GLUE O 2 R 0.0 R 0.3042755 R 0.0) + (GLUE O 4 R 0.0 R 0.3042755 R 0.0) + (GLUE O 5 R 0.0 R 0.3042755 R 0.0) + (GLUE O 3 R 0.229101 R 0.0 R 0.229101) + (GLUE O 6 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 11 R 0.229101 R 0.0 R 0.229101) + (GLUE O 1 R 0.229101 R 0.0 R 0.229101) + ) + ) +(TYPE O 6 + (CHARWD R 0.504013) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.0 R 0.458203 R 0.0) + ) + ) +(TYPE O 7 + (CHARWD R 0.962216) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (KRN O 10 R -0.048114) + (KRN O 11 R -0.048114) + ) + ) +(TYPE O 10 + (CHARWD R 0.353665) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 0 R 0.608551 R 0.0 R 0.229101) + (GLUE O 7 R 0.608551 R 0.0 R 0.229101) + (GLUE O 12 R 0.608551 R 0.0 R 0.229101) + (GLUE O 13 R 0.608551 R 0.0 R 0.229101) + (GLUE O 14 R 0.608551 R 0.0 R 0.229101) + (GLUE O 10 R 0.0 R 0.3042755 R 0.0) + (GLUE O 2 R 0.0 R 0.3042755 R 0.0) + (GLUE O 4 R 0.458203 R 0.0 R 0.229101) + (GLUE O 5 R 0.458203 R 0.0 R 0.229101) + (GLUE O 3 R 0.458203 R 0.0 R 0.229101) + (GLUE O 6 R 0.229101 R 0.229101 R 0.229101) + ) + ) +(TYPE O 11 + (CHARWD R 0.504013) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 0 R 0.458203 R 0.0 R 0.229101) + (GLUE O 7 R 0.458203 R 0.0 R 0.229101) + (GLUE O 12 R 0.458203 R 0.0 R 0.229101) + (GLUE O 13 R 0.458203 R 0.0 R 0.229101) + (GLUE O 14 R 0.458203 R 0.0 R 0.229101) + (GLUE O 10 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 2 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 4 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 5 R 0.229101 R 0.229101 R 0.229101) + (GLUE O 3 R 0.458203 R 0.0 R 0.229101) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (GLUE O 11 R 0.0 R 0.458203 R 0.0) + (GLUE O 1 R 0.0 R 0.458203 R 0.0) + ) + ) +(TYPE O 12 + (CHARWD R 0.962216) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (KRN O 10 R -0.096228) + (KRN O 11 R -0.096228) + ) + ) +(TYPE O 13 + (CHARWD R 0.962216) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (KRN O 10 R -0.144327) + (KRN O 11 R -0.144327) + ) + ) +(TYPE O 14 + (CHARWD R 0.962216) + (CHARHT R 0.777588) + (CHARDP R 0.138855) + (COMMENT + (GLUE O 4 R 0.3042755 R 0.0 R 0.3042755) + (GLUE O 5 R 0.229101 R 0.0 R 0.229101) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 6 R 0.458203 R 0.0 R 0.229101) + (KRN O 10 R -0.192441) + (KRN O 11 R -0.192441) + ) + ) diff --git a/Build/source/texk/web2c/uptexdir/tests/min10.tfm b/Build/source/texk/web2c/uptexdir/tests/min10.tfm new file mode 100644 index 00000000000..1bf04b7ac32 Binary files /dev/null and b/Build/source/texk/web2c/uptexdir/tests/min10.tfm differ diff --git a/Build/source/texk/web2c/uptexdir/tests/tmin10.pl b/Build/source/texk/web2c/uptexdir/tests/tmin10.pl new file mode 100644 index 00000000000..9df7a0d083e --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/tests/tmin10.pl @@ -0,0 +1,286 @@ +(COMMENT THIS IS A KANJI FORMAT FILE) +(DIRECTION TATE) +(FAMILY MINCHO) +(FACE F MRR) +(CODINGSCHEME JIS X0208) +(DESIGNSIZE R 10.0) +(COMMENT DESIGNSIZE IS IN POINTS) +(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) +(CHECKSUM O 35147750366) +(SEVENBITSAFEFLAG TRUE) +(FONTDIMEN + (SLANT R 0.0) + (SPACE R 0.0) + (STRETCH R 0.091641) + (SHRINK R 0.0) + (XHEIGHT R 0.916443) + (QUAD R 0.962216) + (EXTRASPACE R 0.229101) + (EXTRASTRETCH R 0.183283) + (EXTRASHRINK R 0.114551) + ) +(GLUEKERN + (LABEL O 0) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 5 R 0.0 R 0.0 R 0.0) + (GLUE O 6 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 7 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + (STOP) + (LABEL O 1) + (GLUE O 0 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 4 R 0.0 R 0.0 R 0.0) + (GLUE O 5 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 6 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 7 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + (STOP) + (LABEL O 2) + (GLUE O 0 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 4 R 0.0 R 0.0 R 0.0) + (GLUE O 5 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 6 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 7 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + (STOP) + (LABEL O 3) + (GLUE O 0 R 0.107391 R 0.0 R 0.107391) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 5 R 0.0 R 0.0 R 0.0) + (GLUE O 6 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 7 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + (STOP) + (LABEL O 4) + (GLUE O 0 R 0.962216 R 0.0 R 0.481108) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.962216 R 0.0 R 0.481108) + (GLUE O 5 R 0.0 R 0.0 R 0.0) + (GLUE O 6 R 0.962216 R 0.0 R 0.481108) + (GLUE O 7 R 0.962216 R 0.0 R 0.481108) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + (STOP) + (LABEL O 5) + (GLUE O 0 R 0.0 R 0.0 R 0.0) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.0 R 0.0 R 0.0) + (GLUE O 4 R 0.0 R 0.0 R 0.0) + (GLUE O 5 R 0.0 R 0.0 R 0.0) + (GLUE O 6 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 7 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + (STOP) + (LABEL O 6) + (GLUE O 0 R 0.0 R 0.0 R 0.0) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.0 R 0.0 R 0.0) + (GLUE O 4 R 0.0 R 0.0 R 0.0) + (GLUE O 5 R 0.0 R 0.0 R 0.0) + (GLUE O 6 R 0.0 R 0.0 R 0.0) + (GLUE O 7 R 0.240554 R 0.0 R 0.240554) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + (STOP) + (LABEL O 7) + (GLUE O 0 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 1 R 0.240554 R 0.0 R 0.240554) + (GLUE O 2 R 0.240554 R 0.0 R 0.240554) + (GLUE O 3 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 4 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 5 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 6 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 7 R 0.0 R 0.183283 R 0.0) + (GLUE O 10 R 0.240554 R 0.0 R 0.240554) + (STOP) + (LABEL O 10) + (GLUE O 0 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 4 R 0.0 R 0.0 R 0.0) + (GLUE O 5 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 6 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 7 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + (STOP) + ) +(CHARSINTYPE O 1 + U 2124 U 2125 + ) +(CHARSINTYPE O 2 + U 2122 U 2123 + ) +(CHARSINTYPE O 3 + U 2133 U 2134 U 2135 U 2136 U 2137 U 2139 U 2421 U 2423 U 2425 U 2427 + U 2429 U 2443 U 2463 U 2465 U 2467 U 246E U 2521 U 2523 U 2525 U 2527 + U 2529 U 2543 U 2563 U 2565 U 2567 U 256E U 2575 U 2576 + ) +(CHARSINTYPE O 4 + U 2129 U 212A + ) +(CHARSINTYPE O 5 + U 213D U 2144 U 2145 + ) +(CHARSINTYPE O 6 + U 2146 U 2148 U 214A U 214C U 214E U 2150 U 2152 U 2154 U 2156 U 2158 + U 215A + ) +(CHARSINTYPE O 7 + U 2126 U 213E U 2142 U 2143 + ) +(CHARSINTYPE O 10 + U 2147 U 2149 U 214B U 214D U 214F U 2151 U 2153 U 2155 U 2157 U 2159 + U 215B + ) +(TYPE O 0 + (CHARWD R 0.962216) + (CHARHT R 0.458221) + (CHARDP R 0.458221) + (COMMENT + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 5 R 0.0 R 0.0 R 0.0) + (GLUE O 6 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 7 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + ) + ) +(TYPE O 1 + (CHARWD R 0.481108) + (CHARHT R 0.458221) + (CHARDP R 0.458221) + (COMMENT + (GLUE O 0 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 4 R 0.0 R 0.0 R 0.0) + (GLUE O 5 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 6 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 7 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + ) + ) +(TYPE O 2 + (CHARWD R 0.481108) + (CHARHT R 0.458221) + (CHARDP R 0.458221) + (COMMENT + (GLUE O 0 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 4 R 0.0 R 0.0 R 0.0) + (GLUE O 5 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 6 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 7 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + ) + ) +(TYPE O 3 + (CHARWD R 0.747434) + (CHARHT R 0.458221) + (CHARDP R 0.458221) + (COMMENT + (GLUE O 0 R 0.107391 R 0.0 R 0.107391) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.107391 R 0.0 R 0.107391) + (GLUE O 5 R 0.0 R 0.0 R 0.0) + (GLUE O 6 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 7 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + ) + ) +(TYPE O 4 + (CHARWD R 0.962216) + (CHARHT R 0.458221) + (CHARDP R 0.458221) + (COMMENT + (GLUE O 0 R 0.962216 R 0.0 R 0.481108) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.962216 R 0.0 R 0.481108) + (GLUE O 5 R 0.0 R 0.0 R 0.0) + (GLUE O 6 R 0.962216 R 0.0 R 0.481108) + (GLUE O 7 R 0.962216 R 0.0 R 0.481108) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + ) + ) +(TYPE O 5 + (CHARWD R 0.962216) + (CHARHT R 0.458221) + (CHARDP R 0.458221) + (COMMENT + (GLUE O 0 R 0.0 R 0.0 R 0.0) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.0 R 0.0 R 0.0) + (GLUE O 4 R 0.0 R 0.0 R 0.0) + (GLUE O 5 R 0.0 R 0.0 R 0.0) + (GLUE O 6 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 7 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + ) + ) +(TYPE O 6 + (CHARWD R 0.481108) + (CHARHT R 0.458221) + (CHARDP R 0.458221) + (COMMENT + (GLUE O 0 R 0.0 R 0.0 R 0.0) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.0 R 0.0 R 0.0) + (GLUE O 4 R 0.0 R 0.0 R 0.0) + (GLUE O 5 R 0.0 R 0.0 R 0.0) + (GLUE O 6 R 0.0 R 0.0 R 0.0) + (GLUE O 7 R 0.240554 R 0.0 R 0.240554) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + ) + ) +(TYPE O 7 + (CHARWD R 0.481108) + (CHARHT R 0.458221) + (CHARDP R 0.458221) + (COMMENT + (GLUE O 0 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 1 R 0.240554 R 0.0 R 0.240554) + (GLUE O 2 R 0.240554 R 0.0 R 0.240554) + (GLUE O 3 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 4 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 5 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 6 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 7 R 0.0 R 0.183283 R 0.0) + (GLUE O 10 R 0.240554 R 0.0 R 0.240554) + ) + ) +(TYPE O 10 + (CHARWD R 0.481108) + (CHARHT R 0.458221) + (CHARDP R 0.458221) + (COMMENT + (GLUE O 0 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 1 R 0.0 R 0.0 R 0.0) + (GLUE O 2 R 0.0 R 0.0 R 0.0) + (GLUE O 3 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 4 R 0.0 R 0.0 R 0.0) + (GLUE O 5 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 6 R 0.481108 R 0.183283 R 0.481108) + (GLUE O 7 R 0.240554 R 0.183283 R 0.240554) + (GLUE O 10 R 0.0 R 0.0 R 0.0) + ) + ) diff --git a/Build/source/texk/web2c/uptexdir/tests/tmin10.tfm b/Build/source/texk/web2c/uptexdir/tests/tmin10.tfm new file mode 100644 index 00000000000..a54690f5656 Binary files /dev/null and b/Build/source/texk/web2c/uptexdir/tests/tmin10.tfm differ diff --git a/Build/source/texk/web2c/uptexdir/yokotate.test b/Build/source/texk/web2c/uptexdir/yokotate.test new file mode 100755 index 00000000000..c9a21203a02 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/yokotate.test @@ -0,0 +1,28 @@ +#! /bin/sh + +# Copyright (C) 2013 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +test -d uptests || mkdir -p uptests + +# Test inputs +testdir=$srcdir/uptexdir/tests + +# Testing pPLtoTF/pTFtoPL for min10 (yoko=horiz) and tmin10 (tate=vert). +for font in min10 tmin10; do + + ./uppltotf -verbose $testdir/$font.pl uptests/x$font.tfm && \ + cmp $testdir/$font.tfm uptests/x$font.tfm || exit 1 + + TEXMFCNF=$srcdir/../kpathsea \ + ./uptftopl -charcode-format octal -verbose $testdir/$font.tfm uptests/x$font.pl || exit 1 + + ./uppltotf uptests/x$font uptests/xx$font && \ + cmp $testdir/$font.tfm uptests/xx$font.tfm || exit 1 + + TEXMFCNF=$srcdir/../kpathsea TFMFONTS=uptests \ + ./uptftopl -charcode-format=octal xx$font uptests/xx$font && \ + diff uptests/x$font.pl uptests/xx$font.pl || exit 1 + +done + -- cgit v1.2.3