From 4aea181501099f47152166364e045d7f61bff64b Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:33:04 +0000
Subject: [PATCH] lilypond-0.0.34

---
 input/martien.ly   | 25 ++++---------------------
 src/staffwalker.cc |  7 +++++--
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/input/martien.ly b/input/martien.ly
index 683f14d464..86c737badc 100644
--- a/input/martien.ly
+++ b/input/martien.ly
@@ -42,37 +42,20 @@ score {
 	commands {
 		meter {2*4}
 %		key $fis$
-		skip 56*2
+		skip {56*2}
 %		key $bes es as$
-		skip 8*2
+		skip {8*2}
 		meter {6*8}
-		skip 48*8
+		skip{ 48*8}
 		meter {2*4}
-		skip 16*2
+		skip {16*2}
 %		key $fis$
 	}
 	paper {
-%		unitspace 16mm
 		unitspace 24mm
 		width 195mm
 		output "martien.out"
 	}
-	staff { 
-		midi_track 
-		music { alto }
-	}
-	staff { 
-		midi_track 
-		music { violin1 }
-	}
-	staff { 
-		midi_track 
-		music { violin2 }
-	} 
-	staff { 
-		midi_track 
-		music { cello }
-	} 
 	midi { 
 		tempo 4:80
 	}
diff --git a/src/staffwalker.cc b/src/staffwalker.cc
index d93243255d..bba82e38b8 100644
--- a/src/staffwalker.cc
+++ b/src/staffwalker.cc
@@ -30,11 +30,13 @@ Staff_walker::Staff_walker(Staff_walker const &s)
 }
 
 Staff_walker::Staff_walker(Staff * s, PScore*ps )
-    : PCursor<Staff_column*> (s->cols)
+    : PCursor<Staff_column*> (s->cols_)
 {
     staff_l_ = s;
     pscore_l_ = ps;
-    default_grouping = new Rhythmic_grouping(MInterval(0, 1), 4); // should be in tdes. TODO
+    
+    // should be in tdes. TODO
+    default_grouping = new Rhythmic_grouping(MInterval(0, 1), 4); 
     score_walk_l_ = 0;
 }
 
@@ -98,6 +100,7 @@ Staff_walker::process()
     process_timing_reqs();    
     process_requests();
 }
+
 void 
 Staff_walker::allow_break()
 {
-- 
2.39.5