Add '-dcrop' option to ps and svg backends

[lilypond.git] / scripts / convert-ly.py

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index ede9d4a98b81ea7309288364603c2a767cdca00a..d473ec26f5f416ab7fb5472ffb878d7f8168455a 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -5,7 +5,7 @@
 
 # This file is part of LilyPond, the GNU music typesetter.
 #
-# Copyright (C) 1998--2012  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2015  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # LilyPond is free software: you can redistribute it and/or modify
@@ -76,7 +76,7 @@ def warranty ():
 
 %s
 %s
-''' % ( _ ('Copyright (c) %s by') % '2001--2012',
+''' % ( _ ('Copyright (c) %s by') % '2001--2015',
         ' '.join (authors),
         _ ('Distributed under terms of the GNU General Public License.'),
         _ ('It comes with NO WARRANTY.')))
@@ -262,15 +262,13 @@ def do_one_file (infile_name):
     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 (input)
-        if not guess:
-            raise UnknownVersion ()
-        from_version = str_to_tuple (guess)
+    org_version = None
+    guess = guess_lilypond_version (input)
+    org_version = guess and str_to_tuple (guess)
+    from_version = global_options.from_version or org_version
+    if not from_version:
+        raise UnknownVersion ()
 
     if global_options.to_version:
         to_version = global_options.to_version
@@ -293,7 +291,7 @@ def do_one_file (infile_name):
             # the same if two conversion rules cancelled out
             if result == input:
                 # make no (actual) change to the version number
-                last = from_version
+                last = org_version or from_version
             else:
                 last = last_change
                 # If the last update was to an unstable version