release: 0.1.11

[lilypond.git] / lily / script-column.cc

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 836541ce16c9726950321c21b589abad779a66be..6f9359aef7c46fce45dd5b706746c304097dc62a 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -26,7 +26,7 @@ Script_column::add (Script*s_l)
 
 
 void
-Script_column::do_print()const
+Script_column::do_print() const
 {
 #ifndef NPRINT
   DOUT << "scripts: " << script_l_arr_.size() << '\n'; 
@@ -37,8 +37,8 @@ static int
 idx (bool inside, int dir)
 {
   int j = (dir+1);
-  if ( !inside)
-       j ++;
+  if (!inside)
+    j ++;
   return j;
 }
 
@@ -46,49 +46,49 @@ void
 Script_column::do_pre_processing()
 {
   if (!script_l_arr_.size()) 
-       return;
+    return;
   
   /* up+inside, up+outside, down+inside, down+outside */
   Array<Script*> placed_l_arr_a[4];
   for (int i=0; i < script_l_arr_.size(); i++) 
     {
-       Script*s_l = script_l_arr_[i];
-       placed_l_arr_a[idx (s_l->inside_staff_b_ , s_l->dir_i_) ].push (s_l);
+      Script*s_l = script_l_arr_[i];
+      placed_l_arr_a[idx (s_l->inside_staff_b_ , s_l->dir_) ].push (s_l);
     }
   
   for (int j =0; j <4; j++) 
     {
-       placed_l_arr_a[j].sort (Script::compare);
+      placed_l_arr_a[j].sort (Script::compare);
     }
 
 
   for (int j =0; j < 4; j++) 
     {
-       if (placed_l_arr_a[j].size())
-           for (int i=0; i  < support_l_arr_.size(); i++)
-               placed_l_arr_a[j][0]->add_support (support_l_arr_[i]);
+      if (placed_l_arr_a[j].size())
+       for (int i=0; i  < support_l_arr_.size(); i++)
+         placed_l_arr_a[j][0]->add_support (support_l_arr_[i]);
     }
   
   Item * support_l=0;
   int j = 0;
   for (; j < 2; j++) 
     {
-       for (int i=0; i < placed_l_arr_a[j].size(); i++) 
-         {
-           if (support_l)
-               placed_l_arr_a[j][i]->add_support (support_l);
-           support_l = placed_l_arr_a[j][i];
-         }
+      for (int i=0; i < placed_l_arr_a[j].size(); i++) 
+       {
+         if (support_l)
+           placed_l_arr_a[j][i]->add_support (support_l);
+         support_l = placed_l_arr_a[j][i];
+       }
     }
   support_l = 0;
   for (; j < 4; j++) 
     {
-       for (int i=0; i < placed_l_arr_a[j].size(); i++) 
-         {
-           if (support_l)
-               placed_l_arr_a[j][i]->add_support (support_l);
-           support_l = placed_l_arr_a[j][i];
-         }
+      for (int i=0; i < placed_l_arr_a[j].size(); i++) 
+       {
+         if (support_l)
+           placed_l_arr_a[j][i]->add_support (support_l);
+         support_l = placed_l_arr_a[j][i];
+       }
     }
 }
 
@@ -106,7 +106,7 @@ Script_column::do_substitute_dependency (Score_elem*o,Score_elem*n)
 {
   if (o->item()) 
     {
-       script_l_arr_.substitute ((Script*)o->item(),(Script*) (n?n->item ():0));
-       support_l_arr_.substitute (o->item(), (n?n->item ():0));
+      script_l_arr_.substitute ((Script*)o->item(),(Script*) (n?n->item ():0));
+      support_l_arr_.substitute (o->item(), (n?n->item ():0));
     }
 }