Run grand-replace for 2010.

[lilypond.git] / lily / include / pango-font.hh

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index b3d4ebd934758cdde5ba9724cf484dd0438bb642..bb207e22324f7ca7b79b8af3b8a58750fcdf4c33 100644 (file)
--- 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--2010 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
@@ -11,13 +22,12 @@
 
 #include "config.hh"
 
-#if HAVE_PANGO16
+#if HAVE_PANGO_FT2
 
 #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
 {
@@ -27,19 +37,24 @@ class Pango_font : public Font_metric
   Real scale_;
   Real output_scale_;
   SCM physical_font_tab_;
-  Direction text_direction_; 
+  Direction text_direction_;
+
 public:
   SCM physical_font_tab () const;
   Pango_font (PangoFT2FontMap *,
-             PangoFontDescription *,
+             PangoFontDescription const *,
              Real);
   ~Pango_font ();
 
+  string description_string () const; 
   SCM font_file_name () const;
-  void register_font_file (std::string, std::string);
-  Stencil text_stencil (std::string) const;
-  Stencil pango_item_string_stencil (PangoItem const *, std::string) const;
+  void register_font_file (string, string, int);
+  Stencil text_stencil (string, bool, bool) const;
+
+  Stencil pango_item_string_stencil (PangoGlyphItem const *, bool) const;
 
+  virtual Stencil word_stencil (string, bool) const;
+  virtual Stencil text_stencil (string, bool) const;
   virtual void derived_mark () const;
 };