Web: really read search-box HTML file in UTF-8

[lilypond.git] / lily / arpeggio.cc

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index fcb32debcbdd6107ee5987b2427d49839f63135c..a78d150e5313d1dc833f79bfd8f7a3614638f653 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--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2000--2008 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"
@@ -153,6 +164,7 @@ SCM
 Arpeggio::brew_chord_slur (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
+  SCM dash_definition = me->get_property ("dash-definition");
   Interval heads = robust_scm2interval (me->get_property ("positions"),
                                        Interval())
     * Staff_symbol_referencer::staff_space (me);
@@ -165,7 +177,7 @@ Arpeggio::brew_chord_slur (SCM smob)
   Bezier curve = slur_shape (dy, height_limit, ratio);
   curve.rotate (M_PI / 2);
 
-  Stencil mol (Lookup::slur (curve, lt, lt));
+  Stencil mol (Lookup::slur (curve, lt, lt, dash_definition));
   mol.translate_axis (heads[LEFT], Y_AXIS);
   return mol.smobbed_copy ();
 }
@@ -184,13 +196,6 @@ Arpeggio::width (SCM smob)
   return ly_interval2scm (arpeggio.extent (X_AXIS));
 }
 
-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)
@@ -199,17 +204,17 @@ 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 "
               "positions "
               "script-priority " // TODO: make around-note-interface
               "stems "
+               "dash-definition " // TODO: make apply to non-slur arpeggios
               );