From: fred <fred>
Date: Sun, 24 Mar 2002 19:45:40 +0000 (+0000)
Subject: lilypond-0.0.70pre
X-Git-Tag: release/1.5.59~4594
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bf81d06a33c6e6c98772900d00a968dc70732ca0;p=lilypond.git

lilypond-0.0.70pre
---

diff --git a/flower/.version b/flower/.version
index e275cb9db0..7a6f85cea4 100644
--- a/flower/.version
+++ b/flower/.version
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 1
 MINOR_VERSION = 1
-PATCH_LEVEL = 19
+PATCH_LEVEL = 20
 # use to send patches, always empty for released version:
 MY_PATCH_LEVEL = # include separator: "-1" or ".a"
 #
diff --git a/flower/NEWS b/flower/NEWS
index 050b1356d8..a642a93eba 100644
--- a/flower/NEWS
+++ b/flower/NEWS
@@ -1,4 +1,6 @@
 version 1.1:
+pl 20
+	- List::junk_links()
 pl 19
 	- Array::reverse()
 
diff --git a/flower/include/list.hh b/flower/include/list.hh
index 343ccffcbc..fcc5e70712 100644
--- a/flower/include/list.hh
+++ b/flower/include/list.hh
@@ -42,6 +42,7 @@ class List
     Cursor<T> top() const;
 
     void OK() const;		// check list
+    void junk_links();
     
  protected:
     friend class Cursor<T>;
diff --git a/flower/include/plist.hh b/flower/include/plist.hh
index 4c9d71dba5..af27832f00 100644
--- a/flower/include/plist.hh
+++ b/flower/include/plist.hh
@@ -30,6 +30,7 @@ class Link_list : public List<void *>
     }
     PCursor<T> find(T) const;
     void concatenate(Link_list<T> const &s) { List<void*>::concatenate(s); }
+
     Link_list() {}
 };
 
diff --git a/lily/p-col.cc b/lily/p-col.cc
index f55ea2452b..eb7a78ef10 100644
--- a/lily/p-col.cc
+++ b/lily/p-col.cc
@@ -27,10 +27,7 @@ void
 PCol::clean_breakable_items()
 {
     if (!line_l_) {
-	for(iter(its.top(), j); j.ok(); ) {
-	    j->unlink();
-	    j.del();
-	}
+	its.junk_links();
     }
     if (prebreak_p_) prebreak_p_->clean_breakable_items();
     if (postbreak_p_) postbreak_p_->clean_breakable_items();
diff --git a/lily/p-score.cc b/lily/p-score.cc
index 44acc399bd..de266d1b20 100644
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -216,6 +216,14 @@ PScore::set_breaking(Array<Col_hpositions> const &breaking)
 	    typeset_broken_spanner(span_p);
 	}
     }
+    for (iter(elem_p_list_.top(),i ); i.ok() ;) {
+	Item *i_l =i->item();
+	if ( i_l && !i_l->pcol_l_->line_l_) {
+	    i_l->unlink();
+	    delete i.remove_p();
+	} else
+	    i++;
+    }
 
     for (iter_top(cols, i); i.ok(); i++)
 	i->clean_breakable_items();