diff options
author | Jjgod Jiang <gzjjgod@gmail.com> | 2015-05-25 11:52:57 +0000 |
---|---|---|
committer | Jjgod Jiang <gzjjgod@gmail.com> | 2015-05-25 11:52:57 +0000 |
commit | de63571e6991218d72bd5608e29987f9bc9fec17 (patch) | |
tree | a3a8fcfda358eecfd72ff3a042dde9c5072bbc7e /Build/source/texk/dvipdfm-x/cid.c | |
parent | 0014b4c32f357068de8182057763bcca2d0f3467 (diff) |
Convert tabs to spaces
git-svn-id: svn://tug.org/texlive/trunk@37495 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/cid.c')
-rw-r--r-- | Build/source/texk/dvipdfm-x/cid.c | 96 |
1 files changed, 48 insertions, 48 deletions
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); } } |