From ba60b5ffa1e16cac7c4c0a650bd7dbd8ef861937 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Mon, 28 Oct 1996 22:38:00 +0000
Subject: [PATCH] lilypond-0.0.5

---
 calcideal.cc | 10 +++++-----
 sccol.cc     |  2 +-
 scores.cc    |  3 +++
 stcol.cc     |  4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/calcideal.cc b/calcideal.cc
index bddd4f2897..1dc0e1d385 100644
--- a/calcideal.cc
+++ b/calcideal.cc
@@ -26,13 +26,13 @@ Score::connect_nonmus(PCol* c1, PCol *c2, Real d)
 	do_connect(c1,c2,d);
 
 	// alert! this is broken!
-	if (c1->breakable) {
+	if (c1->breakable()) {
 	    do_connect(c1->postbreak, c2,d);
 	}
-	if (c2->breakable) {
+	if (c2->breakable()) {
 	    do_connect(c1, c2->prebreak,d);
 	}
-	if (c1->breakable &&c2->breakable) {
+	if (c1->breakable() &&c2->breakable()) {
 	    do_connect(c1->postbreak, c2->prebreak,d);	    
 	}	
     }
@@ -49,8 +49,8 @@ Score::calc_idealspacing()
     for (; sc.ok(); sc++) {
 	if (sc->musical)
 	    for (int i=0; i < sc->durations.sz(); i++) {
-		Mtime d = sc->durations[i];
-		Real dist = duration_to_idealspace(d, paper->whole_width);
+		Real d = sc->durations[i];
+		Real dist = duration_to_idealspace(d, paper_->whole_width);
 		PCol * c2 = find_col(sc->when + d,true)->pcol;
 		connect_nonmus(sc->pcol, c2, dist);
 		c2 = find_col(sc->when + d,false)->pcol;
diff --git a/sccol.cc b/sccol.cc
index 28955332d5..1dfc8f2176 100644
--- a/sccol.cc
+++ b/sccol.cc
@@ -1,7 +1,7 @@
 #include "sccol.hh"
 #include "debug.hh"
 
-Score_column::Score_column(Mtime w)
+Score_column::Score_column(Real w)
 {
     when = w;
     pcol = new PCol(0);
diff --git a/scores.cc b/scores.cc
index cb06b0074f..46685d6050 100644
--- a/scores.cc
+++ b/scores.cc
@@ -1,5 +1,6 @@
 #include "main.hh"
 #include "score.hh"
+#include "string.hh"
 
 static svec<Score*> sv;
 
@@ -11,6 +12,8 @@ do_scores()
     for (int i=0; i < sv.sz(); i++) {	
 	sv[i]->process();
 	sv[i]->output(outfn);
+	delete sv[i];
+	sv[i] =0;
     }
 }
 
diff --git a/stcol.cc b/stcol.cc
index e9a80c8e36..799daed316 100644
--- a/stcol.cc
+++ b/stcol.cc
@@ -8,7 +8,7 @@ Staff_column::mus() const
     return score_column->musical;
 }
 
-Mtime
+Real
 Staff_column::when() const
 {
     return score_column->when;
@@ -17,7 +17,7 @@ Staff_column::when() const
 void
 Staff_column::add(Voice_element*ve)
 {
-    Mtime d= ve->duration;
+    Real d= ve->duration;
     if (d){
 	score_column->durations.add(d);
     }
-- 
2.11.4.GIT