X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-engraver.cc;h=3d751ecf1282ef88d750761a2f71ddcc5424a55d;hb=bb91de5b7f8c4f753452730101c2422946067cc3;hp=2f1e8ee051b78360eb4d564fed347606b89cdfaa;hpb=afa5829cd270e1b0c616b7ba5c5e6cdc0e920e5f;p=lilypond.git

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 2f1e8ee051..3d751ecf12 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -1,124 +1,118 @@
 /*
-  bar-reg.cc -- implement Bar_engraver
+  bar-engraver.cc -- implement Bar_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "bar-engraver.hh"
-#include "bar.hh"
-#include "musical-request.hh"
-#include "multi-measure-rest.hh"
-#include "command-request.hh"
-#include "time-description.hh"
-#include "engraver-group.hh"
-#include "repeated-music.hh"
+#include "bar-line.hh"
+#include "context.hh"
+#include "score-engraver.hh"
+#include "warn.hh"
+#include "item.hh"
+#include "spanner.hh"
 
-Bar_engraver::Bar_engraver()
-{
-  bar_p_ =0;
-  do_post_move_processing();
-}
+#include "translator.icc"
 
-bool
-Bar_engraver::do_try_music (Music*r_l)
+/*
+  generate bars. Either user ("|:"), or default (new measure)
+*/
+class Bar_engraver : public Engraver
 {
-  if (Bar_req  * b= dynamic_cast <Bar_req *> (r_l))
-    {
-      if (bar_req_l_ && bar_req_l_->equal_b (b)) // huh?
-	return false;
-      
-      bar_req_l_ = b;
+public:
+  TRANSLATOR_DECLARATIONS (Bar_engraver);
+  void request_bar (string type_string);
 
-      return true;
-    }
-  
-  return false;
+protected:
+  void stop_translation_timestep ();
+  void process_acknowledged ();
 
-}
+  DECLARE_END_ACKNOWLEDGER (spanner);
 
-void
-Bar_engraver::create_bar ()
-{
-  if (!bar_p_)
-    {
-      bar_p_ = new Bar;
-      bar_p_->break_priority_i_  = 0;
-      String default_type = get_property ("defaultBarType", 0);
-      if (default_type.length_i ())
-	{
-	  bar_p_->type_str_ = default_type;
-	}
-      announce_element (Score_element_info (bar_p_, bar_req_l_));
-    }
-}
+private:
+  void create_bar ();
 
+  Item *bar_;
+  vector<Spanner*> spanners_;
+};
 
-void 
-Bar_engraver::do_creation_processing ()
+Bar_engraver::Bar_engraver ()
 {
-  create_bar ();
-  bar_p_->type_str_ = "";
+  bar_ = 0;
 }
 
 void
-Bar_engraver::do_removal_processing ()
+Bar_engraver::create_bar ()
 {
-  if (bar_p_) 
+  if (!bar_)
     {
-      typeset_element (bar_p_);
-      bar_p_ =0;
+      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);
     }
 }
 
-void
-Bar_engraver::do_process_requests()
-{  
-  if (bar_req_l_) 
-    {
-      if (!bar_p_)
-	create_bar ();    
+/*
+  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.
+*/
 
-      bar_p_->type_str_ = bar_req_l_->type_str_;
-    }
-  else 
-    {
-      Time_description const *time = get_staff_info().time_C_;
-      String always = get_property ("barAlways", 0);
-      if ((time && !time->whole_in_measure_) || always.length_i ()) 
- 	create_bar ();
-    }
+void
+Bar_engraver::process_acknowledged ()
+{
+  if (!bar_ && scm_is_string (get_property ("whichBar")))
+    create_bar ();
 
-  
-  
-  if (!bar_p_)
-    {
-      Break_req r;
-      r.penalty_i_ = Break_req::DISALLOW;
-      daddy_grav_l ()->try_music (&r);
-    }
+  if (bar_)
+    for (vsize i = 0; i < spanners_.size (); i++)
+      spanners_[i]->set_bound (RIGHT, bar_);
 }
 
-
-void 
-Bar_engraver::do_pre_move_processing()
+/*
+  lines may only be broken if there is a barline in all staves
+*/
+void
+Bar_engraver::stop_translation_timestep ()
 {
-  if (bar_p_) 
-    {
-      typeset_element (bar_p_);
-      bar_p_ =0;
-    }
+  if (!bar_)
+    context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
+
+  bar_ = 0;
+  spanners_.clear ();
 }
 
 void
-Bar_engraver::do_post_move_processing()
+Bar_engraver::acknowledge_end_spanner (Grob_info gi)
 {
-  bar_req_l_ = 0;
+  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.",
 
-ADD_THIS_TRANSLATOR(Bar_engraver);
+		/* create */
+		"BarLine ",
 
+		/* read */
+		"whichBar ",
 
+		/* write */
+		"forbidBreak "
+		);