partial: 1.0.1.jcn

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

diff --git a/lily/bar-grav.cc b/lily/bar-grav.cc
index 0e34557667f75a487e47ad924444b48bfba10960..33e62ad6a9f28ed39b32f65baa03e700f08dcfa7 100644 (file)
--- a/lily/bar-grav.cc
+++ b/lily/bar-grav.cc
@@ -3,17 +3,20 @@
 
   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()
 {
+  bar_p_ =0;
   do_post_move_processing();
 }
 
@@ -33,31 +36,56 @@ Bar_engraver::do_try_request (Request*r_l)
 }
 
 void
-Bar_engraver::do_process_requests()
+Bar_engraver::create_bar ()
 {
-  if (bar_p_)
-    return ;
-  
-  if (bar_req_l_) 
+  if (!bar_p_)
     {
       bar_p_ = new Bar;
-      bar_p_->type_str_=bar_req_l_->type_str_;
+      bar_p_->break_priority_i_  = 0;
+      announce_element (Score_elem_info (bar_p_, bar_req_l_));
+    }
+}
+
+
+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_) 
-       bar_p_ = new Bar;
+       create_bar ();
     }
   
-  if (bar_p_)
-    {
-      announce_element (Score_elem_info (bar_p_, bar_req_l_));
-    }
-  else 
+  if (!bar_p_)
     {
-      Disallow_break_req r;
-      daddy_grav_l()->try_request (&r);
+      Break_req r;
+      r.penalty_i_ = Break_req::DISALLOW;
+      daddy_grav_l ()->try_request (&r);
     }
 }
 
@@ -76,7 +104,6 @@ void
 Bar_engraver::do_post_move_processing()
 {
   bar_req_l_ = 0;
-  bar_p_ =0;
 }