* scripts/abc2ly.py (dump_slyrics): add ord().

[lilypond.git] / lily / sustain-pedal.cc

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index 30658d7bf386c6d3d4bdc2bc0d048ca0a1ba9364..5537069fd460033d77a24a1d6b11c54701884085 100644 (file)
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -7,9 +7,8 @@
   
  */
 #include "grob.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "font-interface.hh"
-#include "string.hh"
 
 // update comment --hwn 
 /*
@@ -40,9 +39,9 @@ Sustain_pedal::print (SCM smob)
 {
   Grob * e = unsmob_grob (smob);
   
-  Molecule mol;
-  SCM glyph = e->get_grob_property ("text");
-  if (!gh_string_p (glyph))
+  Stencil mol;
+  SCM glyph = e->get_property ("text");
+  if (!scm_is_string (glyph))
     return mol.smobbed_copy ();
   
   String text = ly_scm2string (glyph);
@@ -57,7 +56,7 @@ Sustain_pedal::print (SCM smob)
        }
       else
        idx += String (&text.to_bytes ()[i], 1);
-      Molecule m = Font_interface::get_default_font (e)->find_by_name (idx);
+      Stencil m = Font_interface::get_default_font (e)->find_by_name (idx);
       if (!m.is_empty ())
        mol.add_at_edge (X_AXIS, RIGHT, m, 0, 0);
     }