- TODO: line breaks might be allowed if we set whichBar to "".
- */
- if (s != "" || (volta_found && !gh_string_p (get_property ("whichBar"))))
+ 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))