source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "score-element.hh"
+#include "grob.hh"
#include "molecule.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
+#include "string.hh"
// update comment --hwn
/*
struct Sustain_pedal
{
public:
- static SCM brew_molecule (SCM);
+ DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
};
-MAKE_SCHEME_CALLBACK(Sustain_pedal,brew_molecule);
-
+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++)
}
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 ();
}