release: 1.3.10

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

diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc
index 1307cba00021bf586da820c024783c911270fb68..beff1c9148d828b4e398b7f04247a422a110aac1 100644 (file)
--- a/lily/local-key-engraver.cc
+++ b/lily/local-key-engraver.cc
@@ -1,5 +1,5 @@
 /*
-  local-key-reg.cc -- implement Local_key_engraver
+  local-key-engraver.cc -- implement Local_key_engraver
 
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
@@ -13,15 +13,15 @@
 #include "key-item.hh"
 #include "tie.hh"
 #include "note-head.hh"
-#include "time-description.hh"
+#include "timing-translator.hh"
 #include "engraver-group-engraver.hh"
-
+#include "grace-align-item.hh"
 
 Local_key_engraver::Local_key_engraver()
 {
   key_grav_l_ = 0;
   key_item_p_ =0;
-  self_grace_b_ = false;
+  grace_align_l_ =0;
 }
 
 void
@@ -39,15 +39,14 @@ Local_key_engraver::do_creation_processing ()
 
   if (!key_grav_l_)
     {
-      warning (_ ("out of tune") + "! " + _ ("can't find") + " Key_engraver");
+      warning (_ ("out of tune:"));
+      warning (_f ("Can't find: `%s'", "Key_engraver"));
     }
   else
     {
       local_key_ = key_grav_l_->key_;
     }
 
-  self_grace_b_ = get_property ("weAreGraceContext",0 ).to_bool ();
-
   /*
     TODO
     (if we are grace) get key info from parent Local_key_engraver
@@ -57,40 +56,61 @@ Local_key_engraver::do_creation_processing ()
 void
 Local_key_engraver::process_acknowledged ()
 {
-  if (!key_item_p_ && mel_l_arr_.size()) 
+    if (!key_item_p_ && mel_l_arr_.size()) 
     {
-      bool forget = get_property ("forgetAccidentals",0).to_bool();
-      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_)
-           {
-             if (!forget)
-               local_key_.set (note_l->pitch_);
-             continue;
-           }
-           
-         if (!note_l->forceacc_b_
-             && local_key_.different_acc (note_l->pitch_))
-           continue;
-         if (!key_item_p_) 
+        SCM f = get_property ("forgetAccidentals",0);
+        bool forget = gh_boolean_p (f) && gh_scm2bool(f);
+        for (int i=0; i  < mel_l_arr_.size(); i++) 
            {
-             key_item_p_ = new Local_key_item;
-             announce_element (Score_element_info (key_item_p_, 0));         
-           }
-
-
-         key_item_p_->add_pitch (note_l->pitch_,
-                                 note_l->cautionary_b_);
-         key_item_p_->add_support (support_l);
+               Item * support_l = support_l_arr_[i];
+               Note_req * note_l = mel_l_arr_[i];
+
+            /* see if there's a tie that "changes" the accidental */
+            /* works because if there's a tie, the note to the left
+               is of the same pitch as the actual note */
+            bool tie_changes = tied_l_arr_.find_l (support_l)
+                  && !local_key_.different_acc (note_l->pitch_);
+
+            if (!forget
+
+                && ((note_l->forceacc_b_
+                || !local_key_.different_acc (note_l->pitch_)
+                        || local_key_.internal_forceacc (note_l->pitch_)))
+
+             && !tie_changes)
+             {
+                 if (!key_item_p_) 
+                    {
+                        key_item_p_ = new Local_key_item;
+                        announce_element (Score_element_info (key_item_p_, 0));
+                    }
+
+                    key_item_p_->add_pitch (note_l->pitch_,
+                                     note_l->cautionary_b_,
+                                         local_key_.double_to_single_acc(note_l->pitch_));
+                    key_item_p_->add_support (support_l);
+             }
          
-         if (!forget)
-           local_key_.set (note_l->pitch_);
-       }
+                if (!forget)
+                        {
+                                local_key_.set (note_l->pitch_);
+                 if (!tied_l_arr_.find_l (support_l))
+                            {
+                                local_key_.clear_internal_forceacc (note_l->pitch_);
+                            }
+                 else if (tie_changes)
+                                {
+                     local_key_.set_internal_forceacc (note_l->pitch_);
+                            }
+                       }
+        }
     }
+    if (key_item_p_ && grace_align_l_)
+    {
+        grace_align_l_->add_support (key_item_p_);
+        grace_align_l_ =0;
+    }
+  
 }
 
 void
@@ -110,7 +130,8 @@ Local_key_engraver::do_pre_move_processing()
       typeset_element (key_item_p_);
       key_item_p_ =0;
     }
-  
+
+  grace_align_l_ = 0;
   mel_l_arr_.clear();
   tied_l_arr_.clear();
   support_l_arr_.clear();
@@ -119,12 +140,23 @@ Local_key_engraver::do_pre_move_processing()
 
 void
 Local_key_engraver::acknowledge_element (Score_element_info info)
-{    
+{
+  SCM wg= get_property ("weAreGraceContext", 0);
+  
+  bool selfgr = gh_boolean_p (wg) &&gh_scm2bool (wg);
+  bool he_gr = info.elem_l_->get_elt_property ("grace") != SCM_UNDEFINED;
+
+  Grace_align_item * gai = dynamic_cast<Grace_align_item*> (info.elem_l_);  
+  if (he_gr && !selfgr && gai)
+    {
+      grace_align_l_ = gai;
+    }
   Note_req * note_l =  dynamic_cast <Note_req *> (info.req_l_);
   Note_head * note_head = dynamic_cast<Note_head *> (info.elem_l_);
 
-  bool gr = (info.elem_l_->get_elt_property (grace_scm_sym)!=SCM_BOOL_F);
-  if (gr != self_grace_b_)
+
+  
+  if (he_gr != selfgr)
     return;
   
   if (note_l && note_head)
@@ -134,17 +166,20 @@ Local_key_engraver::acknowledge_element (Score_element_info info)
     }
  else if (Tie * tie_l = dynamic_cast<Tie *> (info.elem_l_))
     {
-      tied_l_arr_.push (tie_l-> head_l_drul_[RIGHT]);
+      tied_l_arr_.push (tie_l->head (RIGHT));
     }
 }
 
 void
 Local_key_engraver::do_process_requests()
 {
-  Time_description const * time_C_ = get_staff_info().time_C_;
-  if (time_C_ && !time_C_->whole_in_measure_)
+  Translator * tr = daddy_grav_l()->get_simple_translator ("Timing_engraver"); // ugh
+  Timing_translator * time_C_  = dynamic_cast<Timing_translator*> (tr);
+  
+  if (time_C_ && !time_C_->measure_position ())
     {
-      bool no_res = get_property ("noResetKey",0).to_bool ();
+      SCM n =  get_property ("noResetKey",0);
+      bool no_res = gh_boolean_p (n) && gh_scm2bool (n);
       if (!no_res && key_grav_l_)
        local_key_= key_grav_l_->key_;
     }
@@ -157,3 +192,4 @@ Local_key_engraver::do_process_requests()
 
 
 ADD_THIS_TRANSLATOR(Local_key_engraver);
+