diff options
28 files changed, 24 insertions, 44 deletions
@@ -177,7 +177,6 @@ CMAP_JAPAN_SRC := $(wildcard resources/cmaps/japan/*) CMAP_KOREA_SRC := $(wildcard resources/cmaps/korea/*) FONT_BASE14_SRC := $(wildcard resources/fonts/urw/*.cff) -FONT_DROID_SRC := resources/fonts/droid/DroidSans.ttf resources/fonts/droid/DroidSansMono.ttf FONT_CJK_SRC := resources/fonts/droid/DroidSansFallback.ttc FONT_CJK_FULL_SRC := resources/fonts/droid/DroidSansFallbackFull.ttc @@ -194,8 +193,6 @@ CMAP_GEN := $(addprefix $(GEN)/, gen_cmap_cns.h gen_cmap_gb.h gen_cmap_japan.h g $(GEN)/gen_font_base14.h : $(FONT_BASE14_SRC) $(QUIET_GEN) $(FONTDUMP) $@ $(FONT_BASE14_SRC) -$(GEN)/gen_font_droid.h : $(FONT_DROID_SRC) - $(QUIET_GEN) $(FONTDUMP) $@ $(FONT_DROID_SRC) $(GEN)/gen_font_cjk.h : $(FONT_CJK_SRC) $(QUIET_GEN) $(FONTDUMP) $@ $(FONT_CJK_SRC) $(GEN)/gen_font_cjk_full.h : $(FONT_CJK_FULL_SRC) diff --git a/resources/fonts/droid/DroidSans.ttf b/resources/fonts/droid/DroidSans.ttf Binary files differdeleted file mode 100644 index ad1efca8..00000000 --- a/resources/fonts/droid/DroidSans.ttf +++ /dev/null diff --git a/resources/fonts/droid/DroidSansMono.ttf b/resources/fonts/droid/DroidSansMono.ttf Binary files differdeleted file mode 100644 index a0070719..00000000 --- a/resources/fonts/droid/DroidSansMono.ttf +++ /dev/null diff --git a/resources/fonts/urw/NimbusMon-Bol.cff b/resources/fonts/urw/NimbusMon-Bol.cff Binary files differdeleted file mode 100644 index 7b9b6dfc..00000000 --- a/resources/fonts/urw/NimbusMon-Bol.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusMon-BolObl.cff b/resources/fonts/urw/NimbusMon-BolObl.cff Binary files differdeleted file mode 100644 index 350a8646..00000000 --- a/resources/fonts/urw/NimbusMon-BolObl.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusMon-Obl.cff b/resources/fonts/urw/NimbusMon-Obl.cff Binary files differdeleted file mode 100644 index c0a33da0..00000000 --- a/resources/fonts/urw/NimbusMon-Obl.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusMon-Reg.cff b/resources/fonts/urw/NimbusMon-Reg.cff Binary files differdeleted file mode 100644 index 2ce477ec..00000000 --- a/resources/fonts/urw/NimbusMon-Reg.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusMono-Bold.cff b/resources/fonts/urw/NimbusMono-Bold.cff Binary files differnew file mode 100644 index 00000000..f1ff9532 --- /dev/null +++ b/resources/fonts/urw/NimbusMono-Bold.cff diff --git a/resources/fonts/urw/NimbusMono-BoldOblique.cff b/resources/fonts/urw/NimbusMono-BoldOblique.cff Binary files differnew file mode 100644 index 00000000..db42140c --- /dev/null +++ b/resources/fonts/urw/NimbusMono-BoldOblique.cff diff --git a/resources/fonts/urw/NimbusMono-Oblique.cff b/resources/fonts/urw/NimbusMono-Oblique.cff Binary files differnew file mode 100644 index 00000000..101a91a2 --- /dev/null +++ b/resources/fonts/urw/NimbusMono-Oblique.cff diff --git a/resources/fonts/urw/NimbusMono-Regular.cff b/resources/fonts/urw/NimbusMono-Regular.cff Binary files differnew file mode 100644 index 00000000..606b4e4c --- /dev/null +++ b/resources/fonts/urw/NimbusMono-Regular.cff diff --git a/resources/fonts/urw/NimbusRom-Ita.cff b/resources/fonts/urw/NimbusRom-Ita.cff Binary files differdeleted file mode 100644 index 7d99ef20..00000000 --- a/resources/fonts/urw/NimbusRom-Ita.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusRom-Med.cff b/resources/fonts/urw/NimbusRom-Med.cff Binary files differdeleted file mode 100644 index d66d287c..00000000 --- a/resources/fonts/urw/NimbusRom-Med.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusRom-MedIta.cff b/resources/fonts/urw/NimbusRom-MedIta.cff Binary files differdeleted file mode 100644 index 1d1dedc6..00000000 --- a/resources/fonts/urw/NimbusRom-MedIta.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusRom-Reg.cff b/resources/fonts/urw/NimbusRom-Reg.cff Binary files differdeleted file mode 100644 index 54bb40b4..00000000 --- a/resources/fonts/urw/NimbusRom-Reg.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusRomNo9L-Med.cff b/resources/fonts/urw/NimbusRomNo9L-Med.cff Binary files differnew file mode 100644 index 00000000..cbcc4202 --- /dev/null +++ b/resources/fonts/urw/NimbusRomNo9L-Med.cff diff --git a/resources/fonts/urw/NimbusRomNo9L-MedIta.cff b/resources/fonts/urw/NimbusRomNo9L-MedIta.cff Binary files differnew file mode 100644 index 00000000..53381635 --- /dev/null +++ b/resources/fonts/urw/NimbusRomNo9L-MedIta.cff diff --git a/resources/fonts/urw/NimbusRomNo9L-Reg.cff b/resources/fonts/urw/NimbusRomNo9L-Reg.cff Binary files differnew file mode 100644 index 00000000..c9383466 --- /dev/null +++ b/resources/fonts/urw/NimbusRomNo9L-Reg.cff diff --git a/resources/fonts/urw/NimbusRomNo9L-RegIta.cff b/resources/fonts/urw/NimbusRomNo9L-RegIta.cff Binary files differnew file mode 100644 index 00000000..7eb19abf --- /dev/null +++ b/resources/fonts/urw/NimbusRomNo9L-RegIta.cff diff --git a/resources/fonts/urw/NimbusSan-Bol.cff b/resources/fonts/urw/NimbusSan-Bol.cff Binary files differdeleted file mode 100644 index 07f3b863..00000000 --- a/resources/fonts/urw/NimbusSan-Bol.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusSan-BolIta.cff b/resources/fonts/urw/NimbusSan-BolIta.cff Binary files differdeleted file mode 100644 index 0cf09564..00000000 --- a/resources/fonts/urw/NimbusSan-BolIta.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusSan-Ita.cff b/resources/fonts/urw/NimbusSan-Ita.cff Binary files differdeleted file mode 100644 index 91235729..00000000 --- a/resources/fonts/urw/NimbusSan-Ita.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusSan-Reg.cff b/resources/fonts/urw/NimbusSan-Reg.cff Binary files differdeleted file mode 100644 index fe400cab..00000000 --- a/resources/fonts/urw/NimbusSan-Reg.cff +++ /dev/null diff --git a/resources/fonts/urw/NimbusSanL-Bol.cff b/resources/fonts/urw/NimbusSanL-Bol.cff Binary files differnew file mode 100644 index 00000000..a6fa198b --- /dev/null +++ b/resources/fonts/urw/NimbusSanL-Bol.cff diff --git a/resources/fonts/urw/NimbusSanL-BolIta.cff b/resources/fonts/urw/NimbusSanL-BolIta.cff Binary files differnew file mode 100644 index 00000000..94495dee --- /dev/null +++ b/resources/fonts/urw/NimbusSanL-BolIta.cff diff --git a/resources/fonts/urw/NimbusSanL-Reg.cff b/resources/fonts/urw/NimbusSanL-Reg.cff Binary files differnew file mode 100644 index 00000000..f747c886 --- /dev/null +++ b/resources/fonts/urw/NimbusSanL-Reg.cff diff --git a/resources/fonts/urw/NimbusSanL-RegIta.cff b/resources/fonts/urw/NimbusSanL-RegIta.cff Binary files differnew file mode 100644 index 00000000..a434af57 --- /dev/null +++ b/resources/fonts/urw/NimbusSanL-RegIta.cff diff --git a/source/pdf/pdf-fontfile.c b/source/pdf/pdf-fontfile.c index f0787bc6..cf62108b 100644 --- a/source/pdf/pdf-fontfile.c +++ b/source/pdf/pdf-fontfile.c @@ -4,14 +4,11 @@ Which fonts are embedded is based on a few preprocessor definitions. The base 14 fonts are always embedded. - For font substitution we embed DroidSans which has good glyph coverage. For CJK font substitution we embed DroidSansFallback. Set NOCJK to skip all CJK support (this also omits embedding the CJK CMaps) Set NOCJKFONT to skip the embedded CJK font. Set NOCJKFULL to embed a smaller CJK font without CJK Extension A support. - - Set NODROIDFONT to use the base 14 fonts as substitute fonts. */ #ifdef NOCJK @@ -20,10 +17,6 @@ #include "gen_font_base14.h" -#ifndef NODROIDFONT -#include "gen_font_droid.h" -#endif - #ifndef NOCJKFONT #ifndef NOCJKFULL #include "gen_font_cjk_full.h" @@ -36,52 +29,52 @@ unsigned char * pdf_lookup_builtin_font(const char *name, unsigned int *len) { if (!strcmp("Courier", name)) { - *len = sizeof pdf_font_NimbusMon_Reg; - return (unsigned char*) pdf_font_NimbusMon_Reg; + *len = sizeof pdf_font_NimbusMono_Regular; + return (unsigned char*) pdf_font_NimbusMono_Regular; } if (!strcmp("Courier-Bold", name)) { - *len = sizeof pdf_font_NimbusMon_Bol; - return (unsigned char*) pdf_font_NimbusMon_Bol; + *len = sizeof pdf_font_NimbusMono_Bold; + return (unsigned char*) pdf_font_NimbusMono_Bold; } if (!strcmp("Courier-Oblique", name)) { - *len = sizeof pdf_font_NimbusMon_Obl; - return (unsigned char*) pdf_font_NimbusMon_Obl; + *len = sizeof pdf_font_NimbusMono_Oblique; + return (unsigned char*) pdf_font_NimbusMono_Oblique; } if (!strcmp("Courier-BoldOblique", name)) { - *len = sizeof pdf_font_NimbusMon_BolObl; - return (unsigned char*) pdf_font_NimbusMon_BolObl; + *len = sizeof pdf_font_NimbusMono_BoldOblique; + return (unsigned char*) pdf_font_NimbusMono_BoldOblique; } if (!strcmp("Helvetica", name)) { - *len = sizeof pdf_font_NimbusSan_Reg; - return (unsigned char*) pdf_font_NimbusSan_Reg; + *len = sizeof pdf_font_NimbusSanL_Reg; + return (unsigned char*) pdf_font_NimbusSanL_Reg; } if (!strcmp("Helvetica-Bold", name)) { - *len = sizeof pdf_font_NimbusSan_Bol; - return (unsigned char*) pdf_font_NimbusSan_Bol; + *len = sizeof pdf_font_NimbusSanL_Bol; + return (unsigned char*) pdf_font_NimbusSanL_Bol; } if (!strcmp("Helvetica-Oblique", name)) { - *len = sizeof pdf_font_NimbusSan_Ita; - return (unsigned char*) pdf_font_NimbusSan_Ita; + *len = sizeof pdf_font_NimbusSanL_RegIta; + return (unsigned char*) pdf_font_NimbusSanL_RegIta; } if (!strcmp("Helvetica-BoldOblique", name)) { - *len = sizeof pdf_font_NimbusSan_BolIta; - return (unsigned char*) pdf_font_NimbusSan_BolIta; + *len = sizeof pdf_font_NimbusSanL_BolIta; + return (unsigned char*) pdf_font_NimbusSanL_BolIta; } if (!strcmp("Times-Roman", name)) { - *len = sizeof pdf_font_NimbusRom_Reg; - return (unsigned char*) pdf_font_NimbusRom_Reg; + *len = sizeof pdf_font_NimbusRomNo9L_Reg; + return (unsigned char*) pdf_font_NimbusRomNo9L_Reg; } if (!strcmp("Times-Bold", name)) { - *len = sizeof pdf_font_NimbusRom_Med; - return (unsigned char*) pdf_font_NimbusRom_Med; + *len = sizeof pdf_font_NimbusRomNo9L_Med; + return (unsigned char*) pdf_font_NimbusRomNo9L_Med; } if (!strcmp("Times-Italic", name)) { - *len = sizeof pdf_font_NimbusRom_Ita; - return (unsigned char*) pdf_font_NimbusRom_Ita; + *len = sizeof pdf_font_NimbusRomNo9L_RegIta; + return (unsigned char*) pdf_font_NimbusRomNo9L_RegIta; } if (!strcmp("Times-BoldItalic", name)) { - *len = sizeof pdf_font_NimbusRom_MedIta; - return (unsigned char*) pdf_font_NimbusRom_MedIta; + *len = sizeof pdf_font_NimbusRomNo9L_MedIta; + return (unsigned char*) pdf_font_NimbusRomNo9L_MedIta; } if (!strcmp("Symbol", name)) { *len = sizeof pdf_font_StandardSymL; @@ -98,7 +91,6 @@ pdf_lookup_builtin_font(const char *name, unsigned int *len) unsigned char * pdf_lookup_substitute_font(int mono, int serif, int bold, int italic, unsigned int *len) { -#ifdef NODROIDFONT if (mono) { if (bold) { if (italic) return pdf_lookup_builtin_font("Courier-BoldOblique", len); @@ -124,15 +116,6 @@ pdf_lookup_substitute_font(int mono, int serif, int bold, int italic, unsigned i else return pdf_lookup_builtin_font("Helvetica", len); } } -#else - if (mono) { - *len = sizeof pdf_font_DroidSansMono; - return (unsigned char*) pdf_font_DroidSansMono; - } else { - *len = sizeof pdf_font_DroidSans; - return (unsigned char*) pdf_font_DroidSans; - } -#endif } unsigned char * |