X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=f7af1bb4b94103cccbd41fe35eaa6f3ca4c4767e;hb=55d45442df0ccbc9495e3c7bcd5d3a324e8a0251;hp=fa6eb9097c014468071fe8ea60aa139e643d388b;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index fa6eb9097c..f7af1bb4b9 100644
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -1,42 +1,58 @@
-/*   
+/*
   all-fonts.hh -- declare All_font_metrics
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #ifndef ALL_FONTS_HH
 #define ALL_FONTS_HH
 
-#include "dictionary.hh"
 #include "file-path.hh"
-#include "lily-proto.hh"
 #include "font-metric.hh"
-#include "scm-hash.hh"
+#include "config.hh"
+
+#ifdef HAVE_PANGO16
+#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_p_dict_;
-  Scheme_hash_table tfm_p_dict_;
-  Scheme_hash_table scaled_p_dict_;
-  
+  Scheme_hash_table *afm_dict_;
+  Scheme_hash_table *tfm_dict_;
+  Scheme_hash_table *otf_dict_;
   File_path search_path_;
+
+#ifdef HAVE_PANGO_FT2
+  PangoFT2FontMap *pango_ft2_fontmap_;
+  Scheme_hash_table *pango_dict_;
+  int pango_dpi_;
+#endif
+
+  All_font_metrics (All_font_metrics const &);
 public:
-  
+  All_font_metrics (String search_path);
+  ~All_font_metrics ();
+
+#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);  
-  Scaled_font_metric* find_scaled (String , int);
-  
-  All_font_metrics (String search_path);
-  
+  Font_metric *find_font (String name);
+  Open_type_font *find_otf (String name);
   SCM font_descriptions () const;
 };
 
+extern All_font_metrics *all_fonts_global;
+
 #endif /* ALL_FONTS_HH */