X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsustain-pedal.cc;h=7880e0e0da51cd8a4d2fac46c93d31382986feaa;hb=a77737811657427f9037db99ebaf091ae66d6fc9;hp=5537069fd460033d77a24a1d6b11c54701884085;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index 5537069fd4..7880e0e0da 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -1,11 +1,21 @@
-/*   
-  sustain-pedal.cc --  implement Sustain_pedal
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #include "grob.hh"
 #include "stencil.hh"
 #include "font-interface.hh"
@@ -15,52 +25,53 @@
   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_print ())
-
 */
 
+/*
+  FIXME. Need to use markup.
+*/
 struct Sustain_pedal
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
 };
 
-
-MAKE_SCHEME_CALLBACK (Sustain_pedal,print,1);
+MAKE_SCHEME_CALLBACK (Sustain_pedal, print, 1);
 SCM
-Sustain_pedal::print (SCM smob) 
+Sustain_pedal::print (SCM smob)
 {
-  Grob * e = unsmob_grob (smob);
-  
+  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);
+	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, 0);
+	mol.add_at_edge (X_AXIS, RIGHT, m, 0);
     }
-    
+
   return mol.smobbed_copy ();
 }