Clean up regtests for usable-duration-logs (issues 1655, 1716)

Add convert-ly rule

Fix vesions on regtests to be the version to which the commit applied.

diff --git a/input/regression/multi-measure-rest-standard.ly b/input/regression/multi-measure-rest-standard.ly
index 8a398aab44a636c30db8ed8dbc055e32e68e62ba..a5809f3e7b187d5839a63f03f55163eee70cbf38 100644 (file)
--- a/input/regression/multi-measure-rest-standard.ly
+++ b/input/regression/multi-measure-rest-standard.ly
@@ -2,7 +2,7 @@
   texidoc = "Only whole, breve, longa and maxima rests are used by default for multi-measure rests."
 }
 
-\version "2.15.0"
+\version "2.15.2"
 
 \paper {
   ragged-right = ##t

diff --git a/input/regression/multi-measure-rest-tweaks.ly b/input/regression/multi-measure-rest-tweaks.ly
index f1ef48c275ce3bcc7bfe2abb2fc75b1a0c162f16..5a70e23f50a3fb611dad51d1e66fddc8e6dfe613 100644 (file)
--- a/input/regression/multi-measure-rest-tweaks.ly
+++ b/input/regression/multi-measure-rest-tweaks.ly
@@ -2,7 +2,7 @@
   texidoc = "Multi-measure rests standard values can be tweaked."
 }
 
-\version "2.15.0"
+\version "2.15.2"
 \new Staff {
   \override MultiMeasureRest #'usable-duration-logs = #'(2 1)
   \time 1/4 R4-"Use non-standard multi-measure rests."

diff --git a/python/convertrules.py b/python/convertrules.py
index 2761626997d07f0844f900bcfd22edb230558064..56bdb9cc768402d57eb84c0ea51c43746dd710cb 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3196,10 +3196,10 @@ def conv(str):
 @rule ((2, 13, 51),
     _ ("Woodwind diagrams: Changes to the clarinet diagram."))
 def conv(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)
+    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)
     return str
 
 @rule ((2, 14, 0),
@@ -3207,6 +3207,14 @@ def conv(str):
 def conv (str):
     return str
 
+@rule ((2, 15, 2),
+       _ ("Change in internal property for MultiMeasureRest"))
+def conv (str):
+    if re.search (r'use-breve-rest',str):
+        stderr_write (NOT_SMART % _("use-breve-rest.  This internal property has been replaced by round-to-longer-rest and usable-duration-logs.\n"))
+        stderr_write (UPDATE_MANUALLY)
+    return str
+
 
 # Guidelines to write rules (please keep this at the end of this file)
 #