patch::: 1.3.18.jcn1

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 50b137ab897ad041d9da2ab3b6d4facd8af459f1..861668111d577abef19fa3e4e8678d0c01218956 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -5,6 +5,7 @@
 
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   */
+// clean me up 
 
 #include "key-engraver.hh"
 #include "key-item.hh"
@@ -13,7 +14,10 @@
 #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"
+
+ADD_THIS_TRANSLATOR (Key_engraver);
 
 Key_engraver::Key_engraver ()
 {
@@ -33,8 +37,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-aligned", SCM_BOOL_T); // ugh
+      
+      item_p_->set_elt_property ("multi-octave",
+                                gh_bool2scm (key_.multi_octave_b_));
+      
       announce_element (Score_element_info (item_p_,keyreq_l_));
       
 
@@ -48,7 +58,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 +77,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,8 +90,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 (to_boolean (c))
        create_key ();
     }
   else if (dynamic_cast<Bar *> (info.elem_l_)
@@ -89,10 +99,10 @@ Key_engraver::acknowledge_element (Score_element_info info)
     {
       bool def =  (!item_p_);
       create_key ();
-      if (def)
+      if (!def)
        {
-         item_p_->set_elt_property (visibility_lambda_scm_sym,
-                                   gh_eval_str ("postbreak_only_visibility"));
+         item_p_->set_elt_property ("visibility-lambda",
+                                   ly_eval_str ("all-visibility"));
        }
     }
 
@@ -126,11 +136,9 @@ 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_ = to_boolean (prop);
   
   accidental_idx_arr_.clear ();
 
@@ -196,7 +204,3 @@ Key_engraver::do_post_move_processing ()
   old_accidental_idx_arr_.clear ();
 }
 
-
-
-ADD_THIS_TRANSLATOR (Key_engraver);
-