X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-engraver.cc;h=6bf118ae8b31a10ab4b06b6c5877be0adac594c2;hb=8574d4349026c4ac5a15a27c50e264bf548e29fb;hp=b18bdf251da3805ac41fea4247fcc1a835a020fb;hpb=d4bd65ce87936a9b2abdbf941ad572bda4e76768;p=lilypond.git

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index b18bdf251d..6bf118ae8b 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -3,108 +3,116 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "bar.hh"
+#include "bar-line.hh"
+#include "context.hh"
 #include "score-engraver.hh"
-#include "musical-request.hh"
-#include "engraver-group-engraver.hh"
 #include "warn.hh"
 #include "item.hh"
-#include "engraver.hh"
+#include "spanner.hh"
+
+#include "translator.icc"
 
 /*
   generate bars. Either user ("|:"), or default (new measure)
-
-  */
+*/
 class Bar_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(  Bar_engraver );
-  void request_bar (String type_str);
-    
+  TRANSLATOR_DECLARATIONS (Bar_engraver);
+  void request_bar (string type_string);
+
 protected:
-  virtual void finalize ();
-  virtual void stop_translation_timestep ();
-  virtual void create_grobs ();
+  void stop_translation_timestep ();
+  void process_acknowledged ();
+
+  DECLARE_END_ACKNOWLEDGER (spanner);
 
 private:
-  void typeset_bar ();
   void create_bar ();
 
-  Item * bar_p_;
+  Item *bar_;
+  vector<Spanner*> spanners_;
 };
 
 Bar_engraver::Bar_engraver ()
 {
-  bar_p_ =0;
+  bar_ = 0;
 }
 
 void
 Bar_engraver::create_bar ()
 {
-  if (!bar_p_)
+  if (!bar_)
     {
-      bar_p_ = new Item (get_property ("BarLine"));
-
+      bar_ = make_item ("BarLine", SCM_EOL);
       SCM gl = get_property ("whichBar");
-      if (scm_equal_p (gl, bar_p_->get_grob_property ("glyph")) != SCM_BOOL_T)
-	  bar_p_->set_grob_property ("glyph", gl);
-      
-      announce_grob (bar_p_, 0);
+      if (scm_equal_p (gl, bar_->get_property ("glyph")) != SCM_BOOL_T)
+	bar_->set_property ("glyph", gl);
     }
 }
 
+/*
+  Bar_engraver should come *after* any engravers that
+  modify whichBar
+
+  This is a little hairy : whichBar may be set by
+  Repeat_acknowledge_engraver::process_music, which is at score
+  context. This means that grobs could should be created after
+  process_music. We do stuff process_acknowledged (), just to be
+  on the safe side.
+*/
+
 void
-Bar_engraver::finalize ()
+Bar_engraver::process_acknowledged ()
 {
-  typeset_bar ();
+  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_);
 }
 
 /*
-  Bar_engraver should come *after* any engravers that  
-  modify whichBar
+  lines may only be broken if there is a barline in all staves
 */
 void
-Bar_engraver::create_grobs ()
+Bar_engraver::stop_translation_timestep ()
 {
-  if (!bar_p_ && gh_string_p (get_property ("whichBar")))
-    {
-      create_bar ();
-    }
+  if (!bar_)
+    context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
+
+  bar_ = 0;
+  spanners_.clear ();
 }
 
 void
-Bar_engraver::typeset_bar ()
+Bar_engraver::acknowledge_end_spanner (Grob_info gi)
 {
-  if (bar_p_) 
-    {
-      typeset_grob (bar_p_);
-      bar_p_ =0;
-    }
-}
+  Grob *g = gi.grob ();
 
-/*
-  lines may only be broken if there is a barline in all staves 
-*/
-void 
-Bar_engraver::stop_translation_timestep ()
-{
-  if (!bar_p_)
-    {
-      top_engraver ()->forbid_breaks ();	// guh. Use properties!
-    }
-  else
-    typeset_bar ();
+  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 ",
 
-ENTER_DESCRIPTION(Bar_engraver,
-/* descr */       "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",
-/* creats*/       "BarLine",
-/* acks  */       "",
-/* reads */       "whichBar stavesFound",
-/* write */       "");
+		/* write */
+		"forbidBreak "
+		);