release: 1.5.13

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

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 2443dfd81a8611561a77f6770024f8b2078f0032..24f8d723d483f93b2c0b7a2c2da02ee5247bf482 100644 (file)
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver.hh"
@@ -25,8 +25,7 @@
 class Repeat_acknowledge_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Repeat_acknowledge_engraver();
+  TRANSLATOR_DECLARATIONS(Repeat_acknowledge_engraver);
 
   virtual void start_translation_timestep ();
   virtual void process_music ();
@@ -43,7 +42,7 @@ Repeat_acknowledge_engraver::initialize ()
 }
 
 
-Repeat_acknowledge_engraver::Repeat_acknowledge_engraver()
+Repeat_acknowledge_engraver::Repeat_acknowledge_engraver ()
 {
 }
 
@@ -75,17 +74,17 @@ Repeat_acknowledge_engraver::process_music ()
   bool volta_found = false;
   while (gh_pair_p (cs))
     {
-      SCM command = gh_car (cs);
+      SCM command = ly_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) && gh_car (command) == ly_symbol2scm ("volta"))
+      else if (gh_pair_p (command) && ly_car (command) == ly_symbol2scm ("volta"))
        volta_found = true;
-      cs = gh_cdr (cs);      
+      cs = ly_cdr (cs);      
     }
 
-  if (start && end )
+  if (start && end)
     s = ":|:";
   else if (start)
     s = "|:";
@@ -97,8 +96,15 @@ Repeat_acknowledge_engraver::process_music ()
    */
   if (s != "" || (volta_found && !gh_string_p (get_property ("whichBar"))))
     {
-      daddy_trans_l_->set_property ("whichBar", ly_str02scm(s.ch_C()));
+      daddy_trans_l_->set_property ("whichBar", ly_str02scm (s.ch_C ()));
     }
 }
 
-ADD_THIS_TRANSLATOR(Repeat_acknowledge_engraver);
+
+ENTER_DESCRIPTION(Repeat_acknowledge_engraver,
+/* descr */       "Acknowledge repeated music, and convert the contents of
+repeatCommands ainto an appropriate setting for whichBar",
+/* creats*/       "",
+/* acks  */       "",
+/* reads */       "repeatCommands whichBar",
+/* write */       "");