X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=59cc9f86ea916583bf8a08531ec98725681a8e25;hb=060b9ebe2fc8c253768e36978542668fc3d050e0;hp=776a38d16f40f45027619f52ba1010a1570e7a5e;hpb=5547ff00446ba0ac2bdbd1fe3205c2fb8411bb2f;p=lilypond.git

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index 776a38d16f..59cc9f86ea 100644
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -1,36 +1,52 @@
-/*   
+/*
   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
 
 #include "file-path.hh"
-#include "lily-proto.hh"
 #include "font-metric.hh"
+#include "config.hh"
+
+#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_p_dict_;
-  Scheme_hash_table *tfm_p_dict_;
+  Scheme_hash_table *tfm_dict_;
+  Scheme_hash_table *otf_dict_;
   File_path search_path_;
+
+#if 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 ();  
-  Adobe_font_metric *find_afm (String name);
-  Tex_font_metric *find_tfm (String);
-  Font_metric *find_font (String name);  
-
-  
-  All_font_metrics (String search_path);
-  
+  All_font_metrics (string search_path);
+  ~All_font_metrics ();
+
+#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;
 };