Re: [frogs] Patch for removing oldaddlyrics function

[Graham Percival <graham@xxxxxxxxxxxxxxxxx>]

This patch still has this problem.  Carl: my suggestion is to
manually fix this patch (just delete the first block) and apply
it.  Ian: after Carl has done this, try a git reset --hard, then
try making a trivial change.

My hope is that you accidentally did something weird in git and/or
the file, and that a git reset will clear things up.  If this
problem persists in your next patch (on a different subject), then
let's revisit this issue.

Cheers,
- Graham

On Fri, Feb 06, 2009 at 01:07:14PM +0000, Ian Hulin wrote:
 
>    Here it is. D'oh!
>    Cheers,
>    Ian

> >From da9296f55f69139d130332ee8e966c50e8aa1604 Mon Sep 17 00:00:00 2001
> From: Ian Hulin <ian@xxxxxxxxxxxx>
> Date: Fri, 6 Feb 2009 12:18:01 +0000
> Subject: [PATCH] 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 |   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"
> +???% -*-Scheme-*-
> +\version "2.12.3"
>  
>  
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
> @@ -20,6 +19,7 @@ addQuote =
>     (add-quotable parser name music)
>     (make-music 'SequentialMusic 'void #t))
>  
> +
>  afterGraceFraction =
>  #(cons 6 8)
>  
> @@ -345,20 +345,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)
> 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
>  
> +@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,
> -- 
> 1.6.1.9.g97c34
> 


---

----
Join the Frogs!