From f6310e06f825da51ed054f27a316e14682404493 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 4 Dec 2013 13:00:45 +0000 Subject: pdfTeX: Update to e-TeX 2.6 from 2013-11-21 git-svn-id: svn://tug.org/texlive/trunk@32319 c570f23f-e606-0410-a88d-b1316a301751 --- .../psutils/psutils-1.21-PATCHES/patch-20-psnup-man | 16 ++++++++-------- Build/source/texk/psutils/psutils-1.21/psnup.1 | 7 +++---- Build/source/texk/web2c/pdftexdir/ChangeLog | 6 ++++++ Build/source/texk/web2c/pdftexdir/etex_version.h | 2 +- Build/source/texk/web2c/pdftexdir/pdftex.web | 18 +++++++++++++----- 5 files changed, 31 insertions(+), 18 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-20-psnup-man b/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-20-psnup-man index 41e9549348f..bbfc848c878 100644 --- a/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-20-psnup-man +++ b/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-20-psnup-man @@ -1,7 +1,7 @@ diff -ur psutils-1.21.orig/psnup.1 psutils-1.21/psnup.1 --- psutils-1.21.orig/psnup.1 2013-10-21 23:28:08.000000000 +0200 -+++ psutils-1.21/psnup.1 2013-12-03 11:26:05.000000000 +0100 -@@ -3,53 +3,33 @@ ++++ psutils-1.21/psnup.1 2013-12-04 11:12:43.000000000 +0100 +@@ -3,53 +3,32 @@ psnup \- multiple pages per sheet .SH SYNOPSIS .B psnup @@ -52,11 +52,10 @@ diff -ur psutils-1.21.orig/psnup.1 psutils-1.21/psnup.1 +.RB [ \-c ] +.RB [ \-m\fImargin\fR ] +.RB [ \-b\fIborder\fR ] -+.RB [ \-d\fIlwidth\fR ] ++.RB [ \-d [ \fIlwidth\fR ]] +.RB [ \-s\fIscale\fR ] +.RB [ \-\fInup\fR ] -+.RB [ \-q -+] ++.RB [ \-q ] +.RI [ infile +.RI [ outfile ]] .SH DESCRIPTION @@ -75,7 +74,7 @@ diff -ur psutils-1.21.orig/psnup.1 psutils-1.21/psnup.1 option gives the paper height, specified in .BR pt , .BR mm , -@@ -57,79 +37,80 @@ +@@ -57,79 +36,80 @@ or .BR in . The @@ -136,7 +135,8 @@ diff -ur psutils-1.21.orig/psnup.1 psutils-1.21/psnup.1 option draws a line around the border of each page, of the specified width. If the \fIlwidth\fR parameter is omitted, a default linewidth of 1 point is assumed. The linewidth is relative to the original page dimensions, - \fIi.e.\fR it is scaled down with the rest of the page. +-\fIi.e.\fR it is scaled down with the rest of the page. ++i.e., it is scaled down with the rest of the page. .PP The scale chosen by -.I psnup @@ -176,7 +176,7 @@ diff -ur psutils-1.21.orig/psnup.1 psutils-1.21/psnup.1 For example, using groff to create a PostScript document and lpr as the .SM UNIX -@@ -151,5 +132,5 @@ +@@ -151,5 +131,5 @@ .B PostScript is a trademark of Adobe Systems Incorporated. .SH BUGS diff --git a/Build/source/texk/psutils/psutils-1.21/psnup.1 b/Build/source/texk/psutils/psutils-1.21/psnup.1 index a8505543377..83cd988ec27 100644 --- a/Build/source/texk/psutils/psutils-1.21/psnup.1 +++ b/Build/source/texk/psutils/psutils-1.21/psnup.1 @@ -13,11 +13,10 @@ psnup \- multiple pages per sheet .RB [ \-c ] .RB [ \-m\fImargin\fR ] .RB [ \-b\fIborder\fR ] -.RB [ \-d\fIlwidth\fR ] +.RB [ \-d [ \fIlwidth\fR ]] .RB [ \-s\fIscale\fR ] .RB [ \-\fInup\fR ] -.RB [ \-q -] +.RB [ \-q ] .RI [ infile .RI [ outfile ]] .SH DESCRIPTION @@ -83,7 +82,7 @@ The option draws a line around the border of each page, of the specified width. If the \fIlwidth\fR parameter is omitted, a default linewidth of 1 point is assumed. The linewidth is relative to the original page dimensions, -\fIi.e.\fR it is scaled down with the rest of the page. +i.e., it is scaled down with the rest of the page. .PP The scale chosen by .B psnup diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index fb6ca3c1068..1897371a0d2 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,9 @@ +2013-12-04 Peter Breitenlohner + + Update to e-TeX Version 2.6 [2013-11-21]. + * etex_version.h, pdftex.web: Enable hyphenation of text between + \beginL and \endL or between \beginR and \endR. + 2013-09-27 Akira Kakuto * writet1.c (t1_subset_ascii_part): Remove UniqueID in subsets. diff --git a/Build/source/texk/web2c/pdftexdir/etex_version.h b/Build/source/texk/web2c/pdftexdir/etex_version.h index 718a5756b3a..13752253536 100644 --- a/Build/source/texk/web2c/pdftexdir/etex_version.h +++ b/Build/source/texk/web2c/pdftexdir/etex_version.h @@ -1 +1 @@ -#define ETEX_VERSION "2.5" +#define ETEX_VERSION "2.6" diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web index d3fbfc17e60..c6f652f8bb3 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftex.web +++ b/Build/source/texk/web2c/pdftexdir/pdftex.web @@ -1,4 +1,4 @@ -% Copyright (c) 1996-2012 Han Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh, +% Copyright (c) 1996-2013 Han Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh, % % This file is part of pdfTeX. @@ -113,6 +113,11 @@ % Version 2.5 development was started in Aug 2012; released in Feb 2013. % better tracing of font definitions, reported by % Bruno Le Floch , Jul 2012. +% Version 2.6 development was started in Mar 2013; released in ??? 201?. +% enable hyphenation of text between \beginL and \endL or +% between \beginR and \endR, problem reported by +% Vafa Khalighi , 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 @@ -293,8 +298,8 @@ helping to determine whether a particular implementation deserves to be known as `\eTeX'. @d eTeX_version=2 { \.{\\eTeXversion} } -@d eTeX_revision==".5" { \.{\\eTeXrevision} } -@d eTeX_version_string=='-2.5' {current \eTeX\ version} +@d eTeX_revision==".6" { \.{\\eTeXrevision} } +@d eTeX_version_string=='-2.6' {current \eTeX\ version} @# @d eTeX_banner=='This is e-TeX, Version 3.1415926',eTeX_version_string {printed when \eTeX\ starts} @@ -25114,7 +25119,7 @@ ligature_node: begin f:=font(lig_char(cur_p)); end; end; disc_node: @; -math_node: begin if subtype(cur_p)=L_code) then goto continue else if type(s)=whatsit_node then begin @; goto continue; @@ -25826,6 +25833,7 @@ loop@+ begin if not(is_char_node(s)) then kern_node: if subtype(s)<>normal then goto done4; whatsit_node,glue_node,penalty_node,ins_node,adjust_node,mark_node: goto done4; + math_node: if subtype(s)>=L_code then goto done4@+else goto done1; othercases goto done1 endcases; s:=link(s); -- cgit v1.2.3