diff options
| author | Karl Berry <karl@freefriends.org> | 2010-11-26 02:09:56 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2010-11-26 02:09:56 +0000 |
| commit | fe38d85fc1b3cf785a6f519bab1c79333bc52faa (patch) | |
| tree | 059caa1dc289d8f5e6bd1bf09d271b373a724f86 /Build/source/texk/web2c/pdftexdir | |
| parent | e8f5cf0a3074ca90d2d75684738cabfeccc620a8 (diff) | |
(t1_check_unusual_charstring): switch EOL to space; from Thanh
git-svn-id: svn://tug.org/texlive/trunk@20571 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir')
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/writet1.c | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index dcd0cb7fb12..297055a2688 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2010-11-26 Thanh Han The <thanh@river-valley.org> + + * writet1.c (t1_check_unusual_charstring): switch EOL to space + before appending. + 2010-11-26 Heiko Oberdiek <heiko.oberdiek@googlemail.com> * pdftex.web (Display the whatsit...): avoid erroneous return. diff --git a/Build/source/texk/web2c/pdftexdir/writet1.c b/Build/source/texk/web2c/pdftexdir/writet1.c index 37394e3d363..9701b01de2d 100644 --- a/Build/source/texk/web2c/pdftexdir/writet1.c +++ b/Build/source/texk/web2c/pdftexdir/writet1.c @@ -1599,10 +1599,19 @@ static void t1_mark_glyphs(void) static void t1_check_unusual_charstring(void) { char *p = strstr(t1_line_array, charstringname) + strlen(charstringname); + char *q; int i; /* if no number follows "/CharStrings", let's read the next line */ if (sscanf(p, "%i", &i) != 1) { + /* pdftex_warn("no number found after `%s', I assume it's on the next line", + charstringname); */ strcpy(t1_buf_array, t1_line_array); + + /* t1_getline always appends EOL to t1_line_array; let's change it to + * space before appending the next line + */ + *(strend(t1_buf_array) - 1) = ' '; + t1_getline(); strcat(t1_buf_array, t1_line_array); strcpy(t1_line_array, t1_buf_array); @@ -1622,8 +1631,8 @@ static void t1_subset_charstrings(void) */ t1_check_unusual_charstring(); - cs_size_pos = strstr(t1_line_array, charstringname) + strlen(charstringname) - - t1_line_array + 1; + cs_size_pos = strstr(t1_line_array, charstringname) + + strlen(charstringname) - t1_line_array + 1; /* cs_size_pos points to the number indicating dict size after "/CharStrings" */ cs_size = t1_scan_num(t1_line_array + cs_size_pos, 0); |