X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fconvert-mudela.py;h=7daa574c6261c3430b250a3c23c4ed137deb9e06;hb=7ed4019033adf7db7a8f64c4eb7b7f6d0449402f;hp=41441d2c5e08dfbc435c21e1cdfc1c0aee2a79f3;hpb=38ec7508357499b6bcf78a2cf0e825caac27a591;p=lilypond.git
diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index 41441d2c5e..7daa574c62 100644
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -14,26 +14,57 @@
# - rewrite in python
program_name = 'convert-mudela'
-version = '0.3'
-
+version = '@TOPLEVEL_VERSION@'
import os
import sys
import __main__
import getopt
from string import *
-import regex
-import regsub
+import re
import time
-mudela_version_re_str ='\\\\version *\"\(.*\)\"'
-mudela_version_re = regex.compile(mudela_version_re_str)
+
+mudela_version_re_str = '\\\\version *\"(.*)\"'
+mudela_version_re = re.compile(mudela_version_re_str)
def program_id ():
- return '%s version %s' %(program_name, version);
+ return '%s (GNU LilyPond) %s' %(program_name, version);
def identify ():
sys.stderr.write (program_id () + '\n')
+def usage ():
+ sys.stdout.write (
+ r"""Usage: %s [OPTION]... [FILE]...
+Try to convert to newer mudela-versions. The version number of the
+input is guessed by default from \version directive
+
+Options:
+ -h, --help print this help
+ -e, --edit in place edit
+ -f, --from=VERSION start from version
+ -s, --show-rules print all rules.
+ -t, --to=VERSION target version
+ --version print program version
+
+Report bugs to bugs-gnu-music@gnu.org
+
+""" % program_name)
+
+
+ sys.exit (0)
+
+def print_version ():
+
+ sys.stdout.write (r"""%s
+
+This is free software. It is covered by the GNU General Public
+License, and you are welcome to change it and/or distribute copies of
+it under certain conditions. invoke as `%s --warranty' for more
+information.
+
+""" % (program_id() , program_name))
+
def gulp_file(f):
try:
i = open(f)
@@ -49,7 +80,6 @@ def gulp_file(f):
i.close ()
return s
-
def str_to_tuple (s):
return tuple (map (atoi, split (s,'.')))
@@ -61,27 +91,15 @@ def version_cmp (t1, t2):
if t1[x] - t2[x]:
return t1[x] - t2[x]
return 0
-
def guess_mudela_version(filename):
s = gulp_file (filename)
- if mudela_version_re.search(s) <> -1:
- return mudela_version_re.group(1)
+ m = mudela_version_re.search (s)
+ if m:
+ return m.group(1)
else:
return ''
-def help ():
- sys.stdout.write (
- ("Usage: %s [OPTION]... [FILE]...\n"
- + "Try to convert to newer mudela-versions\n"
- + "Options:\n"
- + " -h, --help print this help\n"
- + ' -e, --edit in place edit\n'
- + ' -f, --from=VERSION start from version\n'
- + ' -s, --show-rules print out all rules.\n'
- + ' -t, --to=VERSION target version\n') % program_name)
- sys.exit (0)
-
class FatalConversionError:
pass
@@ -94,104 +112,283 @@ def show_rules (file):
############################
if 1: # need new a namespace
- def conv (lines):
- found =0
- for x in lines:
- if regex.search ('\\\\octave', x) <> -1:
- found = 1
- break
- if found:
- sys.stderr.write ('\nNot smart enough to convert \\octave\n')
+ def conv (str):
+ if re.search ('\\\\octave', str):
+ sys.stderr.write ('\nNot smart enough to convert \\octave')
raise FatalConversionError()
- return lines
+ return lines
conversions.append (
((0,1,19), conv, 'deprecated \\octave; can\'t convert automatically'))
if 1: # need new a namespace
- def conv (lines):
- newlines = []
- for x in lines:
- x = regsub.gsub ('\\\\textstyle\\([^;]+\\);',
- '\\\\property Lyrics . textstyle = \\1', x)
- x = regsub.gsub ('\\\\key\\([^;]+\\);', '\\\\accidentals \\1;', x)
- newlines.append (x)
- return newlines
-
+ def conv (str):
+ str = re.sub ('\\\\textstyle([^;]+);',
+ '\\\\property Lyrics . textstyle = \\1', str)
+ str = re.sub ('\\\\key([^;]+);', '\\\\accidentals \\1;', str)
+
+ return str
conversions.append (
((0,1,20), conv, 'deprecated \\textstyle, new \key syntax'))
-if 1: # need new a namespace
- def conv (lines):
- newlines = []
- for x in lines:
- x = regsub.gsub ('\\\\musical_pitch',
- '\\\\musicalpitch',x)
- x = regsub.gsub ('\\\\meter',
- '\\\\time',x)
- newlines.append (x)
- return newlines
-
+if 1:
+ def conv (str):
+ str = re.sub ('\\\\musical_pitch', '\\\\musicalpitch',str)
+ str = re.sub ('\\\\meter', '\\\\time',str)
+
+ return str
conversions.append (
((0,1,21), conv, '\\musical_pitch -> \\musicalpitch, '+
- '\\meter -> \\time\n'))
+ '\\meter -> \\time'))
-if 1: # need new a namespace
- def conv (lines):
+if 1:
+ def conv (str):
return lines
conversions.append (
((1,0,0), conv, '0.1.21 -> 1.0.0 '))
-if 1: # need new a namespace
- def conv (lines):
- newlines = []
- for x in lines:
- x = regsub.gsub ('\\\\accidentals',
- '\\\\keysignature',x)
- x = regsub.gsub ('specialaccidentals *= *1',
- 'keyoctaviation = 0',x)
- x = regsub.gsub ('specialaccidentals *= *0',
- 'keyoctaviation = 1',x)
- newlines.append (x)
- return newlines
-
+if 1:
+ def conv (str):
+ str = re.sub ('\\\\accidentals', '\\\\keysignature',str)
+ str = re.sub ('specialaccidentals *= *1', 'keyoctaviation = 0',str)
+ str = re.sub ('specialaccidentals *= *0', 'keyoctaviation = 1',str)
+
+ return str
conversions.append (
((1,0,1), conv, '\\accidentals -> \\keysignature, ' +
- 'specialaccidentals -> keyoctaviation\n'))
+ 'specialaccidentals -> keyoctaviation'))
if 1:
- def conv(lines):
- found = 0
- for x in lines:
- if regex.search ('\\\\header', x) <> -1:
- found = 1
- break
- if found:
- sys.stderr.write ('\nNot smart enough to convert to new \\header format\n')
+ def conv(str):
+ if re.search ('\\\\header', lines):
+ sys.stderr.write ('\nNot smart enough to convert to new \\header format')
return lines
- conversions.append ((1,0,2), conv, '\header { key = concat + with + operator }\n')
+ conversions.append ((1,0,2), conv, '\\header { key = concat + with + operator }')
if 1:
- def conv(lines):
- newlines =[]
- for x in lines:
- x = regsub.gsub ('\\\\melodic', '\\\\notes',x)
- newlines.append (x)
- return newlines
+ def conv(str):
+ str = re.sub ('\\\\melodic', '\\\\notes',str)
+
+ return str
- conversions.append ((1,0,3), conv, '\melodic -> \notes\n')
+ 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)
+
+ return str
+
+ 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)
+
+ return str
+
+ 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()
+ return str
+
+ conversions.append ((1,0,6), conv, 'foo = \\translator {\\type .. } ->\\translator {\\type ..; foo; }')
+
+
+if 1:
+ def conv(str):
+ str = re.sub ('\\\\lyric', '\\\\lyrics',str)
+
+ return str
+
+ conversions.append ((1,0,7), conv, '\\lyric -> \\lyrics')
+
+if 1:
+ def conv(str):
+ str = re.sub ('\\\\\\[/3+', '\\\\times 2/3 { ',str)
+ str = re.sub ('\\[/3+', '\\\\times 2/3 { [',str)
+ str = re.sub ('\\\\\\[([0-9/]+)', '\\\\times \\1 {',str)
+ str = re.sub ('\\[([0-9/]+)', '\\\\times \\1 { [',str)
+ str = re.sub ('\\\\\\]([0-9/]+)', '}', str)
+ str = re.sub ('\\\\\\]', '}',str)
+ str = re.sub ('\\]([0-9/]+)', '] }', str)
+ return str
+
+ conversions.append ((1,0,10), conv, '[2/3 ]1/1 -> \\times 2/3 ')
+
+if 1:
+ def conv(str):
+ return lines
+ conversions.append ((1,0,12), conv, 'Chord syntax stuff')
+if 1:
+ def conv(str):
+
+
+ str = re.sub ('<([^>~]+)~([^>]*)>','<\\1 \\2> ~', str)
+
+ return str
+
+ conversions.append ((1,0,13), conv, ' c -> ~ c')
+
+if 1:
+ def conv(str):
+ str = re.sub ('<\\[','[<', str)
+ str = re.sub ('\\]>','>]', str)
+
+ return str
+
+ conversions.append ((1,0,14), conv, '<[a b> c -> [ ]')
+
+
+if 1:
+ def conv(str):
+ str = re.sub ('\\\\type','\\\\context', str)
+ str = re.sub ('textstyle','textStyle', str)
+
+ return str
+
+ 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()
+ return str
+
+ conversions.append ((1,0,18), conv,
+ '\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative')
+
+if 1:
+ def conv(str):
+ str = re.sub ('SkipBars','skipBars', str)
+ str = re.sub ('fontsize','fontSize', str)
+ str = re.sub ('midi_instrument','midiInstrument', x)
+
+ return str
+
+ conversions.append ((1,0,19), conv,
+ 'fontsize -> fontSize, midi_instrument -> midiInstrument, SkipBars -> skipBars')
+
+
+if 1:
+ def conv(str):
+ str = re.sub ('tieydirection','tieVerticalDirection', str)
+ str = re.sub ('slurydirection','slurVerticalDirection', str)
+ str = re.sub ('ydirection','verticalDirection', x)
+
+ return str
+
+ conversions.append ((1,0,20), conv,
+ '{,tie,slur}ydirection -> {v,tieV,slurV}erticalDirection')
+
+
+if 1:
+ def conv(str):
+ str = re.sub ('hshift','horizontalNoteShift', str)
+
+ return str
+
+ conversions.append ((1,0,21), conv,
+ 'hshift -> horizontalNoteShift')
+
+
+if 1:
+ def conv(str):
+ str = re.sub ('\\\\grouping[^;]*;','', str)
+
+ return str
+
+ conversions.append ((1,1,52), conv,
+ 'deprecate \\grouping')
+
+
+if 1:
+ def conv(str):
+ str = re.sub ('\\\\wheel','\\\\coda', str)
+
+ return str
+
+ conversions.append ((1,1,55), conv,
+ '\\wheel -> \\coda')
+
+if 1:
+ def conv(str):
+ str = re.sub ('keyoctaviation','keyOctaviation', str)
+ str = re.sub ('slurdash','slurDash', str)
+
+ return str
+
+ conversions.append ((1,1,65), conv,
+ 'slurdash -> slurDash, keyoctaviation -> keyOctaviation')
+
+if 1:
+ def conv(str):
+ str = re.sub ('\\\\repeat *\"?semi\"?','\\\\repeat "volta"', str)
+
+ return str
+
+ conversions.append ((1,1,66), conv,
+ 'semi -> volta')
+
+
+if 1:
+ def conv(str):
+ str = re.sub ('\"?beamAuto\"? *= *\"?0?\"?','noAutoBeaming = "1"', str)
+
+ return str
+
+ conversions.append ((1,1,67), conv,
+ 'beamAuto -> noAutoBeaming')
+
+if 1:
+ def conv(str):
+ str = re.sub ('automaticMelismas', 'automaticMelismata', str)
+
+ return str
+
+ conversions.append ((1,2,0), conv,
+ 'automaticMelismas -> automaticMelismata')
+
+if 1:
+ def conv(str):
+ str = re.sub ('dynamicDir', 'dynamicDirection', str)
+
+ return str
+
+ conversions.append ((1,2,1), conv,
+ 'dynamicDir -> dynamicDirection')
+
+if 1:
+ def conv(str):
+ str = re.sub ('\\\\cadenza *0 *;', '\\\\cadenzaOff', str)
+ str = re.sub ('\\\\cadenza *1 *;', '\\\\cadenzaOn', str)
+
+ return str
+
+ conversions.append ((1,3,4), conv,
+ '\\cadenza -> \cadenza{On|Off}')
+
############################
+
def get_conversions (from_version, to_version):
def version_b (v, f = from_version, t = to_version):
@@ -207,24 +404,29 @@ def do_conversion (infile, from_version, outfile, to_version):
conv_list = get_conversions (from_version, to_version)
sys.stderr.write ('Applying conversions: ')
- lines = infile.readlines();
+ str = infile.read ()
last_conversion = ()
try:
for x in conv_list:
sys.stderr.write (tup_to_str (x[0]) + ', ')
- lines = x[1] (lines)
+ str = x[1] (str)
last_conversion = x[0]
-
- sys.stderr.write ('\n')
except FatalConversionError:
sys.stderr.write ('Error while converting; I won\'t convert any further')
- for x in lines:
- if last_conversion:
- x = regsub.sub (mudela_version_re_str, '\\version \"%s\"' % tup_to_str (last_conversion), x)
- outfile.write(x)
+ if last_conversion:
+ sys.stderr.write ('\n')
+ new_ver = '\\\\version \"%s\"' % tup_to_str (last_conversion)
+ if re.search (mudela_version_re_str, str):
+ str = re.sub (mudela_version_re_str,new_ver , str)
+ else:
+ str = new_ver + '\n' + str
+
+ outfile.write(str)
+ return last_conversion
+
class UnknownVersion:
pass
@@ -260,8 +462,7 @@ def do_one_file (infile_name):
else:
outfile = sys.stdout
-
- do_conversion (infile, from_version, outfile, to_version)
+ touched = do_conversion (infile, from_version, outfile, to_version)
if infile_name:
infile.close ()
@@ -269,25 +470,34 @@ def do_one_file (infile_name):
if outfile_name:
outfile.close ()
- if __main__.edit:
+ if __main__.edit and touched:
+ try:
+ os.remove(infile_name + '~')
+ except:
+ pass
os.rename (infile_name, infile_name + '~')
os.rename (infile_name + '.NEW', infile_name)
+ sys.stderr.write ('\n')
+ sys.stderr.flush ()
edit = 0
to_version = ()
from_version = ()
outfile_name = ''
-identify ()
(options, files) = getopt.getopt (
- sys.argv[1:], 'f:t:seh', ['show-rules', 'help', 'edit', 'from', 'to'])
+ sys.argv[1:], 'o:f:t:seh', ['version', 'output', 'show-rules', 'help', 'edit', 'from=', 'to'])
for opt in options:
o = opt[0]
a = opt[1]
if o== '--help' or o == '-h':
- help ()
+ usage ()
+ sys.exit (0)
+ if o == '--version' or o == '-v':
+ print_version ()
+ sys.exit (0)
elif o== '--from' or o=='-f':
from_version = str_to_tuple (a)
elif o== '--to' or o=='-t':
@@ -297,11 +507,13 @@ for opt in options:
elif o== '--show-rules' or o == '-s':
show_rules (sys.stdout)
sys.exit(0)
+ elif o == '--output' or o == '-o':
+ outfile_name = a
else:
print o
raise getopt.error
-
+identify ()
for f in files:
if f == '-':
f = ''