summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/etexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-11-21 10:44:15 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-11-21 10:44:15 +0000
commite8842c31c15e613f8cb08a582bdbdf889ce78dce (patch)
treea9edf1e758d91d619510b2094c69167c6f44f3a4 /Build/source/texk/web2c/etexdir
parent4d611818efd68a3a22bc32c3a3e2969987714748 (diff)
e-TeX: Fix hyphenation of LR and RL text and adapt e-(u)pTeX
git-svn-id: svn://tug.org/texlive/trunk@32197 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/etexdir')
-rw-r--r--Build/source/texk/web2c/etexdir/ChangeLog8
-rw-r--r--Build/source/texk/web2c/etexdir/etex.ch28
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.diffs32
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.fot4
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.log135
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.tex18
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.typ4
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etripin.log8
8 files changed, 202 insertions, 35 deletions
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index 07cab170b60..6e1a16729ab 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * etex.ch: Enable hyphenation of text between \beginL and \endL or
+ between \beginR and \endR.
+ * etrip/etrip.diffs, etrip/etrip.fot, etrip/etrip.log,
+ etrip/etrip.tex, etrip/etrip.typ, etrip/etripin.log:
+ Version 2.6 [2013-11-21] for TL 2014.
+
2013-04-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* etrip/etrip.diffs, etrip/etrip.fot, etrip/etrip.typ,
diff --git a/Build/source/texk/web2c/etexdir/etex.ch b/Build/source/texk/web2c/etexdir/etex.ch
index 2756b047eb0..858b13e5ee8 100644
--- a/Build/source/texk/web2c/etexdir/etex.ch
+++ b/Build/source/texk/web2c/etexdir/etex.ch
@@ -103,7 +103,10 @@
% better tracing of font definitions, reported by
% Bruno Le Floch <blflatex@@gmail.com>, Jul 2012.
% Version 2.6 development was started in Mar 2013; released in ??? 201?.
-% better handling of right-to-left text.
+% enable hyphenation of text between \beginL and \endL or
+% between \beginR and \endR, problem reported by
+% Vafa Khalighi <vafalgk@@gmail.com>, Nov 2013.
+% better handling of right-to-left text -- to be done.
% Although considerable effort has been expended to make the e-TeX program
% correct and reliable, no warranty is implied; the author disclaims any
@@ -1912,7 +1915,7 @@ if do_last_line_fit then
@x [39] m.866 l.17064 - e-TeX TeXXeT
math_node: begin auto_breaking:=(subtype(cur_p)=after); kern_break;
@y
-math_node: begin if subtype(cur_p)<L_code then auto_breaking:=end_LR(cur_p);
+math_node: begin if subtype(cur_p)<L_code then auto_breaking:=odd(subtype(cur_p));
kern_break;
@z
%---------------------------------------
@@ -2004,6 +2007,13 @@ if TeXXeT_en then @<Insert LR nodes at the end of the current line@>;
else pen:=pen+widow_penalty;
@z
%---------------------------------------
+@x [40] m.891 l.17455 - e-TeX TeXXeT
+implicit kern nodes, and $p_m$ is a glue or penalty or insertion or adjust
+@y
+implicit kern or text direction nodes, and $p_m$ is a glue or penalty or
+insertion or adjust
+@z
+%---------------------------------------
@x [40] m.891 l.17494 - e-TeX hyph_codes
cur_lang:=init_cur_lang; l_hyf:=init_l_hyf; r_hyf:=init_r_hyf;
@y
@@ -2011,6 +2021,13 @@ cur_lang:=init_cur_lang; l_hyf:=init_l_hyf; r_hyf:=init_r_hyf;
set_hyph_index;
@z
%---------------------------------------
+@x [40] m.896 l.17557 - e-TeX TeXXeT
+ else if (type(s)=kern_node)and(subtype(s)=normal) then goto continue
+@y
+ else if (type(s)=kern_node)and(subtype(s)=normal) then goto continue
+ else if (type(s)=math_node)and(subtype(s)>=L_code) then goto continue
+@z
+%---------------------------------------
@x [40] m.896 l.17563 - e-TeX hyph_codes
if lc_code(c)<>0 then
if (lc_code(c)=c)or(uc_hyph>0) then goto done2
@@ -2042,6 +2059,13 @@ set_hyph_index;
incr(j); hu[j]:=c; hc[j]:=hc[0];@/
@z
%---------------------------------------
+@x [40] m.899 l.17623 - e-TeX TeXXeT
+ othercases goto done1
+@y
+ math_node: if subtype(s)>=L_code then goto done4@+else goto done1;
+ othercases goto done1
+@z
+%---------------------------------------
@x [42] m.934 l.18245 new_hyph_exceptions - e-TeX hyph_codes
label reswitch, exit, found, not_found;
@y
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
index 7467f35974c..4fcdab1cf93 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
@@ -12,7 +12,7 @@
1c1
< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23
---
-> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) (INITEX) 9 APR 2013 11:37
+> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:53
3c3
< (trip.tex
---
@@ -23,8 +23,8 @@
< 471 memory locations dumped; current usage is 96&278
< 341 multiletter control sequences
---
-> (format=trip 2013.4.9)
-> 1490 strings of total length 26206
+> (format=trip 2013.11.21)
+> 1490 strings of total length 26208
> 479 memory locations dumped; current usage is 104&278
> 342 multiletter control sequences
461c461
@@ -39,7 +39,7 @@
< ** &trip trip
< (trip.tex ##
---
-> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013)
+> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014)
> **(./trip.tex ##
17c16
< Memory usage before: 159&313; after: 102&278; still untouched: 1613
@@ -53,7 +53,7 @@
1c1
< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23
---
-> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) (format=trip 2013.4.9) 9 APR 2013 11:37
+> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (format=trip 2013.11.21) 21 NOV 2013 10:53
3c3
< (trip.tex ##
---
@@ -174,7 +174,7 @@
< 372 multiletter control sequences out of 2100
---
> 44 strings out of 1810
-> 261 string characters out of 7794
+> 261 string characters out of 7792
> 3821 words of memory out of 3999
> 373 multiletter control sequences out of 15000+0
7301c7305
@@ -187,11 +187,11 @@
1c1
< This is DVItype, Version 3.6
---
-> This is DVItype, Version 3.6 (TeX Live 2013)
+> This is DVItype, Version 3.6 (TeX Live 2014)
9c9
< ' TeX output 2008.03.15:0223'
---
-> ' TeX output 2013.04.09:1137'
+> ' TeX output 2013.11.21:1053'
419c419
< 1121: down4 639342208
---
@@ -338,26 +338,22 @@
+ mv etrip.log etripin.log
+ diff SRCDIR/etexdir/etrip/etripin.log etripin.log
1c1
-< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) (INITEX) 1 MAR 2013 13:22
+< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:43
---
-> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) (INITEX) 9 APR 2013 11:37
-26c26
-< (format=etrip 2013.3.1)
----
-> (format=etrip 2013.4.9)
+> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:53
+ ./etex --progname=etex
+ diff SRCDIR/etexdir/etrip/etrip.fot etrip.fot
+ diff SRCDIR/etexdir/etrip/etrip.log etrip.log
1c1
-< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) (format=etrip 2013.3.1) 1 MAR 2013 13:22
+< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:43
---
-> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) (format=etrip 2013.4.9) 9 APR 2013 11:37
+> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:53
+ 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 etrip.typ
9c9
-< ' TeX output 2013.03.01:1322'
+< ' TeX output 2013.11.21:1043'
---
-> ' TeX output 2013.04.09:1137'
+> ' TeX output 2013.11.21:1053'
+ :
PASS: etexdir/etrip.test
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.fot b/Build/source/texk/web2c/etexdir/etrip/etrip.fot
index d009aa9a256..fc78dbe4fe6 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.fot
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.fot
@@ -1,7 +1,7 @@
-This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013)
+This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014)
**entering extended mode
(./etrip.tex e-IniTeX: e-Trip format loaded.
-This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6.
+This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-2.6.
(You are using e-TeX version/revision 2.6)
Missing character: There is no c in font nullfont!
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.log b/Build/source/texk/web2c/etexdir/etrip/etrip.log
index 01512d907cc..3b201f46436 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.log
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.log
@@ -1,8 +1,8 @@
-This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) (format=etrip 2013.3.1) 1 MAR 2013 13:22
+This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:43
entering extended mode
**&etrip etrip
(./etrip.tex e-IniTeX: e-Trip format loaded.
-This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6.
+This is the e-Trip test [2013-11-21] 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!
@@ -4291,14 +4291,139 @@ laywidowpenalties:
{restoring \widowpenalties=0}
{restoring \clubpenalties=0}
{restoring \interlinepenalties=0}
+Checking hyphenation of LR and RL segments:
+
+Overfull \hbox (15.0pt too wide) in paragraph at lines 1256--1256
+ \trip MM1
+
+\hbox(0.0+0.0)x0.0, glue set - 1.0
+.\glue 4.0 plus 2.0 minus 1.0
+.\trip M
+.\trip M
+.\discretionary
+.\trip 1
+.\trip 7 (ligature |)
+.\glue(\rightskip) 0.0
+
+
+Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256
+\trip MM
+
+\hbox(0.0+0.0)x0.0
+.\trip M
+.\trip M
+.\glue(\rightskip) 0.0
+
+
+Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256
+[]\trip MM1[]
+
+\hbox(0.0+0.0)x0.0
+.\beginL
+.\trip M
+.\trip M
+.\discretionary
+.\trip 1
+.\trip 7 (ligature |)
+.\endL
+.\glue(\rightskip) 0.0
+
+
+Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256
+[]\trip MM[]
+
+\hbox(0.0+0.0)x0.0
+.\beginL
+.\trip M
+.\trip M
+.\endL
+.\glue(\rightskip) 0.0
+
+
+Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256
+[]\trip MM1[]
+
+\hbox(0.0+0.0)x0.0
+.\beginL
+.\trip M
+.\trip M
+.\discretionary
+.\trip 1
+.\trip 7 (ligature |)
+.\endL
+.\glue(\rightskip) 0.0
+
+
+Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256
+[]\trip MM[]
+
+\hbox(0.0+0.0)x0.0
+.\beginL
+.\trip M
+.\trip M
+.\endL
+.\glue(\rightskip) 0.0
+
+
+Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256
+[]\trip MM1[]
+
+\hbox(0.0+0.0)x0.0
+.\beginL
+.\trip M
+.\trip M
+.\discretionary
+.\trip 1
+.\trip 7 (ligature |)
+.\endL
+.\glue(\rightskip) 0.0
+
+
+Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256
+[]\trip MM[]
+
+\hbox(0.0+0.0)x0.0
+.\beginL
+.\trip M
+.\trip M
+.\endL
+.\glue(\rightskip) 0.0
+
+
+Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256
+[]\trip MM1[]
+
+\hbox(0.0+0.0)x0.0
+.\beginR
+.\trip M
+.\trip M
+.\discretionary
+.\trip 1
+.\trip 7 (ligature |)
+.\endR
+.\glue(\rightskip) 0.0
+
+
+Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256
+[]\trip MM[]
+
+\hbox(0.0+0.0)x0.0
+.\beginR
+.\trip M
+.\trip M
+.\endR
+.\penalty 10000
+.\glue(\parfillskip) 0.0
+.\glue(\rightskip) 0.0
+
)
Here is how much of TeX's memory you used:
- 18 strings out of 1809
- 140 string characters out of 7763
+ 19 strings out of 1809
+ 145 string characters out of 7761
3164 words of memory out of 3999
409 multiletter control sequences out of 15000+0
3796 words of font info for 5 fonts, out of 20000 for 75
- 9 hyphenation exceptions out of 659
+ 10 hyphenation exceptions out of 659
10i,15n,8p,137b,79s stack positions out of 200i,40n,60p,500b,600s
Output written on etrip.dvi (3 pages, 220 bytes).
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.tex b/Build/source/texk/web2c/etexdir/etrip/etrip.tex
index 87287072028..0f8238ecd65 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.tex
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.tex
@@ -1,4 +1,4 @@
-%%; This is `etrip.tex' for e-TeX v3.1415926-2.6 as of Mar 01, 2013.
+%%; This is `etrip.tex' for e-TeX v3.1415926-2.6 as of Nov 21, 2013.
%%;
%%; This is a diabolical test file for e-TeX, an extension of TeX82.
%%; It is not as diabolical as `trip.tex', Knuth's torture test for TeX.
@@ -9,7 +9,7 @@
%%; ==>> wrong e-TeX input to produce errors and warnings. <<==
%%;
\catcode`\{=1\catcode`\}=2\catcode`\#=6 \let\bgroup={ \let\egroup=}
-\def\etripdate {2013-03-01}
+\def\etripdate {2013-11-21}
\def\texversion {3.1415926}
\def\etripversion{2.6}
%
@@ -1244,6 +1244,20 @@
\endgroup
%
+% -- Check hyphenation of LR and RL segments
+\typeout{Checking hyphenation of LR and RL segments:}
+\begingroup
+ \setbox0=\vbox{\trip
+% \language=5
+ \lccode`M=`M \hyphenation{MM-MM}
+ \TeXXeTstate=1
+ \hsize=0pt
+ \parfillskip=0pt
+ \noindent{} MMMM \beginL MMMM MMMM MMMM\endL{} \beginR MMMM\endR \par
+ }
+\endgroup
+
+%
\showboxbreadth=10\showboxdepth=10
\tracingonline=1\tracingoutput=1
\end
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.typ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ
index f2409268a7a..81072959248 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.typ
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ
@@ -1,4 +1,4 @@
-This is DVItype, Version 3.6 (TeX Live 2013)
+This is DVItype, Version 3.6 (TeX Live 2014)
Options selected:
Starting page = *.*.*.*.*.*.*.*.*.*
Maximum number of pages = 1000000
@@ -6,7 +6,7 @@ Options selected:
Resolution = 72.27000000 pixels per inch
numerator/denominator=25400000/473628672
magnification=1000; 0.00001526 pixels per DVI unit
-' TeX output 2013.03.01:1322'
+' TeX output 2013.11.21:1043'
42: beginning of page 1.0.0.0.0.0.0.0.0.0
87: eop
diff --git a/Build/source/texk/web2c/etexdir/etrip/etripin.log b/Build/source/texk/web2c/etexdir/etrip/etripin.log
index 0210bdc4540..e840a8657b8 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etripin.log
+++ b/Build/source/texk/web2c/etexdir/etrip/etripin.log
@@ -1,8 +1,8 @@
-This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) (INITEX) 1 MAR 2013 13:22
+This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:43
entering extended mode
***etrip
(./etrip.tex
-This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6.
+This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-2.6.
(You are using e-TeX version/revision 2.6)
e-IniTeX: Assigning category codes, tracing switches, other codes,
definitions for e-VirTeX e-Trip test run, constants and registers,
@@ -23,8 +23,8 @@ Proceed; I'll ignore the character I just read.
enable e-TeX enhancements (TeXXeT),
prepare saved items (not to be dumped), everyjob ...dumped. )
Beginning to dump on file etrip.fmt
- (format=etrip 2013.3.1)
-1491 strings of total length 26237
+ (format=etrip 2013.11.21)
+1491 strings of total length 26239
280 memory locations dumped; current usage is 36&166
408 multiletter control sequences
\font\nullfont=nullfont