partial: 1.0.1.jcn

[lilypond.git] / lily / bar-grav.cc

diff --git a/lily/bar-grav.cc b/lily/bar-grav.cc
index 8bcfd80ce727217abde1d8a1c84cabc09e4e81cf..33e62ad6a9f28ed39b32f65baa03e700f08dcfa7 100644 (file)
--- a/lily/bar-grav.cc
+++ b/lily/bar-grav.cc
@@ -3,50 +3,89 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #include "bar-grav.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"
 
 Bar_engraver::Bar_engraver()
 {
-    do_post_move_processing();
+  bar_p_ =0;
+  do_post_move_processing();
 }
 
 bool
-Bar_engraver::do_try_request(Request*r_l)
+Bar_engraver::do_try_request (Request*r_l)
 {
-    Command_req* c_l = r_l->command();
-    if (!c_l|| !c_l->bar()) 
-       return false;
-    Bar_req  * b= c_l->bar();
-    if (bar_req_l_ && bar_req_l_->compare(*b))
-       return false;
-    
-    bar_req_l_ = b;
-
-    return true;
+  Command_req* c_l = r_l->command();
+  if (!c_l|| !c_l->bar()) 
+    return false;
+  Bar_req  * b= c_l->bar();
+  if (bar_req_l_ && bar_req_l_->equal_b (b))
+    return false;
+  
+  bar_req_l_ = b;
+
+  return true;
 }
 
 void
-Bar_engraver::do_process_requests()
+Bar_engraver::create_bar ()
 {
-    if (bar_req_l_ ) {
-       bar_p_ = new Bar;
-       bar_p_->type_str_=bar_req_l_->type_str_;
-    } else if (!get_staff_info().time_C_->whole_in_measure_) {
-       bar_p_ = new Bar;
+  if (!bar_p_)
+    {
+      bar_p_ = new Bar;
+      bar_p_->break_priority_i_  = 0;
+      announce_element (Score_elem_info (bar_p_, bar_req_l_));
     }
-    
-    if (bar_p_){
-       announce_element(Score_elem_info(bar_p_, bar_req_l_) );
-    } else {
-       Disallow_break_req r;
-       daddy_grav_l_->try_request(&r);
+}
+
+
+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;
+    }
+}
+
+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_;
+      if (time && !time->whole_in_measure_) 
+       create_bar ();
+    }
+  
+  if (!bar_p_)
+    {
+      Break_req r;
+      r.penalty_i_ = Break_req::DISALLOW;
+      daddy_grav_l ()->try_request (&r);
     }
 }
 
@@ -54,21 +93,21 @@ Bar_engraver::do_process_requests()
 void 
 Bar_engraver::do_pre_move_processing()
 {
-      if (bar_p_) {
-         typeset_breakable_item(bar_p_);
-         bar_p_ =0;
-      }
+  if (bar_p_) 
+    {
+      typeset_element (bar_p_);
+      bar_p_ =0;
+    }
 }
 
 void
 Bar_engraver::do_post_move_processing()
 {
-    bar_req_l_ = 0;
-    bar_p_ =0;
+  bar_req_l_ = 0;
 }
 
-IMPLEMENT_STATIC_NAME(Bar_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Bar_engraver,Engraver);
-ADD_THIS_ENGRAVER(Bar_engraver);
+ADD_THIS_TRANSLATOR(Bar_engraver);