X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-engraver.cc;h=fb39ae4955c5f301f141bc32b527362cfa74b759;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=57457c37770fa061ca0bd34c7399c81fa8c3bc0b;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 57457c3777..fb39ae4955 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -1,17 +1,28 @@
 /*
-  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--2015 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"
 #include "context.hh"
 #include "score-engraver.hh"
 #include "warn.hh"
 #include "item.hh"
+#include "spanner.hh"
 
 #include "translator.icc"
 
@@ -22,21 +33,22 @@ class Bar_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Bar_engraver);
-  void request_bar (string type_string);
 
 protected:
-  virtual void finalize ();
   void stop_translation_timestep ();
   void process_acknowledged ();
 
+  void acknowledge_end_spanner (Grob_info);
+
 private:
-  void typeset_bar ();
   void create_bar ();
 
   Item *bar_;
+  vector<Spanner *> spanners_;
 };
 
-Bar_engraver::Bar_engraver ()
+Bar_engraver::Bar_engraver (Context *c)
+  : Engraver (c)
 {
   bar_ = 0;
 }
@@ -48,17 +60,11 @@ Bar_engraver::create_bar ()
     {
       bar_ = make_item ("BarLine", SCM_EOL);
       SCM gl = get_property ("whichBar");
-      if (scm_equal_p (gl, bar_->get_property ("glyph")) != SCM_BOOL_T)
-	bar_->set_property ("glyph", gl);
+      if (!ly_is_equal (gl, bar_->get_property ("glyph")))
+        bar_->set_property ("glyph", gl);
     }
 }
 
-void
-Bar_engraver::finalize ()
-{
-  typeset_bar ();
-}
-
 /*
   Bar_engraver should come *after* any engravers that
   modify whichBar
@@ -75,12 +81,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,13 +95,41 @@ 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));
+}
+
+
+void
+Bar_engraver::boot ()
+{
+  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.  This engraver"
+                " is required to trigger the creation of clefs at the start"
+                " of systems.",
+
+                /* create */
+                "BarLine ",
+
+                /* read */
+                "whichBar ",
+
+                /* write */
+                "forbidBreak "
+               );