Remove oldaddlyrics; contributed by Ian Hulin

(cherry picked from commit 31e02ac7f5961d2044509e9cdd2c159ca271c455)

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 69b08f0705f5af9cae95a3e46d6dd6f1839ebc31..daf0990cbc07b2080827e0b4249f94e1c030c23e 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -354,20 +354,10 @@ musicMap =
             (music-map proc mus))
 
 
-
-oldaddlyrics =
-#(define-music-function (parser location music lyrics) (ly:music? ly:music?)
-
-              (make-music 'OldLyricCombineMusic 
-                          'origin location
-                          'elements (list music lyrics)))
-
-
 overrideProperty =
 #(define-music-function (parser location name property value)
    (string? symbol? scheme?)
 
-
    (_i "Set @var{property} to @var{value} in all grobs named @var{name}.
 The @var{name} argument is a string of the form @code{\"Context.GrobName\"}
 or @code{\"GrobName\"}")

diff --git a/python/convertrules.py b/python/convertrules.py
index 737345538670cfb6680f7ef13edebfda5193c715..0dc024871924b8f1855a80dcb05ed83c7c49d6aa 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2870,6 +2870,17 @@ chord-shape call.\n"))
         raise FatalConversionError ()
     return str
 
+@rule ((2,12,3),
+    _ ("Remove oldaddlyrics")
+def conv(str):
+    if re.search(r'\\oldaddlyrics', str):
+        stderr_write ("\n")
+        stderr_write (NOT_SMART % _("oldaddlyrics is no longer supported. \n \
+        Use addlyrics or lyrsicsto instead.\n"))
+        stderr_write (UPDATE_MANUALLY)
+        raise FatalConversionError ()
+    return str
+
 # Guidelines to write rules (please keep this at the end of this file)
 #
 # - keep at most one rule per version; if several conversions should be done,