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

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index 9ee9a2905b..fa81ff3bd8 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -3,55 +3,68 @@
   
   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 "grob.hh"
+#include "stencil.hh"
+#include "font-interface.hh"
 
-#include "sustain-pedal.hh"
-#include "side-position-interface.hh"
-#include "molecule.hh"
-#include "lookup.hh"
-#include "staff-symbol-referencer.hh"
+// update comment --hwn 
+/*
+  Urg.
+  This is almost text
+  Problem is:
+    * we have no kerning
+    * symbols are at wrong place in font
 
-void
-Sustain_pedal::after_line_breaking ()
+
+
+  Properties:
+
+  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
 {
-  /*
-    UGH. Should work automatically via offset callback. 
-   */
-  Side_position_interface i (this);
-  Direction d =  i.get_direction ();
-  i.set_direction (d);
-}
+public:
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+};
+
 
-Molecule
-Sustain_pedal::do_brew_molecule () const
+MAKE_SCHEME_CALLBACK (Sustain_pedal,print,1);
+SCM
+Sustain_pedal::print (SCM smob) 
 {
-  Molecule mol;
-  SCM glyph = get_elt_property ("text");
-  if (glyph == SCM_UNDEFINED)
-    return mol;
+  Grob * e = unsmob_grob (smob);
+  
+  Stencil mol;
+  SCM glyph = e->get_property ("text");
+  if (!scm_is_string (glyph))
+    return mol.smobbed_copy ();
+  
   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, i + 2) == "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 = 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;
+  return mol.smobbed_copy ();
 }
 
-Sustain_pedal ::Sustain_pedal(SCM s )
-  : Item (s)
-{
-}