* lily/ various: Introduce stream events of types Prepare,

[lilypond.git] / lily / arpeggio.cc

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 8ac92f1c3c3c06edb9e855812aac201dde428885..15da9771ceedb7fb4aad88df97720f1af51668bf 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "arpeggio.hh"
@@ -15,6 +15,7 @@
 #include "warn.hh"
 #include "font-interface.hh"
 #include "lookup.hh"
+#include "pointer-group-interface.hh"
 
 MAKE_SCHEME_CALLBACK (Arpeggio, print, 1);
 SCM
@@ -23,9 +24,11 @@ Arpeggio::print (SCM smob)
   Grob *me = unsmob_grob (smob);
 
   Grob *common = me;
-  for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
+
+  extract_grob_set (me, "stems", stems);
+  for (vsize i = 0; i < stems.size (); i++)
     {
-      Grob *stem = unsmob_grob (scm_car (s));
+      Grob *stem = stems[i];
       common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
                                        Y_AXIS);
     }
@@ -41,9 +44,9 @@ Arpeggio::print (SCM smob)
   Interval heads;
   Real my_y = me->relative_coordinate (common, Y_AXIS);
 
-  for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
+  for (vsize i = 0; i < stems.size (); i++)
     {
-      Grob *stem = unsmob_grob (scm_car (s));
+      Grob *stem = stems[i];
       Grob *ss = Staff_symbol_referencer::get_staff_symbol (stem);
       Interval iv = Stem::head_positions (stem);
       iv *= Staff_symbol::staff_space (ss) / 2.0;
@@ -52,23 +55,17 @@ Arpeggio::print (SCM smob)
                   - my_y);
     }
 
-  if (heads.is_empty ())
+  if (heads.is_empty () || heads.length () < 0.5)
     {
-      /*
-       Dumb blonde error
-
-       :-)
-      */
-      programming_error ("Huh, no heads for arpeggio found.");
+      programming_error ("no heads for arpeggio found?");
+      me->suicide ();
       return SCM_EOL;
     }
 
   SCM ad = me->get_property ("arpeggio-direction");
   Direction dir = CENTER;
   if (is_direction (ad))
-    {
-      dir = to_dir (ad);
-    }
+    dir = to_dir (ad);
 
   Stencil mol;
   Font_metric *fm = Font_interface::get_default_font (me);
@@ -100,11 +97,12 @@ SCM
 Arpeggio::brew_chord_bracket (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-
   Grob *common = me;
-  for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
+
+  extract_grob_set (me, "stems", stems);
+  for (vsize i = 0; i < stems.size (); i++)
     {
-      Grob *stem = unsmob_grob (scm_car (s));
+      Grob *stem = stems[i];
       common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
                                        Y_AXIS);
     }
@@ -112,16 +110,16 @@ Arpeggio::brew_chord_bracket (SCM smob)
   Interval heads;
   Real my_y = me->relative_coordinate (common, Y_AXIS);
 
-  for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
+  for (vsize i = 0; i < stems.size (); i++)
     {
-      Grob *stem = unsmob_grob (scm_car (s));
+      Grob *stem = stems[i];
       Grob *ss = Staff_symbol_referencer::get_staff_symbol (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);
     }
 
-  Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
   Real dy = heads.length () + sp;
   Real x = 0.7;
@@ -135,13 +133,11 @@ Arpeggio::brew_chord_bracket (SCM smob)
   We have to do a callback, because print () triggers a
   vertical alignment if it is cross-staff.
 */
-MAKE_SCHEME_CALLBACK (Arpeggio, width_callback, 2);
+MAKE_SCHEME_CALLBACK (Arpeggio, width, 1);
 SCM
-Arpeggio::width_callback (SCM smob, SCM axis)
+Arpeggio::width (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  Axis a = (Axis)scm_to_int (axis);
-  assert (a == X_AXIS);
   Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts.arpeggio");
 
   return ly_interval2scm (arpeggio.extent (X_AXIS));
@@ -149,5 +145,9 @@ Arpeggio::width_callback (SCM smob, SCM axis)
 
 ADD_INTERFACE (Arpeggio, "arpeggio-interface",
               "Functions and settings for drawing an arpeggio symbol (a wavy line left to noteheads.",
-              "stems arpeggio-direction");
+
+              /* properties */
+              "arpeggio-direction "
+              "stems "
+              );