X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fconvert-ly.py;h=07f0a387b3189d8c56345cb50eab038d427f98db;hb=402045837e7134cdf90d1fcf31768c62227a4936;hp=2f14ad226d277779143f76b22d13502271169bb1;hpb=1258ad0e8da82706c7b66449747218ff3b8c9506;p=lilypond.git diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 2f14ad226d..07f0a387b3 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1,10 +1,10 @@ #!@PYTHON@ # # convert-ly.py -- Update old LilyPond input files (fix name?) -# +# # source file of the GNU LilyPond music typesetter -# -# (c) 1998--2003 Han-Wen Nienhuys +# +# (c) 1998--2004 Han-Wen Nienhuys # Jan Nieuwenhuizen @@ -41,7 +41,7 @@ def identify (): def usage (): sys.stdout.write ( - r"""Usage: %s [OPTIONS]... [FILE]... + r"""Usage: %s [OPTIONS]... [FILE]... Try to convert to newer lilypond-versions. The version number of the input is guessed by default from \version directive. @@ -517,7 +517,7 @@ if 1: str = re.sub (r"""\\key *([a-z]+) *;""", r"""\\key \1 \major;""",str); return str conversions.append (((1,3,59), conv, - '\key X ; -> \key X major; ')) + '\key X ; -> \key X major; ')) if 1: def conv (str): @@ -632,7 +632,7 @@ if 1: str = re.sub ('\\\\property *"?Voice"? *[.] *"?textStyle"? *= *"([^"]*)"', '\\\\property Voice.TextScript \\\\set #\'font-style = #\'\\1', str) str = re.sub ('\\\\property *"?Lyrics"? *[.] *"?textStyle"? *= *"([^"]*)"', '\\\\property Lyrics.LyricText \\\\set #\'font-style = #\'\\1', str) - str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?timeSignatureStyle"? *= *"([^"]*)"', '\\\\property \\1.TimeSignature \\\\override #\'style = #\'\\2', str) + str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?timeSignatureStyle"? *= *"([^"]*)"', '\\\\property \\1.TimeSignature \\\\override #\'style = #\'\\2', str) str = re.sub ('"?timeSignatureStyle"? *= *#?""', 'TimeSignature \\\\override #\'style = ##f', str) @@ -640,12 +640,12 @@ if 1: str = re.sub ('#\'style *= #*"([^"])"', '#\'style = #\'\\1', str) - str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?horizontalNoteShift"? *= *"?#?([-0-9]+)"?', '\\\\property \\1.NoteColumn \\\\override #\'horizontal-shift = #\\2', str) + str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?horizontalNoteShift"? *= *"?#?([-0-9]+)"?', '\\\\property \\1.NoteColumn \\\\override #\'horizontal-shift = #\\2', str) # ugh str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?flagStyle"? *= *""', '\\\\property \\1.Stem \\\\override #\'flag-style = ##f', str) - str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?flagStyle"? *= *"([^"]*)"', '\\\\property \\1.Stem \\\\override #\'flag-style = #\'\\2', str) + str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?flagStyle"? *= *"([^"]*)"', '\\\\property \\1.Stem \\\\override #\'flag-style = #\'\\2', str) return str conversions.append (((1,3,98), conv, 'CONTEXT.textStyle -> GROB.#font-style ')) @@ -866,7 +866,7 @@ if 1: func, str) return str - # 40 ? + # 40 ? conversions.append (((1,5,40), conv, 'breakAlignOrder property names')) @@ -1008,7 +1008,7 @@ if 1: return "(make-span-event '%s %s)" % (mtype , stype) def subst_definition_ev_name(match): - return ' = #%s' % subst_ev_name (match) + return ' = #%s' % subst_ev_name (match) def subst_inline_ev_name (match): s = subst_ev_name (match) return '#(ly-export %s)' % s @@ -1265,11 +1265,11 @@ if 1: return origstr durs = [] - def sub_durs (m): + def sub_durs (m, durs = durs): durs.append(m.group(2)) return m.group (1) - str = re.sub ("([a-z]+[,'!? ]*)([0-9.]+)", sub_durs, str) + str = re.sub (r"([a-z]+[,'!? ]*)([0-9]+\.*)", sub_durs, str) dur_str = '' for d in durs: @@ -1284,96 +1284,123 @@ if 1: last_str = '' while last_str <> str: - last_str = str - def sub_dyn_end (m): - dyns.append (' \!') - return ' ' + m.group(2) - - str = re.sub (r'(\\!)\s*([a-z]+)', sub_dyn_end, str) - def sub_slurs(m): - if '-)' not in slur_strs: - slur_strs.append ( ')') - return m.group(1) - def sub_p_slurs(m): - if '-\)' not in slur_strs: - slur_strs.append ( '\)') - return m.group(1) - str = re.sub (r"\)[ ]*([a-z]+)", sub_slurs, str) - str = re.sub (r"\\\)[ ]*([a-z]+)", sub_p_slurs, str) - def sub_begin_slurs(m): - if '-(' not in slur_strs: - slur_strs.append ( '(') - return m.group(1) - str = re.sub (r"([a-z]+[,'!?0-9 ]*)\(", sub_begin_slurs, str) - def sub_begin_p_slurs(m): - if '-\(' not in slur_strs: - slur_strs.append ( '\(') - return m.group(1) - - str = re.sub (r"([a-z]+[,'!?0-9 ]*)\\\(", sub_begin_p_slurs, str) - - def sub_dyns (m): - s = m.group(0) - if s == '@STARTCRESC@': - slur_strs.append ("\\<") - elif s == '@STARTDECRESC@': - slur_strs.append ("\\>") - elif s == r'-?\\!': - slur_strs.append ('\\!') - return '' - - str = re.sub (r'@STARTCRESC@', sub_dyns, str) - str = re.sub (r'-?\\!', sub_dyns, str) - - def sub_articulations (m): - a = m.group(1) - if a not in slur_strs: - slur_strs.append (a) - return '' - - str = re.sub (r"([_^-]\@ACCENT\@)", sub_articulations, str) - str = re.sub (r"([_^-]\\[a-z]+)", sub_articulations, str) - str = re.sub (r"([_^-][>_.+|^-])", sub_articulations, str) - - def sub_pslurs(m): - slur_strs.append ( ' \\)') - return m.group(1) - str = re.sub (r"\\\)[ ]*([a-z]+)", sub_pslurs, str) - - suffix = string.join (slur_strs, '') + string.join (pslur_strs, '') \ + last_str = str + + def sub_tremolos (m, slur_strs = slur_strs): + tr = m.group (2) + if tr not in slur_strs: + slur_strs.append (tr) + return m.group (1) + + str = re.sub (r"([a-z]+[',!? ]*)(:[0-9]+)", + sub_tremolos, str) + + def sub_dyn_end (m, dyns = dyns): + dyns.append (' \!') + return ' ' + m.group(2) + + str = re.sub (r'(\\!)\s*([a-z]+)', sub_dyn_end, str) + def sub_slurs(m, slur_strs = slur_strs): + if '-)' not in slur_strs: + slur_strs.append (')') + return m.group(1) + + def sub_p_slurs(m, slur_strs = slur_strs): + if '-\)' not in slur_strs: + slur_strs.append ('\)') + return m.group(1) + + str = re.sub (r"\)[ ]*([a-z]+)", sub_slurs, str) + str = re.sub (r"\\\)[ ]*([a-z]+)", sub_p_slurs, str) + def sub_begin_slurs(m, slur_strs = slur_strs): + if '-(' not in slur_strs: + slur_strs.append ('(') + return m.group(1) + + str = re.sub (r"([a-z]+[,'!?0-9 ]*)\(", + sub_begin_slurs, str) + def sub_begin_p_slurs(m, slur_strs = slur_strs): + if '-\(' not in slur_strs: + slur_strs.append ('\(') + return m.group(1) + + str = re.sub (r"([a-z]+[,'!?0-9 ]*)\\\(", + sub_begin_p_slurs, str) + + def sub_dyns (m, slur_strs = slur_strs): + s = m.group(0) + if s == '@STARTCRESC@': + slur_strs.append ("\\<") + elif s == '@STARTDECRESC@': + slur_strs.append ("\\>") + elif s == r'-?\\!': + slur_strs.append ('\\!') + return '' + + str = re.sub (r'@STARTCRESC@', sub_dyns, str) + str = re.sub (r'-?\\!', sub_dyns, str) + + def sub_articulations (m, slur_strs = slur_strs): + a = m.group(1) + if a not in slur_strs: + slur_strs.append (a) + return '' + + str = re.sub (r"([_^-]\@ACCENT\@)", sub_articulations, + str) + str = re.sub (r"([_^-]\\[a-z]+)", sub_articulations, + str) + str = re.sub (r"([_^-][>_.+|^-])", sub_articulations, + str) + str = re.sub (r'([_^-]"[^"]+")', sub_articulations, + str) + + def sub_pslurs(m, slur_strs = slur_strs): + slur_strs.append (' \\)') + return m.group(1) + str = re.sub (r"\\\)[ ]*([a-z]+)", sub_pslurs, str) + + ## end of while <> + + suffix = string.join (slur_strs, '') + string.join (pslur_strs, + '') \ + string.join (dyns, '') return '@STARTCHORD@%s@ENDCHORD@%s%s' % (str , dur_str, suffix) - - def sub_chords (str): simend = '>' - simstart = "<" + simstart = '<' chordstart = '<<' chordend = '>>' marker_str = '%% new-chords-done %%' if re.search (marker_str,str): return str - str= re.sub (r'\\<', '@STARTCRESC@', str) - str= re.sub (r'\\>', '@STARTDECRESC@', str) - str= re.sub (r'([_^-])>', r'\1@ACCENT@', str) - str = re.sub ('<([^<>{}]+)>', sub_chord, str) - + str = re.sub ('<<', '@STARTCHORD@', str) + str = re.sub ('>>', '@ENDCHORD@', str) + + str = re.sub (r'\\<', '@STARTCRESC@', str) + str = re.sub (r'\\>', '@STARTDECRESC@', str) + str = re.sub (r'([_^-])>', r'\1@ACCENT@', str) + str = re.sub (r'<([^<>{}]+)>', sub_chord, str) + + # add dash: -[, so that [<> c d] becomes + # <>-[ c d] + # and gets skipped by articulation_substitute str = re.sub (r'\[ *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]*)', - r'\1[', - str) + r'\1-[', str) str = re.sub (r'\\! *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]*)', - r'\1\\!', - str) - str = re.sub ('<([^?])', r'%s\1' % simstart, str) - str = re.sub ('>([^?])', r'%s\1' % simend, str) + r'\1-\\!', str) + + str = re.sub (r'<([^?])', r'%s\1' % simstart, str) + str = re.sub (r'>([^?])', r'%s\1' % simend, str) str = re.sub ('@STARTCRESC@', r'\\<', str) str = re.sub ('@STARTDECRESC@', r'\\>' ,str) - str = re.sub (r'\\context *Voice *@STARTCHORD@', '@STARTCHORD@', str) + str = re.sub (r'\\context *Voice *@STARTCHORD@', + '@STARTCHORD@', str) str = re.sub ('@STARTCHORD@', chordstart, str) str = re.sub ('@ENDCHORD@', chordend, str) str = re.sub (r'@ACCENT@', '>', str) @@ -1381,8 +1408,10 @@ if 1: def articulation_substitute (str): str = re.sub (r"""([^-])\[ *([a-z]+[,']*[!?]?[0-9:]*\.*)""", - r" \1 \2[", str) - str = re.sub (r"""([^-])\) *([a-z]+[,']*[!?]?[0-9:]*\.*)""", + r"\1 \2[", str) + str = re.sub (r"""([^-])\\\) *([a-z]+[,']*[!?]?[0-9:]*\.*)""", + r"\1 \2\\)", str) + str = re.sub (r"""([^-\\])\) *([a-z]+[,']*[!?]?[0-9:]*\.*)""", r"\1 \2)", str) str = re.sub (r"""([^-])\\! *([a-z]+[,']*[!?]?[0-9:]*\.*)""", r"\1 \2\\!", str) @@ -1428,7 +1457,7 @@ if 1: 'ly:set-context-property!', str) str = re.sub ('\\\\newcontext', '\\\\new', str) str = re.sub ('\\\\grace[\t\n ]*([^{ ]+)', - r'\\grace { \1 }', str) + r'\\grace { \1 }', str) str = re.sub ("\\\\grace[\t\n ]*{([^}]+)}", r"""\\grace { \\property Voice.Stem \\override #'stroke-style = #"grace" @@ -1444,9 +1473,406 @@ if 1: def conv (str): str = re.sub ('accacciatura', 'acciaccatura', str) + + if re.search ("context-spec-music", str): + sys.stderr.write ("context-spec-music takes a symbol for the context now. Update by hand.") + + raise FatalConversionError() + + str = re.sub ('fingerHorizontalDirection *= *#(LEFT|-1)', + "fingeringOrientations = #'(up down left)", str) + str = re.sub ('fingerHorizontalDirection *= *#(RIGHT|1)', + "fingeringOrientations = #'(up down right)", str) + return str - conversions.append (((1,9,3), conv, """\acciaccatura misspelling""")) + conversions.append (((1,9,3), conv, + """\acciaccatura misspelling, fingerHorizontalDirection -> fingeringOrientations""")) + + +def conv (str): + if re.search ('\\figures', str): + sys.stderr.write ("Warning: attempting automatic \\figures conversion. Check results!"); + + + def figures_replace (m): + s = m.group (1) + s = re.sub ('<', '@FIGOPEN@',s) + s = re.sub ('>', '@FIGCLOSE@',s) + return '\\figures { %s }' % s + + str = re.sub (r'\\figures[ \t\n]*{([^}]+)}', figures_replace, str) + str = re.sub (r'\\<', '@STARTCRESC@', str) + str = re.sub (r'\\>', '@STARTDECRESC@', str) + str = re.sub (r'([-^_])>', r'\1@ACCENT@', str) + str = re.sub (r'<<', '@STARTCHORD@', str) + str = re.sub (r'>>', '@ENDCHORD@', str) + str = re.sub (r'>', '@ENDSIMUL@', str) + str = re.sub (r'<', '@STARTSIMUL@', str) + str = re.sub ('@STARTDECRESC@', '\\>', str) + str = re.sub ('@STARTCRESC@', '\\<', str) + str = re.sub ('@ACCENT@', '>', str) + str = re.sub ('@ENDCHORD@', '>', str) + str = re.sub ('@STARTCHORD@', '<', str) + str = re.sub ('@STARTSIMUL@', '<<', str) + str = re.sub ('@ENDSIMUL@', '>>', str) + str = re.sub ('@FIGOPEN@', '<', str) + str = re.sub ('@FIGCLOSE@', '>', str) + + return str + +conversions.append (((1,9,4), conv, 'Swap < > and << >>')) + + +def conv (str): + str = re.sub ('HaraKiriVerticalGroup', 'RemoveEmptyVerticalGroup', str) + + return str + +conversions.append (((1,9,5), conv, 'HaraKiriVerticalGroup -> RemoveEmptyVerticalGroup')) + +def conv (str): + if re.search ("ly:get-font", str) : + sys.stderr.write (r"(ly:get-font foo ..) has been replaced by" + \ + " (ly:paper-get-font (ly:grob-get-paper foo) .. ).\n" +\ + "please update manually.") + + raise FatalConversionError() + + if re.search ("\\pitch *#", str) : + sys.stderr.write (r"\\pitch has been deprecated. " +\ + " Use Scheme code to construct arbitrary note events.") + + raise FatalConversionError() + + return str + + +conversions.append (((1,9,6), conv, 'ly:get-font deprecated.')) + +def conv (str): + def sub_alteration (m): + alt = m.group (3) + alt = { + '-1': 'FLAT', + '-2': 'DOUBLE-FLAT', + '0': 'NATURAL', + '1': 'SHARP', + '2': 'DOUBLE-SHARP', + }[alt] + + return '(ly:make-pitch %s %s %s)' % (m.group(1), m.group (2), + alt) + + str =re.sub ("\\(ly:make-pitch *([0-9-]+) *([0-9-]+) *([0-9-]+) *\\)", + sub_alteration, str) + + + str = re.sub ("ly:verbose", "ly:get-option 'verbose", str) + + m= re.search ("\\\\outputproperty #([^#]+)[\t\n ]*#'([^ ]+)", str) + if m: + sys.stderr.write (\ + r"""\outputproperty found, +Please hand-edit, using + + \applyoutput #(outputproperty-compatibility %s '%s ) + +as a substitution text.""" % (m.group (1), m.group (2)) ) + raise FatalConversionError () + + if re.search ("ly:(make-pitch|pitch-alteration)", str) \ + or re.search ("keySignature", str): + sys.stderr.write ( +"""The alteration field of Scheme pitches was multiplied by 2 +to support quarter tone accidentals. You have to edit the following constructs by hand: + +* calls of ly:make-pitch and ly:pitch-alteration +* keySignature settings made with \property +""") + raise FatalConversionError () + + return str +conversions.append (((1,9,7), conv, + '''use symbolic constants for alterations, +remove \\outputproperty, move ly:verbose into ly:get-option''')) + + +def conv (str): + if re.search ("dash-length",str): + sys.stderr.write ("""dash-length has been removed. Use dash-fraction instead.""") + raise FatalConversionError() + return str + +conversions.append (((1,9,8), conv, """dash-length -> dash-fraction""")) + + +def conv (str): + def func(match): + return "#'font-size = #%d" % (2*string.atoi (match.group (1))) + + str =re.sub (r"#'font-relative-size\s*=\s*#([0-9-]+)", func, str) + str =re.sub (r"#'font-family\s*=\s*#'ancient", + r"#'font-family = #'music", str) + + return str + +conversions.append (((2,1,1), conv, """font-relative-size -> font-size""")) + +def conv (str): + str =re.sub (r"ly:get-music-length", "ly:music-length", str) + return str + +conversions.append (((2,1,2), conv, """ly:get-music-length -> ly:music-length""")) + +def conv (str): + str =re.sub (r"\.\s+stz=", ". instr ", str) + return str + +conversions.append (((2,1,3), conv, """stanza -> instrument""")) + +def conv (str): + def func (match): + c = match.group (1) + b = match.group (2) + + if b == 't': + if c == 'Score': + return '' + else: + return r" \property %s.melismaBusyProperties \unset" % c + elif b == 'f': + return r"\property %s.melismaBusyProperties = #'(melismaBusy)" % c + + str =re.sub (r"\\property ([a-zA-Z]+)\s*\.\s*automaticMelismata\s*=\s*##([ft])", func, str) + return str + +conversions.append (((2,1,4), conv, """removal of automaticMelismata; use melismaBusyProperties instead.""")) + + + +def conv (str): + str =re.sub (r"\\translator\s+([a-zA-Z]+)", r"\\change \1", str) + return str + +conversions.append (((2,1,7), conv, """\\translator Staff -> \\change Staff""")) + +def conv (str): + str =re.sub (r"\\newaddlyrics", r"\\lyricsto", str) + return str + +conversions.append (((2,1,10), conv, """\\newaddlyrics -> \\lyricsto""")) + +def conv (str): + str = re.sub (r'\\include\s*"paper([0-9]+)(-init)?.ly"', + r"#(set-staff-size \1)", str) + + def sub_note (match): + dur = '' + log = string.atoi (match.group (1)) + dots = string.atoi (match.group (2)) + + if log >= 0: + dur = '%d' % (1 << log) + else: + dur = { -1 : 'breve', + -2 : 'longa', + -3 : 'maxima'}[log] + + dur += ('.' * dots) + + return r'\note #"%s" #%s' % (dur, match.group (3)) + + str = re.sub (r'\\note\s+#([0-9-]+)\s+#([0-9]+)\s+#([0-9.-]+)', + sub_note, str) + return str + +conversions.append (((2,1,11), conv, """\\include "paper16.ly" -> #(set-staff-size 16) +\note #3 #1 #1 -> \note #"8." #1 +""")) + + +def conv (str): + str =re.sub (r"OttavaSpanner", r"OttavaBracket", str) + return str + +conversions.append (((2,1,12), conv, """OttavaSpanner -> OttavaBracket""")) + + +def conv (str): + str =re.sub (r"\(set-staff-size ", r"(set-global-staff-size ", str) + return str + +conversions.append (((2,1,13), conv, """set-staff-size -> set-global-staff-size""")) + +def conv (str): + str =re.sub (r"#'style\s*=\s*#'dotted-line", + r"#'dash-fraction = #0.0 ", str) + return str + +conversions.append (((2,1,14), conv, """style = dotted -> dash-fraction = 0""")) + +def conv (str): + str =re.sub (r'LyricsVoice\s*\.\s*instrument\s*=\s*("[^"]*")', + r'LyricsVoice . vocalName = \1', str) + + str =re.sub (r'LyricsVoice\s*\.\s*instr\s*=\s*("[^"]*")', + r'LyricsVoice . vocNam = \1', str) + return str + +conversions.append (((2,1,15), conv, """LyricsVoice . instr(ument) -> vocalName""")) + +def conv (str): + def sub_acc (m): + d = { + '4': 'doublesharp', + '3': 'threeqsharp', + '2': 'sharp', + '1': 'semisharp', + '0': 'natural', + '-1': 'semiflat', + '-2': 'flat', + '-3': 'threeqflat', + '-4': 'doubleflat'} + return '\\%s' % d[m.group (1)] + + str = re.sub (r'\\musicglyph\s*#"accidentals-([0-9-]+)"', + sub_acc, str) + return str + +conversions.append (((2,1,16), conv, """\\musicglyph #"accidentals-NUM" -> \\sharp/flat/etc.""")) + + +def conv (str): + + if re.search (r'\\partcombine', str): + sys.stderr.write ('Warning: \\partcombine has been changed. ' + +'Check conversion manually!') + + raise FatalConversionError() + + # this rule doesn't really work, + # too lazy to figure out why. + str = re.sub (r'\\context\s+Voice\s*=\s*one\s*\\partcombine\s+Voice\s*\\context\s+Thread\s*=\s*one(.*)\s*' + + r'\\context\s+Thread\s*=\s*two', + '\\\\newpartcombine\n\\1\n', str) + + + return str + +conversions.append (((2,1,17), conv, """\\partcombine syntax change to \\newpartcombine""")) + + +def conv (str): + str = re.sub (r'\\newpartcombine', r'\\partcombine', str) + str = re.sub (r'\\autochange\s+Staff', r'\\autochange ', str) + return str + +conversions.append (((2,1,18), conv, """\\newpartcombine -> \\partcombine, +\\autochange Staff -> \\autochange +""")) + + + + +def conv (str): + str = re.sub (r'\\include "drumpitch-init.ly"','', str) + str = re.sub (r'\\pitchnames ','pitchnames = ', str) + str = re.sub (r'\\chordmodifiers ','chordmodifiers = ', str) + str = re.sub (r'\bdrums\b\s*=','drumContents = ', str) + str = re.sub (r'\\drums\b','\\drumContents ', str) + + + if re.search ('drums->paper', str): + sys.stderr.write ("\nDrum notation found. Check file manually!") + + str = re.sub (r"""\\apply\s+#\(drums->paper\s+'([a-z]+)\)""", + r"""\property DrumStaff.drumStyleTable = #\1-style""", + str) + + if re.search ('Thread', str): + sys.stderr.write ("\nThread found. Check file manually!\n"); + + str = re.sub (r"""(\\once\s*)?\\property\s+Thread\s*\.\s*NoteHead\s*""" + + r"""\\(set|override)\s*#'style\s*=\s*#'harmonic""" + + r"""\s+([a-z]+[,'=]*)([0-9]*\.*)""" + ,r"""<\3\\harmonic>\4""", str) + + str = re.sub (r"""\\new Thread""", """\context Voice""", str) + str = re.sub (r"""Thread""", """Voice""", str) + + if re.search ('\bLyrics\b', str): + sys.stderr.write ("\nLyrics found. Check file manually!\n"); + + str = re.sub (r"""LyricsVoice""", r"""L@ricsVoice""", str) + str = re.sub (r"""\bLyrics\b""", r"""LyricsVoice""", str) + str = re.sub (r"""LyricsContext""", r"""LyricsVoiceContext""", str) + str = re.sub (r"""L@ricsVoice""", r"""LyricsVoice""",str) + + + return str + +conversions.append (((2,1,19), conv, """Drum notation changes, Removing \chordmodifiers, \notenames. +Harmonic notes. Thread context removed. Lyrics context removed.""")) + +def conv (str): + str = re.sub (r'nonevent-skip', 'skip-music', str) + return str + +conversions.append (((2,1,20), conv, """nonevent-skip -> skip-music""" )) + +def conv (str): + str = re.sub (r'molecule-callback', 'print-function', str) + str = re.sub (r'brew_molecule', 'print', str) + str = re.sub (r'brew-new-markup-molecule', 'Text_item::print', str) + str = re.sub (r'LyricsVoice', 'Lyrics', str) + str = re.sub (r'tupletInvisible', + r"TupletBracket \\set #'transparent", str) +# str = re.sub (r'molecule', 'collage', str) +#molecule -> collage + str = re.sub (r"\\property\s+[a-zA-Z]+\s*\.\s*[a-zA-Z]+\s*" + + r"\\set\s*#'X-extent-callback\s*=\s*#Grob::preset_extent", + "", str) + + return str + +conversions.append (((2,1,21), conv, """molecule-callback -> print-function, +brew_molecule -> print +brew-new-markup-molecule -> Text_item::print +LyricsVoice -> Lyrics +tupletInvisible -> TupletBracket \set #'transparent +Grob::preset_extent removed. +""" )) + + +def conv (str): + str = re.sub (r'\\property\s+([^.]+)\s*\.\s*([^\\=]+)\s*\\(set|override)', + r"\\overrid@ \1.\2 ", str) + str = re.sub (r'\\property\s+([^. ]+)\s*\.\s*([^\\= ]+)\s*=', + r'\\s@t \1.\2 = ', str) + str = re.sub (r'\\property\s+([^. ]+)\s*\.\s*([^\\= ]+)\s*\\unset', + r'\\uns@t \1.\2 ', str) + str = re.sub (r'\\property\s+([^. ]+)\s*\.\s*([^\\= ]+)\s*\\revert' + + r"\s*#'([-a-z0-9_]+)", + r"\\rev@rt \1.\2 #'\3", str) + str = re.sub (r'Voice\.', '', str) + str = re.sub (r'Lyrics\.', '', str) + str = re.sub (r'ChordNames\.', '', str) + + str = re.sub ('rev@rt', 'revert',str) + str = re.sub ('s@t', 'set',str) + str = re.sub ('overrid@', 'override',str) + + str = re.sub ('molecule', 'stencil', str) + str = re.sub ('Molecule', 'Stencil', str) + return str + +conversions.append (((2,1,22), conv, """new syntax for property settings: + \set A.B = #C , \unset A.B + \override A.B #C = #D, \revert A.B #C + +""")) + ################################ # END OF CONVERSIONS @@ -1582,7 +2008,7 @@ identify () for f in files: if f == '-': f = '' - if not os.path.isfile (f): + elif not os.path.isfile (f): continue try: do_one_file (f)