Merge branch 'master' into lilypond/translation

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

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index a1f126f29093265e5d3d3a74225b699e423ddd3b..930c11da107db7bb24345a13216beaf6dc9c5fce 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--2010  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2011  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # LilyPond is free software: you can redistribute it and/or modify
@@ -78,7 +78,7 @@ def warranty ():
 
 %s
 %s
-''' % ( _ ('Copyright (c) %s by') % '2001--2010',
+''' % ( _ ('Copyright (c) %s by') % '2001--2011',
         ' '.join (authors),
         _ ('Distributed under terms of the GNU General Public License.'),
         _ ('It comes with NO WARRANTY.')))
@@ -118,6 +118,12 @@ def get_option_parser ():
               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: -f 0, -t %s]") % program_version,
@@ -176,9 +182,11 @@ string."""
     conv_list = get_conversions (from_version, to_version)
 
     error_file_write (_ ("Applying conversion: "))
-        
+
     last_conversion = ()
     try:
+        if not conv_list:
+            last_conversion = to_version
         for x in conv_list:
             error_file_write (tup_to_str (x[0]))
             if x != conv_list[-1]:
@@ -250,6 +258,18 @@ def do_one_file (infile_name):
         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,
@@ -257,7 +277,7 @@ def do_one_file (infile_name):
         elif not global_options.skip_version_add:
             result = newversion + '\n' + result
             
-        error_file_write ('\n')            
+        error_file_write ('\n')
     
         if global_options.edit:
             try: