From: fred <fred>
Date: Sat, 21 Dec 1996 10:51:13 +0000 (+0000)
Subject: lilypond-0.0.19
X-Git-Tag: release/1.5.59~6526
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b9d2e54d2dc97e299d20c98db7cf9dcca6a8c972;p=lilypond.git

lilypond-0.0.19
---

diff --git a/src/staff.cc b/src/staff.cc
index f3d6a063be..03e22a0398 100644
--- a/src/staff.cc
+++ b/src/staff.cc
@@ -99,9 +99,23 @@ Staff::setup_staffcols()
     }
 
     for (PCursor<Staff_commands_at*> cc(*staff_commands_); cc.ok(); cc++) {
-	Staff_column *sc=get_col(cc->when,false);
-	for (PCursor<Command*> i(**cc); i.ok(); i++)
-	    sc->s_commands.add(i);
+	Staff_column *sc=get_col(cc->moment_.when,false);
+	sc->s_commands = cc;
+	sc->moment_ = new Moment(cc->moment_);
+    }
+
+    PCursor<Staff_commands_at*> cc(*staff_commands_);
+    for (PCursor<Staff_column*> i(cols); i.ok(); i++) {
+	while  ((cc+1).ok() && (cc+1)->when() < i->when())
+	    cc++;
+	
+	if(!i->moment_) {
+	    if (cc->moment_.when == i->when())
+		i->moment_ = new Moment(cc->moment_);
+	    else
+		i->moment_ = new Moment(
+		    i->when() - cc->when() ,&cc->moment_);
+	}
     }
 }
 
@@ -150,7 +164,7 @@ Staff::print() const
 }
 
 Staff::Staff()
-{
+{    
     staff_commands_ = 0;
     score_ =0;
     pscore_=0;