From de63571e6991218d72bd5608e29987f9bc9fec17 Mon Sep 17 00:00:00 2001 From: Jjgod Jiang Date: Mon, 25 May 2015 11:52:57 +0000 Subject: Convert tabs to spaces git-svn-id: svn://tug.org/texlive/trunk@37495 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/cff.c | 222 ++++++++-------- Build/source/texk/dvipdfm-x/cid.c | 96 +++---- Build/source/texk/dvipdfm-x/dvi.c | 104 ++++---- Build/source/texk/dvipdfm-x/t1_char.c | 470 +++++++++++++++++----------------- Build/source/texk/dvipdfm-x/t1_load.c | 334 ++++++++++++------------ Build/source/texk/dvipdfm-x/type0.c | 8 +- Build/source/texk/dvipdfm-x/type1.c | 236 ++++++++--------- 7 files changed, 735 insertions(+), 735 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/dvipdfm-x/cff.c b/Build/source/texk/dvipdfm-x/cff.c index 42ed9e60526..f134f44d9f2 100644 --- a/Build/source/texk/dvipdfm-x/cff.c +++ b/Build/source/texk/dvipdfm-x/cff.c @@ -97,7 +97,7 @@ cff_font *cff_open(FILE *stream, long offset, int n) if (cff->header.major > 1 || cff->header.minor > 0) { WARN("%s: CFF version %u.%u not supported.", - CFF_DEBUG_STR, cff->header.major, cff->header.minor); + CFF_DEBUG_STR, cff->header.major, cff->header.minor); cff_close(cff); return NULL; } @@ -121,7 +121,7 @@ cff_font *cff_open(FILE *stream, long offset, int n) if (n > idx->count - 1) ERROR("CFF Top DICT not exist..."); cff->topdict = cff_dict_unpack(idx->data + idx->offset[n] - 1, - idx->data + idx->offset[n + 1] - 1); + idx->data + idx->offset[n + 1] - 1); if (!cff->topdict) ERROR("Parsing CFF Top DICT data failed..."); cff_release_index(idx); @@ -205,19 +205,19 @@ cff_close (cff_font *cff) if (cff->cstrings) cff_release_index(cff->cstrings); if (cff->fdarray) { for (i=0;inum_fds;i++) { - if (cff->fdarray[i]) cff_release_dict(cff->fdarray[i]); + if (cff->fdarray[i]) cff_release_dict(cff->fdarray[i]); } RELEASE(cff->fdarray); } if (cff->private) { for (i=0;inum_fds;i++) { - if (cff->private[i]) cff_release_dict(cff->private[i]); + if (cff->private[i]) cff_release_dict(cff->private[i]); } RELEASE(cff->private); } if (cff->subrs) { for (i=0;inum_fds;i++) { - if (cff->subrs[i]) cff_release_index(cff->subrs[i]); + if (cff->subrs[i]) cff_release_index(cff->subrs[i]); } RELEASE(cff->subrs); } @@ -278,8 +278,8 @@ cff_put_header (cff_font *cff, card8 *dest, long destlen) *(dest++) = cff->header.major; *(dest++) = cff->header.minor; *(dest++) = 4; /* Additional data in between header and - * Name INDEX ignored. - */ + * Name INDEX ignored. + */ /* We will set all offset (0) to four-byte integer. */ *(dest++) = 4; cff->header.offsize = 4; @@ -517,8 +517,8 @@ long cff_get_sid (cff_font *cff, const char *str) cff_index *idx = cff->string; for (i = 0; i < idx->count; i++) { if (strlen(str) == (idx->offset)[i+1] - (idx->offset)[i] && - !memcmp(str, (idx->data)+(idx->offset)[i]-1, strlen(str))) - return (i + CFF_STDSTR_MAX); + !memcmp(str, (idx->data)+(idx->offset)[i]-1, strlen(str))) + return (i + CFF_STDSTR_MAX); } } @@ -557,8 +557,8 @@ int cff_match_string (cff_font *cff, const char *str, s_SID sid) ERROR("Invalid SID"); if (strlen(str) == (cff->string->offset)[i+1] - (cff->string->offset)[i]) return (!memcmp(str, - (cff->string->data)+(cff->string->offset)[i]-1, - strlen(str))) ? 1 : 0; + (cff->string->data)+(cff->string->offset)[i]-1, + strlen(str))) ? 1 : 0; } return 0; @@ -594,13 +594,13 @@ s_SID cff_add_string (cff_font *cff, const char *str, int unique) /* TODO: do binary search to speed things up */ for (idx = 0; idx < CFF_STDSTR_MAX; idx++) { if (cff_stdstr[idx] && !strcmp(cff_stdstr[idx], str)) - return idx; + return idx; } for (idx = 0; idx < strings->count; idx++) { size = strings->offset[idx+1] - strings->offset[idx]; offset = strings->offset[idx]; if (size == len && !memcmp(strings->data+offset-1, str, len)) - return (idx + CFF_STDSTR_MAX); + return (idx + CFF_STDSTR_MAX); } } @@ -668,10 +668,10 @@ long cff_read_encoding (cff_font *cff) cff_range1 *ranges; encoding->num_entries = get_unsigned_byte(cff->stream); encoding->data.range1 = ranges - = NEW(encoding->num_entries, cff_range1); + = NEW(encoding->num_entries, cff_range1); for (i=0;i<(encoding->num_entries);i++) { - ranges[i].first = get_unsigned_byte(cff->stream); - ranges[i].n_left = get_unsigned_byte(cff->stream); + ranges[i].first = get_unsigned_byte(cff->stream); + ranges[i].n_left = get_unsigned_byte(cff->stream); } length += (encoding->num_entries) * 2 + 1; } @@ -727,10 +727,10 @@ long cff_pack_encoding (cff_font *cff, card8 *dest, long destlen) case 1: { if (destlen < len + (encoding->num_entries)*2) - ERROR("in cff_pack_encoding(): Buffer overflow"); + ERROR("in cff_pack_encoding(): Buffer overflow"); for (i=0;i<(encoding->num_entries);i++) { - dest[len++] = (encoding->data).range1[i].first & 0xff; - dest[len++] = (encoding->data).range1[i].n_left; + dest[len++] = (encoding->data).range1[i].first & 0xff; + dest[len++] = (encoding->data).range1[i].n_left; } } break; @@ -773,15 +773,15 @@ card16 cff_encoding_lookup (cff_font *cff, card8 code) case 0: for (i = 0; i < encoding->num_entries; i++) { if (code == (encoding->data).codes[i]) { - gid = i + 1; - break; + gid = i + 1; + break; } } break; case 1: for (i = 0; i < encoding->num_entries; i++) { if (code >= (encoding->data).range1[i].first && - code <= (encoding->data).range1[i].first + (encoding->data).range1[i].n_left) { + code <= (encoding->data).range1[i].first + (encoding->data).range1[i].n_left) { gid += code - (encoding->data).range1[i].first + 1; break; } @@ -802,8 +802,8 @@ card16 cff_encoding_lookup (cff_font *cff, card8 code) map = encoding->supp; for (i=0;i<(encoding->num_supps);i++) { if (code == map[i].code) { - gid = cff_charsets_lookup(cff, map[i].glyph); - break; + gid = cff_charsets_lookup(cff, map[i].glyph); + break; } } } @@ -817,18 +817,18 @@ void cff_release_encoding (cff_encoding *encoding) switch (encoding->format & (~0x80)) { case 0: if (encoding->data.codes) - RELEASE(encoding->data.codes); + RELEASE(encoding->data.codes); break; case 1: if (encoding->data.range1) - RELEASE(encoding->data.range1); + RELEASE(encoding->data.range1); break; default: ERROR("Unknown Encoding format."); } if (encoding->format & 0x80) { if (encoding->supp) - RELEASE(encoding->supp); + RELEASE(encoding->supp); } RELEASE(encoding); } @@ -888,12 +888,12 @@ long cff_read_charsets (cff_font *cff) { cff_range1 *ranges = NULL; while (count > 0 && charset->num_entries < cff->num_glyphs) { - ranges = RENEW(ranges, charset->num_entries + 1, cff_range1); - ranges[charset->num_entries].first = get_unsigned_pair(cff->stream); - ranges[charset->num_entries].n_left = get_unsigned_byte(cff->stream); - count -= ranges[charset->num_entries].n_left + 1; /* no-overrap */ - charset->num_entries += 1; - charset->data.range1 = ranges; + ranges = RENEW(ranges, charset->num_entries + 1, cff_range1); + ranges[charset->num_entries].first = get_unsigned_pair(cff->stream); + ranges[charset->num_entries].n_left = get_unsigned_byte(cff->stream); + count -= ranges[charset->num_entries].n_left + 1; /* no-overrap */ + charset->num_entries += 1; + charset->data.range1 = ranges; } length += (charset->num_entries) * 3; } @@ -902,11 +902,11 @@ long cff_read_charsets (cff_font *cff) { cff_range2 *ranges = NULL; while (count > 0 && charset->num_entries < cff->num_glyphs) { - ranges = RENEW(ranges, charset->num_entries + 1, cff_range2); - ranges[charset->num_entries].first = get_unsigned_pair(cff->stream); - ranges[charset->num_entries].n_left = get_unsigned_pair(cff->stream); - count -= ranges[charset->num_entries].n_left + 1; /* non-overrapping */ - charset->num_entries += 1; + ranges = RENEW(ranges, charset->num_entries + 1, cff_range2); + ranges[charset->num_entries].first = get_unsigned_pair(cff->stream); + ranges[charset->num_entries].n_left = get_unsigned_pair(cff->stream); + count -= ranges[charset->num_entries].n_left + 1; /* non-overrapping */ + charset->num_entries += 1; } charset->data.range2 = ranges; length += (charset->num_entries) * 4; @@ -952,23 +952,23 @@ long cff_pack_charsets (cff_font *cff, card8 *dest, long destlen) case 1: { if (destlen < len + (charset->num_entries)*3) - ERROR("in cff_pack_charsets(): Buffer overflow"); + ERROR("in cff_pack_charsets(): Buffer overflow"); for (i=0;i<(charset->num_entries);i++) { - dest[len++] = ((charset->data).range1[i].first >> 8) & 0xff; - dest[len++] = (charset->data).range1[i].first & 0xff; - dest[len++] = (charset->data).range1[i].n_left; + dest[len++] = ((charset->data).range1[i].first >> 8) & 0xff; + dest[len++] = (charset->data).range1[i].first & 0xff; + dest[len++] = (charset->data).range1[i].n_left; } } break; case 2: { if (destlen < len + (charset->num_entries)*4) - ERROR("in cff_pack_charsets(): Buffer overflow"); + ERROR("in cff_pack_charsets(): Buffer overflow"); for (i=0;i<(charset->num_entries);i++) { - dest[len++] = ((charset->data).range2[i].first >> 8) & 0xff; - dest[len++] = (charset->data).range2[i].first & 0xff; - dest[len++] = ((charset->data).range2[i].n_left >> 8) & 0xff; - dest[len++] = (charset->data).range2[i].n_left & 0xff; + dest[len++] = ((charset->data).range2[i].first >> 8) & 0xff; + dest[len++] = (charset->data).range2[i].first & 0xff; + dest[len++] = ((charset->data).range2[i].n_left >> 8) & 0xff; + dest[len++] = (charset->data).range2[i].n_left & 0xff; } } break; @@ -1013,31 +1013,31 @@ card16 cff_glyph_lookup (cff_font *cff, const char *glyph) for (i = 0; i < charset->num_entries; i++) { gid++; if (cff_match_string(cff, glyph, charset->data.glyphs[i])) { - return gid; + return gid; } } break; case 1: for (i = 0; i < charset->num_entries; i++) { for (n = 0; - n <= charset->data.range1[i].n_left; n++) { - gid++; - if (cff_match_string(cff, glyph, - (s_SID)(charset->data.range1[i].first + n))) { - return gid; - } + n <= charset->data.range1[i].n_left; n++) { + gid++; + if (cff_match_string(cff, glyph, + (s_SID)(charset->data.range1[i].first + n))) { + return gid; + } } } break; case 2: for (i = 0; i num_entries; i++) { for (n = 0; - n <= charset->data.range2[i].n_left; n++) { - gid++; - if (cff_match_string(cff, glyph, - (s_SID)(charset->data.range2[i].first + n))) { - return gid; - } + n <= charset->data.range2[i].n_left; n++) { + gid++; + if (cff_match_string(cff, glyph, + (s_SID)(charset->data.range2[i].first + n))) { + return gid; + } } } break; @@ -1076,17 +1076,17 @@ card16 cff_charsets_lookup_gid (cff_charsets *charset, card16 cid) case 0: for (i = 0; i num_entries; i++) { if (cid == charset->data.glyphs[i]) { - gid = i + 1; - return gid; + gid = i + 1; + return gid; } } break; case 1: for (i = 0; i < charset->num_entries; i++) { if (cid >= charset->data.range1[i].first && - cid <= charset->data.range1[i].first + charset->data.range1[i].n_left) { + cid <= charset->data.range1[i].first + charset->data.range1[i].n_left) { gid += cid - charset->data.range1[i].first + 1; - return gid; + return gid; } gid += charset->data.range1[i].n_left + 1; } @@ -1094,9 +1094,9 @@ card16 cff_charsets_lookup_gid (cff_charsets *charset, card16 cid) case 2: for (i = 0; i < charset->num_entries; i++) { if (cid >= charset->data.range2[i].first && - cid <= charset->data.range2[i].first + charset->data.range2[i].n_left) { + cid <= charset->data.range2[i].first + charset->data.range2[i].n_left) { gid += cid - charset->data.range2[i].first + 1; - return gid; + return gid; } gid += charset->data.range2[i].n_left + 1; } @@ -1142,7 +1142,7 @@ cff_charsets_lookup_cid(cff_charsets *charset, card16 gid) case 1: for (i = 0; i < charset->num_entries; i++) { if (gid <= charset->data.range1[i].n_left + 1) { - sid = gid + charset->data.range1[i].first - 1; + sid = gid + charset->data.range1[i].first - 1; break; } gid -= charset->data.range1[i].n_left + 1; @@ -1153,7 +1153,7 @@ cff_charsets_lookup_cid(cff_charsets *charset, card16 gid) case 2: for (i = 0; i < charset->num_entries; i++) { if (gid <= charset->data.range2[i].n_left + 1) { - sid = gid + charset->data.range2[i].first - 1; + sid = gid + charset->data.range2[i].first - 1; break; } gid -= charset->data.range2[i].n_left + 1; @@ -1175,15 +1175,15 @@ cff_release_charsets (cff_charsets *charset) switch (charset->format) { case 0: if (charset->data.glyphs) - RELEASE(charset->data.glyphs); + RELEASE(charset->data.glyphs); break; case 1: if (charset->data.range1) - RELEASE(charset->data.range1); + RELEASE(charset->data.range1); break; case 2: if (charset->data.range2) - RELEASE(charset->data.range2); + RELEASE(charset->data.range2); break; default: break; @@ -1227,13 +1227,13 @@ long cff_read_fdselect (cff_font *cff) fdsel->num_entries = get_unsigned_pair(cff->stream); fdsel->data.ranges = ranges = NEW(fdsel->num_entries, cff_range3); for (i=0;i<(fdsel->num_entries);i++) { - ranges[i].first = get_unsigned_pair(cff->stream); - ranges[i].fd = get_unsigned_byte(cff->stream); + ranges[i].first = get_unsigned_pair(cff->stream); + ranges[i].fd = get_unsigned_byte(cff->stream); } if (ranges[0].first != 0) - ERROR("Range not starting with 0."); + ERROR("Range not starting with 0."); if (cff->num_glyphs != get_unsigned_pair(cff->stream)) - ERROR("Sentinel value mismatched with number of glyphs."); + ERROR("Sentinel value mismatched with number of glyphs."); length += (fdsel->num_entries) * 3 + 4; } break; @@ -1274,17 +1274,17 @@ long cff_pack_fdselect (cff_font *cff, card8 *dest, long destlen) case 3: { if (destlen < len + 2) - ERROR("in cff_pack_fdselect(): Buffer overflow"); + ERROR("in cff_pack_fdselect(): Buffer overflow"); len += 2; for (i=0;i<(fdsel->num_entries);i++) { - if (destlen < len + 3) - ERROR("in cff_pack_fdselect(): Buffer overflow"); - dest[len++] = ((fdsel->data).ranges[i].first >> 8) & 0xff; - dest[len++] = (fdsel->data).ranges[i].first & 0xff; - dest[len++] = (fdsel->data).ranges[i].fd; + if (destlen < len + 3) + ERROR("in cff_pack_fdselect(): Buffer overflow"); + dest[len++] = ((fdsel->data).ranges[i].first >> 8) & 0xff; + dest[len++] = (fdsel->data).ranges[i].first & 0xff; + dest[len++] = (fdsel->data).ranges[i].fd; } if (destlen < len + 2) - ERROR("in cff_pack_fdselect(): Buffer overflow"); + ERROR("in cff_pack_fdselect(): Buffer overflow"); dest[len++] = (cff->num_glyphs >> 8) & 0xff; dest[len++] = cff->num_glyphs & 0xff; dest[1] = ((len/3 - 1) >> 8) & 0xff; @@ -1331,14 +1331,14 @@ card8 cff_fdselect_lookup (cff_font *cff, card16 gid) case 3: { if (gid == 0) { - fd = (fdsel->data).ranges[0].fd; + fd = (fdsel->data).ranges[0].fd; } else { - card16 i; - for (i=1;i<(fdsel->num_entries);i++) { - if (gid < (fdsel->data).ranges[i].first) - break; - } - fd = (fdsel->data).ranges[i-1].fd; + card16 i; + for (i=1;i<(fdsel->num_entries);i++) { + if (gid < (fdsel->data).ranges[i].first) + break; + } + fd = (fdsel->data).ranges[i-1].fd; } } break; @@ -1375,19 +1375,19 @@ long cff_read_subrs (cff_font *cff) if (cff->flag & FONTTYPE_CIDFONT) { for (i=0;inum_fds;i++) { if (cff->private[i] == NULL || - !cff_dict_known(cff->private[i], "Subrs")) { - (cff->subrs)[i] = NULL; + !cff_dict_known(cff->private[i], "Subrs")) { + (cff->subrs)[i] = NULL; } else { - offset = (long) cff_dict_get(cff->fdarray[i], "Private", 1); - offset += (long) cff_dict_get(cff->private[i], "Subrs", 0); - cff_seek_set(cff, offset); - (cff->subrs)[i] = cff_get_index(cff); - len += cff_index_size((cff->subrs)[i]); + offset = (long) cff_dict_get(cff->fdarray[i], "Private", 1); + offset += (long) cff_dict_get(cff->private[i], "Subrs", 0); + cff_seek_set(cff, offset); + (cff->subrs)[i] = cff_get_index(cff); + len += cff_index_size((cff->subrs)[i]); } } } else { if (cff->private[0] == NULL || - !cff_dict_known(cff->private[0], "Subrs")) { + !cff_dict_known(cff->private[0], "Subrs")) { (cff->subrs)[0] = NULL; } else { offset = (long) cff_dict_get(cff->topdict, "Private", 1); @@ -1450,31 +1450,31 @@ long cff_read_private (cff_font *cff) cff->private = NEW(cff->num_fds, cff_dict *); for (i=0;inum_fds;i++) { if (cff->fdarray[i] != NULL && - cff_dict_known(cff->fdarray[i], "Private") && - (size = (long) cff_dict_get(cff->fdarray[i], "Private", 0)) - > 0) { - offset = (long) cff_dict_get(cff->fdarray[i], "Private", 1); - cff_seek_set(cff, offset); - data = NEW(size, card8); - if (cff_read_data(data, size, cff) != size) - ERROR("reading file failed"); - (cff->private)[i] = cff_dict_unpack(data, data+size); - RELEASE(data); - len += size; + cff_dict_known(cff->fdarray[i], "Private") && + (size = (long) cff_dict_get(cff->fdarray[i], "Private", 0)) + > 0) { + offset = (long) cff_dict_get(cff->fdarray[i], "Private", 1); + cff_seek_set(cff, offset); + data = NEW(size, card8); + if (cff_read_data(data, size, cff) != size) + ERROR("reading file failed"); + (cff->private)[i] = cff_dict_unpack(data, data+size); + RELEASE(data); + len += size; } else { - (cff->private)[i] = NULL; + (cff->private)[i] = NULL; } } } else { cff->num_fds = 1; cff->private = NEW(1, cff_dict *); if (cff_dict_known(cff->topdict, "Private") && - (size = (long) cff_dict_get(cff->topdict, "Private", 0)) > 0) { + (size = (long) cff_dict_get(cff->topdict, "Private", 0)) > 0) { offset = (long) cff_dict_get(cff->topdict, "Private", 1); cff_seek_set(cff, offset); data = NEW(size, card8); if (cff_read_data(data, size, cff) != size) - ERROR("reading file failed"); + ERROR("reading file failed"); cff->private[0] = cff_dict_unpack(data, data+size); RELEASE(data); len += size; diff --git a/Build/source/texk/dvipdfm-x/cid.c b/Build/source/texk/dvipdfm-x/cid.c index dc2da3e8b77..07d60c29ce1 100644 --- a/Build/source/texk/dvipdfm-x/cid.c +++ b/Build/source/texk/dvipdfm-x/cid.c @@ -188,9 +188,9 @@ CIDFont_release (CIDFont *font) if (font->ident) RELEASE(font->ident); if (font->csi) { if (font->csi->registry) - RELEASE(font->csi->registry); + RELEASE(font->csi->registry); if (font->csi->ordering) - RELEASE(font->csi->ordering); + RELEASE(font->csi->ordering); RELEASE(font->csi); } if (font->options) @@ -305,7 +305,7 @@ CIDFont_is_ACCFont (CIDFont *font) for (i = ACC_START; i <= ACC_END ; i++) { if (!strcmp(font->csi->registry, CIDFont_stdcc_def[i].registry) && - !strcmp(font->csi->ordering, CIDFont_stdcc_def[i].ordering)) + !strcmp(font->csi->ordering, CIDFont_stdcc_def[i].ordering)) return 1; } @@ -547,7 +547,7 @@ CIDFont_cache_get (int font_id) */ int CIDFont_cache_find (const char *map_name, - CIDSysInfo *cmap_csi, fontmap_opt *fmap_opt) + CIDSysInfo *cmap_csi, fontmap_opt *fmap_opt) { int font_id = -1; CIDFont *font = NULL; @@ -584,39 +584,39 @@ CIDFont_cache_find (const char *map_name, for (font_id = 0; font_id < __cache->num; font_id++) { font = __cache->fonts[font_id]; if (!strcmp(font->name, map_name) && - font->options->style == opt->style && - font->options->index == opt->index) { + font->options->style == opt->style && + font->options->index == opt->index) { if (font->options->embed == opt->embed) { - /* - * Case 1: CSI not available (Identity CMap) - * Font is TrueType --> continue - * Font is CIDFont --> break - * Case 2: CSI matched --> break - */ - if (!opt->csi) { - if (font->subtype == CIDFONT_TYPE2) - continue; - else - break; - } else if (!strcmp(font->csi->registry, opt->csi->registry) && - !strcmp(font->csi->ordering, opt->csi->ordering)) { - if (font->subtype == CIDFONT_TYPE2) - font->csi->supplement = - MAX(opt->csi->supplement, font->csi->supplement); - break; - } + /* + * Case 1: CSI not available (Identity CMap) + * Font is TrueType --> continue + * Font is CIDFont --> break + * Case 2: CSI matched --> break + */ + if (!opt->csi) { + if (font->subtype == CIDFONT_TYPE2) + continue; + else + break; + } else if (!strcmp(font->csi->registry, opt->csi->registry) && + !strcmp(font->csi->ordering, opt->csi->ordering)) { + if (font->subtype == CIDFONT_TYPE2) + font->csi->supplement = + MAX(opt->csi->supplement, font->csi->supplement); + break; + } } else if (CIDFont_is_BaseFont(font)) { - opt->embed = 0; - break; + opt->embed = 0; + break; } } } if (font_id < __cache->num && cmap_csi) { if (strcmp(font->csi->registry, cmap_csi->registry) || - strcmp(font->csi->ordering, cmap_csi->ordering)) + strcmp(font->csi->ordering, cmap_csi->ordering)) ERROR("%s: Incompatible CMap for CIDFont \"%s\"", - CIDFONT_DEBUG_STR, map_name); + CIDFONT_DEBUG_STR, map_name); } if (font_id == __cache->num) { @@ -633,9 +633,9 @@ CIDFont_cache_find (const char *map_name, return -1; } else { if (__cache->num >= __cache->max) { - __cache->max += CACHE_ALLOC_SIZE; - __cache->fonts = RENEW(__cache->fonts, - __cache->max, struct CIDFont *); + __cache->max += CACHE_ALLOC_SIZE; + __cache->fonts = RENEW(__cache->fonts, + __cache->max, struct CIDFont *); } font->name = NEW(strlen(map_name)+1, char); strcpy(font->name, map_name); @@ -661,13 +661,13 @@ CIDFont_cache_close (void) if (__cache) { for (font_id = 0; - font_id < __cache->num; font_id++) { + font_id < __cache->num; font_id++) { CIDFont *font; font = __cache->fonts[font_id]; if (__verbose) - MESG("(CID"); + MESG("(CID"); CIDFont_dofont (font); CIDFont_flush (font); @@ -676,7 +676,7 @@ CIDFont_cache_close (void) RELEASE(font); if (__verbose) - MESG(")"); + MESG(")"); } RELEASE(__cache->fonts); RELEASE(__cache); @@ -723,7 +723,7 @@ get_cidsysinfo (const char *map_name, fontmap_opt *fmap_opt) for (i = 0; CIDFont_stdcc_alias[i].name != NULL; i++) { n = strlen(CIDFont_stdcc_alias[i].name); if (!strncmp(fmap_opt->charcoll, - CIDFont_stdcc_alias[i].name, n)) { + CIDFont_stdcc_alias[i].name, n)) { csi_idx = CIDFont_stdcc_alias[i].index; csi = NEW(1, CIDSysInfo); csi->registry = NEW(strlen(CIDFont_stdcc_def[csi_idx].registry)+1, char); @@ -731,9 +731,9 @@ get_cidsysinfo (const char *map_name, fontmap_opt *fmap_opt) csi->ordering = NEW(strlen(CIDFont_stdcc_def[csi_idx].ordering)+1, char); strcpy(csi->ordering, CIDFont_stdcc_def[csi_idx].ordering); if (strlen(fmap_opt->charcoll) > n) { - csi->supplement = (int) strtoul(&(fmap_opt->charcoll[n]), NULL, 10); + csi->supplement = (int) strtoul(&(fmap_opt->charcoll[n]), NULL, 10); } else { /* Use heighest supported value for current output PDF version. */ - csi->supplement = CIDFont_stdcc_def[csi_idx].supplement[pdf_ver]; + csi->supplement = CIDFont_stdcc_def[csi_idx].supplement[pdf_ver]; } break; } @@ -748,18 +748,18 @@ get_cidsysinfo (const char *map_name, fontmap_opt *fmap_opt) p = strchr(fmap_opt->charcoll, '-'); if (!p || p[1] == '\0') ERROR("%s: String can't be converted to REGISTRY-ORDERING-SUPPLEMENT: %s", - CIDFONT_DEBUG_STR, fmap_opt->charcoll); + CIDFONT_DEBUG_STR, fmap_opt->charcoll); p++; q = strchr(p, '-'); if (!q || q[1] == '\0') ERROR("%s: String can't be converted to REGISTRY-ORDERING-SUPPLEMENT: %s", - CIDFONT_DEBUG_STR, fmap_opt->charcoll); + CIDFONT_DEBUG_STR, fmap_opt->charcoll); q++; if (!isdigit((unsigned char)q[0])) ERROR("%s: String can't be converted to REGISTRY-ORDERING-SUPPLEMENT: %s", - CIDFONT_DEBUG_STR, fmap_opt->charcoll); + CIDFONT_DEBUG_STR, fmap_opt->charcoll); n = strlen(fmap_opt->charcoll) - strlen(p) - 1; csi->registry = NEW(n+1, char); @@ -776,22 +776,22 @@ get_cidsysinfo (const char *map_name, fontmap_opt *fmap_opt) /* Check for standart character collections. */ for (i = 0; CIDFont_stdcc_def[i].ordering != NULL; i++) { if ((CIDFont_stdcc_def[i].registry && - !strcmp(csi->registry, CIDFont_stdcc_def[i].registry)) && - !strcmp(csi->ordering, CIDFont_stdcc_def[i].ordering)) { - csi_idx = i; - break; + !strcmp(csi->registry, CIDFont_stdcc_def[i].registry)) && + !strcmp(csi->ordering, CIDFont_stdcc_def[i].ordering)) { + csi_idx = i; + break; } } } if (csi && csi_idx >= 0) { if (csi->supplement > CIDFont_stdcc_def[csi_idx].supplement[pdf_ver] - && (fmap_opt->flags & FONTMAP_OPT_NOEMBED)) { + && (fmap_opt->flags & FONTMAP_OPT_NOEMBED)) { WARN("%s: Heighest supplement number supported in PDF-1.%d for %s-%s is %d.", - CIDFONT_DEBUG_STR, pdf_ver, csi->registry, csi->ordering, - CIDFont_stdcc_def[csi_idx].supplement[pdf_ver]); + CIDFONT_DEBUG_STR, pdf_ver, csi->registry, csi->ordering, + CIDFont_stdcc_def[csi_idx].supplement[pdf_ver]); WARN("%s: Some character may not shown without embedded font (--> %s).", - CIDFONT_DEBUG_STR, map_name); + CIDFONT_DEBUG_STR, map_name); } } diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c index 8389292b7fd..3645dde1505 100644 --- a/Build/source/texk/dvipdfm-x/dvi.c +++ b/Build/source/texk/dvipdfm-x/dvi.c @@ -111,10 +111,10 @@ double get_origin (int x) return x ? dev_origin_x : dev_origin_y; } -#define LTYPESETTING 0 /* typesetting from left to right */ -#define RTYPESETTING 1 /* typesetting from right to left */ -#define SKIMMING 2 /* skimming through reflected segment measuring its width */ -#define REVERSE(MODE) (LTYPESETTING + RTYPESETTING - MODE) +#define LTYPESETTING 0 /* typesetting from left to right */ +#define RTYPESETTING 1 /* typesetting from right to left */ +#define SKIMMING 2 /* skimming through reflected segment measuring its width */ +#define REVERSE(MODE) (LTYPESETTING + RTYPESETTING - MODE) struct dvi_lr { @@ -139,8 +139,8 @@ static struct loaded_font { int type; /* Type is physical or virtual */ int font_id; /* id returned by dev (for PHYSICAL fonts) - * or by vf module for (VIRTUAL fonts) - */ + * or by vf module for (VIRTUAL fonts) + */ int subfont_id; /* id returned by subfont_locate_font() */ int tfm_id; spt_t size; @@ -194,16 +194,16 @@ static struct font_def #define XDV_FLAG_VERTICAL 0x0100 #define XDV_FLAG_COLORED 0x0200 #define XDV_FLAG_FEATURES 0x0400 -#define XDV_FLAG_EXTEND 0x1000 -#define XDV_FLAG_SLANT 0x2000 -#define XDV_FLAG_EMBOLDEN 0x4000 +#define XDV_FLAG_EXTEND 0x1000 +#define XDV_FLAG_SLANT 0x2000 +#define XDV_FLAG_EMBOLDEN 0x4000 #endif static int num_def_fonts = 0, max_def_fonts = 0; static int compute_boxes = 0, link_annot = 1; static int verbose = 0; -#define DVI_PAGE_BUF_CHUNK 0x10000U /* 64K should be plenty for most pages */ +#define DVI_PAGE_BUF_CHUNK 0x10000U /* 64K should be plenty for most pages */ static unsigned char* dvi_page_buffer; static unsigned int dvi_page_buf_size; @@ -344,7 +344,7 @@ find_post (void) do { xseek_absolute (dvi_file, --current, "DVI"); } while ((ch = fgetc(dvi_file)) == PADDING && - current > 0); + current > 0); /* file_position now points to last non padding character or * beginning of file */ @@ -471,7 +471,7 @@ get_preamble_dvi_info (void) ch = get_unsigned_byte(dvi_file); if (fread(dvi_info.comment, - 1, ch, dvi_file) != ch) { + 1, ch, dvi_file) != ch) { ERROR(invalid_signature); } dvi_info.comment[ch] = '\0'; @@ -632,10 +632,10 @@ get_dvi_fonts (int32_t post_location) MESG("DVI file font info\n"); for (i = 0; i < num_def_fonts; i++) { MESG("TeX Font: %10s loaded at ID=%5d, ", - def_fonts[i].font_name, def_fonts[i].tex_id); + def_fonts[i].font_name, def_fonts[i].tex_id); MESG("size=%5.2fpt (scaled %4.1f%%)", - def_fonts[i].point_size * dvi2pts, - 100.0 * ((double) def_fonts[i].point_size / def_fonts[i].design_size)); + def_fonts[i].point_size * dvi2pts, + 100.0 * ((double) def_fonts[i].point_size / def_fonts[i].design_size)); MESG("\n"); } } @@ -648,7 +648,7 @@ static void get_comment (void) xseek_absolute (dvi_file, 14, "DVI"); length = get_unsigned_byte(dvi_file); if (fread(dvi_info.comment, - 1, length, dvi_file) != length) { + 1, length, dvi_file) != length) { ERROR(invalid_signature); } dvi_info.comment[length] = '\0'; @@ -1143,22 +1143,22 @@ dvi_set (int32_t ch) wbuf[2] = (UTF32toUTF16LS(ch) >> 8) & 0xff; wbuf[3] = UTF32toUTF16LS(ch) & 0xff; pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 4, - width, font->font_id, 2); + width, font->font_id, 2); } else if (ch > 255) { /* _FIXME_ */ wbuf[0] = (ch >> 8) & 0xff; wbuf[1] = ch & 0xff; pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 2, - width, font->font_id, 2); + width, font->font_id, 2); } else if (font->subfont_id >= 0) { unsigned short uch = lookup_sfd_record(font->subfont_id, (unsigned char) ch); wbuf[0] = (uch >> 8) & 0xff; wbuf[1] = uch & 0xff; pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 2, - width, font->font_id, 2); + width, font->font_id, 2); } else { wbuf[0] = (unsigned char) ch; pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 1, - width, font->font_id, 1); + width, font->font_id, 1); } if (dvi_is_tracking_boxes()) { pdf_rect rect; @@ -1169,7 +1169,7 @@ dvi_set (int32_t ch) depth = sqxfw(font->size, depth); pdf_dev_set_rect (&rect, dvi_state.h, -dvi_state.v, - width, height, depth); + width, height, depth); pdf_doc_expand_box(&rect); } break; @@ -1215,12 +1215,12 @@ dvi_put (int32_t ch) wbuf[2] = (UTF32toUTF16LS(ch) >> 8) & 0xff; wbuf[3] = UTF32toUTF16LS(ch) & 0xff; pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 4, - width, font->font_id, 2); + width, font->font_id, 2); } else if (ch > 255) { /* _FIXME_ */ wbuf[0] = (ch >> 8) & 0xff; wbuf[1] = ch & 0xff; pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 2, - width, font->font_id, 2); + width, font->font_id, 2); } else if (font->subfont_id >= 0) { unsigned int uch; @@ -1228,11 +1228,11 @@ dvi_put (int32_t ch) wbuf[0] = (uch >> 8) & 0xff; wbuf[1] = uch & 0xff; pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 2, - width, font->font_id, 2); + width, font->font_id, 2); } else { wbuf[0] = (unsigned char) ch; pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 1, - width, font->font_id, 1); + width, font->font_id, 1); } if (dvi_is_tracking_boxes()) { pdf_rect rect; @@ -1243,7 +1243,7 @@ dvi_put (int32_t ch) depth = sqxfw(font->size, depth); pdf_dev_set_rect (&rect, dvi_state.h, -dvi_state.v, - width, height, depth); + width, height, depth); pdf_doc_expand_box(&rect); } break; @@ -1463,7 +1463,7 @@ do_fnt (int32_t tex_id) def_fonts[i].embolden); } else { font_id = dvi_locate_font(def_fonts[i].font_name, - def_fonts[i].point_size); + def_fonts[i].point_size); } loaded_fonts[font_id].rgba_color = def_fonts[i].rgba_color; #else @@ -1896,7 +1896,7 @@ dvi_init (char *dvi_filename, double mag) if (!dvi_filename) { /* no filename: reading from stdin, probably a pipe */ #ifdef WIN32 - setmode(fileno(stdin), _O_BINARY); + setmode(fileno(stdin), _O_BINARY); #endif dvi_file = stdin; linear = 1; @@ -2121,9 +2121,9 @@ read_length (double *vp, double mag, const char **pp, const char *endptr) static int scan_special (double *wd, double *ht, double *xo, double *yo, char *lm, - unsigned *minorversion, - int *do_enc, unsigned *key_bits, unsigned *permission, char *owner_pw, char *user_pw, - const char *buf, uint32_t size) + unsigned *minorversion, + int *do_enc, unsigned *key_bits, unsigned *permission, char *owner_pw, char *user_pw, + const char *buf, uint32_t size) { char *q; const char *p = buf, *endptr; @@ -2238,36 +2238,36 @@ scan_special (double *wd, double *ht, double *xo, double *yo, char *lm, if (!kp) break; else { - pdf_obj *obj; + pdf_obj *obj; skip_white(&p, endptr); if (!strcmp(kp, "ownerpw")) { if ((obj = parse_pdf_string(&p, endptr))) { - strncpy(owner_pw, pdf_string_value(obj), MAX_PWD_LEN); - pdf_release_obj(obj); - } else - error = -1; + strncpy(owner_pw, pdf_string_value(obj), MAX_PWD_LEN); + pdf_release_obj(obj); + } else + error = -1; } else if (!strcmp(kp, "userpw")) { if ((obj = parse_pdf_string(&p, endptr))) { - strncpy(user_pw, pdf_string_value(obj), MAX_PWD_LEN); - pdf_release_obj(obj); - } else - error = -1; + strncpy(user_pw, pdf_string_value(obj), MAX_PWD_LEN); + pdf_release_obj(obj); + } else + error = -1; } else if (!strcmp(kp, "length")) { if ((obj = parse_pdf_number(&p, endptr)) && PDF_OBJ_NUMBERTYPE(obj)) { - *key_bits = (unsigned) pdf_number_value(obj); - } else - error = -1; - if (obj) - pdf_release_obj(obj); + *key_bits = (unsigned) pdf_number_value(obj); + } else + error = -1; + if (obj) + pdf_release_obj(obj); } else if (!strcmp(kp, "perm")) { if ((obj = parse_pdf_number(&p, endptr)) && PDF_OBJ_NUMBERTYPE(obj)) { - *permission = (unsigned) pdf_number_value(obj); - } else - error = -1; - if (obj) - pdf_release_obj(obj); + *permission = (unsigned) pdf_number_value(obj); + } else + error = -1; + if (obj) + pdf_release_obj(obj); } else - error = -1; + error = -1; RELEASE(kp); } skip_white(&p, endptr); @@ -2285,7 +2285,7 @@ dvi_scan_specials (int page_no, double *page_width, double *page_height, double *x_offset, double *y_offset, char *landscape, unsigned *minorversion, - int *do_enc, unsigned *key_bits, unsigned *permission, char *owner_pw, char *user_pw) + int *do_enc, unsigned *key_bits, unsigned *permission, char *owner_pw, char *user_pw) { FILE *fp = dvi_file; int32_t offset; diff --git a/Build/source/texk/dvipdfm-x/t1_char.c b/Build/source/texk/dvipdfm-x/t1_char.c index c935e027668..9db2ce35a3b 100644 --- a/Build/source/texk/dvipdfm-x/t1_char.c +++ b/Build/source/texk/dvipdfm-x/t1_char.c @@ -270,9 +270,9 @@ stem_compare (const void *v1, const void *v2) if (s1->dir == s2->dir) { if (s1->pos == s2->pos) { if (s1->del == s2->del) - cmp = 0; + cmp = 0; else - cmp = (s1->del < s2->del) ? -1 : 1; + cmp = (s1->del < s2->del) ? -1 : 1; } else { cmp = (s1->pos < s2->pos) ? -1 : 1; } @@ -308,8 +308,8 @@ add_stem (t1_chardesc *cd, double pos, double del, int dir) pos += (dir == HSTEM) ? cd->sbw.sby : cd->sbw.sbx; for (i = 0; i < cd->num_stems; i++) { if (cd->stems[i].dir == dir && - cd->stems[i].pos == pos && - cd->stems[i].del == del) + cd->stems[i].pos == pos && + cd->stems[i].del == del) break; } if (i == cd->num_stems) { @@ -455,13 +455,13 @@ do_operator1 (t1_chardesc *cd, card8 **data) { int stem_id; stem_id = add_stem(cd, - cs_arg_stack[cs_stack_top-2], - cs_arg_stack[cs_stack_top-1], - ((op == cs_hstem) ? HSTEM : VSTEM)); + cs_arg_stack[cs_stack_top-2], + cs_arg_stack[cs_stack_top-1], + ((op == cs_hstem) ? HSTEM : VSTEM)); if (stem_id < 0) { - WARN("Too many hints..."); - status = CS_PARSE_ERROR; - return; + WARN("Too many hints..."); + status = CS_PARSE_ERROR; + return; } /* Put stem_id onto the stack... */ cs_arg_stack[cs_stack_top++] = stem_id; @@ -476,8 +476,8 @@ do_operator1 (t1_chardesc *cd, card8 **data) CHECKSTACK(2); { if (phase < T1_CS_PHASE_PATH) { - cs_arg_stack[cs_stack_top-2] += cd->sbw.sbx; - cs_arg_stack[cs_stack_top-1] += cd->sbw.sby; + cs_arg_stack[cs_stack_top-2] += cd->sbw.sbx; + cs_arg_stack[cs_stack_top-1] += cd->sbw.sby; } ADD_PATH(cd, op, 2); } @@ -489,27 +489,27 @@ do_operator1 (t1_chardesc *cd, card8 **data) { int argn = 1; if (phase < T1_CS_PHASE_PATH) { - /* - * The reference point for the first moveto operator is diferrent - * between Type 1 charstring and Type 2 charstring. We compensate it. - */ - if (op == cs_hmoveto) { - cs_arg_stack[cs_stack_top-1] += cd->sbw.sbx; - if (cd->sbw.sby != 0.0) { - cs_arg_stack[cs_stack_top++] = cd->sbw.sby; - argn = 2; - op = cs_rmoveto; - } - } else { - cs_arg_stack[cs_stack_top-1] += cd->sbw.sby; - if (cd->sbw.sbx != 0.0) { - cs_arg_stack[cs_stack_top] = cs_arg_stack[cs_stack_top-1]; - cs_arg_stack[cs_stack_top-1] = cd->sbw.sbx; - cs_stack_top++; - argn = 2; - op = cs_rmoveto; - } - } + /* + * The reference point for the first moveto operator is diferrent + * between Type 1 charstring and Type 2 charstring. We compensate it. + */ + if (op == cs_hmoveto) { + cs_arg_stack[cs_stack_top-1] += cd->sbw.sbx; + if (cd->sbw.sby != 0.0) { + cs_arg_stack[cs_stack_top++] = cd->sbw.sby; + argn = 2; + op = cs_rmoveto; + } + } else { + cs_arg_stack[cs_stack_top-1] += cd->sbw.sby; + if (cd->sbw.sbx != 0.0) { + cs_arg_stack[cs_stack_top] = cs_arg_stack[cs_stack_top-1]; + cs_arg_stack[cs_stack_top-1] = cd->sbw.sbx; + cs_stack_top++; + argn = 2; + op = cs_rmoveto; + } + } } ADD_PATH(cd, op, argn); } @@ -601,15 +601,15 @@ do_othersubr0 (t1_chardesc *cd) cur = cur->next; for (i = 1; i < 7; i++) { if (cur == NULL || cur->type != CS_FLEX_CTRL || - cur->num_args != 2) { - status = CS_PARSE_ERROR; - return; + cur->num_args != 2) { + status = CS_PARSE_ERROR; + return; } if (i == 1) { - flex->args[0] += cur->args[0]; - flex->args[1] += cur->args[1]; + flex->args[0] += cur->args[0]; + flex->args[1] += cur->args[1]; } else { - copy_args(&(flex->args[2*i-2]), cur->args, 2); + copy_args(&(flex->args[2*i-2]), cur->args, 2); } next = cur->next; RELEASE(cur); @@ -716,9 +716,9 @@ do_othersubr13 (t1_chardesc *cd) pos += ps_arg_stack[--ps_stack_top]; del = ps_arg_stack[--ps_stack_top]; stem_id = add_stem(cd, - (del < 0.0) ? pos + del : pos, - (del < 0.0) ? -del : del, - HSTEM); + (del < 0.0) ? pos + del : pos, + (del < 0.0) ? -del : del, + HSTEM); stemgroups[n].stems[stemgroups[n].num_stems] = stem_id; stemgroups[n].num_stems += 1; pos += del; @@ -743,9 +743,9 @@ do_othersubr13 (t1_chardesc *cd) pos += ps_arg_stack[--ps_stack_top]; del = ps_arg_stack[--ps_stack_top]; stem_id = add_stem(cd, - (del < 0.0) ? pos + del : pos, - (del < 0.0) ? -del : del, - VSTEM); + (del < 0.0) ? pos + del : pos, + (del < 0.0) ? -del : del, + VSTEM); stemgroups[n].stems[stemgroups[n].num_stems] = stem_id; stemgroups[n].num_stems += 1; pos += del; @@ -761,7 +761,7 @@ do_othersubr13 (t1_chardesc *cd) for (n = 0; n < MAX(num_hgroups, num_vgroups); n++) { add_charpath(cd, cs_cntrmask, - stemgroups[n].stems, stemgroups[n].num_stems); + stemgroups[n].stems, stemgroups[n].num_stems); } cd->flags |= T1_CS_FLAG_USE_CNTRMASK; @@ -832,20 +832,20 @@ do_operator2 (t1_chardesc *cd, card8 **data, card8 *endptr) { int i; for (i = 2; i >= 0; i--) { - int stem_id; - stem_id = add_stem(cd, - cs_arg_stack[cs_stack_top-2*i-2], - cs_arg_stack[cs_stack_top-2*i-1], - ((op == cs_hstem3) ? HSTEM : VSTEM)); - if (stem_id < 0) { - WARN("Too many hints..."); - status = CS_PARSE_ERROR; - return; - } - /* Put stem_id onto the stack... */ - cs_arg_stack[cs_stack_top++] = stem_id; - ADD_PATH(cd, CS_HINT_DECL, 1); - cs_stack_top--; + int stem_id; + stem_id = add_stem(cd, + cs_arg_stack[cs_stack_top-2*i-2], + cs_arg_stack[cs_stack_top-2*i-1], + ((op == cs_hstem3) ? HSTEM : VSTEM)); + if (stem_id < 0) { + WARN("Too many hints..."); + status = CS_PARSE_ERROR; + return; + } + /* Put stem_id onto the stack... */ + cs_arg_stack[cs_stack_top++] = stem_id; + ADD_PATH(cd, CS_HINT_DECL, 1); + cs_stack_top--; } } CLEARSTACK(); @@ -886,7 +886,7 @@ do_operator2 (t1_chardesc *cd, card8 **data, card8 *endptr) */ if (!(cd->flags & T1_CS_FLAG_USE_HINTMASK)) { if (__verbose > 1) - WARN("Obsolete Type 1 charstring operator \"dotsection\" not supported."); + WARN("Obsolete Type 1 charstring operator \"dotsection\" not supported."); } #endif /* noop */ @@ -1057,7 +1057,7 @@ get_longint (card8 **data, card8 *endptr) /* Parse charstring and build charpath. */ static void t1char_build_charpath (t1_chardesc *cd, - card8 **data, card8 *endptr, cff_index *subrs) + card8 **data, card8 *endptr, cff_index *subrs) { card8 b0 = 0, *subr; long len; @@ -1074,17 +1074,17 @@ t1char_build_charpath (t1_chardesc *cd, status = CS_SUBR_RETURN; } else if (b0 == cs_callsubr) { if (cs_stack_top < 1) { - status = CS_STACK_ERROR; + status = CS_STACK_ERROR; } else { - int idx; - - idx = cs_arg_stack[--cs_stack_top]; - if (!subrs || idx >= subrs->count) - ERROR("Invalid Subr#."); - subr = subrs->data + subrs->offset[idx] - 1; - len = subrs->offset[idx+1] - subrs->offset[idx]; - t1char_build_charpath(cd, &subr, subr+len, subrs); - *data += 1; + int idx; + + idx = cs_arg_stack[--cs_stack_top]; + if (!subrs || idx >= subrs->count) + ERROR("Invalid Subr#."); + subr = subrs->data + subrs->offset[idx] - 1; + len = subrs->offset[idx+1] - subrs->offset[idx]; + t1char_build_charpath(cd, &subr, subr+len, subrs); + *data += 1; } } else if (b0 == cs_escape) { do_operator2(cd, data, endptr); @@ -1154,18 +1154,18 @@ do_postproc (t1_chardesc *cd) x += cur->args[0]; y += cur->args[1]; UPDATE_BBOX(cd->bbox, x, y); if (TRY_COMPACT) { - if (prev->type == cs_rlineto) { - copy_args(prev->args+prev->num_args, cur->args, cur->num_args); - prev->num_args += cur->num_args; - prev->next = next; - RELEASE(cur); cur = NULL; - } else if (prev->type == cs_rrcurveto) { - copy_args(prev->args+prev->num_args, cur->args, cur->num_args); - prev->num_args += cur->num_args; - prev->type = cs_rcurveline; - prev->next = next; - RELEASE(cur); cur = NULL; - } + if (prev->type == cs_rlineto) { + copy_args(prev->args+prev->num_args, cur->args, cur->num_args); + prev->num_args += cur->num_args; + prev->next = next; + RELEASE(cur); cur = NULL; + } else if (prev->type == cs_rrcurveto) { + copy_args(prev->args+prev->num_args, cur->args, cur->num_args); + prev->num_args += cur->num_args; + prev->type = cs_rcurveline; + prev->next = next; + RELEASE(cur); cur = NULL; + } } break; case cs_hmoveto: @@ -1176,13 +1176,13 @@ do_postproc (t1_chardesc *cd) x += cur->args[0]; UPDATE_BBOX(cd->bbox, x, y); if (TRY_COMPACT) { - if ((prev->type == cs_vlineto && (prev->num_args % 2) == 1) || - (prev->type == cs_hlineto && (prev->num_args % 2) == 0)) { - copy_args(prev->args+prev->num_args, cur->args, cur->num_args); - prev->num_args += cur->num_args; - prev->next = next; - RELEASE(cur); cur = NULL; - } + if ((prev->type == cs_vlineto && (prev->num_args % 2) == 1) || + (prev->type == cs_hlineto && (prev->num_args % 2) == 0)) { + copy_args(prev->args+prev->num_args, cur->args, cur->num_args); + prev->num_args += cur->num_args; + prev->next = next; + RELEASE(cur); cur = NULL; + } } break; case cs_vmoveto: @@ -1193,33 +1193,33 @@ do_postproc (t1_chardesc *cd) y += cur->args[0]; UPDATE_BBOX(cd->bbox, x, y); if (TRY_COMPACT) { - if ((prev->type == cs_hlineto && (prev->num_args % 2) == 1) || - (prev->type == cs_vlineto && (prev->num_args % 2) == 0)) { - copy_args(prev->args+prev->num_args, cur->args, cur->num_args); - prev->num_args += cur->num_args; - prev->next = next; - RELEASE(cur); cur = NULL; - } + if ((prev->type == cs_hlineto && (prev->num_args % 2) == 1) || + (prev->type == cs_vlineto && (prev->num_args % 2) == 0)) { + copy_args(prev->args+prev->num_args, cur->args, cur->num_args); + prev->num_args += cur->num_args; + prev->next = next; + RELEASE(cur); cur = NULL; + } } break; case cs_rrcurveto: for (i = 0; i < 3; i++) { - x += cur->args[2*i]; y += cur->args[2*i+1]; - UPDATE_BBOX(cd->bbox, x, y); + x += cur->args[2*i]; y += cur->args[2*i+1]; + UPDATE_BBOX(cd->bbox, x, y); } if (TRY_COMPACT) { - if (prev->type == cs_rrcurveto) { - copy_args(prev->args+prev->num_args, cur->args, cur->num_args); - prev->num_args += cur->num_args; - prev->next = next; - RELEASE(cur); cur = NULL; - } else if (prev->type == cs_rlineto) { - copy_args(prev->args+prev->num_args, cur->args, cur->num_args); - prev->num_args += cur->num_args; - prev->type = cs_rlinecurve; - prev->next = next; - RELEASE(cur); cur = NULL; - } + if (prev->type == cs_rrcurveto) { + copy_args(prev->args+prev->num_args, cur->args, cur->num_args); + prev->num_args += cur->num_args; + prev->next = next; + RELEASE(cur); cur = NULL; + } else if (prev->type == cs_rlineto) { + copy_args(prev->args+prev->num_args, cur->args, cur->num_args); + prev->num_args += cur->num_args; + prev->type = cs_rlinecurve; + prev->next = next; + RELEASE(cur); cur = NULL; + } } break; case cs_vhcurveto: @@ -1230,13 +1230,13 @@ do_postproc (t1_chardesc *cd) x += cur->args[3]; UPDATE_BBOX(cd->bbox, x, y); if (TRY_COMPACT) { - if ((prev->type == cs_hvcurveto && ((prev->num_args / 4) % 2) == 1) || - (prev->type == cs_vhcurveto && ((prev->num_args / 4) % 2) == 0)) { - copy_args(prev->args+prev->num_args, cur->args, cur->num_args); - prev->num_args += cur->num_args; - prev->next = next; - RELEASE(cur); cur = NULL; - } + if ((prev->type == cs_hvcurveto && ((prev->num_args / 4) % 2) == 1) || + (prev->type == cs_vhcurveto && ((prev->num_args / 4) % 2) == 0)) { + copy_args(prev->args+prev->num_args, cur->args, cur->num_args); + prev->num_args += cur->num_args; + prev->next = next; + RELEASE(cur); cur = NULL; + } } break; case cs_hvcurveto: @@ -1247,48 +1247,48 @@ do_postproc (t1_chardesc *cd) y += cur->args[3]; UPDATE_BBOX(cd->bbox, x, y); if (TRY_COMPACT) { - if ((prev->type == cs_vhcurveto && ((prev->num_args / 4) % 2) == 1) || - (prev->type == cs_hvcurveto && ((prev->num_args / 4) % 2) == 0)) { - copy_args(prev->args+prev->num_args, cur->args, cur->num_args); - prev->num_args += cur->num_args; - prev->next = next; - RELEASE(cur); cur = NULL; - } + if ((prev->type == cs_vhcurveto && ((prev->num_args / 4) % 2) == 1) || + (prev->type == cs_hvcurveto && ((prev->num_args / 4) % 2) == 0)) { + copy_args(prev->args+prev->num_args, cur->args, cur->num_args); + prev->num_args += cur->num_args; + prev->next = next; + RELEASE(cur); cur = NULL; + } } break; case cs_flex: for (i = 0; i < 6; i++) { - x += cur->args[2*i]; y += cur->args[2*1+1]; - UPDATE_BBOX(cd->bbox, x, y); + x += cur->args[2*i]; y += cur->args[2*1+1]; + UPDATE_BBOX(cd->bbox, x, y); } if (cur->args[12] == 50.0) { - if (cur->args[1] == 0.0 && cur->args[11] == 0.0 && - cur->args[5] == 0.0 && cur->args[7] == 0.0 && - cur->args[3] + cur->args[9] == 0.0) { - /* cur->args[0] = cur->args[0]; dx1 */ - cur->args[1] = cur->args[2]; /* dx2 */ - cur->args[2] = cur->args[3]; /* dy2 */ - cur->args[3] = cur->args[4]; /* dx3 */ - cur->args[4] = cur->args[6]; /* dx4 */ - cur->args[5] = cur->args[8]; /* dx5 */ - cur->args[6] = cur->args[10]; /* dx6 */ - cur->num_args = 7; - cur->type = cs_hflex; - } else if (cur->args[5] == 0.0 && cur->args[7] == 0.0 && - (cur->args[1] + cur->args[3] + - cur->args[9] + cur->args[11]) == 0) { - /* cur->args[0] = cur->args[0]; dx1 */ - /* cur->args[1] = cur->args[1]; dy1 */ - /* cur->args[2] = cur->args[2]; dx2 */ - /* cur->args[3] = cur->args[3]; dy2 */ - /* cur->args[4] = cur->args[4]; dx3 */ - cur->args[5] = cur->args[6]; /* dx4 */ - cur->args[6] = cur->args[8]; /* dx5 */ - cur->args[7] = cur->args[9]; /* dy5 */ - cur->args[8] = cur->args[10]; /* dx6 */ - cur->num_args = 9; - cur->type = cs_hflex1; - } + if (cur->args[1] == 0.0 && cur->args[11] == 0.0 && + cur->args[5] == 0.0 && cur->args[7] == 0.0 && + cur->args[3] + cur->args[9] == 0.0) { + /* cur->args[0] = cur->args[0]; dx1 */ + cur->args[1] = cur->args[2]; /* dx2 */ + cur->args[2] = cur->args[3]; /* dy2 */ + cur->args[3] = cur->args[4]; /* dx3 */ + cur->args[4] = cur->args[6]; /* dx4 */ + cur->args[5] = cur->args[8]; /* dx5 */ + cur->args[6] = cur->args[10]; /* dx6 */ + cur->num_args = 7; + cur->type = cs_hflex; + } else if (cur->args[5] == 0.0 && cur->args[7] == 0.0 && + (cur->args[1] + cur->args[3] + + cur->args[9] + cur->args[11]) == 0) { + /* cur->args[0] = cur->args[0]; dx1 */ + /* cur->args[1] = cur->args[1]; dy1 */ + /* cur->args[2] = cur->args[2]; dx2 */ + /* cur->args[3] = cur->args[3]; dy2 */ + /* cur->args[4] = cur->args[4]; dx3 */ + cur->args[5] = cur->args[6]; /* dx4 */ + cur->args[6] = cur->args[8]; /* dx5 */ + cur->args[7] = cur->args[9]; /* dy5 */ + cur->args[8] = cur->args[10]; /* dx6 */ + cur->num_args = 9; + cur->type = cs_hflex1; + } } break; case CS_HINT_DECL: @@ -1367,8 +1367,8 @@ t1char_get_metrics (card8 *src, long srclen, cff_index *subrs, t1_ginfo *ginfo) */ static long t1char_encode_charpath (t1_chardesc *cd, - double default_width, double nominal_width, - card8 *dst, card8 *endptr) + double default_width, double nominal_width, + card8 *dst, card8 *endptr) { card8 *save; t1_cpath *curr; @@ -1399,16 +1399,16 @@ t1char_encode_charpath (t1_chardesc *cd, for (i = 0; i < cd->num_stems && cd->stems[i].dir == HSTEM; i++) { num_hstems++; stem[0] = (reset ? - (cd->stems[i].pos) : - (cd->stems[i].pos - (cd->stems[i-1].pos + cd->stems[i-1].del))); + (cd->stems[i].pos) : + (cd->stems[i].pos - (cd->stems[i-1].pos + cd->stems[i-1].del))); stem[1] = cd->stems[i].del; put_numbers(stem, 2, &dst, endptr); CHECK_STATUS(); reset = 0; if (2*num_hstems > CS_ARG_STACK_MAX - 3) { - CHECK_BUFFER(1); - *dst++ = (card8) ((cd->flags & T1_CS_FLAG_USE_HINTMASK) ? cs_hstemhm : cs_hstem); - reset = 1; + CHECK_BUFFER(1); + *dst++ = (card8) ((cd->flags & T1_CS_FLAG_USE_HINTMASK) ? cs_hstemhm : cs_hstem); + reset = 1; } } if (reset == 0) { @@ -1418,36 +1418,36 @@ t1char_encode_charpath (t1_chardesc *cd, reset = 1; if (cd->num_stems - num_hstems > 0) { for (i = num_hstems; i < cd->num_stems; i++) { - num_vstems++; - stem[0] = (reset ? - (cd->stems[i].pos) : - (cd->stems[i].pos - (cd->stems[i-1].pos + cd->stems[i-1].del))); - stem[1] = cd->stems[i].del; - put_numbers(stem, 2, &dst, endptr); - CHECK_STATUS(); - reset = 0; - if (2*num_vstems > CS_ARG_STACK_MAX - 3) { - CHECK_BUFFER(1); - *dst++ = (card8) ((cd->flags & T1_CS_FLAG_USE_HINTMASK) ? cs_vstemhm : cs_vstem); - reset = 1; - } + num_vstems++; + stem[0] = (reset ? + (cd->stems[i].pos) : + (cd->stems[i].pos - (cd->stems[i-1].pos + cd->stems[i-1].del))); + stem[1] = cd->stems[i].del; + put_numbers(stem, 2, &dst, endptr); + CHECK_STATUS(); + reset = 0; + if (2*num_vstems > CS_ARG_STACK_MAX - 3) { + CHECK_BUFFER(1); + *dst++ = (card8) ((cd->flags & T1_CS_FLAG_USE_HINTMASK) ? cs_vstemhm : cs_vstem); + reset = 1; + } } if (reset == 0) { - CHECK_BUFFER(1); - if ((cd->flags & T1_CS_FLAG_USE_HINTMASK) || - (cd->flags & T1_CS_FLAG_USE_CNTRMASK)) { - /* - * The vstem hint operator can be ommited if hstem and vstem hints - * are both declared at the beginning of a charstring, and is - * followed directly by the hintmask or cntrmask operators. - */ - if (curr->type != CS_HINT_DECL && - curr->type != cs_cntrmask) { - *dst++ = (card8) cs_vstemhm; - } - } else { - *dst++ = (card8) cs_vstem; - } + CHECK_BUFFER(1); + if ((cd->flags & T1_CS_FLAG_USE_HINTMASK) || + (cd->flags & T1_CS_FLAG_USE_CNTRMASK)) { + /* + * The vstem hint operator can be ommited if hstem and vstem hints + * are both declared at the beginning of a charstring, and is + * followed directly by the hintmask or cntrmask operators. + */ + if (curr->type != CS_HINT_DECL && + curr->type != cs_cntrmask) { + *dst++ = (card8) cs_vstemhm; + } + } else { + *dst++ = (card8) cs_vstem; + } } } } @@ -1458,41 +1458,41 @@ t1char_encode_charpath (t1_chardesc *cd, switch (curr->type) { case CS_HINT_DECL: { - card8 hintmask[(CS_STEM_ZONE_MAX+7)/8]; - - memset(hintmask, 0, (cd->num_stems+7)/8); - while (curr != NULL && curr->type == CS_HINT_DECL) { - int stem_idx; - - stem_idx = get_stem(cd, (int) curr->args[0]); - ASSERT(stem_idx < cd->num_stems); - hintmask[stem_idx/8] |= (1 << (7 - (stem_idx % 8))); - curr = curr->next; - } - if (cd->flags & T1_CS_FLAG_USE_HINTMASK) { - CHECK_BUFFER((cd->num_stems+7)/8 + 1); - *dst++ = (card8) cs_hintmask; - memcpy(dst, hintmask, (cd->num_stems+7)/8); - dst += (cd->num_stems+7)/8; - } + card8 hintmask[(CS_STEM_ZONE_MAX+7)/8]; + + memset(hintmask, 0, (cd->num_stems+7)/8); + while (curr != NULL && curr->type == CS_HINT_DECL) { + int stem_idx; + + stem_idx = get_stem(cd, (int) curr->args[0]); + ASSERT(stem_idx < cd->num_stems); + hintmask[stem_idx/8] |= (1 << (7 - (stem_idx % 8))); + curr = curr->next; + } + if (cd->flags & T1_CS_FLAG_USE_HINTMASK) { + CHECK_BUFFER((cd->num_stems+7)/8 + 1); + *dst++ = (card8) cs_hintmask; + memcpy(dst, hintmask, (cd->num_stems+7)/8); + dst += (cd->num_stems+7)/8; + } } break; case cs_cntrmask: { - card8 cntrmask[(CS_STEM_ZONE_MAX+7)/8]; - int stem_idx, i; - - memset(cntrmask, 0, (cd->num_stems+7)/8); - for (i = 0; i < curr->num_args; i++) { - stem_idx = get_stem(cd, (int) curr->args[i]); - ASSERT(stem_idx < cd->num_stems); - cntrmask[stem_idx/8] |= (1 << (7 - (stem_idx % 8))); - } - CHECK_BUFFER((cd->num_stems+7)/8 + 1); - *dst++ = (card8) cs_cntrmask; - memcpy(dst, cntrmask, (cd->num_stems+7)/8); - dst += (cd->num_stems+7)/8; - curr = curr->next; + card8 cntrmask[(CS_STEM_ZONE_MAX+7)/8]; + int stem_idx, i; + + memset(cntrmask, 0, (cd->num_stems+7)/8); + for (i = 0; i < curr->num_args; i++) { + stem_idx = get_stem(cd, (int) curr->args[i]); + ASSERT(stem_idx < cd->num_stems); + cntrmask[stem_idx/8] |= (1 << (7 - (stem_idx % 8))); + } + CHECK_BUFFER((cd->num_stems+7)/8 + 1); + *dst++ = (card8) cs_cntrmask; + memcpy(dst, cntrmask, (cd->num_stems+7)/8); + dst += (cd->num_stems+7)/8; + curr = curr->next; } break; case cs_rmoveto: case cs_hmoveto: case cs_vmoveto: @@ -1500,22 +1500,22 @@ t1char_encode_charpath (t1_chardesc *cd, case cs_rrcurveto: case cs_hvcurveto: case cs_vhcurveto: case cs_rlinecurve: case cs_rcurveline: { - put_numbers(curr->args, curr->num_args, &dst, endptr); - CHECK_STATUS(); - CHECK_BUFFER(1); - *dst++ = (card8) curr->type; - curr = curr->next; + put_numbers(curr->args, curr->num_args, &dst, endptr); + CHECK_STATUS(); + CHECK_BUFFER(1); + *dst++ = (card8) curr->type; + curr = curr->next; } break; case cs_flex: case cs_hflex: case cs_hflex1: { - put_numbers(curr->args, curr->num_args, &dst, endptr); - CHECK_STATUS(); - CHECK_BUFFER(2); - *dst++ = (card8) cs_escape; - *dst++ = (card8) curr->type; - curr = curr->next; + put_numbers(curr->args, curr->num_args, &dst, endptr); + CHECK_STATUS(); + CHECK_BUFFER(2); + *dst++ = (card8) cs_escape; + *dst++ = (card8) curr->type; + curr = curr->next; } break; default: @@ -1546,9 +1546,9 @@ t1char_encode_charpath (t1_chardesc *cd, long t1char_convert_charstring (card8 *dst, long dstlen, - card8 *src, long srclen, cff_index *subrs, - double default_width, double nominal_width, - t1_ginfo *ginfo) + card8 *src, long srclen, cff_index *subrs, + double default_width, double nominal_width, + t1_ginfo *ginfo) { long length; t1_chardesc t1char, *cd; diff --git a/Build/source/texk/dvipdfm-x/t1_load.c b/Build/source/texk/dvipdfm-x/t1_load.c index dfa59759d3d..cfa1b6a6f48 100644 --- a/Build/source/texk/dvipdfm-x/t1_load.c +++ b/Build/source/texk/dvipdfm-x/t1_load.c @@ -75,8 +75,8 @@ static void t1_crypt_init (unsigned short key) static void t1_decrypt (unsigned short key, - unsigned char *dst, const unsigned char *src, - long skip, long len) + unsigned char *dst, const unsigned char *src, + long skip, long len) { len -= skip; while (skip--) @@ -104,7 +104,7 @@ get_next_key (unsigned char **start, unsigned char *end) pst_obj *tok; while (*start < end && - (tok = pst_get_token(start, end)) != NULL) { + (tok = pst_get_token(start, end)) != NULL) { if (PST_NAMETYPE(tok)) { key = (char *) pst_getSV(tok); RELEASE_TOK(tok); @@ -122,7 +122,7 @@ seek_operator (unsigned char **start, unsigned char *end, const char *op) pst_obj *tok = NULL; while (*start < end && - (tok = pst_get_token(start, end)) != NULL) { + (tok = pst_get_token(start, end)) != NULL) { if (MATCH_OP(tok, op)) { break; } @@ -194,8 +194,8 @@ parse_nvalue (unsigned char **start, unsigned char *end, double *value, int max) /* It does not distinguish '[' and '{'... */ RELEASE_TOK(tok); while (*start < end && - (tok = pst_get_token(start, end)) != NULL && - PST_NUMBERTYPE(tok) && argn < max) { + (tok = pst_get_token(start, end)) != NULL && + PST_NUMBERTYPE(tok) && argn < max) { value[argn++] = (double) pst_getRV(tok); RELEASE_TOK(tok); } @@ -343,26 +343,26 @@ parse_encoding (char **enc_vec, unsigned char **start, unsigned char *end) RELEASE_TOK(tok); if (enc_vec) { for (code = 0; code < 256; code++) { - if (StandardEncoding[code] && - strcmp(StandardEncoding[code], ".notdef") != 0) { - enc_vec[code] = NEW(strlen(StandardEncoding[code])+1, char); - strcpy(enc_vec[code], StandardEncoding[code]); - } else { - enc_vec[code] = NULL; - } + if (StandardEncoding[code] && + strcmp(StandardEncoding[code], ".notdef") != 0) { + enc_vec[code] = NEW(strlen(StandardEncoding[code])+1, char); + strcpy(enc_vec[code], StandardEncoding[code]); + } else { + enc_vec[code] = NULL; + } } } } else if (MATCH_OP(tok, "ISOLatin1Encoding")) { RELEASE_TOK(tok); if (enc_vec) { for (code = 0; code < 256; code++) { - if (ISOLatin1Encoding[code] && - strcmp(ISOLatin1Encoding[code], ".notdef") != 0) { - enc_vec[code] = NEW(strlen(ISOLatin1Encoding[code])+1, char); - strcpy(enc_vec[code], ISOLatin1Encoding[code]); - } else { - enc_vec[code] = NULL; - } + if (ISOLatin1Encoding[code] && + strcmp(ISOLatin1Encoding[code], ".notdef") != 0) { + enc_vec[code] = NEW(strlen(ISOLatin1Encoding[code])+1, char); + strcpy(enc_vec[code], ISOLatin1Encoding[code]); + } else { + enc_vec[code] = NULL; + } } } } else if (MATCH_OP(tok, "ExpertEncoding")) { @@ -383,44 +383,44 @@ parse_encoding (char **enc_vec, unsigned char **start, unsigned char *end) * occurrence of "def" or "readonly". */ while (*start < end && - (tok = pst_get_token(start, end)) != NULL) { + (tok = pst_get_token(start, end)) != NULL) { if (MATCH_OP(tok, "def") || MATCH_OP(tok, "readonly")) { - RELEASE_TOK(tok); - break; + RELEASE_TOK(tok); + break; } else if (!MATCH_OP(tok, "dup")) { - RELEASE_TOK(tok); - continue; + RELEASE_TOK(tok); + continue; } RELEASE_TOK(tok); tok = pst_get_token(start, end); if (!tok || !PST_INTEGERTYPE(tok) || - (code = pst_getIV(tok)) > 255 || code < 0) { - RELEASE_TOK(tok); - continue; + (code = pst_getIV(tok)) > 255 || code < 0) { + RELEASE_TOK(tok); + continue; } RELEASE_TOK(tok); tok = pst_get_token(start, end); if (!tok || !PST_NAMETYPE(tok)) { - RELEASE_TOK(tok); - continue; + RELEASE_TOK(tok); + continue; } if (enc_vec) { - if (enc_vec[code]) - RELEASE(enc_vec[code]); - enc_vec[code] = (char *) pst_getSV(tok); + if (enc_vec[code]) + RELEASE(enc_vec[code]); + enc_vec[code] = (char *) pst_getSV(tok); } RELEASE_TOK(tok); tok = pst_get_token(start, end); if (!MATCH_OP(tok, "put")) { - if (enc_vec[code]) { - RELEASE(enc_vec[code]); - enc_vec[code] = NULL; - } - RELEASE_TOK(tok); - continue; + if (enc_vec[code]) { + RELEASE(enc_vec[code]); + enc_vec[code] = NULL; + } + RELEASE_TOK(tok); + continue; } RELEASE_TOK(tok); } @@ -438,7 +438,7 @@ parse_encoding (char **enc_vec, unsigned char **start, unsigned char *end) static int parse_subrs (cff_font *font, - unsigned char **start, unsigned char *end, int lenIV, int mode) + unsigned char **start, unsigned char *end, int lenIV, int mode) { cff_index *subrs; pst_obj *tok; @@ -494,7 +494,7 @@ parse_subrs (cff_font *font, if (lengths) RELEASE(lengths); return -1; } else if (MATCH_OP(tok, "ND") || - MATCH_OP(tok, "|-") || MATCH_OP(tok, "def")) { + MATCH_OP(tok, "|-") || MATCH_OP(tok, "def")) { RELEASE_TOK(tok); break; } else if (!MATCH_OP(tok, "dup")) { @@ -506,7 +506,7 @@ parse_subrs (cff_font *font, /* Found "dup" */ tok = pst_get_token(start, end); if (!PST_INTEGERTYPE(tok) || pst_getIV(tok) < 0 || - pst_getIV(tok) >= count) { + pst_getIV(tok) >= count) { RELEASE_TOK(tok); if (data) RELEASE(data); if (offsets) RELEASE(offsets); @@ -518,7 +518,7 @@ parse_subrs (cff_font *font, tok = pst_get_token(start, end); if (!PST_INTEGERTYPE(tok) || pst_getIV(tok) < 0 || - pst_getIV(tok) > CS_STR_LEN_MAX) { + pst_getIV(tok) > CS_STR_LEN_MAX) { RELEASE_TOK(tok); return -1; } @@ -527,7 +527,7 @@ parse_subrs (cff_font *font, tok = pst_get_token(start, end); if (!MATCH_OP(tok, "RD") && !MATCH_OP(tok, "-|") && - seek_operator(start, end, "readstring") < 0) { + seek_operator(start, end, "readstring") < 0) { RELEASE_TOK(tok); if (data) RELEASE(data); if (offsets) RELEASE(offsets); @@ -545,18 +545,18 @@ parse_subrs (cff_font *font, } if (mode != 1) { if (offset + len >= max_size) { - max_size += CS_STR_LEN_MAX; - data = RENEW(data, max_size, card8); + max_size += CS_STR_LEN_MAX; + data = RENEW(data, max_size, card8); } if (lenIV >= 0) { - t1_decrypt(T1_CHARKEY, data+offset, *start, lenIV, len); - offsets[idx] = offset; - offset += (lengths[idx] = len - lenIV); + t1_decrypt(T1_CHARKEY, data+offset, *start, lenIV, len); + offsets[idx] = offset; + offset += (lengths[idx] = len - lenIV); } else if (len > 0) { - offsets[idx] = offset; - lengths[idx] = len; - memcpy(&data[offset], *start, len); - offset += len; + offsets[idx] = offset; + lengths[idx] = len; + memcpy(&data[offset], *start, len); + offset += len; } } *start += len; @@ -571,8 +571,8 @@ parse_subrs (cff_font *font, for (i = 0; i < count; i++) { subrs->offset[i] = offset + 1; if (lengths[i] > 0) { - memcpy(subrs->data + offset, data + offsets[i], lengths[i]); - offset += lengths[i]; + memcpy(subrs->data + offset, data + offsets[i], lengths[i]); + offset += lengths[i]; } } subrs->offset[count] = offset + 1; @@ -592,7 +592,7 @@ parse_subrs (cff_font *font, static int parse_charstrings (cff_font *font, - unsigned char **start, unsigned char *end, int lenIV, int mode) + unsigned char **start, unsigned char *end, int lenIV, int mode) { cff_index *charstrings; cff_charsets *charset; @@ -683,7 +683,7 @@ parse_charstrings (cff_font *font, tok = pst_get_token(start, end); if (!PST_INTEGERTYPE(tok) || - pst_getIV(tok) < 0 || pst_getIV(tok) > CS_STR_LEN_MAX) { + pst_getIV(tok) < 0 || pst_getIV(tok) > CS_STR_LEN_MAX) { RELEASE_TOK(tok); return -1; } @@ -692,8 +692,8 @@ parse_charstrings (cff_font *font, tok = pst_get_token(start, end); if (!MATCH_OP(tok, "RD") && - !MATCH_OP(tok, "-|") && - seek_operator(start, end, "readstring") < 0) { + !MATCH_OP(tok, "-|") && + seek_operator(start, end, "readstring") < 0) { RELEASE_TOK(tok); return -1; } @@ -704,40 +704,40 @@ parse_charstrings (cff_font *font, } if (mode != 1) { if (offset + len >= max_size) { - max_size += MAX(len, CS_STR_LEN_MAX); - charstrings->data = RENEW(charstrings->data, max_size, card8); + max_size += MAX(len, CS_STR_LEN_MAX); + charstrings->data = RENEW(charstrings->data, max_size, card8); } if (gid == 0) { - if (lenIV >= 0) { - memmove(charstrings->data + len - lenIV, charstrings->data, offset); - for (j = 1; j <= i; j++) { - charstrings->offset[j] += len - lenIV; - } - } else { - memmove(charstrings->data + len, charstrings->data, offset); - for (j = 1; j <= i; j++) { - charstrings->offset[j] += len; - } - } + if (lenIV >= 0) { + memmove(charstrings->data + len - lenIV, charstrings->data, offset); + for (j = 1; j <= i; j++) { + charstrings->offset[j] += len - lenIV; + } + } else { + memmove(charstrings->data + len, charstrings->data, offset); + for (j = 1; j <= i; j++) { + charstrings->offset[j] += len; + } + } } } *start += 1; if (mode != 1) { if (lenIV >= 0) { - long offs = gid ? offset : 0; - charstrings->offset[gid] = offs + 1; /* start at 1 */ - t1_decrypt(T1_CHARKEY, charstrings->data+offs, *start, lenIV, len); - offset += len - lenIV; + long offs = gid ? offset : 0; + charstrings->offset[gid] = offs + 1; /* start at 1 */ + t1_decrypt(T1_CHARKEY, charstrings->data+offs, *start, lenIV, len); + offset += len - lenIV; } else { - if (gid == 0) { - charstrings->offset[gid] = 1; - memcpy(&charstrings->data[0], *start, len); - } else { - charstrings->offset[gid] = offset + 1; - memcpy(&charstrings->data[offset], *start, len); - } - offset += len; + if (gid == 0) { + charstrings->offset[gid] = 1; + memcpy(&charstrings->data[0], *start, len); + } else { + charstrings->offset[gid] = offset + 1; + memcpy(&charstrings->data[offset], *start, len); + } + offset += len; } } *start += len; @@ -776,28 +776,28 @@ parse_part2 (cff_font *font, unsigned char **start, unsigned char *end, int mode int argn, lenIV = 4; while (*start < end && - (key = get_next_key(start, end)) != NULL) { + (key = get_next_key(start, end)) != NULL) { if (!strcmp(key, "Subrs")) { /* levIV must appear before Subrs */ if (parse_subrs(font, start, end, lenIV, mode) < 0) { - RELEASE(key); - return -1; + RELEASE(key); + return -1; } } else if (!strcmp(key, "CharStrings")) { if (parse_charstrings(font, start, end, lenIV, mode) < 0) { - RELEASE(key); - return -1; + RELEASE(key); + return -1; } } else if (!strcmp(key, "lenIV")) { argn = parse_nvalue(start, end, argv, 1); CHECK_ARGN_EQ(1); lenIV = (int) argv[0]; } else if (!strcmp(key, "BlueValues") || - !strcmp(key, "OtherBlues") || - !strcmp(key, "FamilyBlues") || - !strcmp(key, "FamilyOtherBlues") || - !strcmp(key, "StemSnapH") || - !strcmp(key, "StemSnapV")) { + !strcmp(key, "OtherBlues") || + !strcmp(key, "FamilyBlues") || + !strcmp(key, "FamilyOtherBlues") || + !strcmp(key, "StemSnapH") || + !strcmp(key, "StemSnapV")) { /* * Operand values are delta in CFF font dictionary encoding. */ @@ -805,16 +805,16 @@ parse_part2 (cff_font *font, unsigned char **start, unsigned char *end, int mode CHECK_ARGN_GE(0); cff_dict_add(font->private[0], key, argn); while (argn-- > 0) { - cff_dict_set(font->private[0], key, argn, - (argn == 0) ? argv[argn] : argv[argn] - argv[argn-1]); + cff_dict_set(font->private[0], key, argn, + (argn == 0) ? argv[argn] : argv[argn] - argv[argn-1]); } } else if (!strcmp(key, "StdHW") || - !strcmp(key, "StdVW") || - !strcmp(key, "BlueScale") || - !strcmp(key, "BlueShift") || - !strcmp(key, "BlueFuzz") || - !strcmp(key, "LanguageGroup") || - !strcmp(key, "ExpansionFactor")) { + !strcmp(key, "StdVW") || + !strcmp(key, "BlueScale") || + !strcmp(key, "BlueShift") || + !strcmp(key, "BlueFuzz") || + !strcmp(key, "LanguageGroup") || + !strcmp(key, "ExpansionFactor")) { /* * Value of StdHW and StdVW is described as an array in the * Type 1 Font Specification but is a number in CFF format. @@ -827,8 +827,8 @@ parse_part2 (cff_font *font, unsigned char **start, unsigned char *end, int mode argn = parse_bvalue(start, end, &(argv[0])); CHECK_ARGN_EQ(1); if (argv[0] != 0) { - cff_dict_add(font->private[0], key, 1); - cff_dict_set(font->private[0], key, 0, 1); + cff_dict_add(font->private[0], key, 1); + cff_dict_set(font->private[0], key, 0, 1); } } /* @@ -846,7 +846,7 @@ parse_part2 (cff_font *font, unsigned char **start, unsigned char *end, int mode static long parse_part1 (cff_font *font, char **enc_vec, - unsigned char **start, unsigned char *end) + unsigned char **start, unsigned char *end) { char *key, *strval; double argv[MAX_ARGS]; @@ -861,18 +861,18 @@ parse_part1 (cff_font *font, char **enc_vec, return -1; while (*start < end && - (key = get_next_key(start, end)) != NULL) { + (key = get_next_key(start, end)) != NULL) { if (!strcmp(key, "Encoding")) { if (parse_encoding(enc_vec, start, end) < 0) { - RELEASE(key); - return -1; + RELEASE(key); + return -1; } } else if (!strcmp(key, "FontName")) { argn = parse_svalue(start, end, &strval); CHECK_ARGN_EQ(1); if (strlen(strval) > TYPE1_NAME_LEN_MAX) { - WARN("FontName too long: %s (%d bytes)", strval, strlen(strval)); - strval[TYPE1_NAME_LEN_MAX] = '\0'; + WARN("FontName too long: %s (%d bytes)", strval, strlen(strval)); + strval[TYPE1_NAME_LEN_MAX] = '\0'; } cff_set_name(font, strval); RELEASE(strval); @@ -880,9 +880,9 @@ parse_part1 (cff_font *font, char **enc_vec, argn = parse_nvalue(start, end, argv, 1); CHECK_ARGN_EQ(1); if (argv[0] != 1.0) { - WARN("FontType %d not supported.", (int) argv[0]); - RELEASE(key); - return -1; + WARN("FontType %d not supported.", (int) argv[0]); + RELEASE(key); + return -1; } #if 0 /* DISABLED: @@ -896,25 +896,25 @@ parse_part1 (cff_font *font, char **enc_vec, cff_dict_set(font->topdict, key, 0, argv[0]); #endif } else if (!strcmp(key, "ItalicAngle") || - !strcmp(key, "StrokeWidth") || - !strcmp(key, "PaintType")) { + !strcmp(key, "StrokeWidth") || + !strcmp(key, "PaintType")) { argn = parse_nvalue(start, end, argv, 1); CHECK_ARGN_EQ(1); if (argv[0] != 0.0) { #if 0 - /* - * Positive value in Bitstream CharterBT-Italic ??? - */ - if (!strcmp(key, "ItalicAngle") && argv[0] > 0) { - WARN("Positive ItalicAngle value: %g", argv[0]); - argv[0] *= -1; - } + /* + * Positive value in Bitstream CharterBT-Italic ??? + */ + if (!strcmp(key, "ItalicAngle") && argv[0] > 0) { + WARN("Positive ItalicAngle value: %g", argv[0]); + argv[0] *= -1; + } #endif - cff_dict_add(font->topdict, key, 1); - cff_dict_set(font->topdict, key, 0, argv[0]); + cff_dict_add(font->topdict, key, 1); + cff_dict_set(font->topdict, key, 0, argv[0]); } } else if (!strcmp(key, "UnderLinePosition") || - !strcmp(key, "UnderLineThickness")) { + !strcmp(key, "UnderLineThickness")) { argn = parse_nvalue(start, end, argv, 1); CHECK_ARGN_EQ(1); cff_dict_add(font->topdict, key, 1); @@ -924,45 +924,45 @@ parse_part1 (cff_font *font, char **enc_vec, CHECK_ARGN_EQ(4); cff_dict_add(font->topdict, key, 4); while (argn-- > 0) { - cff_dict_set(font->topdict, key, argn, argv[argn]); + cff_dict_set(font->topdict, key, argn, argv[argn]); } } else if (!strcmp(key, "FontMatrix")) { argn = parse_nvalue(start, end, argv, 6); CHECK_ARGN_EQ(6); if (argv[0] != 0.001 || argv[1] != 0.0 || argv[2] != 0.0 || - argv[3] != 0.001 || argv[4] != 0.0 || argv[5] != 0.0) { - cff_dict_add(font->topdict, key, 6); - while (argn-- > 0) { - cff_dict_set(font->topdict, key, argn, argv[argn]); - } + argv[3] != 0.001 || argv[4] != 0.0 || argv[5] != 0.0) { + cff_dict_add(font->topdict, key, 6); + while (argn-- > 0) { + cff_dict_set(font->topdict, key, argn, argv[argn]); + } } } else if (!strcmp(key, "version") || !strcmp(key, "Notice") || - !strcmp(key, "FullName") || !strcmp(key, "FamilyName") || - !strcmp(key, "Weight") || !strcmp(key, "Copyright")) { + !strcmp(key, "FullName") || !strcmp(key, "FamilyName") || + !strcmp(key, "Weight") || !strcmp(key, "Copyright")) { /* * FontInfo */ argn = parse_svalue(start, end, &strval); CHECK_ARGN_EQ(1); { - s_SID sid; - - cff_dict_add(font->topdict, key, 1); - if ((sid = cff_get_sid(font, strval)) == CFF_STRING_NOTDEF) - sid = cff_add_string(font, strval, 0); /* FIXME */ - /* - * We don't care about duplicate strings here since - * later a subset font of this font will be generated. - */ - cff_dict_set(font->topdict, key, 0, sid); + s_SID sid; + + cff_dict_add(font->topdict, key, 1); + if ((sid = cff_get_sid(font, strval)) == CFF_STRING_NOTDEF) + sid = cff_add_string(font, strval, 0); /* FIXME */ + /* + * We don't care about duplicate strings here since + * later a subset font of this font will be generated. + */ + cff_dict_set(font->topdict, key, 0, sid); } RELEASE(strval); } else if (!strcmp(key, "IsFixedPitch")) { argn = parse_bvalue(start, end, &(argv[0])); CHECK_ARGN_EQ(1); if (argv[0] != 0.0) { - cff_dict_add(font->private[0], key, 1); - cff_dict_set(font->private[0], key, 0, 1); + cff_dict_add(font->private[0], key, 1); + cff_dict_set(font->private[0], key, 0, 1); } } RELEASE(key); @@ -1037,23 +1037,23 @@ get_pfb_segment (FILE *fp, int expected_type, long *length) slen = 0; for (i = 0; i < 4; i++) { - if ((ch = fgetc(fp)) < 0) { - if (buffer) - RELEASE(buffer); - return NULL; - } - slen = slen + (ch << (8*i)); + if ((ch = fgetc(fp)) < 0) { + if (buffer) + RELEASE(buffer); + return NULL; + } + slen = slen + (ch << (8*i)); } buffer = RENEW(buffer, bytesread + slen, unsigned char); while (slen > 0) { - rlen = fread(buffer + bytesread, sizeof(unsigned char), slen, fp); - if (rlen < 0) { - if (buffer) - RELEASE(buffer); - return NULL; - } - slen -= rlen; - bytesread += rlen; + rlen = fread(buffer + bytesread, sizeof(unsigned char), slen, fp); + if (rlen < 0) { + if (buffer) + RELEASE(buffer); + return NULL; + } + slen -= rlen; + bytesread += rlen; } } } @@ -1099,17 +1099,17 @@ t1_get_fontname (FILE *fp, char *fontname) } while (!fn_found && start < end && - (key = get_next_key(&start, end)) != NULL) { + (key = get_next_key(&start, end)) != NULL) { if (!strcmp(key, "FontName")) { char *strval; if (parse_svalue(&start, end, &strval) == 1) { - if (strlen(strval) > TYPE1_NAME_LEN_MAX) { - WARN("FontName \"%s\" too long. (%d bytes)", strval, strlen(strval)); - strval[TYPE1_NAME_LEN_MAX] = '\0'; - } - strcpy(fontname, strval); - RELEASE(strval); - fn_found = 1; + if (strlen(strval) > TYPE1_NAME_LEN_MAX) { + WARN("FontName \"%s\" too long. (%d bytes)", strval, strlen(strval)); + strval[TYPE1_NAME_LEN_MAX] = '\0'; + } + strcpy(fontname, strval); + RELEASE(strval); + fn_found = 1; } } RELEASE(key); diff --git a/Build/source/texk/dvipdfm-x/type0.c b/Build/source/texk/dvipdfm-x/type0.c index 5fe77a7f86d..ba3efa2e40f 100644 --- a/Build/source/texk/dvipdfm-x/type0.c +++ b/Build/source/texk/dvipdfm-x/type0.c @@ -236,8 +236,8 @@ add_ToUnicode (Type0Font *font) if (CIDFont_get_flag(cidfont, CIDFONT_FLAG_TYPE1C)) { /* FIXME */ tounicode = Type0Font_create_ToUnicode_stream(font); } else if (CIDFont_get_flag(cidfont, CIDFONT_FLAG_TYPE1)) { /* FIXME */ - /* Font loader will create ToUnicode and set. */ - return; + /* Font loader will create ToUnicode and set. */ + return; } else { tounicode = Type0Font_try_load_ToUnicode_stream(font, fontname); } @@ -252,7 +252,7 @@ add_ToUnicode (Type0Font *font) if (tounicode) { pdf_add_dict(font->fontdict, - pdf_new_name("ToUnicode"), tounicode); + pdf_new_name("ToUnicode"), tounicode); } else { WARN("Failed to load ToUnicode CMap for font \"%s\"", fontname); } @@ -266,7 +266,7 @@ Type0Font_set_ToUnicode (Type0Font *font, pdf_obj *cmap_ref) ASSERT(font); pdf_add_dict(font->fontdict, - pdf_new_name("ToUnicode"), cmap_ref); + pdf_new_name("ToUnicode"), cmap_ref); } static void diff --git a/Build/source/texk/dvipdfm-x/type1.c b/Build/source/texk/dvipdfm-x/type1.c index 28460b5c8a3..a211e94fb58 100644 --- a/Build/source/texk/dvipdfm-x/type1.c +++ b/Build/source/texk/dvipdfm-x/type1.c @@ -103,7 +103,7 @@ pdf_font_open_type1 (pdf_font *font) pdf_font_set_fontname(font, ident); pdf_font_set_subtype (font, PDF_FONT_FONTTYPE_TYPE1); pdf_font_set_flags (font, - (PDF_FONT_FLAG_NOEMBED|PDF_FONT_FLAG_BASEFONT)); + (PDF_FONT_FLAG_NOEMBED|PDF_FONT_FLAG_BASEFONT)); } else { fp = DPXFOPEN(ident, DPX_RES_TYPE_T1FONT); if (!fp) @@ -187,8 +187,8 @@ get_font_attr (pdf_font *font, cff_font *cffont) gid = cff_glyph_lookup(cffont, "space"); if (gid >= 0 && gid < cffont->cstrings->count) { t1char_get_metrics(cffont->cstrings->data + cffont->cstrings->offset[gid] - 1, - cffont->cstrings->offset[gid+1] - cffont->cstrings->offset[gid], - cffont->subrs[0], &gm); + cffont->cstrings->offset[gid+1] - cffont->cstrings->offset[gid], + cffont->subrs[0], &gm); defaultwidth = gm.wx; } @@ -196,8 +196,8 @@ get_font_attr (pdf_font *font, cff_font *cffont) gid = cff_glyph_lookup(cffont, L_c[i]); if (gid >= 0 && gid < cffont->cstrings->count) { t1char_get_metrics(cffont->cstrings->data + cffont->cstrings->offset[gid] - 1, - cffont->cstrings->offset[gid+1] - cffont->cstrings->offset[gid], - cffont->subrs[0], &gm); + cffont->cstrings->offset[gid+1] - cffont->cstrings->offset[gid], + cffont->subrs[0], &gm); capheight = gm.bbox.ury; break; } @@ -207,8 +207,8 @@ get_font_attr (pdf_font *font, cff_font *cffont) gid = cff_glyph_lookup(cffont, L_d[i]); if (gid >= 0 && gid < cffont->cstrings->count) { t1char_get_metrics(cffont->cstrings->data + cffont->cstrings->offset[gid] - 1, - cffont->cstrings->offset[gid+1] - cffont->cstrings->offset[gid], - cffont->subrs[0], &gm); + cffont->cstrings->offset[gid+1] - cffont->cstrings->offset[gid], + cffont->subrs[0], &gm); descent = gm.bbox.lly; break; } @@ -218,8 +218,8 @@ get_font_attr (pdf_font *font, cff_font *cffont) gid = cff_glyph_lookup(cffont, L_a[i]); if (gid >= 0 && gid < cffont->cstrings->count) { t1char_get_metrics(cffont->cstrings->data + cffont->cstrings->offset[gid] - 1, - cffont->cstrings->offset[gid+1] - cffont->cstrings->offset[gid], - cffont->subrs[0], &gm); + cffont->cstrings->offset[gid+1] - cffont->cstrings->offset[gid], + cffont->subrs[0], &gm); ascent = gm.bbox.ury; break; } @@ -254,17 +254,17 @@ get_font_attr (pdf_font *font, cff_font *cffont) flags |= FONT_FLAG_SYMBOLIC; /* FIXME */ pdf_add_dict(descriptor, - pdf_new_name("CapHeight"), pdf_new_number(capheight)); + pdf_new_name("CapHeight"), pdf_new_number(capheight)); pdf_add_dict(descriptor, - pdf_new_name("Ascent"), pdf_new_number(ascent)); + pdf_new_name("Ascent"), pdf_new_number(ascent)); pdf_add_dict(descriptor, - pdf_new_name("Descent"), pdf_new_number(descent)); + pdf_new_name("Descent"), pdf_new_number(descent)); pdf_add_dict(descriptor, - pdf_new_name("ItalicAngle"), pdf_new_number(italicangle)); + pdf_new_name("ItalicAngle"), pdf_new_number(italicangle)); pdf_add_dict(descriptor, - pdf_new_name("StemV"), pdf_new_number(stemv)); + pdf_new_name("StemV"), pdf_new_number(stemv)); pdf_add_dict(descriptor, - pdf_new_name("Flags"), pdf_new_number(flags)); + pdf_new_name("Flags"), pdf_new_number(flags)); } static void @@ -315,8 +315,8 @@ add_metrics (pdf_font *font, cff_font *cffont, char **enc_vec, double *widths, l } else { for (firstchar = 255, lastchar = 0, code = 0; code < 256; code++) { if (usedchars[code]) { - if (code < firstchar) firstchar = code; - if (code > lastchar) lastchar = code; + if (code < firstchar) firstchar = code; + if (code > lastchar) lastchar = code; } } if (firstchar > lastchar) { @@ -329,27 +329,27 @@ add_metrics (pdf_font *font, cff_font *cffont, char **enc_vec, double *widths, l if (usedchars[code]) { double width; if (tfm_id < 0) /* tfm is not found */ - width = scaling * widths[cff_glyph_lookup(cffont, enc_vec[code])]; + width = scaling * widths[cff_glyph_lookup(cffont, enc_vec[code])]; else width = 1000. * tfm_get_width(tfm_id, code); - pdf_add_array(tmp_array, - pdf_new_number(ROUND(width, 0.1))); + pdf_add_array(tmp_array, + pdf_new_number(ROUND(width, 0.1))); } else { - pdf_add_array(tmp_array, pdf_new_number(0.0)); + pdf_add_array(tmp_array, pdf_new_number(0.0)); } } } if (pdf_array_length(tmp_array) > 0) { pdf_add_dict(fontdict, - pdf_new_name("Widths"), pdf_ref_obj(tmp_array)); + pdf_new_name("Widths"), pdf_ref_obj(tmp_array)); } pdf_release_obj(tmp_array); pdf_add_dict(fontdict, - pdf_new_name("FirstChar"), pdf_new_number(firstchar)); + pdf_new_name("FirstChar"), pdf_new_number(firstchar)); pdf_add_dict(fontdict, - pdf_new_name("LastChar"), pdf_new_number(lastchar)); + pdf_new_name("LastChar"), pdf_new_number(lastchar)); return; } @@ -412,38 +412,38 @@ write_fontfile (pdf_font *font, cff_font *cffont) offset = 0; /* Header */ offset += cff_put_header(cffont, - stream_data_ptr + offset, stream_data_len - offset); + stream_data_ptr + offset, stream_data_len - offset); /* Name */ offset += cff_pack_index(cffont->name, - stream_data_ptr + offset, stream_data_len - offset); + stream_data_ptr + offset, stream_data_len - offset); /* Top DICT */ topdict_offset = offset; offset += cff_index_size(topdict); /* Strings */ offset += cff_pack_index(cffont->string, - stream_data_ptr + offset, stream_data_len - offset); + stream_data_ptr + offset, stream_data_len - offset); /* Global Subrs */ offset += cff_pack_index(cffont->gsubr, - stream_data_ptr + offset, stream_data_len - offset); + stream_data_ptr + offset, stream_data_len - offset); /* Encoding */ /* TODO: don't write Encoding entry if the font is always used * with PDF Encoding information. Applies to type1c.c as well. */ cff_dict_set(cffont->topdict, "Encoding", 0, offset); offset += cff_pack_encoding(cffont, - stream_data_ptr + offset, stream_data_len - offset); + stream_data_ptr + offset, stream_data_len - offset); /* charset */ cff_dict_set(cffont->topdict, "charset", 0, offset); offset += cff_pack_charsets(cffont, - stream_data_ptr + offset, stream_data_len - offset); + stream_data_ptr + offset, stream_data_len - offset); /* CharStrings */ cff_dict_set(cffont->topdict, "CharStrings", 0, offset); offset += cff_pack_index(cffont->cstrings, - stream_data_ptr + offset, charstring_len); + stream_data_ptr + offset, charstring_len); /* Private */ if ((cffont->private)[0] && private_size > 0) { private_size = cff_dict_pack(cffont->private[0], - stream_data_ptr + offset, private_size); + stream_data_ptr + offset, private_size); cff_dict_set(cffont->topdict, "Private", 1, offset); cff_dict_set(cffont->topdict, "Private", 0, private_size); } @@ -453,7 +453,7 @@ write_fontfile (pdf_font *font, cff_font *cffont) topdict->data = NEW(topdict->offset[1] - 1, card8); cff_dict_pack (cffont->topdict, topdict->data, topdict->offset[1] - 1); cff_pack_index(topdict, - stream_data_ptr + topdict_offset, cff_index_size(topdict)); + stream_data_ptr + topdict_offset, cff_index_size(topdict)); cff_release_index(topdict); /* Copyright and Trademark Notice ommited. */ @@ -462,9 +462,9 @@ write_fontfile (pdf_font *font, cff_font *cffont) fontfile = pdf_new_stream(STREAM_COMPRESS); stream_dict = pdf_stream_dict(fontfile); pdf_add_dict(descriptor, - pdf_new_name("FontFile3"), pdf_ref_obj (fontfile)); + pdf_new_name("FontFile3"), pdf_ref_obj (fontfile)); pdf_add_dict(stream_dict, - pdf_new_name("Subtype"), pdf_new_name("Type1C")); + pdf_new_name("Subtype"), pdf_new_name("Type1C")); pdf_add_stream (fontfile, (void *) stream_data_ptr, offset); pdf_release_obj(fontfile); @@ -551,7 +551,7 @@ pdf_font_load_type1 (pdf_font *font) */ if (!pdf_lookup_dict(fontdict, "ToUnicode")) { tounicode = pdf_create_ToUnicode_CMap(fullname, - enc_vec, usedchars); + enc_vec, usedchars); if (tounicode) { pdf_add_dict(fontdict, pdf_new_name("ToUnicode"), @@ -609,49 +609,49 @@ pdf_font_load_type1 (pdf_font *font) glyph = enc_vec[code]; if (!usedchars[code]) - continue; + continue; if (glyph && !strcmp(glyph, ".notdef")) { - WARN("Character mapped to .notdef used in font: %s", - fontname); - usedchars[code] = 0; - continue; + WARN("Character mapped to .notdef used in font: %s", + fontname); + usedchars[code] = 0; + continue; } gid = cff_glyph_lookup(cffont, glyph); if (gid < 1 || gid >= cffont->cstrings->count) { - WARN("Glyph \"%s\" missing in font \"%s\".", glyph, fontname); - usedchars[code] = 0; - continue; + WARN("Glyph \"%s\" missing in font \"%s\".", glyph, fontname); + usedchars[code] = 0; + continue; } for (duplicate = 0; duplicate < code; duplicate++) { - if (usedchars[duplicate] && - enc_vec[duplicate] && !strcmp(enc_vec[duplicate], glyph)) - break; + if (usedchars[duplicate] && + enc_vec[duplicate] && !strcmp(enc_vec[duplicate], glyph)) + break; } sid = cff_add_string(cffont, glyph, 1); /* FIXME */ if (duplicate < code) { /* found duplicates */ - cffont->encoding->supp[cffont->encoding->num_supps].code = duplicate; - cffont->encoding->supp[cffont->encoding->num_supps].glyph = sid; - cffont->encoding->num_supps += 1; + cffont->encoding->supp[cffont->encoding->num_supps].code = duplicate; + cffont->encoding->supp[cffont->encoding->num_supps].glyph = sid; + cffont->encoding->num_supps += 1; } else { - GIDMap[num_glyphs] = (card16) gid; - charset->data.glyphs[charset->num_entries] = sid; - charset->num_entries += 1; - if (code != prev + 1) { - cffont->encoding->num_entries += 1; - cffont->encoding->data.range1[cffont->encoding->num_entries-1].first = code; - cffont->encoding->data.range1[cffont->encoding->num_entries-1].n_left = 0; - } else { - cffont->encoding->data.range1[cffont->encoding->num_entries-1].n_left += 1; - } - prev = code; - num_glyphs++; - - if (verbose > 2) { - MESG("/%s", glyph); - } + GIDMap[num_glyphs] = (card16) gid; + charset->data.glyphs[charset->num_entries] = sid; + charset->num_entries += 1; + if (code != prev + 1) { + cffont->encoding->num_entries += 1; + cffont->encoding->data.range1[cffont->encoding->num_entries-1].first = code; + cffont->encoding->data.range1[cffont->encoding->num_entries-1].n_left = 0; + } else { + cffont->encoding->data.range1[cffont->encoding->num_entries-1].n_left += 1; + } + prev = code; + num_glyphs++; + + if (verbose > 2) { + MESG("/%s", glyph); + } } } @@ -689,8 +689,8 @@ pdf_font_load_type1 (pdf_font *font) /* The num_glyphs increases if "seac" operators are used. */ for (gid = 0; gid < num_glyphs; gid++) { if (offset + CS_STR_LEN_MAX >= dstlen_max) { - dstlen_max += CS_STR_LEN_MAX * 2; - cstring->data = RENEW(cstring->data, dstlen_max, card8); + dstlen_max += CS_STR_LEN_MAX * 2; + cstring->data = RENEW(cstring->data, dstlen_max, card8); } gid_orig = GIDMap[gid]; @@ -699,57 +699,57 @@ pdf_font_load_type1 (pdf_font *font) srclen = cffont->cstrings->offset[gid_orig + 1] - cffont->cstrings->offset[gid_orig]; offset += t1char_convert_charstring(dstptr, CS_STR_LEN_MAX, - srcptr, srclen, - cffont->subrs[0], defaultwidth, nominalwidth, &gm); + srcptr, srclen, + cffont->subrs[0], defaultwidth, nominalwidth, &gm); cstring->offset[gid + 1] = offset + 1; if (gm.use_seac) { - long bchar_gid, achar_gid, i; - const char *bchar_name, *achar_name; - - /* - * NOTE: - * 1. seac.achar and seac.bchar must be contained in the CFF standard string. - * 2. Those characters need not to be encoded. - * 3. num_glyphs == charsets->num_entries + 1. - */ - achar_name = t1_get_standard_glyph(gm.seac.achar); - achar_gid = cff_glyph_lookup(cffont, achar_name); - bchar_name = t1_get_standard_glyph(gm.seac.bchar); - bchar_gid = cff_glyph_lookup(cffont, bchar_name); - if (achar_gid < 0) { - WARN("Accent char \"%s\" not found. Invalid use of \"seac\" operator.", - achar_name); - continue; - } - if (bchar_gid < 0) { - WARN("Base char \"%s\" not found. Invalid use of \"seac\" operator.", - bchar_name); - continue; - } - - for (i = 0; i < num_glyphs; i++) { - if (GIDMap[i] == achar_gid) - break; - } - if (i == num_glyphs) { - if (verbose > 2) - MESG("/%s", achar_name); - GIDMap[num_glyphs++] = achar_gid; - charset->data.glyphs[charset->num_entries] = cff_get_seac_sid(cffont, achar_name); - charset->num_entries += 1; - } - - for (i = 0; i < num_glyphs; i++) { - if (GIDMap[i] == bchar_gid) - break; - } - if (i == num_glyphs) { - if (verbose > 2) - MESG("/%s", bchar_name); - GIDMap[num_glyphs++] = bchar_gid; - charset->data.glyphs[charset->num_entries] = cff_get_seac_sid(cffont, bchar_name); - charset->num_entries += 1; - } + long bchar_gid, achar_gid, i; + const char *bchar_name, *achar_name; + + /* + * NOTE: + * 1. seac.achar and seac.bchar must be contained in the CFF standard string. + * 2. Those characters need not to be encoded. + * 3. num_glyphs == charsets->num_entries + 1. + */ + achar_name = t1_get_standard_glyph(gm.seac.achar); + achar_gid = cff_glyph_lookup(cffont, achar_name); + bchar_name = t1_get_standard_glyph(gm.seac.bchar); + bchar_gid = cff_glyph_lookup(cffont, bchar_name); + if (achar_gid < 0) { + WARN("Accent char \"%s\" not found. Invalid use of \"seac\" operator.", + achar_name); + continue; + } + if (bchar_gid < 0) { + WARN("Base char \"%s\" not found. Invalid use of \"seac\" operator.", + bchar_name); + continue; + } + + for (i = 0; i < num_glyphs; i++) { + if (GIDMap[i] == achar_gid) + break; + } + if (i == num_glyphs) { + if (verbose > 2) + MESG("/%s", achar_name); + GIDMap[num_glyphs++] = achar_gid; + charset->data.glyphs[charset->num_entries] = cff_get_seac_sid(cffont, achar_name); + charset->num_entries += 1; + } + + for (i = 0; i < num_glyphs; i++) { + if (GIDMap[i] == bchar_gid) + break; + } + if (i == num_glyphs) { + if (verbose > 2) + MESG("/%s", bchar_name); + GIDMap[num_glyphs++] = bchar_gid; + charset->data.glyphs[charset->num_entries] = cff_get_seac_sid(cffont, bchar_name); + charset->num_entries += 1; + } } widths[gid] = gm.wx; } @@ -786,7 +786,7 @@ pdf_font_load_type1 (pdf_font *font) if (encoding_id < 0 && enc_vec) { for (code = 0; code < 256; code++) { if (enc_vec[code]) - RELEASE(enc_vec[code]); + RELEASE(enc_vec[code]); enc_vec[code] = NULL; } RELEASE(enc_vec); -- cgit v1.2.3