#include <freetype/tttables.h>
-#include "lily-proto.hh"
#include "memory-stream.hh"
#include "warn.hh"
#include "lily-guile.hh"
Index_to_charcode_map m;
FT_ULong charcode;
FT_UInt gindex;
-
+
+ FT_CharMap current_cmap = face->charmap;
FT_Select_Charmap(face, FT_ENCODING_UNICODE);
+
+ int j = 0;
for (charcode = FT_Get_First_Char (face, &gindex); gindex != 0;
charcode = FT_Get_Next_Char (face, charcode, &gindex))
- m[gindex] = charcode;
+ {
+ m[gindex] = charcode;
+ j++;
+ }
+ FT_Set_Charmap (face, current_cmap);
+
+
return m;
}
= (TT_Postscript *) FT_Get_Sfnt_Table (face, ft_sfnt_post);
if (pt->maxMemType42)
- lily_cookie_fprintf (out, "%%%%VMUsage: %ld %ld\n", 0, 0);
+ lily_cookie_fprintf (out, "%%%%VMUsage: %d %d\n", 0, 0);
lily_cookie_fprintf (out, "%d dict begin\n", 11);
lily_cookie_fprintf (out, "/FontName /%s def\n",
lily_cookie_fprintf (out, "/FontType 42 def\n");
lily_cookie_fprintf (out, "/FontInfo 8 dict dup begin\n");
lily_cookie_fprintf (out, "/version (%d.%d) def\n",
- (ht->Font_Revision >> 16),
- (ht->Font_Revision &((1 << 16) -1)));
+ int (ht->Font_Revision >> 16),
+ int (ht->Font_Revision &((1 << 16) -1)));
#if 0
if (strings[0])
Index_to_charcode_map ic_map (make_index_to_charcode_map (face));
+ int output_count = 0;
for (int i = 0; i < mp->numGlyphs; i++)
{
glyph_name[0] = 0;
FT_Error error = FT_Get_Glyph_Name (face, i, glyph_name,
GLYPH_NAME_LEN);
if (error)
- programming_error ("print_trailer(): FT_Get_Glyph_Name() returned error");
- else
- glyph_name[0] = 0;
+ {
+ programming_error ("print_trailer(): FT_Get_Glyph_Name() returned error");
+ glyph_name[0] = 0;
+ }
}
+ if (!glyph_name[0] && ic_map.find (i) != ic_map.end ())
+ {
+ FT_ULong ucode = ic_map[i];
+ get_unicode_name (glyph_name, ucode);
+ }
+
+ if (glyph_name == string (".notdef"))
+ glyph_name[0] = '\0';
+
+
if (!glyph_name[0])
{
- get_unicode_name (glyph_name, ic_map[i]);
+ get_glyph_index_name (glyph_name, i);
}
- lily_cookie_fprintf (out, "/%s %d def ", glyph_name, i);
-
- if (! (i % 5))
+ if (glyph_name[0])
+ {
+ lily_cookie_fprintf (out, "/%s %d def ", glyph_name, i);
+ output_count ++;
+ }
+ else
+ {
+ programming_error (to_string ("no name for glyph %d", i));
+ }
+
+ if (! (output_count % 5))
lily_cookie_fprintf (out, "\n");
}