X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=c8c0de2f0a78f748bb61d70b9423c8666e1541c1;hb=31a6b8c4e2cbcea4a968511cdf339ccb8473108c;hp=b0cdeff9d51bbd0f1239c4cd032e1df1d79b076f;hpb=085f80bad751ed2ab6f146884271ade8633389e0;p=lilypond.git

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index b0cdeff9d5..c8c0de2f0a 100644
--- 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,38 @@
 #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
+
+  Font_metric *find_font (string name);
+  Open_type_font *find_otf (string name);
   SCM font_descriptions () const;
 };