release: 1.5.31

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

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 477e295fb1885d180116ad3a19f0cc36ff6a62ac..a62d7a37d1d3fc300219854413915793717fc9eb 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver.hh"
@@ -25,28 +25,31 @@
 class Repeat_acknowledge_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Repeat_acknowledge_engraver();
-  
-  virtual void do_post_move_processing ();
-  virtual void do_process_music ();
-  virtual void do_creation_processing ();
+  TRANSLATOR_DECLARATIONS(Repeat_acknowledge_engraver);
+
+  virtual void start_translation_timestep ();
+  virtual void process_music ();
+  virtual void initialize ();
+
+  bool first_b_;
 };
 
 void
-Repeat_acknowledge_engraver::do_creation_processing ()
+Repeat_acknowledge_engraver::initialize ()
 {
+  first_b_ = true;
   daddy_trans_l_->set_property ("repeatCommands", SCM_EOL);
 }
 
 
-Repeat_acknowledge_engraver::Repeat_acknowledge_engraver()
+Repeat_acknowledge_engraver::Repeat_acknowledge_engraver ()
 {
 }
 
 void
-Repeat_acknowledge_engraver::do_post_move_processing ()
+Repeat_acknowledge_engraver::start_translation_timestep ()
 {
+  first_b_ = true;
   Translator_group * tr = daddy_trans_l_->where_defined (ly_symbol2scm ("repeatCommands"));
   if (!tr)
     tr = daddy_trans_l_;
@@ -55,35 +58,62 @@ Repeat_acknowledge_engraver::do_post_move_processing ()
 }
 
 void
-Repeat_acknowledge_engraver::do_process_music ()
+Repeat_acknowledge_engraver::process_music ()
 {
+  /*
+    At the start of a piece, we don't print any repeat bars.
+   */
+  if (now_mom () == Moment (0))
+    return ; 
+  
   SCM cs = get_property ("repeatCommands");
-
+  
   String s = "";
-  bool start  = false;
+  bool start = false;
   bool end = false;
+  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;
-      cs = gh_cdr (cs);      
+      else if (gh_pair_p (command) && ly_car (command) == ly_symbol2scm ("volta"))
+       volta_found = true;
+      cs = ly_cdr (cs);      
     }
 
-  if ( start && end )
+  if (start && end)
     s = ":|:";
   else if (start)
     s = "|:";
   else if (end)
     s = ":|";
 
-  if (s != "")
+  /*
+    TODO: line breaks might be allowed if we set whichBar to "".
+   */
+
+  /*
+    We only set the barline if we wouldn't overwrite a previously set
+    barline.
+   */
+  SCM wb = get_property ("whichBar");
+  SCM db  = get_property ("defaultBarType");
+  if (!gh_string_p (wb) || gh_equal_p (db, wb))
     {
-      daddy_trans_l_->set_property ("whichBar", ly_str02scm(s.ch_C()));
+      if (s != "" || (volta_found && !gh_string_p (wb)))
+       {
+         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 */       "");