Fix #821/880.

* don't kill arpeggios on single notes if they are children of a SpanArpeggio

diff --git a/input/regression/arpeggio-span-collision.ly b/input/regression/arpeggio-span-collision.ly
new file mode 100644 (file)
index 0000000..93e9404
--- /dev/null
+++ b/input/regression/arpeggio-span-collision.ly
@@ -0,0 +1,25 @@
+\version "2.13.12"
+
+\header {
+  texidoc = "Cross-staff or -voice arpeggios which include single
+note heads as anchors do not collide with previous note heads or
+prefatory material."
+}
+ddddd = { d'16 d'16 d'16 d'16 d'4\arpeggio }
+sdf = { s4 <d' f'>4\arpeggio }
+\score {
+  \new PianoStaff <<
+    \new Staff {
+      \set PianoStaff.connectArpeggios = ##t
+      << \transpose c c'{ \ddddd \sdf } \\ { \sdf \ddddd } >>
+      << { a'1\arpeggio } \\ { f'2\arpeggio e' } >>
+    }
+    \new Staff {
+      R1
+      d'\arpeggio
+    }
+  >>
+  \layout {
+    line-width = 90\mm
+  }
+}

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index a78d150e5313d1dc833f79bfd8f7a3614638f653..643edf5c29e69b246d9dbf70e9b0f7a4fb634346 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -30,6 +30,15 @@
 #include "stem.hh"
 #include "warn.hh"
 
+static Stencil
+get_squiggle (Grob *me)
+{
+  Font_metric *fm = Font_interface::get_default_font (me);
+  Stencil squiggle = fm->find_by_name ("scripts.arpeggio");
+
+  return squiggle;
+}
+
 Grob *
 Arpeggio::get_common_y (Grob *me)
 {
@@ -75,7 +84,7 @@ Arpeggio::calc_positions (SCM grob)
                   - my_y);
     }
 
-  heads *= 1/Staff_symbol_referencer::staff_space(me);
+  heads *= 1 / Staff_symbol_referencer::staff_space (me);
 
   return ly_interval2scm (heads);
 }
@@ -91,12 +100,22 @@ Arpeggio::print (SCM smob)
   
   if (heads.is_empty () || heads.length () < 0.5)
     {
-      if (!to_boolean (me->get_property ("transparent")))
+      if (to_boolean (me->get_property ("transparent")))
+       {
+         /*
+           This is part of a cross-staff/-voice span-arpeggio,
+           so we need to ensure `heads' is large enough to encompass
+           a single trill-element since the span-arpeggio depends on
+           its children to prevent collisions.
+         */
+         heads.unite (get_squiggle (me).extent (Y_AXIS));
+       }
+      else
        {
          me->warning ("no heads for arpeggio found?");
          me->suicide ();
+         return SCM_EOL;
        }
-      return SCM_EOL;
     }
 
   SCM ad = me->get_property ("arpeggio-direction");
@@ -105,8 +124,7 @@ Arpeggio::print (SCM smob)
     dir = to_dir (ad);
 
   Stencil mol;
-  Font_metric *fm = Font_interface::get_default_font (me);
-  Stencil squiggle = fm->find_by_name ("scripts.arpeggio");
+  Stencil squiggle (get_squiggle (me));
 
   /*
     Compensate for rounding error which may occur when a chord
@@ -121,6 +139,7 @@ Arpeggio::print (SCM smob)
   Stencil arrow;
   if (dir)
     {
+      Font_metric *fm = Font_interface::get_default_font (me);
       arrow = fm->find_by_name ("scripts.arpeggio.arrow." + to_string (dir));
       heads[dir] -= dir * arrow.extent (Y_AXIS).length ();
     }
@@ -191,9 +210,7 @@ SCM
 Arpeggio::width (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts.arpeggio");
-
-  return ly_interval2scm (arpeggio.extent (X_AXIS));
+  return ly_interval2scm (get_squiggle (me).extent (X_AXIS));
 }
 
 MAKE_SCHEME_CALLBACK (Arpeggio, pure_height, 3);