X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=115902e89db2b789f80e3d257b471c7a75f07143;hb=27661bd698d2f501ee621beb598dd9a3b48cdbb2;hp=5707b548b99f46e8923a99bd710115d06381e2e6;hpb=952705bbbb000581a13836e6a733df04511e93c5;p=lilypond.git

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 5707b548b9..115902e89d 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -46,9 +46,9 @@ protected:
   void stop_translation_timestep ();
   void process_music ();
 
-  DECLARE_TRANSLATOR_LISTENER (key_change);
-  DECLARE_ACKNOWLEDGER (clef);
-  DECLARE_ACKNOWLEDGER (bar_line);
+  void listen_key_change (Stream_event *);
+  void acknowledge_clef (Grob_info);
+  void acknowledge_bar_line (Grob_info);
 };
 
 void
@@ -78,11 +78,11 @@ Key_engraver::create_key (bool is_default)
       item_->set_property ("c0-position",
                            get_property ("middleCClefPosition"));
 
-      SCM last = get_property ("lastKeySignature");
-      SCM key = get_property ("keySignature");
+      SCM last = get_property ("lastKeyAlterations");
+      SCM key = get_property ("keyAlterations");
 
       if ((to_boolean (get_property ("printKeyCancellation"))
-           || key == SCM_EOL)
+           || scm_is_null (key))
           && !scm_is_eq (last, key))
         {
           SCM restore = SCM_EOL;
@@ -90,7 +90,7 @@ Key_engraver::create_key (bool is_default)
             {
               SCM new_alter_pair = scm_assoc (scm_caar (s), key);
               Rational old_alter = robust_scm2rational (scm_cdar (s), 0);
-              if (new_alter_pair == SCM_BOOL_F
+              if (scm_is_false (new_alter_pair)
                   || ((ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter) * old_alter
                       < Rational (0)))
                 {
@@ -106,7 +106,7 @@ Key_engraver::create_key (bool is_default)
 
               cancellation_->set_property ("alteration-alist", restore);
               cancellation_->set_property ("c0-position",
-                                           get_property ("middleCPosition"));
+                                           get_property ("middleCClefPosition"));
             }
         }
 
@@ -117,10 +117,10 @@ Key_engraver::create_key (bool is_default)
     {
       SCM visibility = get_property ("explicitKeySignatureVisibility");
       item_->set_property ("break-visibility", visibility);
+      item_->set_property ("non-default", SCM_BOOL_T);
     }
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Key_engraver, key_change);
 void
 Key_engraver::listen_key_change (Stream_event *ev)
 {
@@ -140,15 +140,14 @@ Key_engraver::acknowledge_clef (Grob_info /* info */)
 void
 Key_engraver::acknowledge_bar_line (Grob_info /* info */)
 {
-  if (scm_is_pair (get_property ("keySignature")))
-    create_key (true);
+  create_key (true);
 }
 
 void
 Key_engraver::process_music ()
 {
   if (key_event_
-      || get_property ("lastKeySignature") != get_property ("keySignature"))
+      || get_property ("lastKeyAlterations") != get_property ("keyAlterations"))
     create_key (false);
 }
 
@@ -156,7 +155,7 @@ void
 Key_engraver::stop_translation_timestep ()
 {
   item_ = 0;
-  context ()->set_property ("lastKeySignature", get_property ("keySignature"));
+  context ()->set_property ("lastKeyAlterations", get_property ("keyAlterations"));
   cancellation_ = 0;
   key_event_ = 0;
 }
@@ -198,7 +197,7 @@ Key_engraver::read_event (Stream_event const *r)
         r->origin ()->warning (_ ("Incomplete keyAlterationOrder for key signature"));
     }
 
-  context ()->set_property ("keySignature", scm_reverse_x (accs, SCM_EOL));
+  context ()->set_property ("keyAlterations", scm_reverse_x (accs, SCM_EOL));
   context ()->set_property ("tonic",
                             r->get_property ("tonic"));
 }
@@ -206,15 +205,21 @@ Key_engraver::read_event (Stream_event const *r)
 void
 Key_engraver::initialize ()
 {
-  context ()->set_property ("keySignature", SCM_EOL);
-  context ()->set_property ("lastKeySignature", SCM_EOL);
+  context ()->set_property ("keyAlterations", SCM_EOL);
+  context ()->set_property ("lastKeyAlterations", SCM_EOL);
 
-  Pitch p (0, 0, 0);
+  Pitch p;
   context ()->set_property ("tonic", p.smobbed_copy ());
 }
 
-ADD_ACKNOWLEDGER (Key_engraver, clef);
-ADD_ACKNOWLEDGER (Key_engraver, bar_line);
+
+void
+Key_engraver::boot ()
+{
+  ADD_LISTENER (Key_engraver, key_change);
+  ADD_ACKNOWLEDGER (Key_engraver, clef);
+  ADD_ACKNOWLEDGER (Key_engraver, bar_line);
+}
 
 ADD_TRANSLATOR (Key_engraver,
                 /* doc */
@@ -229,13 +234,13 @@ ADD_TRANSLATOR (Key_engraver,
                 "explicitKeySignatureVisibility "
                 "extraNatural "
                 "keyAlterationOrder "
-                "keySignature "
-                "lastKeySignature "
+                "keyAlterations "
+                "lastKeyAlterations "
                 "printKeyCancellation "
                 "middleCClefPosition ",
 
                 /* write */
-                "keySignature "
-                "lastKeySignature "
+                "keyAlterations "
+                "lastKeyAlterations "
                 "tonic "
                );