summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/ptexdir/tests/min10.pl43
-rw-r--r--Build/source/texk/web2c/ptexdir/tests/tmin10.pl430
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/yokotate.test12
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog4
-rwxr-xr-xBuild/source/texk/web2c/uptexdir/yokotate.test12
6 files changed, 231 insertions, 275 deletions
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 2d51e373116..f92368dc72e 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tests/min10.pl, tests/tmin10.pl: Converted to 7-bit ASCII.
+ * yokotate.test: Simplified.
+
2013-12-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* ppltotf.ch: Drop one unused change set (is in ../pltotf.ch).
diff --git a/Build/source/texk/web2c/ptexdir/tests/min10.pl b/Build/source/texk/web2c/ptexdir/tests/min10.pl
index f7f27440d30..32ac437cbc1 100644
--- a/Build/source/texk/web2c/ptexdir/tests/min10.pl
+++ b/Build/source/texk/web2c/ptexdir/tests/min10.pl
@@ -1,12 +1,12 @@
(COMMENT THIS IS A KANJI FORMAT FILE)
-(COMMENT INSERT DUMMY DATA IN CHATSINTYPE 3, JIS 2577)
(FAMILY MINCHO)
-(FACE O 0)
+(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)
@@ -15,8 +15,8 @@
(XHEIGHT R 0.916443)
(QUAD R 0.962216)
(EXTRASPACE R 0.229101)
- (PARAMETER D 8 R 0.183283)
- (PARAMETER D 9 R 0.114551)
+ (EXTRASTRETCH R 0.183283)
+ (EXTRASHRINK R 0.114551)
)
(GLUEKERN
(LABEL O 0)
@@ -139,43 +139,48 @@
(STOP)
)
(CHARSINTYPE O 1
- $B!K(B $B!M(B $B!O(B $B!Q(B $B!S(B $B!U(B $B!W(B $B!Y(B $B![(B
+ J 214B J 214D J 214F J 2151 J 2153 J 2155 J 2157 J 2159 J 215B
)
(CHARSINTYPE O 2
- $B!+(B $B!,(B
+ J 212B J 212C
)
(CHARSINTYPE O 3
- $B!6(B $B!7(B $B!9(B $B!h(B $B!i(B $B!j(B $B!p(B $B!q(B $B!r(B $B$!(B $B$#(B $B$%(B $B$'(B
- $B$)(B $B$C(B $B$c(B $B$e(B $B$g(B $B$n(B $B%!(B $B%#(B $B%%(B $B%'(B $B%)(B $B%C(B $B%c(B $B%e(B
- $B%g(B $B%n(B $B%u(B $B%v(B
+ J 2136 J 2137 J 2139 J 2168 J 2169 J 216A J 2170 J 2171 J 2172 J 2421
+ J 2423 J 2425 J 2427 J 2429 J 2443 J 2463 J 2465 J 2467 J 246E J 2521
+ J 2523 J 2525 J 2527 J 2529 J 2543 J 2563 J 2565 J 2567 J 256E J 2575
+ J 2576
)
(CHARSINTYPE O 4
- $B!&(B $B!'(B $B!((B $B!*(B $B!-(B $B!.(B $B!>(B $B!B(B $B!C(B $B!F(B $B!G(B
+ J 2126 J 2127 J 2128 J 212A J 212D J 212E J 213E J 2142 J 2143 J 2146
+ J 2147
)
(CHARSINTYPE O 5
- $B!)(B $B!/(B $B!0(B $B!3(B $B!5(B $B!H(B $B!I(B $B!k(B $B!l(B $B!m(B $B!x(B
+ J 2129 J 212F J 2130 J 2133 J 2135 J 2148 J 2149 J 216B J 216C J 216D
+ J 2178
)
(CHARSINTYPE O 6
- $B!J(B $B!L(B $B!N(B $B!P(B $B!R(B $B!T(B $B!V(B $B!X(B $B!Z(B
+ J 214A J 214C J 214E J 2150 J 2152 J 2154 J 2156 J 2158 J 215A
)
(CHARSINTYPE O 7
- $B$&(B $B$/(B $B$0(B $B$1(B $B$2(B $B$9(B $B$:(B $B$j(B $B%F(B $B%G(B $B%d(B
+ J 2426 J 242F J 2430 J 2431 J 2432 J 2439 J 243A J 246A J 2546 J 2547
+ J 2564
)
(CHARSINTYPE O 10
- $B!$(B $B!%(B
+ J 2124 J 2125
)
(CHARSINTYPE O 11
- $B!"(B $B!#(B
+ J 2122 J 2123
)
(CHARSINTYPE O 12
- $B%"(B $B%$(B $B%&(B $B%*(B $B%1(B $B%2(B $B%5(B $B%6(B $B%=(B $B%>(B $B%A(B $B%B(B $B%D(B
- $B%E(B $B%H(B $B%I(B $B%J(B $B%U(B $B%V(B $B%W(B $B%_(B $B%a(B $B%i(B $B%j(B $B%o(B $B%r(B
+ J 2522 J 2524 J 2526 J 252A J 2531 J 2532 J 2535 J 2536 J 253D J 253E
+ J 2541 J 2542 J 2544 J 2545 J 2548 J 2549 J 254A J 2555 J 2556 J 2557
+ J 255F J 2561 J 2569 J 256A J 256F J 2572
)
(CHARSINTYPE O 13
- $B%/(B $B%0(B $B%?(B $B%@(B
+ J 252F J 2530 J 253F J 2540
)
(CHARSINTYPE O 14
- $B%N(B
+ J 254E
)
(TYPE O 0
(CHARWD R 0.962216)
diff --git a/Build/source/texk/web2c/ptexdir/tests/tmin10.pl b/Build/source/texk/web2c/ptexdir/tests/tmin10.pl
index 1230acef26a..611911dca34 100644
--- a/Build/source/texk/web2c/ptexdir/tests/tmin10.pl
+++ b/Build/source/texk/web2c/ptexdir/tests/tmin10.pl
@@ -1,7 +1,3 @@
-(COMMENT
- tmin10 Propaty List File (Tate kumi)
- by Hisato Hamano at ascii Co.
-)
(COMMENT THIS IS A KANJI FORMAT FILE)
(DIRECTION TATE)
(FAMILY MINCHO)
@@ -24,309 +20,267 @@
(EXTRASHRINK R 0.114551)
)
(GLUEKERN
- (LABEL D 0)
- (GLUE D 1 R 0.0 R 0.0 R 0.0 )
- (GLUE D 2 R 0.0 R 0.0 R 0.0 )
- (GLUE D 3 R 0.107391 R 0.0 R 0.107391)
- (GLUE D 5 R 0.0 R 0.0 R 0.0 )
- (GLUE D 6 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 7 R 0.240554 R 0.183283 R 0.240554)
- (GLUE D 8 R 0.0 R 0.0 R 0.0 )
+ (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 D 1)
- (GLUE D 0 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 1 R 0.0 R 0.0 R 0.0 )
- (GLUE D 2 R 0.0 R 0.0 R 0.0 )
- (GLUE D 3 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 4 R 0.0 R 0.0 R 0.0 )
- (GLUE D 5 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 6 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 7 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 8 R 0.0 R 0.0 R 0.0 )
+ (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 D 2)
- (GLUE D 0 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 1 R 0.0 R 0.0 R 0.0 )
- (GLUE D 2 R 0.0 R 0.0 R 0.0 )
- (GLUE D 3 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 4 R 0.0 R 0.0 R 0.0 )
- (GLUE D 5 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 6 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 7 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 8 R 0.0 R 0.0 R 0.0 )
+ (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 D 3)
- (GLUE D 0 R 0.107391 R 0.0 R 0.107391)
- (GLUE D 1 R 0.0 R 0.0 R 0.0 )
- (GLUE D 2 R 0.0 R 0.0 R 0.0 )
- (GLUE D 3 R 0.107391 R 0.0 R 0.107391)
- (GLUE D 5 R 0.0 R 0.0 R 0.0 )
- (GLUE D 6 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 7 R 0.240554 R 0.183283 R 0.240554)
- (GLUE D 8 R 0.0 R 0.0 R 0.0 )
+ (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 D 4)
- (GLUE D 0 R 0.962216 R 0.0 R 0.481108)
- (GLUE D 1 R 0.0 R 0.0 R 0.0 )
- (GLUE D 2 R 0.0 R 0.0 R 0.0 )
- (GLUE D 3 R 0.962216 R 0.0 R 0.481108)
- (GLUE D 5 R 0.0 R 0.0 R 0.0 )
- (GLUE D 6 R 0.962216 R 0.0 R 0.481108)
- (GLUE D 7 R 0.962216 R 0.0 R 0.481108)
- (GLUE D 8 R 0.0 R 0.0 R 0.0 )
+ (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 D 5)
- (GLUE D 0 R 0.0 R 0.0 R 0.0 )
- (GLUE D 1 R 0.0 R 0.0 R 0.0 )
- (GLUE D 2 R 0.0 R 0.0 R 0.0 )
- (GLUE D 3 R 0.0 R 0.0 R 0.0 )
- (GLUE D 4 R 0.0 R 0.0 R 0.0 )
- (GLUE D 5 R 0.0 R 0.0 R 0.0 )
- (GLUE D 6 R 0.240554 R 0.183283 R 0.240554)
- (GLUE D 7 R 0.240554 R 0.183283 R 0.240554)
- (GLUE D 8 R 0.0 R 0.0 R 0.0 )
+ (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 D 6)
- (GLUE D 0 R 0.0 R 0.0 R 0.0 )
- (GLUE D 1 R 0.0 R 0.0 R 0.0 )
- (GLUE D 2 R 0.0 R 0.0 R 0.0 )
- (GLUE D 3 R 0.0 R 0.0 R 0.0 )
- (GLUE D 4 R 0.0 R 0.0 R 0.0 )
- (GLUE D 5 R 0.0 R 0.0 R 0.0 )
- (GLUE D 6 R 0.0 R 0.0 R 0.0 )
- (GLUE D 7 R 0.240554 R 0.0 R 0.240554)
- (GLUE D 8 R 0.0 R 0.0 R 0.0 )
+ (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 D 7)
- (GLUE D 0 R 0.240554 R 0.183283 R 0.240554)
- (GLUE D 1 R 0.240554 R 0.0 R 0.240554)
- (GLUE D 2 R 0.240554 R 0.0 R 0.240554)
- (GLUE D 3 R 0.240554 R 0.183283 R 0.240554)
- (GLUE D 4 R 0.240554 R 0.183283 R 0.240554)
- (GLUE D 5 R 0.240554 R 0.183283 R 0.240554)
- (GLUE D 6 R 0.240554 R 0.183283 R 0.240554)
- (GLUE D 7 R 0.0 R 0.183283 R 0.0 )
- (GLUE D 8 R 0.240554 R 0.0 R 0.240554)
+ (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 D 8)
- (GLUE D 0 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 1 R 0.0 R 0.0 R 0.0 )
- (GLUE D 2 R 0.0 R 0.0 R 0.0 )
- (GLUE D 3 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 4 R 0.0 R 0.0 R 0.0 )
- (GLUE D 5 R 0.240554 R 0.183283 R 0.240554)
- (GLUE D 6 R 0.481108 R 0.183283 R 0.481108)
- (GLUE D 7 R 0.240554 R 0.183283 R 0.240554)
- (GLUE D 8 R 0.0 R 0.0 R 0.0 )
+ (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 D 1
- $B!$(B $B!%(B
+(CHARSINTYPE O 1
+ J 2124 J 2125
)
-(CHARSINTYPE D 2
- $B!"(B $B!#(B
+(CHARSINTYPE O 2
+ J 2122 J 2123
)
-(CHARSINTYPE D 3
- $B!3(B $B!4(B $B!5(B $B!6(B $B!7(B $B!9(B
- $B$!(B $B$#(B $B$%(B $B$'(B $B$)(B $B$C(B $B$c(B $B$e(B $B$g(B $B$n(B
- $B%!(B $B%#(B $B%%(B $B%'(B $B%)(B $B%C(B $B%c(B $B%e(B $B%g(B $B%n(B $B%u(B $B%v(B
+(CHARSINTYPE O 3
+ J 2133 J 2134 J 2135 J 2136 J 2137 J 2139 J 2421 J 2423 J 2425 J 2427
+ J 2429 J 2443 J 2463 J 2465 J 2467 J 246E J 2521 J 2523 J 2525 J 2527
+ J 2529 J 2543 J 2563 J 2565 J 2567 J 256E J 2575 J 2576
)
-(CHARSINTYPE D 4
- $B!)(B $B!*(B
+(CHARSINTYPE O 4
+ J 2129 J 212A
)
-(CHARSINTYPE D 5
- $B!=(B $B!D(B $B!E(B
+(CHARSINTYPE O 5
+ J 213D J 2144 J 2145
)
-(CHARSINTYPE D 6
- $B!F(B $B!H(B $B!J(B $B!L(B $B!N(B $B!P(B $B!R(B $B!T(B $B!V(B $B!X(B $B!Z(B
+(CHARSINTYPE O 6
+ J 2146 J 2148 J 214A J 214C J 214E J 2150 J 2152 J 2154 J 2156 J 2158
+ J 215A
)
-(CHARSINTYPE D 7
- $B!&(B $B!>(B $B!B(B $B!C(B
+(CHARSINTYPE O 7
+ J 2126 J 213E J 2142 J 2143
)
-(CHARSINTYPE D 8
- $B!G(B $B!I(B $B!K(B $B!M(B $B!O(B $B!Q(B $B!S(B $B!U(B $B!W(B $B!Y(B $B![(B
+(CHARSINTYPE O 10
+ J 2147 J 2149 J 214B J 214D J 214F J 2151 J 2153 J 2155 J 2157 J 2159
+ J 215B
)
-(TYPE D 0
- (COMMENT $BIaDL$N4A;z(B
- )
+(TYPE O 0
(CHARWD R 0.962216)
(CHARHT R 0.458221)
(CHARDP R 0.458221)
(COMMENT
- (GLUE D 1 R 0.0 R 0.0 R 0.0 ) $B!$!%(B
- (GLUE D 2 R 0.0 R 0.0 R 0.0 ) $B!"!#(B
- (GLUE D 3 R 0.107391 R 0.0 R 0.107391) $B>.$+$J(B
- (GLUE D 5 R 0.0 R 0.0 R 0.0 ) $BA43QLsJ*(B
- (GLUE D 6 R 0.481108 R 0.183283 R 0.481108) $B%+%C%33+$-(B
- (GLUE D 7 R 0.240554 R 0.183283 R 0.240554) $BCf%D%-LsJ*(B
- (GLUE D 8 R 0.0 R 0.0 R 0.0 ) $B%+%C%3JD$8(B
+ (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 D 1
- (COMMENT $B!$!%(B
- (CHARSINTYPE D 1
- $B!$(B $B!%(B
- )
- )
+(TYPE O 1
(CHARWD R 0.481108)
(CHARHT R 0.458221)
(CHARDP R 0.458221)
(COMMENT
- (GLUE D 0 R 0.481108 R 0.183283 R 0.481108) $B4A;z(B
- (GLUE D 1 R 0.0 R 0.0 R 0.0 ) $B!$!%(B
- (GLUE D 2 R 0.0 R 0.0 R 0.0 ) $B!"!#(B
- (GLUE D 3 R 0.481108 R 0.183283 R 0.481108) $B>.%+%J(B
- (GLUE D 4 R 0.0 R 0.0 R 0.0 ) $B!)!*(B
- (GLUE D 5 R 0.481108 R 0.183283 R 0.481108) $BA43QLsJ*(B
- (GLUE D 6 R 0.481108 R 0.183283 R 0.481108) $B%+%C%33+$-(B
- (GLUE D 7 R 0.481108 R 0.183283 R 0.481108) $BCf%D%-LsJ*(B
- (GLUE D 8 R 0.0 R 0.0 R 0.0 ) $B%+%C%3JD$8(B
+ (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 D 2
- (COMMENT $B!"!#(B
- (CHARSINTYPE D 2
- $B!"(B $B!#(B
- )
- )
+(TYPE O 2
(CHARWD R 0.481108)
(CHARHT R 0.458221)
(CHARDP R 0.458221)
(COMMENT
- (GLUE D 0 R 0.481108 R 0.183283 R 0.481108) $B4A;z(B
- (GLUE D 1 R 0.0 R 0.0 R 0.0 ) $B!$!%(B
- (GLUE D 2 R 0.0 R 0.0 R 0.0 ) $B!"!#(B
- (GLUE D 3 R 0.481108 R 0.183283 R 0.481108) $B>.%+%J(B
- (GLUE D 4 R 0.0 R 0.0 R 0.0 ) $B!)!*(B
- (GLUE D 5 R 0.481108 R 0.183283 R 0.481108) $BA43QLsJ*(B
- (GLUE D 6 R 0.481108 R 0.183283 R 0.481108) $B%+%C%33+$-(B
- (GLUE D 7 R 0.481108 R 0.183283 R 0.481108) $BCf%D%-LsJ*(B
- (GLUE D 8 R 0.0 R 0.0 R 0.0 ) $B%+%C%3JD$8(B
+ (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 D 3
- (COMMENT $B>.$+$J(B
- (CHARSINTYPE D 3
- $B!3(B $B!4(B $B!5(B $B!6(B $B!7(B $B!9(B
- $B$!(B $B$#(B $B$%(B $B$'(B $B$)(B $B$C(B $B$c(B $B$e(B $B$g(B $B$n(B
- $B%!(B $B%#(B $B%%(B $B%'(B $B%)(B $B%C(B $B%c(B $B%e(B $B%g(B $B%n(B $B%u(B $B%v(B
- )
- )
+(TYPE O 3
(CHARWD R 0.747434)
(CHARHT R 0.458221)
(CHARDP R 0.458221)
(COMMENT
- (GLUE D 0 R 0.107391 R 0.0 R 0.107391) $B4A;z(B
- (GLUE D 1 R 0.0 R 0.0 R 0.0 ) $B!$!%(B
- (GLUE D 2 R 0.0 R 0.0 R 0.0 ) $B!"!#(B
- (GLUE D 3 R 0.107391 R 0.0 R 0.107391) $B>.$+$J(B
- (GLUE D 5 R 0.0 R 0.0 R 0.0 ) $BA43QLsJ*(B
- (GLUE D 6 R 0.481108 R 0.183283 R 0.481108) $B%+%C%33+$-(B
- (GLUE D 7 R 0.240554 R 0.183283 R 0.240554) $BCf%D%-LsJ*(B
- (GLUE D 8 R 0.0 R 0.0 R 0.0 ) $B%+%C%3JD$8(B
+ (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 D 4
- (COMMENT $B!*!)(B
- (CHARSINTYPE D 4
- $B!)(B $B!*(B
- )
- )
+(TYPE O 4
(CHARWD R 0.962216)
(CHARHT R 0.458221)
(CHARDP R 0.458221)
(COMMENT
- (GLUE D 0 R 0.962216 R 0.0 R 0.481108) $B4A;z(B
- (GLUE D 1 R 0.0 R 0.0 R 0.0 ) $B!$!%(B
- (GLUE D 2 R 0.0 R 0.0 R 0.0 ) $B!"!#(B
- (GLUE D 3 R 0.962216 R 0.0 R 0.481108) $B>.$+$J(B
- (GLUE D 5 R 0.0 R 0.0 R 0.0 ) $BA43QLsJ*(B
- (GLUE D 6 R 0.962216 R 0.0 R 0.481108) $B%+%C%33+$-(B
- (GLUE D 7 R 0.962216 R 0.0 R 0.481108) $BCf%D%-LsJ*(B
- (GLUE D 8 R 0.0 R 0.0 R 0.0 ) $B%+%C%3JD$8(B
+ (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 D 5
- (COMMENT $BA43QLsJ*(B
- (CHARSINTYPE D 5
- $B!=(B $B!D(B $B!E(B
- )
- )
+(TYPE O 5
(CHARWD R 0.962216)
(CHARHT R 0.458221)
(CHARDP R 0.458221)
(COMMENT
- (GLUE D 0 R 0.0 R 0.0 R 0.0 ) $B4A;z(B
- (GLUE D 1 R 0.0 R 0.0 R 0.0 ) $B!$!%(B
- (GLUE D 2 R 0.0 R 0.0 R 0.0 ) $B!"!#(B
- (GLUE D 3 R 0.0 R 0.0 R 0.0 ) $B>.$+$J(B
- (GLUE D 4 R 0.0 R 0.0 R 0.0 ) $B!*!)(B
- (GLUE D 5 R 0.0 R 0.0 R 0.0 ) $BA43QLsJ*(B
- (GLUE D 6 R 0.240554 R 0.183283 R 0.240554) $B%+%C%33+$-(B
- (GLUE D 7 R 0.240554 R 0.183283 R 0.240554) $BCf%D%-LsJ*(B
- (GLUE D 8 R 0.0 R 0.0 R 0.0 ) $B%+%C%3JD$8(B
+ (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 D 6
- (COMMENT $B%+%C%33+$-(B
- (CHARSINTYPE D 6
- $B!F(B $B!H(B $B!J(B $B!L(B $B!N(B $B!P(B $B!R(B $B!T(B $B!V(B $B!X(B $B!Z(B
- )
- )
+(TYPE O 6
(CHARWD R 0.481108)
(CHARHT R 0.458221)
(CHARDP R 0.458221)
(COMMENT
- (GLUE D 0 R 0.0 R 0.0 R 0.0 ) $B4A;z(B
- (GLUE D 1 R 0.0 R 0.0 R 0.0 ) $B!$!%(B
- (GLUE D 2 R 0.0 R 0.0 R 0.0 ) $B!"!#(B
- (GLUE D 3 R 0.0 R 0.0 R 0.0 ) $B>.$+$J(B
- (GLUE D 4 R 0.0 R 0.0 R 0.0 ) $B!*!)(B
- (GLUE D 5 R 0.0 R 0.0 R 0.0 ) $BA43QLsJ*(B
- (GLUE D 6 R 0.0 R 0.0 R 0.0 ) $B%+%C%33+$-(B
- (GLUE D 7 R 0.240554 R 0.0 R 0.240554) $BCf%D%-LsJ*(B
- (GLUE D 8 R 0.0 R 0.0 R 0.0 ) $B%+%C%3JD$8(B
+ (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 D 7
- (COMMENT $BCf%D%-LsJ*(B
- (CHARSINTYPE D 7
- $B!&(B $B!>(B $B!B(B $B!C(B
- )
- )
+(TYPE O 7
(CHARWD R 0.481108)
(CHARHT R 0.458221)
(CHARDP R 0.458221)
(COMMENT
- (GLUE D 0 R 0.240554 R 0.183283 R 0.240554) $B4A;z(B
- (GLUE D 1 R 0.240554 R 0.0 R 0.240554) $B!$!%(B
- (GLUE D 2 R 0.240554 R 0.0 R 0.240554) $B!"!#(B
- (GLUE D 3 R 0.240554 R 0.183283 R 0.240554) $B>.%+%J(B
- (GLUE D 4 R 0.240554 R 0.183283 R 0.240554) $B!)!*(B
- (GLUE D 5 R 0.240554 R 0.183283 R 0.240554) $BA43QLsJ*(B
- (GLUE D 6 R 0.240554 R 0.183283 R 0.240554) $B%+%C%33+$-(B
- (GLUE D 7 R 0.0 R 0.183283 R 0.0 ) $BCf%D%-LsJ*(B
- (GLUE D 8 R 0.240554 R 0.0 R 0.240554) $B%+%C%3JD$8(B
+ (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 D 8
- (COMMENT $B%+%C%3JD$8(B
- (CHARSINTYPE D 8
- $B!G(B $B!I(B $B!K(B $B!M(B $B!O(B $B!Q(B $B!S(B $B!U(B $B!W(B $B!Y(B $B![(B
- )
- )
+(TYPE O 10
(CHARWD R 0.481108)
(CHARHT R 0.458221)
(CHARDP R 0.458221)
(COMMENT
- (GLUE D 0 R 0.481108 R 0.183283 R 0.481108) $B4A;z(B
- (GLUE D 1 R 0.0 R 0.0 R 0.0 ) $B!$!%(B
- (GLUE D 2 R 0.0 R 0.0 R 0.0 ) $B!"!#(B
- (GLUE D 3 R 0.481108 R 0.183283 R 0.481108) $B>.%+%J(B
- (GLUE D 4 R 0.0 R 0.0 R 0.0 ) $B!)!*(B
- (GLUE D 5 R 0.240554 R 0.183283 R 0.240554) $BA43QLsJ*(B
- (GLUE D 6 R 0.481108 R 0.183283 R 0.481108) $B%+%C%33+$-(B
- (GLUE D 7 R 0.240554 R 0.183283 R 0.240554) $BCf%D%-LsJ*(B
- (GLUE D 8 R 0.0 R 0.0 R 0.0 ) $B%+%C%3JD$8(B
+ (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/ptexdir/yokotate.test b/Build/source/texk/web2c/ptexdir/yokotate.test
index 70232903323..7c0809896e7 100755
--- a/Build/source/texk/web2c/ptexdir/yokotate.test
+++ b/Build/source/texk/web2c/ptexdir/yokotate.test
@@ -12,17 +12,11 @@ testdir=$srcdir/ptexdir/tests
for font in min10 tmin10; do
./ppltotf -verbose $testdir/$font.pl ptests/x$font.tfm && \
- cmp $testdir/$font.tfm ptests/x$font.tfm || exit 1
+ cmp $testdir/$font.tfm ptests/x$font.tfm && echo || exit 1
TEXMFCNF=$srcdir/../kpathsea \
- ./ptftopl -charcode-format octal -verbose $testdir/$font.tfm ptests/x$font.pl || exit 1
-
- ./ppltotf ptests/x$font ptests/xx$font && \
- cmp $testdir/$font.tfm ptests/xx$font.tfm || exit 1
-
- TEXMFCNF=$srcdir/../kpathsea TFMFONTS=ptests \
- ./ptftopl -charcode-format=octal xx$font ptests/xx$font && \
- diff ptests/x$font.pl ptests/xx$font.pl || exit 1
+ ./ptftopl -charcode-format octal -verbose $testdir/$font.tfm ptests/x$font.pl && \
+ diff $testdir/$font.pl ptests/x$font.pl && echo || exit 1
done
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index bd495677693..4d8b983bb80 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * yokotate.test: Simplified.
+
2013-12-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* yokotate.test (new): Shell scripts to test upPLtoTF/upTFtoPL
diff --git a/Build/source/texk/web2c/uptexdir/yokotate.test b/Build/source/texk/web2c/uptexdir/yokotate.test
index c9a21203a02..022f7a20080 100755
--- a/Build/source/texk/web2c/uptexdir/yokotate.test
+++ b/Build/source/texk/web2c/uptexdir/yokotate.test
@@ -12,17 +12,11 @@ testdir=$srcdir/uptexdir/tests
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
+ cmp $testdir/$font.tfm uptests/x$font.tfm && echo || 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
+ ./uptftopl -charcode-format octal -verbose $testdir/$font.tfm uptests/x$font.pl && \
+ diff $testdir/$font.pl uptests/x$font.pl && echo || exit 1
done