* tex/lilyponddefs.tex (\lyitem): Don't use \topalign to make

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index fdb59dc4927c061a9d6cc7a867fdfb49018076be..e4c84d9e9fc9dfe76a16dbdd81ceb50784707a5b 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -29,9 +29,10 @@ class Key_engraver : public Engraver
 {
   void create_key (bool);
   void read_ev (Music const * r);
-  Music * key_ev_;
-  Item * item_;
 
+  Music *key_ev_;
+  Item *item_;
+  Item *cancellation_;
 public:
   TRANSLATOR_DECLARATIONS (Key_engraver);
 
@@ -56,6 +57,7 @@ Key_engraver::Key_engraver ()
 {
   key_ev_ = 0;
   item_ = 0;
+  cancellation_ = 0;
 }
 
 
@@ -68,11 +70,19 @@ Key_engraver::create_key (bool def)
 
       item_->set_property ("c0-position",
                           get_property ("middleCPosition"));
-      
-      if (to_boolean (get_property ("printKeyCancellation")))
-       item_->set_property ("old-accidentals", get_property ("lastKeySignature"));
-      item_->set_property ("new-accidentals", get_property ("keySignature"));
 
+      SCM last = get_property ("lastKeySignature");
+      SCM key = get_property ("keySignature");
+      if (to_boolean (get_property ("printKeyCancellation"))
+         && !scm_is_eq (last, key))
+       {
+         cancellation_ = make_item ("KeyCancellation", key_ev_ ? key_ev_->self_scm () : SCM_EOL);
+         cancellation_->set_property ("old-accidentals",last);
+         cancellation_->set_property ("c0-position",
+                          get_property ("middleCPosition"));
+      
+       }
+      item_->set_property ("new-accidentals", key);
     }
 
   if (!def)
@@ -89,15 +99,12 @@ Key_engraver::try_music (Music * ev)
 {
   if (ev->is_mus_type ("key-change-event"))
     {
+      /* do this only once, just to be on the safe side.  */
       if (!key_ev_)
        {
-         /*
-           do this only once, just to be on the safe side.
-           */      
          key_ev_ = ev;
          read_ev (key_ev_);
        }
-      
       return true;
     }   
   return  false;
@@ -116,7 +123,7 @@ Key_engraver::acknowledge_grob (Grob_info info)
        }
     }
   else if (Bar_line::has_interface (info.grob_)
-          && ly_c_pair_p (get_property ("keySignature")))
+          && scm_is_pair (get_property ("keySignature")))
     {
       create_key (true);
     }
@@ -135,11 +142,9 @@ Key_engraver::process_music ()
 void
 Key_engraver::stop_translation_timestep ()
 {
-  if (item_) 
-    {
-      typeset_grob (item_);
-      item_ = 0;
-    }
+  item_ = 0;
+  context ()->set_property ("lastKeySignature", get_property ("keySignature"));
+  cancellation_ = 0; 
 }
 
 
@@ -147,28 +152,28 @@ void
 Key_engraver::read_ev (Music const * r)
 {
   SCM p = r->get_property ("pitch-alist");
-  if (!ly_c_pair_p (p))
+  if (!scm_is_pair (p))
     return;
 
   SCM n = scm_list_copy (p);
   SCM accs = SCM_EOL;
   for (SCM s = get_property ("keyAccidentalOrder");
-       ly_c_pair_p (s); s = ly_cdr (s))
+       scm_is_pair (s); s = scm_cdr (s))
     {
-      if (ly_c_pair_p (scm_member (ly_car (s), n)))
+      if (scm_is_pair (scm_member (scm_car (s), n)))
        {
-         accs = scm_cons (ly_car (s), accs);
-         n = scm_delete_x (ly_car (s), n);
+         accs = scm_cons (scm_car (s), accs);
+         n = scm_delete_x (scm_car (s), n);
        }
     }
   
-  for (SCM s = n ; ly_c_pair_p (s); s = ly_cdr (s))
-    if (ly_scm2int (ly_cdar (s)))
-      accs = scm_cons (ly_car (s), accs);
+  for (SCM s = n ; scm_is_pair (s); s = scm_cdr (s))
+    if (scm_to_int (scm_cdar (s)))
+      accs = scm_cons (scm_car (s), accs);
 
   context ()->set_property ("keySignature", accs);
   context ()->set_property ("tonic" ,
-                             r->get_property ("tonic"));
+                           r->get_property ("tonic"));
 }
 
 
@@ -176,7 +181,6 @@ void
 Key_engraver::start_translation_timestep ()
 {
   key_ev_ = 0;
-  context ()->set_property ("lastKeySignature", get_property ("keySignature"));
 }