* lily/ledger-line-spanner.cc (print): swap linear_combination

[lilypond.git] / lily / repeat-acknowledge-engraver.cc

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 0c6921feca505a05562a5562f0ab332880b21d30..c1c77892ca7a71c8aa8e6f310204f83a51799a3f 100644 (file)
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -3,11 +3,13 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
+
 #include "engraver.hh"
 #include "translator-group.hh"
+#include "context.hh"
 #include "repeated-music.hh"
 
 
@@ -25,20 +27,19 @@
 class Repeat_acknowledge_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Repeat_acknowledge_engraver);
-
+  
+  TRANSLATOR_DECLARATIONS (Repeat_acknowledge_engraver);
+protected:
   virtual void start_translation_timestep ();
   virtual void process_music ();
   virtual void initialize ();
 
-  bool first_b_;
 };
 
 void
 Repeat_acknowledge_engraver::initialize ()
 {
-  first_b_ = true;
-  daddy_trans_->set_property ("repeatCommands", SCM_EOL);
+  context ()->set_property ("repeatCommands", SCM_EOL);
 }
 
 
@@ -49,10 +50,9 @@ Repeat_acknowledge_engraver::Repeat_acknowledge_engraver ()
 void
 Repeat_acknowledge_engraver::start_translation_timestep ()
 {
-  first_b_ = true;
-  Translator_group * tr = daddy_trans_->where_defined (ly_symbol2scm ("repeatCommands"));
+  Context * tr = context ()->where_defined (ly_symbol2scm ("repeatCommands"));
   if (!tr)
-    tr = daddy_trans_;
+    tr = context ();
 
   tr->set_property ("repeatCommands", SCM_EOL);
 }
@@ -63,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");
@@ -72,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)
@@ -101,20 +101,20 @@ 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_trans_->set_property ("whichBar", scm_makfrom0str (s.to_str0 ()));
+         context ()->set_property ("whichBar", scm_makfrom0str (s.to_str0 ()));
        }
     }
 }
 
-ENTER_DESCRIPTION(Repeat_acknowledge_engraver,
-/* descr */       "Acknowledge repeated music, and convert the contents of
-repeatCommands ainto an appropriate setting for whichBar",
+ENTER_DESCRIPTION (Repeat_acknowledge_engraver,
+/* descr */       "Acknowledge repeated music, and convert the contents of "
+"repeatCommands ainto an appropriate setting for whichBar.",
 /* creats*/       "",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "",
 /* reads */       "repeatCommands whichBar",
 /* write */       "");