X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsustain-pedal.cc;h=f57ba09a9eb8568bbcc48898a7805cb448d2a11b;hb=98ca84585c45f75503adff82fc0a8cec2a105769;hp=93e454441c9489a3e11bb757b3a9fc31c70be349;hpb=f5e5c04d731e93b1d8d4cf7e7697f71f6e7c2bdf;p=lilypond.git

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index 93e454441c..f57ba09a9e 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -3,61 +3,65 @@
   
   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 "string.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 ()
-{
-  return ;
-  /*
-    UGH. Should work automatically via offset callback. 
-   */
-  Side_position_interface i (this);
-  Direction d =  i.get_direction ();
-  i.set_direction (d);
-}
 
-MAKE_SCHEME_SCORE_ELEMENT_NON_DEFAULT_CALLBACKS(Sustain_pedal);
+
+  Properties:
+
+  glyph -- text string (TODO: make one large glyph of the Ped symbol, removes need for member_print ())
+
+*/
+
+struct Sustain_pedal
+{
+public:
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+};
 
 
+MAKE_SCHEME_CALLBACK (Sustain_pedal,print,1);
 SCM
-Sustain_pedal::scheme_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 (!ly_c_string_p (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")
+      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 ();
 }
 
-Sustain_pedal ::Sustain_pedal(SCM s )
-  : Item (s)
-{
-}