Run grand replace for 2015.

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

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index a0e503735d165669a0ce3021e5438b397034a89a..ff5e6302f061f505347001cce6a34aa3fbfef585 100644 (file)
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--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
@@ -42,28 +42,33 @@ class Pango_font : public Font_metric
 public:
   SCM physical_font_tab () const;
   Pango_font (PangoFT2FontMap *,
-             PangoFontDescription const *,
-             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, int);
-  Stencil text_stencil (string, bool, bool) const;
+  void register_font_file (const string &filename, const string &ps_name, int face_index);
 
-  Stencil pango_item_string_stencil (PangoItem const *, string, bool) const;
+  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;
 
-  virtual Stencil word_stencil (string, bool) const;
-  virtual Stencil text_stencil (string, bool) const;
+  Stencil pango_item_string_stencil (PangoGlyphItem const *) const;
+
+  virtual Stencil text_stencil (Output_def *output_state,
+                                const 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);