summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schröder <martin@oneiros.de>2007-02-04 20:26:47 +0000
committerMartin Schröder <martin@oneiros.de>2007-02-04 20:26:47 +0000
commit142ceb49bf98e4c5f7750e335fad477db26dff48 (patch)
treed6397e49a55a9afb5108d69a2a6e1c09f44a7b7a
parent13488a563bb5a4b4746bf42eabc74cc4169e2431 (diff)
pdftex 1.40.3
git-svn-id: svn://tug.org/texlive/trunk@3910 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/pdftexdir/NEWS6
-rw-r--r--Build/source/texk/web2c/pdftexdir/README4
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web4
-rw-r--r--Build/source/texk/web2c/pdftexdir/writefont.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writeimg.c4
5 files changed, 15 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/NEWS b/Build/source/texk/web2c/pdftexdir/NEWS
index 38419061284..466ba74993d 100644
--- a/Build/source/texk/web2c/pdftexdir/NEWS
+++ b/Build/source/texk/web2c/pdftexdir/NEWS
@@ -1,4 +1,10 @@
-------------------------------------------------
+pdfTeX 3.141592-1.40.3 was released on 2007-02-04
+-------------------------------------------------
+- bugfix: document which used type 1 and truetype or opentype fonts resulted in
+ broken pdfs (729)
+
+-------------------------------------------------
pdfTeX 3.141592-1.40.2 was released on 2007-01-31
-------------------------------------------------
- bugfix: maplines starting with = would not work as advertised
diff --git a/Build/source/texk/web2c/pdftexdir/README b/Build/source/texk/web2c/pdftexdir/README
index 6261b8ba0e9..b43ecc3dd66 100644
--- a/Build/source/texk/web2c/pdftexdir/README
+++ b/Build/source/texk/web2c/pdftexdir/README
@@ -1,10 +1,10 @@
pdfTeX
======
-README for version 3.14159-1.40.2
+README for version 3.14159-1.40.3
=================================
-This directory contains the version 1.40.2 of pdfTeX, an extended version
+This directory contains the version 1.40.3 of pdfTeX, an extended version
of eTeX that can create PDF directly from TeX source files and enhance the
result of TeX typesetting with the help of PDF. When PDF output is not
selected, pdfTeX produces normal DVI output, otherwise it produces PDF
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 21ba7327392..693a347d447 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -286,8 +286,8 @@ known as `\eTeX'.
{printed when \eTeX\ starts}
@#
@d pdftex_version==140 { \.{\\pdftexversion} }
-@d pdftex_revision=="2" { \.{\\pdftexrevision} }
-@d pdftex_version_string=='-1.40.2' {current \pdfTeX\ version}
+@d pdftex_revision=="3" { \.{\\pdftexrevision} }
+@d pdftex_version_string=='-1.40.3' {current \pdfTeX\ version}
@#
@d pdfeTeX_banner=='This is pdfeTeX, Version 3.141592',pdftex_version_string,eTeX_version_string
{printed when \pdfeTeX\ starts}
diff --git a/Build/source/texk/web2c/pdftexdir/writefont.c b/Build/source/texk/web2c/pdftexdir/writefont.c
index 684db2881f6..3a7a13cd5d3 100644
--- a/Build/source/texk/web2c/pdftexdir/writefont.c
+++ b/Build/source/texk/web2c/pdftexdir/writefont.c
@@ -1,5 +1,5 @@
/*
-Copyright (c) 1996-2006 Han The Thanh, <thanh@pdftex.org>
+Copyright (c) 1996-2007 Han The Thanh, <thanh@pdftex.org>
This file is part of pdfTeX.
@@ -504,7 +504,8 @@ void write_fontdictionary(fo_entry * fo)
pdf_printf("/FirstChar %i\n/LastChar %i\n/Widths %i 0 R\n",
(int) fo->first_char, (int) fo->last_char,
(int) fo->cw->cw_objnum);
- if (fo->fe != NULL && fo->fe->fe_objnum != 0)
+ if ((is_type1(fo->fm) || is_opentype(fo->fm)) && fo->fe != NULL
+ && fo->fe->fe_objnum != 0)
pdf_printf("/Encoding %i 0 R\n", (int) fo->fe->fe_objnum);
if (fo->tounicode_objnum != 0)
pdf_printf("/ToUnicode %i 0 R\n", (int) fo->tounicode_objnum);
diff --git a/Build/source/texk/web2c/pdftexdir/writeimg.c b/Build/source/texk/web2c/pdftexdir/writeimg.c
index 29e0cd00e24..1af5abec8a7 100644
--- a/Build/source/texk/web2c/pdftexdir/writeimg.c
+++ b/Build/source/texk/web2c/pdftexdir/writeimg.c
@@ -1,5 +1,5 @@
/*
-Copyright (c) 1996-2002, 2005 Han The Thanh, <thanh@pdftex.org>
+Copyright (c) 1996-2007 Han The Thanh, <thanh@pdftex.org>
This file is part of pdfTeX.
@@ -314,7 +314,7 @@ integer readimage(strnumber s, integer page_num, strnumber page_name,
if (pdfversion < 4) {
pdftex_fail
("JBIG2 images only possible with at least PDF 1.4; you are generating PDF 1.%i",
- pdfversion);
+ (int)pdfversion);
}
jbig2_ptr(img) = xtalloc(1, JBIG2_IMAGE_INFO);
img_type(img) = IMAGE_TYPE_JBIG2;