Emit not-quite-cross-staff beams in the right context.

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index be132ac5e3db3c7b269b330634317b93fa81a97f..bbfe73a9a0c77600c4dda0fb91e4f817a93b3c46 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2964,22 +2964,29 @@ def conv(str):
                   '(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",
+    # match through the end of assignments in the form "x = 30", "x = 1 \in", or "x = #3"
+    str = re.sub (r"(page-top-space)\s*=\s*(([+-]?[.\d]*\s*\\[-\w]+)|(#?\s*[-+]?[.\d]+))",
+                  r"obsolete-\g<0>"
+                  r"  top-system-spacing #'space = #(/ obsolete-\1 staff-space)",
                   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 = re.sub (r"(between-system-space)\s*=\s*(([+-]?[.\d]*\s*\\[-\w]+)|(#?\s*[-+]?[.\d]+))",
+                  r"obsolete-\g<0>"
+                  r"  between-system-spacing #'space = #(/ obsolete-\1 staff-space)"
+                  r"  between-scores-system-spacing #'space = #(/ obsolete-\1 staff-space)",
                   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 = re.sub (r"(between-system-padding)\s*=\s*(([+-]?[.\d]*\s*\\[-\w]+)|(#?\s*[-+]?[.\d]+))",
+                  r"obsolete-\g<0>"
+                  r"  between-system-spacing #'padding = #(/ obsolete-\1 staff-space)"
+                  r"  between-scores-system-spacing #'padding = #(/ obsolete-\1 staff-space)",
                   str)
-    str = re.sub (r"(after|between|before)-title-space\s*=\s*#([0-9.]+)",
-                  r"\1-title-spacing #'space = #\2",
+    str = re.sub (r"((before|between|after)-title-space)\s*=\s*(([+-]?[.\d]*\s*\\[-\w]+)|(#?\s*[-+]?[.\d]+))",
+                  r"obsolete-\g<0>"
+                  r"  \2-title-spacing #'space = #(/ obsolete-\1 staff-space)",
                   str)
 
-    if re.search(r'minimum-Y-extent', str):
+    if re.search(r"VerticalAxisGroup\s*#\s*'minimum-Y-extent", str):
         stderr_write("\n")
-        stderr_write(NOT_SMART % _("vertical spacing has been changed; minimum-Y-extent is obsolete.\n"))
+        stderr_write(NOT_SMART % _("minimum-Y-extent; vertical spacing no longer depends on the Y-extent of a VerticalAxisGroup.\n"))
         stderr_write(UPDATE_MANUALLY)
 
     return str
@@ -3122,6 +3129,78 @@ def conv(str):
        stderr_write (UPDATE_MANUALLY);
     return str
 
+@rule ((2, 13, 44),
+    _ ("Remove context from overrideTimeSignatureSettings and revertTimeSignatureSettings.\n"))
+
+def conv(str):
+    str = re.sub (r"\\(override|revert)TimeSignatureSettings(\s+[^#]*)(#[^#]*)#", r"\\\1TimeSignatureSettings\2#", str)
+    return str
+
+@rule ((2, 13, 46),
+    _ ("Change stringTunings from a list of semitones to a list of pitches.\n"\
+       "Change tenor and baritone ukulele names in string tunings.\n"\
+       "Generate messages for manual conversion of vertical spacing if required."))
+
+def conv(str):
+    def semitones2pitch(semitones):
+       steps = [0, 0, 1, 1, 2, 3, 3, 4, 4, 5, 5, 6]
+       alterations = ["NATURAL", "SHARP", "NATURAL", "SHARP", "NATURAL", "NATURAL", "SHARP", "NATURAL", "SHARP", "NATURAL", "SHARP", "NATURAL"]
+       octave = 0
+       while semitones > 11:
+           octave += 1
+           semitones -=12
+       while semitones < 0:
+           octave -= 1
+           semitones += 12
+       pitchArgs = "%d %d %s" % (octave, steps[semitones], alterations[semitones])
+       return pitchArgs
+
+    def convert_tones (semitone_list):
+       tones = semitone_list.split ()
+       res = ""
+       for tone in tones:
+           args = semitones2pitch(int(tone))
+           res += ",(ly:make-pitch " + args + ") "
+       return res
+
+    def new_tunings (matchobj):
+       return "stringTunings = #`(" + convert_tones(matchobj.group(1)) + ")"
+    str = re.sub (r"stringTunings\s*=\s*#'\(([\d\s-]*)\)", \
+          new_tunings , str)
+
+    str = re.sub (r"ukulele-(tenor|baritone)-tuning", r"\1-ukulele-tuning", str)
+
+    if re.search (r"[^-]page-top-space", str):
+        stderr_write (NOT_SMART % "page-top-space.  " + UPDATE_MANUALLY)
+    if re.search (r"[^-]between-system-(space|padding)", str):
+        stderr_write (NOT_SMART % "between-system-space, -padding.  " + UPDATE_MANUALLY)
+    if re.search (r"[^-](before|between|after)-title-space", str):
+        stderr_write (NOT_SMART % "-title-space.  " + UPDATE_MANUALLY)
+    if re.search (r"\\name\s", str):
+        stderr_write("\n" + _("Vertical spacing changes might affect user-defined contexts.  ") + UPDATE_MANUALLY)
+
+    return str
+
+@rule ((2, 13, 48),
+       _ ("Replace bar-size with bar-extent."))
+
+def conv(str):
+    def size_as_extent (matchobj):
+        half = "%g" % (float (matchobj.group (1)) / 2)
+        return "bar-extent = #'(-" + half + " . " + half + ")"
+
+    str = re.sub (r"bar-size\s*=\s*#([0-9\.]+)", size_as_extent, str)
+
+    return 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)
+    return str
 
 # Guidelines to write rules (please keep this at the end of this file)
 #