From 6b892caca39f04aa6388b06e50a269cbd2d1bee6 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:05:57 +0000
Subject: [PATCH] lilypond-0.1.46

---
 TODO             |  2 ++
 lily/bar-grav.cc | 30 +++++++++++++++++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/TODO b/TODO
index 7a203a5307..ae2a8a6eb3 100644
--- a/TODO
+++ b/TODO
@@ -7,6 +7,8 @@ Most of the items are marked in the code as well, with full explanation.
 grep for TODO and ugh/ugr
 
 0.2:
+	* abbrevs
+
 	* use kpsepath to find all TeX dirs
 	- configure.in 
 	- clean-fonts.sh
diff --git a/lily/bar-grav.cc b/lily/bar-grav.cc
index 2d43282523..4ca3bdac19 100644
--- a/lily/bar-grav.cc
+++ b/lily/bar-grav.cc
@@ -14,6 +14,7 @@
 
 Bar_engraver::Bar_engraver()
 {
+  bar_p_ =0;
   do_post_move_processing();
 }
 
@@ -43,16 +44,32 @@ Bar_engraver::create_bar ()
     }
 }
 
+void 
+Bar_engraver::do_creation_processing ()
+{
+  create_bar ();
+  bar_p_->type_str_ = "";
+}
+
 void
-Bar_engraver::do_process_requests()
+Bar_engraver::do_removal_processing ()
 {
-  if (bar_p_)
-    return ;
-  
+  if (bar_p_) 
+    {
+      typeset_element (bar_p_);
+      bar_p_ =0;
+    }
+}
+
+void
+Bar_engraver::do_process_requests()
+{  
   if (bar_req_l_) 
     {
-      create_bar ();
-      bar_p_->type_str_=bar_req_l_->type_str_;
+      if (!bar_p_)
+	create_bar ();    
+
+      bar_p_->type_str_ = bar_req_l_->type_str_;
     }
   else 
     {
@@ -83,7 +100,6 @@ void
 Bar_engraver::do_post_move_processing()
 {
   bar_req_l_ = 0;
-  bar_p_ =0;
 }
 
 
-- 
2.39.5