summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2008-02-18 10:29:18 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2008-02-18 10:29:18 +0000
commit643b23146b2f751249a13b5566765127b34cdbf4 (patch)
tree6984bd35ce60eb3367ae15bf5bb5bdeeb0a1cb9e
parenta80e11faf487b9895707a593d2d4414e5241eff8 (diff)
fixed bug in e-TeX hyph_code handling
git-svn-id: svn://tug.org/texlive/trunk@6673 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/etexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/etexdir/etex.ch22
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web29
4 files changed, 38 insertions, 24 deletions
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index eb53fb8052c..c4db2e4e893 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * etex.ch: Fixed a bug in hyph_code handling (\savinghyphcodes)
+ reported by Vladimir Volovich <vvv@vsu.ru>.
+ Corrected a few typos in TeX text.
+
2005-08-03 Olaf Weber <olaf@infovore.xs4all.nl>
* tex.ech: Implement -etex switch.
diff --git a/Build/source/texk/web2c/etexdir/etex.ch b/Build/source/texk/web2c/etexdir/etex.ch
index 74c19e79057..d887bf00288 100644
--- a/Build/source/texk/web2c/etexdir/etex.ch
+++ b/Build/source/texk/web2c/etexdir/etex.ch
@@ -29,7 +29,7 @@
% (pdftexdir/pdftex.ch). Consequently, changes in these files have to be
% coordinated.
-% e-TeX is copyright (C) 1999-2004 by P. Breitenlohner (1994,98 by the NTS
+% e-TeX is copyright (C) 1999-2008 by P. Breitenlohner (1994,98 by the NTS
% team); all rights are reserved. Copying of this file is authorized only if
% (1) you are P. Breitenlohner, or if (2) you make absolutely no changes to
% your copy. (Programs such as TIE allow the application of several change
@@ -116,6 +116,9 @@
% direction typesetting;
% fixed a bug in the revised glue rounding code, detected by
% Tigran Aivazian <tigran@@aivazian.fsnet.co.uk>, Oct 2004.
+% Version 2.3 development was started in Feb 2008; released in Mon Year.
+% fixed a bug in hyph_code handling (\savinghyphcodes)
+% reported by Vladimir Volovich <vvv@@vsu.ru>, Feb 2008.
% Although considerable effort has been expended to make the e-TeX program
% correct and reliable, no warranty is implied; the author disclaims any
@@ -3020,13 +3023,12 @@ if (format_ident=0)or(buffer[loc]="&") then
if eTeX_ex then wterm_ln('entering extended mode');
@z
%---------------------------------------
-@x [53] m.1363 l.24757 - e-TeX hyph_codes
-adv_past(s)
+@x [53] m.1362 l.24751 adv_past - e-TeX hyph_codes
+ begin cur_lang:=what_lang(#); l_hyf:=what_lhm(#); r_hyf:=what_rhm(#);@+end
@y
-if subtype(s)=language_node then
- begin cur_lang:=what_lang(s); l_hyf:=what_lhm(s); r_hyf:=what_rhm(s);
- set_hyph_index;
- end
+ begin cur_lang:=what_lang(#); l_hyf:=what_lhm(#); r_hyf:=what_rhm(#);
+ set_hyph_index;
+ end
@z
%---------------------------------------
@x [54] m.1379 l.24945 - e-TeX additions
@@ -5915,7 +5917,7 @@ fields in the active nodes.
@!best_pl_glue:array[very_loose_fit..tight_fit] of scaled; {corresponding
glue stretch or shrink}
-@ The new algorithm for the last line requires that the stretchability
+@ The new algorithm for the last line requires that the stretchability of
|par_fill_skip| is infinite and the stretchability of |left_skip| plus
|right_skip| is finite.
@@ -5966,10 +5968,10 @@ if arith_error then
if active_short(r)>0 then g:=max_dimen@+else g:=-max_dimen;
if g>0 then
@<Set the value of |b| to the badness of the last line for stretching,
- compute the corresponding |fit_class, and |goto found||@>
+ compute the corresponding |fit_class|, and |goto found|@>
else if g<0 then
@<Set the value of |b| to the badness of the last line for shrinking,
- compute the corresponding |fit_class, and |goto found||@>;
+ compute the corresponding |fit_class|, and |goto found|@>;
not_found:end
@ These badness computations are rather similar to those of the standard
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 243b3ddd9c2..d8dcfd4afcb 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pdftex.web: Adapted to e-TeX changes (fixed a bug in hyph_code
+ handling and corrected a few typos in TeX text).
+
2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.in (depend): Substitute $(srcdir) in depend.mk.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 68122be619f..ef4392aee57 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -15,12 +15,11 @@
% pdfTeX; if not, write to the Free Software Foundation, Inc., 51 Franklin
% Street, Fifth Floor, Boston, MA 02110-1301 USA.
-% e-TeX is copyright (C) 1994,98 by Peter Breitenlohner; all rights are
-% reserved. Copying of this file is authorized only if (1) you are Peter
-% Breitenlohner, or if (2) you make absolutely no changes to your copy.
-% (Programs such as PATCHWEB, TIE, or WEBMERGE allow the application of
-% several change files to tex.web; the master files tex.web and etex.ch
-% should stay intact.)
+% e-TeX is copyright (C) 1999-2008 by P. Breitenlohner (1994,98 by the NTS
+% team); all rights are reserved. Copying of this file is authorized only if
+% (1) you are P. Breitenlohner, or if (2) you make absolutely no changes to
+% your copy. (Programs such as TIE allow the application of several change
+% files to tex.web; the master files tex.web and etex.ch should stay intact.)
% See etex_gen.tex for hints on how to install this program.
% And see etripman.tex for details about how to validate it.
@@ -100,6 +99,9 @@
% direction typesetting;
% fixed a bug in the revised glue rounding code, detected by
% Tigran Aivazian <tigran@@aivazian.fsnet.co.uk>, Oct 2004.
+% Version 2.3 development was started in Feb 2008; released in Mon Year.
+% fixed a bug in hyph_code handling (\savinghyphcodes)
+% reported by Vladimir Volovich <vvv@@vsu.ru>, Feb 2008.
% Although considerable effort has been expended to make the e-TeX program
% correct and reliable, no warranty is implied; the author disclaims any
@@ -35057,7 +35059,9 @@ else
d := 0
@ @d adv_past(#)==@+if subtype(#)=language_node then
- begin cur_lang:=what_lang(#); l_hyf:=what_lhm(#); r_hyf:=what_rhm(#);@+end
+ begin cur_lang:=what_lang(#); l_hyf:=what_lhm(#); r_hyf:=what_rhm(#);
+ set_hyph_index;
+ end
@<Advance \(p)past a whatsit node in the \(l)|line_break| loop@>=@+
begin
@@ -35067,10 +35071,7 @@ if (subtype(cur_p) = pdf_refxform_node) or (subtype(cur_p) = pdf_refximage_node)
end
@ @<Advance \(p)past a whatsit node in the \(p)pre-hyphenation loop@>=@+
-if subtype(s)=language_node then
- begin cur_lang:=what_lang(s); l_hyf:=what_lhm(s); r_hyf:=what_rhm(s);
- set_hyph_index;
- end
+adv_past(s)
@ @<Prepare to move whatsit |p| to the current page, then |goto contribute|@>=
begin
@@ -39039,7 +39040,7 @@ fields in the active nodes.
@!best_pl_glue:array[very_loose_fit..tight_fit] of scaled; {corresponding
glue stretch or shrink}
-@ The new algorithm for the last line requires that the stretchability
+@ The new algorithm for the last line requires that the stretchability of
|par_fill_skip| is infinite and the stretchability of |left_skip| plus
|right_skip| is finite.
@@ -39090,10 +39091,10 @@ if arith_error then
if active_short(r)>0 then g:=max_dimen@+else g:=-max_dimen;
if g>0 then
@<Set the value of |b| to the badness of the last line for stretching,
- compute the corresponding |fit_class, and |goto found||@>
+ compute the corresponding |fit_class|, and |goto found|@>
else if g<0 then
@<Set the value of |b| to the badness of the last line for shrinking,
- compute the corresponding |fit_class, and |goto found||@>;
+ compute the corresponding |fit_class|, and |goto found|@>;
not_found:end
@ These badness computations are rather similar to those of the standard