Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / arpeggio.cc

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 53f70cdf6b79912b2478980cfec8103134a29aaf..d9e9e80636854617517438444c42014b8ccad75b 100644 (file)
--- 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "arpeggio.hh"
 
+#include "grob.hh"
 #include "output-def.hh"
 #include "stem.hh"
 #include "staff-symbol-referencer.hh"
@@ -26,7 +27,7 @@ Arpeggio::print (SCM smob)
   Grob *common = me;
 
   extract_grob_set (me, "stems", stems);
-  for (int i = 0; i < stems.size (); i++)
+  for (vsize i = 0; i < stems.size (); i++)
     {
       Grob *stem = stems[i];
       common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
@@ -44,7 +45,7 @@ Arpeggio::print (SCM smob)
   Interval heads;
   Real my_y = me->relative_coordinate (common, Y_AXIS);
 
-  for (int i = 0; i < stems.size (); i++)
+  for (vsize i = 0; i < stems.size (); i++)
     {
       Grob *stem = stems[i];
       Grob *ss = Staff_symbol_referencer::get_staff_symbol (stem);
@@ -57,8 +58,11 @@ Arpeggio::print (SCM smob)
 
   if (heads.is_empty () || heads.length () < 0.5)
     {
-      programming_error ("no heads for arpeggio found?");
-      me->suicide ();
+      if (!to_boolean (me->get_property ("transparent")))
+       {
+         me->warning ("no heads for arpeggio found?");
+         me->suicide ();
+       }
       return SCM_EOL;
     }
 
@@ -100,7 +104,7 @@ Arpeggio::brew_chord_bracket (SCM smob)
   Grob *common = me;
 
   extract_grob_set (me, "stems", stems);
-  for (int i = 0; i < stems.size (); i++)
+  for (vsize i = 0; i < stems.size (); i++)
     {
       Grob *stem = stems[i];
       common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
@@ -110,7 +114,7 @@ Arpeggio::brew_chord_bracket (SCM smob)
   Interval heads;
   Real my_y = me->relative_coordinate (common, Y_AXIS);
 
-  for (int i = 0; i < stems.size (); i++)
+  for (vsize i = 0; i < stems.size (); i++)
     {
       Grob *stem = stems[i];
       Grob *ss = Staff_symbol_referencer::get_staff_symbol (stem);
@@ -119,7 +123,7 @@ Arpeggio::brew_chord_bracket (SCM smob)
       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;
@@ -133,20 +137,22 @@ 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);
-  (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));
 }
 
-ADD_INTERFACE (Arpeggio, "arpeggio-interface",
+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
+              );