From: fred <fred>
Date: Sun, 24 Mar 2002 19:53:36 +0000 (+0000)
Subject: lilypond-0.1.7
X-Git-Tag: release/1.5.59~4129
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=340b2b167b5f33f2d5032166cd5085cd5182c2e0;p=lilypond.git

lilypond-0.1.7
---

diff --git a/lily/collision-grav.cc b/lily/collision-grav.cc
index 2a4903d105..8eaa7cd30f 100644
--- a/lily/collision-grav.cc
+++ b/lily/collision-grav.cc
@@ -16,9 +16,10 @@ Collision_engraver::acknowledge_element(Score_elem_info i)
     if (!(i.elem_l_->name() == Note_column::static_name()))
 	return;
 
-    if (!col_p_)
+    if (!col_p_) {
 	col_p_ = new Collision;
-    
+	announce_element(Score_elem_info(col_p_,0));
+    }
     col_p_->add((Note_column*)i.elem_l_->item());
 }
 
diff --git a/lily/include/item.hh b/lily/include/item.hh
index dcbae6374f..0768c5885e 100644
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -14,7 +14,7 @@
 #include "score-elem.hh"
 
 /**
- a horizontally fixed size element of the score
+  A horizontally fixed size element of the score.
 
   Item is the datastructure for printables whose width is known
   before the spacing is calculated
@@ -30,7 +30,10 @@ public:
     
     Item * broken_to_a_[2];
 
-    // nobreak = 0, pre =1, post = 2
+    /// should be put in a breakable col.
+    bool breakable_b_;
+    int break_status_i_;
+    /// nobreak = 0, pre = -1, post = 1
     int break_status_i()const;
     Item * find_prebroken_piece(PCol*)const;
     Item * find_prebroken_piece(Line_of_score*)const;    
@@ -47,7 +50,6 @@ protected:
     virtual void do_print()const;
 
     void copy_breakable_items();
-
 };
 
 
diff --git a/lily/rest-collision-grav.cc b/lily/rest-collision-grav.cc
index 29fdac1a3d..bf18c12e1a 100644
--- a/lily/rest-collision-grav.cc
+++ b/lily/rest-collision-grav.cc
@@ -31,8 +31,10 @@ Rest_collision_engraver::acknowledge_element(Score_elem_info i)
     } 
     else if (nC == Note_column::static_name()) {
 	// what should i do, what should _engraver do?
-	if (!rest_collision_p_)
+	if (!rest_collision_p_) {
 	    rest_collision_p_ = new Rest_collision;
+	    announce_element(Score_elem_info(rest_collision_p_, 0));
+	}
 	rest_collision_p_->add((Note_column*)i.elem_l_->item());
     }
     else if (nC == Rest_column::static_name()) {