#!@PYTHON@
-
-# convert-lilypond.py -- convertor for lilypond versions
+#
+# convert-ly.py -- Update old LilyPond input files (fix name?)
#
# source file of the GNU LilyPond music typesetter
#
-# (c) 1998
+# (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# Jan Nieuwenhuizen <janneke@gnu.org>
+
# TODO
# use -f and -t for -s output
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);
Options:
-h, --help print this help
- -e, --edit in place edit
- -f, --from=VERSION start from version
+ -e, --edit edit in place
+ -f, --from=VERSION start from version; overrides \version found in file
-s, --show-rules print all rules.
- -t, --to=VERSION target version
+ -t, --to=VERSION show target version
+ -n, --no-version don't add new version stamp.
--version print program version
Report bugs to bugs-gnu-music@gnu.org
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 ''
############################
+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
- conversions.append (
- ((0,1,19), conv, 'deprecated \\octave; can\'t convert automatically'))
+ conversions.append ((
+ ((0,1,19), conv, 'deprecated \\octave; can\'t convert automatically')))
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
- conversions.append (
- ((0,1,20), conv, 'deprecated \\textstyle, new \key syntax'))
+ conversions.append ((
+ ((0,1,20), conv, 'deprecated \\textstyle, new \key syntax')))
if 1:
return str
- conversions.append (
+ conversions.append ((
((0,1,21), conv, '\\musical_pitch -> \\musicalpitch, '+
- '\\meter -> \\time'))
+ '\\meter -> \\time')))
if 1:
def conv (str):
return str
- conversions.append (
- ((1,0,0), conv, '0.1.21 -> 1.0.0 '))
+ conversions.append ((
+ ((1,0,0), conv, '0.1.21 -> 1.0.0 ')))
if 1:
return str
- conversions.append (
+ conversions.append ((
((1,0,1), conv, '\\accidentals -> \\keysignature, ' +
- 'specialaccidentals -> keyoctaviation'))
+ 'specialaccidentals -> keyoctaviation')))
if 1:
def conv(str):
sys.stderr.write ('\nNot smart enough to convert to new \\header format')
return str
- conversions.append ((1,0,2), conv, '\\header { key = concat + with + operator }')
+ conversions.append (((1,0,2), conv, '\\header { key = concat + with + operator }'))
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')
+ conversions.append (((1,0,3), conv, '\\melodic -> \\notes'))
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}')
+ conversions.append (((1,0,4), conv, 'default_{paper,midi}'))
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
- conversions.append ((1,0,5), conv, 'ChoireStaff -> ChoirStaff')
+ conversions.append (((1,0,5), conv, 'ChoireStaff -> ChoirStaff'))
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; }')
+ conversions.append (((1,0,6), conv, 'foo = \\translator {\\type .. } ->\\translator {\\type ..; foo; }'))
if 1:
def conv(str):
- str = re.sub ('\\\\lyric', '\\\\lyrics',str)
+ str = re.sub ('\\\\lyrics*', '\\\\lyrics',str)
return str
- conversions.append ((1,0,7), conv, '\\lyric -> \\lyrics')
+ conversions.append (((1,0,7), conv, '\\lyric -> \\lyrics'))
if 1:
def conv(str):
str = re.sub ('\\]([0-9/]+)', '] }', str)
return str
- conversions.append ((1,0,10), conv, '[2/3 ]1/1 -> \\times 2/3 ')
+ conversions.append (((1,0,10), conv, '[2/3 ]1/1 -> \\times 2/3 '))
if 1:
def conv(str):
return str
- conversions.append ((1,0,12), conv, 'Chord syntax stuff')
+ conversions.append (((1,0,12), conv, 'Chord syntax stuff'))
if 1:
return str
- conversions.append ((1,0,13), conv, '<a ~ b> c -> <a b> ~ c')
+ conversions.append (((1,0,13), conv, '<a ~ b> c -> <a b> ~ c'))
if 1:
def conv(str):
return str
- conversions.append ((1,0,14), conv, '<[a b> <a b]>c -> [<a b> <a b>]')
+ conversions.append (((1,0,14), conv, '<[a b> <a b]>c -> [<a b> <a b>]'))
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
- conversions.append ((1,0,16), conv, '\\type -> \\context, textstyle -> textStyle')
+ conversions.append (((1,0,16), conv, '\\type -> \\context, textstyle -> textStyle'))
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,
- '\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative')
+ conversions.append (((1,0,18), conv,
+ '\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative'))
if 1:
def conv(str):
return str
- conversions.append ((1,0,19), conv,
- 'fontsize -> fontSize, midi_instrument -> midiInstrument, SkipBars -> skipBars')
+ conversions.append (((1,0,19), conv,
+ 'fontsize -> fontSize, midi_instrument -> midiInstrument, SkipBars -> skipBars'))
if 1:
return str
- conversions.append ((1,0,20), conv,
- '{,tie,slur}ydirection -> {v,tieV,slurV}erticalDirection')
+ conversions.append (((1,0,20), conv,
+ '{,tie,slur}ydirection -> {v,tieV,slurV}erticalDirection'))
if 1:
return str
- conversions.append ((1,0,21), conv,
- 'hshift -> horizontalNoteShift')
+ conversions.append (((1,0,21), conv,
+ 'hshift -> horizontalNoteShift'))
if 1:
return str
- conversions.append ((1,1,52), conv,
- 'deprecate \\grouping')
+ conversions.append (((1,1,52), conv,
+ 'deprecate \\grouping'))
if 1:
return str
- conversions.append ((1,1,55), conv,
- '\\wheel -> \\coda')
+ conversions.append (((1,1,55), conv,
+ '\\wheel -> \\coda'))
if 1:
def conv(str):
return str
- conversions.append ((1,1,65), conv,
- 'slurdash -> slurDash, keyoctaviation -> keyOctaviation')
+ conversions.append (((1,1,65), conv,
+ 'slurdash -> slurDash, keyoctaviation -> keyOctaviation'))
if 1:
def conv(str):
return str
- conversions.append ((1,1,66), conv,
- 'semi -> volta')
+ conversions.append (((1,1,66), conv,
+ 'semi -> volta'))
if 1:
return str
- conversions.append ((1,1,67), conv,
- 'beamAuto -> noAutoBeaming')
+ conversions.append (((1,1,67), conv,
+ 'beamAuto -> noAutoBeaming'))
if 1:
def conv(str):
return str
- conversions.append ((1,2,0), conv,
- 'automaticMelismas -> automaticMelismata')
+ conversions.append (((1,2,0), conv,
+ 'automaticMelismas -> automaticMelismata'))
if 1:
def conv(str):
return str
- conversions.append ((1,2,1), conv,
- 'dynamicDir -> dynamicDirection')
+ conversions.append (((1,2,1), conv,
+ 'dynamicDir -> dynamicDirection'))
if 1:
def conv(str):
return str
- conversions.append ((1,3,4), conv,
- '\\cadenza -> \cadenza{On|Off}')
+ conversions.append (((1,3,4), conv,
+ '\\cadenza -> \cadenza{On|Off}'))
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
- conversions.append ((1,3,5), conv, 'beamAuto moment properties')
+ conversions.append (((1,3,5), conv, 'beamAuto moment properties'))
if 1:
def conv (str):
str)
return str
- conversions.append ((1,3,17), conv, 'stemStyle -> flagStyle')
+ conversions.append (((1,3,17), conv, 'stemStyle -> flagStyle'))
if 1:
def conv (str):
str)
return str
- conversions.append ((1,3,18), conv, 'staffLineLeading -> staffSpace')
+ 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)
return str
- conversions.append ((1,3,35), conv, 'textEmptyDimension -> textNonEmpty')
+ conversions.append (((1,3,35), conv, 'textEmptyDimension -> textNonEmpty'))
if 1:
def conv (str):
sys.stderr.write ('\nNot smart enough to convert to new \\notenames format')
return str
- conversions.append ((1,3,38), conv, '\musicalpitch { a b c } -> #\'(a b c)')
+ conversions.append (((1,3,38), conv, '\musicalpitch { a b c } -> #\'(a b c)'))
if 1:
def conv (str):
str = re.sub ("\\\\key ([^;]+);", replace, str)
return str
- conversions.append ((1,3,39), conv, '\\key A ; ->\\key a;')
+ conversions.append (((1,3,39), conv, '\\key A ; ->\\key a;'))
if 1:
def conv (str):
sys.stderr.write ('\nNot smart enough to convert to new tremolo format')
return str
- conversions.append ((1,3,41), conv,
- '[:16 c4 d4 ] -> \\repeat "tremolo" 2 { c16 d16 }')
+ conversions.append (((1,3,41), conv,
+ '[:16 c4 d4 ] -> \\repeat "tremolo" 2 { c16 d16 }'))
if 1:
def conv (str):
str = re.sub ('Staff_margin_engraver' , 'Instrument_name_engraver', str)
return str
- conversions.append ((1,3,42), conv,
- 'Staff_margin_engraver deprecated, use Instrument_name_engraver')
+ conversions.append (((1,3,42), conv,
+ 'Staff_margin_engraver deprecated, use Instrument_name_engraver'))
if 1:
def conv (str):
str = re.sub ('note[hH]eadStyle\\s*=\\s*"?(\\w+)"?' , "noteHeadStyle = #'\\1", str)
return str
- conversions.append ((1,3,49), conv,
- 'noteHeadStyle value: string -> symbol')
+ 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);
return str
- conversions.append ((1,3,59), conv,
- '\key X ; -> \key X major; ')
+ conversions.append (((1,3,59), conv,
+ '\key X ; -> \key X major; '))
if 1:
def conv (str):
'latexheaders = "',
str)
return str
- conversions.append ((1,3,68), conv, 'latexheaders = "\\input global" -> latexheaders = "global"')
-
-
+ conversions.append (((1,3,68), conv, 'latexheaders = "\\input global" -> latexheaders = "global"'))
-################ 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)
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)
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,
- 'property definiton case (eg. onevoice -> oneVoice)')
+ conversions.append (((1,3,93), conv,
+ 'property definiton case (eg. onevoice -> oneVoice)'))
if 1:
return str
- conversions.append ((1,3,97), conv, 'ChordName -> ChordNames')
+ 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
- conversions.append ((1,3,102), conv, 'beamAutoEnd -> autoBeamSettings \\push (end * * * *)')
+ conversions.append (((1,3,102), conv, 'beamAutoEnd -> autoBeamSettings \\push (end * * * *)'))
if 1:
return str
- conversions.append ((1,3,110), conv, '\\push -> \\override, \\pop -> \\revert')
+ conversions.append (((1,3,111), conv, '\\push -> \\override, \\pop -> \\revert'))
+if 1:
+ def conv (str):
+ 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'))
+
+def regularize_id (str):
+ s = ''
+ lastx = ''
+ for x in str:
+ if x == '_':
+ lastx = x
+ continue
+ elif x in string.digits:
+ x = chr(ord (x) - ord ('0') +ord ('A'))
+ elif x not in string.letters:
+ x = 'x'
+ elif x in string.lowercase and lastx == '_':
+ x = string.upper (x)
+ s = s + x
+ lastx = x
+ return s
-############################
+if 1:
+ def conv (str):
+
+ def regularize_dollar_reference (match):
+ return regularize_id (match.group (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]+)[ \t]*= *', regularize_assignment, str)
+ return str
+
+ conversions.append (((1,3,117), conv, 'identifier names: $!foo_bar_123 -> xfooBarABC'))
+
+
+if 1:
+ def conv (str):
+ def regularize_paper (match):
+ return regularize_id (match.group (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)
+ str = re.sub ('unachorda', 'unaChorda', str)
+ str = re.sub ('trechorde', 'treChorde', str)
+
+ return str
+
+ conversions.append (((1,3,120), conv, 'paper_xxx -> paperXxxx, pedalup -> pedalUp.'))
+
+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, \\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])hord([ea])', '\\1ord\\2', 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'))
+
+if 1:
+ def conv (str):
+ str = re.sub ('\(align', '(axis', str)
+ str = re.sub ('\(rows', '(columns', str)
+ return str
+ conversions.append (((1,3,148), conv, '"(align" -> "(axis", "(rows" -> "(columns"'))
+
+
+if 1:
+ def conv (str):
+ str = re.sub ('SystemStartDelimiter', 'systemStartDelimiter', str)
+ return str
+ conversions.append (((1,5,33), conv, 'SystemStartDelimiter -> systemStartDelimiter'))
+
+if 1:
+ def conv (str):
+ str = re.sub ('arithmetic-multiplier', 'spacing-increment', str)
+ str = re.sub ('arithmetic-basicspace', 'shortest-duration-space', str)
+ return str
+
+ conversions.append (((1,5,38), conv, 'SystemStartDelimiter -> systemStartDelimiter'))
+
+
+if 1:
+ def conv (str):
+
+ def func(match):
+ break_dict = {
+ "Instrument_name": "instrument-name",
+ "Left_edge_item": "left-edge",
+ "Span_bar": "span-bar",
+ "Breathing_sign": "breathing-sign",
+ "Staff_bar": "staff-bar",
+ "Clef_item": "clef",
+ "Key_item": "key-signature",
+ "Time_signature": "time-signature",
+ "Custos": "custos"
+ }
+ props = match.group (1)
+ for (k,v) in break_dict.items():
+ props = re.sub (k, v, props)
+ return "breakAlignOrder = #'(%s)" % props
+
+ str = re.sub ("breakAlignOrder *= *#'\\(([a-z_\n\tA-Z ]+)\\)",
+ func, str)
+ return str
+
+ # 40 ?
+ conversions.append (((1,5,40), conv, 'breakAlignOrder property names'))
+
+
+if 1:
+ def conv (str):
+ str = re.sub ('noAutoBeaming *= *##f', 'autoBeaming = ##t', str)
+ str = re.sub ('noAutoBeaming *= *##t', 'autoBeaming = ##f', str)
+ return str
+
+ conversions.append (((1,5,49), conv, 'noAutoBeaming -> autoBeaming'))
+
+if 1:
+ def conv (str):
+ str = re.sub ('tuplet-bracket-visibility', 'bracket-visibility', str)
+ str = re.sub ('tuplet-number-visibility', 'number-visibility', str)
+ return str
+
+ conversions.append (((1,5,52), conv, 'tuplet-X-visibility -> X-visibility'))
+
+if 1:
+ def conv (str):
+ str = re.sub ('Pitch::transpose', 'ly-transpose-pitch', str)
+
+ return str
+
+ conversions.append (((1,5,56), conv, 'Pitch::transpose -> ly-transpose-pitch'))
+
+if 1:
+ def conv (str):
+ str = re.sub ('textNonEmpty *= *##t', "TextScript \\set #'no-spacing-rods = ##f", str)
+ str = re.sub ('textNonEmpty *= *##f', "TextScript \\set #'no-spacing-rods = ##t", str)
+ return str
+ conversions.append (((1,5,58), conv, 'deprecate textNonEmpty'))
+
+
+if 1:
+ def conv (str):
+ str = re.sub ('MinimumVerticalExtent', 'minimumV@rticalExtent', str)
+ str = re.sub ('minimumVerticalExtent', 'minimumV@rticalExtent', str)
+ str = re.sub ('ExtraVerticalExtent', 'extraV@rticalExtent', str)
+ str = re.sub ('extraVerticalExtent', 'extraV@rticalExtent', str)
+ str = re.sub ('VerticalExtent', 'verticalExtent', str)
+ str = re.sub ('extraV@rticalExtent', 'extraVerticalExtent', str)
+ str = re.sub ('minimumV@rticalExtent', 'minimumVerticalExtent', str)
+ return str
+
+ conversions.append (((1,5,59), conv,
+ 'XxxxVerticalExtent -> xxxVerticalExtent'))
+
+if 1:
+ def conv (str):
+ str = re.sub ('visibility-lambda', 'break-visibility', str)
+ return str
+
+ conversions.append (((1,5,62), conv,
+ 'visibility-lambda -> break-visibility'))
+
+
+if 1:
+ def conv (str):
+ if re.search (r'\addlyrics',str) \
+ and re.search ('automaticMelismata', str) == None:
+ sys.stderr.write ('automaticMelismata is turned on by default since 1.5.67. Please fix this by hand.')
+ raise FatalConversionError()
+ return str
+
+ conversions.append (((1,5,67), conv,
+ 'automaticMelismata turned on by default'))
+
+if 1:
+ def conv (str):
+ str = re.sub ('ly-set-grob-property([^!])', 'ly-set-grob-property!\1', str)
+ str = re.sub ('ly-set-mus-property([^!])', 'ly-set-mus-property!\1', str)
+ return str
+
+ conversions.append (((1,5,68), conv, 'ly-set-X-property -> ly-set-X-property!'))
+
+if 1:
+ def conv (str):
+ str = re.sub ('extent-X', 'X-extent', str)
+ str = re.sub ('extent-Y', 'Y-extent', str)
+ return str
+
+ conversions.append (((1,5,71), conv, 'extent-[XY] -> [XY]-extent'))
+
+
+if 1:
+ def conv (str):
+ str = re.sub ("""#\(set! +point-and-click +line-column-location\)""",
+ """#(set-point-and-click! \'line-column)""", str)
+ str = re.sub ("""#\(set![ \t]+point-and-click +line-location\)""",
+ '#(set-point-and-click! \'line)', str)
+ str = re.sub ('#\(set! +point-and-click +#f\)',
+ '#(set-point-and-click! \'none)', str)
+ return str
+
+ conversions.append (((1,5,72), conv, 'set! point-and-click -> set-point-and-click!'))
+
+
+if 1:
+ def conv (str):
+ str = re.sub ('flag-style', 'stroke-style', str)
+ str = re.sub (r"""Stem([ ]+)\\override #'style""", r"""Stem \\override #'flag-style""", str);
+ str = re.sub (r"""Stem([ ]+)\\set([ ]+)#'style""", r"""Stem \\set #'flag-style""", str);
+ return str
+
+ conversions.append (((1,6,5), conv, 'Stems: flag-style -> stroke-style; style -> flag-style'))
+
+
+if 1:
+ def subst_req_name (match):
+ return "(make-music-by-name \'%sEvent)" % regularize_id (match.group(1))
+
+ def conv (str):
+ str = re.sub ('\\(ly-make-music *\"([A-Z][a-z_]+)_req\"\\)', subst_req_name, str)
+ str = re.sub ('Request_chord', 'EventChord', str)
+ return str
+
+ conversions.append (((1,7,1), conv, 'ly-make-music foo_bar_req -> make-music-by-name FooBarEvent'))
+
+
+if 1:
+ spanner_subst ={
+ "text" : 'TextSpanEvent',
+ "decrescendo" : 'DecrescendoEvent',
+ "crescendo" : 'CrescendoEvent',
+ "Sustain" : 'SustainPedalEvent',
+ "slur" : 'SlurEvent',
+ "UnaCorda" : 'UnaCordaEvent',
+ "Sostenuto" : 'SostenutoEvent',
+ }
+ def subst_ev_name (match):
+ stype = 'STOP'
+ if re.search ('start', match.group(1)):
+ stype= 'START'
+
+ mtype = spanner_subst[match.group(2)]
+ return "(make-span-event '%s %s)" % (mtype , stype)
+
+ def subst_definition_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
+ def subst_csp_definition (match):
+ return ' = #(make-event-chord (list %s))' % subst_ev_name (match)
+ def subst_csp_inline (match):
+ return '#(ly-export (make-event-chord (list %s)))' % subst_ev_name (match)
+
+ def conv (str):
+ str = re.sub (r' *= *\\spanrequest *([^ ]+) *"([^"]+)"', subst_definition_ev_name, str)
+ str = re.sub (r'\\spanrequest *([^ ]+) *"([^"]+)"', subst_inline_ev_name, str)
+ str = re.sub (r' *= *\\commandspanrequest *([^ ]+) *"([^"]+)"', subst_csp_definition, str)
+ str = re.sub (r'\\commandspanrequest *([^ ]+) *"([^"]+)"', subst_csp_inline, str)
+ str = re.sub (r'ly-id ', 'ly-import ', str)
+
+ str = re.sub (r' *= *\\script "([^"]+)"', ' = #(make-articulation "\\1")', str)
+ str = re.sub (r'\\script "([^"]+)"', '#(ly-export (make-articulation "\\1"))', str)
+ return str
+
+ conversions.append (((1,7,2), conv, '\\spanrequest -> #(make-span-event .. ), \script -> #(make-articulation .. )'))
+
+if 1:
+ def conv(str):
+ str = re.sub (r'\(ly-', '(ly:', str)
+
+ changed = [
+ r'duration\?',
+ r'font-metric\?',
+ r'molecule\?',
+ r'moment\?',
+ r'music\?',
+ r'pitch\?',
+ 'make-duration',
+ 'music-duration-length',
+ 'duration-log',
+ 'duration-dotcount',
+ 'intlog2',
+ 'duration-factor',
+ 'transpose-key-alist',
+ 'get-system',
+ 'get-broken-into',
+ 'get-original',
+ 'set-point-and-click!',
+ 'make-moment',
+ 'make-pitch',
+ 'pitch-octave',
+ 'pitch-alteration',
+ 'pitch-notename',
+ 'pitch-semitones',
+ r'pitch<\?',
+ r'dir\?',
+ 'music-duration-compress',
+ 'set-point-and-click!'
+ ]
+
+ origre = r'\b(%s)' % string.join (changed, '|')
+
+ str = re.sub (origre, r'ly:\1',str)
+ str = re.sub ('set-point-and-click!', 'set-point-and-click', str)
+
+ return str
+
+ conversions.append (((1,7,3), conv, 'ly- -> ly:'))
+
+if 1:
+ def conv(str):
+ if re.search ('new-chords-done',str):
+ return str
+
+ str = re.sub (r'<<', '< <', str)
+ str = re.sub (r'>>', '> >', str)
+ return str
+
+ conversions.append (((1,7,4), conv, '<< >> -> < < > >'))
+
+if 1:
+ def conv(str):
+ str = re.sub (r"\\transpose", r"\\transpose c'", str)
+ str = re.sub (r"\\transpose c' *([a-z]+)'", r"\\transpose c \1", str)
+ return str
+ conversions.append (((1,7,5), conv, '\\transpose TO -> \\transpose FROM TO'))
+
+if 1:
+ def conv(str):
+ kws = ['arpeggio',
+ 'sustainDown',
+ 'sustainUp',
+ 'f',
+ 'p',
+ 'pp',
+ 'ppp',
+ 'fp',
+ 'ff',
+ 'mf',
+ 'mp',
+ 'sfz',
+ ]
+
+ origstr = string.join (kws, '|')
+ str = re.sub (r'([^_^-])\\(%s)\b' % origstr, r'\1-\\\2', str)
+ return str
+ conversions.append (((1,7,6), conv, 'note\\script -> note-\script'))
+
+
+if 1:
+ def conv(str):
+ str = re.sub (r"\\property *ChordNames *\. *ChordName *\\(set|override) *#'style *= *#('[a-z]+)",
+ r"#(set-chord-name-style \2)", str)
+ str = re.sub (r"\\property *ChordNames *\. *ChordName *\\revert *#'style",
+ r"", str)
+ return str
+ conversions.append (((1,7,10), conv, "\property ChordName #'style -> #(set-chord-name-style 'style)"))
+
+
+
+if 1:
+ def conv(str):
+ str = re.sub (r"ly:transpose-pitch", "ly:pitch-transpose", str)
+
+ return str
+ conversions.append (((1,7,11), conv, "transpose-pitch -> pitch-transpose"))
+
+if 1:
+ def conv(str):
+ str = re.sub (r"ly:get-molecule-extent", "ly:molecule-get-extent", str)
+ str = re.sub (r"ly:set-molecule-extent!", "ly:molecule-set-extent!", str)
+ str = re.sub (r"ly:add-molecule", "ly:molecule-add", str)
+ str = re.sub (r"ly:combine-molecule-at-edge", "ly:molecule-combine-at-edge", str)
+ str = re.sub (r"ly:align-to!", "ly:molecule-align-to!", str)
+
+ return str
+
+ conversions.append (((1,7,13), conv, "ly:XX-molecule-YY -> ly:molecule-XX-YY"))
+
+if 1:
+ def conv(str):
+ str = re.sub (r"linewidth *= *-[0-9.]+ *(\\mm|\\cm|\\in|\\pt)?", 'raggedright = ##t', str )
+ return str
+
+ conversions.append (((1,7,15), conv, "linewidth = -1 -> raggedright = ##t"))
+
+if 1:
+ def conv(str):
+ str = re.sub ("divisiomaior",
+ "divisioMaior", str)
+ str = re.sub ("divisiominima",
+ "divisioMinima", str)
+ str = re.sub ("divisiomaxima",
+ "divisioMaxima", str)
+ return str
+
+ conversions.append (((1,7,16), conv, "divisiomaior -> divisioMaior"))
+
+if 1:
+ def conv(str):
+ str = re.sub ("Skip_req_swallow_translator",
+ "Skip_event_swallow_translator", str)
+ return str
+
+ conversions.append (((1,7,17), conv, "Skip_req -> Skip_event"))
+
+if 1:
+ def conv(str):
+ str = re.sub ("groupOpen",
+ "startGroup", str)
+ str = re.sub ("groupClose",
+ "stopGroup", str)
+ str = re.sub ("#'outer",
+ "#'enclose-bounds", str)
+
+ return str
+
+ conversions.append (((1,7,18), conv,
+ """groupOpen/Close -> start/stopGroup,
+ #'outer -> #'enclose-bounds
+ """))
+
+if 1:
+ def conv(str):
+ if re.search( r'\\GraceContext', str):
+ sys.stderr.write ("GraceContext has been removed")
+ sys.stderr.write ("please use #(add-to-grace-init .. )")
+ raise FatalConversionError()
+
+ str = re.sub ('HaraKiriStaffContext', 'RemoveEmptyStaffContext', str)
+ return str
+
+ conversions.append (((1,7,19), conv,"remove GraceContext"))
+
+
+
+if 1:
+ def conv(str):
+ str = re.sub (
+ r"(set|override|revert) *#'type",
+ r"\1 #'style",
+ str)
+ return str
+
+ conversions.append (((1,7,22), conv,"remove GraceContext"))
+
+if 1:
+ def conv(str):
+ str = re.sub (
+ "barNonAuto *= *##t",
+ "automaticBars = ##f",
+ str)
+ str = re.sub (
+ "barNonAuto *= *##f",
+ "automaticBars = ##t",
+ str)
+ return str
+
+ conversions.append (((1,7,23), conv,"barNonAuto -> automaticBars"))
+
+
+if 1:
+ def conv(str):
+ if re.search( r'-(start|stop)Cluster', str):
+ sys.stderr.write ("""Cluster syntax has been changed.
+Please refer to the manual for details, and convert manually.
+""")
+
+ raise FatalConversionError()
+
+ return str
+
+ conversions.append (((1,7,24), conv,"cluster syntax"))
+
+if 1:
+ def conv(str):
+ str = re.sub (r"\\property *Staff\.(Sustain|Sostenuto|UnaCorda)Pedal *\\(override|set) *#'pedal-type *",
+ r"\property Staff.pedal\1Style ", str)
+ str = re.sub (r"\\property *Staff\.(Sustain|Sostenuto|UnaCorda)Pedal *\\revert *#'pedal-type", '', str)
+ return str
+
+ conversions.append (((1,7,28), conv,"new Pedal style syntax"))
+
+
+
+################################
+# END OF CONVERSIONS
+################################
def get_conversions (from_version, to_version):
def version_b (v, f = from_version, t = to_version):
if last_conversion:
sys.stderr.write ('\n')
- new_ver = '\\\\version \"%s\"' % tup_to_str (last_conversion)
+ 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:
+ str = re.sub (lilypond_version_re_str,'\\'+new_ver , str)
+ elif add_version:
str = new_ver + '\n' + str
outfile.write(str)
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', 'version', 'output', 'show-rules', 'help', 'edit', 'from=', 'to='])
for opt in options:
o = opt[0]
sys.exit(0)
elif o == '--output' or o == '-o':
outfile_name = a
+ elif o == '--no-version' or o == '-n':
+ add_version = 0
else:
print o
raise getopt.error
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')
projects / lilypond.git / blobdiff