Revert "Revert "Regtests for lilypond-book include files located in subdir.""

This reverts commit d60be8f280a9b64643ff866a3b172d61a219df3a
and restores commit ee70161485a2d2f347db3e29724a943c741ef524.

Regtests for lilypond-book include files located in subdir,
this now also works for in-tree build.

diff --git a/input/regression/lilypond-book/include/example.ly b/input/regression/lilypond-book/include/example.ly
new file mode 100644 (file)
index 0000000..ccb2f8d
--- /dev/null
+++ b/input/regression/lilypond-book/include/example.ly
@@ -0,0 +1,4 @@
+\version "2.14.0"
+\score {
+  \relative c'' { d c b c }
+}

diff --git a/input/regression/lilypond-book/include/myvar.ily b/input/regression/lilypond-book/include/myvar.ily
new file mode 100644 (file)
index 0000000..48c9439
--- /dev/null
+++ b/input/regression/lilypond-book/include/myvar.ily
@@ -0,0 +1 @@
+myVar = { a b c a }

diff --git a/input/regression/lilypond-book/tex-include-file.lytex b/input/regression/lilypond-book/tex-include-file.lytex
index 1045df472972769ddb09fd302c91352451b0ac87..bcad93601b0e8f39325bb93f6f03cb61dfd5a399 100644 (file)
--- a/input/regression/lilypond-book/tex-include-file.lytex
+++ b/input/regression/lilypond-book/tex-include-file.lytex
@@ -1,5 +1,17 @@
 \documentclass{article}
 \begin{document}
 Including a LilyPond file without any options:
+
 \lilypondfile{include2.ly}
+
+From a subdirectory:
+
+\lilypondfile{include/example.ly}
+
+Within a lilypond block:
+
+\begin{lilypond}
+  \include "include/myvar.ily"
+  \relative c'' { \myVar }
+\end{lilypond}
 \end{document}

diff --git a/input/regression/lilypond-book/tex-include-options.lytex b/input/regression/lilypond-book/tex-include-options.lytex
index 99934bf049567a4adb88854b47868e45c813f6d7..251fa087d80ebe334ec150d2cce2011e58da4a7d 100644 (file)
--- a/input/regression/lilypond-book/tex-include-options.lytex
+++ b/input/regression/lilypond-book/tex-include-options.lytex
@@ -1,5 +1,17 @@
 \documentclass{article}
 \begin{document}
 Including a LilyPond file with options (quote and noindent):
+
 \lilypondfile[quote,noindent]{include2.ly}
+
+From a subdirectory:
+
+\lilypondfile[quote,noindent]{include/example.ly}
+
+Within a lilypond block:
+
+\begin{lilypond}[quote,noindent]
+  \include "include/myvar.ily"
+  \relative c'' { \myVar }
+\end{lilypond}
 \end{document}

diff --git a/input/regression/lilypond-book/texinfo-include-file.tely b/input/regression/lilypond-book/texinfo-include-file.tely
new file mode 100644 (file)
index 0000000..610eb23
--- /dev/null
+++ b/input/regression/lilypond-book/texinfo-include-file.tely
@@ -0,0 +1,23 @@
+\input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
+@setfilename texinfo-include-file.info
+@settitle Include lilypond files in texinfo
+
+@node Top
+@top Include lilypond files in texinfo
+
+Lilypond files included in texinfo without any options:
+
+@lilypondfile{include2.ly}
+
+From a subdirectory:
+
+@lilypondfile{include/example.ly}
+
+Within a lilypond block:
+
+@lilypond
+  \include "include/myvar.ily"
+  \relative c'' { \myVar }
+@end lilypond
+
+@bye