X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeat-acknowledge-engraver.cc;h=c1c77892ca7a71c8aa8e6f310204f83a51799a3f;hb=fe6b181832f78629fc2285dc1d23dccc7373e9ec;hp=0b3752eecdc79f7c278741303abb1f8ef689f966;hpb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;p=lilypond.git

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 0b3752eecd..c1c77892ca 100644
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -27,8 +27,9 @@
 class Repeat_acknowledge_engraver : public Engraver
 {
 public:
+  
   TRANSLATOR_DECLARATIONS (Repeat_acknowledge_engraver);
-
+protected:
   virtual void start_translation_timestep ();
   virtual void process_music ();
   virtual void initialize ();
@@ -38,7 +39,7 @@ public:
 void
 Repeat_acknowledge_engraver::initialize ()
 {
-  daddy_context_->set_property ("repeatCommands", SCM_EOL);
+  context ()->set_property ("repeatCommands", SCM_EOL);
 }
 
 
@@ -49,9 +50,9 @@ Repeat_acknowledge_engraver::Repeat_acknowledge_engraver ()
 void
 Repeat_acknowledge_engraver::start_translation_timestep ()
 {
-  Context * tr = daddy_context_->where_defined (ly_symbol2scm ("repeatCommands"));
+  Context * tr = context ()->where_defined (ly_symbol2scm ("repeatCommands"));
   if (!tr)
-    tr = daddy_context_;
+    tr = context ();
 
   tr->set_property ("repeatCommands", SCM_EOL);
 }
@@ -62,7 +63,7 @@ Repeat_acknowledge_engraver::process_music ()
   /*
     At the start of a piece, we don't print any repeat bars.
    */
-  if (now_mom () == Moment (0))
+  if (!now_mom ().main_part_)
     return ; 
   
   SCM cs = get_property ("repeatCommands");
@@ -71,16 +72,16 @@ Repeat_acknowledge_engraver::process_music ()
   bool start = false;
   bool end = false;
   bool volta_found = false;
-  while (gh_pair_p (cs))
+  while (scm_is_pair (cs))
     {
-      SCM command = ly_car (cs);
+      SCM command = scm_car (cs);
       if (command == ly_symbol2scm ("start-repeat"))
 	start = true;
       else if (command == ly_symbol2scm ("end-repeat"))
 	end = true;
-      else if (gh_pair_p (command) && ly_car (command) == ly_symbol2scm ("volta"))
+      else if (scm_is_pair (command) && scm_car (command) == ly_symbol2scm ("volta"))
 	volta_found = true;
-      cs = ly_cdr (cs);      
+      cs = scm_cdr (cs);      
     }
 
   if (start && end)
@@ -100,11 +101,11 @@ Repeat_acknowledge_engraver::process_music ()
    */
   SCM wb = get_property ("whichBar");
   SCM db  = get_property ("defaultBarType");
-  if (!gh_string_p (wb) || gh_equal_p (db, wb))
+  if (!scm_is_string (wb) || ly_c_equal_p (db, wb))
     {
-      if (s != "" || (volta_found && !gh_string_p (wb)))
+      if (s != "" || (volta_found && !scm_is_string (wb)))
 	{
-	  daddy_context_->set_property ("whichBar", scm_makfrom0str (s.to_str0 ()));
+	  context ()->set_property ("whichBar", scm_makfrom0str (s.to_str0 ()));
 	}
     }
 }