X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=784a337afab3a7b54fef35afd59aaaf62a825136;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b01ad19119138d8a13dfe2f50809a6acc12af93a;hpb=bc1e5cfa4aef13a1b9bd2d251dd9cb25dbaf9d03;p=lilypond.git

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index b01ad19119..784a337afa 100644
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -1,44 +1,70 @@
-/*   
-  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>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2015 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
 
-
 #include "file-path.hh"
-#include "lily-proto.hh"
 #include "font-metric.hh"
-#include "scm-hash.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.
- */
+/*
+   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_;
+
+#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:
-  
-  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);
-  
+
+  Index_to_charcode_map const *get_index_to_charcode_map (const string &filename,
+                                                          int face_index,
+                                                          FT_Face face);
+
+  All_font_metrics (const string &search_path);
+  ~All_font_metrics ();
+
+  Pango_font *find_pango_font (PangoFontDescription const *description,
+                               Real scale);
+
+  Font_metric *find_font (const string &name);
+  Open_type_font *find_otf (const 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 */
-