lilypond-0.0.10

diff --git a/src/calcideal.cc b/src/calcideal.cc
index 8099e0e4c71e04f5c9f1eef963b18bc237cc85f8..051ac4312c99be55bf39d4fedb618d5a9f94bc58 100644 (file)
--- a/src/calcideal.cc
+++ b/src/calcideal.cc
@@ -50,14 +50,14 @@ Score::calc_idealspacing()
            for (int i=0; i < sc->durations.sz(); i++) {
                Real d = sc->durations[i];
                Real dist = paper_->duration_to_dist(d);
-               PCol * c2 = find_col(sc->when + d,true)->pcol;
-               connect_nonmus(sc->pcol, c2, dist);
-               c2 = find_col(sc->when + d,false)->pcol;
-               connect_nonmus(sc->pcol, c2,  dist);
+               PCol * c2 = find_col(sc->when + d,true)->pcol_;
+               connect_nonmus(sc->pcol_, c2, dist);
+               c2 = find_col(sc->when + d,false)->pcol_;
+               connect_nonmus(sc->pcol_, c2,  dist);
            }
        else if (sc->used()) {  // ignore empty columns
-           PCol * c2 = find_col(sc->when,true)->pcol;
-           connect_nonmus(sc->pcol,c2,0.0);
+           PCol * c2 = find_col(sc->when,true)->pcol_;
+           connect_nonmus(sc->pcol_, c2, 0.0);
        }
     }          
 }

diff --git a/src/score.cc b/src/score.cc
index 1df13365f22900bf4ebcf957bab1c28e4a3ff57c..61271961743a9ed70e48ce20137abfc4da36dcb6 100644 (file)
--- a/src/score.cc
+++ b/src/score.cc
@@ -75,7 +75,7 @@ Score::clean_cols()
        sc->clean_cols();
     
     for (PCursor<Score_column*> c(cols_); c.ok(); ) {
-       if (!c->pcol->used) {
+       if (!c->pcol_->used) {
            mtor << "removing : ";
            c->print();
            c.del();
@@ -155,7 +155,7 @@ Score::do_pcols()
 {
     PCursor<Score_column*> sc(cols_);
     for (; sc.ok(); sc++) {
-       pscore_->add(sc->pcol);
+       pscore_->add(sc->pcol_);
     }
 }
 Real