release: 0.1.11

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

diff --git a/lily/key-grav.cc b/lily/key-grav.cc
index 5de204bd2507b9f31981d4a6958add82cadfd7af..f2d81ae9073645b0ad530e4906a547464258472b 100644 (file)
--- a/lily/key-grav.cc
+++ b/lily/key-grav.cc
@@ -20,48 +20,52 @@
 
 Key_engraver::Key_engraver()
 {
-    kit_p_ = 0;
-    do_post_move_processing();
+  kit_p_ = 0;
+  do_post_move_processing();
 }
 
 void
 Key_engraver::create_key()
 {
-    if (!kit_p_) {
+  if (!kit_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_;  
        
-       kit_p_ = new Key_item(c0_i);
-       announce_element(Score_elem_info(kit_p_,keyreq_l_));
-       kit_p_->read(*this);
+       kit_p_ = new Key_item (c0_i);
+       announce_element (Score_elem_info (kit_p_,keyreq_l_));
+       kit_p_->read (*this);
     }
 }
 
 bool
-Key_engraver::do_try_request(Request * req_l)
+Key_engraver::do_try_request (Request * req_l)
 {
-    Command_req* creq_l= req_l->command();
-    if (!creq_l|| !creq_l->keychange())
+  Command_req* creq_l= req_l->command();
+  if (!creq_l|| !creq_l->keychange())
        return false;
-     
-    if (keyreq_l_)
+   
+  if (keyreq_l_)
        return false;           // TODO
-    keyreq_l_ = creq_l->keychange();
-    read_req(keyreq_l_);
-    return true;
+  keyreq_l_ = creq_l->keychange();
+  read_req (keyreq_l_);
+  return true;
 }
 
 void
-Key_engraver::acknowledge_element(Score_elem_info info)
+Key_engraver::acknowledge_element (Score_elem_info info)
 {
-    Command_req * r_l = info.req_l_->command() ;
-    if (r_l && r_l->clefchange()) {
+  Command_req * r_l = info.req_l_->command() ;
+  if (r_l && r_l->clefchange()) 
+    {
        create_key();
-    } else if (info.elem_l_->name() == Bar::static_name()) {
-       if ( !keyreq_l_)
+    }
+  else if (info.elem_l_->name() == Bar::static_name ()) 
+    {
+       if (!keyreq_l_)
            default_key_b_ = true;
        create_key();
     }
@@ -71,9 +75,12 @@ Key_engraver::acknowledge_element(Score_elem_info info)
 void
 Key_engraver::do_process_requests()
 {
-    if (key_.multi_octave_b_) {
-       assert(false); // TODO . 
-    } else if (keyreq_l_) {
+  if (key_.multi_octave_b_) 
+    {
+       assert (false); // TODO . 
+    }
+  else if (keyreq_l_) 
+    {
        create_key();
     }
 }
@@ -81,38 +88,40 @@ Key_engraver::do_process_requests()
 void
 Key_engraver::do_pre_move_processing()
 { 
-    if (kit_p_) {
+  if (kit_p_) 
+    {
        kit_p_->default_b_ = default_key_b_;
-       typeset_element( kit_p_);
+       typeset_element (kit_p_);
        kit_p_ = 0;
     }
 }
 
 
-    
+  
 void
-Key_engraver::read_req(Key_change_req * r)
+Key_engraver::read_req (Key_change_req * r)
 {
-    key_.multi_octave_b_ = r->multi_octave_b_;
-    accidental_idx_arr_.clear();
-    for (int i = 0; i < r->melodic_p_arr_.size(); i ++) {
+  key_.multi_octave_b_ = r->multi_octave_b_;
+  accidental_idx_arr_.clear();
+  for (int i = 0; i < r->melodic_p_arr_.size(); i ++) 
+    {
        Melodic_req *  m_l =r->melodic_p_arr_[i];
        int n_i =m_l->notename_i_;
        int a_i = m_l->accidental_i_;
        int o_i = m_l->octave_i_;
        if (r->multi_octave_b_)
-           key_.set(o_i, n_i, a_i);
+           key_.set (o_i, n_i, a_i);
        else
-           key_.set(n_i, a_i);
-       accidental_idx_arr_.push(n_i);
+           key_.set (n_i, a_i);
+       accidental_idx_arr_.push (n_i);
     }
 }
 
 void
 Key_engraver::do_post_move_processing()
 {
-    keyreq_l_ = 0;
-    default_key_b_ = false;
+  keyreq_l_ = 0;
+  default_key_b_ = false;
 }