update-with-convert-ly.sh: improve exclusion patterns for find

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index bbba578e48b8c7e9a3f1ec0dc0d16b817e8d1176..6ea53ea37d33a1d35c316b962fdeba69b742c332 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3257,7 +3257,8 @@ def conv (str):
                   r"#(define \g<2> #{ \\stringTuning\g<3> #})", str)
     return str
 
-@rule ((2, 15, 17), "\\markuplines -> \\markuplist")
+@rule ((2, 15, 17), "\\markuplines -> \\markuplist\n\
+Change Beam broken slope syntax.")
 def conv (str):
     str = re.sub (r"""
 \\markuplines( +)([^ ].*)
@@ -3266,6 +3267,83 @@ def conv (str):
            \g<1>\g<3>""", str)
     str = re.sub (r"\\markuplines", r"\\markuplist", str)
     str = re.sub (r"@funindex markuplines", r"@funindex markuplist", str)
+    if re.search (r'consistent-broken-slope', str):
+        stderr_write ("\n")
+        stderr_write (NOT_SMART % _("consistent-broken-slope, which is now handled through the positions callback.\n"))
+        stderr_write (_ ("input/regression/beam-broken-classic.ly shows how broken beams are now handled.\n"))
+        stderr_write (UPDATE_MANUALLY)
+    return str
+
+def paren_matcher (n):
+    # poor man's matched paren scanning, gives up
+    # after n+1 levels.  Matches any string with balanced
+    # parens inside; add the outer parens yourself if needed.
+    # Nongreedy.
+    return r"[^()]*?(?:\("*n+r"[^()]*?"+r"\)[^()]*?)*?"*n
+    return
+
+def undollar_scm (m):
+    return re.sub (r"\$", "", m.group (0))
+
+def undollar_embedded (m):
+    str = re.sub (r"#\$", "#", m.group (1))
+    # poor man's matched paren scanning after #, gives up
+    # after 25 levels.
+    str = re.sub ("#`?\("+paren_matcher (25)+"\)", undollar_scm, str)
+    return m.string[m.start (0):m.start (1)] + str + m.string[m.end (1):m.end (0)]
+
+def strip_export (str):
+    return re.sub (r"\(ly:export\s+(" + paren_matcher (25) + r")\)",
+                   r"\1", str)
+
+def export_puller (m):
+    if not re.search (r"ly:export\s+", m.group (0)):
+        return m.group (0)
+    return "$" + strip_export (m.string[m.start (0)+1:m.end (0)])
+
+def ugly_function_rewriter (m):
+    return m.string[m.start(0):m.start(1)] + strip_export (m.group (1)) + m.string[m.end(1):m.end(0)]
+
+should_really_be_music_function = "(?:\
+set-time-signature|empty-music|add-grace-property|\
+remove-grace-property|set-accidental-style)"
+
+def record_ugly (m):
+    global should_really_be_music_function
+    if not re.match (should_really_be_music_function, m.group (1)) \
+            and re.search (r"ly:export\s+", m.group (2)):
+        should_really_be_music_function = \
+            should_really_be_music_function[:-1] + "|" + m.group (1) + ")"
+    return m.group (0)
+
+@rule ((2, 15, 18), "#$ -> #, ly:export -> $")
+def conv (str):
+    str = re.sub (r"(?s)#@?\{(.*?)#@?\}", undollar_embedded, str)
+    str = re.sub (r"#\(define(?:-public)?\s+\(([-a-zA-Z]+)"
+                  + r"\b[^()]*?\)(" + paren_matcher (25)
+                  + r")\)", record_ugly, str)
+    str = re.sub (r"\(define(?:-public)?\s+\(" + should_really_be_music_function
+                  + r"\b[^()]*\)(" + paren_matcher (25)
+                  + r")\)", ugly_function_rewriter, str)
+    str = re.sub (r"#(?=\(" + should_really_be_music_function + ")", "$", str)
+    str = re.sub (r"#\(markup\*(?=\s)", r"$(markup", str)
+    str = re.sub ("#\("+paren_matcher (25)+"\)", export_puller, str)
+    if re.search (r"\(ly:export\s+", str):
+        stderr_write ('\n')
+        stderr_write (NOT_SMART % "ly:export")
+        stderr_write ('\n')
+    return str
+
+@rule ((2, 15, 19), r"$(set-time-signature ...) -> \time")
+def conv (str):
+    str = re.sub (r"\$\(set-time-signature\s+([0-9]+)\s+([0-9]+)\s*\)",
+                  r"\\time \1/\2", str)
+    str = re.sub (r"\$\(set-time-signature\s+([0-9]+)\s+([0-9]+)\s+(" +
+                  paren_matcher (5) + r")\)", r"\\time #\3 \1/\2", str)
+    if re.search (r"\(set-time-signature\s+", str):
+        stderr_write ('\n')
+        stderr_write (NOT_SMART % "set-time-signature")
+        stderr_write ('\n')
     return str
 
 # Guidelines to write rules (please keep this at the end of this file)