* stepmake/aclocal.m4 (STEPMAKE_KPATHSEA): Do not include

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index e856460f7987fc77ecd89b6427fc7dca5dadc9bc..531eb9b346dd9fdf25f93f23d9bc535d9159008c 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,18 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   */
 
-
-
-#include "event.hh"
 #include "item.hh"
 #include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
 #include "context.hh"
 #include "engraver.hh"
-#include "pitch.hh"
 #include "protected-scm.hh"
 #include "clef.hh"
 
@@ -29,9 +25,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 +53,7 @@ Key_engraver::Key_engraver ()
 {
   key_ev_ = 0;
   item_ = 0;
+  cancellation_ = 0;
 }
 
 
@@ -68,17 +66,26 @@ Key_engraver::create_key (bool def)
 
       item_->set_property ("c0-position",
                           get_property ("middleCPosition"));
+
+      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"));
       
-      if (to_boolean (get_property ("printKeyCancellation")))
-       item_->set_property ("old-accidentals", get_property ("lastKeySignature"));
-      item_->set_property ("new-accidentals", get_property ("keySignature"));
+       }
+      item_->set_property ("new-accidentals", key);
     }
 
   if (!def)
     {
       SCM vis = get_property ("explicitKeySignatureVisibility"); 
       if (ly_c_procedure_p (vis))
-       item_->set_property ("break-visibility",vis);
+       item_->set_property ("break-visibility", vis);
     }
 }      
 
@@ -112,7 +119,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);
     }
@@ -133,6 +140,7 @@ Key_engraver::stop_translation_timestep ()
 {
   item_ = 0;
   context ()->set_property ("lastKeySignature", get_property ("keySignature"));
+  cancellation_ = 0; 
 }
 
 
@@ -140,24 +148,24 @@ 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" ,
@@ -178,13 +186,13 @@ Key_engraver::initialize ()
   context ()->set_property ("keySignature", SCM_EOL);
   context ()->set_property ("lastKeySignature", SCM_EOL);
 
-  Pitch p (0,0,0);
+  Pitch p (0, 0, 0);
   context ()->set_property ("tonic", p.smobbed_copy ());
 
 }
 
 
-ENTER_DESCRIPTION (Key_engraver,
+ADD_TRANSLATOR (Key_engraver,
 /* descr */       "",
 /* creats*/       "KeySignature",
 /* accepts */     "key-change-event",