X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Ffestival.ly;h=ad3541ce98fc64d9eaed84059feaa2a97ef1bd22;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=66313e3f99bd44c0824bb51a0a6bbb85a8b98441;hpb=33fee1aae93af367e6d2f0a80bef3e1b38eda9eb;p=lilypond.git

diff --git a/ly/festival.ly b/ly/festival.ly
index 66313e3f99..ad3541ce98 100644
--- a/ly/festival.ly
+++ b/ly/festival.ly
@@ -1,38 +1,38 @@
-% festival.ly --- Festival singing mode output
-%
-% Copyright (C) 2006, 2007 Brailcom, o.p.s.
-%
-% Author: Milan Zamazal <pdm@brailcom.org>
-%
-% COPYRIGHT NOTICE
-%
-% This program is free software; you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
-% (at your option) any later version.
-%
-% This program is distributed in the hope that it will be useful, but
-% WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-% or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-% for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+%%%% Festival singing mode output
+%%%% This file is part of LilyPond, the GNU music typesetter.
+%%%%
+%%%% Copyright (C) 2006, 2007 Brailcom, o.p.s.
+%%%%
+%%%% Author: Milan Zamazal <pdm@brailcom.org>
+%%%% LilyPond is free software: you can redistribute it and/or modify
+%%%% it under the terms of the GNU General Public License as published by
+%%%% the Free Software Foundation, either version 3 of the License, or
+%%%% (at your option) any later version.
+%%%%
+%%%% LilyPond is distributed in the hope that it will be useful,
+%%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%%%% GNU General Public License for more details.
+%%%%
+%%%% You should have received a copy of the GNU General Public License
+%%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.12.0"
+\version "2.19.22"
 
 #(use-modules (scm song))
+#(use-modules (srfi srfi-39))
 
 % \festival #"filename" { \tempo N = X } { music }
 festival =
-#(define-music-function (parser location filename tempo music) (string? ly:music? ly:music?)
-  (output-file music tempo filename)
-  music)
+#(define-music-function (filename tempo music)
+   (string? ly:music? ly:music?)
+   (output-file music tempo filename)
+   music)
 
 % \festivalsyl #"filename" { \tempo N = X } { music }
 festivalsyl =
-#(define-music-function (parser location filename tempo music) (string? ly:music? ly:music?)
-  (set! *syllabify* #t)
-  (output-file music tempo filename)
-  music)
+#(define-music-function (filename tempo music)
+   (string? ly:music? ly:music?)
+   (parameterize ((*syllabify* #t))
+     (output-file music tempo filename))
+   music)