X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpango-font.hh;h=43eca3a6ba156dde4d43e988cf732a703f2cc0bf;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=31ce425485a81c70ade4ad9534bf70a249c6afbb;hpb=edf9d00fea686457b4469b82a435d5dc3bf09a56;p=lilypond.git

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 31ce425485..43eca3a6ba 100644
--- 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2014 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 (PangoGlyphItem const *, 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 text_stencil (Output_def* output_state,
-                                string text, bool music) 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);