X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=ttf2png.c;h=6224fc3419436c10c94bd2e1ec0198774fdc4270;hb=329e747da6ee89d4ed2de15ceacf68b932e56e80;hp=7cd94551202ff74897f2687a0d8dc597adc1b5ae;hpb=f80db26b7c5db7c120f5b38defa15fed232f6e96;p=ttf2png.git

diff --git a/ttf2png.c b/ttf2png.c
index 7cd9455..6224fc3 100644
--- a/ttf2png.c
+++ b/ttf2png.c
@@ -61,16 +61,25 @@ 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, unsigned *, unsigned *);
+void convert_code_point_range(char, Range *);
 unsigned str_to_code_point(const char *, char **);
 void convert_size(char, unsigned *, unsigned *);
+void sort_and_compact_ranges(Range *, unsigned *);
+int range_cmp(const void *, const void *);
 unsigned round_to_pot(unsigned);
 void *alloc_image_data(size_t, size_t);
-int init_font(Font *, FT_Face, unsigned, unsigned, bool);
+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 *);
@@ -81,8 +90,8 @@ char verbose = 0;
 int main(int argc, char **argv)
 {
 	char *fn;
-	unsigned begin = 0;
-	unsigned end = 255;
+	Range *ranges = NULL;
+	unsigned n_ranges = 0;
 	unsigned size = 10;
 	unsigned cpl = 0;
 	unsigned cellw = 0;
@@ -117,7 +126,8 @@ int main(int argc, char **argv)
 		switch(i)
 		{
 		case 'r':
-			convert_code_point_range('r', &begin, &end);
+			ranges = (Range *)realloc(ranges, (++n_ranges)*sizeof(Range));
+			convert_code_point_range('r', &ranges[n_ranges-1]);
 			break;
 		case 's':
 			size = convert_numeric_option('s', 1);
@@ -206,7 +216,8 @@ int main(int argc, char **argv)
 	}
 
 	font.size = size;
-	err = init_font(&font, face, begin, end, autohinter);
+	sort_and_compact_ranges(ranges, &n_ranges);
+	err = init_font(&font, face, ranges, n_ranges, autohinter);
 	if(err)
 		return 1;
 
@@ -288,26 +299,26 @@ int convert_numeric_option(char opt, int min_value)
 	return value;
 }
 
-void convert_code_point_range(char opt, unsigned *begin, unsigned *end)
+void convert_code_point_range(char opt, Range *range)
 {
 	int value;
 	char *ptr;
 
 	if(!strcmp(optarg, "all"))
 	{
-		*begin = 0;
-		*end = 0x10FFFF;
+		range->first = 0;
+		range->last = 0x10FFFF;
 		return;
 	}
 
 	value = str_to_code_point(optarg, &ptr);
 	if(value>0 && *ptr==',')
 	{
-		*begin = value;
+		range->first = value;
 		value = str_to_code_point(ptr+1, &ptr);
 		if(value>0 && !*ptr)
 		{
-			*end = value;
+			range->last = value;
 			return;
 		}
 	}
@@ -396,6 +407,44 @@ void convert_size(char opt, unsigned *width, unsigned *height)
 	exit(1);
 }
 
+void sort_and_compact_ranges(Range *ranges, unsigned *n_ranges)
+{
+	unsigned i, j;
+
+	if(!*n_ranges)
+		return;
+
+	qsort(ranges, *n_ranges, sizeof(Range), &range_cmp);
+	for(i=0, j=1; j<*n_ranges; ++j)
+	{
+		if(ranges[i].last+1>=ranges[j].first)
+		{
+			if(ranges[j].last>ranges[i].last)
+				ranges[i].last = ranges[j].last;
+		}
+		else
+		{
+			++i;
+			if(i!=j)
+				ranges[i] = ranges[j];
+		}
+	}
+
+	*n_ranges = i+1;
+}
+
+int range_cmp(const void *p1, const void *p2)
+{
+	const Range *r1 = (const Range *)p1;
+	const Range *r2 = (const Range *)p2;
+	if(r1->first!=r2->first)
+		return (r1->first<r2->first ? -1 : 1);
+	else if(r1->last!=r2->last)
+		return (r1->last<r2->last ? -1 : 1);
+	else
+		return 0;
+}
+
 unsigned round_to_pot(unsigned n)
 {
 	n -= 1;
@@ -432,7 +481,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, bool autohinter)
+int init_font(Font *font, FT_Face face, const Range *ranges, unsigned n_ranges, bool autohinter)
 {
 	unsigned i, j;
 	unsigned size = 0;
@@ -448,7 +497,52 @@ int init_font(Font *font, FT_Face face, unsigned first, unsigned last, bool auto
 
 	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;
@@ -466,7 +560,25 @@ int init_font(Font *font, FT_Face face, unsigned first, unsigned last, bool auto
 		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)
 		{
@@ -510,40 +622,6 @@ int init_font(Font *font, FT_Face face, unsigned first, unsigned last, bool auto
 		}
 	}
 
-	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;
 }