release: 1.3.0

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 519d8f9500060b609f547cc2aaadd726152a54f5..6e571d4fcb95aa6c71f82797dbb8f78358d093b7 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -21,6 +21,12 @@ Key_engraver::Key_engraver ()
   do_post_move_processing ();
 }
 
+bool
+Key_engraver::key_changed_b () const
+{
+  return keyreq_l_ ;
+}
+
 void
 Key_engraver::create_key ()
 {
@@ -42,7 +48,7 @@ Key_engraver::create_key ()
            item_p_->add (m_l.notename_i_, a);
        }
 
-      for (int i = 0 ; i< old_accidental_idx_arr_.size(); i++) 
+      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_;
@@ -61,7 +67,7 @@ Key_engraver::do_try_music (Music * req_l)
   if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
     {
       if (keyreq_l_)
-       warning ("Fixme: key change merge.");
+       warning (_ ("FIXME: key change merge"));
       keyreq_l_ = kc;
       read_req (keyreq_l_);
       return true;
@@ -74,8 +80,8 @@ Key_engraver::acknowledge_element (Score_element_info info)
 {
   if (dynamic_cast <Clef_change_req *> (info.req_l_)) 
     {
-      int i= get_property ("createKeyOnClefChange", 0).length_i ();
-      if (i)
+      SCM c =  get_property ("createKeyOnClefChange", 0);
+      if (gh_boolean_p (c) && gh_scm2bool (c))
        create_key ();
     }
   else if (dynamic_cast<Bar *> (info.elem_l_)
@@ -86,7 +92,7 @@ Key_engraver::acknowledge_element (Score_element_info info)
       if (def)
        {
          item_p_->set_elt_property (visibility_lambda_scm_sym,
-                                   gh_eval_str ("postbreak_only_visibility"));
+                                   ly_ch_C_eval_scm ("postbreak_only_visibility"));
        }
     }
 
@@ -120,35 +126,17 @@ Key_engraver::read_req (Key_change_req const * r)
 {
   old_accidental_idx_arr_ = accidental_idx_arr_;
   key_.clear ();
-  Scalar prop = get_property ("keyoctaviation", 0);
-  if (prop.length_i () > 0)
-    {
-      key_.multi_octave_b_ = ! prop.to_bool ();
-    }
+  SCM prop = get_property ("keyOctaviation", 0);
+
+  key_.multi_octave_b_ = gh_boolean_p (prop) && gh_scm2bool (prop);
   
   accidental_idx_arr_.clear ();
 
-  if (r->ordinary_key_b_) 
+  if (r->key_.ordinary_key_b_) 
     {
-      int p;
-      if (r->pitch_arr_.size () < 1) 
-        {
-         r->warning (_ ("No key name: assuming `C'"));
-         p = 0;
-       }
-      else
-       {
-         p = r->pitch_arr_[0].semitone_pitch ();
-         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;
-      no_of_acc = (no_of_acc + 18) % 12 -6;
-
-      /* Correct from flats to sharps or vice versa */
-      if (no_of_acc * r->pitch_arr_[0].accidental_i_ < 0)
-       no_of_acc += 12 * sign (r->pitch_arr_[0].accidental_i_);
+      int no_of_acc = r->key_.ordinary_accidentals_i ();
 
+      // Hmm, can't these be handled/constructed by Key_change_req?
       if (no_of_acc < 0) 
        {
          int accidental = 6 ; // First accidental: bes
@@ -186,9 +174,9 @@ Key_engraver::read_req (Key_change_req const * r)
     }
   else // Special key
     {
-      for (int i = 0; i < r->pitch_arr_.size (); i ++) 
+      for (int i = 0; i < r->key_.pitch_arr_.size (); i ++) 
        {
-         Musical_pitch m_l =r->pitch_arr_[i];
+         Musical_pitch m_l =r->key_.pitch_arr_[i];
          if (key_.multi_octave_b_)
            key_.set (m_l);
          else
@@ -206,7 +194,4 @@ Key_engraver::do_post_move_processing ()
   old_accidental_idx_arr_.clear ();
 }
 
-
-
 ADD_THIS_TRANSLATOR (Key_engraver);
-