X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=3bb5b583778f02b0cf8bfc6a123d8ea013116fb6;hb=6421a3ea12cf519b165afc3700a86058bdcc381d;hp=5f027fbe017c72f8eff615556b9188282b8be8ac;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index 5f027fbe01..3bb5b58377 100644
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -1,11 +1,21 @@
-/*   
-  all-fonts.hh -- declare All_font_metrics
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef ALL_FONTS_HH
 #define ALL_FONTS_HH
@@ -14,46 +24,47 @@
 #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.
- */
+/*
+   Interface to all fonts (both system fonts and fonts loaded
+   via Pango).
+*/
 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_PANGO_FT2
+#if HAVE_PANGO_FT2
   PangoFT2FontMap *pango_ft2_fontmap_;
   Scheme_hash_table *pango_dict_;
   int pango_dpi_;
 #endif
-  
-  All_font_metrics (All_font_metrics const&);
+
+  map<string, Index_to_charcode_map > filename_charcode_maps_map_;
+
+  All_font_metrics (All_font_metrics const &);
 public:
-  All_font_metrics (String search_path);
+
+  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 ();
-  
-#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);  
-  Open_type_font *find_otf (String name);  
+
+  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;
 };
 
 extern All_font_metrics *all_fonts_global;
+SCM ly_reset_all_fonts ();
 
 #endif /* ALL_FONTS_HH */
-