release: 0.1.9

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 09ab9d73c0771fcbeb922cb6da73ae4342e6343a..eac107ba8dc113e7c4d51a2c529cc9feb2edd5c4 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -18,17 +18,17 @@ void
 Spanner::do_print()const
 {
 #ifndef NPRINT
-    DOUT << "Between col ";
-    if ( left_col_l_)
-       DOUT << left_col_l_->rank_i();
-    else 
+  DOUT << "Between col ";
+  if ( left_col_l_)
+       DOUT << left_col_l_->rank_i();
+  else 
        DOUT << "nop";
-    DOUT << ", ";
-    if ( right_col_l_)
-       DOUT << right_col_l_->rank_i();
-    else 
+  DOUT << ", ";
+  if ( right_col_l_)
+       DOUT << right_col_l_->rank_i();
+  else 
        DOUT << "nop";
-    if (broken_into_l_arr_.size())
+  if (broken_into_l_arr_.size())
        DOUT << "with broken pieces\n";
 #endif
 }
@@ -36,22 +36,23 @@ Spanner::do_print()const
 void
 Spanner::break_into_pieces (bool copy_deps_b)
 {
-    if (  broken_into_l_arr_.size())
+  if (  broken_into_l_arr_.size())
        return; 
         
-    PCol * left = left_col_l_;
-    PCol * right = right_col_l_;
-    if (left->daddy_l_) left = left->daddy_l_;
-    if (right->daddy_l_) right = right->daddy_l_;
-    
-    
-    Link_array<PCol> break_cols = pscore_l_->broken_col_range (left,right);
-    Link_array<Spanner> broken_into_l_arr;
-
-    break_cols.insert (left,0);
-    break_cols.push (right);
-
-    for (int i=1; i < break_cols.size(); i++) {
+  PCol * left = left_col_l_;
+  PCol * right = right_col_l_;
+  if (left->daddy_l_) left = left->daddy_l_;
+  if (right->daddy_l_) right = right->daddy_l_;
+  
+  
+  Link_array<PCol> break_cols = pscore_l_->broken_col_range (left,right);
+  Link_array<Spanner> broken_into_l_arr;
+
+  break_cols.insert (left,0);
+  break_cols.push (right);
+
+  for (int i=1; i < break_cols.size(); i++) 
+    {
        Spanner* span_p = clone()->spanner ();
        if (copy_deps_b)
            span_p->copy_dependencies (*this);
@@ -70,8 +71,8 @@ Spanner::break_into_pieces (bool copy_deps_b)
        pscore_l_->typeset_broken_spanner (span_p);
        broken_into_l_arr.push (span_p);
     }
-     
-    broken_into_l_arr_ = broken_into_l_arr;
+   
+  broken_into_l_arr_ = broken_into_l_arr;
 }
 
 void
@@ -79,20 +80,23 @@ Spanner::set_my_columns()
 {
   if (!left_col_l_->line_l_)
        left_col_l_ = left_col_l_->postbreak_p_;
-    if (!right_col_l_->line_l_)
+  if (!right_col_l_->line_l_)
        right_col_l_ = right_col_l_->prebreak_p_;
 }       
 
 void
 Spanner::do_break_processing()
 {
-    set_my_columns();
-    
-    if (!line_l()) {
+  set_my_columns();
+  
+  if (!line_l()) 
+    {
        break_into_pieces (true);
        for (int i=0; i < broken_into_l_arr_.size(); i++)
            broken_into_l_arr_[i]->handle_broken_dependencies();
-    } else { 
+    }
+  else 
+    {
        handle_broken_dependencies();
     }
 }
@@ -100,42 +104,42 @@ Spanner::do_break_processing()
 
 Spanner::Spanner()
 {
-    left_col_l_ = right_col_l_ = 0;
+  left_col_l_ = right_col_l_ = 0;
 }
 
 
 Interval
 Spanner::do_width()const
 {
-    Real r = right_col_l_->hpos_f_;
-    Real l = left_col_l_->hpos_f_;
-    assert (*left_col_l_ < *right_col_l_);
-    assert (r>=l);
+  Real r = right_col_l_->hpos_f_;
+  Real l = left_col_l_->hpos_f_;
+  assert (*left_col_l_ < *right_col_l_);
+  assert (r>=l);
        
-    return Interval (0, r-l);
+  return Interval (0, r-l);
 }
 
 Line_of_score *
 Spanner::line_l()const
 {
-    if ( left_col_l_->line_l_ != right_col_l_->line_l_)
+  if ( left_col_l_->line_l_ != right_col_l_->line_l_)
        return 0;
-    return left_col_l_->line_l_;
+  return left_col_l_->line_l_;
 }
 
 
 Spanner*
 Spanner::find_broken_piece (Line_of_score*l)const
 {
-    for (int i=0; i < broken_into_l_arr_.size(); i++)
+  for (int i=0; i < broken_into_l_arr_.size(); i++)
        if (broken_into_l_arr_[i]->line_l() == l)
            return broken_into_l_arr_[i];
-    return 0;                             
+  return 0;                               
          
 }
 
 bool
 Spanner::broken_b()const
 {
-    return broken_into_l_arr_.size();
+  return broken_into_l_arr_.size();
 }