* buildscripts/ontgaar.py: get_music () -> get_pending_events ().

diff --git a/ChangeLog b/ChangeLog
index a5fac6b43e765a60b93809d58f0ec9e7840fff5e..094116f544c99e56bae10ff24bcdea356c81a6e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-07-25  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * buildscripts/ontgaar.py: get_music () -> get_pending_events ().
+       
        * buildscripts/ontgaar.py: New file.
 
        * scm/grob-property-description.scm (conditional-elements): Add

diff --git a/buildscripts/ontgaar.py b/buildscripts/ontgaar.py
index 7b55943c59a25e4a91134947d4d95fcb28c5f926..e2e2c64df4ca29f8b5536253bc0100e07a28d3b5 100644 (file)
--- a/buildscripts/ontgaar.py
+++ b/buildscripts/ontgaar.py
@@ -97,11 +97,7 @@ for f in files:
        s = re.sub (r'to_c(\W)', r'to_cX\1', s)
        s = re.sub (r'P_C', r'P_XC', s)
 
-       # Hmm, music-iterators already have
-       # SCM get_music () and Music*music_l ()
-       # Let's keep any get_X names as they are
-       s = re.sub (r'(\W)get_music(\W)', r'\1Xget_music\2', s)
-       s = re.sub (r'(\W)get_lyrics(\W)', r'\1Xget_lyrics\2', s)
+       s = re.sub (r'(\W)get_music(\W)', r'\1Yget_pending_events\2', s)
 
        s = re.sub (r'2_i(\W)', r'2int\1', s)
        s = re.sub (r'2_u(\W)', r'2unsigned\1', s)
@@ -172,9 +168,7 @@ for f in files:
        s = re.sub (r'Yget_hex', 'hex', s)
        s = re.sub (r'Yget_index', 'index', s)
        s = re.sub (r'Yget_length', 'length', s)
-       s = re.sub (r'Yget_music', 'the_music', s)
        s = re.sub (r'Yget_remove', 'remove', s)
-       s = re.sub (r'Yget_lyrics', 'the_lyrics', s)
        s = re.sub (r'Yget_report', 'report', s)
        s = re.sub (r'Yget_size', 'size', s)
        s = re.sub (r'Yget_get', 'get', s)