X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=9c37a1a7d2107d265c55ec809bdf85ff9f474e75;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=ebfd2a2224942679c11cc4d4ba2dda07447234fe;hpb=c5402461ab1d1cdbaa684b0e55d4851f0e28e37a;p=lilypond.git

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index ebfd2a2224..9c37a1a7d2 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--2008 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"
 
-/**
-   Interface to all .afm files living in the filesystem.
- */
+#if HAVE_PANGO_FT2
+#include <pango/pango.h>
+#include <pango/pangoft2.h>
+#endif
+
+
+/*
+   Interface to all fonts (both system fonts and fonts loaded
+   via Pango).
+*/
 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 *otf_dict_;
   File_path search_path_;
-public:
-  ~All_font_metrics ();  
-  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 , Real);
-  
-  All_font_metrics (String search_path);
+
+#if HAVE_PANGO_FT2
+  PangoFT2FontMap *pango_ft2_fontmap_;
+  Scheme_hash_table *pango_dict_;
+  int pango_dpi_;
+#endif
+
+  map<string, Index_to_charcode_map > filename_charcode_maps_map_;
   
+  All_font_metrics (All_font_metrics const &);
+public:
+
+  Index_to_charcode_map const *get_index_to_charcode_map (string filename, FT_Face face);
+
+  All_font_metrics (string search_path);
+  ~All_font_metrics ();
+
+  Pango_font *find_pango_font (PangoFontDescription const *description,
+			       Real scale);
+
+  Font_metric *find_font (string name);
+  Open_type_font *find_otf (string name);
   SCM font_descriptions () const;
 };
 
-Font_metric * find_font (String name);
+extern All_font_metrics *all_fonts_global;
+SCM ly_reset_all_fonts ();
 
 #endif /* ALL_FONTS_HH */
-