Imported Upstream version 2.14.2

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index f480d2624d3c10b709a8902566c36c9d10557f9a..badd058e5446d3e99aeed0a45c48909e1e4d3b91 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -1,10 +1,21 @@
 /*
-  bar-engraver.cc -- implement Bar_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
   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 "bar-line.hh"
@@ -12,6 +23,7 @@
 #include "score-engraver.hh"
 #include "warn.hh"
 #include "item.hh"
+#include "spanner.hh"
 
 #include "translator.icc"
 
@@ -28,10 +40,13 @@ protected:
   void stop_translation_timestep ();
   void process_acknowledged ();
 
+  DECLARE_END_ACKNOWLEDGER (spanner);
+
 private:
   void create_bar ();
 
   Item *bar_;
+  vector<Spanner*> spanners_;
 };
 
 Bar_engraver::Bar_engraver ()
@@ -67,6 +82,10 @@ Bar_engraver::process_acknowledged ()
 {
   if (!bar_ && scm_is_string (get_property ("whichBar")))
     create_bar ();
+
+  if (bar_)
+    for (vsize i = 0; i < spanners_.size (); i++)
+      spanners_[i]->set_bound (RIGHT, bar_);
 }
 
 /*
@@ -79,11 +98,32 @@ Bar_engraver::stop_translation_timestep ()
     context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
 
   bar_ = 0;
+  spanners_.clear ();
 }
 
+void
+Bar_engraver::acknowledge_end_spanner (Grob_info gi)
+{
+  Grob *g = gi.grob ();
+
+  if (to_boolean (g->get_property ("to-barline")))
+    spanners_.push_back (dynamic_cast<Spanner*> (g));
+}
+
+ADD_END_ACKNOWLEDGER (Bar_engraver, spanner);
+
 ADD_TRANSLATOR (Bar_engraver,
-               /* doc */ "Create barlines. This engraver is controlled through the "
-               "@code{whichBar} property. If it has no bar line to create, it will forbid a linebreak at this point",
-               /* create */ "BarLine",
-               /* read */ "whichBar",
-               /* write */ "forbidBreak");
+               /* doc */
+               "Create barlines.  This engraver is controlled through the"
+               " @code{whichBar} property.  If it has no bar line to create,"
+               " it will forbid a linebreak at this point.",
+
+               /* create */
+               "BarLine ",
+
+               /* read */
+               "whichBar ",
+
+               /* write */
+               "forbidBreak "
+               );