X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeat-acknowledge-engraver.cc;h=d61ef206ba83af8dd301227cf36de164587087c9;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=5ae53695aaaa98d3d2599e53a55472342f6cfb71;hpb=a501f5946426488804ca2b03ab986f9c2b94ab99;p=lilypond.git

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 5ae53695aa..d61ef206ba 100644
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -1,47 +1,45 @@
-/*   
-  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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2008 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:
-  TRANSLATOR_DECLARATIONS (Repeat_acknowledge_engraver);
 
-  virtual void start_translation_timestep ();
-  virtual void process_music ();
+  TRANSLATOR_DECLARATIONS (Repeat_acknowledge_engraver);
+protected:
+  void start_translation_timestep ();
+  void process_music ();
   virtual void initialize ();
-
 };
 
 void
 Repeat_acknowledge_engraver::initialize ()
 {
-  get_parent_context ()->set_property ("repeatCommands", SCM_EOL);
+  context ()->set_property ("repeatCommands", SCM_EOL);
 }
 
-
 Repeat_acknowledge_engraver::Repeat_acknowledge_engraver ()
 {
 }
@@ -49,9 +47,10 @@ Repeat_acknowledge_engraver::Repeat_acknowledge_engraver ()
 void
 Repeat_acknowledge_engraver::start_translation_timestep ()
 {
-  Context * tr = get_parent_context ()->where_defined (ly_symbol2scm ("repeatCommands"));
+  SCM rc;
+  Context *tr = context ()->where_defined (ly_symbol2scm ("repeatCommands"), &rc);
   if (!tr)
-    tr = get_parent_context ();
+    tr = context ();
 
   tr->set_property ("repeatCommands", SCM_EOL);
 }
@@ -61,30 +60,30 @@ 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 = "";
+
+  string s = "";
   bool start = false;
   bool end = false;
   bool volta_found = false;
-  while (is_pair (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 (is_pair (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)
-    s = ":|:";
+    s = robust_scm2string (get_property ("doubleRepeatType"), ":|:");
   else if (start)
     s = "|:";
   else if (end)
@@ -92,28 +91,35 @@ Repeat_acknowledge_engraver::process_music ()
 
   /*
     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 (!is_string (wb) || is_equal (db, wb))
+  SCM db = get_property ("defaultBarType");
+  if (!scm_is_string (wb) || ly_is_equal (db, wb))
     {
-      if (s != "" || (volta_found && !is_string (wb)))
-	{
-	  get_parent_context ()->set_property ("whichBar", scm_makfrom0str (s.to_str0 ()));
-	}
+      if (s != "" || (volta_found && !scm_is_string (wb)))
+	context ()->set_property ("whichBar", ly_string2scm (s));
     }
 }
 
-ENTER_DESCRIPTION (Repeat_acknowledge_engraver,
-/* descr */       "Acknowledge repeated music, and convert the contents of "
-"repeatCommands ainto an appropriate setting for whichBar.",
-/* creats*/       "",
-/* accepts */     "",
-/* acks  */      "",
-/* reads */       "repeatCommands whichBar",
-/* write */       "");
+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 ",
+
+		/* write */
+		""
+		);