(key): add HAVE_FLEXLEXER_YY_CURRENT_BUFFER check.

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index ca5fc070f8a8bcb42211b3476ce5f965185740c3..e856460f7987fc77ecd89b6427fc7dca5dadc9bc 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"));
@@ -72,14 +72,12 @@ Key_engraver::create_key (bool def)
       if (to_boolean (get_property ("printKeyCancellation")))
        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)
     {
       SCM vis = get_property ("explicitKeySignatureVisibility"); 
-      if (ly_procedure_p (vis))
+      if (ly_c_procedure_p (vis))
        item_->set_property ("break-visibility",vis);
     }
 }      
@@ -90,15 +88,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;
@@ -117,7 +112,7 @@ Key_engraver::acknowledge_grob (Grob_info info)
        }
     }
   else if (Bar_line::has_interface (info.grob_)
-          && ly_pair_p (get_property ("keySignature")))
+          && ly_c_pair_p (get_property ("keySignature")))
     {
       create_key (true);
     }
@@ -136,11 +131,8 @@ 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"));
 }
 
 
@@ -148,28 +140,28 @@ void
 Key_engraver::read_ev (Music const * r)
 {
   SCM p = r->get_property ("pitch-alist");
-  if (!ly_pair_p (p))
+  if (!ly_c_pair_p (p))
     return;
 
   SCM n = scm_list_copy (p);
   SCM accs = SCM_EOL;
   for (SCM s = get_property ("keyAccidentalOrder");
-       ly_pair_p (s); s = ly_cdr (s))
+       ly_c_pair_p (s); s = ly_cdr (s))
     {
-      if (ly_pair_p (scm_member (ly_car (s), n)))
+      if (ly_c_pair_p (scm_member (ly_car (s), n)))
        {
          accs = scm_cons (ly_car (s), accs);
          n = scm_delete_x (ly_car (s), n);
        }
     }
   
-  for (SCM s = n ; ly_pair_p (s); s = ly_cdr (s))
+  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);
 
-  daddy_context_->set_property ("keySignature", accs);
-  daddy_context_->set_property ("tonic" ,
-                             r->get_property ("tonic"));
+  context ()->set_property ("keySignature", accs);
+  context ()->set_property ("tonic" ,
+                           r->get_property ("tonic"));
 }
 
 
@@ -177,18 +169,17 @@ void
 Key_engraver::start_translation_timestep ()
 {
   key_ev_ = 0;
-  daddy_context_->set_property ("lastKeySignature", get_property ("keySignature"));
 }
 
 
 void
 Key_engraver::initialize ()
 {
-  daddy_context_->set_property ("keySignature", SCM_EOL);
-  daddy_context_->set_property ("lastKeySignature", SCM_EOL);
+  context ()->set_property ("keySignature", SCM_EOL);
+  context ()->set_property ("lastKeySignature", SCM_EOL);
 
   Pitch p (0,0,0);
-  daddy_context_->set_property ("tonic", p.smobbed_copy ());
+  context ()->set_property ("tonic", p.smobbed_copy ());
 
 }