X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsustain-pedal.cc;h=98b4e2df8a59b4dbd6d6d9cea91843b30fb229de;hb=fb3d387af9431f3f072e40e78c50bf78fcc0f496;hp=4818b545f71f60aa39ed3b5f59d7beef8bed2a9f;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index 4818b545f7..98b4e2df8a 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -1,15 +1,26 @@
 /*
-  sustain-pedal.cc -- implement Sustain_pedal
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2005 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"
 
-// update comment --hwn 
+// update comment --hwn
 /*
   Urg.
   This is almost text
@@ -44,21 +55,21 @@ Sustain_pedal::print (SCM smob)
   if (!scm_is_string (glyph))
     return mol.smobbed_copy ();
 
-  String text = ly_scm2string (glyph);
+  string text = ly_scm2string (glyph);
 
-  for (int i = 0; i < text.length (); i++)
+  for (ssize i = 0; i < text.length (); i++)
     {
-      String idx ("pedal.");
-      if (text.cut_string (i, 3) == "Ped")
-	{
-	  idx += "Ped";
-	  i += 2;
-	}
+      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 ();