From 8e18851cbe22c5dfe195f118c4039afb882630ae Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 28 Jun 2021 21:57:05 +0000 Subject: sync to branch: pdftex 1.40.23 post-release fix for sharable fmt git-svn-id: svn://tug.org/texlive/branches/branch2021@59744 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pdftexdir/ChangeLog | 33 ++++++++++++++++++++-- Build/source/texk/web2c/pdftexdir/NEWS | 8 ++++++ Build/source/texk/web2c/pdftexdir/pdftex.web | 11 ++++++-- Build/source/texk/web2c/pdftexdir/pdftex_version.h | 2 +- Build/source/texk/web2c/pdftexdir/ptexlib.h | 2 +- 5 files changed, 48 insertions(+), 8 deletions(-) diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 92be2f93c47..2a7f3d400d0 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,30 @@ +2021-02-17 Karl Berry + + * NEWS, + * pdftex_version.h, + * pdftex.web (pdftex_revision, pdftex_version_string): + version [1.40.]23 for post-TL21 fmt fix. + +2021-01-04 Thanh Han The + + * pdftex.web (letter_space_font): use explicit \fontdimen6 (quad) + if specified: + https://mailman.ntg.nl/pipermail/ntg-pdftex/2021-June/004335.html + + And avoid problem when single-character command + is used with \letterspacefont: + https://mailman.ntg.nl/pipermail/ntg-pdftex/2021-June/004336.html + + Both reports from Robert Schlict. + (pdftex r853, r854) + +2021-06-15 Marcel Fabian Krueger + + * ptexlib.h (glyph_unicode_entry): use integer, not long, + to allow dumping without making .fmt platform dependent. + See surrounding thread at: + https://tug.org/pipermail/tex-live/2021-June/047132.html + 2021-03-23 Karl Berry * TL'21. @@ -1493,7 +1520,7 @@ * pdftex.ch (do_extension): Recover variables unused by TeX. -2009-09-16 Han The Thanh +2009-09-16 Thanh Han The * writettf.c: patch for TTC from Liu Yubao @@ -1531,14 +1558,14 @@ * pdftex.web (sup_dest_names_size): increase to 500000; test document from Peter Abbott to Karl, 12 Aug 2009 12:24:43. -2009-07-13 Han The Thanh +2009-07-13 Thanh Han The * mapfile.c: treat TTC fonts as TTF * writejpg.c: fix bitmap resolution * writettf.c: fix segfault for certain TTF fonts * pdftex.web: enable pk generation by default -2009-06-26 Han The Thanh +2009-06-26 Thanh Han The * pdftex.web: bugfix from Hartmut: fix \pdfobj file {foo} for files foo that don't end with '\n' diff --git a/Build/source/texk/web2c/pdftexdir/NEWS b/Build/source/texk/web2c/pdftexdir/NEWS index 8b522289dc8..89c7483e11e 100644 --- a/Build/source/texk/web2c/pdftexdir/NEWS +++ b/Build/source/texk/web2c/pdftexdir/NEWS @@ -1,3 +1,11 @@ +pdfTeX 3.141592653-2.6-1.40.23 (TeX Live 2021 post-release) (June 28, 2021) +- changes: + - for letterspaced fonts, use explicit \fontdimen6 if specified. + +- bugfixes: + - make .fmt files sharable between 4/8-byte architectures. + - for \letterspacefont, avoid problem with single-character control sequence. + pdfTeX 3.141592653-2.6-1.40.22 (TeX Live 2021) (March 23, 2021) - changes: - new primitives \pdfrunninglinkoff and \pdfrunninglinkon; e.g., for diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web index 4ae1f20716f..d0742a64dca 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftex.web +++ b/Build/source/texk/web2c/pdftexdir/pdftex.web @@ -307,8 +307,8 @@ known as `\eTeX'. {printed when \eTeX\ starts} @# @d pdftex_version==140 { \.{\\pdftexversion} } -@d pdftex_revision=="22" { \.{\\pdftexrevision} } -@d pdftex_version_string=='-1.40.22' {current \pdfTeX\ version} +@d pdftex_revision=="23" { \.{\\pdftexrevision} } +@d pdftex_version_string=='-1.40.23' {current \pdfTeX\ version} @# @d pdfTeX_banner=='This is pdfTeX, Version 3.141592653',eTeX_version_string,pdftex_version_string {printed when \pdfTeX\ starts} @@ -17641,12 +17641,17 @@ begin if scan_keyword("nolig") then set_no_ligatures(k); {disable ligatures for letter-spaced fonts} nw := height_base[k] - width_base[k]; + + if (quad(k) = 0) and (quad(f) > 0) then + quad(k) := quad(f); + if quad(k) = 0 then + pdf_warning("\letterspacefont", "font has zero em size (\fontdimen6)", true, true); + for i := 0 to nw - 1 do font_info[width_base[k] + i].sc := font_info[width_base[k] + i].sc + round_xn_over_d(quad(k), e, 1000); {append, e.g., '+100ls' to font name} - flush_str(font_name[k]); str_room(length(font_name[k]) + 7); {|abs(e) <= 1000|} old_setting := selector; selector := new_string; diff --git a/Build/source/texk/web2c/pdftexdir/pdftex_version.h b/Build/source/texk/web2c/pdftexdir/pdftex_version.h index 026f967d163..076264226f9 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftex_version.h +++ b/Build/source/texk/web2c/pdftexdir/pdftex_version.h @@ -1 +1 @@ -#define PDFTEX_VERSION "1.40.22" +#define PDFTEX_VERSION "1.40.23" diff --git a/Build/source/texk/web2c/pdftexdir/ptexlib.h b/Build/source/texk/web2c/pdftexdir/ptexlib.h index b10d289b38b..4a58e21118e 100644 --- a/Build/source/texk/web2c/pdftexdir/ptexlib.h +++ b/Build/source/texk/web2c/pdftexdir/ptexlib.h @@ -77,7 +77,7 @@ typedef struct { typedef struct { char *name; /* glyph name */ - long code; /* -1 = undefined; -2 = multiple codes, stored + integer code; /* -1 = undefined; -2 = multiple codes, stored as string in unicode_seq; otherwise unicode value */ char *unicode_seq; /* multiple unicode sequence */ } glyph_unicode_entry; -- cgit v1.2.3