release: 1.1.37

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 83fd6ec6db5be709db24f5d19f11ae33790ec7c6..519d8f9500060b609f547cc2aaadd726152a54f5 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -1,11 +1,11 @@
 /*
-  key-reg.cc -- implement Key_engraver
+  key-engraver.cc -- implement Key_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   */
+
 #include "key-engraver.hh"
 #include "key-item.hh"
 #include "command-request.hh"
@@ -17,53 +17,77 @@
 
 Key_engraver::Key_engraver ()
 {
-  kit_p_ = 0;
+  item_p_ = 0;
   do_post_move_processing ();
 }
 
 void
 Key_engraver::create_key ()
 {
-  if (!kit_p_) 
+  if (!item_p_) 
     {
-      kit_p_ = new Key_item;
-      kit_p_->break_priority_i_ = -1; // ugh
-      announce_element (Score_element_info (kit_p_,keyreq_l_));
-      kit_p_->set (key_.multi_octave_b_, accidental_idx_arr_, old_accidental_idx_arr_);
+      item_p_ = new Key_item;
+      item_p_->set_elt_property (break_priority_scm_sym, gh_int2scm(-1)); // ugh
+      item_p_->multi_octave_b_ = key_.multi_octave_b_;
+      announce_element (Score_element_info (item_p_,keyreq_l_));
+      
+
+      for (int i = 0; i < accidental_idx_arr_.size(); i++) 
+       {
+         Musical_pitch m_l =accidental_idx_arr_[i];
+         int a =m_l.accidental_i_;      
+         if (key_.multi_octave_b_)
+           item_p_->add (m_l.steps (), a);
+         else
+           item_p_->add (m_l.notename_i_, a);
+       }
+
+      for (int i = 0 ; i< old_accidental_idx_arr_.size(); i++) 
+       {
+         Musical_pitch m_l =old_accidental_idx_arr_[i];
+         int a =m_l.accidental_i_;
+         if (key_.multi_octave_b_)
+           item_p_->add_old (m_l.steps  (), a);
+         else
+           item_p_->add_old (m_l.notename_i_, a);
+       }
     }
-}
+}      
+
 
 bool
-Key_engraver::do_try_request (Request * req_l)
+Key_engraver::do_try_music (Music * req_l)
 {
-  Command_req* creq_l= req_l->access_Command_req ();
-  if (!creq_l|| !creq_l->access_Key_change_req ())
-    return false;
-   
-  if (keyreq_l_)
-    return false;              // TODO
-  keyreq_l_ = creq_l->access_Key_change_req ();
-  read_req (keyreq_l_);
-  return true;
+  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
+    {
+      if (keyreq_l_)
+       warning ("Fixme: key change merge.");
+      keyreq_l_ = kc;
+      read_req (keyreq_l_);
+      return true;
+    }   
+  return  false;
 }
 
 void
 Key_engraver::acknowledge_element (Score_element_info info)
 {
-  Command_req * r_l = info.req_l_->access_Command_req () ;
-
-  if (r_l && r_l->access_Clef_change_req ()) 
+  if (dynamic_cast <Clef_change_req *> (info.req_l_)) 
     {
-      int i= get_property ("createKeyOnClefChange").length_i ();
+      int i= get_property ("createKeyOnClefChange", 0).length_i ();
       if (i)
        create_key ();
     }
-  else if (info.elem_l_->is_type_b (Bar::static_name ())
+  else if (dynamic_cast<Bar *> (info.elem_l_)
           && accidental_idx_arr_.size ()) 
     {
-      if (!keyreq_l_)
-       default_key_b_ = true;
+      bool def =  (!item_p_);
       create_key ();
+      if (def)
+       {
+         item_p_->set_elt_property (visibility_lambda_scm_sym,
+                                   gh_eval_str ("postbreak_only_visibility"));
+       }
     }
 
 }
@@ -80,11 +104,10 @@ Key_engraver::do_process_requests ()
 void
 Key_engraver::do_pre_move_processing ()
 { 
-  if (kit_p_) 
+  if (item_p_) 
     {
-      kit_p_->default_b_ = default_key_b_;
-      typeset_element (kit_p_);
-      kit_p_ = 0;
+      typeset_element (item_p_);
+      item_p_ = 0;
     }
 }
 
@@ -97,7 +120,7 @@ Key_engraver::read_req (Key_change_req const * r)
 {
   old_accidental_idx_arr_ = accidental_idx_arr_;
   key_.clear ();
-  Scalar prop = get_property ("keyoctaviation");
+  Scalar prop = get_property ("keyoctaviation", 0);
   if (prop.length_i () > 0)
     {
       key_.multi_octave_b_ = ! prop.to_bool ();
@@ -116,8 +139,7 @@ Key_engraver::read_req (Key_change_req const * r)
       else
        {
          p = r->pitch_arr_[0].semitone_pitch ();
-         if (r->minor_b ())
-           p += 3;
+         p += r->modality_i_;
        }
       /* Solve the equation 7*no_of_acc mod 12 = p, -6 <= no_of_acc <= 5 */
       int no_of_acc = (7*p) % 12;
@@ -181,11 +203,10 @@ void
 Key_engraver::do_post_move_processing ()
 {
   keyreq_l_ = 0;
-  default_key_b_ = false;
   old_accidental_idx_arr_.clear ();
 }
 
 
-IMPLEMENT_IS_TYPE_B1 (Key_engraver,Engraver);
+
 ADD_THIS_TRANSLATOR (Key_engraver);