summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/pdftexdir/writet3.c
diff options
context:
space:
mode:
authorMartin Schröder <martin@oneiros.de>2007-07-11 21:13:59 +0000
committerMartin Schröder <martin@oneiros.de>2007-07-11 21:13:59 +0000
commit7bf56e6bfcd7b204b3507dc9acaaaa3dce2cbcdb (patch)
tree5f8b4be4a21dc917441e4d2a1ec3e6fe25fd0192 /Build/source/texk/web2c/pdftexdir/writet3.c
parentc0da09fd6e4a542610245624c185a66f5ec814b2 (diff)
Imported pdftex 1.40.4
git-svn-id: svn://tug.org/texlive/trunk@4561 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir/writet3.c')
-rw-r--r--Build/source/texk/web2c/pdftexdir/writet3.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/writet3.c b/Build/source/texk/web2c/pdftexdir/writet3.c
index d50de0bb52f..b5ad919c709 100644
--- a/Build/source/texk/web2c/pdftexdir/writet3.c
+++ b/Build/source/texk/web2c/pdftexdir/writet3.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.
@@ -13,11 +13,11 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with pdfTeX; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+You should have received a copy of the GNU General Public License along
+with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: writet3.c,v 1.10 2005/12/26 14:26:18 hahe Exp hahe $
+$Id: writet3.c 200 2007-07-11 13:11:12Z oneiros $
*/
#include "ptexlib.h"
@@ -113,8 +113,7 @@ static void t3_write_glyph(internalfontnumber f)
"%i %i %i %i %i %i %i %i =", &glyph_index,
&width, &height, &depth, &llx, &lly, &urx, &ury) != 8) {
remove_eol(p, t3_line_array);
- pdftex_warn("invalid glyph preamble: `%s'", t3_line_array);
- return;
+ pdftex_fail("invalid glyph preamble: `%s'", t3_line_array);
}
if (glyph_index < fontbc[f] || glyph_index > fontec[f])
return;
@@ -193,11 +192,10 @@ static boolean writepk(internalfontnumber f)
if (name == NULL ||
!FILESTRCASEEQ(cur_file_name, font_ret.name) ||
!kpse_bitmap_tolerance((float) font_ret.dpi, (float) dpi)) {
- pdftex_warn("Font %s at %i not found", cur_file_name, (int) dpi);
- cur_file_name = NULL;
- return false;
+ pdftex_fail("Font %s at %i not found", cur_file_name, (int) dpi);
}
t3_file = xfopen(name, FOPEN_RBIN_MODE);
+ recorder_record_input(name);
t3_image_used = true;
is_pk_font = true;
tex_printf(" <%s", (char *) name);
@@ -290,10 +288,7 @@ void writet3(int objnum, internalfontnumber f)
sscanf(t3_line_array + strlen(t3_font_scale_str) + 1, "%g",
&t3_font_scale) < 1 || t3_font_scale <= 0
|| t3_font_scale > 1000) {
- pdftex_warn("missing or invalid font scale");
- t3_close();
- cur_file_name = NULL;
- return;
+ pdftex_fail("missing or invalid font scale");
}
while (!t3_eof())
t3_write_glyph(f);