X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Fconvertrules.py;h=be132ac5e3db3c7b269b330634317b93fa81a97f;hb=ace881437adc0146a62cffa3255ac1ca169bd054;hp=df2540967a955107d4540542268dc363b2e553ed;hpb=d9d72186ca281ea763cb2d50446a113ab0a26779;p=lilypond.git diff --git a/python/convertrules.py b/python/convertrules.py index df2540967a..be132ac5e3 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", @@ -3006,7 +3007,7 @@ def conv (str): return str @rule ((2, 13, 29), - _ ("Eliminate beamSettings, beatLength, \setBeatGrouping, \overrideBeamSettings and \revertBeamSettings\n\ + _ ("Eliminate beamSettings, beatLength, \\setBeatGrouping, \\overrideBeamSettings and \\revertBeamSettings.\n\ \"accordion.accEtcbase\" -> \"accordion.etcbass\"")) def conv(str): def sub_acc (m): @@ -3024,11 +3025,11 @@ def conv(str): 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(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(NOT_SMART % _("\\revertBeamSettings. Use \\set beamExceptions or \\revertTimeSignatureSettings.\n")) stderr_write(UPDATE_MANUALLY) if re.search(r'beamSettings', str): stderr_write("\n") @@ -3058,13 +3059,70 @@ def conv(str): return str @rule ((2, 13, 36), - _ ("Add fretboard-table argument to savePredefinedFretboard.")) + _ ("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 + +@rule ((2, 13, 42), + _ ("Rename space to basic-distance in various spacing alists.\n\ +Remove HarmonicParenthesesItem grob.")) +def conv(str): + str = re.sub (r'\(space\s+\.\s+([0-9]*\.?[0-9]*)\)', r'(basic-distance . \1)', str) + str = re.sub (r"#'space\s+=\s+#?([0-9]*\.?[0-9]*)", r"#'basic-distance = #\1", str) + if re.search (r'HarmonicParenthesesItem', str): + stderr_write ("\n") + stderr_write (NOT_SMART % ("HarmonicParenthesesItem.\n")) + stderr_write (_ ("HarmonicParenthesesItem has been eliminated.\n")) + stderr_write (_ ("Harmonic parentheses are part of the TabNoteHead grob.\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,