Fix some bugs in the dynamic engraver and PostScript backend

[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 5d1b8a6d38b6e0610fe85ef78848e830ed0942a7..59cc9f86ea916583bf8a08531ec98725681a8e25 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
@@ -35,7 +35,7 @@ class All_font_metrics
 
   All_font_metrics (All_font_metrics const &);
 public:
-  All_font_metrics (String search_path);
+  All_font_metrics (string search_path);
   ~All_font_metrics ();
 
 #if HAVE_PANGO_FT2
@@ -44,9 +44,9 @@ public:
                               Real scale);
 #endif
 
-  Tex_font_metric *find_tfm (String);
-  Font_metric *find_font (String name);
-  Open_type_font *find_otf (String name);
+  Tex_font_metric *find_tfm (string);
+  Font_metric *find_font (string name);
+  Open_type_font *find_otf (string name);
   SCM font_descriptions () const;
 };