Improve pure-height estimations with outside-staff-priority.

[lilypond.git] / lily / volta-engraver.cc

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index dad57ca7f47584d34b7c5ee1780202d3ffa506be..1410905f6582cad724ab6180936133558545338a 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  volta-engraver.cc -- implement Volta_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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 "engraver.hh"
@@ -130,13 +141,7 @@ Volta_engraver::process_music ()
       volta_bracket_->set_property ("text", start_string_);
 
       if (!volta_spanner_)
-       {
-         volta_spanner_ = make_spanner ("VoltaBracketSpanner", SCM_EOL);
-         /* ensure that we don't get spanned up by VerticalAlignment.
-            ugh. this could cause problems if we get moved to Staff context */
-         Axis_group_interface::add_element (unsmob_grob (get_property ("rootSystem")),
-                                            volta_spanner_);
-       }
+       volta_spanner_ = make_spanner ("VoltaBracketSpanner", SCM_EOL);
 
       Axis_group_interface::add_element (volta_spanner_, volta_bracket_);
     }
@@ -187,7 +192,18 @@ Volta_engraver::stop_translation_timestep ()
 */
 ADD_ACKNOWLEDGER (Volta_engraver, bar_line);
 ADD_TRANSLATOR (Volta_engraver,
-               /* doc */ "Make volta brackets.",
-               /* create */ "VoltaBracket",
-               /* read */ "repeatCommands voltaSpannerDuration stavesFound",
-               /* write */ "");
+               /* doc */
+               "Make volta brackets.",
+
+               /* create */
+               "VoltaBracket "
+               "VoltaBracketSpanner ",
+
+               /* read */
+               "repeatCommands "
+               "voltaSpannerDuration "
+               "stavesFound ",
+
+               /* write */
+               ""
+               );