lilypond-0.0.18

diff --git a/hdr/pscore.hh b/hdr/pscore.hh
index 00fb79bccc1bf737f6036e4b05b83c28bd44fdaf..33741e926328feeb9f93abc4fb8c85584342585c 100644 (file)
--- a/hdr/pscore.hh
+++ b/hdr/pscore.hh
@@ -55,13 +55,13 @@ struct PScore {
     void postprocess();
     
     /// search all pcols which are breakable.
-    svec<const PCol *> find_breaks() const;
+    svec< PCol *> find_breaks() const;
 
     /// add a line to the broken stuff. Positions given in #config#
-    void add_line(svec<const PCol *> curline, svec<Real> config);
+    void add_line(svec< PCol *> curline, svec<Real> config);
 
     /// helper: solve for the columns in #curline#.
-    svec<Real> solve_line(svec<const PCol *> curline) const;
+    svec<Real> solve_line(svec<PCol *> curline) const;
 
     void add(PStaff *);
     /// add item
@@ -83,7 +83,7 @@ struct PScore {
     */
 
     /// return argument as a cursor.
-    PCursor<PCol *> find_col(const PCol *)const;
+    PCursor<PCol *> find_col(PCol *)const;
 
     /// delete unused columns
     void clean_cols();
@@ -98,10 +98,10 @@ struct PScore {
     void print() const;
 
     /// does curline fit on the paper?
-    bool feasible(svec<const PCol *> curline) const;
+    bool feasible(svec<PCol *> curline) const;
 
     /// which is first (left, higher)
-    int compare_pcols(const PCol*, const PCol*)const;
+    int compare_pcols( PCol*, PCol*)const;
 };
 /** notes, signs, symbols in a score can be grouped in two ways:
     horizontally (staffwise), and vertically (columns). #PScore#

diff --git a/src/score.cc b/src/score.cc
index 4c584c4ea727b3e6cc2bb4100a94e61737463992..5a65809c5ac73255bd00c89119f647ce760728f0 100644 (file)
--- a/src/score.cc
+++ b/src/score.cc
@@ -24,8 +24,9 @@ Score::process()
 
     // do this after processing, staffs first have to generate PCols.
     do_pcols();
-    // ugh. Would want to clean the columns before anything else.
-    clean_cols();
+
+    clean_cols();    // can't move this farther up.
+
     calc_idealspacing();
 
     // debugging