From f099f935f96349e5c359d4ccbcb526e2b881167b Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:57:22 +0000
Subject: [PATCH] lilypond-0.1.14

---
 lily/clef-item.cc             |  2 +-
 lily/horizontal-align-item.cc | 10 ++++++++--
 lily/key-item.cc              |  3 ++-
 lily/script.cc                |  3 ++-
 lily/span-bar.cc              |  4 ++--
 lily/span-score-bar.cc        |  3 ++-
 lily/vertical-align-elem.cc   |  2 +-
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index fc579ec347..920d2c5512 100644
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -21,7 +21,7 @@ Clef_item::do_pre_processing()
 
   if (default_b_)
     {
-      empty_b_ = (break_status_i() != 1);
+      set_empty(break_status_i() != 1);
       transparent_b_ = (break_status_i() != 1);
     }
 }
diff --git a/lily/horizontal-align-item.cc b/lily/horizontal-align-item.cc
index 48701d148a..6e63be3daa 100644
--- a/lily/horizontal-align-item.cc
+++ b/lily/horizontal-align-item.cc
@@ -7,7 +7,7 @@
 */
 
 #include "horizontal-align-item.hh"
-
+#include "debug.hh"
 
 IMPLEMENT_IS_TYPE_B1(Horizontal_align_item,Item);
 
@@ -114,12 +114,18 @@ Horizontal_align_item::do_width() const
 void
 Horizontal_align_item::do_print() const
 {
+#ifndef NPRINT
+  Item::do_print ();
+  DOUT << "contains: ";
+  for (int i=0 ;  i < item_l_arr_.size(); i++) 
+    DOUT << item_l_arr_[i]->name () << ", ";
+#endif
 }
 
 Horizontal_align_item::Horizontal_align_item()
 {
   center_l_ = 0;
   align_i_ = 0;
-  empty_b_ = true;
+  set_empty (true);
   transparent_b_ = true;
 }
diff --git a/lily/key-item.cc b/lily/key-item.cc
index d328f44ac9..f3b57d20a1 100644
--- a/lily/key-item.cc
+++ b/lily/key-item.cc
@@ -94,6 +94,7 @@ Key_item::do_pre_processing()
 {
   if (default_b_) 
     {
-	empty_b_ = transparent_b_ = (break_status_i() != 1);
+	transparent_b_ = (break_status_i() != 1);
+	set_empty (transparent_b_);
     }
 }
diff --git a/lily/script.cc b/lily/script.cc
index ea3bfbef20..073fc7cd93 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -80,7 +80,8 @@ Script::do_pre_processing()
 {
   if  (breakable_b_ && break_status_i() != 1) 
     {
-      transparent_b_ = empty_b_ = true;
+      transparent_b_ = true;
+      set_empty (true);
     }
   
   if (!dir_)
diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index ba2c3739f2..e23b322678 100644
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -63,7 +63,7 @@ Span_bar::do_pre_processing()
   if (spanning_l_arr_.size() < 1) 
     {
       transparent_b_ = true;
-      empty_b_ =true;
+      set_empty (true);   
     }
   else 
     {
@@ -72,7 +72,7 @@ Span_bar::do_pre_processing()
       if (!type_str_) 
 	{
 	  transparent_b_=true;
-	  empty_b_ = true;
+	  set_empty (true);
 	}
       else if (type_str_ == "|:") 
 	{
diff --git a/lily/span-score-bar.cc b/lily/span-score-bar.cc
index 96c73a9d1d..97b195ef1e 100644
--- a/lily/span-score-bar.cc
+++ b/lily/span-score-bar.cc
@@ -23,7 +23,8 @@ Span_score_bar::do_pre_processing()
   
   if (break_status_i() != 1) 
     {
-	empty_b_ = transparent_b_ = true;
+      set_empty (true);
+      transparent_b_ = true;
     }
 }
 
diff --git a/lily/vertical-align-elem.cc b/lily/vertical-align-elem.cc
index 02d1823b25..4f83ba1b7b 100644
--- a/lily/vertical-align-elem.cc
+++ b/lily/vertical-align-elem.cc
@@ -64,7 +64,7 @@ Vertical_align_element::contains_b (Score_elem const *e) const
 Vertical_align_element::Vertical_align_element()
 {
   transparent_b_ = true;
-  empty_b_ =true;
+  set_empty (true);
 }
 
 
-- 
2.39.5