add

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 37b215fbd69ca3e7d85164e9bbf24c83a073d13e..95fb3879d2a0ed56ee62e192d7c08c0332dcf2b4 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,15 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   */
 
-#include "key-item.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
+
+
+#include "event.hh"
 #include "item.hh"
-#include "bar.hh"
-#include "timing-translator.hh"
+#include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
 #include "translator-group.hh"
 #include "engraver.hh"
@@ -26,23 +25,19 @@ class Key_engraver : public Engraver
 {
   void create_key (bool);
   void read_req (Key_change_req const * r);
+  Key_change_req * keyreq_;
+  Item * item_;
 
 public:
-  Key_engraver ();
-  
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(Key_engraver);
 
-  Key_change_req * keyreq_l_;
-  Item * item_p_;
-  Protected_scm old_accs_;     // ugh. -> property
-    
 protected:
   virtual void initialize ();
   virtual void finalize ();
-  virtual bool try_music (Music *req_l);
+  virtual bool try_music (Music *req);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
-  virtual void create_grobs ();
+  virtual void process_music ();
   virtual void acknowledge_grob (Grob_info);
 };
 
@@ -50,68 +45,67 @@ protected:
 void
 Key_engraver::finalize ()
 {
-  old_accs_ = SCM_EOL;         // unprotect can not  be called from dtor.
 }
 
+
 Key_engraver::Key_engraver ()
 {
-  keyreq_l_ = 0;
-  item_p_ = 0;
+  keyreq_ = 0;
+  item_ = 0;
 }
 
+
 void
 Key_engraver::create_key (bool def)
 {
-  if (!item_p_) 
+  if (!item_) 
     {
-      item_p_ = new Item (get_property ("KeySignature"));
-
-      item_p_->set_grob_property ("c0-position", gh_int2scm (0));
+      item_ = new Item (get_property ("KeySignature"));
 
+      item_->set_grob_property ("c0-position",
+                               get_property ("centralCPosition"));
+      
       // todo: put this in basic props.
-      item_p_->set_grob_property ("old-accidentals", old_accs_);
-      item_p_->set_grob_property ("new-accidentals", get_property ("keySignature"));
+      item_->set_grob_property ("old-accidentals", get_property ("lastKeySignature"));
+      item_->set_grob_property ("new-accidentals", get_property ("keySignature"));
 
-      Staff_symbol_referencer::set_interface (item_p_);
-      Key_item::set_interface (item_p_);
-
-      
-      announce_grob (item_p_,keyreq_l_);
+      announce_grob(item_, keyreq_ ? keyreq_->self_scm() : SCM_EOL);
     }
 
-
   if (!def)
     {
       SCM vis = get_property ("explicitKeySignatureVisibility"); 
       if (gh_procedure_p (vis))
-       item_p_->set_grob_property ("visibility-lambda",vis);
+       item_->set_grob_property ("break-visibility",vis);
     }
 }      
 
 
 bool
-Key_engraver::try_music (Music * req_l)
+Key_engraver::try_music (Music * req)
 {
-  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
+  //  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req))
+  if (req->is_mus_type ("key-change-event"))
     {
-      if (keyreq_l_ && !keyreq_l_->equal_b (kc))
+      if (!keyreq_)
        {
-         kc->origin ()->warning (_ ("Conflicting key signatures found."));
-         keyreq_l_->origin ()->warning (_ ("This was the other key definition."));       
-         return false;
+         /*
+           do this only once, just to be on the safe side.
+           */      
+         keyreq_ = dynamic_cast<Key_change_req*> (req); // UGH.
+         read_req (keyreq_);
        }
-      keyreq_l_ = kc;
-      read_req (keyreq_l_);
-
+      
       return true;
     }   
   return  false;
 }
 
+
 void
 Key_engraver::acknowledge_grob (Grob_info info)
 {
-  if (Clef::has_interface (info.elem_l_))
+  if (Clef::has_interface (info.grob_))
     {
       SCM c =  get_property ("createKeyOnClefChange");
       if (to_boolean (c))
@@ -119,33 +113,34 @@ Key_engraver::acknowledge_grob (Grob_info info)
          create_key (false);
        }
     }
-  else if (Bar::has_interface (info.elem_l_)
+  else if (Bar_line::has_interface (info.grob_)
           && gh_pair_p (get_property ("keySignature")))
     {
       create_key (true);
     }
-
 }
 
+
 void
-Key_engraver::create_grobs ()
+Key_engraver::process_music ()
 {
-  if (keyreq_l_ || old_accs_ != get_property ("keySignature"))
-    {
-      create_key (false);
-    }
+  if (keyreq_ ||
+      get_property ("lastKeySignature") != get_property ("keySignature"))
+    create_key (false);
 }
 
+
 void
 Key_engraver::stop_translation_timestep ()
-{ 
-  if (item_p_) 
+{
+  if (item_) 
     {
-      typeset_grob (item_p_);
-      item_p_ = 0;
+      typeset_grob (item_);
+      item_ = 0;
     }
 }
 
+
 void
 Key_engraver::read_req (Key_change_req const * r)
 {
@@ -164,28 +159,40 @@ Key_engraver::read_req (Key_change_req const * r)
          n = scm_delete_x (ly_car (s), n);
        }
     }
+  
   for (SCM s = n ; gh_pair_p (s); s = ly_cdr (s))
-    if (gh_scm2int (gh_cdar (s)))
+    if (gh_scm2int (ly_cdar (s)))
       accs = gh_cons (ly_car (s), accs);
 
-  old_accs_ = get_property ("keySignature");
-  daddy_trans_l_->set_property ("keySignature", accs);
+#if 0
+  daddy_trans_->set_property ("lastKeySignature",
+                               get_property ("keySignature"));
+#endif
+  
+  daddy_trans_->set_property ("keySignature", accs);
 }
 
+
 void
 Key_engraver::start_translation_timestep ()
 {
-  keyreq_l_ = 0;
-  old_accs_ = get_property ("keySignature");
+  keyreq_ = 0;
+  daddy_trans_->set_property ("lastKeySignature", get_property ("keySignature"));
 }
 
+
 void
 Key_engraver::initialize ()
 {
-  daddy_trans_l_->set_property ("keySignature", SCM_EOL);
-  old_accs_ = SCM_EOL;
+  daddy_trans_->set_property ("keySignature", SCM_EOL);
+  daddy_trans_->set_property ("lastKeySignature", SCM_EOL);
 }
 
 
-ADD_THIS_TRANSLATOR (Key_engraver);
-
+ENTER_DESCRIPTION(Key_engraver,
+/* descr */       "",
+/* creats*/       "KeySignature",
+/* accepts */     "key-change-event",
+/* acks  */      "bar-line-interface clef-interface",
+/* reads */       "keySignature lastKeySignature explicitKeySignatureVisibility createKeyOnClefChange keyAccidentalOrder keySignature",
+/* write */       "lastKeySignature");