X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=184e4751d528bf2a06a646a8d22142f116ceea9c;hb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;hp=59cc9f86ea916583bf8a08531ec98725681a8e25;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index 59cc9f86ea..184e4751d5 100644
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ALL_FONTS_HH
@@ -18,12 +18,13 @@
 #include <pango/pangoft2.h>
 #endif
 
-/**
-   Interface to all .afm files living in the filesystem.
+
+/*
+   Interface to all fonts (both system fonts and fonts loaded
+   via Pango).
 */
 class All_font_metrics
 {
-  Scheme_hash_table *tfm_dict_;
   Scheme_hash_table *otf_dict_;
   File_path search_path_;
 
@@ -33,24 +34,27 @@ class All_font_metrics
   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,
+							  int face_index,
+							  FT_Face face);
+
   All_font_metrics (string search_path);
   ~All_font_metrics ();
 
-#if HAVE_PANGO_FT2
-  Pango_font *find_pango_font (PangoFontDescription *description,
-			       Real magnification,
+  Pango_font *find_pango_font (PangoFontDescription const *description,
 			       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;
 };
 
 extern All_font_metrics *all_fonts_global;
+SCM ly_reset_all_fonts ();
 
 #endif /* ALL_FONTS_HH */
-