release: 0.1.11

[lilypond.git] / lily / local-key-grav.cc

diff --git a/lily/local-key-grav.cc b/lily/local-key-grav.cc
index 82134c860846ba8e7395d9d4482c4114df238297..7da053d41898f008bd779cdf02160bb99c15d068 100644 (file)
--- a/lily/local-key-grav.cc
+++ b/lily/local-key-grav.cc
@@ -26,43 +26,43 @@ Local_key_engraver::do_pre_move_processing()
   Local_key_item *key_item_p = 0;
   if (mel_l_arr_.size()) 
     {
-       for (int i=0; i  < mel_l_arr_.size(); i++) 
-         {
-           Item * support_l = support_l_arr_[i];
-           Note_req * note_l = mel_l_arr_[i];
+      for (int i=0; i  < mel_l_arr_.size(); i++) 
+       {
+         Item * support_l = support_l_arr_[i];
+         Note_req * note_l = mel_l_arr_[i];
 
-           if (tied_l_arr_.find_l (support_l) && 
-               !note_l->forceacc_b_)
-               continue;
+         if (tied_l_arr_.find_l (support_l) && 
+             !note_l->forceacc_b_)
+           continue;
            
-           if (!note_l->forceacc_b_ &&
-               local_key_.oct (note_l->octave_i_).acc (note_l->notename_i_)
-               == note_l->accidental_i_) 
-               continue;
-           if (!key_item_p) 
-             {
-               int c0_i=0;
+         if (!note_l->forceacc_b_ &&
+             local_key_.oct (note_l->octave_i_).acc (note_l->notename_i_)
+             == note_l->accidental_i_) 
+           continue;
+         if (!key_item_p) 
+           {
+             int c0_i=0;
 
-               Staff_info inf = get_staff_info();
-               if (inf.c0_position_i_l_)
-                   c0_i = *get_staff_info().c0_position_i_l_;  
+             Staff_info inf = get_staff_info();
+             if (inf.c0_position_i_l_)
+               c0_i = *get_staff_info().c0_position_i_l_;      
                
-               key_item_p = new Local_key_item (c0_i);
-             }
-           key_item_p->add (note_l);
-           key_item_p->add_support (support_l);
-           local_key_.oct (note_l->octave_i_)
-               .set (note_l->notename_i_, note_l->accidental_i_);
-         }
+             key_item_p = new Local_key_item (c0_i);
+           }
+         key_item_p->add (note_l);
+         key_item_p->add_support (support_l);
+         local_key_.oct (note_l->octave_i_)
+           .set (note_l->notename_i_, note_l->accidental_i_);
+       }
        
     }
   if (key_item_p) 
     {
-       for (int i=0; i < support_l_arr_.size(); i++)
-           key_item_p->add_support (support_l_arr_[i]);
+      for (int i=0; i < support_l_arr_.size(); i++)
+       key_item_p->add_support (support_l_arr_[i]);
        
-       announce_element (Score_elem_info (key_item_p, 0)); // ugh ugh ugh
-       typeset_element (key_item_p);
+      announce_element (Score_elem_info (key_item_p, 0)); // ugh ugh ugh
+      typeset_element (key_item_p);
     }
   
   mel_l_arr_.clear();
@@ -80,32 +80,32 @@ Local_key_engraver::acknowledge_element (Score_elem_info info)
   Score_elem * elem_l = info.elem_l_;
   if (info.req_l_->musical() && info.req_l_->musical ()->note ()) 
     {
-       Note_req * note_l = info.req_l_->musical()->note ();
-       Item * item_l = info.elem_l_->item();
+      Note_req * note_l = info.req_l_->musical()->note ();
+      Item * item_l = info.elem_l_->item();
 
-       mel_l_arr_.push (note_l);
-       support_l_arr_.push (item_l);
+      mel_l_arr_.push (note_l);
+      support_l_arr_.push (item_l);
        
     }
   else if (info.req_l_->command()
-              && info.req_l_->command()->keychange ()) 
-                {
-       Key_engraver * key_grav_l =
-           (Key_engraver*)info.origin_grav_l_arr_[0];
-       key_C_ = &key_grav_l->key_;
-       local_key_ = *key_C_;
+          && info.req_l_->command()->keychange ()) 
+    {
+      Key_engraver * key_grav_l =
+       (Key_engraver*)info.origin_grav_l_arr_[0];
+      key_C_ = &key_grav_l->key_;
+      local_key_ = *key_C_;
     }
   else if (elem_l->name() == Key_item::static_name ()) 
     {
-       Key_engraver * key_grav_l =
-           (Key_engraver*)info.origin_grav_l_arr_[0];
-       key_C_ = &key_grav_l->key_;
+      Key_engraver * key_grav_l =
+       (Key_engraver*)info.origin_grav_l_arr_[0];
+      key_C_ = &key_grav_l->key_;
     }
   else if (elem_l->name() == Tie::static_name ()) 
     {
-       Tie * tie_l = (Tie*)elem_l->spanner();
-       if (tie_l->same_pitch_b_)
-           tied_l_arr_.push (tie_l-> right_head_l_);
+      Tie * tie_l = (Tie*)elem_l->spanner();
+      if (tie_l->same_pitch_b_)
+       tied_l_arr_.push (tie_l-> head_l_drul_[RIGHT]);
     }
 }
 
@@ -115,8 +115,8 @@ Local_key_engraver::do_process_requests()
   Time_description const * time_C_ = get_staff_info().time_C_;
   if (time_C_ && !time_C_->whole_in_measure_)
     {
-       if (key_C_)
-           local_key_= *key_C_;
+      if (key_C_)
+       local_key_= *key_C_;
     }
 }