* lily/ttf.cc (print_trailer): if all else fails: use

[lilypond.git] / lily / ttf.cc

diff --git a/lily/ttf.cc b/lily/ttf.cc
index 9f5fbfb8a29a408fe75d8c380a839900c5854e62..4f2d6c8748f71db98ea33fb6ed1a7a0732c0aa8c 100644 (file)
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -26,11 +26,18 @@ make_index_to_charcode_map (FT_Face face)
   FT_UInt gindex;
 
   FT_CharMap current_cmap = face->charmap;
-  FT_Select_Charmap(face, FT_ENCODING_UNICODE);
+  //  FT_Select_Charmap(face, FT_ENCODING_UNICODE);
+  FT_Select_Charmap(face, FT_ENCODING_NONE);  
+
+  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;
 }
@@ -174,12 +181,21 @@ print_trailer (void *out,
          get_unicode_name (glyph_name, ucode);
        }
 
+      if (!glyph_name[0])
+       {
+         get_glyph_index_name (glyph_name, i);
+       }
+      
       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");
     }