From 556368a6e899d753aea358df2e7847a0727b21c9 Mon Sep 17 00:00:00 2001
From: Valentin Villenave <address@hidden>
Date: Sun, 4 Dec 2011 15:38:52 +0100
Subject: [PATCH] Add regtests for Scheme strings inclusion/evaluation.

This commit expands include-string.ly and adds another
test for eval-string. Include-string.ly has been
renamed scheme-include-string, for consistency's sake.
---
 input/regression/include-string.ly        |    8 --------
 input/regression/scheme-eval-string.ly    |   22 ++++++++++++++++++++++
 input/regression/scheme-include-string.ly |   14 ++++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)
 delete mode 100644 input/regression/include-string.ly
 create mode 100644 input/regression/scheme-eval-string.ly
 create mode 100644 input/regression/scheme-include-string.ly

diff --git a/input/regression/include-string.ly b/input/regression/include-string.ly
deleted file mode 100644
index 5c88e94..0000000
--- a/input/regression/include-string.ly
+++ /dev/null
@@ -1,8 +0,0 @@
-\version "2.14.0"
-
-\header {
-  texidoc = "@code{ly:parser-include-string} should include the current
-string like a file @code{\\include}."
-}
-
-#(ly:parser-include-string parser "\\relative c' { a4 b c d }")
diff --git a/input/regression/scheme-eval-string.ly b/input/regression/scheme-eval-string.ly
new file mode 100644
index 0000000..73cf621
--- /dev/null
+++ b/input/regression/scheme-eval-string.ly
@@ -0,0 +1,22 @@
+\version "2.15.21"
+
+\header {
+  texidoc = "Arbitrary strings may be evaluated in a Scheme expression.
+However, in most cases it is recommended to use
address@hidden:parser-include-string} instead.
+"
+}
+
+var = \relative c' { c1_"you shouldn't be seeing this" }
+
+defineVar =
+#(define-music-function (parser location name) (string?)
+  (eval-string (format #f
+      "(define-public ~a
+      #{ \\relative c' { a4 b c d } #} )"
+      name))
+  (make-music 'Music 'void #t ))
+
+\defineVar "var"
+
+\new Staff \var
diff --git a/input/regression/scheme-include-string.ly b/input/regression/scheme-include-string.ly
new file mode 100644
index 0000000..9e21471
--- /dev/null
+++ b/input/regression/scheme-include-string.ly
@@ -0,0 +1,14 @@
+\version "2.15.21"
+
+\header {
+  texidoc = "@code{ly:parser-include-string} should include the current
+string like a file @code{\\include}, thus allowing for toplevel
+expressions.
+"
+}
+
+var = \relative c' { c1_"you shouldn't be seeing this" }
+
+#(ly:parser-include-string parser "var = \\relative c' { a4 b c d }")
+
+\new Staff \var
-- 
1.7.7.4