tectonic/dpx: remove useless code related to DPXTEST

We will never use/define DPXTEST, hence remove the dead code.

Author: ronnychevalier

tectonic/dpx-fontmap.c

@@ -1280,158 +1280,3 @@ strip_options (const char *map_name, fontmap_opt *opt)
 
     return font_name;
 }
-
-#ifdef  DPXTEST
-static void
-dump_fontmap_rec (const char *key, const fontmap_rec *mrec)
-{
-    fontmap_opt *opt = (fontmap_opt *) &mrec->opt;
-
-    if (mrec->map_name)
-        fprintf(stdout, "  <!-- subfont");
-    else
-        fprintf(stdout, "  <insert");
-    fprintf(stdout, " id=\"%s\"", key);
-    if (mrec->map_name)
-        fprintf(stdout, " map-name=\"%s\"", mrec->map_name);
-    if (mrec->enc_name)
-        fprintf(stdout, " enc-name=\"%s\"",  mrec->enc_name);
-    if (mrec->font_name)
-        fprintf(stdout, " font-name=\"%s\"", mrec->font_name);
-    if (mrec->charmap.sfd_name && mrec->charmap.subfont_id) {
-        fprintf(stdout, " charmap=\"sfd:%s,%s\"",
-                mrec->charmap.sfd_name, mrec->charmap.subfont_id);
-    }
-    if (opt->slant != 0.0)
-        fprintf(stdout, " font-slant=\"%g\"", opt->slant);
-    if (opt->extend != 1.0)
-        fprintf(stdout, " font-extend=\"%g\"", opt->extend);
-    if (opt->charcoll)
-        fprintf(stdout, " glyph-order=\"%s\"", opt->charcoll);
-    if (opt->tounicode)
-        fprintf(stdout, " tounicode=\"%s\"", opt->tounicode);
-    if (opt->index != 0)
-        fprintf(stdout, " ttc-index=\"%d\"", opt->index);
-    if (opt->flags & FONTMAP_OPT_NOEMBED)
-        fprintf(stdout, " embedding=\"no\"");
-    if (opt->mapc >= 0) {
-        fprintf(stdout, " charmap=\"pad:");
-        if (opt->mapc > 0xffff)
-            fprintf(stdout, "%02x %02x", (opt->mapc >> 16) & 0xff, (opt->mapc >> 8) & 0xff);
-        else
-            fprintf(stdout, "%02x", (opt->mapc >> 8) & 0xff);
-        fprintf(stdout, "\"");
-    }
-    if (opt->flags & FONTMAP_OPT_VERT)
-        fprintf(stdout, " writing-mode=\"vertical\"");
-    if (opt->style != FONTMAP_STYLE_NONE) {
-        fprintf(stdout, " font-style=\"");
-        switch (opt->style) {
-        case FONTMAP_STYLE_BOLD:
-            fprintf(stdout, "bold");
-            break;
-        case FONTMAP_STYLE_ITALIC:
-            fprintf(stdout, "italic");
-            break;
-        case FONTMAP_STYLE_BOLDITALIC:
-            fprintf(stdout, "bolditalic");
-            break;
-        }
-        fprintf(stdout, "\"");
-    }
-    if (mrec->map_name)
-        fprintf(stdout, " / -->\n");
-    else
-        fprintf(stdout, " />\n");
-}
-
-void
-dump_fontmaps (void)
-{
-    struct ht_iter iter;
-    fontmap_rec   *mrec;
-    char           key[128], *kp;
-    int            kl;
-
-    if (!fontmap)
-        return;
-
-    fprintf(stdout, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-    fprintf(stdout, "<!DOCTYPE fontmap SYSTEM \"fontmap.dtd\">\n");
-    fprintf(stdout, "<fontmap id=\"%s\">\n", "foo");
-    if (ht_set_iter(fontmap, &iter) == 0) {
-        do {
-            kp   = ht_iter_getkey(&iter, &kl);
-            mrec = ht_iter_getval(&iter);
-            if (kl > 127)
-                continue;
-            memcpy(key, kp, kl); key[kl] = 0;
-            dump_fontmap_rec(key, mrec);
-        } while (!ht_iter_next(&iter));
-    }
-    ht_clear_iter(&iter);
-    fprintf(stdout, "</fontmap>\n");
-
-    return;
-}
-
-void
-test_fontmap_help (void)
-{
-    fprintf(stdout, "usage: fontmap [options] [mapfile...]\n");
-    fprintf(stdout, "-l, --lookup string\n");
-    fprintf(stdout, "  Lookup fontmap entry for 'string' after loading mapfile(s).\n");
-}
-
-int
-test_fontmap_main (int argc, char *argv[])
-{
-    int    i;
-    char  *key = NULL;
-
-    for (;;) {
-        int  c, optidx = 0;
-        static struct option long_options[] = {
-            {"lookup", 1, 0, 'l'},
-            {"help",   0, 0, 'h'},
-            {0, 0, 0, 0}
-        };
-        c = getopt_long(argc, argv, "l:h", long_options, &optidx);
-        if (c == -1)
-            break;
-
-        switch (c) {
-        case  'l':
-            key = optarg;
-            break;
-        case  'h':
-            test_fontmap_help();
-            return  0;
-            break;
-        default:
-            test_fontmap_help();
-            return  -1;
-            break;
-        }
-    }
-
-    pdf_init_fontmaps();
-    for (i = optind; i < argc; i++)
-        pdf_load_fontmap_file(argv[i], FONTMAP_RMODE_REPLACE);
-
-    if (key == NULL)
-        dump_fontmaps();
-    else {
-        fontmap_rec *mrec;
-        mrec = pdf_lookup_fontmap_record(key);
-        if (mrec)
-            dump_fontmap_rec(key, mrec);
-        else {
-            dpx_warning("Fontmap entry \"%s\" not found.", key);
-        }
-    }
-    pdf_close_fontmaps();
-
-    return  0;
-}
-#endif /* DPXTEST */

tectonic/dpx-subfont.c

@@ -472,180 +472,3 @@ release_sfd_record (void)
     num_sfd_records = max_sfd_records = 0;
     num_sfd_files = max_sfd_files = 0;
 }
