X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=ttf2png.c;h=58b901666a282e4e1aee2805f1d53741a5a10568;hb=7e78e3535d807df01c113e4a870082d79d9ecf49;hp=96c325454609bd3d9cf4dfd7556f38b17773e1dc;hpb=5ccf6cfbee39edce04c091a1863574adfcdfe968;p=ttf2png.git diff --git a/ttf2png.c b/ttf2png.c index 96c3254..58b9016 100644 --- a/ttf2png.c +++ b/ttf2png.c @@ -61,11 +61,17 @@ typedef struct sFont Image image; } Font; -void usage(); +typedef int bool; + +void usage(void); +int convert_numeric_option(char, int); +void convert_code_point_range(char, unsigned *, unsigned *); +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, unsigned, unsigned, 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,19 +81,19 @@ 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; + unsigned begin = 0; + unsigned end = 255; + 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; @@ -108,63 +114,19 @@ 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); - } - } + convert_code_point_range('r', &begin, &end); 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 +157,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; } } @@ -248,6 +210,12 @@ int main(int argc, char **argv) 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 +247,155 @@ int main(int argc, char **argv) return 0; } -void usage() +void usage(void) { printf("ttf2png 1.1 - True Type Font to PNG converter\n" - "Copyright (c) 2004-2008 Mikko Rasa, Mikkosoft Productions\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(value0 && *ptr==',') + { + *begin = value; + value = str_to_code_point(ptr+1, &ptr); + if(value>0 && !*ptr) + { + *end = 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 +432,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, unsigned first, unsigned last, bool autohinter) { unsigned i, j; unsigned size = 0; @@ -375,7 +466,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) { @@ -456,7 +565,7 @@ int init_font(Font *font, FT_Face face, unsigned first, unsigned last, int autoh 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;