Merge branch 'master' into lilypond/translation

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 3ea4739db0d091dbe138b736d62dc0c6ea692029..be132ac5e3db3c7b269b330634317b93fa81a97f 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3095,12 +3095,12 @@ def conv(str):
 @rule ((2, 13, 40),
     _ ("Remove \\paper variables head-separation and foot-separation."))
 def conv(str):
-    if re.search(r'head-separation', str):
+    if re.search (r'head-separation', str):
         stderr_write("\n")
         stderr_write(NOT_SMART % ("head-separation.\n"))
         stderr_write(_ ("Adjust settings for top-system-spacing instead.\n"))
-        stderr_write(UPDATE_MANUALLY)
-    if re.search(r'foot-separation', str):
+        stderr_write (UPDATE_MANUALLY)
+    if re.search (r'foot-separation', str):
         stderr_write("\n")
         stderr_write(NOT_SMART % ("foot-separation.\n"))
         stderr_write(_ ("Adjust settings for last-bottom-spacing instead.\n"))
@@ -3108,6 +3108,20 @@ def conv(str):
 
     return str
 
+@rule ((2, 13, 42),
+    _ ("Rename space to basic-distance in various spacing alists.\n\
+Remove HarmonicParenthesesItem grob."))
+def conv(str):
+    str = re.sub (r'\(space\s+\.\s+([0-9]*\.?[0-9]*)\)', r'(basic-distance . \1)', str)
+    str = re.sub (r"#'space\s+=\s+#?([0-9]*\.?[0-9]*)", r"#'basic-distance = #\1", str)
+    if re.search (r'HarmonicParenthesesItem', str):
+       stderr_write ("\n")
+       stderr_write (NOT_SMART % ("HarmonicParenthesesItem.\n"))
+       stderr_write (_ ("HarmonicParenthesesItem has been eliminated.\n"))
+       stderr_write (_ ("Harmonic parentheses are part of the TabNoteHead grob.\n"))
+       stderr_write (UPDATE_MANUALLY);
+    return str
+
 
 # Guidelines to write rules (please keep this at the end of this file)
 #