release: 1.5.8

[lilypond.git] / lily / arpeggio.cc

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 7500ef844b707cb23fbe73c645114e92ef873671..900949224c34ce87afb0529127e99b3b06f7562d 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -3,19 +3,21 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "molecule.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
 #include "arpeggio.hh"
-#include "score-element.hh"
+#include "grob.hh"
 #include "stem.hh"
 #include "staff-symbol-referencer.hh"
+#include "staff-symbol.hh"
+#include "warn.hh"
+#include "font-interface.hh"
 
 bool
-Arpeggio::has_interface (Score_element* me)
+Arpeggio::has_interface (Grob* me)
 {
   return me && me->has_interface (ly_symbol2scm ("arpeggio-interface"));
 }
@@ -24,27 +26,74 @@ MAKE_SCHEME_CALLBACK (Arpeggio, brew_molecule, 1);
 SCM 
 Arpeggio::brew_molecule (SCM smob) 
 {
-  Score_element *me = unsmob_element (smob);
+  Grob *me = unsmob_grob (smob);
   
-  Interval iv; 
-  for (SCM s = me->get_elt_property ("stems"); gh_pair_p (s); s = gh_cdr (s))
+  Grob * common = me;
+  for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = gh_cdr (s))
     {
-      Score_element *stem = unsmob_element (gh_car (s));
-      iv.unite (Stem::head_positions (stem));
+      Grob * stem =  unsmob_grob (gh_car (s));
+      common =  common->common_refpoint (Staff_symbol_referencer::staff_symbol_l (stem),
+                                Y_AXIS);
     }
 
+  /*
+    TODO:
+    
+    Using stems here is not very convenient; should store noteheads
+    instead, and also put them into the support. Now we will mess up
+    in vicinity of a collision.
+
+  */
+  Interval heads;
+  Real my_y = me->relative_coordinate (common, Y_AXIS);
+      
+  for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = gh_cdr (s))
+    {
+      Grob * stem = unsmob_grob (gh_car (s));
+      Grob * ss = Staff_symbol_referencer::staff_symbol_l (stem);
+      Interval iv =Stem::head_positions (stem);
+      iv *= Staff_symbol::staff_space (ss)/2.0;
+      
+      heads.unite (iv + ss->relative_coordinate (common, Y_AXIS)
+                  - my_y);
+    }
+
+  if (heads.empty_b ())
+    {
+      programming_error ("Huh? Dumb blonde encountered?");
+      /*
+       Nee Valerie, jij bent _niet_ dom. 
+       */
+      return SCM_EOL;
+    }
+  
   Molecule mol;
-  Molecule dot = me->paper_l ()->lookup_l (0)->afm_find ("dots-dot");
-  Real half_space = Staff_symbol_referencer::staff_space (me) / 2;
-  for (Real i = iv[MIN]; i <= iv[MAX]; i++)
+  Molecule arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio");
+
+  Real y = heads[LEFT];
+  while (y < heads[RIGHT])
     {
-      Molecule d (dot);
-      d.translate_axis (i * half_space, Y_AXIS);
-      mol.add_molecule (d);
+      mol.add_at_edge (Y_AXIS, UP,arpeggio, 0.0);
+      y+= arpeggio. extent (Y_AXIS).length ();
     }
-  mol.translate (Offset (-3, 0));
+  mol.translate_axis (heads[LEFT], Y_AXIS);
 
-  return mol.create_scheme (); 
+  return mol.smobbed_copy () ;
 }
 
+/*
+  We have to do a callback, because brew_molecule () triggers a
+  vertical alignment if it is cross-staff.
+  This callback also adds padding.
+*/
+MAKE_SCHEME_CALLBACK (Arpeggio, width_callback,2);
+SCM
+Arpeggio::width_callback (SCM smob, SCM axis)
+{
+  Grob * me = unsmob_grob (smob);
+  Axis a = (Axis)gh_scm2int (axis);
+  assert (a == X_AXIS);
+  Molecule arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio");
 
+  return ly_interval2scm (arpeggio.extent (X_AXIS) * 1.5);
+}