X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=d170e818a759f14b9b20a8e79e8b53341c3b8a27;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=073b839d9a1ff874cd9b0f880a665468f82f9d32;hpb=ac1340846e81661575ba3036b251e8ab55b13023;p=lilypond.git

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index 073b839d9a..d170e818a7 100644
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -1,9 +1,20 @@
 /*
-  all-fonts.hh -- declare All_font_metrics
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2007 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
@@ -20,7 +31,8 @@
 
 
 /*
-   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
 {
@@ -38,7 +50,9 @@ class All_font_metrics
   All_font_metrics (All_font_metrics const &);
 public:
 
-  Index_to_charcode_map const *get_index_to_charcode_map (string filename, FT_Face face);
+  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 ();
@@ -55,4 +69,3 @@ extern All_font_metrics *all_fonts_global;
 SCM ly_reset_all_fonts ();
 
 #endif /* ALL_FONTS_HH */
-