release: 0.1.9

[lilypond.git] / lily / rest-collision.cc

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 10fb35ec70d05a4fdf020eaeeac0ee6d87360369..d5b4217f7eceabfc2ac45061fcb9bed79deb1fb0 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -21,82 +21,84 @@ IMPLEMENT_IS_TYPE_B1(Rest_collision,Item);
 void
 Rest_collision::add (Note_column *nc_l)
 {
-    add_dependency (nc_l);
-    ncol_l_arr_.push (nc_l);
+  add_dependency (nc_l);
+  ncol_l_arr_.push (nc_l);
 }
 
 void
 Rest_collision::add (Rest_column *rc_l)
 {
-    add_dependency (rc_l);
-    rest_l_arr_.push (rc_l);
+  add_dependency (rc_l);
+  rest_l_arr_.push (rc_l);
 }
 
 void
 Rest_collision::do_post_processing()
 {
-    /*
-      handle rest under beam (do_post: beams are calculated now)
-
-      [todo]
-      i-d like to have access to the beam itself, 
-      iso only the (half-initialised?) stem
-
-      what about combination of collisions and rest under beam
-     */
-
-    // no rests to collide
-    if (!rest_l_arr_.size())
-       return;
-    // can this happen?
-    Stem* stem_l = rest_l_arr_[0]->stem_l_;
-    if (!stem_l)
-       return;
-    // no beam
-    if (!(stem_l->beams_left_i_ || stem_l->beams_right_i_))
-       return;
-
-    int dir_i = rest_l_arr_[0]->dir_i_;
-    int midpos = 4;
+  /*
+    handle rest under beam (do_post: beams are calculated now)
+
+    [todo]
+    i-d like to have access to the beam itself, 
+    iso only the (half-initialised?) stem
+
+    what about combination of collisions and rest under beam
+   */
+
+  // no rests to collide
+  if (!rest_l_arr_.size())
+       return;
+  // can this happen?
+  Stem* stem_l = rest_l_arr_[0]->stem_l_;
+  if (!stem_l)
+       return;
+  // no beam
+  if (!(stem_l->beams_left_i_ || stem_l->beams_right_i_))
+       return;
+
+  int dir_i = rest_l_arr_[0]->dir_i_;
+  int midpos = 4;
 #if 1
-    // ugh
-    int stem_length_i = 7 - 2;
-    // ugh, Stem::stem_start vs Stem::stem_end
-    int pos = (stem_l->stem_end_f() - midpos) - dir_i * stem_length_i;
+  // ugh
+  int stem_length_i = 7 - 2;
+  // ugh, Stem::stem_start vs Stem::stem_end
+  int pos = (stem_l->stem_end_f() - midpos) - dir_i * stem_length_i;
 #else // nogo: stem_start not set for rests?
-    int pos = (stem_l->stem_start_f() - midpos) + dir_i * 2;
+  int pos = (stem_l->stem_start_f() - midpos) + dir_i * 2;
 #endif
-    rest_l_arr_[0]->translate_heads (pos);     
+  rest_l_arr_[0]->translate_heads (pos);       
 }
 
 void
 Rest_collision::do_pre_processing()
 {
-    /* 
-      handle rest-rest and rest-note collisions
+  /* 
+    handle rest-rest and rest-note collisions
 
-      [todo]
-      decide not to print rest if too crowded?
-     */
+    [todo]
+    decide not to print rest if too crowded?
+   */
 
-    // no rests to collide
-    if (!rest_l_arr_.size())
-       return;
+  // no rests to collide
+  if (!rest_l_arr_.size())
+       return;
 
-    // no partners to collide with
-    if (rest_l_arr_.size() + ncol_l_arr_.size () < 2)
+  // no partners to collide with
+  if (rest_l_arr_.size() + ncol_l_arr_.size () < 2)
        return;
 
-    // meisjes met meisjes
-    if (!ncol_l_arr_.size()) {
+  // meisjes met meisjes
+  if (!ncol_l_arr_.size()) 
+    {
        int dy = rest_l_arr_.size() > 2 ? 6 : 4;
        
        rest_l_arr_[0]->translate_heads (rest_l_arr_[0]->dir_i_ *dy);   
        // top is last element...
        rest_l_arr_.top()->translate_heads (rest_l_arr_.top ()->dir_i_* dy);    
     }
-    // meisjes met jongetjes
-    else {
+  // meisjes met jongetjes
+  else 
+    {
 #if 0 // breendet: rests go always under
        // geen gemug, trug op je rug
        int dir_i = -1;
@@ -107,7 +109,7 @@ Rest_collision::do_pre_processing()
        // hope it's 4: if it works->doco
        int midpos = 4;
        
-        // minimum move
+      // minimum move
        int minpos = 4;
        
        // quart rest height
@@ -115,13 +117,14 @@ Rest_collision::do_pre_processing()
        int size_i = 6;
        
        int sep_i = 3 + size_i / 2;
-       for (int i = 0; i < ncol_l_arr_.size(); i++) {
+       for (int i = 0; i < ncol_l_arr_.size(); i++) 
+         {
            // how to know whether to sort?
            ncol_l_arr_[i]->sort();
            for ( int j = 0; j < ncol_l_arr_[i]->head_l_arr_.size(); j++)
                minpos = minpos >? dir_i * 
                    (ncol_l_arr_[i]->head_l_arr_[j]->position_i_ -midpos) + sep_i;
-       }
+         }
        rest_l_arr_[0]->translate_heads (dir_i * minpos);       
 #endif
     }
@@ -131,23 +134,23 @@ void
 Rest_collision::do_print() const
 {
 #ifndef NPRINT
-    DOUT << "rests: " << rest_l_arr_.size() << ", ";
-    DOUT << "cols: " << ncol_l_arr_.size();
+  DOUT << "rests: " << rest_l_arr_.size() << ", ";
+  DOUT << "cols: " << ncol_l_arr_.size();
 #endif
 }
 
 void
 Rest_collision::do_substitute_dependency (Score_elem*o,Score_elem*n)
 {
-    Item*o_l = o->item();
-    Item*n_l = n?n->item():0;
-    
-    rest_l_arr_.substitute ((Rest_column*)o_l,(Rest_column*)n_l);
-    ncol_l_arr_.substitute ((Note_column*)o_l,(Note_column*)n_l);
+  Item*o_l = o->item();
+  Item*n_l = n?n->item():0;
+  
+  rest_l_arr_.substitute ((Rest_column*)o_l,(Rest_column*)n_l);
+  ncol_l_arr_.substitute ((Note_column*)o_l,(Note_column*)n_l);
 }
 
 Rest_collision::Rest_collision()
 {
-    transparent_b_ = true;
-    empty_b_ = true;
+  transparent_b_ = true;
+  empty_b_ = true;
 }