From: Graham Percival Date: Sun, 4 Oct 2009 12:09:43 +0000 (+0100) Subject: Doc: move input/tutorial/ to Documentation/included/ X-Git-Tag: release/2.13.6-1~59 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=589cd505f81fd939a6def814ef3af70f005a23f7;p=lilypond.git Doc: move input/tutorial/ to Documentation/included/ --- diff --git a/Documentation/included/lbook-html-test.html b/Documentation/included/lbook-html-test.html new file mode 100644 index 0000000000..0a64062447 --- /dev/null +++ b/Documentation/included/lbook-html-test.html @@ -0,0 +1,34 @@ + + + + +

+Documents for lilypond-book may freely mix music and text. For +example, + +\relative { + c2^"test" g'2 \times 2/3 { f8 e d } c'2 g4 +} + + + + c'4 f16 + + +

+ +

+ +This page is for LilyPond-2.9.3 (development-branch).
+ +

+Report errors to http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs.
+

+
+ +

+ Other languages: English. +
+ Using automatic language selection. +

+ diff --git a/Documentation/included/lbook-latex-test.tex b/Documentation/included/lbook-latex-test.tex new file mode 100644 index 0000000000..badee25b83 --- /dev/null +++ b/Documentation/included/lbook-latex-test.tex @@ -0,0 +1,48 @@ +\documentclass[a4paper]{article} + +\begin{document} + +Documents for lilypond-book may freely mix music and text. For +example, + +\begin{lilypond} +\relative { + c2^"test" g'2 \times 2/3 { f8 e d } c'2 g4 +} +\end{lilypond} + +Options are put in brackets. + +\begin[fragment,quote,staffsize=26,verbatim]{lilypond} + c'4 f16 +\end{lilypond} + +Larger examples can be put in a separate file, and introduced with +\verb+\lilypondfile+. + +%\lilypondfile[quote,noindent]{screech-boink.ly} + + + +The line length of a \LaTeX{} document matches the length of music +fragment: bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla +bla bla bla bla bla bla + +\begin{lilypond} +{ +c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' +c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' +c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' +c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' +c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' +c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' +c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' +c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' +} +\end{lilypond} + + +\end{document} diff --git a/Documentation/included/lbook-texi-test.texi b/Documentation/included/lbook-texi-test.texi new file mode 100644 index 0000000000..69209999c2 --- /dev/null +++ b/Documentation/included/lbook-texi-test.texi @@ -0,0 +1,34 @@ +\input texinfo @c -*-texinfo-*- +@setfilename lilbook.info +@settitle lilypond-book test +@node Top, , , +@top + +@chapter lilypond-book test + +@section Introduction + +Blah blah blah Blah blah blah Blah blah blah Blah blah blah Blah blah +blah + +Fragment: + + +@lilypond +\relative { + c2 g'2^"test" \times 2/3 { f8 e d } c'2 g4 +} +@end lilypond + + +Bla bla blah + +This is a multipage / multipicture fragment: + +@lilypond +\book { + \score { { c1 \break \pageBreak c1 } } +} +@end lilypond + +@bye diff --git a/input/GNUmakefile b/input/GNUmakefile index aaa3954761..9b068a9f3a 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SUBDIRS = regression tutorial mutopia +SUBDIRS = regression mutopia examples = typography-demo les-nereides wilhelmus proportional bach-schenker cary diff --git a/input/tutorial/GNUmakefile b/input/tutorial/GNUmakefile deleted file mode 100644 index 0213aefb4f..0000000000 --- a/input/tutorial/GNUmakefile +++ /dev/null @@ -1,9 +0,0 @@ -depth = ../.. - -LOCALSTEPMAKE_TEMPLATES=ly mutopia - -EXTRA_DIST_FILES= lbook-texi-test.texi lbook-latex-test.tex lbook-html-test.html - -include $(depth)/make/stepmake.make - - diff --git a/input/tutorial/lbook-html-test.html b/input/tutorial/lbook-html-test.html deleted file mode 100644 index 0a64062447..0000000000 --- a/input/tutorial/lbook-html-test.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - -

-Documents for lilypond-book may freely mix music and text. For -example, - -\relative { - c2^"test" g'2 \times 2/3 { f8 e d } c'2 g4 -} - - - - c'4 f16 - - -

- -

- -This page is for LilyPond-2.9.3 (development-branch).
- -

-Report errors to http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs.
-

-
- -

- Other languages: English. -
- Using automatic language selection. -

- diff --git a/input/tutorial/lbook-latex-test.tex b/input/tutorial/lbook-latex-test.tex deleted file mode 100644 index badee25b83..0000000000 --- a/input/tutorial/lbook-latex-test.tex +++ /dev/null @@ -1,48 +0,0 @@ -\documentclass[a4paper]{article} - -\begin{document} - -Documents for lilypond-book may freely mix music and text. For -example, - -\begin{lilypond} -\relative { - c2^"test" g'2 \times 2/3 { f8 e d } c'2 g4 -} -\end{lilypond} - -Options are put in brackets. - -\begin[fragment,quote,staffsize=26,verbatim]{lilypond} - c'4 f16 -\end{lilypond} - -Larger examples can be put in a separate file, and introduced with -\verb+\lilypondfile+. - -%\lilypondfile[quote,noindent]{screech-boink.ly} - - - -The line length of a \LaTeX{} document matches the length of music -fragment: bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla -bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla -bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla -bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla -bla bla bla bla bla bla - -\begin{lilypond} -{ -c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' -c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' -c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' -c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' -c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' -c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' -c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' -c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' c''4 c'' c'' c'' -} -\end{lilypond} - - -\end{document} diff --git a/input/tutorial/lbook-texi-test.texi b/input/tutorial/lbook-texi-test.texi deleted file mode 100644 index 69209999c2..0000000000 --- a/input/tutorial/lbook-texi-test.texi +++ /dev/null @@ -1,34 +0,0 @@ -\input texinfo @c -*-texinfo-*- -@setfilename lilbook.info -@settitle lilypond-book test -@node Top, , , -@top - -@chapter lilypond-book test - -@section Introduction - -Blah blah blah Blah blah blah Blah blah blah Blah blah blah Blah blah -blah - -Fragment: - - -@lilypond -\relative { - c2 g'2^"test" \times 2/3 { f8 e d } c'2 g4 -} -@end lilypond - - -Bla bla blah - -This is a multipage / multipicture fragment: - -@lilypond -\book { - \score { { c1 \break \pageBreak c1 } } -} -@end lilypond - -@bye diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 993d6de0f6..d1c7cd2fea 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -29,7 +29,7 @@ LILYPOND_BOOK = $(script-dir)/lilypond-book.py LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) \ -I $(top-src-dir)/Documentation -I $(top-src-dir)/Documentation/snippets \ -I $(input-dir)/regression/ -I $(top-src-dir)/Documentation/included/ \ - -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/ \ + -I $(top-build-dir)/mf/$(outconfbase)/ \ -I $(top-build-dir)/mf/out/ \ -I $(top-src-dir)/Documentation/pictures \ -I $(top-build-dir)/Documentation/pictures/$(outdir)