X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsustain-pedal.cc;h=7880e0e0da51cd8a4d2fac46c93d31382986feaa;hb=c77189ccaa4e645850ad61779de7a4c8f3fdbc6f;hp=a6388d658ec4d6a0030fd4c4ae1edbe0c19cfbb7;hpb=87aedc5e4e7c56bb54a29f604eafc177a37e3f05;p=lilypond.git

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index a6388d658e..7880e0e0da 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -1,62 +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 "sustain-pedal.hh"
-#include "side-position-interface.hh"
-#include "molecule.hh"
-#include "lookup.hh"
-#include "staff-symbol-referencer.hh"
-
-void
-Sustain_pedal::after_line_breaking ()
+/*
+  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"
+
+// update comment --hwn 
+/*
+  Urg.
+  This is almost text
+  Problem is:
+  * 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
 {
-  /*
-    UGH. Should work automatically via offset callback. 
-   */
-  Side_position_interface i (this);
-  Direction d =  i.get_direction ();
-  i.set_direction (d);
-}
+public:
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+};
 
-Molecule
-Sustain_pedal::do_brew_molecule () const
+MAKE_SCHEME_CALLBACK (Sustain_pedal, print, 1);
+SCM
+Sustain_pedal::print (SCM smob)
 {
-  Molecule mol;
-  SCM glyph = get_elt_property ("text");
-  if (glyph == SCM_UNDEFINED)
-    return mol;
-  String text = ly_scm2string (glyph);
+  Grob *e = unsmob_grob (smob);
+
+  Stencil mol;
+  SCM glyph = e->get_property ("text");
+  if (!scm_is_string (glyph))
+    return mol.smobbed_copy ();
 
-  for (int i = 0; i < text.length_i (); i++)
+  string text = ly_scm2string (glyph);
+
+  for (ssize i = 0; i < text.length (); i++)
     {
-      String idx = String ("pedal-") + String (&text.byte_C ()[i], 1);
-      Molecule m = lookup_l ()->afm_find (idx);
-      if (m.empty_b ())
-	continue;
-      Real kern = 0;
-      if (i)
+      string idx ("pedal.");
+      if (text.substr (i, 3) == "Ped")
 	{
-	  SCM s = scm_eval (gh_list (ly_symbol2scm ("pedal-kerning"),
-				     ly_str02scm (String (&text.byte_C ()[i - 1], 1).ch_C ()),
-				     ly_str02scm (String (&text.byte_C ()[i], 1).ch_C ()),
-				     SCM_UNDEFINED));
-	  if (gh_number_p (s))
-	    {
-	      Staff_symbol_referencer_interface st (this);
-	      Real staff_space = st.staff_space ();
-	      kern = gh_scm2double (s) * staff_space;
-	    }
+	  idx += "Ped";
+	  i += 2;
 	}
-      mol.add_at_edge (X_AXIS, RIGHT, m, kern);
+      else
+	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;
-}
 
+  return mol.smobbed_copy ();
+}