From 7b76aa0ec445a5c97f3e41101ba7a434abf3ab0f Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sun, 24 Jan 2010 15:23:06 +0000 Subject: [PATCH] Build: move unused templates into Usage. --- Documentation/included/lbook-html-test.html | 34 -------------- Documentation/included/lbook-latex-test.tex | 48 ------------------- Documentation/included/lbook-texi-test.texi | 34 -------------- Documentation/usage/lilypond-book.itely | 51 +++++++++++++++++---- 4 files changed, 42 insertions(+), 125 deletions(-) delete mode 100644 Documentation/included/lbook-html-test.html delete mode 100644 Documentation/included/lbook-latex-test.tex delete mode 100644 Documentation/included/lbook-texi-test.texi diff --git a/Documentation/included/lbook-html-test.html b/Documentation/included/lbook-html-test.html deleted file mode 100644 index 0a64062447..0000000000 --- a/Documentation/included/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/Documentation/included/lbook-latex-test.tex b/Documentation/included/lbook-latex-test.tex deleted file mode 100644 index badee25b83..0000000000 --- a/Documentation/included/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/Documentation/included/lbook-texi-test.texi b/Documentation/included/lbook-texi-test.texi deleted file mode 100644 index 0978b88fd0..0000000000 --- a/Documentation/included/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/Documentation/usage/lilypond-book.itely b/Documentation/usage/lilypond-book.itely index 0e9135153e..47bb04a540 100644 --- a/Documentation/usage/lilypond-book.itely +++ b/Documentation/usage/lilypond-book.itely @@ -1011,16 +1011,14 @@ Normal LaTeX text. \begin@{lilypond@} \relative c'' @{ -a4 b c d + a4 b c d @} \end@{lilypond@} -More LaTeX text. +More LaTeX text, and options in square brackets. -\begin@{lilypond@} -\relative c'' @{ +\begin[fragment,relative=2,quote,staffsize=26,verbatim]@{lilypond@} d4 c b a -@} \end@{lilypond@} \end@{document@} @end example @@ -1031,16 +1029,19 @@ You can include LilyPond fragments in Texinfo; in fact, this entire manual is written in Texinfo. @example -\input texinfo +\input texinfo @c -*-texinfo-*- @@node Top +@@top Texinfo text -@@lilypond[verbatim,fragment,ragged-right] -a4 b c d +@@lilypond +\relative @{ + a4 b c d +@} @@end lilypond -More Texinfo text +More Texinfo text, and options in brackets. @@lilypond[verbatim,fragment,ragged-right] d4 c b a @@ -1050,6 +1051,38 @@ d4 c b a @end example +@subsection html + +@example + + + + + +

+Documents for lilypond-book may freely mix music and text. For +example, + +\relative c'' @{ + a4 b c d +@} + +

+ +

+Another bit of lilypond, this time with options: + + +a4 b c d + +

+ + + + + +@end example + @subsection xelatex @verbatim -- 2.39.5