From a6f5a3823ccc5964ef4b1e44a8ba392f75c0cf43 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 1 Mar 2013 13:22:31 +0000 Subject: e-TeX: Better handling of right-to-left text (v2.6) git-svn-id: svn://tug.org/texlive/trunk@29250 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/texk/web2c/eptexdir/eptrip/eptrip.diffs | 222 ++++++++++++--------- Build/source/texk/web2c/eptexdir/eptrip/etrip.log | 6 +- Build/source/texk/web2c/eptexdir/eptrip/etrip.tex | 6 +- 3 files changed, 135 insertions(+), 99 deletions(-) (limited to 'Build/source/texk/web2c/eptexdir/eptrip') diff --git a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs index e94faaf91c6..40d16dc7d6f 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs +++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs @@ -13,7 +13,7 @@ 1c1 < This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 --- -> This is e-pTeX, Version 3.1415926-p3.3-110825-2.5 (utf8.euc) (TeX Live 2013/dev) (INITEX) 2 AUG 2012 21:33 +> This is e-pTeX, Version 3.1415926-p3.3-110825-2.6 (utf8.euc) (TeX Live 2013/dev) (INITEX) 1 MAR 2013 13:33 3c3 < (trip.tex --- @@ -33,8 +33,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2012.8.2) -> 1603 strings of total length 27712 +> (format=trip 2013.3.1) +> 1604 strings of total length 27751 > 489 memory locations dumped; current usage is 110&278 > 387 multiletter control sequences 461c462 @@ -50,7 +50,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.1415926-p3.3-110825-2.5 (utf8.euc) (TeX Live 2013/dev) +> This is e-pTeX, Version 3.1415926-p3.3-110825-2.6 (utf8.euc) (TeX Live 2013/dev) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -64,7 +64,7 @@ 1c1 < This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 --- -> This is e-pTeX, Version 3.1415926-p3.3-110825-2.5 (utf8.euc) (TeX Live 2013/dev) (format=trip 2012.8.2) 2 AUG 2012 21:33 +> This is e-pTeX, Version 3.1415926-p3.3-110825-2.6 (utf8.euc) (TeX Live 2013/dev) (format=trip 2013.3.1) 1 MAR 2013 13:33 3c3 < (trip.tex ## --- @@ -175,76 +175,91 @@ < ! Improper alphabetic constant. --- > ! Improper alphabetic or KANJI constant. -2533c2541 +2405,2406c2413,2421 +< {the character -} +< {the character 1} +--- +> ! Extended delimiter code used as delcode. +> +> \relax +> l.249 ...mber\the\delcode`\relax +> \over{{{}}}}\pagestretch=-1\p... +> A numeric delimiter code must be between 0 and 2^{27}-1. +> I changed this one to zero. +> +> {the character 0} +2434d2448 +< \\mathord [] +2533c2547 < \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil --- > \vbox(16383.99998+0.0)x20.0, glue set 16330.99998fil -2575c2583 +2575c2589 < Memory usage before: 339&413; after: 236&405; still untouched: 706 --- > Memory usage before: 493&411; after: 327&403; still untouched: 1941 -2830c2838 +2830c2844 < Since I expected to read a number between 0 and 15, --- > Since I expected to read a number between 0 and 255, -3051c3059 +3051c3065 < \insert0, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 --- > \insert0Y, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 -3054c3062 +3054c3068 < .\fam0 ^^c8 --- > .\fam0 È -3143a3152 +3143a3158 > ....\displace 0.0 -3235c3244 +3235c3250 < ! \textfont 0 is undefined (character ^^c8). --- > ! \textfont 0 is undefined (character È). -3326c3335 +3326c3341 < \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil --- > \vbox(10000.0+2.0)x28.0, glue set 9737.58742fil -3547a3557 +3547a3563 > .........\displace 0.0 -3616c3626 +3616c3632 < Memory usage before: 2170&521; after: 1181&459; still untouched: 175 --- > Memory usage before: 3263&519; after: 1743&457; still untouched: 483 -3864c3874 +3864c3880 < \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil --- > \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil -3951c3961 +3951c3967 < Memory usage before: 640&415; after: 397&410; still untouched: 175 --- > Memory usage before: 959&413; after: 573&408; still untouched: 483 -4034c4044 +4034c4050 < \vbox(16383.99998+0.0)x8236.0, glue set 16344.0fil --- > \vbox(16383.99998+0.0)x8236.0, glue set 16343.99998fil -4053c4063 +4053c4069 < Memory usage before: 235&401; after: 178&399; still untouched: 175 --- > Memory usage before: 342&399; after: 248&397; still untouched: 483 -4420c4430 +4420c4436 < \vbox(16383.99998+0.0)x100.0, glue set 16332.0fil --- > \vbox(16383.99998+0.0)x100.0, glue set 16331.99998fil -4506c4516 +4506c4522 < Memory usage before: 651&432; after: 417&418; still untouched: 175 --- > Memory usage before: 992&431; after: 598&417; still untouched: 483 -4742c4752,4753 +4742c4758,4759 < \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil --- > \vbox(16383.99998+0.0)x205.12613, glue set 16343.99998fil, yoko directio > n -4828c4839 +4828c4845 < Memory usage before: 776&458; after: 464&452; still untouched: 175 --- > Memory usage before: 1174&457; after: 676&451; still untouched: 483 -4881,4888d4891 +4881,4888d4897 < ! Bad number (16). < < = @@ -253,41 +268,41 @@ < Since I expected to read a number between 0 and 15, < I changed this one to zero. < -5700c5703 +5700c5709 < ! \textfont 0 is undefined (character ^^c8). --- > ! \textfont 0 is undefined (character È). -6380c6383 +6380c6389 < (tripos.tex --- > (./tripos.tex -6501c6504 +6501c6510 < l.429 ...^^M=13 \def^^M{\relax}# --- > l.429 ...^^M=13 \defqqM{\relax}# -6595c6598 +6595c6604 < Memory usage before: 819&428; after: 720&426; still untouched: 175 --- > Memory usage before: 1220&428; after: 1070&426; still untouched: 483 -7155c7158 +7155c7164 < Memory usage before: 895&439; after: 290&420; still untouched: 175 --- > Memory usage before: 1336&439; after: 392&420; still untouched: 483 -7288c7291 +7288c7297 < Memory usage before: 334&431; after: 292&418; still untouched: 175 --- > Memory usage before: 456&431; after: 394&418; still untouched: 483 -7296,7299c7299,7302 +7296,7299c7305,7308 < 47 strings out of 1674 < 253 string characters out of 8354 < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1697 -> 261 string characters out of 8288 +> 44 strings out of 1696 +> 261 string characters out of 8249 > 4017 words of memory out of 4500 > 418 multiletter control sequences out of 15000+0 -7301c7304 +7301c7310 < 2 hyphenation exceptions out of 307 --- > 1 hyphenation exception out of 659 @@ -301,7 +316,7 @@ 9c9 < ' TeX output 2008.03.15:0223' --- -> ' TeX output 2012.08.02:2133' +> ' TeX output 2013.03.01:1333' 419c419 < 1121: down4 639342208 --- @@ -323,7 +338,7 @@ < **\input trip < (trip.tex --- -> This is e-pTeX, Version 3.1415926-p3.3-110825-2.5 (utf8.euc) (TeX Live 2013/dev) (INITEX) 2 AUG 2012 21:33 +> This is e-pTeX, Version 3.1415926-p3.3-110825-2.6 (utf8.euc) (TeX Live 2013/dev) (INITEX) 1 MAR 2013 13:33 > entering extended mode > ***\input trip > (./trip.tex @@ -349,8 +364,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2012.8.2) -> 1603 strings of total length 27712 +> (format=trip 2013.3.1) +> 1604 strings of total length 27751 > 536 memory locations dumped; current usage is 157&278 > 459 multiletter control sequences 461c457 @@ -366,7 +381,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.1415926-p3.3-110825-2.5 (utf8.euc) (TeX Live 2013/dev) +> This is e-pTeX, Version 3.1415926-p3.3-110825-2.6 (utf8.euc) (TeX Live 2013/dev) > **entering extended mode > ## (./trip.tex 17c17 @@ -387,7 +402,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.1415926-p3.3-110825-2.5 (utf8.euc) (TeX Live 2013/dev) (format=trip 2012.8.2) 2 AUG 2012 21:33 +> This is e-pTeX, Version 3.1415926-p3.3-110825-2.6 (utf8.euc) (TeX Live 2013/dev) (format=trip 2013.3.1) 1 MAR 2013 13:33 > entering extended mode > **&trip \toksdef\tokens=0 \input trip > (./trip.tex @@ -511,123 +526,138 @@ < ! Improper alphabetic constant. --- > ! Improper alphabetic or KANJI constant. -2533c2539 +2405,2406c2411,2419 +< {the character -} +< {the character 1} +--- +> ! Extended delimiter code used as delcode. +> +> \relax +> l.249 ...mber\the\delcode`\relax +> \over{{{}}}}\pagestretch=-1\p... +> A numeric delimiter code must be between 0 and 2^{27}-1. +> I changed this one to zero. +> +> {the character 0} +2434d2446 +< \\mathord [] +2533c2545 < \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil --- > \vbox(16383.99998+0.0)x20.0, glue set 16330.99998fil -2570c2576,2577 +2570c2582,2583 < .\hbox(0.0+0.0)x15.0, glue set 0.1875, shifted 5.0 --- > .\hbox(0.0+0.0)x15.0, glue set 0.1875, shifted 5.0, display, yoko direct > ion -2575c2582 +2575c2588 < Memory usage before: 339&413; after: 236&405; still untouched: 706 --- > Memory usage before: 493&411; after: 327&403; still untouched: 1941 -2830c2837 +2830c2843 < Since I expected to read a number between 0 and 15, --- > Since I expected to read a number between 0 and 255, -2835d2841 +2835d2847 < {restoring current font=\ip} -3051c3057 +3051c3063 < \insert0, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 --- > \insert0Y, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 -3054c3060 +3054c3066 < .\fam0 ^^c8 --- > .\fam0 È -3143a3150 +3143a3156 > ....\displace 0.0 -3223d3229 +3223d3235 < {restoring \fam=-1} -3235c3241 +3235c3247 < ! \textfont 0 is undefined (character ^^c8). --- > ! \textfont 0 is undefined (character È). -3326c3332 +3326c3338 < \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil --- > \vbox(10000.0+2.0)x28.0, glue set 9737.58742fil -3372c3378 +3372c3384 < .\hbox(68.26251+98.15005)x19.0, glue set - 1.0, shifted 9.0 --- > .\hbox(68.26251+98.15005)x19.0, glue set - 1.0, shifted 9.0, display -3547a3554 +3547a3560 > .........\displace 0.0 -3557c3564 +3557c3570 < .\hbox(20.5+50.80002)x8.27895, shifted 19.72105 --- > .\hbox(20.5+50.80002)x8.27895, shifted 19.72105, display -3616c3623 +3616c3629 < Memory usage before: 2170&521; after: 1181&459; still untouched: 175 --- > Memory usage before: 3263&519; after: 1743&457; still untouched: 483 -3766d3772 +3766d3778 < {restoring \fam=-1} -3839d3844 +3839d3850 < {restoring \fam=-1} -3864c3869 +3864c3875 < \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil --- > \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil -3895c3900 +3895c3906 < ..\hbox(12.0+4.0)x8.1778 --- > ..\hbox(12.0+4.0)x8.1778, display -3917c3922 +3917c3928 < ..\hbox(0.0+13.00002)x-0.1778, glue set - 57.67767fil --- > ..\hbox(0.0+13.00002)x-0.1778, glue set - 57.67767fil, display -3925c3930 +3925c3936 < ....\hbox(7.0+1.0)x5.0, shifted 47.5 --- > ....\hbox(7.0+1.0)x5.0, shifted 47.5, display -3951c3956 +3951c3962 < Memory usage before: 640&415; after: 397&410; still untouched: 175 --- > Memory usage before: 959&413; after: 573&408; still untouched: 483 -4011d4015 +4011d4021 < {restoring \fam=-1} -4034c4038 +4034c4044 < \vbox(16383.99998+0.0)x8236.0, glue set 16344.0fil --- > \vbox(16383.99998+0.0)x8236.0, glue set 16343.99998fil -4047c4051 +4047c4057 < .\hbox(0.0+0.0)x1009.0, shifted 7227.0 --- > .\hbox(0.0+0.0)x1009.0, shifted 7227.0, display -4051c4055 +4051c4061 < .\hbox(0.0+0.0)x-7127.0, shifted 7227.0 --- > .\hbox(0.0+0.0)x-7127.0, shifted 7227.0, display -4053c4057 +4053c4063 < Memory usage before: 235&401; after: 178&399; still untouched: 175 --- > Memory usage before: 342&399; after: 248&397; still untouched: 483 -4420c4424 +4420c4430 < \vbox(16383.99998+0.0)x100.0, glue set 16332.0fil --- > \vbox(16383.99998+0.0)x100.0, glue set 16331.99998fil -4506c4510 +4506c4516 < Memory usage before: 651&432; after: 417&418; still untouched: 175 --- > Memory usage before: 992&431; after: 598&417; still untouched: 483 -4742c4746,4747 +4742c4752,4753 < \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil --- > \vbox(16383.99998+0.0)x205.12613, glue set 16343.99998fil, yoko directio > n -4828c4833 +4828c4839 < Memory usage before: 776&458; after: 464&452; still untouched: 175 --- > Memory usage before: 1174&457; after: 676&451; still untouched: 483 -4845c4850 +4845c4856 < I'll pretend you didn't say \long or \outer or \global. --- > I'll pretend you didn't say \long or \outer or \global or \protected. -4881,4888d4885 +4881,4888d4891 < ! Bad number (16). < < = @@ -636,45 +666,45 @@ < Since I expected to read a number between 0 and 15, < I changed this one to zero. < -5700c5697 +5700c5703 < ! \textfont 0 is undefined (character ^^c8). --- > ! \textfont 0 is undefined (character È). -6380c6377 +6380c6383 < (tripos.tex --- > (./tripos.tex -6501c6498 +6501c6504 < l.429 ...^^M=13 \def^^M{\relax}# --- > l.429 ...^^M=13 \defqqM{\relax}# -6595c6592 +6595c6598 < Memory usage before: 819&428; after: 720&426; still untouched: 175 --- > Memory usage before: 1220&428; after: 1070&426; still untouched: 483 -7155c7152 +7155c7158 < Memory usage before: 895&439; after: 290&420; still untouched: 175 --- > Memory usage before: 1336&439; after: 392&420; still untouched: 483 -7288c7285 +7288c7291 < Memory usage before: 334&431; after: 292&418; still untouched: 175 --- > Memory usage before: 456&431; after: 394&418; still untouched: 483 -7291a7289,7291 +7291a7295,7297 > > ### semi simple group (level 1) entered at line 429 (begingroup) > ### bottom level -7296,7299c7296,7299 +7296,7299c7302,7305 < 47 strings out of 1674 < 253 string characters out of 8354 < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1697 -> 261 string characters out of 8288 +> 44 strings out of 1696 +> 261 string characters out of 8249 > 4017 words of memory out of 4500 > 490 multiletter control sequences out of 15000+0 -7301,7302c7301,7302 +7301,7302c7307,7308 < 2 hyphenation exceptions out of 307 < 7i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s --- @@ -690,7 +720,7 @@ 9c9 < ' TeX output 2008.03.15:0223' --- -> ' TeX output 2012.08.02:2133' +> ' TeX output 2013.03.01:1333' 419c419 < 1121: down4 639342208 --- @@ -711,29 +741,35 @@ + sed 's/, yoko direction//;s/yoko direction, //' etrip.log + diff SRCDIR/etexdir/etrip/etripin.log eptripin.log 1c1 -< This is e-TeX, Version 3.1415926-2.5 (TeX Live 2013/dev) (INITEX) 2 AUG 2012 21:16 +< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013/dev) (INITEX) 1 MAR 2013 13:22 --- -> This is e-pTeX, Version 3.1415926-p3.3-110825-2.5 (utf8.euc) (TeX Live 2013/dev) (INITEX) 2 AUG 2012 21:33 +> This is e-pTeX, Version 3.1415926-p3.3-110825-2.6 (utf8.euc) (TeX Live 2013/dev) (INITEX) 1 MAR 2013 13:33 27,29c27,29 < 1491 strings of total length 26237 < 280 memory locations dumped; current usage is 36&166 < 408 multiletter control sequences --- -> 1604 strings of total length 27743 +> 1605 strings of total length 27782 > 283 memory locations dumped; current usage is 40&166 > 459 multiletter control sequences + ./eptex --progname=eptex + sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' etrip.log + diff SRCDIR/etexdir/etrip/etrip.fot eptrip.fot 1c1 -< This is e-TeX, Version 3.1415926-2.5 (TeX Live 2013/dev) +< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013/dev) --- -> This is e-pTeX, Version 3.1415926-p3.3-110825-2.5 (utf8.euc) (TeX Live 2013/dev) +> This is e-pTeX, Version 3.1415926-p3.3-110825-2.6 (utf8.euc) (TeX Live 2013/dev) + diff SRCDIR/eptexdir/eptrip/etrip.log eptrip.log 1c1 -< This is e-pTeX, Version 3.1415926-p3.3-110825-2.5 (utf8.euc) (TeX Live 2013/dev) (format=etrip 2012.8.2) 2 AUG 2012 21:24 +< This is e-pTeX, Version 3.1415926-p3.3-110825-2.6 (utf8.euc) (TeX Live 2013/dev) (format=etrip 2013.3.1) 1 MAR 2013 13:22 +--- +> This is e-pTeX, Version 3.1415926-p3.3-110825-2.6 (utf8.euc) (TeX Live 2013/dev) (format=etrip 2013.3.1) 1 MAR 2013 13:33 +4296,4297c4296,4297 +< 18 strings out of 1696 +< 140 string characters out of 8257 --- -> This is e-pTeX, Version 3.1415926-p3.3-110825-2.5 (utf8.euc) (TeX Live 2013/dev) (format=etrip 2012.8.2) 2 AUG 2012 21:33 +> 18 strings out of 1695 +> 140 string characters out of 8218 + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' etrip.dvi ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' etrip.dvi + diff SRCDIR/etexdir/etrip/etrip.typ eptrip.typ @@ -744,6 +780,6 @@ 9c9 < ' TeX output 2012.05.11:1347' --- -> ' TeX output 2012.08.02:2133' +> ' TeX output 2013.03.01:1333' + : PASS: eptexdir/eptrip.test diff --git a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log b/Build/source/texk/web2c/eptexdir/eptrip/etrip.log index 08bc0540d5f..c3868426d89 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log +++ b/Build/source/texk/web2c/eptexdir/eptrip/etrip.log @@ -1,9 +1,9 @@ -This is e-pTeX, Version 3.1415926-p3.3-110825-2.5 (utf8.euc) (TeX Live 2013/dev) (format=etrip 2012.8.2) 2 AUG 2012 21:24 +This is e-pTeX, Version 3.1415926-p3.3-110825-2.6 (utf8.euc) (TeX Live 2013/dev) (format=etrip 2013.3.1) 1 MAR 2013 13:22 entering extended mode **&etrip etrip (./etrip.tex e-IniTeX: e-Trip format loaded. -This is the e-Trip test [2012-08-02] for e-TeX v3.1415926-2.5. -(You are using e-TeX version/revision 2.5) +This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6. +(You are using e-TeX version/revision 2.6) Missing character: There is no b in font nullfont! Missing character: There is no c in font nullfont! diff --git a/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex b/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex index 2d239d69a2a..fa267b9fe65 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex +++ b/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex @@ -1,4 +1,4 @@ -%%; This is `eptrip.tex' for e-pTeX v3.1415926-2.5 as of Aug 02, 2012. +%%; This is `eptrip.tex' for e-pTeX v3.1415926-2.6 as of Mar 01, 2013. %%; %%; This is a diabolical test file for e-pTeX, an extension of TeX82. %%; It is not as diabolical as `trip.tex', Knuth's torture test for TeX. @@ -9,9 +9,9 @@ %%; ==>> wrong e-TeX input to produce errors and warnings. <<== %%; \catcode`\{=1\catcode`\}=2\catcode`\#=6 \let\bgroup={ \let\egroup=} -\def\etripdate {2012-08-02} +\def\etripdate {2013-03-01} \def\texversion {3.1415926} -\def\etripversion{2.5} +\def\etripversion{2.6} % \message{This is the e-Trip test [\etripdate] for e-TeX v\texversion-\etripversion.} -- cgit v1.2.3