release: 1.3.46

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 50b137ab897ad041d9da2ab3b6d4facd8af459f1..6d01fb2b6de72d73ec96049f9890a9a362314933 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,9 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   */
-
+// clean me up 
 #include "key-engraver.hh"
 #include "key-item.hh"
 #include "command-request.hh"
@@ -13,7 +13,8 @@
 #include "musical-request.hh"
 #include "local-key-item.hh"
 #include "bar.hh"
-#include "time-description.hh"
+#include "timing-translator.hh"
+#include "staff-symbol-referencer.hh"
 
 Key_engraver::Key_engraver ()
 {
@@ -33,8 +34,14 @@ Key_engraver::create_key ()
   if (!item_p_) 
     {
       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_;
+      Staff_symbol_referencer_interface st (item_p_);
+      st.set_interface ();
+
+      
+      item_p_->set_elt_property ("break-align-symbol", ly_symbol2scm ("Key_item")); 
+      item_p_->set_elt_property ("multi-octave",
+                                gh_bool2scm (key_.multi_octave_b_));
+      
       announce_element (Score_element_info (item_p_,keyreq_l_));
       
 
@@ -48,7 +55,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_;
@@ -67,7 +74,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;
@@ -80,26 +87,20 @@ 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");
+      if (to_boolean (c))
        create_key ();
     }
   else if (dynamic_cast<Bar *> (info.elem_l_)
           && accidental_idx_arr_.size ()) 
     {
-      bool def =  (!item_p_);
       create_key ();
-      if (def)
-       {
-         item_p_->set_elt_property (visibility_lambda_scm_sym,
-                                   gh_eval_str ("postbreak_only_visibility"));
-       }
     }
 
 }
 
 void
-Key_engraver::do_process_requests ()
+Key_engraver::do_process_music ()
 {
   if (keyreq_l_) 
     {
@@ -112,6 +113,10 @@ Key_engraver::do_pre_move_processing ()
 { 
   if (item_p_) 
     {
+      if (keyreq_l_)
+       item_p_->set_elt_property ("visibility-lambda",
+                                  scm_eval (ly_symbol2scm  ("all-visible")));
+      
       typeset_element (item_p_);
       item_p_ = 0;
     }
@@ -119,24 +124,25 @@ Key_engraver::do_pre_move_processing ()
 
 
 /*
-  TODO Slightly hairy.  
+  TODO.  Use properties; and this is too hairy.
  */
 void
 Key_engraver::read_req (Key_change_req const * r)
 {
+  if (!r->key_)
+    return;
+  
   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");
+
+  key_.multi_octave_b_ = to_boolean (prop);
   
   accidental_idx_arr_.clear ();
 
-  if (r->key_.ordinary_key_b_) 
+  if (r->key_->ordinary_key_b_) 
     {
-      int no_of_acc = r->key_.ordinary_accidentals_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) 
@@ -176,9 +182,9 @@ Key_engraver::read_req (Key_change_req const * r)
     }
   else // Special key
     {
-      for (int i = 0; i < r->key_.pitch_arr_.size (); i ++) 
+      for (int i = 0; i < r->key_->pitch_arr_.size (); i ++) 
        {
-         Musical_pitch m_l =r->key_.pitch_arr_[i];
+         Musical_pitch m_l =r->key_->pitch_arr_[i];
          if (key_.multi_octave_b_)
            key_.set (m_l);
          else
@@ -196,7 +202,5 @@ Key_engraver::do_post_move_processing ()
   old_accidental_idx_arr_.clear ();
 }
 
-
-
 ADD_THIS_TRANSLATOR (Key_engraver);