release: 1.1.51

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 62b5f70ffd4e24a5f7b5d1cbbbea069fe866ce9e..04eca124294c70aba9497db0b6e3ce39a698fb5f 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -8,18 +8,16 @@
 */
 
 #include "bar-engraver.hh"
-#include "bar.hh"
+#include "staff-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 "engraver-group-engraver.hh"
 
 Bar_engraver::Bar_engraver()
 {
   bar_p_ =0;
-  bar_l_ =0;
   do_post_move_processing();
 }
 
@@ -32,7 +30,6 @@ Bar_engraver::do_try_music (Music*r_l)
        return false;
       
       bar_req_l_ = b;
-
       return true;
     }
   
@@ -40,41 +37,58 @@ Bar_engraver::do_try_music (Music*r_l)
 
 }
 
-void
-Bar_engraver::acknowledge_element (Score_element_info i)
-{
-  if (Bar *b = dynamic_cast<Bar *> (i.elem_l_))
-    {
-      bar_l_ = b;
-      //      auto_create_bar_b_ = false;
-    }
-}
+
 
 void
 Bar_engraver::create_bar ()
 {
   if (!bar_p_)
     {
-      bar_p_ = new Bar;
-      bar_p_->break_priority_i_  = 0;
+      bar_p_ = new Staff_bar;
+      bar_p_->set_elt_property (break_priority_scm_sym, gh_int2scm (0));
+
       // urg: "" != empty...
       String default_type = get_property ("defaultBarType", 0);
       if (default_type.length_i ())
        {
          bar_p_->type_str_ = default_type;
        }
+
+      /*
+       urg.  Why did I implement this?
+       */
+      Scalar prop = get_property ("barAtLineStart", 0);
+      if (prop.to_bool ())
+       {
+         bar_p_->set_elt_property (at_line_start_scm_sym, SCM_BOOL_T);
+       }
       announce_element (Score_element_info (bar_p_, bar_req_l_));
     }
 }
 
+void
+Bar_engraver::request_bar (String type_str)
+{
+  Scalar prop = get_property ("barAtLineStart", 0);
+  if (!now_mom ())
+    {
+      Scalar prop = get_property ("barAtLineStart", 0);
+      if (!prop.to_bool ())
+       return;
+    }
+  create_bar ();
+  if (((type_str == "|:") && (bar_p_->type_str_ == ":|"))
+    || ((type_str == ":|") && (bar_p_->type_str_ == "|:")))
+    bar_p_->type_str_ = ":|:";
+  else
+    bar_p_->type_str_ = type_str;
+}
 
 void 
 Bar_engraver::do_creation_processing ()
 {
   create_bar ();
   bar_p_->type_str_ = "";
-  Scalar prop = get_property ("barAuto", 0);
-  auto_create_bar_b_ = prop.to_bool ();
 }
 
 void
@@ -93,33 +107,26 @@ Bar_engraver::do_process_requests()
   Time_description const *time = get_staff_info().time_C_;
   if (bar_req_l_) 
     {
-      if (!bar_p_)
-       create_bar ();    
-
+      create_bar ();    
       bar_p_->type_str_ = bar_req_l_->type_str_;
     }
+  else if (!now_mom ())
+    {
+      create_bar ();
+      bar_p_->type_str_ = "|";
+    }
   else 
     {
-      Scalar always = get_property ("barAlways", 0);
-      if ((time && !time->whole_in_measure_) || always.to_bool ())
+      Scalar nonauto = get_property ("barNonAuto", 0);
+      if (!nonauto.to_bool ())
        {
-         if (auto_create_bar_b_)
+         Scalar always = get_property ("barAlways", 0);
+         if ((time && !time->whole_in_measure_) || always.to_bool ())
            create_bar ();
-         Scalar prop = get_property ("barAuto", 0);
-         auto_create_bar_b_ = prop.to_bool ();
        }
     }
   
-  /*
-    hmm, perhaps it's Better to create empty bars if you want none
-    displayed, and keep bars for breakpoints ?
-   */
-#if 0
-  if ((time && time->whole_in_measure_)
-      && !always.to_bool ()
-      && !bar_p_ && !bar_l_)
-#endif
-  if (!bar_p_ && !bar_l_)
+  if (!bar_p_)
     {
       Break_req r;
       r.penalty_i_ = Break_req::DISALLOW;
@@ -131,15 +138,6 @@ Bar_engraver::do_process_requests()
 void 
 Bar_engraver::do_pre_move_processing()
 {
-  if (bar_l_)
-    {
-      bar_l_ = 0;
-      if (bar_p_)
-       {
-         bar_p_->unlink ();
-         bar_p_ = 0;
-       }
-    }
   if (bar_p_) 
     {
       typeset_element (bar_p_);