summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/pdftexdir/writettf.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-04-12 16:48:24 +0000
committerKarl Berry <karl@freefriends.org>2012-04-12 16:48:24 +0000
commit9b41efe5379edf34e5f9cb992c97ed57be3bab5d (patch)
tree9a100652b62922837c9b91ade033a17c4478d218 /Build/source/texk/web2c/pdftexdir/writettf.c
parent1932fa55c545fffe9fdd79df0459f384028a39d2 (diff)
changes from thanh for two new warning-suppression primitives and unicode glyph-name scanning; import from pdftex
git-svn-id: svn://tug.org/texlive/trunk@25938 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir/writettf.c')
-rw-r--r--Build/source/texk/web2c/pdftexdir/writettf.c47
1 files changed, 28 insertions, 19 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/writettf.c b/Build/source/texk/web2c/pdftexdir/writettf.c
index 1d5cd6497dc..f92b453d7d3 100644
--- a/Build/source/texk/web2c/pdftexdir/writettf.c
+++ b/Build/source/texk/web2c/pdftexdir/writettf.c
@@ -1,5 +1,5 @@
/*
-Copyright 1996-2011 Han The Thanh, <thanh@pdftex.org>
+Copyright 1996-2012 Han The Thanh, <thanh@pdftex.org>
This file is part of pdfTeX.
@@ -1020,6 +1020,7 @@ static void ttf_reindex_glyphs(void)
ttfenc_entry *e;
glyph_entry *glyph;
int index;
+ int n;
long *t;
ttf_cmap_entry *cmap = NULL;
boolean cmap_not_found = false;
@@ -1063,18 +1064,16 @@ static void ttf_reindex_glyphs(void)
/* handle case of reencoded fonts */
if (e->name == notdef)
continue;
- /* scan form `index123' */
- if (sscanf(e->name, GLYPH_PREFIX_INDEX "%i", &index) == 1) {
- if (index >= glyphs_count) {
- pdftex_warn("`%s' out of valid range [0..%i)",
- e->name, glyphs_count);
- continue;
- }
- glyph = glyph_tab + index;
- goto append_new_glyph;
- }
+
+ /* look up by name first */
+ for (glyph = glyph_tab; glyph - glyph_tab < glyphs_count; glyph++)
+ if (glyph->name != notdef && strcmp(glyph->name, e->name) == 0)
+ goto append_new_glyph;
+
/* scan form `uniABCD' */
- if (sscanf(e->name, GLYPH_PREFIX_UNICODE "%X", &index) == 1) {
+ n = -1;
+ sscanf(e->name, GLYPH_PREFIX_UNICODE "%X%n", &index, &n);
+ if (n == strlen(e->name)) {
if (cmap == NULL && !cmap_not_found) {
/* need to read the unicode mapping, ie (pid,eid) = (3,1) or (0,3) */
cmap = ttf_read_cmap(fd_cur->fm->ff_name, 3, 1, false);
@@ -1105,14 +1104,24 @@ static void ttf_reindex_glyphs(void)
continue;
}
}
- /* look up by name */
- for (glyph = glyph_tab; glyph - glyph_tab < glyphs_count; glyph++)
- if (glyph->name != notdef && strcmp(glyph->name, e->name) == 0)
- break;
- if (!(glyph - glyph_tab < glyphs_count)) {
- pdftex_warn("glyph `%s' not found", e->name);
- continue;
+
+ /* scan form `index123' */
+ n = -1;
+ sscanf(e->name, GLYPH_PREFIX_INDEX "%i%n", &index, &n);
+ if (n == strlen(e->name)) {
+ if (index >= glyphs_count) {
+ pdftex_warn("`%s' out of valid range [0..%i)",
+ e->name, glyphs_count);
+ continue;
+ }
+ glyph = glyph_tab + index;
+ goto append_new_glyph;
}
+
+ /* not found */
+ pdftex_warn("glyph `%s' not found", e->name);
+ continue;
+
append_new_glyph:
assert(glyph > glyph_tab && glyph - glyph_tab < glyphs_count);
if (glyph->newindex < 0) {