Imported Upstream version 2.14.2

[lilypond.git] / lily / span-bar-engraver.cc

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 503bdf265b5cbcae112ba6c3182d701eca7b36e3..5378eab765cdfee0569dbfccf868b7f1f7a8f64d 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  span-bar-engraver.cc -- implement Span_bar_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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 "bar-line.hh"
@@ -40,7 +51,7 @@ void
 Span_bar_engraver::acknowledge_bar_line (Grob_info i)
 {
   int depth = i.origin_contexts (this).size ();
-  if (depth && Bar_line::has_interface (i.grob ()))
+  if (depth && !Span_bar::has_interface (i.grob ()))
     {
       Item *it = dynamic_cast<Item *> (i.grob ());
       bars_.push_back (it);
@@ -65,7 +76,7 @@ Span_bar_engraver::stop_translation_timestep ()
       SCM vissym = ly_symbol2scm ("break-visibility");
       SCM vis = bars_[0]->internal_get_property (vissym);
       if (ly_is_equal (spanbar_->internal_get_property (vissym), vis))
-       spanbar_->internal_set_property (vissym, vis);
+       spanbar_->set_property (vissym, vis);
 
       spanbar_ = 0;
     }
@@ -76,9 +87,16 @@ Span_bar_engraver::stop_translation_timestep ()
 
 ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
 ADD_TRANSLATOR (Span_bar_engraver,
-               /* doc */ "This engraver makes cross-staff barlines: It catches all normal "
-               "bar lines, and draws a single span-bar across them.",
-               /* create */ "SpanBar",
-               /* accept */ "",
-               /* read */ "",
-               /* write */ "");
+               /* doc */
+               "Make cross-staff bar lines: It catches all normal bar lines"
+               " and draws a single span bar across them.",
+
+               /* create */
+               "SpanBar ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );