release: 0.1.11

[lilypond.git] / lily / break.cc

diff --git a/lily/break.cc b/lily/break.cc
index 3ebba2eb63646998e01843dd91240ae3ab2cd148..7f5139a831cf183e000918246d0cd60f0c1ab618 100644 (file)
--- a/lily/break.cc
+++ b/lily/break.cc
@@ -20,7 +20,7 @@ Col_stats::str() const {
   String s (count_i_);
   s += " lines";
   if  (count_i_)
-       s += String (Real (cols_i_)/count_i_, ", (with an average of %.1f columns)");
+    s += String (Real (cols_i_)/count_i_, ", (with an average of %.1f columns)");
   
   return s;
 }
@@ -42,14 +42,14 @@ Col_stats::Col_stats()
 /* **************************************************************** */
 
 Line_of_cols
-Break_algorithm::all_cols()const
+Break_algorithm::all_cols() const
 {
   Line_of_cols retval;
-  for (PCursor<PCol*> c (pscore_l_->col_p_list_.top()); 
-        c.ok(); c++) 
-          {
+  for (PCursor<Paper_column*> c (pscore_l_->col_p_list_.top()); 
+       c.ok(); c++) 
+    {
        
-       retval.push (c);
+      retval.push (c);
     }
   return retval;
 }
@@ -61,12 +61,12 @@ Break_algorithm::find_break_indices() const
   Array<int> retval;
   
   for (int i=0; i < all.size(); i++)
-       if (all[i]->breakable_b())
-           retval.push (i);
+    if (all[i]->breakable_b_)
+      retval.push (i);
   
-  if ( linelength <=0)
-       while ( retval.size() >2)
-           retval.del (1);
+  if (linelength <=0)
+    while (retval.size() >2)
+      retval.del (1);
 
   return retval;
 }
@@ -79,13 +79,13 @@ Break_algorithm::find_breaks() const
   Line_of_cols retval;
   
   for (int i=0; i < all.size(); i++)
-       if (all[i]->breakable_b())
-           retval.push (all[i]);
+    if (all[i]->breakable_b_)
+      retval.push (all[i]);
 
 
-  if ( linelength <=0)
-       while ( retval.size() >2)
-           retval.del (1);
+  if (linelength <=0)
+    while (retval.size() >2)
+      retval.del (1);
 
   return retval;
 }
@@ -95,19 +95,19 @@ Break_algorithm::find_breaks() const
  
 
 Line_spacer*
-Break_algorithm::generate_spacing_problem (Line_of_cols curline)const
+Break_algorithm::generate_spacing_problem (Line_of_cols curline) const
 {
   Line_spacer * sp= (*get_line_spacer)();
 
   sp->paper_l_ = pscore_l_->paper_l_;
   sp->add_column (curline[0], true, 0.0);
   for (int i=1; i< curline.size()-1; i++)
-       sp->add_column (curline[i]);
+    sp->add_column (curline[i]);
 
-  if ( linelength > 0)
-       sp->add_column (curline.top(), true, linelength);
+  if (linelength > 0)
+    sp->add_column (curline.top(), true, linelength);
   else
-       sp->add_column (curline.top());
+    sp->add_column (curline.top());
 
   sp->prepare();
   return sp;
@@ -132,11 +132,11 @@ bool
 Break_algorithm::feasible (Line_of_cols curline) const
 {
   if (linelength <=  0)
-       return true;
+    return true;
   
   Real l =0;
   for (int i=0; i < curline.size(); i++)
-       l +=curline[i]->width().length ();
+    l +=curline[i]->width().length ();
   return l < linelength;    
 }
 
@@ -144,24 +144,24 @@ void
 Break_algorithm::problem_OK() const
 {
   if (!pscore_l_->col_p_list_.size())
-       error ("Score does not have any columns");
+    error ("Score does not have any columns");
   OK();
 }
 
 void
-Break_algorithm::OK()const
+Break_algorithm::OK() const
 {
 #ifndef NDEBUG
   iter_top (pscore_l_->col_p_list_,start);
-  PCursor<PCol *> end (pscore_l_->col_p_list_.bottom());
+  PCursor<Paper_column *> end (pscore_l_->col_p_list_.bottom());
   
-  assert (start->breakable_b());    
-  assert (end->breakable_b());
+  assert (start->breakable_b_);    
+  assert (end->breakable_b_);
 #endif
 }
 
 Array<Col_hpositions>
-Break_algorithm::solve()const
+Break_algorithm::solve() const
 {
   return do_solve();
 }
@@ -173,10 +173,10 @@ Break_algorithm::do_set_pscore()
 }
 
 void
-Break_algorithm::print_stats()const
+Break_algorithm::print_stats() const
 {
   if (approx_stats_.count_i_)
-       *mlog << "\nApproximated: " << approx_stats_.str() << "\n";
+    *mlog << "\nApproximated: " << approx_stats_.str() << "\n";
   if (exact_stats_.count_i_)
-       *mlog << "Calculated exactly: " << exact_stats_.str() << "\n";
+    *mlog << "Calculated exactly: " << exact_stats_.str() << "\n";
 }