X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpango-font.hh;h=5e804f7a8f8f743430dd0c757d3220bd9df5619b;hb=8cf69a467ad7650f5ca9da6fe2dfd4c7c088b239;hp=b290339f139cd7b7a3a190087c73a23d95ae55ef;hpb=cd029434d0cb431315ed12f51ff01cf2813bb365;p=lilypond.git

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index b290339f13..5e804f7a8f 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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2005 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,45 +22,59 @@
 
 #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"
+struct Preinit_Pango_font {
+  SCM physical_font_tab_;
+  Preinit_Pango_font ();
+};
 
-class Pango_font : public Font_metric
+class Pango_font : Preinit_Pango_font, public Font_metric
 {
   PangoContext *context_;
   PangoFontDescription *pango_description_;
   PangoAttrList *attribute_list_;
   Real scale_;
   Real output_scale_;
-  SCM physical_font_tab_;
+  Direction text_direction_;
 
 public:
   SCM physical_font_tab () const;
   Pango_font (PangoFT2FontMap *,
-	      Direction leftright,
-	      PangoFontDescription *,
-	      Real);
+              PangoFontDescription const *,
+              Real);
   ~Pango_font ();
 
+  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 *, String) const;
+  void register_font_file (const string &filename, const string &ps_name, int face_index);
+
+  size_t name_to_index (string) const;
+  SCM get_glyph_outline (size_t signed_idx) const;
+  Box get_glyph_outline_bbox (size_t signed_idx) const;
+  Box get_unscaled_indexed_char_dimensions (size_t) const;
+  Box get_scaled_indexed_char_dimensions (size_t) const;
+
+  Stencil pango_item_string_stencil (PangoGlyphItem const *) const;
 
+  virtual Stencil text_stencil (Output_def *output_state,
+                                const string &text,
+                                bool music,
+                                const string &features_str) 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);