Merge branch 'microtonal'

[lilypond.git] / lily / pango-font.cc

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 322b50c7774c9cb637ab97e6413fa37f4d23dc0e..3d58e0dd0ed69cbbd4a701b425d6c94e3d27549e 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -10,16 +10,19 @@
 #include <pango/pangoft2.h>
 #include <freetype/ftxf86.h>
 
+#include <map>
+
 /* Ugh.  */
-#include "pango-font.hh"
 
+#include "pango-font.hh"
 #include "dimensions.hh"
 #include "file-name.hh"
 #include "international.hh"
-#include "lookup.hh"
+#include "lookup.hh"           // debugging
 #include "main.hh"
 #include "string-convert.hh"
 #include "warn.hh"
+#include "all-font-metrics.hh"
 
 #if HAVE_PANGO_FT2
 #include "stencil.hh"
@@ -77,22 +80,6 @@ Pango_font::derived_mark () const
 }
 
 
-map<string, Index_to_charcode_map > filename_charcode_maps_map;
-Index_to_charcode_map const *get_index_to_charcode_map (string postscript_name, FT_Face face);
-
-
-Index_to_charcode_map const *
-get_index_to_charcode_map (string filename, FT_Face face)
-{
-  if (filename_charcode_maps_map.find (filename) == filename_charcode_maps_map.end ())
-    filename_charcode_maps_map[filename] = make_index_to_charcode_map (face);
-
-  if (filename_charcode_maps_map.find (filename) == filename_charcode_maps_map.end ())
-    return 0;
-  
-  return &filename_charcode_maps_map[filename];
-}
-
 void
 get_glyph_index_name (char *s, FT_ULong code)
 {
@@ -160,9 +147,9 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str,
   Index_to_charcode_map const *cmap = 0;
   bool has_glyph_names = ftface->face_flags & FT_FACE_FLAG_GLYPH_NAMES;
   if  (! has_glyph_names)
-    cmap = get_index_to_charcode_map (file_name, ftface);
+    cmap = all_fonts_global->get_index_to_charcode_map (file_name, ftface);
 
-  bool is_ttf = string (FT_Get_X11_Font_Format (ftface)) == "TrueType6";
+  bool is_ttf = string (FT_Get_X11_Font_Format (ftface)) == "TrueType";
   bool cid_keyed = false;
   for (int i = 0; i < pgs->num_glyphs; i++)
     {
@@ -178,12 +165,10 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str,
          if (errorcode)
            programming_error ("FT_Get_Glyph_Name returns error");
        }
-      
+
       SCM char_id = SCM_EOL;
       if (glyph_name[0] == '\0'
          && cmap
-
-         /* Ugh should ask FreeType about font type. */
          && is_ttf
          && cmap->find (pg) != cmap->end ())
        {
@@ -200,6 +185,10 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str,
          continue;
        }
 
+      
+      if (glyph_name == string (".notdef") && is_ttf)
+       glyph_name[0] = '\0';
+         
       if (glyph_name[0] == '\0' && is_ttf)
        {
          // access by glyph index directly.