Merge master into nested-bookparts

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

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index bf888bc1b068d9bbdb825996252557929b914765..5d7b98d36e4144661fd54b1e6775b092b72f4300 100644 (file)
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -1,95 +1,125 @@
-/*   
-  repeat-acknowledge-engraver.cc --  implement Repeat_acknowledge_engraver
-  
+/*
+  repeat-acknowledge-engraver.cc -- implement Repeat_acknowledge_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "engraver.hh"
 #include "translator-group.hh"
+#include "context.hh"
 #include "repeated-music.hh"
 
+#include "translator.icc"
 
 /*
   Objective:
 
   -- set and reset repeatCommands, so Unfolded_repeat_iterator knows
-    where to set variables.
+  where to set variables.
 
   -- collect information passed by Unfolded_repeat_iterator for
-   Bar_engraver: writes whichBar property. (TODO: check for
-   interactions with timing engraver.)
-  
- */
+  Bar_engraver: writes whichBar property. (TODO: check for
+  interactions with timing engraver.)
+*/
 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);
+protected:
+  void start_translation_timestep ();
+  void process_music ();
+  virtual void initialize ();
 };
 
 void
-Repeat_acknowledge_engraver::do_creation_processing ()
+Repeat_acknowledge_engraver::initialize ()
 {
-  daddy_trans_l_->set_property ("repeatCommands", SCM_EOL);
+  context ()->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 ()
 {
-  Translator_group * tr = daddy_trans_l_->where_defined (ly_symbol2scm ("repeatCommands"));
+  SCM rc;
+  Context *tr = context ()->where_defined (ly_symbol2scm ("repeatCommands"), &rc);
   if (!tr)
-    tr = daddy_trans_l_;
+    tr = context ();
 
   tr->set_property ("repeatCommands", SCM_EOL);
 }
 
 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 ; 
-  
+  */
+  if (!now_mom ().main_part_)
+    return;
+
   SCM cs = get_property ("repeatCommands");
 
-  String s = "";
-  bool start  = false;
+  string s = "";
+  bool start = false;
   bool end = false;
-  while (gh_pair_p (cs))
+  bool volta_found = false;
+  while (scm_is_pair (cs))
     {
-      SCM command = gh_car (cs);
+      SCM command = scm_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 (scm_is_pair (command) && scm_car (command) == ly_symbol2scm ("volta"))
+       volta_found = true;
+      cs = scm_cdr (cs);
     }
 
-  if ( start && end )
-    s = ":|:";
+  if (start && end)
+    s = robust_scm2string (get_property ("doubleRepeatType"), ":|:");
   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 (!scm_is_string (wb) || ly_is_equal (db, wb))
     {
-      daddy_trans_l_->set_property ("whichBar", ly_str02scm(s.ch_C()));
+      if (s != "" || (volta_found && !scm_is_string (wb)))
+       context ()->set_property ("whichBar", ly_string2scm (s));
     }
 }
 
+ADD_TRANSLATOR (Repeat_acknowledge_engraver,
+               /* doc */
+               "Acknowledge repeated music, and convert the contents of"
+               " @code{repeatCommands} into an appropriate setting for"
+               " @code{whichBar}.",
+
+               /* create */
+               "",
+
+               /* read */
+               "doubleRepeatType "
+               "repeatCommands "
+               "whichBar ",
 
-ADD_THIS_TRANSLATOR(Repeat_acknowledge_engraver);
+               /* write */
+               ""
+               );