lilypond-0.0.32

diff --git a/src/break.cc b/src/break.cc
index 576bf4c67a3d7c30ecc37751e09f79fdd8670e19..6128fdd097e38049b7cf9385ae72150b017845ea 100644 (file)
--- a/src/break.cc
+++ b/src/break.cc
@@ -17,7 +17,7 @@ Break_algorithm::find_breaks() const
 {
     Line_of_cols retval;
     for (iter_top(pscore_.cols,c); c.ok(); c++)
-       if (c->breakable())
+       if (c->breakable_b())
            retval.push(c);
     assert(retval.top() == pscore_.cols.bottom().ptr());
     return retval;
@@ -71,7 +71,7 @@ Break_algorithm::problem_OK() const
     iter_top(pscore_.cols,start);
     PCursor<PCol *> end (pscore_.cols.bottom());
     
-    assert(start->breakable());    
-    assert(end->breakable());
+    assert(start->breakable_b());    
+    assert(end->breakable_b());
 #endif
 }

diff --git a/src/pcol.cc b/src/pcol.cc
index 54e177f4860c30ee438f68303814be75e8c2f57d..5256947ce77c33fdb1eeb46d15d9595dbae9f595 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_;
 }
@@ -117,5 +117,5 @@ PCol::add( Item *i)
 bool
 PCol::used()const
 {
-    return breakable() || its.size();
+    return breakable_b() || its.size();
 }

diff --git a/src/pscore.cc b/src/pscore.cc
index 34f0e09c28bf466e8074a407ff71a8f260c204e6..c18fe83e01434433f6fba4610b236eae74d302dd 100644 (file)
--- a/src/pscore.cc
+++ b/src/pscore.cc
@@ -103,7 +103,7 @@ void
 PScore::add(PCol *p)
 {
     p->pscore_l_ = this;
-    if (p->breakable()){
+    if (p->breakable_b()){
        p->prebreak_p_->pscore_l_ = this;
        p->postbreak_p_->pscore_l_ = this;
     }