(all-grob-descriptions): remove all

[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 b0cdeff9d51bbd0f1239c4cd032e1df1d79b076f..90cd306292ff50046c788edaf0521abbc3de681b 100644 (file)
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -29,7 +29,7 @@ class All_font_metrics
   Scheme_hash_table *otf_dict_;
   File_path search_path_;
 
-#ifdef HAVE_PANGO16
+#ifdef HAVE_PANGO_FT2
   PangoFT2FontMap *pango_ft2_fontmap_;
   Scheme_hash_table *pango_dict_;
   int pango_dpi_;
@@ -40,7 +40,12 @@ public:
   All_font_metrics (String search_path);
   ~All_font_metrics ();
   
-  Pango_font *find_pango_font (PangoFontDescription*description);
+#ifdef HAVE_PANGO_FT2
+  Pango_font *find_pango_font (PangoFontDescription*description,
+                              Real magnification,
+                              Real scale);
+#endif
+  
   Adobe_font_metric *find_afm (String name);
   Tex_font_metric *find_tfm (String);
   Font_metric *find_font (String name);