(conv): \apply -> \applymusic

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index c4209caa2ec218c54721b88b3aface0e06144386..fdb59dc4927c061a9d6cc7a867fdfb49018076be 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -64,7 +64,7 @@ Key_engraver::create_key (bool def)
 {
   if (!item_) 
     {
-      item_ = make_item ("KeySignature");
+      item_ = make_item ("KeySignature", key_ev_ ? key_ev_->self_scm () : SCM_EOL);
 
       item_->set_property ("c0-position",
                           get_property ("middleCPosition"));
@@ -73,7 +73,6 @@ Key_engraver::create_key (bool def)
        item_->set_property ("old-accidentals", get_property ("lastKeySignature"));
       item_->set_property ("new-accidentals", get_property ("keySignature"));
 
-      announce_grob (item_, key_ev_ ? key_ev_->self_scm () : SCM_EOL);
     }
 
   if (!def)
@@ -167,8 +166,8 @@ Key_engraver::read_ev (Music const * r)
     if (ly_scm2int (ly_cdar (s)))
       accs = scm_cons (ly_car (s), accs);
 
-  get_parent_context ()->set_property ("keySignature", accs);
-  get_parent_context ()->set_property ("tonic" ,
+  context ()->set_property ("keySignature", accs);
+  context ()->set_property ("tonic" ,
                              r->get_property ("tonic"));
 }
 
@@ -177,18 +176,18 @@ void
 Key_engraver::start_translation_timestep ()
 {
   key_ev_ = 0;
-  get_parent_context ()->set_property ("lastKeySignature", get_property ("keySignature"));
+  context ()->set_property ("lastKeySignature", get_property ("keySignature"));
 }
 
 
 void
 Key_engraver::initialize ()
 {
-  get_parent_context ()->set_property ("keySignature", SCM_EOL);
-  get_parent_context ()->set_property ("lastKeySignature", SCM_EOL);
+  context ()->set_property ("keySignature", SCM_EOL);
+  context ()->set_property ("lastKeySignature", SCM_EOL);
 
   Pitch p (0,0,0);
-  get_parent_context ()->set_property ("tonic", p.smobbed_copy ());
+  context ()->set_property ("tonic", p.smobbed_copy ());
 
 }