Imported Upstream version 2.16.0

[lilypond.git] / ly / festival.ly

diff --git a/ly/festival.ly b/ly/festival.ly
index cbe88d67c847b1acb51cefe7006e3bb349f51fa4..8363525e9aecff1512a2d5b46d9788f0a617e2b3 100644 (file)
--- a/ly/festival.ly
+++ b/ly/festival.ly
@@ -17,19 +17,22 @@
 %%%% 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.14.0"
+\version "2.16.0"
 
 #(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 (parser location 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 (parser location filename tempo music)
+   (string? ly:music? ly:music?)
+   (parameterize ((*syllabify* #t))
+     (output-file music tempo filename))
+   music)