summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipsk/writet1.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-11-26 02:09:56 +0000
committerKarl Berry <karl@freefriends.org>2010-11-26 02:09:56 +0000
commitfe38d85fc1b3cf785a6f519bab1c79333bc52faa (patch)
tree059caa1dc289d8f5e6bd1bf09d271b373a724f86 /Build/source/texk/dvipsk/writet1.c
parente8f5cf0a3074ca90d2d75684738cabfeccc620a8 (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/dvipsk/writet1.c')
-rw-r--r--Build/source/texk/dvipsk/writet1.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/Build/source/texk/dvipsk/writet1.c b/Build/source/texk/dvipsk/writet1.c
index a0968fdd471..2b075c685ae 100644
--- a/Build/source/texk/dvipsk/writet1.c
+++ b/Build/source/texk/dvipsk/writet1.c
@@ -1432,10 +1432,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);
@@ -1455,8 +1464,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);