]> git.tdb.fi Git - ttf2png.git/blobdiff - ttf2png.c
Support multiple disjoint code point ranges
[ttf2png.git] / ttf2png.c
index e8d794c56c6445f4e5780a80272f70ed3a44c321..2a087ff3ac02eff7acfe403821f6a6704e672f23 100644 (file)
--- a/ttf2png.c
+++ b/ttf2png.c
@@ -61,11 +61,24 @@ typedef struct sFont
        Image image;
 } Font;
 
+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,19 +88,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;
+       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;
@@ -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
@@ -305,6 +281,129 @@ void usage(void)
                "  -h  Print this message\n");
 }
 
+int convert_numeric_option(char opt, int min_value)
+{
+       int value;
+       char *ptr;
+
+       value = strtol(optarg, &ptr, 0);
+       if(value<min_value || *ptr)
+       {
+               printf("Invalid option argument in -%c %s\n", opt, optarg);
+               exit(1);
+       }
+
+       return value;
+}
+
+void convert_code_point_range(char opt, Range *range)
+{
+       int value;
+       char *ptr;
+
+       if(!strcmp(optarg, "all"))
+       {
+               range->first = 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; i<bytes; ++i)
+                       code = (code<<6)|(nptr[i]&0x3F);
+
+               if(endptr)
+                       *endptr = (char *)nptr+bytes;
+
+               return code;
+       }
+       else if(isdigit(nptr[0]))
+               return strtoul(nptr, endptr, 0);
+       else
+       {
+               if(endptr)
+                       *endptr = (char *)nptr+1;
+               return *nptr;
+       }
+}
+
+void convert_size(char opt, unsigned *width, unsigned *height)
+{
+       int value;
+       char *ptr;
+
+       if(!strcmp(optarg, "auto"))
+       {
+               *width = 0;
+               *height = 0;
+               return;
+       }
+       else if(!strcmp(optarg, "autorect"))
+       {
+               *width = 0;
+               *height = 1;
+               return;
+       }
+
+       value = strtol(optarg, &ptr, 0);
+       if(value>0)
+       {
+               *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,7 +456,52 @@ 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<n_ranges; ++i)
+               if(init_glyphs(font, face, &ranges[i], autohinter))
+                       return -1;
+
+       if(verbose>=1)
+               printf("Loaded %u glyphs\n", font->n_glyphs);
+
+       font->n_kerning = 0;
+       font->kerning = NULL;
+       for(i=0; i<font->n_glyphs; ++i) for(j=0; j<font->n_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;
                FT_Bitmap *bmp = &face->glyph->bitmap;
@@ -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)
+                                       utf8[j] = 0x80 | ((i>>((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,44 +581,10 @@ 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; i<font->n_glyphs; ++i) for(j=0; j<font->n_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;