X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=a13b4315a6d869cf6b902c677f199cfd1cc80d9f;hb=3e07faa176c300184b2e41d0dcfa779360519359;hp=a4e2dbe22022c396d25e36448dead2ccc5b61a68;hpb=d7e4a5100d0f9650463dfdb19d2cc292aba2e4a9;p=lilypond.git

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index a4e2dbe220..a13b4315a6 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -79,7 +79,7 @@ Key_engraver::create_key (bool def)
   if (!def)
     {
       SCM vis = get_property ("explicitKeySignatureVisibility"); 
-      if (gh_procedure_p (vis))
+      if (ly_c_procedure_p (vis))
 	item_->set_property ("break-visibility",vis);
     }
 }      
@@ -117,7 +117,7 @@ Key_engraver::acknowledge_grob (Grob_info info)
 	}
     }
   else if (Bar_line::has_interface (info.grob_)
-	   && gh_pair_p (get_property ("keySignature")))
+	   && ly_c_pair_p (get_property ("keySignature")))
     {
       create_key (true);
     }
@@ -148,27 +148,27 @@ void
 Key_engraver::read_ev (Music const * r)
 {
   SCM p = r->get_property ("pitch-alist");
-  if (!gh_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");
-       gh_pair_p (s); s = ly_cdr (s))
+       ly_c_pair_p (s); s = ly_cdr (s))
     {
-      if (gh_pair_p (scm_member (ly_car (s), n)))
+      if (ly_c_pair_p (scm_member (ly_car (s), n)))
 	{
-	  accs = gh_cons (ly_car (s), accs);
+	  accs = scm_cons (ly_car (s), accs);
 	  n = scm_delete_x (ly_car (s), n);
 	}
     }
   
-  for (SCM s = n ; gh_pair_p (s); s = ly_cdr (s))
-    if (gh_scm2int (ly_cdar (s)))
-      accs = gh_cons (ly_car (s), accs);
+  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" ,
+  context ()->set_property ("keySignature", accs);
+  context ()->set_property ("tonic" ,
 			      r->get_property ("tonic"));
 }
 
@@ -177,18 +177,18 @@ void
 Key_engraver::start_translation_timestep ()
 {
   key_ev_ = 0;
-  daddy_context_->set_property ("lastKeySignature", get_property ("keySignature"));
+  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 ());
 
 }