X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsustain-pedal.cc;h=c807868387af79117c4a1922940539116b0c81a1;hb=89bf299597169eeaa5ed7a215b6e808fa849c8cd;hp=b4bd9f53a35b006fd27b6cb432e4298ca06e6ebf;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc index b4bd9f53a3..c807868387 100644 --- a/lily/sustain-pedal.cc +++ b/lily/sustain-pedal.cc @@ -6,9 +6,9 @@ (c) 2000 Han-Wen Nienhuys */ -#include "score-element.hh" +#include "grob.hh" #include "molecule.hh" -#include "lookup.hh" +#include "font-interface.hh" #include "string.hh" // update comment --hwn @@ -38,12 +38,12 @@ 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->lookup_l ()->afm_find (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 (); }