From: Marc Hohl <marc@hohlart.de>
Date: Mon, 15 Oct 2012 19:29:32 +0000 (+0200)
Subject: Include whichBar in convert-ly rule for bar line changes
X-Git-Tag: release/2.17.6-1~47
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1b36fe672946c010741b3679c028a3f7723f4cd8;p=lilypond.git

Include whichBar in convert-ly rule for bar line changes

This is a follow-up of Issue 2790 and commit
cced43289cf170305e6e6517180659a1c4fa91db.

The whichBar property is not set explicitly anywhere
in the sources and thus was forgotten in the commit above.
---

diff --git a/python/convertrules.py b/python/convertrules.py
index 6eeb392ee4..5d44fd7a15 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3399,7 +3399,7 @@ def conv (str):
                   matcharg + ")", r"\\shape\2\1", str)
     return str
 
-barstring=r"(\\bar|defaultBarType|segnoType|doubleRepeatType|startRepeatType|endRepeatType|doubleRepeatSegnoType|startRepeatSegnoType|endRepeatSegnoType)(\s*[=]?\s*[#]?)"
+barstring=r"(\\bar|whichBar|defaultBarType|segnoType|doubleRepeatType|startRepeatType|endRepeatType|doubleRepeatSegnoType|startRepeatSegnoType|endRepeatSegnoType)(\s*[=]?\s*[#]?)"
 
 @rule ((2, 17, 5), r"New bar line interface")
 def conv(str):
diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index c1c006cf06..76c5191bf1 100644
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -576,7 +576,7 @@ of bar line to create.
 Example:
 
 @example
-\\set Staff.whichBar = \"|:\"
+\\set Staff.whichBar = \".|:\"
 @end example
 
 @noindent