Manual convert-ly woodwind files

Narrow the convert-ly rule from 1273cd.. to reduce false-positives.
Resolve the remaining false-positives with a version bump.

diff --git a/Documentation/notation/wind.itely b/Documentation/notation/wind.itely
index d5c4afbd88364e5112dc7b2ebac88f75812a2163..ab31e7c23a92e08df2c917028e45900ac018ec85 100644 (file)
--- a/Documentation/notation/wind.itely
+++ b/Documentation/notation/wind.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.13.51"
 
 @node Wind instruments
 @section Wind instruments

diff --git a/Documentation/snippets/new/woodwind-diagrams-listing.ly b/Documentation/snippets/new/woodwind-diagrams-listing.ly
index 381523528fd6ed6c8367419059aa50f6b70a9cfb..9185acb308466c181d263aa9154461d9b0100c72 100644 (file)
--- a/Documentation/snippets/new/woodwind-diagrams-listing.ly
+++ b/Documentation/snippets/new/woodwind-diagrams-listing.ly
@@ -1,4 +1,4 @@
-\version "2.13.36"
+\version "2.13.51"
 
 \header {
   lsrtags="winds"

diff --git a/input/regression/woodwind-diagrams-empty.ly b/input/regression/woodwind-diagrams-empty.ly
index 07ea72e7fa6102d0aca949b80077aca9fc0dce63..1e6e859bad9c7316c01d6ba527f4240a8fc033bb 100644 (file)
--- a/input/regression/woodwind-diagrams-empty.ly
+++ b/input/regression/woodwind-diagrams-empty.ly
@@ -1,4 +1,4 @@
-\version "2.13.36"
+\version "2.13.51"
 
 \header {
   texidoc="Empty woodwind diagrams for all instruments

diff --git a/python/convertrules.py b/python/convertrules.py
index 34099734f589c1a4fc4facf416a767a64a1a1991..bbfe73a9a0c77600c4dda0fb91e4f817a93b3c46 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3196,7 +3196,7 @@ def conv(str):
 @rule ((2, 13, 51),
     _ ("Woodwind diagrams: Changes to the clarinet diagram."))
 def conv(str):
-    if re.search(r'woodwind-diagram', str):
+    if re.search(r'\\woodwind-diagram\s*#[^#]*clarinet\s', str):
         stderr_write("\n")
         stderr_write(NOT_SMART % _("woodwind-diagrams.  Clarinet fingering changed to reflect actual anatomy of instrument.\n"))
         stderr_write(UPDATE_MANUALLY)