-
-
-#ifdef  DPXTEST
-/* SFD file dumper */
-#ifdef HAVE_ICONV
-#include <iconv.h>
-#else
-typedef int iconv_t;
-#endif
-#include <string.h>
-
-static void
-dump_table (const char *sfd_name, const char *sub_name, iconv_t cd)
-{
-    int  rec_id, i;
-
-    rec_id = sfd_load_record(sfd_name, sub_name);
-    if (rec_id < 0) {
-        dpx_warning("Could not load SFD mapping for \"%s\"", sub_name);
-        return;
-    }
-    fprintf(stdout, "  <subfont id=\"%s\">\n", sub_name);
-    for (i = 0; i < 256; i++) {
-        unsigned short c = lookup_sfd_record(rec_id, i);
-        char    *p, inbuf[2];
-        char    *q, outbuf[32];
-        size_t   r, inbufleft = 2, outbufleft = 32;
-
-        if (c == 0)
-            fprintf(stdout, "    <!-- %02x: undefined -->", i);
-        else {
-            fprintf(stdout, "    <a bi=\"%02x\" bo=\"%02x %02x\"", i, (c >> 8) & 0xff, c & 0xff);
-            if (cd != (iconv_t) -1) {
-                p = inbuf; q = outbuf;
-                inbuf[0] = (c >> 8) & 0xff;
-                inbuf[1] = c & 0xff;
-#ifdef HAVE_ICONV
-                r = iconv(cd, &p, &inbufleft, &q, &outbufleft);
-                if (r == -1) {
-                    if (verbose) {
-                        dpx_warning("Conversion to Unicode failed for subfont-id=\"%s\" code=\"0x%02x\"",
-                                    sub_name, i);
-                        dpx_warning(">> with: %s", strerror(errno));
-                    }
-                } else {
-                    outbuf[32-outbufleft] = 0;
-                    fprintf(stdout, " uc=\"%s\"", outbuf);
-                }
-#endif /* HAVE_ICONV */
-            }
-            fprintf(stdout, " />");
-        }
-        fprintf(stdout, "\n");
-    }
-    fprintf(stdout, "  </subfont>\n");
-    return;
-}
-
-#define subfontDefinition_DTD "\
-<!ELEMENT subfontDefinition (subfont+)>\n\
-<!ATTLIST subfontDefinition\n\
-  id CDATA #REQUIRED\n\
-  output-encoding CDATA #IMPLIED\n\
->\n\
-<!ELEMENT subfont (a*)>\n\
-<!ATTLIST subfont\n\
-  id CDATA #REQUIRED\n\
->\n\
-<!ELEMENT a EMPTY>\n\
-<!ATTLIST a\n\
-  bi NMTOKENS #REQUIRED\n\
-  bo NMTOKENS #REQUIRED\n\
-  uc CDATA #IMPLIED\n\
->\
-"
-
-void
-test_subfont_help (void)
-{
-    fprintf(stdout, "usage: subfont [options] SFD_name\n");
-    fprintf(stdout, "-e, --encoding string\n");
-    fprintf(stdout, "  Target (output) encoding of SFD mapping is 'string'.\n");
-    fprintf(stdout, "  It must be an encoding name recognized by iconv.\n");
-    fprintf(stdout, "  With this option write Unicode character in auxiliary attribute 'uc'.\n");
-    fprintf(stdout, "-s, --subfont-id string\n");
-    fprintf(stdout, "  Load and dump mapping table only for subfont 'string'.\n");
-}
-
-int
-test_subfont_main (int argc, char *argv[])
-{
-    char   *sfd_name = NULL, *sub_name = NULL;
-    char   *from = NULL;
-    int     i;
-    iconv_t cd = (iconv_t) -1;
-
-    for (;;) {
-        int  c, optidx = 0;
-        static struct option long_options[] = {
-            {"encoding",   1, 0, 'e'}, /* for to-Unicode conversion */
-            {"subfont-id", 1, 0, 's'},
-            {"help",       0, 0, 'h'},
-            {0, 0, 0, 0}
-        };
-        c = getopt_long(argc, argv, "e:s:h", long_options, &optidx);
-        if (c == -1)
-            break;
-
-        switch (c) {
-        case  'e':
-            from = optarg;
-            break;
-        case  's':
-            sub_name = optarg;
-            break;
-        case  'h':
-            test_subfont_help();
-            return  0;
-            break;
-        default:
-            test_subfont_help();
-            return  -1;
-            break;
-        }
-    }
-    if (optind < argc) {
-        sfd_name = argv[optind++];
-    }
-
-    if (sfd_name == NULL) {
-        dpx_warning("No SFD file name specified.");
-        test_subfont_help();
-        return  -1;
-    }
-    if (!from)
-        cd = (iconv_t) -1;
-    else {
-#ifdef HAVE_ICONV
-        cd = iconv_open("utf-8", from);
-        if (cd == (iconv_t) -1) {
-            dpx_warning("Can't open iconv conversion descriptor for %s --> utf-8", from);
-            return  -1;
-        }
-#else
-        dpx_warning("Your system doesn't have iconv() in libc!");
-#endif
-    }
-
-    fprintf(stdout, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-    fprintf(stdout, "<!DOCTYPE subfontDefinition [\n%s\n]>\n",
-            subfontDefinition_DTD);
-    fprintf(stdout, "<subfontDefinition id=\"%s\" output-encoding=\"%s\">\n",
-            sfd_name, from ? from : "unknown");
-    if (sub_name == NULL || !strcmp(sub_name, "all")) {
-        char **sub_id;
-        int    num_ids = 0;
-        sub_id = sfd_get_subfont_ids(sfd_name, &num_ids);
-        if (!sub_id)
-            dpx_warning("Could not open SFD file: %s", sfd_name);
-        else {
-            for (i = 0; i < num_ids; i++)
-                dump_table(sfd_name, sub_id[i], cd);
-        }
-    } else {
-        dump_table(sfd_name, sub_name, cd);
-    }
-    fprintf(stdout, "</subfontDefinition>\n");
-
-#ifdef HAVE_ICONV
-    if (cd != (iconv_t) -1)
-        iconv_close(cd);
-#endif
-
-    return  0;
-}
-
-#endif  /* DPXTEST */