Change \partcombine (et al.) to \partCombine

python/convertrules.py

 # -*- coding: utf-8 -*-
 # (setq py-indent-offset 4)
 
 
 import string
 import re
 import sys
 import lilylib
 
 _ = lilylib._
@@ skipping 3916 matching lines @@
     # because Grob.output-attributes.id = #(lambda ... ) will not work.
     # Then for the rest we convert 'id' to 'output-attributes.id'
     str = re.sub (manual_edits, r"\1output-attributes\2", str)
     str = re.sub (automatic, r"\1output-attributes.id", str)
     return str
 
 matchscmarg = (r'(?:[a-zA-Z_][-a-zA-Z_0-9]*|"(?:[^\\"]|\\.)*"|[-+]?[0-9.]+|\('
                + paren_matcher (10) + r"\))")
 
 @rule ((2, 21, 0), r"""\note #"4." -> \note {4.}
-\markup-command #" -> \markup-command " """)
+\markup-command #" -> \markup-command "
+\partcombine* -> \partCombine, \autochange -> \autoChange""")
 def conv (str):
     def repl1ly (m):
         if m.group (2)[0] in "blm":
             return m.group(1) + "{\\" + m.group(2) + "}"
         return m.group (1) + "{" + m.group (2) + "}"
     def repl1scm (m):
         return ("%s(ly:make-duration %d %d)" %
                 (m.group (1),
                  {"1": 0, "2": 1, "4": 2, "8": 3, "16": 4,
                   "32": 5, "64": 6, "128": 7, "256": 8,
@@ skipping 15 matching lines @@
     str = re.sub (r"\(tuplet-number::(?:fraction-with-notes|non-default-fraction-with-notes|append-note-wrapper)\s" +
                   paren_matcher (20) + r"\)", replscm, str)
     str = re.sub (r'\(markup\s' + paren_matcher (20) + r'\)',
                   replmarkup, str)
     str = re.sub (r'(\\(?:fret-diagram(?:-terse)?|harp-pedal|justify-string'
                   r'|lookup|musicglyph|postscript|simple|tied-lyric|verbatim-file'
                   r'|with-url|wordwrap-string'
                   r'|discant|freeBass|stdBass|stdBassIV|stdBassV|stdBassVI'
                   r')\s*)[#$](\\?")',
                   r'\1\2', str)
-    return str
-
-@rule ((2, 21, 0), "syntax change \\partcombine -> \\partCombine")
-def conv(str):
-    str = re.sub (r"\\partcombine", r"\\partCombine", str)

[dak, 2018/12/21 11:22:20]

Uh, you realize that every line after this one is a no-op?

-    str = re.sub (r"\\partcombineForce", r"\\partCombineForce", str)
-    str = re.sub (r"\\partcombineUp", r"\\partCombineUp", str)
-    str = re.sub (r"\\partcombineDown", r"\\partCombineDown", str)
-    str = re.sub (r"\\partcombineChords", r"\\partCombineChords", str)
-    str = re.sub (r"\\partcombineApart", r"\\partCombineApart", str)
-    str = re.sub (r"\\partcombineUnisono", r"\\partCombineUnisono", str)
-    str = re.sub (r"\\partcombineSoloI", r"\\partCombineSoloI", str)
-    str = re.sub (r"\\partcombineSoloII", r"\\partCombineSoloII", str)
-    str = re.sub (r"\\partcombineAutomatic", r"\\partCombineAutomatic", str)
-    return str
-
-@rule ((2, 21, 0), "syntax change \\autochange -> \\autoChange")
-def conv(str):
+    str = re.sub (r"\\partcombine(Force|Up|Down|Chords|Apart|Unisono|SoloI|SoloII|Automatic|)\b",
+                  r"\\partCombine\1", str)
     str = re.sub (r"\\autochange", r"\\autoChange", 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,
 # concatenate them into a single "conv" function;
 #
 # - enclose strings to be localized with `_(' and  `)';
 #
 # - write rule for bumping major stable version with
 #
 #     _ ("bump version for release")
 #
 # as exact description.