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

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index a6388d658e..2a01f3455e 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -3,60 +3,65 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-
-#include "sustain-pedal.hh"
-#include "side-position-interface.hh"
+#include "grob.hh"
 #include "molecule.hh"
-#include "lookup.hh"
-#include "staff-symbol-referencer.hh"
+#include "font-interface.hh"
+#include "string.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_brew_molecule ())
 
-void
-Sustain_pedal::after_line_breaking ()
+*/
+
+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 (brew_molecule, (SCM));
+};
+
 
-Molecule
-Sustain_pedal::do_brew_molecule () const
+MAKE_SCHEME_CALLBACK (Sustain_pedal,brew_molecule,1);
+SCM
+Sustain_pedal::brew_molecule (SCM smob) 
 {
+  Grob * e = unsmob_grob (smob);
+  
   Molecule mol;
-  SCM glyph = get_elt_property ("text");
-  if (glyph == SCM_UNDEFINED)
-    return mol;
+  SCM glyph = e->get_grob_property ("text");
+  if (!gh_string_p (glyph))
+    return mol.smobbed_copy ();
+  
   String text = ly_scm2string (glyph);
 
-  for (int i = 0; i < text.length_i (); i++)
+  for (int 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.cut_string (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.to_bytes ()[i], 1);
+      Molecule 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);
     }
     
-  return mol;
+  return mol.smobbed_copy ();
 }
 
-