From 2ec0dc76eecddfb1e65047576bf11fbecfec1e33 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 02:04:04 +0000
Subject: [PATCH] lilypond-1.5.21

---
 lily/repeat-acknowledge-engraver.cc | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 24f8d723d4..4f75dade55 100644
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -92,15 +92,24 @@ 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_l_->set_property ("whichBar", ly_str02scm (s.ch_C ()));
+	}
     }
 }
 
-
 ENTER_DESCRIPTION(Repeat_acknowledge_engraver,
 /* descr */       "Acknowledge repeated music, and convert the contents of
 repeatCommands ainto an appropriate setting for whichBar",
-- 
2.39.5