X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=b50111762498d5b941062e4d9b9c4534115ab790;hb=c2fb0a612743e63154edc1bc2944f90320d082e7;hp=8ac92f1c3c3c06edb9e855812aac201dde428885;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 8ac92f1c3c..b501117624 100644
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -3,11 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "arpeggio.hh"
 
+#include "grob.hh"
 #include "output-def.hh"
 #include "stem.hh"
 #include "staff-symbol-referencer.hh"
@@ -15,6 +16,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 +25,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 +45,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 +56,20 @@ 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.");
+      if (!to_boolean (me->get_property ("transparent")))
+	{
+	  me->warning ("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);
@@ -83,11 +84,11 @@ Arpeggio::print (SCM smob)
 
   for (Real y = heads[LEFT]; y < heads[RIGHT];
        y += squiggle.extent (Y_AXIS).length ())
-    mol.add_at_edge (Y_AXIS, UP, squiggle, 0.0, 0);
+    mol.add_at_edge (Y_AXIS, UP, squiggle, 0.0);
 
   mol.translate_axis (heads[LEFT], Y_AXIS);
   if (dir)
-    mol.add_at_edge (Y_AXIS, dir, arrow, 0, 0);
+    mol.add_at_edge (Y_AXIS, dir, arrow, 0);
 
   return mol.smobbed_copy ();
 }
@@ -100,11 +101,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 +114,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,19 +137,40 @@ 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));
 }
 
-ADD_INTERFACE (Arpeggio, "arpeggio-interface",
+MAKE_SCHEME_CALLBACK (Arpeggio, height, 1);
+SCM
+Arpeggio::height (SCM smob)
+{
+  return Grob::stencil_height (smob);
+}
+
+MAKE_SCHEME_CALLBACK (Arpeggio, pure_height, 3);
+SCM
+Arpeggio::pure_height (SCM smob, SCM, SCM)
+{
+  Grob *me = unsmob_grob (smob);
+  if (to_boolean (me->get_property ("cross-staff")))
+    return ly_interval2scm (Interval ());
+
+  return height (smob);
+}
+
+ADD_INTERFACE (Arpeggio,
 	       "Functions and settings for drawing an arpeggio symbol (a wavy line left to noteheads.",
-	       "stems arpeggio-direction");
+
+	       /* properties */
+	       "arpeggio-direction "
+	       "stems "
+	       "script-priority " // TODO: make around-note-interface
+	       );