partial: 0.0.39-1.jcn

[lilypond.git] / src / pcol.cc

diff --git a/src/pcol.cc b/src/pcol.cc
index 4c9ef91afcb4de8169b0fd46c750b2e9569154c5..4f1b65dcd716fe74d2a312475ab8671e3386a685 100644 (file)
--- a/src/pcol.cc
+++ b/src/pcol.cc
@@ -37,7 +37,7 @@ PCol::print() const
        mtor << "rank: " << rank() << '\n';
 
     mtor << "# symbols: " << its.size() ;
-    if (breakable()){
+    if (breakable_b()){
        mtor << "\npre,post: ";
        prebreak_p_->print();
        postbreak_p_->print();
@@ -76,7 +76,7 @@ PCol::OK() const
 void
 PCol::set_breakable()
 {
-    if (breakable())
+    if (breakable_b())
        return;
 
     prebreak_p_ = new PCol(this);
@@ -86,7 +86,7 @@ PCol::set_breakable()
 }
 
 bool
-PCol::breakable() const
+PCol::breakable_b() const
 {
     return prebreak_p_||postbreak_p_;
 }
@@ -97,7 +97,7 @@ PCol::PCol(PCol *parent)
     prebreak_p_=0;
     postbreak_p_=0;
     line_l_=0;
- 
+    hpos = -1.0;
     pscore_l_ = 0;
 }
 
@@ -115,7 +115,7 @@ PCol::add( Item *i)
 }
 
 bool
-PCol::used()const
+PCol::used_b()const
 {
-    return breakable() || its.size();
+    return breakable_b() || its.size();
 }