Midi: Use span dynamics render results for note velocities. Fixes #1586.

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

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index a0e503735d165669a0ce3021e5438b397034a89a..3d435af9ca5ccba2640c63abcc76674f01bc421c 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--2011 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
@@ -49,12 +49,11 @@ public:
   string description_string () const; 
   SCM font_file_name () const;
   void register_font_file (string, string, int);
-  Stencil text_stencil (string, bool, bool) const;
 
-  Stencil pango_item_string_stencil (PangoItem const *, string, bool) const;
+  Stencil pango_item_string_stencil (PangoGlyphItem const *) const;
 
-  virtual Stencil word_stencil (string, bool) const;
-  virtual Stencil text_stencil (string, bool) const;
+  virtual Stencil text_stencil (Output_def *output_state,
+                                string text, bool music) const;
   virtual void derived_mark () const;
 };