release: 1.5.25

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

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index 2e931fb9bb2dff136b229845c7eeaf28161ba842..0d8c21fe41b75d0808e8116ec1979200ddd4396c 100644 (file)
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -3,12 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include "score-element.hh"
+#include "grob.hh"
 #include "molecule.hh"
-#include "font-metric.hh"
+#include "font-interface.hh"
 #include "string.hh"
 
 // update comment --hwn 
@@ -30,20 +30,20 @@
 struct Sustain_pedal
 {
 public:
-  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM));
+  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
 };
 
 
-MAKE_SCHEME_CALLBACK(Sustain_pedal,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Sustain_pedal,brew_molecule,1);
 SCM
 Sustain_pedal::brew_molecule (SCM smob) 
 {
-  Score_element * e = unsmob_element (smob);
+  Grob * e = unsmob_grob (smob);
   
   Molecule mol;
-  SCM glyph = e->get_elt_property ("text");
+  SCM glyph = e->get_grob_property ("text");
   if (!gh_string_p (glyph))
-    return mol.create_scheme();
+    return mol.smobbed_copy ();
   String text = ly_scm2string (glyph);
 
   for (int i = 0; i < text.length_i (); i++)
@@ -56,11 +56,11 @@ Sustain_pedal::brew_molecule (SCM smob)
        }
       else
        idx += String (&text.byte_C ()[i], 1);
-      Molecule m = e->get_default_font ()->find_by_name (idx);
+      Molecule m = Font_interface::get_default_font (e)->find_by_name (idx);
       if (!m.empty_b ())
        mol.add_at_edge (X_AXIS, RIGHT, m, 0);
     }
     
-  return mol.create_scheme ();
+  return mol.smobbed_copy ();
 }