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 b0cdeff9d51bbd0f1239c4cd032e1df1d79b076f..59cc9f86ea916583bf8a08531ec98725681a8e25 100644 (file)
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -1,11 +1,10 @@
-/*   
+/*
   all-fonts.hh -- declare All_font_metrics
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef ALL_FONTS_HH
 #define ALL_FONTS_HH
@@ -14,37 +13,40 @@
 #include "font-metric.hh"
 #include "config.hh"
 
-#ifdef HAVE_PANGO16
+#if HAVE_PANGO_FT2
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
 #endif
 
 /**
    Interface to all .afm files living in the filesystem.
- */
+*/
 class All_font_metrics
 {
-  Scheme_hash_table *afm_dict_;
   Scheme_hash_table *tfm_dict_;
   Scheme_hash_table *otf_dict_;
   File_path search_path_;
 
-#ifdef HAVE_PANGO16
+#if HAVE_PANGO_FT2
   PangoFT2FontMap *pango_ft2_fontmap_;
   Scheme_hash_table *pango_dict_;
   int pango_dpi_;
 #endif
-  
-  All_font_metrics (All_font_metrics const&);
+
+  All_font_metrics (All_font_metrics const &);
 public:
-  All_font_metrics (String search_path);
+  All_font_metrics (string search_path);
   ~All_font_metrics ();
-  
-  Pango_font *find_pango_font (PangoFontDescription*description);
-  Adobe_font_metric *find_afm (String name);
-  Tex_font_metric *find_tfm (String);
-  Font_metric *find_font (String name);  
-  Open_type_font *find_otf (String name);  
+
+#if HAVE_PANGO_FT2
+  Pango_font *find_pango_font (PangoFontDescription *description,
+                              Real magnification,
+                              Real scale);
+#endif
+
+  Tex_font_metric *find_tfm (string);
+  Font_metric *find_font (string name);
+  Open_type_font *find_otf (string name);
   SCM font_descriptions () const;
 };