X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-engraver.cc;h=dc2d162fc2c3dd5788539f87402e1083058f84e0;hb=8da6cef580cce3365b219f6aca429b434cb60fcf;hp=7a2a515cdc7456684173e3bc28c71eb673bba4a5;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 7a2a515cdc..dc2d162fc2 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -1,18 +1,43 @@
 /*
-  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--2000 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"
+
+/*
+  generate bars. Either user ("|:"), or default (new measure)
+
+  */
+class Bar_engraver : public Engraver
+{
+public:
+  Bar_engraver();
+  VIRTUAL_COPY_CONS(Translator);
+  void request_bar (String type_str);
+    
+protected:
+  virtual void do_creation_processing ();
+  virtual void do_removal_processing ();
+  virtual void do_process_music();
+  virtual void do_pre_move_processing();
+
+private:
+  void typeset_bar ();
+  void create_bar ();
+
+  Item * bar_p_;
+};
 
 Bar_engraver::Bar_engraver()
 {
@@ -20,86 +45,48 @@ Bar_engraver::Bar_engraver()
   do_post_move_processing();
 }
 
-bool
-Bar_engraver::do_try_request (Request*r_l)
-{
-  Command_req* c_l = dynamic_cast <Command_req *> (r_l);
-  if (!c_l|| !dynamic_cast <Bar_req *> (c_l)) 
-    return false;
-  Bar_req  * b= dynamic_cast <Bar_req *> (c_l);
-  if (bar_req_l_ && bar_req_l_->equal_b (b))
-    return false;
-  
-  bar_req_l_ = b;
-
-  return true;
-}
-
 void
 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_elt_property ("glyph")) != SCM_BOOL_T)
+	  bar_p_->set_elt_property ("glyph", gl);
+      
+      announce_element (bar_p_, 0);
     }
 }
 
-
 void 
 Bar_engraver::do_creation_processing ()
 {
-  create_bar ();
-  bar_p_->type_str_ = "";
 }
 
 void
 Bar_engraver::do_removal_processing ()
 {
-  if (bar_p_) 
-    {
-      typeset_element (bar_p_);
-      bar_p_ =0;
-    }
+  typeset_bar ();
 }
 
+/*
+  Bar_engraver should come *after* any engravers that expect bars to
+  modify whichBar in do_process_music () be typeset
+*/
 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_)
+Bar_engraver::do_process_music()
+{
+  SCM b =get_property ("whichBar");
+  if (gh_string_p (b))
     {
-      Break_req r;
-      r.penalty_i_ = Break_req::DISALLOW;
-      daddy_grav_l ()->try_request (&r);
+      create_bar ();
     }
 }
 
-
-void 
-Bar_engraver::do_pre_move_processing()
+void
+Bar_engraver::typeset_bar ()
 {
   if (bar_p_) 
     {
@@ -108,14 +95,28 @@ Bar_engraver::do_pre_move_processing()
     }
 }
 
-void
-Bar_engraver::do_post_move_processing()
+/*
+  lines may only be broken if there is a barline in all staffs 
+*/
+void 
+Bar_engraver::do_pre_move_processing()
 {
-  bar_req_l_ = 0;
-}
+  if (!bar_p_)
+    {
+      Score_engraver * e = 0;
+      Translator * t  =  daddy_grav_l ();
+      for (; !e && t;  t = t->daddy_trans_l_)
+	{
+	  e = dynamic_cast<Score_engraver*> (t);
+	}
 
+      if (!e)
+	programming_error ("No score engraver!");
+      else
+	e->forbid_breaks ();	// guh. Use properties!
+    }
+  else
+    typeset_bar ();
+}
 
-IMPLEMENT_IS_TYPE_B1(Bar_engraver,Engraver);
 ADD_THIS_TRANSLATOR(Bar_engraver);
-
-