X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsustain-pedal.cc;h=724059742d7b31e3d2f3f3d89fe2fa54fc57bdb2;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=ca8463c515c3b4c5c50182641958af614ea901ba;hpb=e0833e924a7b626154c66170d98335c6c4985dfe;p=lilypond.git

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index ca8463c515..724059742d 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -1,67 +1,77 @@
-/*   
-  sustain-pedal.cc --  implement Sustain_pedal
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include "score-element.hh"
-#include "molecule.hh"
-#include "lookup.hh"
-#include "string.hh"
-
-// update comment --hwn 
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2015 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
 /*
   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:
-   static SCM 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)
 {
-  Score_element * e = unsmob_element (smob);
-  
-  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++)
+  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 (ssize i = 0; i < text.length (); i++)
     {
-      String idx ("pedal-");
-      if (text.cut_str (i, 3) == "Ped")
-	{
-	  idx += "Ped";
-	  i += 2;
-	}
+      string idx ("pedal.");
+      if (text.substr (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.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.create_scheme ();
+
+  return mol.smobbed_copy ();
 }