indent

[lilypond.git] / lily / arpeggio.cc

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 8e6e9c5a3364613eac45c2a216288d1d09421709..e201dbf579aa8d664a2e291f352cfedc9d972eb8 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -1,9 +1,20 @@
 /*
-  arpeggio.cc -- implement Arpeggio
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2010 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "arpeggio.hh"
@@ -19,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)
 {
@@ -64,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);
 }
@@ -80,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");
@@ -94,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
@@ -110,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 ();
     }
@@ -180,16 +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));
-}
-
-MAKE_SCHEME_CALLBACK (Arpeggio, height, 1);
-SCM
-Arpeggio::height (SCM smob)
-{
-  return Grob::stencil_height (smob);
+  return ly_interval2scm (get_squiggle (me).extent (X_AXIS));
 }
 
 MAKE_SCHEME_CALLBACK (Arpeggio, pure_height, 3);
@@ -200,12 +221,11 @@ Arpeggio::pure_height (SCM smob, SCM, SCM)
   if (to_boolean (me->get_property ("cross-staff")))
     return ly_interval2scm (Interval ());
 
-  return height (smob);
+  return Grob::stencil_height (smob);
 }
 
 ADD_INTERFACE (Arpeggio,
-              "Functions and settings for drawing an arpeggio symbol (a"
-              " wavy line left to noteheads.",
+              "Functions and settings for drawing an arpeggio symbol.",
 
               /* properties */
               "arpeggio-direction "