lilypond-1.1.31

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 5d3993f232aa4de588d5d9a9baa4e46d9e71d55a..e7bdb019ac596ecea219ee8252c3a6f646eb7c8b 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -93,8 +93,6 @@ 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
@@ -123,13 +121,12 @@ Bar_engraver::do_process_requests()
     }
   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 ();
        }
     }
   

diff --git a/lily/include/bar-engraver.hh b/lily/include/bar-engraver.hh
index 143f5831cbe3be57062a1ae35906bb1bbc511435..647a47e05d252db17a6ee030e98aaa1b99fbff39 100644 (file)
--- a/lily/include/bar-engraver.hh
+++ b/lily/include/bar-engraver.hh
@@ -37,7 +37,6 @@ private:
 
   Bar_req * bar_req_l_;
   Bar * bar_p_;
-  bool auto_create_bar_b_;
 };
 
 #endif // BAR_ENGRAVER_HH