Merge with master

[lilypond.git] / lily / arpeggio.cc

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 15da9771ceedb7fb4aad88df97720f1af51668bf..234dbc44e3bd2575b9ffc5b87f9284ad49d7c4dc 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -3,11 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 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"
@@ -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;
     }
 
@@ -80,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 ();
 }
@@ -143,11 +147,12 @@ Arpeggio::width (SCM smob)
   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.",
 
               /* properties */
               "arpeggio-direction "
               "stems "
+              "script-priority " // TODO: make around-note-interface
               );