From 4bfd532f6c822436edc8c511ccd9cbca65283faf Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 21:47:17 +0000
Subject: [PATCH] lilypond-1.1.31

---
 lily/bar-engraver.cc         | 11 ++++-------
 lily/include/bar-engraver.hh |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 5d3993f232..e7bdb019ac 100644
--- 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 143f5831cb..647a47e05d 100644
--- 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
-- 
2.39.5