release: 1.5.14

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index f37ef88881ad6e3cad64ddd62a2c3cfccefe80e5..445d1972656af812639fa4b9f9237191aa22811b 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"
@@ -24,41 +24,38 @@
  */
 class Key_engraver : public Engraver
 {
-  void create_key(bool);
+  void create_key (bool);
   void read_req (Key_change_req const * r);
+  Key_change_req * keyreq_l_;
+  Item * item_p_;
 
 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 do_creation_processing();
-  virtual void do_removal_processing ();
+  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 stop_translation_timestep ();
+  virtual void start_translation_timestep ();
   virtual void create_grobs ();
   virtual void acknowledge_grob (Grob_info);
 };
 
 
 void
-Key_engraver::do_removal_processing ()
+Key_engraver::finalize ()
 {
-  old_accs_ = SCM_EOL;         // unprotect can not  be called from dtor.
 }
 
+
 Key_engraver::Key_engraver ()
 {
   keyreq_l_ = 0;
   item_p_ = 0;
 }
 
+
 void
 Key_engraver::create_key (bool def)
 {
@@ -66,25 +63,18 @@ Key_engraver::create_key (bool def)
     {
       item_p_ = new Item (get_property ("KeySignature"));
 
-      item_p_->set_grob_property ("c0-position", gh_int2scm (0));
-
+      item_p_->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 ("old-accidentals", get_property ("lastKeySignature"));
       item_p_->set_grob_property ("new-accidentals", get_property ("keySignature"));
 
       Staff_symbol_referencer::set_interface (item_p_);
       Key_item::set_interface (item_p_);
-
-      SCM prop = get_property ("keyOctaviation");
-      bool multi = to_boolean (prop);
-      
-      if (multi)
-       item_p_->set_grob_property ("multi-octave", gh_bool2scm (multi));
-      
       announce_grob (item_p_,keyreq_l_);
     }
 
-
   if (!def)
     {
       SCM vis = get_property ("explicitKeySignatureVisibility"); 
@@ -99,19 +89,25 @@ Key_engraver::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"));
+      if (keyreq_l_ && !keyreq_l_->equal_b (kc))
+       {
+         kc->origin ()->warning (_ ("Conflicting key signatures found."));
+         keyreq_l_->origin ()->warning (_ ("This was the other key definition."));       
+         return false;
+       }
       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_l_))
     {
       SCM c =  get_property ("createKeyOnClefChange");
       if (to_boolean (c))
@@ -119,26 +115,26 @@ Key_engraver::acknowledge_grob (Grob_info info)
          create_key (false);
        }
     }
-  else if (Bar::has_interface (info.elem_l_)
+  else if (Bar::has_interface (info.grob_l_)
           && gh_pair_p (get_property ("keySignature")))
     {
       create_key (true);
     }
-
 }
 
+
 void
 Key_engraver::create_grobs ()
 {
-  if (keyreq_l_ || old_accs_ != get_property ("keySignature"))
-    {
-      create_key (false);
-    }
+  if (keyreq_l_ ||
+      get_property ("lastKeySignature") != get_property ("keySignature"))
+    create_key (false);
 }
 
+
 void
 Key_engraver::stop_translation_timestep ()
-{ 
+{
   if (item_p_) 
     {
       typeset_grob (item_p_);
@@ -146,6 +142,7 @@ Key_engraver::stop_translation_timestep ()
     }
 }
 
+
 void
 Key_engraver::read_req (Key_change_req const * r)
 {
@@ -156,36 +153,44 @@ Key_engraver::read_req (Key_change_req const * r)
   SCM n = scm_list_copy (p);
   SCM accs = SCM_EOL;
   for (SCM s = get_property ("keyAccidentalOrder");
-       gh_pair_p (s); s = gh_cdr (s))
+       gh_pair_p (s); s = ly_cdr (s))
     {
-      if (gh_pair_p (scm_member (gh_car (s), n)))
+      if (gh_pair_p (scm_member (ly_car (s), n)))
        {
-         accs = gh_cons (gh_car (s), accs);
-         n = scm_delete_x (gh_car (s), n);
+         accs = gh_cons (ly_car (s), accs);
+         n = scm_delete_x (ly_car (s), n);
        }
     }
-  for (SCM s = n ; gh_pair_p (s); s = gh_cdr (s))
-    if (gh_scm2int (gh_cdar (s)))
-      accs = gh_cons (gh_car (s), accs);
+  
+  for (SCM s = n ; gh_pair_p (s); s = ly_cdr (s))
+    if (gh_scm2int (ly_cdar (s)))
+      accs = gh_cons (ly_car (s), accs);
 
-  old_accs_ = get_property ("keySignature");
+  daddy_trans_l_->set_property ("lastKeySignature",
+                               get_property ("keySignature"));
   daddy_trans_l_->set_property ("keySignature", accs);
 }
 
+
 void
 Key_engraver::start_translation_timestep ()
 {
   keyreq_l_ = 0;
-  old_accs_ = get_property ("keySignature");
+  daddy_trans_l_->set_property ("lastKeySignature", get_property ("keySignature"));
 }
 
+
 void
-Key_engraver::do_creation_processing ()
+Key_engraver::initialize ()
 {
   daddy_trans_l_->set_property ("keySignature", SCM_EOL);
-  old_accs_ = SCM_EOL;
+  daddy_trans_l_->set_property ("lastKeySignature", SCM_EOL);
 }
 
 
-ADD_THIS_TRANSLATOR (Key_engraver);
-
+ENTER_DESCRIPTION(Key_engraver,
+/* descr */       "",
+/* creats*/       "KeySignature",
+/* acks  */       "bar-line-interface clef-interface",
+/* reads */       "keySignature lastKeySignature explicitKeySignatureVisibility createKeyOnClefChange keyAccidentalOrder keySignature",
+/* write */       "lastKeySignature");