if re.search(r'\\oldaddlyrics', str):
stderr_write (NOT_SMART % "oldaddlyrics")
stderr_write (_ ("oldaddlyrics is no longer supported. \n \
- Use addlyrics or lyrsicsto instead.\n"))
+ Use addlyrics or lyricsto instead.\n"))
stderr_write (UPDATE_MANUALLY)
raise FatalConversionError ()
return str
return r"[^{}]*?(?:{"*n+r"[^{}]*?"+r"}[^{}]*?)*?"*n
matchstring = r'"(?:[^"\\]|\\.)*"'
-matcharg = (r"\s+(?:[$#]['`]?\s*(?:[a-zA-Z]\S*|" + matchstring + r"|\("
- + paren_matcher(20) + r"\))|" + matchstring + r"|\\[a-z_A-Z]+)")
-matchmarkup = (r'(?:\\markup\s*(?:{' + brace_matcher (20) +r'}|' +
+matcharg = (r"\s+(?:[$#]['`]?\s*(?:[a-zA-Z][^ \t\n()\\]*|" + matchstring
+ + r"|#?\(" + paren_matcher(20) + r"\)|"
+ + r"-?(?:[0-9]+(?:\.[0-9]*)?|\.[0-9]+)|"
+ + r"#(?:[tf]|\\.|@?\{" + brace_matcher (10) + r"#@?\}))|"
+ + matchstring + r"|\\[a-z_A-Z]+|[0-9]+(?:/[0-9]+)?|-[0-9]+)")
+matchmarkup = (r'(?:\\markup\s*(?:@?\{' + brace_matcher (20) +r'\}|' +
matchstring + r'|(?:\\[a-z_A-Z][a-z_A-Z-]*(?:' + matcharg +
- r')*?\s*)*(?:' + matchstring + "|{" + brace_matcher (20) +
- "}))|" + matchstring + ")")
+ r')*?\s*)*(?:' + matchstring + r"|@?\{" + brace_matcher (20) +
+ r"\}))|" + matchstring + ")")
@rule((2, 15, 25), r"\(auto)?Footnote(Grob)? -> \footnote")
def conv (str):
@rule((2, 17, 27), r'''\stringTuning \notemode -> \stringTuning''')
def conv(str):
- str = re.sub (r"\\stringTuning\s*\\notemode(\s*)@?\{\s*(.*?)\s*@?}",
+ str = re.sub (r"\\stringTuning\s*\\notemode(\s*)@?\{\s*(.*?)\s*@?\}",
r"\\stringTuning\1\2", str)
if re.search (r'[^-\w]staff-padding[^-\w]', str):
stderr_write (NOT_SMART % "staff-padding")
str = re.sub (r'\bthin-kern\b', 'segno-kern', str)
return str
+# before_id is written in a manner where it will only substantially
+# (rather than as a lookbefore assertion) match material that could
+# not be part of a previous id. In that manner, one replacement does
+# not inhibit an immediately adjacent replacement.
+
+before_id = r'(?:^|(?<!\\)(?:\\\\)+|(?<=[^-_\\a-zA-Z])|(?<=[^a-zA-Z][-_]))'
+
+# after_id is a pure lookbehind assertion so its match string is
+# always empty
+
+after_id = r'(?![a-zA-Z]|[-_][a-zA-Z])'
+
@rule ((2, 19, 16), """implicitTimeSignatureVisibility -> initialTimeSignatureVisibility
csharp -> c-sharp""")
def conv(str):
str = re.sub (r'\bimplicitTimeSignatureVisibility\b', 'initialTimeSignatureVisibility', str)
- str = re.sub (r'\b([a-g])((?:sharp){1,2}|(?:flat){1,2})\b',r'\1-\2', str)
+ str = re.sub ('(' + before_id + r'[a-g])((?:sharp){1,2}|(?:flat){1,2})'
+ + after_id, r'\1-\2', str)
+ return str
+
+@rule ((2, 19, 22), """whiteout -> whiteout-box
+(define-xxx-function (parser location ...) -> (define-xxx-function (...)
+(xxx ... parser ...) -> (xxx ... ...)""")
+def conv(str):
+ # whiteout -> whiteout-box
+ str = re.sub (r"\\whiteout(?![a-z_-])", r"\\whiteout-box", str)
+ str = re.sub (r"\b\.whiteout(?![a-z_-])\b", r".whiteout-box", str)
+ str = re.sub (r"#'whiteout(?![a-z_-])\b", r"#'whiteout-box", str)
+ str = re.sub (r"\bstencil-whiteout\b", r"stencil-whiteout-box", str)
+
+ # (define-xxx-function (parser location ...) -> (define-xxx-function (...)
+ def subst(m):
+ def subsub(m):
+ str = (m.group (1)
+ + re.sub ('(?<=\s|["\\()])' + m.group (2) + r'(?=\s|["\\()])',
+ r'(*location*)',
+ re.sub (r'(?<=\s|["\\()])parser(?=\s|["\\()])',
+ r'(*parser*)', m.group (3))))
+ return str
+ return re.sub (r'(\([-a-z]+\s*\(+)parser\s+([-a-z]+)\s*((?:.|\n)*)$',
+ subsub, m.group (0))
+ str = re.sub (r'\(define-(?:music|event|scheme|void)-function(?=\s|["(])'
+ + paren_matcher (20) + r'\)', subst, str)
+
+ # (xxx ... parser ...) -> (xxx ... ...)
+ def repl (m):
+ return m.group (1) + inner (m.group (2))
+ def inner (str):
+ str = re.sub (r"(\((?:" +
+ r"ly:parser-lexer|" +
+ r"ly:parser-clone|" +
+ r"ly:parser-output-name|" +
+ r"ly:parser-error|" +
+ r"ly:parser-define!|" +
+ r"ly:parser-lookup|" +
+ r"ly:parser-has-error\?|" +
+ r"ly:parser-clear-error|" +
+ r"ly:parser-set-note-names|" +
+ r"ly:parser-include-string|" +
+ r"note-names-language|" +
+ r"display-lily-music|" +
+ r"music->lily-string|" +
+ r"note-name->lily-string|" +
+ r"value->lily-string|"
+ r"check-grob-path|" +
+ r"event-chord-wrap!|" +
+ r"collect-bookpart-for-book|" +
+ r"collect-scores-for-book|" +
+ r"collect-music-aux|" +
+ r"collect-book-music-for-book|" +
+ r"scorify-music|" +
+ r"collect-music-for-book|" +
+ r"collect-book-music-for-book|" +
+ r"toplevel-book-handler|" +
+ r"default-toplevel-book-handler|" +
+ r"print-book-with-defaults|" +
+ r"toplevel-music-handler|" +
+ r"toplevel-score-handler|" +
+ r"toplevel-text-handler|" +
+ r"toplevel-bookpart-handler|" +
+ r"book-music-handler|" +
+ r"context-mod-music-handler|" +
+ r"bookpart-music-handler|" +
+ r"output-def-music-handler|" +
+ r"print-book-with-defaults-as-systems|" +
+ r"add-score|" +
+ r"add-text|" +
+ r"add-music|" +
+ r"make-part-combine-music|" +
+ r"make-directed-part-combine-music|" +
+ r"add-quotable|" +
+ r"paper-variable|" +
+ r"make-autochange-music|" +
+ r"context-mod-from-music|" +
+ r"context-defs-from-music)" +
+ r'(?=\s|[()]))(' + paren_matcher (20) + ")"
+ r"(?:\s+parser(?=\s|[()])|\s*\(\*parser\*\))", repl, str)
+ return str
+ return inner (str)
+
+@rule ((2, 19, 24), r"""music-has-type -> music-is-of-type?
+\applyOutput #'Context -> \applyOutput Context""")
+def conv (str):
+ str = re.sub (r'(?<=\s|["\\()])' + "music-has-type" + r'(?=\s|["\\()])',
+ "music-is-of-type?", str)
+ str = re.sub (r"(\\applyOutput\s+)#'([a-zA-Z])", r"\1\2", str)
+ return str
+
+@rule ((2, 19, 28), r"c:5.x, c:5^x, c:sus -> c:3.5.x, c:3.5^x, c:5")
+def conv (str):
+ str = re.sub (r":5([.^][1-9])", r":3.5\1", str)
+ # row back for self-defeating forms
+ str = re.sub (r":3\.5((?:\.[0-9]+)*\^(?:[0-9]+\.)*)3\.", r":5\1", str)
+ str = re.sub (r":3\.5((?:\.[0-9]+)*\^?:[0-9]+(?:\.[0-9]+)*)\.3(?![.0-9])", r":5\1", str)
+ str = re.sub (r":3\.5((?:\.[0-9]+)*)\^3(?=\s|\})", r":5\1", str)
+ str = re.sub (r":sus(?=\s|\})", ":5", str)
+ str = re.sub (r":1\.5(?=\s|[.^}])", r":5", str)
+ return str
+
+@rule ((2, 19, 29), r"partcombine*Once -> \once \partcombine*")
+def conv(str):
+ str = re.sub (r"(\\partcombine(?:Apart|Chords|Unisono|SoloII?|Automatic))Once\b",
+ r"\\once \1", str)
+ str = re.sub (r"(\\partcombineForce" + matcharg + r")\s*##f(\s)",
+ r"\1\2", str)
+ str = re.sub (r"(\\partcombineForce" + matcharg + r")\s*##t(\s)",
+ r"\\once \1\2", str)
return str
# Guidelines to write rules (please keep this at the end of this file)
projects / lilypond.git / blobdiff