2003 -> 2004

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

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 24f8d723d483f93b2c0b7a2c2da02ee5247bf482..18907b15b38f3c998bc140bd2727df55b906ca5a 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver.hh"
@@ -31,14 +31,12 @@ public:
   virtual void process_music ();
   virtual void initialize ();
 
-  bool first_b_;
 };
 
 void
 Repeat_acknowledge_engraver::initialize ()
 {
-  first_b_ = true;
-  daddy_trans_l_->set_property ("repeatCommands", SCM_EOL);
+  daddy_trans_->set_property ("repeatCommands", SCM_EOL);
 }
 
 
@@ -49,10 +47,9 @@ Repeat_acknowledge_engraver::Repeat_acknowledge_engraver ()
 void
 Repeat_acknowledge_engraver::start_translation_timestep ()
 {
-  first_b_ = true;
-  Translator_group * tr = daddy_trans_l_->where_defined (ly_symbol2scm ("repeatCommands"));
+  Translator_group * tr = daddy_trans_->where_defined (ly_symbol2scm ("repeatCommands"));
   if (!tr)
-    tr = daddy_trans_l_;
+    tr = daddy_trans_;
 
   tr->set_property ("repeatCommands", SCM_EOL);
 }
@@ -92,19 +89,29 @@ Repeat_acknowledge_engraver::process_music ()
     s = ":|";
 
   /*
-    TODO: line breaks might be allowed if we set whichBar to "". 
+    TODO: line breaks might be allowed if we set whichBar to "".
    */
-  if (s != "" || (volta_found && !gh_string_p (get_property ("whichBar"))))
+
+  /*
+    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_->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",
+/* descr */       "Acknowledge repeated music, and convert the contents of "
+"repeatCommands ainto an appropriate setting for whichBar.",
 /* creats*/       "",
-/* acks  */       "",
+/* accepts */     "",
+/* acks  */      "",
 /* reads */       "repeatCommands whichBar",
 /* write */       "");