X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=f206a3b95d7ec375f6a864c44a8aab7b43170e05;hb=d9b67cc332fa253ab0679b54873b2f17fc37e099;hp=53488cc9f73d73d275a30cc591b8ca0117ef0214;hpb=59a6d1a06432fc0ca88c3023c646182f389ec1b5;p=lilypond.git

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index 53488cc9f7..f206a3b95d 100644
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -44,24 +44,25 @@ class All_font_metrics : public Smob<All_font_metrics>
   int pango_dpi_;
 #endif
 
-  std::map<std::string, Index_to_charcode_map > filename_charcode_maps_map_;
+  map<string, Index_to_charcode_map > filename_charcode_maps_map_;
 
   All_font_metrics (All_font_metrics const &);
 public:
+  static const char * const type_p_name_; // = 0
   SCM mark_smob () const;
 
-  Index_to_charcode_map const *get_index_to_charcode_map (const std::string &filename,
+  Index_to_charcode_map const *get_index_to_charcode_map (const string &filename,
                                                           int face_index,
                                                           FT_Face face);
 
-  All_font_metrics (const std::string &search_path);
+  All_font_metrics (const string &search_path);
   ~All_font_metrics ();
 
   Pango_font *find_pango_font (PangoFontDescription const *description,
                                Real scale);
 
-  Font_metric *find_font (const std::string &name);
-  Open_type_font *find_otf (const std::string &name);
+  Font_metric *find_font (const string &name);
+  Open_type_font *find_otf (const string &name);
   SCM font_descriptions () const;
 };