lilypond-0.0.5

diff --git a/calcideal.cc b/calcideal.cc
index bddd4f28970f7b76ac0deb5b8c8eebc2b0fba4c3..1dc0e1d3859e79f73d02e35bf6b8aad1e2f37465 100644 (file)
--- 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 28955332d5482d326dd78725e2bb2226048c4c42..1dfc8f21764c9c898fef527a15071410e42caa3e 100644 (file)
--- 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 cb06b0074ff8f637d7e984b8198f113742dd12ff..46685d605053be9908837a359c8f158d54b50c00 100644 (file)
--- 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 e9a80c8e3622fb0a1815c68c5909355dcf1f60de..799daed31641fa4aa23e078a8edc7f4429b29821 100644 (file)
--- 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);
     }