release: 1.3.131

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index f19ddf1c1f78f34cb8d371c1c87a72ddc171008a..9ffb77a3818d86ecdaeb8f12617f512c2bcfad4b 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   */
 
 #include "key-item.hh"
@@ -15,14 +15,15 @@
 #include "staff-symbol-referencer.hh"
 #include "translator-group.hh"
 #include "engraver.hh"
-#include "musical-pitch.hh"
+#include "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);
 
@@ -36,15 +37,22 @@ public:
   Protected_scm old_accs_;     // ugh. -> property
     
 protected:
-  virtual void do_creation_processing();
-  virtual bool do_try_music (Music *req_l);
-  virtual void do_process_music();
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
-  virtual void acknowledge_element (Score_element_info);
+  virtual void initialize();
+  virtual void finalize ();
+  virtual bool try_music (Music *req_l);
+  virtual void stop_translation_timestep();
+  virtual void start_translation_timestep();
+  virtual void create_grobs ();
+  virtual void acknowledge_grob (Grob_info);
 };
 
 
+void
+Key_engraver::finalize ()
+{
+  old_accs_ = SCM_EOL;         // unprotect can not  be called from dtor.
+}
+
 Key_engraver::Key_engraver ()
 {
   keyreq_l_ = 0;
@@ -56,13 +64,13 @@ Key_engraver::create_key (bool def)
 {
   if (!item_p_) 
     {
-      item_p_ = new Item ( get_property ("basicKeyProperties"));
+      item_p_ = new Item (get_property ("KeySignature"));
 
-      item_p_->set_elt_property ("c0-position", gh_int2scm (0));
+      item_p_->set_grob_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"));
+      item_p_->set_grob_property ("old-accidentals", old_accs_);
+      item_p_->set_grob_property ("new-accidentals", get_property ("keySignature"));
 
       Staff_symbol_referencer::set_interface (item_p_);
       Key_item::set_interface (item_p_);
@@ -71,21 +79,23 @@ Key_engraver::create_key (bool def)
       bool multi = to_boolean (prop);
       
       if (multi)
-       item_p_->set_elt_property ("multi-octave", gh_bool2scm (multi));
+       item_p_->set_grob_property ("multi-octave", gh_bool2scm (multi));
       
-      announce_element (item_p_,keyreq_l_);
+      announce_grob (item_p_,keyreq_l_);
     }
 
-  if (!def)
-    item_p_->set_elt_property ("visibility-lambda",
-                              scm_eval2 (ly_symbol2scm  ("all-visible"),
-                                         SCM_EOL));
 
+  if (!def)
+    {
+      SCM vis = get_property ("explicitKeySignatureVisibility"); 
+      if (gh_procedure_p (vis))
+       item_p_->set_grob_property ("visibility-lambda",vis);
+    }
 }      
 
 
 bool
-Key_engraver::do_try_music (Music * req_l)
+Key_engraver::try_music (Music * req_l)
 {
   if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
     {
@@ -99,7 +109,7 @@ Key_engraver::do_try_music (Music * req_l)
 }
 
 void
-Key_engraver::acknowledge_element (Score_element_info info)
+Key_engraver::acknowledge_grob (Grob_info info)
 {
   if (Clef::has_interface (info.elem_l_))
     {
@@ -118,7 +128,7 @@ Key_engraver::acknowledge_element (Score_element_info info)
 }
 
 void
-Key_engraver::do_process_music ()
+Key_engraver::create_grobs ()
 {
   if (keyreq_l_ || old_accs_ != get_property ("keySignature"))
     {
@@ -127,11 +137,11 @@ Key_engraver::do_process_music ()
 }
 
 void
-Key_engraver::do_pre_move_processing ()
+Key_engraver::stop_translation_timestep ()
 { 
   if (item_p_) 
     {
-      typeset_element (item_p_);
+      typeset_grob (item_p_);
       item_p_ = 0;
     }
 }
@@ -140,7 +150,7 @@ void
 Key_engraver::read_req (Key_change_req const * r)
 {
   SCM p = r->get_mus_property ("pitch-alist");
-  if (p == SCM_UNDEFINED)
+  if (!gh_pair_p (p))
     return;
 
   SCM n = scm_list_copy (p);
@@ -163,14 +173,14 @@ Key_engraver::read_req (Key_change_req const * r)
 }
 
 void
-Key_engraver::do_post_move_processing ()
+Key_engraver::start_translation_timestep ()
 {
   keyreq_l_ = 0;
   old_accs_ = get_property ("keySignature");
 }
 
 void
-Key_engraver::do_creation_processing ()
+Key_engraver::initialize ()
 {
   daddy_trans_l_->set_property ("keySignature", SCM_EOL);
   old_accs_ = SCM_EOL;