X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsustain-pedal.cc;h=1479f663658615e6f8cf52f4926694bc586913d1;hb=412c64d1afc9576b83783b995062083971475db3;hp=4973d87870c0655c1e31b6855c3f873b97401ece;hpb=9435b85cc6551448e51a16a1a0e41ab840feabc4;p=lilypond.git

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index 4973d87870..1479f66365 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -1,67 +1,66 @@
-/*   
-  sustain-pedal.cc --  implement Sustain_pedal
-  
+/*
+  sustain-pedal.cc -- implement Sustain_pedal
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 #include "grob.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "font-interface.hh"
-#include "string.hh"
 
 // update comment --hwn 
 /*
   Urg.
   This is almost text
   Problem is:
-    * we have no kerning
-    * symbols are at wrong place in font
+  * we have no kerning
+  * symbols are at wrong place in font
 
 
 
   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:
-  DECLARE_SCHEME_CALLBACK (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)
 {
-  Grob * e = unsmob_grob (smob);
-  
-  Molecule mol;
-  SCM glyph = e->get_grob_property ("text");
-  if (!gh_string_p (glyph))
+  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++)
+  string text = ly_scm2string (glyph);
+
+  for (ssize i = 0; i < text.length (); i++)
     {
-      String idx ("pedal-");
-      if (text.cut_string (i, 3) == "Ped")
+      string idx ("pedal.");
+      if (text.substr (i, 3) == "Ped")
 	{
 	  idx += "Ped";
 	  i += 2;
 	}
       else
-	idx += String (&text.to_bytes ()[i], 1);
-      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, 0);
+	idx += string (&text.c_str ()[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);
     }
-    
+
   return mol.smobbed_copy ();
 }