Run grand-replace for 2009.

[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 34a05e701f21cb1a5ae16b276ceaa8122b0ab729..184e4751d528bf2a06a646a8d22142f116ceea9c 100644 (file)
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ALL_FONTS_HH
@@ -20,7 +20,8 @@
 
 
 /*
-   Interface to all .afm files living in the filesystem.
+   Interface to all fonts (both system fonts and fonts loaded
+   via Pango).
 */
 class All_font_metrics
 {
@@ -38,16 +39,15 @@ class All_font_metrics
   All_font_metrics (All_font_metrics const &);
 public:
 
-  Index_to_charcode_map const *get_index_to_charcode_map (string filename, FT_Face face);
+  Index_to_charcode_map const *get_index_to_charcode_map (string filename,
+                                                         int face_index,
+                                                         FT_Face face);
 
   All_font_metrics (string search_path);
   ~All_font_metrics ();
 
-#if HAVE_PANGO_FT2
-  Pango_font *find_pango_font (PangoFontDescription *description,
-                              Real magnification,
+  Pango_font *find_pango_font (PangoFontDescription const *description,
                               Real scale);
-#endif
 
   Font_metric *find_font (string name);
   Open_type_font *find_otf (string name);
@@ -58,4 +58,3 @@ extern All_font_metrics *all_fonts_global;
 SCM ly_reset_all_fonts ();
 
 #endif /* ALL_FONTS_HH */
-