X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=ttf2png.c;h=2a087ff3ac02eff7acfe403821f6a6704e672f23;hb=633be0c0c9ae91ab068ee84d4eb5f32328cf6280;hp=733453d3c76147896e0acc2b49b437045a2135ff;hpb=c89b104eff8c264817472585b70e6f57ca74eebd;p=ttf2png.git diff --git a/ttf2png.c b/ttf2png.c index 733453d..2a087ff 100644 --- a/ttf2png.c +++ b/ttf2png.c @@ -28,18 +28,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA typedef struct sImage { unsigned w, h; - char *data; + char *data; } Image; typedef struct sGlyph { unsigned index; unsigned code; - Image image; + Image image; unsigned x, y; - int offset_x; - int offset_y; - int advance; + int offset_x; + int offset_y; + int advance; } Glyph; typedef struct sKerning @@ -52,20 +52,33 @@ typedef struct sKerning typedef struct sFont { unsigned size; - int ascent; - int descent; + int ascent; + int descent; unsigned n_glyphs; - Glyph *glyphs; + Glyph *glyphs; unsigned n_kerning; - Kerning *kerning; - Image image; + Kerning *kerning; + Image image; } Font; -void usage(); +typedef struct sRange +{ + unsigned first; + unsigned last; +} Range; + +typedef int bool; + +void usage(void); +int convert_numeric_option(char, int); +void convert_code_point_range(char, Range *); +unsigned str_to_code_point(const char *, char **); +void convert_size(char, unsigned *, unsigned *); unsigned round_to_pot(unsigned); void *alloc_image_data(size_t, size_t); -int init_font(Font *, FT_Face, unsigned, unsigned, int); -int render_grid(Font *, unsigned, unsigned, unsigned, int); +int init_font(Font *, FT_Face, const Range *, unsigned, bool); +int init_glyphs(Font *, FT_Face, const Range *, bool); +int render_grid(Font *, unsigned, unsigned, unsigned, bool); int render_packed(Font *, unsigned, unsigned); int save_defs(const char *, const Font *); int save_png(const char *, const Image *, char); @@ -75,25 +88,25 @@ char verbose = 0; int main(int argc, char **argv) { char *fn; - int begin = 0; - int end = 255; - int size = 10; - int cpl = 0; - int cellw = 0; - int cellh = 0; - char autohinter = 0; - char seq = 0; - char alpha = 0; - char invert = 0; - char pack = 0; - int margin = 0; - int padding = 1; + Range *ranges = NULL; + unsigned n_ranges = 0; + unsigned size = 10; + unsigned cpl = 0; + unsigned cellw = 0; + unsigned cellh = 0; + bool autohinter = 0; + bool seq = 0; + bool alpha = 0; + bool invert = 0; + bool pack = 0; + unsigned margin = 0; + unsigned padding = 1; FT_Library freetype; - FT_Face face; + FT_Face face; - int err; - int i; + int err; + int i; char *out_fn = "font.png"; char *def_fn = NULL; @@ -108,63 +121,20 @@ int main(int argc, char **argv) while((i = getopt(argc, argv, "r:s:l:c:o:atvh?ed:pim:n:")) != -1) { - char *ptr; - int temp; switch(i) { case 'r': - if(!strcmp(optarg, "all")) - { - begin = 0; - end = 0x110000; - } - else - { - if(!isdigit(optarg[0])) - temp = -1; - else - { - temp = strtol(optarg, &ptr, 0); - if(ptr[0]!=',' || !isdigit(ptr[1])) - temp = -1; - } - if(temp<0) - { - printf("Not a valid range: %s\n", optarg); - exit(1); - } - else - { - begin = temp; - end = strtol(ptr+1, NULL, 0); - } - } + ranges = (Range *)realloc(ranges, (++n_ranges)*sizeof(Range)); + convert_code_point_range('r', &ranges[n_ranges-1]); break; case 's': - size = strtol(optarg, NULL, 0); + size = convert_numeric_option('s', 1); break; case 'l': - cpl = strtol(optarg, NULL, 0); + cpl = convert_numeric_option('l', 1); break; case 'c': - if(!strcmp(optarg, "auto")) - { - cellw = 0; - cellh = 0; - } - else if(!strcmp(optarg, "autorect")) - { - cellw = 0; - cellh = 1; - } - else - { - cellw = strtol(optarg, &ptr, 0); - if(ptr[0]=='x' && isdigit(ptr[1])) - cellh = strtol(ptr+1, NULL, 0); - else - cellh = cellw; - } + convert_size('c', &cellw, &cellh); break; case 'o': out_fn = optarg; @@ -195,10 +165,10 @@ int main(int argc, char **argv) invert = 1; break; case 'm': - margin = strtol(optarg, NULL, 0); + margin = convert_numeric_option('m', 0); break; case 'n': - padding = strtol(optarg, NULL, 0); + padding = convert_numeric_option('n', 0); break; } } @@ -244,10 +214,16 @@ int main(int argc, char **argv) } font.size = size; - err = init_font(&font, face, begin, end, autohinter); + err = init_font(&font, face, ranges, n_ranges, autohinter); if(err) return 1; + if(!font.n_glyphs) + { + fprintf(stderr, "No glyphs found in the requested range\n"); + return 1; + } + if(pack) err = render_packed(&font, margin, padding); else @@ -279,32 +255,155 @@ int main(int argc, char **argv) return 0; } -void usage() +void usage(void) { - printf("ttf2png 1.0 - True Type Font to PNG converter\n" - "Copyright (c) 2004-2008 Mikko Rasa, Mikkosoft Productions\n" + printf("ttf2png 1.1 - True Type Font to PNG converter\n" + "Copyright (c) 2004-2018 Mikko Rasa, Mikkosoft Productions\n" "Distributed under the GNU General Public License\n\n"); printf("Usage: ttf2png [options] \n\n"); printf("Accepted options (default values in [brackets])\n" - " -r Range of characters to convert [0,255]\n" + " -r Range of code points to convert [0,255]\n" " -s Font size to use, in pixels [10]\n" - " -l Number of characters to put in one line [auto]\n" - " -c Character cell size, in pixels [auto]\n" + " -l Number of glyphs to put in one line [auto]\n" + " -c Glyph cell size, in pixels (grid mode only) [auto]\n" " -o Output file name (or - for stdout) [font.png]\n"); printf(" -a Force autohinter\n" " -t Render glyphs to alpha channel\n" " -i Invert colors of the glyphs\n" " -v Increase the level of verbosity\n" - " -e Use cells in sequence, without gaps\n" + " -e Use cells in sequence, without gaps (grid mode only)\n" " -p Pack the glyphs tightly instead of in a grid\n" - " -m Margin around image edges in packed mode [0]\n" - " -n Padding between packed glyphs [1]\n" + " -m Margin around image edges (packed mode only) [0]\n" + " -n Padding between glyphs (packed mode only) [1]\n" " -d File name for writing glyph definitions\n" " -h Print this message\n"); } +int convert_numeric_option(char opt, int min_value) +{ + int value; + char *ptr; + + value = strtol(optarg, &ptr, 0); + if(valuefirst = 0; + range->last = 0x10FFFF; + return; + } + + value = str_to_code_point(optarg, &ptr); + if(value>0 && *ptr==',') + { + range->first = value; + value = str_to_code_point(ptr+1, &ptr); + if(value>0 && !*ptr) + { + range->last = value; + return; + } + } + + printf("Invalid option argument in -%c %s\n", opt, optarg); + exit(1); +} + +unsigned str_to_code_point(const char *nptr, char **endptr) +{ + if(nptr[0]=='U' && nptr[1]=='+') + return strtoul(nptr+2, endptr, 16); + else if(nptr[0]&0x80) + { + unsigned bytes; + unsigned code; + unsigned i; + + if(endptr) + *endptr = (char *)nptr; + + for(bytes=1; (bytes<4 && (nptr[0]&(0x80>>bytes))); ++bytes) + if((nptr[bytes]&0xC0)!=0x80) + return 0; + if(bytes<2) + return 0; + + code = nptr[0]&(0x3F>>bytes); + for(i=1; i0) + { + *width = value; + if(*ptr=='x') + { + value = strtol(ptr+1, &ptr, 0); + if(value>0 && !*ptr) + { + *height = value; + return; + } + } + else if(!*ptr) + { + *height = *width; + return; + } + } + + printf("Invalid option argument in -%c %s\n", opt, optarg); + exit(1); +} + unsigned round_to_pot(unsigned n) { n -= 1; @@ -341,7 +440,7 @@ void *alloc_image_data(size_t a, size_t b) return ptr; } -int init_font(Font *font, FT_Face face, unsigned first, unsigned last, int autohinter) +int init_font(Font *font, FT_Face face, const Range *ranges, unsigned n_ranges, bool autohinter) { unsigned i, j; unsigned size = 0; @@ -357,13 +456,58 @@ int init_font(Font *font, FT_Face face, unsigned first, unsigned last, int autoh font->n_glyphs = 0; font->glyphs = NULL; - for(i=first; i<=last; ++i) + for(i=0; i=1) + printf("Loaded %u glyphs\n", font->n_glyphs); + + font->n_kerning = 0; + font->kerning = NULL; + for(i=0; in_glyphs; ++i) for(j=0; jn_glyphs; ++j) + if(j!=i) + { + FT_Vector kerning; + FT_Get_Kerning(face, font->glyphs[i].index, font->glyphs[j].index, FT_KERNING_DEFAULT, &kerning); + + /* FreeType documentation says that vertical kerning is practically + never used, so we ignore it. */ + if(kerning.x) + { + Kerning *kern; + + if(font->n_kerning>=size) + { + size += 16; + font->kerning = (Kerning *)realloc(font->kerning, size*sizeof(Kerning)); + } + + kern = &font->kerning[font->n_kerning++]; + kern->left_code = font->glyphs[i].code; + kern->right_code = font->glyphs[j].code; + kern->distance = kerning.x/64; + } + } + + if(verbose>=1) + printf("Loaded %d kerning pairs\n", font->n_kerning); + + return 0; +} + +int init_glyphs(Font *font, FT_Face face, const Range *range, bool autohinter) +{ + unsigned i, j; + unsigned size = font->n_glyphs; + + for(i=range->first; i<=range->last; ++i) { - unsigned n; + unsigned n; FT_Bitmap *bmp = &face->glyph->bitmap; - unsigned x, y; - int flags = 0; - Glyph *glyph; + unsigned x, y; + int flags = 0; + Glyph *glyph; n = FT_Get_Char_Index(face, i); if(!n) @@ -375,7 +519,25 @@ int init_font(Font *font, FT_Face face, unsigned first, unsigned last, int autoh FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL); if(verbose>=2) - printf(" Char %u: glyph %u, size %dx%d\n", i, n, bmp->width, bmp->rows); + { + printf(" Code point U+%04X", i); + if(i>=0x20 && i<0x7F) + printf(" (%c)", i); + else if(i>=0xA0 && i<=0x10FFFF) + { + char utf8[5]; + unsigned bytes; + + for(bytes=2; i>>(1+bytes*5); ++bytes) ; + for(j=0; j>((bytes-j-1)*6))&0x3F); + utf8[0] |= 0xF0<<(4-bytes); + utf8[j] = 0; + + printf(" (%s)", utf8); + } + printf(": glyph %u, size %dx%d\n", n, bmp->width, bmp->rows); + } if(bmp->pixel_mode!=FT_PIXEL_MODE_GRAY) { @@ -419,47 +581,13 @@ int init_font(Font *font, FT_Face face, unsigned first, unsigned last, int autoh } } - if(verbose>=1) - printf("Loaded %u glyphs\n", font->n_glyphs); - - size = 0; - font->n_kerning = 0; - font->kerning = NULL; - for(i=0; in_glyphs; ++i) for(j=0; jn_glyphs; ++j) - if(j!=i) - { - FT_Vector kerning; - FT_Get_Kerning(face, font->glyphs[i].index, font->glyphs[j].index, FT_KERNING_DEFAULT, &kerning); - - /* FreeType documentation says that vertical kerning is practically - never used, so we ignore it. */ - if(kerning.x) - { - Kerning *kern; - - if(font->n_kerning>=size) - { - size += 16; - font->kerning = (Kerning *)realloc(font->kerning, size*sizeof(Kerning)); - } - - kern = &font->kerning[font->n_kerning++]; - kern->left_code = font->glyphs[i].code; - kern->right_code = font->glyphs[j].code; - kern->distance = kerning.x/64; - } - } - - if(verbose>=1) - printf("Loaded %d kerning pairs\n", font->n_kerning); - return 0; } -int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int seq) +int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, bool seq) { unsigned i; - int top = 0, bot = 0; + int top = 0, bot = 0; unsigned first, last; unsigned maxw = 0, maxh = 0; @@ -533,7 +661,7 @@ int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int se for(i=0; in_glyphs; ++i) { - Glyph *glyph; + Glyph *glyph; unsigned ci, cx, cy; unsigned x, y; @@ -568,8 +696,8 @@ int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int se int render_packed(Font *font, unsigned margin, unsigned padding) { unsigned i; - size_t area = 0; - char *used_glyphs; + size_t area = 0; + char *used_glyphs; unsigned *used_pixels; unsigned cx = margin, cy; unsigned used_h = 0; @@ -615,12 +743,12 @@ int render_packed(Font *font, unsigned margin, unsigned padding) { unsigned w; unsigned x, y; - Glyph *glyph = NULL; + Glyph *glyph = NULL; unsigned best_score = 0; unsigned target_h = 0; - /* Find the leftmost free pixel on this row. Also record the lowest extent of glyphs - to the left of the free position. */ + /* Find the leftmost free pixel on this row. Also record the lowest + extent of glyphs to the left of the free position. */ for(; (cx+marginimage.w && used_pixels[cx]>cy); ++cx) if(used_pixels[cx]-cy-padding>target_h) target_h = used_pixels[cx]-cy-padding; @@ -702,7 +830,7 @@ int render_packed(Font *font, unsigned margin, unsigned padding) int save_defs(const char *fn, const Font *font) { - FILE *out; + FILE *out; unsigned i; out = fopen(fn, "w"); @@ -737,13 +865,13 @@ int save_defs(const char *fn, const Font *font) int save_png(const char *fn, const Image *image, char alpha) { - FILE *out; + FILE *out; png_struct *pngs; - png_info *pngi; - png_byte **rows; - unsigned i; - png_byte *data2 = 0; - int color; + png_info *pngi; + png_byte **rows; + unsigned i; + png_byte *data2 = 0; + int color; if(!strcmp(fn, "-")) out = stdout;