X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsustain-pedal.cc;h=fa81ff3bd811b4ffa95fc6f68a01033c59c110c5;hb=0849262a1fd57ad3e68d879e7d129a3bf99273cd;hp=ca8463c515c3b4c5c50182641958af614ea901ba;hpb=e0833e924a7b626154c66170d98335c6c4985dfe;p=lilypond.git

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index ca8463c515..fa81ff3bd8 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -3,13 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include "score-element.hh"
-#include "molecule.hh"
-#include "lookup.hh"
-#include "string.hh"
+#include "grob.hh"
+#include "stencil.hh"
+#include "font-interface.hh"
 
 // update comment --hwn 
 /*
@@ -23,45 +22,49 @@
 
   Properties:
 
-  glyph -- text string (TODO:   make one large glyph of the Ped symbol, removes need for member_brew_molecule ())
+  glyph -- text string (TODO: make one large glyph of the Ped symbol, removes need for member_print ())
 
 */
 
+
+/*
+  FIXME. Need to use markup. 
+ */
 struct Sustain_pedal
 {
 public:
-   static SCM brew_molecule (SCM);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
 };
 
 
-MAKE_SCHEME_CALLBACK(Sustain_pedal,brew_molecule,1);
-
+MAKE_SCHEME_CALLBACK (Sustain_pedal,print,1);
 SCM
-Sustain_pedal::brew_molecule (SCM smob) 
+Sustain_pedal::print (SCM smob) 
 {
-  Score_element * e = unsmob_element (smob);
+  Grob * e = unsmob_grob (smob);
+  
+  Stencil mol;
+  SCM glyph = e->get_property ("text");
+  if (!scm_is_string (glyph))
+    return mol.smobbed_copy ();
   
-  Molecule mol;
-  SCM glyph = e->get_elt_property ("text");
-  if (!gh_string_p (glyph))
-    return mol.create_scheme();
   String text = ly_scm2string (glyph);
 
-  for (int i = 0; i < text.length_i (); i++)
+  for (int i = 0; i < text.length (); i++)
     {
-      String idx ("pedal-");
-      if (text.cut_str (i, 3) == "Ped")
+      String idx ("pedal.");
+      if (text.cut_string (i, 3) == "Ped")
 	{
 	  idx += "Ped";
 	  i += 2;
 	}
       else
-	idx += String (&text.byte_C ()[i], 1);
-      Molecule m = e->lookup_l ()->afm_find (idx);
-      if (!m.empty_b ())
-	mol.add_at_edge (X_AXIS, RIGHT, m, 0);
+	idx += String (&text.to_bytes ()[i], 1);
+      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);
     }
     
-  return mol.create_scheme ();
+  return mol.smobbed_copy ();
 }