X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Fconvertrules.py;h=3ea4739db0d091dbe138b736d62dc0c6ea692029;hb=54913d98833edba1223c784ce32b21a45710806b;hp=21c934fd37f642c850a5065fb7e0a9d3752ad44f;hpb=bf5e2a2a8feba1a38d620049d426b4f26bd55bb6;p=lilypond.git diff --git a/python/convertrules.py b/python/convertrules.py index 21c934fd37..3ea4739db0 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2901,7 +2901,7 @@ longer in reversed order.\n")) ly:hairpin::after-line-breaking -> ly:spanner::kill-zero-spanned-time\n\ Dash parameters for slurs and ties are now in dash-definition")) def conv(str): - if re.search(r'\\bar\s*"."', str): + if re.search(r'\\bar\s*"\."', str): stderr_write ("\n") stderr_write (NOT_SMART % _("\\bar \".\" now produces a thick barline.\n")) stderr_write (UPDATE_MANUALLY) @@ -2915,8 +2915,9 @@ def conv(str): @rule ((2, 13, 4), _ ("Autobeaming rules have changed. override-auto-beam-setting and\n\ -revert-auto-beam-setting have been eliminated. \\overrideBeamSettings has been\n\ -added. beatGrouping has been eliminated.\n\ +revert-auto-beam-setting have been eliminated.\n\ +\\overrideBeamSettings has been added.\n\ +beatGrouping has been eliminated.\n\ Different settings for vertical layout.\n\ ly:system-start-text::print -> system-start-text::print\n\ Beam #'thickness -> Beam #'beam-thickness\n\ @@ -2949,8 +2950,8 @@ you must now specify the distances between staves rather than the offset of stav str = re.sub ('ly:(system-start-text::print|note-head::brew-ez-stencil|ambitus::print)', '\\1', str) str = re.sub ('(\\bBeam\\s+#\')(?=thickness\\b)', '\\1beam-', str) - str = re.sub (r'(\\context\s*\{{1}[^\}]+\\name\s+"*Dynamics"*[^\}]*\}{1})', - '', str) + str = re.sub (r'(\\context\s*\{{1}[^\}]+\\type\s+\"?Engraver_group\"?\s+\\name\s+"*Dynamics"*[^\}]*\}{1})', + '% [Convert-ly] The Dynamics context is now included by default.', str) return str @rule ((2, 13, 10), @@ -2989,7 +2990,7 @@ def conv(str): return re.sub(r'\bfeta(Number|Dynamic)', 'fetaText', str) @rule ((2, 13, 18), - _ ("\RemoveEmpty*StaffContext -> \*Staff \RemoveEmptyStaves")) + _ ("\\RemoveEmpty*StaffContext -> \\*Staff \\RemoveEmptyStaves")) def conv(str): str = re.sub (r"\\RemoveEmpty(|Drum|Rhythmic|Tab)StaffContext", r"\\\1Staff \\RemoveEmptyStaves", @@ -2997,13 +2998,117 @@ def conv(str): str = re.sub (r"\\AncientRemoveEmptyStaffContext", r"\\VaticanaStaff \\RemoveEmptyStaves", str); + return str -@rule ((2,13,20), - _ ("\\cresc etc. are now postfix operators")) +@rule ((2, 13, 20), + _ ("\\cresc etc. are now postfix operators")) def conv (str): - str = re.sub (r'\\(cresc|dim|endcresc|enddim\w+)', r'\\deprecated\1', str) + str = re.sub (r'\\(cresc|dim|endcresc|enddim)\b', r'\\deprecated\1', str) + return str + +@rule ((2, 13, 29), + _ ("Eliminate beamSettings, beatLength, \\setBeatGrouping, \\overrideBeamSettings and \\revertBeamSettings.\n\ +\"accordion.accEtcbase\" -> \"accordion.etcbass\"")) +def conv(str): + def sub_acc (m): + d = { + 'Dot': 'dot', + 'Discant': 'discant', + 'Bayanbase': 'bayanbass', + 'Stdbase': 'stdbass', + 'Freebase': 'freebass', + 'OldEE': 'oldEE' + } + return '"accordion.%s"' % d[m.group (1)] + + str = re.sub (r'"accordion\.acc([a-zA-Z]+)"', + sub_acc, str) + if re.search(r'overrideBeamSettings', str): + stderr_write("\n") + stderr_write(NOT_SMART % _("\\overrideBeamSettings. Use \\set beamExceptions or \\overrideTimeSignatureSettings.\n")) + stderr_write(UPDATE_MANUALLY) + if re.search(r'revertBeamSettings', str): + stderr_write("\n") + stderr_write(NOT_SMART % _("\\revertBeamSettings. Use \\set beamExceptions or \\revertTimeSignatureSettings.\n")) + stderr_write(UPDATE_MANUALLY) + if re.search(r'beamSettings', str): + stderr_write("\n") + stderr_write(NOT_SMART % _("beamSettings. Use baseMoment, beatStructure, and beamExceptions.\n")) + stderr_write(UPDATE_MANUALLY) + if re.search(r'beatLength', str): + stderr_write("\n") + stderr_write(NOT_SMART % _("beatLength. Use baseMoment and beatStructure.\n")) + stderr_write(UPDATE_MANUALLY) + if re.search(r'setBeatGrouping', str): + stderr_write("\n") + stderr_write(NOT_SMART % _("setbeatGrouping. Use baseMoment and beatStructure.\n")) + stderr_write(UPDATE_MANUALLY) + return str + +@rule ((2, 13, 31), + _ ("Woodwind diagrams: Move size, thickness, and graphic from argument list to properties.\n\ +Deprecate negative dash-period for hidden lines: use #'style = #'none instead.")) +def conv(str): + if re.search(r'woodwind-diagram', str): + stderr_write("\n") + stderr_write(NOT_SMART % _("woodwind-diagrams. Move size, thickness, and graphic to properties. Argument should be just the key list.\n")) + stderr_write(UPDATE_MANUALLY) + str = re.sub (r"dash-period\s+=\s*#\s*-[0-9.]+", + r"style = #'none", + str); + return str + +@rule ((2, 13, 36), + _ ("Rename vertical spacing variables.\n\ +Add fretboard-table argument to savePredefinedFretboard.")) +def conv(str): + str = re.sub ('after-title-spacing', 'markup-system-spacing', str) + str = re.sub ('before-title-spacing', 'score-markup-spacing', str) + str = re.sub ('between-scores-system-spacing', 'score-system-spacing', str) + # this rule also converts page-breaking-between-system-spacing: + str = re.sub ('between-system-spacing', 'system-system-spacing', str) + str = re.sub ('between-title-spacing', 'markup-markup-spacing', str) + str = re.sub ('bottom-system-spacing', 'last-bottom-spacing', str) + str = re.sub ('top-title-spacing', 'top-markup-spacing', str) + + str = re.sub (r"storePredefinedDiagram", + r"storePredefinedDiagram #default-fret-table", + str); + return str + +@rule ((2, 13, 39), + _ ("Rename vertical spacing grob properties.")) +def conv(str): + # this rule also converts default-next-staff-spacing: + str = re.sub ('next-staff-spacing', 'staff-staff-spacing', str) + # this is not a mistake: + # Both 'next- and 'between- become 'staff-staff-spacing. + # There is no conflict since they are in different grobs. + str = re.sub ('between-staff-spacing', 'staff-staff-spacing', str) + str = re.sub ('after-last-staff-spacing', 'staffgroup-staff-spacing', str) + str = re.sub ('inter-staff-spacing', 'nonstaff-relatedstaff-spacing', str) + str = re.sub ('non-affinity-spacing', 'nonstaff-unrelatedstaff-spacing', str) + str = re.sub ('inter-loose-line-spacing', 'nonstaff-nonstaff-spacing', str); + + return str + +@rule ((2, 13, 40), + _ ("Remove \\paper variables head-separation and foot-separation.")) +def conv(str): + if re.search(r'head-separation', str): + stderr_write("\n") + stderr_write(NOT_SMART % ("head-separation.\n")) + stderr_write(_ ("Adjust settings for top-system-spacing instead.\n")) + stderr_write(UPDATE_MANUALLY) + if re.search(r'foot-separation', str): + stderr_write("\n") + stderr_write(NOT_SMART % ("foot-separation.\n")) + stderr_write(_ ("Adjust settings for last-bottom-spacing instead.\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,