Run `make grand-replace'.

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

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index f94867bbf41d070e0d4b525e9f485d80a6b5c316..1479f663658615e6f8cf52f4926694bc586913d1 100644 (file)
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -1,66 +1,66 @@
-/*   
-  sustain-pedal.cc --  implement Sustain_pedal
-  
+/*
+  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"
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+#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 ())
+*/
 
-void
-Sustain_pedal::after_line_breaking ()
+/*
+  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 ();
+
+  string text = ly_scm2string (glyph);
 
-  for (int i = 0; i < text.length_i (); i++)
+  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 ();
+}
 
-Sustain_pedal ::Sustain_pedal(SCM s )
-  : Item (s)
-{}