#!@TARGET_PYTHON@
-#
+
# convert-ly.py -- Update old LilyPond input files (fix name?)
+# converting rules are found in python/convertrules.py
+
+# This file is part of LilyPond, the GNU music typesetter.
#
-# source file of the GNU LilyPond music typesetter
-#
-# (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
# Jan Nieuwenhuizen <janneke@gnu.org>
#
-# converting rules are found in python/convertrules.py
+# LilyPond is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
#
+# LilyPond is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
import os
import sys
-import string
import re
-
-datadir = '@local_lilypond_datadir@'
-if not os.path.isdir (datadir):
- datadir = '@lilypond_datadir@'
-
-sys.path.insert (0, os.path.join (datadir, 'python'))
-
-# dynamic relocation, for GUB binaries.
-bindir = os.path.abspath (os.path.split (sys.argv[0])[0])
-for p in ['share', 'lib']:
- datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % p)
- sys.path.insert (0, datadir)
+"""
+@relocate-preamble@
+"""
import lilylib as ly
global _;_=ly._
+ly.require_python_version ()
+
import convertrules
lilypond_version_re_str = '\\\\version *\"([0-9.]+)"'
lilypond_version_re = re.compile (lilypond_version_re_str)
+lilypond_version_strict_re_str = '\\\\version *\"([0-9]+[.][0-9]+[.][0-9]+)"'
+lilypond_version_strict_re = re.compile (lilypond_version_strict_re_str)
help_summary = (
_ ('''Update LilyPond input to newer version. By default, update from the
version taken from the \\version command, to the current LilyPond version.''')
+ _ ("Examples:")
+ '''
- convert-ly -e old.ly
- convert-ly --from=2.3.28 --to 2.5.21 foobar.ly
+ $ convert-ly -e old.ly
+ $ convert-ly --from=2.3.28 --to=2.5.21 foobar.ly > foobar-new.ly
''')
copyright = ('Jan Nieuwenhuizen <janneke@gnu.org>',
program_name = os.path.basename (sys.argv[0])
program_version = '@TOPLEVEL_VERSION@'
-def warning (s):
- sys.stderr.write (program_name + ": " + _ ("warning: %s") % s + '\n')
+authors = ('Jan Nieuwenhuizen <janneke@gnu.org>',
+ 'Han-Wen Nienhuys <hanwen@xs4all.nl>')
-def error (s):
- sys.stderr.write (program_name + ": " + _ ("error: %s") % s + '\n')
-
-def identify (port=sys.stderr):
- port.write ('%s (GNU LilyPond) %s\n' % (program_name, program_version))
+def identify ():
+ ly.progress ('%s (GNU LilyPond) %s\n' % (program_name, program_version))
def warranty ():
identify ()
- sys.stdout.write ('''
-Copyright (c) %s by
+ ly.encoded_write (sys.stdout, '''
+%s
- Han-Wen Nienhuys
- Jan Nieuwenhuizen
+%s
%s
%s
-''' ( '2001--2006',
- _ ("Distributed under terms of the GNU General Public License."),
- _ ('It comes with NO WARRANTY.')))
-
+''' % ( _ ('Copyright (c) %s by') % '2001--2012',
+ ' '.join (authors),
+ _ ('Distributed under terms of the GNU General Public License.'),
+ _ ('It comes with NO WARRANTY.')))
def get_option_parser ():
p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'convert-ly',
- version="@TOPLEVEL_VERSION@",
- description=help_summary)
+ description=help_summary,
+ add_help_option=False)
+
+ p.version="@TOPLEVEL_VERSION@"
+ p.add_option("--version",
+ action="version",
+ help=_ ("show version number and exit"))
+
+ p.add_option("-h", "--help",
+ action="help",
+ help=_ ("show this help and exit"))
p.add_option ('-f', '--from',
action="store",
p.add_option ('-e', '--edit', help=_ ("edit in place"),
action='store_true')
+
+ p.add_option ("-l", "--loglevel",
+ help=_ ("Print log messages according to LOGLEVEL "
+ "(NONE, ERROR, WARNING, PROGRESS (default), DEBUG)"),
+ metavar=_ ("LOGLEVEL"),
+ action='callback',
+ callback=ly.handle_loglevel_option,
+ type='string')
+
p.add_option ('-n', '--no-version',
help=_ ("do not add \\version command if missing"),
action='store_true',
dest='skip_version_add',
default=False)
+
+ p.add_option ('-c', '--current-version',
+ help=_ ("force updating \\version number to %s") % program_version,
+ action='store_true',
+ dest='force_current_version',
+ default=False)
+
+ p.add_option ('-d', '--diff-version-update',
+ help=_ ("only update \\version number if file is modified"),
+ action='store_true',
+ dest='diff_version_update',
+ default=False)
p.add_option ("-s", '--show-rules',
- help=_ ("show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"),
+ help=_ ("show rules [default: -f 0, -t %s]") % program_version,
dest='show_rules',
action='store_true', default=False)
p.add_option ('-t', '--to',
- help=_ ("convert to VERSION [default: @TOPLEVEL_VERSION@]"),
+ help=_ ("convert to VERSION [default: %s]") % program_version,
metavar=_ ('VERSION'),
action='store',
dest="to_version",
default='')
-
- p.add_option_group ('bugs',
- description=(_ ("Report bugs via")
- + ''' http://post.gmane.org/post.php'''
- '''?group=gmane.comp.gnu.lilypond.bugs\n'''))
+ p.add_option ('-w', '--warranty', help=_ ("show warranty and copyright"),
+ action='store_true',
+ ),
+ p.add_option_group ('',
+ description=(
+ _ ("Report bugs via %s")
+ % 'http://post.gmane.org/post.php'
+ '?group=gmane.comp.gnu.lilypond.bugs') + '\n')
return p
def str_to_tuple (s):
- return tuple (map (int, string.split (s, '.')))
+ return tuple ([int(n) for n in s.split ('.')])
def tup_to_str (t):
- return string.join (map (lambda x: '%s' % x, list (t)), '.')
+ return '.'.join (['%s' % x for x in t])
def version_cmp (t1, t2):
for x in [0, 1, 2]:
for x in convertrules.conversions:
if (not from_version or x[0] > from_version) \
and (not to_version or x[0] <= to_version):
- file.write ('%s: %s\n' % (tup_to_str (x[0]), x[2]))
+ ly.encoded_write (file, '%s: %s\n' % (tup_to_str (x[0]), x[2]))
def do_conversion (str, from_version, to_version):
"""Apply conversions from FROM_VERSION to TO_VERSION. Return
-tuple (LAST,STR), with the last succesful conversion and the resulting
+tuple (LAST,STR), with the last successful conversion and the resulting
string."""
conv_list = get_conversions (from_version, to_version)
- if convertrules.error_file:
- convertrules.error_file.write (_ ("Applying conversion: "))
-
+ ly.progress (_ ("Applying conversion: "), newline = False)
+
last_conversion = ()
try:
+ if not conv_list:
+ last_conversion = to_version
for x in conv_list:
- convertrules.error_file.write (tup_to_str (x[0]))
if x != conv_list[-1]:
- convertrules.error_file.write (', ')
+ ly.progress (tup_to_str (x[0]), newline = False)
+ ly.progress (', ', newline = False)
+ else:
+ ly.progress (tup_to_str (x[0]))
str = x[1] (str)
last_conversion = x[0]
except convertrules.FatalConversionError:
- convertrules.error_file.write ('\n'
- + _ ("Error while converting")
- + '\n'
- + _ ("Stopping at last succesful rule")
- + '\n')
+ ly.error (_ ("Error while converting")
+ + '\n'
+ + _ ("Stopping at last successful rule"))
return (last_conversion, str)
-def guess_lilypond_version (filename):
- s = open (filename).read ()
- m = lilypond_version_re.search (s)
+def guess_lilypond_version (input):
+ m = lilypond_version_strict_re.search (input)
if m:
return m.group (1)
+ m = lilypond_version_re.search (input)
+ if m:
+ raise InvalidVersion (m.group (1))
else:
return ''
-class FatalConversionError:
+class FatalConversionError (Exception):
pass
-class UnknownVersion:
+class UnknownVersion (Exception):
pass
+class InvalidVersion (Exception):
+ def __init__ (self, version):
+ self.version = version
+
def do_one_file (infile_name):
- sys.stderr.write (_ ("Processing `%s\'... ") % infile_name)
- sys.stderr.write ('\n')
+ ly.progress (_ ("Processing `%s\'... ") % infile_name, True)
+
+ if infile_name:
+ infile = open (infile_name, 'r')
+ input = infile.read ()
+ infile.close ()
+ else:
+ input = sys.stdin.read ()
from_version = None
to_version = None
if global_options.from_version:
from_version = global_options.from_version
else:
- guess = guess_lilypond_version (infile_name)
+ guess = guess_lilypond_version (input)
if not guess:
raise UnknownVersion ()
from_version = str_to_tuple (guess)
else:
to_version = latest_version ()
-
- if infile_name:
- infile = open (infile_name, 'r')
- else:
- infile = sys.stdin
+ if len (from_version) != 3:
+ raise InvalidVersion (".".join ([str(n) for n in from_version]))
- (last, result) = do_conversion (infile.read (), from_version, to_version)
- infile.close ()
+ (last, result) = do_conversion (input, from_version, to_version)
if last:
+ if global_options.force_current_version and last == to_version:
+ last = str_to_tuple (program_version)
+
+ if global_options.diff_version_update:
+ if result == input:
+ # check the y in x.y.z (minor version number)
+ previous_stable = (last[0], 2*(last[1]/2), 0)
+ if ((last[0:2] != from_version[0:2]) and
+ (previous_stable > from_version)):
+ # previous stable version
+ last = previous_stable
+ else:
+ # make no (actual) change to the version number
+ last = from_version
+
newversion = r'\version "%s"' % tup_to_str (last)
if lilypond_version_re.search (result):
result = re.sub (lilypond_version_re_str,
'\\' + newversion, result)
elif not global_options.skip_version_add:
result = newversion + '\n' + result
-
- convertrules.error_file.write ('\n')
+
+ ly.progress ('\n')
if global_options.edit:
try:
opt_parser = get_option_parser()
(options, args) = opt_parser.parse_args ()
+ if options.warranty:
+ warranty ()
+ sys.exit (0)
if options.from_version:
options.from_version = str_to_tuple (options.from_version)
show_rules (sys.stdout, global_options.from_version, global_options.to_version)
sys.exit (0)
- identify (sys.stderr)
+ identify ()
for f in files:
if f == '-':
f = ''
elif not os.path.isfile (f):
- error (_ ("cannot open file: `%s'") % f)
+ ly.error (_ ("%s: Unable to open file") % f)
if len (files) == 1:
sys.exit (1)
continue
try:
do_one_file (f)
except UnknownVersion:
- error (_ ("cannot determine version for `%s'. Skipping") % f)
+ ly.error (_ ("%s: Unable to determine version. Skipping") % f)
+ except InvalidVersion:
+ # Compat code for 2.x and 3.0 syntax ("except .. as v" doesn't
+ # work in python 2.4!):
+ t, v, b = sys.exc_info ()
+ ly.error (_ ("%s: Invalid version string `%s' \n"
+ "Valid version strings consist of three numbers, "
+ "separated by dots, e.g. `2.8.12'") % (f, v.version) )
- sys.stderr.write ('\n')
main ()