Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 7fb5ef70a27bde73516e0ee968ab92ea6d3b5db1..7111657ca1912d9adc265a927e2af00b013cf0bc 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2953,6 +2953,36 @@ you must now specify the distances between staves rather than the offset of stav
                   '', str)
     return str
 
+@rule ((2, 13, 10),
+       _ ("Remove obsolete engravers/translators: Note_swallow_translator,\n\
+Rest_swallow_translator, Skip_event_swallow_translator, Swallow_engraver,\n\
+Swallow_performer and String_number_engraver.\n\
+New vertical spacing variables."))
+def conv(str):
+    str = re.sub (r'\\(consists|remove)\s+"*(Swallow_(engraver|performer)|'
+                  '(Note|Rest|Skip_event)_swallow_translator|String_number_engraver)"*',
+                  '', str)
+
+    str = re.sub (r"page-top-space\s*=\s*#([0-9.]+)",
+                  r"top-system-spacing #'space = #\1",
+                  str)
+    str = re.sub (r"between-system-space\s*=\s*#([0-9.]+)",
+                  r"between-system-spacing #'space = #\1\nbetween-scores-system-spacing #'space = #\1",
+                  str)
+    str = re.sub (r"between-system-padding\s*=\s*#([0-9.]+)",
+                  r"between-system-spacing #'padding = #\1\nbetween-scores-system-spacing #'padding = #\1",
+                  str)
+    str = re.sub (r"(after|between|before)-title-space\s*=\s*#([0-9.]+)",
+                  r"\1-title-spacing #'space = #\2",
+                  str)
+
+    if re.search(r'minimum-Y-extent', str):
+        stderr_write("\n")
+        stderr_write(NOT_SMART % _("vertical spacing has been changed; minimum-Y-extent is obsolete.\n"))
+        stderr_write(UPDATE_MANUALLY)
+
+    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,