diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-09-14 03:34:50 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-09-14 03:34:50 +0000 |
commit | 00653d612add044de9f941c7b2c562bebe60d1e8 (patch) | |
tree | 46f2e9aa6440270f015d3e9d3d17f4d4ed709691 /Build/source/texk/dvipdfm-x/fontmap.c | |
parent | fb833e57545c4b4d76e01406904fdfd83f057447 (diff) |
Cleanup. Remove duplicated code. Reorganize global variables. (S. Hirata)
git-svn-id: svn://tug.org/texlive/trunk@48663 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/fontmap.c')
-rw-r--r-- | Build/source/texk/dvipdfm-x/fontmap.c | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/Build/source/texk/dvipdfm-x/fontmap.c b/Build/source/texk/dvipdfm-x/fontmap.c index 06909a63ab7..92e6b7d8829 100644 --- a/Build/source/texk/dvipdfm-x/fontmap.c +++ b/Build/source/texk/dvipdfm-x/fontmap.c @@ -28,6 +28,7 @@ #include "mem.h" #include "error.h" +#include "dpxconf.h" #include "dpxfile.h" #include "dpxutil.h" @@ -38,14 +39,6 @@ /* CIDFont */ static char *strip_options (const char *map_name, fontmap_opt *opt); -static int verbose = 0; -void -pdf_fontmap_set_verbose (void) -{ - verbose++; -} - - void pdf_init_fontmap_record (fontmap_rec *mrec) { @@ -737,7 +730,7 @@ pdf_append_fontmap_record (const char *kp, const fontmap_rec *vp) return -1; } - if (verbose > 3) + if (dpx_conf.verbose_level > 3) MESG("fontmap>> append key=\"%s\"...", kp); fnt_name = chop_sfd_name(kp, &sfd_name); @@ -777,7 +770,7 @@ pdf_append_fontmap_record (const char *kp, const fontmap_rec *vp) } ht_insert_table(fontmap, kp, strlen(kp), mrec); } - if (verbose > 3) + if (dpx_conf.verbose_level > 3) MESG("\n"); return 0; @@ -791,7 +784,7 @@ pdf_remove_fontmap_record (const char *kp) if (!kp) return -1; - if (verbose > 3) + if (dpx_conf.verbose_level > 3) MESG("fontmap>> remove key=\"%s\"...", kp); fnt_name = chop_sfd_name(kp, &sfd_name); @@ -802,13 +795,13 @@ pdf_remove_fontmap_record (const char *kp) subfont_ids = sfd_get_subfont_ids(sfd_name, &n); if (!subfont_ids) return -1; - if (verbose > 3) + if (dpx_conf.verbose_level > 3) MESG("\nfontmap>> Expand @%s@:", sfd_name); while (n-- > 0) { tfm_name = make_subfont_name(kp, sfd_name, subfont_ids[n]); if (!tfm_name) continue; - if (verbose > 3) + if (dpx_conf.verbose_level > 3) MESG(" %s", tfm_name); ht_remove_table(fontmap, tfm_name, strlen(tfm_name)); RELEASE(tfm_name); @@ -819,7 +812,7 @@ pdf_remove_fontmap_record (const char *kp) ht_remove_table(fontmap, kp, strlen(kp)); - if (verbose > 3) + if (dpx_conf.verbose_level > 3) MESG("\n"); return 0; @@ -836,7 +829,7 @@ pdf_insert_fontmap_record (const char *kp, const fontmap_rec *vp) return NULL; } - if (verbose > 3) + if (dpx_conf.verbose_level > 3) MESG("fontmap>> insert key=\"%s\"...", kp); fnt_name = chop_sfd_name(kp, &sfd_name); @@ -851,13 +844,13 @@ pdf_insert_fontmap_record (const char *kp, const fontmap_rec *vp) WARN("Could not open SFD file: %s", sfd_name); return NULL; } - if (verbose > 3) + if (dpx_conf.verbose_level > 3) MESG("\nfontmap>> Expand @%s@:", sfd_name); while (n-- > 0) { tfm_name = make_subfont_name(kp, sfd_name, subfont_ids[n]); if (!tfm_name) continue; - if (verbose > 3) + if (dpx_conf.verbose_level > 3) MESG(" %s", tfm_name); mrec = NEW(1, fontmap_rec); pdf_init_fontmap_record(mrec); @@ -879,7 +872,7 @@ pdf_insert_fontmap_record (const char *kp, const fontmap_rec *vp) } ht_insert_table(fontmap, kp, strlen(kp), mrec); - if (verbose > 3) + if (dpx_conf.verbose_level > 3) MESG("\n"); return mrec; @@ -980,7 +973,7 @@ pdf_load_fontmap_file (const char *filename, int mode) ASSERT(filename); ASSERT(fontmap) ; - if (verbose) + if (dpx_conf.verbose_level > 0) MESG("<FONTMAP:"); fp = DPXFOPEN(filename, DPX_RES_TYPE_FONTMAP); /* outputs path if verbose */ if (!fp) { @@ -1038,7 +1031,7 @@ pdf_load_fontmap_file (const char *filename, int mode) } DPXFCLOSE(fp); - if (verbose) + if (dpx_conf.verbose_level > 0) MESG(">"); return error; @@ -1057,7 +1050,7 @@ pdf_insert_native_fontmap_record (const char *path, uint32_t index, fontmap_key = malloc(strlen(path) + 40); // CHECK sprintf(fontmap_key, "%s/%d/%c/%d/%d/%d", path, index, layout_dir == 0 ? 'H' : 'V', extend, slant, embolden); - if (verbose) + if (dpx_conf.verbose_level > 0) MESG("<NATIVE-FONTMAP:%s", fontmap_key); mrec = NEW(1, fontmap_rec); @@ -1081,7 +1074,7 @@ pdf_insert_native_fontmap_record (const char *path, uint32_t index, pdf_clear_fontmap_record(mrec); RELEASE(mrec); - if (verbose) + if (dpx_conf.verbose_level > 0) MESG(">"); return ret; |