(get_header): copy module, instead of

[lilypond.git] / lily / arpeggio.cc

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 2a1a32b533ba516e3a5ac4903e145781044c9999..53f70cdf6b79912b2478980cfec8103134a29aaf 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -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 (int 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 (int 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 ("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 (int 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,9 +110,9 @@ 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 (int 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;
@@ -140,8 +138,9 @@ SCM
 Arpeggio::width_callback (SCM smob, SCM axis)
 {
   Grob *me = unsmob_grob (smob);
-  Axis a = (Axis)scm_to_int (axis);
-  assert (a == X_AXIS);
+  (void) axis;
+
+  assert (scm_to_int (axis) == X_AXIS);
   Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts.arpeggio");
 
   return ly_interval2scm (arpeggio.extent (X_AXIS));