X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpango-font.hh;h=6b4ad4b68f9646196d774216b0d27330d2892e0f;hb=df4ec5f5b3c2befd7623d5826ed54b0a2490d3f5;hp=44c2bf4e5b5efc67d82b6d41393742e2b4ac4ade;hpb=1c8fbe4dc400ab5b40d4adf69d78e6ee71b2dea8;p=lilypond.git

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 44c2bf4e5b..6b4ad4b68f 100644
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -1,9 +1,20 @@
 /*
-  pango-font.hh -- declare Pango_font
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2006 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 PANGO_FONT_HH
@@ -15,9 +26,8 @@
 
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
-#include "font-metric.hh"
 
-#include "open-type-font.hh"
+#include "font-metric.hh"
 
 class Pango_font : public Font_metric
 {
@@ -29,31 +39,30 @@ class Pango_font : public Font_metric
   SCM physical_font_tab_;
   Direction text_direction_;
 
-  map<string, Index_to_charcode_map > charcode_maps_;
-
-  Index_to_charcode_map const *get_index_to_charcode_map (string postscript_name, FT_Face face);
 public:
   SCM physical_font_tab () const;
   Pango_font (PangoFT2FontMap *,
-	      PangoFontDescription *,
-	      Real);
+              PangoFontDescription const *,
+              Real);
   ~Pango_font ();
 
-  string description_string () const; 
+  string description_string () const;
   SCM font_file_name () const;
-  void register_font_file (string, string);
-  Stencil text_stencil (string) const;
-  Stencil pango_item_string_stencil (PangoItem const *, string) const;
+  void register_font_file (string, string, int);
+
+  Stencil pango_item_string_stencil (PangoGlyphItem const *) const;
 
+  virtual Stencil text_stencil (Output_def *output_state,
+                                string text, bool music) const;
   virtual void derived_mark () const;
 };
 
 PangoFontDescription *
 symbols_to_pango_font_description (SCM family,
-				   SCM style,
-				   SCM variant,
-				   SCM weight,
-				   SCM stretch);
+                                   SCM style,
+                                   SCM variant,
+                                   SCM weight,
+                                   SCM stretch);
 
 Font_metric *
 select_pango_font (Output_def *layout, SCM chain);