patch::: 1.3.96.jcn9

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 524d32cffaa013748f05682c0f42d6cc3701b3c1..eff8a73a20a169b9eba72f8cc127a371639370fd 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -9,7 +9,7 @@
 #include "key-item.hh"
 #include "command-request.hh"
 #include "musical-request.hh"
-#include "local-key-item.hh"
+#include "item.hh"
 #include "bar.hh"
 #include "timing-translator.hh"
 #include "staff-symbol-referencer.hh"
@@ -17,12 +17,13 @@
 #include "engraver.hh"
 #include "musical-pitch.hh"
 #include "protected-scm.hh"
-
+#include "clef.hh"
 
 /**
   Make the key signature.
  */
-class Key_engraver : public Engraver {
+class Key_engraver : public Engraver
+{
   void create_key(bool);
   void read_req (Key_change_req const * r);
 
@@ -32,11 +33,12 @@ public:
   VIRTUAL_COPY_CONS(Translator);
 
   Key_change_req * keyreq_l_;
-  Key_item * item_p_;
-  Protected_scm old_accs_;
+  Item * item_p_;
+  Protected_scm old_accs_;     // ugh. -> property
     
 protected:
   virtual void do_creation_processing();
+  virtual void do_removal_processing ();
   virtual bool do_try_music (Music *req_l);
   virtual void do_process_music();
   virtual void do_pre_move_processing();
@@ -45,6 +47,12 @@ protected:
 };
 
 
+void
+Key_engraver::do_removal_processing ()
+{
+  old_accs_ = SCM_EOL;         // unprotect can not  be called from dtor.
+}
+
 Key_engraver::Key_engraver ()
 {
   keyreq_l_ = 0;
@@ -56,16 +64,16 @@ Key_engraver::create_key (bool def)
 {
   if (!item_p_) 
     {
-      item_p_ = new Key_item ( get_property ("basicKeyProperties"));
-      
+      item_p_ = new Item ( get_property ("KeySignature"));
+
       item_p_->set_elt_property ("c0-position", gh_int2scm (0));
 
       // todo: put this in basic props.
       item_p_->set_elt_property ("old-accidentals", old_accs_);
       item_p_->set_elt_property ("new-accidentals", get_property ("keySignature"));
 
-      Staff_symbol_referencer_interface st (item_p_);
-      st.set_interface ();
+      Staff_symbol_referencer::set_interface (item_p_);
+      Key_item::set_interface (item_p_);
 
       SCM prop = get_property ("keyOctaviation");
       bool multi = to_boolean (prop);
@@ -73,13 +81,16 @@ Key_engraver::create_key (bool def)
       if (multi)
        item_p_->set_elt_property ("multi-octave", gh_bool2scm (multi));
       
-      announce_element (Score_element_info (item_p_,keyreq_l_));
+      announce_element (item_p_,keyreq_l_);
     }
 
-  if (!def)
-    item_p_->set_elt_property ("visibility-lambda",
-                              scm_eval (ly_symbol2scm  ("all-visible")));
 
+  if (!def)
+    {
+      SCM vis = get_property ("explicitKeySignatureVisibility"); 
+      if (gh_procedure_p (vis))
+       item_p_->set_elt_property ("visibility-lambda",vis);
+    }
 }      
 
 
@@ -100,7 +111,7 @@ Key_engraver::do_try_music (Music * req_l)
 void
 Key_engraver::acknowledge_element (Score_element_info info)
 {
-  if (to_boolean (info.elem_l_->get_elt_property ("clef-interface"))) 
+  if (Clef::has_interface (info.elem_l_))
     {
       SCM c =  get_property ("createKeyOnClefChange");
       if (to_boolean (c))
@@ -108,7 +119,7 @@ Key_engraver::acknowledge_element (Score_element_info info)
          create_key (false);
        }
     }
-  else if (dynamic_cast<Bar *> (info.elem_l_)
+  else if (Bar::has_interface (info.elem_l_)
           && gh_pair_p (get_property ("keySignature")))
     {
       create_key (true);
@@ -138,10 +149,11 @@ Key_engraver::do_pre_move_processing ()
 void
 Key_engraver::read_req (Key_change_req const * r)
 {
-  if (r->pitch_alist_ == SCM_UNDEFINED)
+  SCM p = r->get_mus_property ("pitch-alist");
+  if (p == SCM_UNDEFINED)
     return;
 
-  SCM n = scm_list_copy (r->pitch_alist_);
+  SCM n = scm_list_copy (p);
   SCM accs = SCM_EOL;
   for (SCM s = get_property ("keyAccidentalOrder");
        gh_pair_p (s); s = gh_cdr (s))