Fix 1240.

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 063da1f4f9ca6d35f184b975cf2cff62d6ab5d0d..3571d1a9b2115e4179b271c0544b412cb99ff4fb 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2901,7 +2901,7 @@ longer in reversed order.\n"))
 ly:hairpin::after-line-breaking -> ly:spanner::kill-zero-spanned-time\n\
 Dash parameters for slurs and ties are now in dash-definition"))
 def conv(str):
-    if re.search(r'\\bar\s*"."', str):
+    if re.search(r'\\bar\s*"\."', str):
         stderr_write ("\n")
         stderr_write (NOT_SMART % _("\\bar \".\" now produces a thick barline.\n"))
         stderr_write (UPDATE_MANUALLY)
@@ -2915,8 +2915,9 @@ def conv(str):
 
 @rule ((2, 13, 4),
        _ ("Autobeaming rules have changed.  override-auto-beam-setting and\n\
-revert-auto-beam-setting have been eliminated.  \\overrideBeamSettings has been\n\
-added.  beatGrouping has been eliminated.\n\
+revert-auto-beam-setting have been eliminated.\n\
+\\overrideBeamSettings has been added.\n\
+beatGrouping has been eliminated.\n\
 Different settings for vertical layout.\n\
 ly:system-start-text::print -> system-start-text::print\n\
 Beam #'thickness -> Beam #'beam-thickness\n\
@@ -2989,7 +2990,7 @@ def conv(str):
     return re.sub(r'\bfeta(Number|Dynamic)', 'fetaText', str)
 
 @rule ((2, 13, 18),
-       _ ("\RemoveEmpty*StaffContext -> \*Staff \RemoveEmptyStaves"))
+       _ ("\\RemoveEmpty*StaffContext -> \\*Staff \\RemoveEmptyStaves"))
 def conv(str):
     str = re.sub (r"\\RemoveEmpty(|Drum|Rhythmic|Tab)StaffContext",
                   r"\\\1Staff \\RemoveEmptyStaves",
@@ -3006,7 +3007,7 @@ def conv (str):
     return str
 
 @rule ((2, 13, 29),
-       _ ("Eliminate beamSettings, beatLength, \setBeatGrouping, \overrideBeamSettings and \revertBeamSettings\n\
+       _ ("Eliminate beamSettings, beatLength, \\setBeatGrouping, \\overrideBeamSettings and \\revertBeamSettings.\n\
 \"accordion.accEtcbase\" -> \"accordion.etcbass\""))
 def conv(str):
     def sub_acc (m):
@@ -3024,11 +3025,11 @@ def conv(str):
                  sub_acc, str)
     if re.search(r'overrideBeamSettings', str):
         stderr_write("\n")
-        stderr_write(NOT_SMART % _("\overrideBeamSettings.  Use \set beamExceptions or \overrideTimeSignatureSettings.\n"))
+        stderr_write(NOT_SMART % _("\\overrideBeamSettings.  Use \\set beamExceptions or \\overrideTimeSignatureSettings.\n"))
         stderr_write(UPDATE_MANUALLY)
     if re.search(r'revertBeamSettings', str):
         stderr_write("\n")
-        stderr_write(NOT_SMART % _("\revertBeamSettings. Use \set beamExceptions or \revertTimeSignatureSettings.\n"))
+        stderr_write(NOT_SMART % _("\\revertBeamSettings. Use \\set beamExceptions or \\revertTimeSignatureSettings.\n"))
         stderr_write(UPDATE_MANUALLY)
     if re.search(r'beamSettings', str):
         stderr_write("\n")
@@ -3056,6 +3057,27 @@ def conv(str):
                   r"style = #'none",
                   str);
     return str
+
+@rule ((2, 13, 36),
+    _ ("Rename vertical spacing variables.\n\
+Add fretboard-table argument to savePredefinedFretboard."))
+def conv(str):
+    str = re.sub ('after-title-spacing',           'markup-system-spacing', str)
+    str = re.sub ('before-title-spacing',          'score-markup-spacing',  str)
+    str = re.sub ('between-scores-system-spacing', 'score-system-spacing',  str)
+
+    # also converts page-breaking-between-system-spacing:
+    str = re.sub ('between-system-spacing',        'system-system-spacing', str)
+
+    str = re.sub ('between-title-spacing',         'markup-markup-spacing', str)
+    str = re.sub ('bottom-system-spacing',         'last-bottom-spacing',   str)
+    str = re.sub ('top-title-spacing',             'top-markup-spacing',    str)
+
+    str = re.sub (r"storePredefinedDiagram",
+                  r"storePredefinedDiagram #default-fret-table",
+                  str);
+    return str
+
 # Guidelines to write rules (please keep this at the end of this file)
 #
 # - keep at most one rule per version; if several conversions should be done,