X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-engraver.cc;h=b18bdf251da3805ac41fea4247fcc1a835a020fb;hb=46340a068e743b3b35175c80b811c0b3860512ea;hp=456a13cf400387bb7dcc3d82481482b75b3128f7;hpb=31653bf1d61a33ef8bc8c871d60c6b3452d04d28;p=lilypond.git

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 456a13cf40..b18bdf251d 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -1,40 +1,45 @@
 /*
-  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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "bar-engraver.hh"
 #include "bar.hh"
+#include "score-engraver.hh"
 #include "musical-request.hh"
-#include "multi-measure-rest.hh"
-#include "command-request.hh"
-#include "time-description.hh"
-#include "engraver-group.hh"
+#include "engraver-group-engraver.hh"
+#include "warn.hh"
+#include "item.hh"
+#include "engraver.hh"
 
-Bar_engraver::Bar_engraver()
-{
-  bar_p_ =0;
-  do_post_move_processing();
-}
+/*
+  generate bars. Either user ("|:"), or default (new measure)
 
-bool
-Bar_engraver::do_try_request (Request*r_l)
+  */
+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;
-
-      return true;
-    }
-  
-  return false;
-
+public:
+  TRANSLATOR_DECLARATIONS(  Bar_engraver );
+  void request_bar (String type_str);
+    
+protected:
+  virtual void finalize ();
+  virtual void stop_translation_timestep ();
+  virtual void create_grobs ();
+
+private:
+  void typeset_bar ();
+  void create_bar ();
+
+  Item * bar_p_;
+};
+
+Bar_engraver::Bar_engraver ()
+{
+  bar_p_ =0;
 }
 
 void
@@ -42,82 +47,64 @@ Bar_engraver::create_bar ()
 {
   if (!bar_p_)
     {
-      bar_p_ = new Bar;
-      bar_p_->break_priority_i_  = 0;
-      String default_type = get_property ("defaultBarType");
-      if (default_type.length_i ())
-	{
-	  bar_p_->type_str_ = default_type;
-	}
-      announce_element (Score_element_info (bar_p_, bar_req_l_));
+      bar_p_ = new Item (get_property ("BarLine"));
+
+      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);
     }
 }
 
-
-void 
-Bar_engraver::do_creation_processing ()
+void
+Bar_engraver::finalize ()
 {
-  create_bar ();
-  bar_p_->type_str_ = "";
+  typeset_bar ();
 }
 
+/*
+  Bar_engraver should come *after* any engravers that  
+  modify whichBar
+*/
 void
-Bar_engraver::do_removal_processing ()
+Bar_engraver::create_grobs ()
 {
-  if (bar_p_) 
+  if (!bar_p_ && gh_string_p (get_property ("whichBar")))
     {
-      typeset_element (bar_p_);
-      bar_p_ =0;
+      create_bar ();
     }
 }
 
 void
-Bar_engraver::do_process_requests()
-{  
-  if (bar_req_l_) 
-    {
-      if (!bar_p_)
-	create_bar ();    
-
-      bar_p_->type_str_ = bar_req_l_->type_str_;
-    }
-  else 
-    {
-      Time_description const *time = get_staff_info().time_C_;
-      String always = get_property ("barAlways");
-      if ((time && !time->whole_in_measure_) || always.length_i ()) 
- 	create_bar ();
-    }
-
-  
-  
-  if (!bar_p_)
-    {
-      Break_req r;
-      r.penalty_i_ = Break_req::DISALLOW;
-      daddy_grav_l ()->try_request (&r);
-    }
-}
-
-
-void 
-Bar_engraver::do_pre_move_processing()
+Bar_engraver::typeset_bar ()
 {
   if (bar_p_) 
     {
-      typeset_element (bar_p_);
+      typeset_grob (bar_p_);
       bar_p_ =0;
     }
 }
 
-void
-Bar_engraver::do_post_move_processing()
+/*
+  lines may only be broken if there is a barline in all staves 
+*/
+void 
+Bar_engraver::stop_translation_timestep ()
 {
-  bar_req_l_ = 0;
+  if (!bar_p_)
+    {
+      top_engraver ()->forbid_breaks ();	// guh. Use properties!
+    }
+  else
+    typeset_bar ();
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Bar_engraver,Engraver);
-ADD_THIS_TRANSLATOR(Bar_engraver);
-
-
+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 */       "");