Imported sources

[lilypond.git] / lily / sustain-pedal.cc

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index 851fddb88a54ec4bf8e0dad73c3447bf698060fe..30658d7bf386c6d3d4bdc2bc0d048ca0a1ba9364 100644 (file)
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "grob.hh"
@@ -23,20 +23,20 @@
 
   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 ())
 
 */
 
 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);
   
@@ -44,21 +44,22 @@ Sustain_pedal::brew_molecule (SCM smob)
   SCM glyph = e->get_grob_property ("text");
   if (!gh_string_p (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, 3) == "Ped")
+      if (text.cut_string (i, 3) == "Ped")
        {
          idx += "Ped";
          i += 2;
        }
       else
-       idx += String (&text.byte_C ()[i], 1);
+       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);
+      if (!m.is_empty ())
+       mol.add_at_edge (X_AXIS, RIGHT, m, 0, 0);
     }
     
   return mol.smobbed_copy ();