From: fred <fred>
Date: Sun, 24 Mar 2002 19:27:37 +0000 (+0000)
Subject: lilypond-0.0.22
X-Git-Tag: release/1.5.59~5627
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=75697bb0244e50a2d28f5d53d985648f6faed2b8;p=lilypond.git

lilypond-0.0.22
---

diff --git a/src/voice.cc b/src/voice.cc
index 9c474f81bb..f4372893af 100644
--- a/src/voice.cc
+++ b/src/voice.cc
@@ -4,7 +4,9 @@
 
 Voice::Voice(Voice const&src)
 {
-    PL_copy(elts, src.elts);
+    for (iter_top(src.elts, i); i.ok(); i++)
+	add(new Voice_element(**i));
+
     start = src.start;
 }
 
@@ -57,7 +59,7 @@ Voice_element::add(Request*r)
 	assert (!duration);	    
 	duration = r->duration();
     }
-    r->elt = this;
+    r->elt_l_ = this;
     reqs.bottom().add(r);
 }
 
@@ -71,9 +73,8 @@ Voice_element::Voice_element()
 
 Voice_element::Voice_element(Voice_element const&src)
 {
-    duration=src.duration;
     voice_=src.voice_;
-    IPointerList__copy(Request*, reqs, src.reqs, clone());
+    for (iter_top(src.reqs, i); i.ok(); i++)
+	add(i->clone());
     group=src.group;
-//    assert(!granted_items.size() && !granted_spanners.size());
 }