X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fconvert-ly.py;h=1018a71263fdd3f633ede4bad6f7f217b525b90b;hb=56803f159f4a7bcf205835b781531c7db9c10958;hp=34bf1af183b32a83b80c088904cc2632603caad7;hpb=ee487d06d8935dc4ad75c290983ecb9132b2e37f;p=lilypond.git diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 34bf1af183..1018a71263 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1,10 +1,10 @@ #!@PYTHON@ - -# convert-lilypond.py -- convertor for lilypond versions +# +# convert-ly.py -- convertor for lilypond versions # # source file of the GNU LilyPond music typesetter # -# (c) 1998 +# (c) 1998--2001 # TODO # use -f and -t for -s output @@ -24,8 +24,12 @@ import string import re import time -lilypond_version_re_str = '\\\\version *\"(.*)\"' -lilypond_version_re = re.compile(lilypond_version_re_str) +# Did we ever have \mudela-version? I doubt it. +# lilypond_version_re_str = '\\\\version *\"(.*)\"' +lilypond_version_re_str = '\\\\(mudela-)?version *\"(.*)\"' +lilypond_version_re = re.compile (lilypond_version_re_str) +add_version = 1 + def program_id (): return '%s (GNU LilyPond) %s' %(program_name, version); @@ -40,11 +44,13 @@ Try to convert to newer lilypond-versions. The version number of the input is guessed by default from \version directive Options: + -a, --assume-old apply all conversions to unversioned files -h, --help print this help -e, --edit in place edit - -f, --from=VERSION start from version + -f, --from=VERSION start from version. Overrides \version found in file. -s, --show-rules print all rules. -t, --to=VERSION target version + -n, --no-version don't add new version stamp. --version print program version Report bugs to bugs-gnu-music@gnu.org @@ -92,11 +98,11 @@ def version_cmp (t1, t2): return t1[x] - t2[x] return 0 -def guess_lilypond_version(filename): +def guess_lilypond_version (filename): s = gulp_file (filename) m = lilypond_version_re.search (s) if m: - return m.group(1) + return m.group (2) else: return '' @@ -111,11 +117,19 @@ def show_rules (file): ############################ +if 1: + def conv(str): + if re.search ('\\\\multi', str): + sys.stderr.write ('\nNot smart enough to convert \\multi') + return str + + conversions.append (((0,1,9), conv, '\\header { key = concat + with + operator }')) + if 1: # need new a namespace def conv (str): if re.search ('\\\\octave', str): sys.stderr.write ('\nNot smart enough to convert \\octave') - raise FatalConversionError() + # raise FatalConversionError() return str @@ -127,7 +141,8 @@ if 1: # need new a namespace def conv (str): str = re.sub ('\\\\textstyle([^;]+);', '\\\\property Lyrics . textstyle = \\1', str) - str = re.sub ('\\\\key([^;]+);', '\\\\accidentals \\1;', str) + # harmful to current .lys + # str = re.sub ('\\\\key([^;]+);', '\\\\accidentals \\1;', str) return str @@ -176,8 +191,7 @@ if 1: if 1: def conv(str): - str = re.sub ('\\\\melodic', '\\\\notes',str) - + str = re.sub ('\\\\melodic([^a-zA-Z])', '\\\\notes\\1',str) return str conversions.append (((1,0,3), conv, '\\melodic -> \\notes')) @@ -185,8 +199,7 @@ if 1: if 1: def conv(str): str = re.sub ('default_paper *=', '',str) - str = re.sub ('default_midi *=', '',x) - + str = re.sub ('default_midi *=', '',str) return str conversions.append (((1,0,4), conv, 'default_{paper,midi}')) @@ -194,7 +207,7 @@ if 1: if 1: def conv(str): str = re.sub ('ChoireStaff', 'ChoirStaff',str) - str = re.sub ('\\output', 'output = ',str) + str = re.sub ('\\\\output', 'output = ',str) return str @@ -204,7 +217,7 @@ if 1: def conv(str): if re.search ('[a-zA-Z]+ = *\\translator',str): sys.stderr.write ('\nNot smart enough to change \\translator syntax') - raise FatalConversionError() + # raise FatalConversionError() return str conversions.append (((1,0,6), conv, 'foo = \\translator {\\type .. } ->\\translator {\\type ..; foo; }')) @@ -212,7 +225,7 @@ if 1: if 1: def conv(str): - str = re.sub ('\\\\lyric', '\\\\lyrics',str) + str = re.sub ('\\\\lyrics*', '\\\\lyrics',str) return str @@ -259,7 +272,10 @@ if 1: if 1: def conv(str): + str = re.sub ('\\\\type([^\n]*engraver)','\\\\TYPE\\1', str) + str = re.sub ('\\\\type([^\n]*performer)','\\\\TYPE\\1', str) str = re.sub ('\\\\type','\\\\context', str) + str = re.sub ('\\\\TYPE','\\\\type', str) str = re.sub ('textstyle','textStyle', str) return str @@ -271,7 +287,7 @@ if 1: def conv(str): if re.search ('\\\\repeat',str): sys.stderr.write ('\nNot smart enough to convert \\repeat') - raise FatalConversionError() + # raise FatalConversionError() return str conversions.append (((1,0,18), conv, @@ -389,7 +405,7 @@ if 1: if 1: def conv (str): - str = re.sub ('beamAuto([^=]+)= *"([0-9]+)/([0-9]+)" *;', + str = re.sub ('"?beamAuto([^"=]+)"? *= *"([0-9]+)/([0-9]+)" *;*', 'beamAuto\\1 = #(make-moment \\2 \\3)', str) return str @@ -414,6 +430,18 @@ if 1: conversions.append (((1,3,18), conv, 'staffLineLeading -> staffSpace')) + +if 1: + def conv(str): + if re.search ('\\\\repetitions',str): + sys.stderr.write ('\nNot smart enough to convert \\repetitions') + # raise FatalConversionError() + return str + + conversions.append (((1,3,23), conv, + '\\\\repetitions feature dropped')) + + if 1: def conv (str): str = re.sub ('textEmptyDimension *= *##t', @@ -473,6 +501,16 @@ if 1: conversions.append (((1,3,49), conv, 'noteHeadStyle value: string -> symbol')) +if 1: + def conv (str): + if re.search ('\\\\keysignature', str): + sys.stderr.write ('\nNot smart enough to convert to new tremolo format') + return str + + + conversions.append (((1,3,58), conv, + 'noteHeadStyle value: string -> symbol')) + if 1: def conv (str): str = re.sub (r"""\\key *([a-z]+) *;""", r"""\\key \1 \major;""",str); @@ -490,10 +528,8 @@ if 1: -################ TODO: lots of other syntax change should be done here as well - - +# TODO: lots of other syntax change should be done here as well if 1: def conv (str): str = re.sub ('basicCollisionProperties', 'NoteCollision', str) @@ -504,17 +540,22 @@ if 1: str = re.sub ('basicLocalKeyProperties' ,"Accidentals", str) - str = re.sub ('basicMarkProperties' ,"Accidentals", str) + str = re.sub ('basicMarkProperties' ,"Accidentals", str) str = re.sub ('basic([A-Za-z_]+)Properties', '\\1', str) + + str = re.sub ('Repeat_engraver' ,'Volta_engraver', str) return str - conversions.append (((1,3,92), conv, 'basicXXXProperties -> XXX')) + conversions.append (((1,3,92), conv, 'basicXXXProperties -> XXX, Repeat_engraver -> Volta_engraver')) if 1: def conv (str): + # Ugh, but meaning of \stemup changed too + # maybe we should do \stemup -> \stemUp\slurUp\tieUp ? str = re.sub ('\\\\stemup', '\\\\stemUp', str) str = re.sub ('\\\\stemdown', '\\\\stemDown', str) str = re.sub ('\\\\stemboth', '\\\\stemBoth', str) + str = re.sub ('\\\\slurup', '\\\\slurUp', str) str = re.sub ('\\\\slurboth', '\\\\slurBoth', str) str = re.sub ('\\\\slurdown', '\\\\slurDown', str) @@ -531,7 +572,39 @@ if 1: str = re.sub ('\\\\voicetwo', '\\\\voiceTwo', str) str = re.sub ('\\\\voicethree', '\\\\voiceThree', str) str = re.sub ('\\\\voicefour', '\\\\voiceFour', str) + + # I don't know exactly when these happened... + # ugh, we loose context setting here... + str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?"?(1|(\\\\up))"?', '\\\\stemUp\\\\slurUp\\\\tieUp', str) + str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?"?((-1)|(\\\\down))"?', '\\\\stemDown\\\\slurDown\\\\tieDown', str) + str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?"?(0|(\\\\center))"?', '\\\\stemBoth\\\\slurBoth\\\\tieBoth', str) + + str = re.sub ('verticalDirection[^=]*= *#?"?(1|(\\\\up))"?', 'Stem \\\\override #\'direction = #0\nSlur \\\\override #\'direction = #0\n Tie \\\\override #\'direction = #1', str) + str = re.sub ('verticalDirection[^=]*= *#?"?((-1)|(\\\\down))"?', 'Stem \\\\override #\'direction = #0\nSlur \\\\override #\'direction = #0\n Tie \\\\override #\'direction = #-1', str) + str = re.sub ('verticalDirection[^=]*= *#?"?(0|(\\\\center))"?', 'Stem \\\\override #\'direction = #0\nSlur \\\\override #\'direction = #0\n Tie \\\\override #\'direction = #0', str) + str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?"?(1|(\\\\up))"?', '\\\\\\1Up', str) + str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?"?((-1)|(\\\\down))"?', '\\\\\\1Down', str) + str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?"?(0|(\\\\center))"?', '\\\\\\1Both', str) + + # (lacks capitalisation slur -> Slur) + str = re.sub ('([a-z]+)VerticalDirection[^=]*= *#?"?(1|(\\\\up))"?', '\\1 \\\\override #\'direction = #1', str) + str = re.sub ('([a-z]+)VerticalDirection[^=]*= *#?"?((-1)|(\\\\down))"?', '\\1 \\override #\'direction = #-1', str) + str = re.sub ('([a-z]+)VerticalDirection[^=]*= *#?"?(0|(\\\\center))"?', '\\1 \\\\override #\'direction = #0', str) + + ## dynamic.. + str = re.sub ('\\\\property *[^ .]*[.]?dynamicDirection[^=]*= *#?"?(1|(\\\\up))"?', '\\\\dynamicUp', str) + str = re.sub ('\\\\property *[^ .]*[.]?dyn[^=]*= *#?"?((-1)|(\\\\down))"?', '\\\\dynamicDown', str) + str = re.sub ('\\\\property *[^ .]*[.]?dyn[^=]*= *#?"?(0|(\\\\center))"?', '\\\\dynamicBoth', str) + + str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)Dash[^=]*= *#?"?(0|(""))"?', '\\\\\\1NoDots', str) + str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)Dash[^=]*= *#?"?([1-9]+)"?', '\\\\\\1Dotted', str) + + str = re.sub ('\\\\property *[^ .]*[.]?noAutoBeaming[^=]*= *#?"?(0|(""))"?', '\\\\autoBeamOn', str) + str = re.sub ('\\\\property *[^ .]*[.]?noAutoBeaming[^=]*= *#?"?([1-9]+)"?', '\\\\autoBeamOff', str) + + + return str conversions.append (((1,3,93), conv, @@ -550,12 +623,38 @@ if 1: conversions.append (((1,3,97), conv, 'ChordName -> ChordNames')) + +# TODO: add lots of these + +if 1: + def conv (str): + 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 ('"?timeSignatureStyle"? *= *#?""', 'TimeSignature \\\\override #\'style = ##f', str) + + str = re.sub ('"?timeSignatureStyle"? *= *#?"([^"]*)"', 'TimeSignature \\\\override #\'style = #\'\\1', str) + + str = re.sub ('#\'style *= #*"([^"])"', '#\'style = #\'\\1', 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) + return str + + conversions.append (((1,3,98), conv, 'CONTEXT.textStyle -> GROB.#font-style ')) + if 1: def conv (str): - str = re.sub ('beamAutoEnd_([0-9]*) *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end 1 \\1 * *) = \\2', str) - str = re.sub ('beamAutoBegin_([0-9]*) *= *(#\\([^)]*\))', 'autoBeamSettings \\push #\'(begin 1 \\1 * *) = \\2', str) - str = re.sub ('beamAutoEnd *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end * * * *) = \\1', str) - str = re.sub ('beamAutoBegin *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(begin * * * *) = \\1', str) + str = re.sub ('"?beamAutoEnd_([0-9]*)"? *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end 1 \\1 * *) = \\2', str) + str = re.sub ('"?beamAutoBegin_([0-9]*)"? *= *(#\\([^)]*\))', 'autoBeamSettings \\push #\'(begin 1 \\1 * *) = \\2', str) + str = re.sub ('"?beamAutoEnd"? *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end * * * *) = \\1', str) + str = re.sub ('"?beamAutoBegin"? *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(begin * * * *) = \\1', str) return str @@ -577,6 +676,7 @@ if 1: str = re.sub ('LyricVoice', 'LyricsVoice', str) # old fix str = re.sub ('Chord[Nn]ames*.Chord[Nn]ames*', 'ChordNames.ChordName', str) + str = re.sub ('Chord[Nn]ames([ \t\n]+\\\\override)', 'ChordName\\1', str) return str conversions.append (((1,3,113), conv, 'LyricVoice -> LyricsVoice')) @@ -606,7 +706,7 @@ if 1: def regularize_assignment (match): return '\n' + regularize_id (match.group (1)) + ' = ' str = re.sub ('\$([^\t\n ]+)', regularize_dollar_reference, str) - str = re.sub ('\n([^ \t\n]+) = ', regularize_assignment, str) + str = re.sub ('\n([^ \t\n]+)[ \t]*= *', regularize_assignment, str) return str conversions.append (((1,3,117), conv, 'identifier names: $!foo_bar_123 -> xfooBarABC')) @@ -619,6 +719,7 @@ if 1: str = re.sub ('(paper_[a-z]+)', regularize_paper, str) str = re.sub ('sustainup', 'sustainUp', str) + str = re.sub ('nobreak', 'noBreak', str) str = re.sub ('sustaindown', 'sustainDown', str) str = re.sub ('sostenutoup', 'sostenutoUp', str) str = re.sub ('sostenutodown', 'sostenutoDown', str) @@ -632,13 +733,94 @@ if 1: if 1: def conv (str): str = re.sub ('drarnChords', 'chordChanges', str) + str = re.sub ('\\musicalpitch', '\\pitch', str) return str - conversions.append (((1,3,122), conv, 'drarnChords -> chordChanges')) + conversions.append (((1,3,122), conv, 'drarnChords -> chordChanges, \\musicalpitch -> \\pitch')) +if 1: + def conv (str): + str = re.sub ('ly-([sg])et-elt-property', 'ly-\\1et-grob-property', str) + return str + + conversions.append (((1,3,136), conv, 'ly-X-elt-property -> ly-X-grob-property')) -############################ +if 1: + def conv (str): + str = re.sub ('point-and-click +#t', 'point-and-click line-column-location', str) + return str + + conversions.append (((1,3,138), conv, 'point-and-click argument changed to procedure.')) + +if 1: + def conv (str): + str = re.sub ('followThread', 'followVoice', str) + str = re.sub ('Thread.FollowThread', 'Voice.VoiceFollower', str) + str = re.sub ('FollowThread', 'VoiceFollower', str) + return str + conversions.append (((1,3,138), conv, 'followThread -> followVoice.')) + +if 1: + def conv (str): + str = re.sub ('font-point-size', 'font-design-size', str) + return str + + conversions.append (((1,3,139), conv, 'font-point-size -> font-design-size.')) + +if 1: + def conv (str): + str = re.sub ('([a-zA-Z]*)NoDots', '\\1Solid', str) + return str + + conversions.append (((1,3,141), conv, 'xNoDots -> xSolid')) + +if 1: + def conv (str): + str = re.sub ('([Cc])horda', '\\1orda', str) + return str + + conversions.append (((1,3,144), conv, 'Chorda -> Corda')) + + +if 1: + def conv (str): + str = re.sub ('([A-Za-z]+)MinimumVerticalExtent', 'MinimumV@rticalExtent', str) + str = re.sub ('([A-Za-z]+)ExtraVerticalExtent', 'ExtraV@rticalExtent', str) + str = re.sub ('([A-Za-z]+)VerticalExtent', 'VerticalExtent', str) + str = re.sub ('ExtraV@rticalExtent', 'ExtraVerticalExtent', str) + str = re.sub ('MinimumV@rticalExtent', 'MinimumVerticalExtent', str) + return str + + conversions.append (((1,3,145), conv, + 'ContextNameXxxxVerticalExtent -> XxxxVerticalExtent')) + +if 1: + def conv (str): + str = re.sub ('\\\\key[ \t]*;', '\\key \\default;', str) + str = re.sub ('\\\\mark[ \t]*;', '\\mark \\default;', str) + + # Make sure groups of more than one ; have space before + # them, so that non of them gets removed by next rule + str = re.sub ("([^ \n\t;]);(;+)", "\\1 ;\\2", str) + + # Only remove ; that are not after spaces, # or ; + # Otherwise we interfere with Scheme comments, + # which is badbadbad. + str = re.sub ("([^ \t;#]);", "\\1", str) + + return str + conversions.append (((1,3,146), conv, 'semicolons removed')) + +if 1: + def conv (str): + str = re.sub ('default-neutral-direction', 'neutral-direction',str) + return str + conversions.append (((1,3,147), conv, 'default-neutral-direction -> neutral-direction')) + +################################ +# END OF CONVERSIONS +################################ def get_conversions (from_version, to_version): def version_b (v, f = from_version, t = to_version): @@ -667,9 +849,10 @@ def do_conversion (infile, from_version, outfile, to_version): if last_conversion: sys.stderr.write ('\n') new_ver = '\\version \"%s\"' % tup_to_str (last_conversion) + if re.search (lilypond_version_re_str, str): str = re.sub (lilypond_version_re_str,'\\'+new_ver , str) - else: + elif add_version: str = new_ver + '\n' + str outfile.write(str) @@ -731,12 +914,13 @@ def do_one_file (infile_name): sys.stderr.flush () edit = 0 +assume_old = 0 to_version = () from_version = () outfile_name = '' (options, files) = getopt.getopt ( - sys.argv[1:], 'o:f:t:seh', ['version', 'output', 'show-rules', 'help', 'edit', 'from=', 'to']) + sys.argv[1:], 'ao:f:t:senh', ['no-version', 'assume-old', 'version', 'output', 'show-rules', 'help', 'edit', 'from=', 'to=']) for opt in options: o = opt[0] @@ -758,6 +942,10 @@ for opt in options: sys.exit(0) elif o == '--output' or o == '-o': outfile_name = a + elif o == '--assume-old' or o == '-a': + assume_old = 1 + elif o == '--no-version' or o == '-n': + add_version = 0 else: print o raise getopt.error @@ -766,7 +954,20 @@ identify () for f in files: if f == '-': f = '' + if not os.path.isfile (f): + continue try: do_one_file (f) except UnknownVersion: + sys.stderr.write ('\n') + sys.stderr.write ("%s: can't determine version for %s" % (program_name, f)) + sys.stderr.write ('\n') + if assume_old: + fv = from_version + from_version = (0,0,0) + do_one_file (f) + from_version = fv + else: + sys.stderr.write ("%s: skipping: %s " % (program_name, f)) pass +sys.stderr.write ('\n')