Re: [frogs] Patch for removing oldaddlyrics function

[Ian Hulin <ian@xxxxxxxxxxxx>]

Hi Carl,
Third time lucky . . . Another updated patch attached,

Graham Percival wrote:

On Mon, Feb 02, 2009 at 02:15:15PM +0000, Ian Hulin wrote:
  

-------------------------- ly/music-functions-init.ly --------------------------
index 61a8197..ecd3be0 100644
@@ -1,4 +1,4 @@
-% -*-Scheme-*-
+??????% -*-Scheme-*-
 
 \version "2.12.0"
    

That part doesn't look right.

Cheers,
- Graham

  

Oh Mao!

Cheers,

Ian

Author: Ian Hulin <ian@xxxxxxxxxxxx>  2009-02-03 00:25:26
Committer: Ian Hulin <ian@xxxxxxxxxxxx>  2009-02-03 00:25:26
Parent: 813d15e956789c53b0164da763c6812ded5b1e59 (Frogs Task 1- \mapMusic to \pageBreak, rework after feedback.)
Branch: master
Follows: release/2.12.1-1
Precedes: 

    For V2.12.3 - Remove Obsolete function oldaddlyrics
    update music-functions-init.ly and add warning to convertrules.py.
    
    Signed-off-by: Ian Hulin <ian@xxxxxxxxxxxx>

-------------------------- ly/music-functions-init.ly --------------------------
index 61a8197..82d7114 100644
@@ -1,6 +1,6 @@
-% -*-Scheme-*-
+% -*-Scheme-*-
 
-\version "2.12.0"
+\version "2.12.3"
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20,6 +20,7 @@ addQuote =
    (add-quotable parser name music)
    (make-music 'SequentialMusic 'void #t))
 
+
 afterGraceFraction =
 #(cons 6 8)
 
@@ -345,20 +346,6 @@ entire music expression (@var(mus))."
 )
 	     (music-map proc mus))
 
-%
-% TODO \addlyrics, \lyricmode \lyricsto and other lyrics functions are currently
-% not documented via docstrings here as they are not classed as Identifiers. 
-%
-oldaddlyrics =
-#(define-music-function (parser location music lyrics) (ly:music? ly:music?)
-(_i "Obsolete function @code{oldaddlyrics} @var(lyrics) was used to add a block 
-    of lyrics text to a music expression.
-    Please use @code(addlyrics) @var{lyrics} or 
-    @code{lyricsto} @var(voicename) @var(lyrics) and @code{lyricmode) instead.")
-              (make-music 'OldLyricCombineMusic 
-                          'origin location
-                          'elements (list music lyrics)))
-
 
 overrideProperty =
 #(define-music-function (parser location name property value)

---------------------------- python/convertrules.py ----------------------------
index ad2c0cd..854de40 100644
@@ -2864,6 +2864,17 @@ chord-shape call.\n"))
         raise FatalConversionError ()
     return str
 
+@rule ((2, 12, 3),
+       _ ("Remove support for 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 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,