Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 57457c37770fa061ca0bd34c7399c81fa8c3bc0b..2357c087b5dc425a3faa839c629cd6c4f9d9aee5 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -12,6 +12,7 @@
 #include "score-engraver.hh"
 #include "warn.hh"
 #include "item.hh"
+#include "spanner.hh"
 
 #include "translator.icc"
 
@@ -25,15 +26,16 @@ public:
   void request_bar (string type_string);
 
 protected:
-  virtual void finalize ();
   void stop_translation_timestep ();
   void process_acknowledged ();
 
+  DECLARE_END_ACKNOWLEDGER (spanner);
+
 private:
-  void typeset_bar ();
   void create_bar ();
 
   Item *bar_;
+  vector<Spanner*> spanners_;
 };
 
 Bar_engraver::Bar_engraver ()
@@ -53,12 +55,6 @@ Bar_engraver::create_bar ()
     }
 }
 
-void
-Bar_engraver::finalize ()
-{
-  typeset_bar ();
-}
-
 /*
   Bar_engraver should come *after* any engravers that
   modify whichBar
@@ -75,12 +71,10 @@ Bar_engraver::process_acknowledged ()
 {
   if (!bar_ && scm_is_string (get_property ("whichBar")))
     create_bar ();
-}
 
-void
-Bar_engraver::typeset_bar ()
-{
-  bar_ = 0;
+  if (bar_)
+    for (vsize i = 0; i < spanners_.size (); i++)
+      spanners_[i]->set_bound (RIGHT, bar_);
 }
 
 /*
@@ -91,10 +85,22 @@ Bar_engraver::stop_translation_timestep ()
 {
   if (!bar_)
     context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
-  else
-    typeset_bar ();
+
+  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",