* scripts/convert-ly.py (conv): unfoldrepeats -> unfoldRepeats,

compressmusic -> compressMusic.

* ly/music-functions-init.ly (oldaddlyrics): idem.

diff --git a/ChangeLog b/ChangeLog
index f95df7aa2464adfccb49b565c669d37005f0eec0..dbd9be457ca948780bc5ac7db917784ae8476322 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-05-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scripts/convert-ly.py (conv): unfoldrepeats -> unfoldRepeats,
+       compressmusic -> compressMusic.
+
        * ly/music-functions-init.ly (oldaddlyrics): idem.
 
        * lily/parser.yy: NewLyricCombineMusic ->

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index d732b5731e88ddcebda4d93ce86fb51dd5df5aa0..74ebf1f8e507a70ce4905197818c411856b29387 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -40,10 +40,10 @@ breathe = #(def-music-function (parser location) ()
               'elements (list (make-music 'BreathingSignEvent))))
 
 
-unfoldrepeats = #(def-music-function (parser location music) (ly:music?)
+unfoldRepeats = #(def-music-function (parser location music) (ly:music?)
                  (unfold-repeats music))
 
-compressmusic = #(def-music-function
+compressMusic = #(def-music-function
                  (parser location fraction music) (number-pair? ly:music?)
                  (ly:music-compress music (ly:make-moment (car fraction) (cdr fraction))))
 

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 4119d0f8f196b2471bcf46d0bfd4c5d94ce515b8..1338ee7f01898d4b249e91c27779a36c304da458 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2581,7 +2581,17 @@ explicitely; 1/4 is no longer multiplied to cover moments 1/2 and 3/4 too.
 conversions.append (((2, 5, 21),
                     conv,
                     'warn about auto beam settings'))
-                   
+
+def conv (str):
+       str = re.sub (r"unfoldrepeats", 'unfoldRepeats', str)
+       str = re.sub (r"compressmusic", 'compressMusic', str)
+       return str
+
+conversions.append (((2, 5, 25), conv,
+
+                    'unfoldrepeats -> unfoldRepeats,'
+                    + 'compressmusic -> compressMusic'))
+
 ################################
 #      END OF CONVERSIONS
 ################################