uniformize grob interface naming with C++.

[lilypond.git] / lily / include / all-font-metrics.hh

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index 414233124e6d43bce876fb36c5307da5294654cb..c8c0de2f0a78f748bb61d70b9423c8666e1541c1 100644 (file)
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -13,7 +13,7 @@
 #include "font-metric.hh"
 #include "config.hh"
 
-#if HAVE_PANGO16
+#if HAVE_PANGO_FT2
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
 #endif
@@ -23,7 +23,6 @@
 */
 class All_font_metrics
 {
-  Scheme_hash_table *tfm_dict_;
   Scheme_hash_table *otf_dict_;
   File_path search_path_;
 
@@ -35,7 +34,7 @@ class All_font_metrics
 
   All_font_metrics (All_font_metrics const &);
 public:
-  All_font_metrics (std::string search_path);
+  All_font_metrics (string search_path);
   ~All_font_metrics ();
 
 #if HAVE_PANGO_FT2
@@ -44,9 +43,8 @@ public:
                               Real scale);
 #endif
 
-  Tex_font_metric *find_tfm (std::string);
-  Font_metric *find_font (std::string name);
-  Open_type_font *find_otf (std::string name);
+  Font_metric *find_font (string name);
+  Open_type_font *find_otf (string name);
   SCM font_descriptions () const;
 };