[PATCH] For V2.12.3 - Remove Obsolete function oldaddlyrics update music-functions-init.ly and add warning to convertrules.py.

[Ian Hulin <ian@xxxxxxxxxxxx>]

Signed-off-by: Ian Hulin <ian@xxxxxxxxxxxx>
---
 ly/music-functions-init.ly |   20 +++-----------------
 python/convertrules.py     |   11 +++++++++++
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 61a8197..d499190 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -1,6 +1,5 @@
-% -*-Scheme-*-
-
-\version "2.12.0"
+=EF=BB=BF% -*-Scheme-*-
+\version "2.12.3"
=20
=20
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20,6 +19,7 @@ addQuote =3D
    (add-quotable parser name music)
    (make-music 'SequentialMusic 'void #t))
=20
+
 afterGraceFraction =3D
 #(cons 6 8)
=20
@@ -345,20 +345,6 @@ entire music expression (@var(mus))."
 )
 	     (music-map proc mus))
=20
-%
-% TODO \addlyrics, \lyricmode \lyricsto and other lyrics functions are c=
urrently
-% not documented via docstrings here as they are not classed as Identifi=
ers.=20
-%
-oldaddlyrics =3D
-#(define-music-function (parser location music lyrics) (ly:music? ly:mus=
ic?)
-(_i "Obsolete function @code{oldaddlyrics} @var(lyrics) was used to add =
a block=20
-    of lyrics text to a music expression.
-    Please use @code(addlyrics) @var{lyrics} or=20
-    @code{lyricsto} @var(voicename) @var(lyrics) and @code{lyricmode) in=
stead.")
-              (make-music 'OldLyricCombineMusic=20
-                          'origin location
-                          'elements (list music lyrics)))
-
=20
 overrideProperty =3D
 #(define-music-function (parser location name property value)
diff --git a/python/convertrules.py b/python/convertrules.py
index ad2c0cd..854de40 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2864,6 +2864,17 @@ chord-shape call.\n"))
         raise FatalConversionError ()
     return str
=20
+@rule ((2, 12, 3),
+       _ ("Remove support for oldaddlyrics")=20
+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 lyricsto 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,
--=20
1.6.1.9.g97c34


--------------090304090601040008020508--

---

----
Join the Frogs!