lilypond-0.0.65

diff --git a/lily/idealspacing.cc b/lily/idealspacing.cc
index 8437aabe223eacb46b094b317d9cc43be68f23bb..f1ff3691d567ad25b89509d2284b2e9683f265fc 100644 (file)
--- a/lily/idealspacing.cc
+++ b/lily/idealspacing.cc
@@ -1,7 +1,6 @@
 #include "idealspacing.hh"
 #include "p-col.hh"
 #include "p-score.hh"
-#include "p-staff.hh"
 #include "debug.hh"
 
 void
@@ -10,7 +9,7 @@ Idealspacing::print() const
 #ifndef NPRINT
     mtor << "idealspacing {" ;
     mtor << "distance "<<space<< " strength " << hooke ;
-    mtor << "left " << left->rank() << " right " << right->rank() << "}\n";
+    mtor << "left " << left->rank_i() << " right " << right->rank_i() << "}\n";
 #endif
 }
 

diff --git a/lily/include/p-col.hh b/lily/include/p-col.hh
index 71b5887c98e40d776951ceb6c7cb0b0b42ed9dfb..11d1cc8cc06fea2da2bd1f6fcf43b72e39c3775e 100644 (file)
--- a/lily/include/p-col.hh
+++ b/lily/include/p-col.hh
@@ -22,8 +22,8 @@
 
 class PCol { 
 public:
-    Link_list<Item const *> its;
-    Link_list<Spanner const *> stoppers, starters;
+    Link_list<Item *> its;
+    Link_list<Spanner *> stoppers, starters;
     
     /** prebreak is put before end of line.
     if broken here, then (*this) column is discarded, and prebreak
@@ -39,7 +39,7 @@ public:
     PCol *daddy_l_;
     
     /// if lines are broken then this column is in #line#
-    Line_of_score const *line_l_;
+    Line_of_score *line_l_;
 
     /** if lines are broken then this column x-coord #hpos# if not
       known, then hpos == -1.(ugh?)  */
@@ -52,7 +52,7 @@ public:
 
     /* *************** */
     /// which  one (left =0)
-    int rank() const;
+    int rank_i() const;
 
     /// does this column have items
     bool used_b() const;

diff --git a/lily/p-col.cc b/lily/p-col.cc
index ae39bdda9a4ba9c451678335f45a1a533797bf7b..66701e384082625933be0898ea084dbaee6d1ecd 100644 (file)
--- a/lily/p-col.cc
+++ b/lily/p-col.cc
@@ -1,14 +1,14 @@
 /*
   p-col.cc -- implement PCol
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #include "p-col.hh"
 #include "p-score.hh"
-#include "p-staff.hh"
+
 #include "debug.hh"
 
 Interval
@@ -24,7 +24,7 @@ PCol::width() const
 }
 
 int
-PCol::rank() const
+PCol::rank_i() const
 {
     assert(rank_i_ != -1);
     return rank_i_;
@@ -66,7 +66,7 @@ PCol::print() const
 int
 PCol::compare(PCol const &c1, PCol const &c2)
 {
-    return c1.rank() - c2.rank();
+    return c1.rank_i() - c2.rank_i();
 }
 
 void