lilypond-book.itely: commit a fix for issue 1221

[lilypond.git] / Documentation / usage / lilypond-book.itely

diff --git a/Documentation/usage/lilypond-book.itely b/Documentation/usage/lilypond-book.itely
index cf8517ec900c6b7eaed30d341fe31f88fceeabd0..ed386b77682a704a2125dcfd4526c759eed96097 100644 (file)
--- a/Documentation/usage/lilypond-book.itely
+++ b/Documentation/usage/lilypond-book.itely
@@ -84,13 +84,13 @@ For example,
 
 \begin{lilypond}
 \relative c' {
 
 \begin{lilypond}
 \relative c' {

-  c2 g'2 \times 2/3 { f8 e d } c'2 g4
+  c2 e2 \times 2/3 { f8 a b } a2 e4

 }
 \end{lilypond}
 
 Options are put in brackets.
 
 }
 \end{lilypond}
 
 Options are put in brackets.
 

-\begin[fragment,quote,staffsize=26,verbatim]{lilypond}
+\begin{lilypond}[fragment,quote,staffsize=26,verbatim]

   c'4 f16
 \end{lilypond}
 
   c'4 f16
 \end{lilypond}
 


@@ -143,7 +143,7 @@ For example,
 
 @lilypond
 \relative c' {
 
 @lilypond
 \relative c' {

-  c2 g'2 \times 2/3 { f8 e d } c'2 g4
+  c2 e2 \times 2/3 { f8 a b } a2 e4

 }
 @end lilypond
 
 }
 @end lilypond
 


@@ -188,7 +188,7 @@ to use @LaTeX{}.
 Music is entered using
 
 @example
 Music is entered using
 
 @example

-\begin[options,go,here]@{lilypond@}
+\begin@{lilypond@}[options,go,here]

   YOUR LILYPOND CODE
 \end@{lilypond@}
 @end example
   YOUR LILYPOND CODE
 \end@{lilypond@}
 @end example


@@ -215,7 +215,7 @@ processed with @LaTeX{}.
 We show some examples here.  The @code{lilypond} environment
 
 @example
 We show some examples here.  The @code{lilypond} environment
 
 @example

-\begin[quote,fragment,staffsize=26]@{lilypond@}
+\begin@{lilypond@}[quote,fragment,staffsize=26]

   c' d' e' f' g'2 g'2
 \end@{lilypond@}
 @end example
   c' d' e' f' g'2 g'2
 \end@{lilypond@}
 @end example


@@ -315,7 +315,7 @@ is trivial.
 @example
 \def\betweenLilyPondSystem#1@{\endinput@}
 
 @example
 \def\betweenLilyPondSystem#1@{\endinput@}
 

-\begin[fragment]@{lilypond@}
+\begin@{lilypond@}[fragment]

   c'1\( e'( c'~ \break c' d) e f\)
 \end@{lilypond@}
 @end example
   c'1\( e'( c'~ \break c' d) e f\)
 \end@{lilypond@}
 @end example


@@ -326,7 +326,7 @@ the number of systems you want in the output.
 
 @example
 \def\betweenLilyPondSystem#1@{
 
 @example
 \def\betweenLilyPondSystem#1@{

-    \ifnum##1<2\else\expandafter\endinput\fi
+    \ifnum#1<2\else\expandafter\endinput\fi

 @}
 @end example
 
 @}
 @end example
 


@@ -488,7 +488,7 @@ of lilypond.
 
 For inserting LilyPond snippets it is good to keep the conformity of our
 DocBook document, thus allowing us to use DocBook editors, validation
 
 For inserting LilyPond snippets it is good to keep the conformity of our
 DocBook document, thus allowing us to use DocBook editors, validation

-etc. So we don't use custom tags, only specify a convention based on the
+etc.  So we don't use custom tags, only specify a convention based on the

 standard DocBook elements.
 
 @subheading Common conventions
 standard DocBook elements.
 
 @subheading Common conventions


@@ -618,7 +618,7 @@ Since this is the default, @code{nofragment} is redundant normally.
 
 @item indent=@var{size}\@var{unit}
 Set indentation of the first music system to @var{size}, using
 
 @item indent=@var{size}\@var{unit}
 Set indentation of the first music system to @var{size}, using

-@var{unit} as units. @var{unit} is one of the following strings:
+@var{unit} as units.  @var{unit} is one of the following strings:

 @code{cm}, @code{mm}, @code{in}, or @code{pt}.  This option affects
 LilyPond, not the text layout.
 
 @code{cm}, @code{mm}, @code{in}, or @code{pt}.  This option affects
 LilyPond, not the text layout.
 


@@ -847,7 +847,7 @@ See the documentation of Texinfo for further details.
 Specify the document type to process: @code{html}, @code{latex},
 @code{texi} (the default) or @code{docbook}.  If this option is missing,
 @command{lilypond-book} tries to detect the format automatically, see
 Specify the document type to process: @code{html}, @code{latex},
 @code{texi} (the default) or @code{docbook}.  If this option is missing,
 @command{lilypond-book} tries to detect the format automatically, see

-@ref{Filename extensions}. Currently, @code{texi} is the same as
+@ref{Filename extensions}.  Currently, @code{texi} is the same as

 @code{texi-html}.
 
 @c This complicated detail is not implemented, comment it out -jm
 @code{texi-html}.
 
 @c This complicated detail is not implemented, comment it out -jm


@@ -915,7 +915,7 @@ useful if your document is processed with @command{xelatex}, for
 example.
 
 @itemx --left-padding=@var{amount}
 example.
 
 @itemx --left-padding=@var{amount}

-Pad EPS boxes by this much. @var{amount} is measured in millimeters,
+Pad EPS boxes by this much.  @var{amount} is measured in millimeters,

 and is 3.0 by default.  This option should be used if the lines of
 music stick out of the right margin.
 
 and is 3.0 by default.  This option should be used if the lines of
 music stick out of the right margin.
 


@@ -971,6 +971,7 @@ selects the output format based on the input filename's extension.
 @item @strong{extension} @tab @strong{output format}
 @item
 @item @file{.html} @tab HTML
 @item @strong{extension} @tab @strong{output format}
 @item
 @item @file{.html} @tab HTML

+@item @file{.htmly} @tab HTML

 @item @file{.itely} @tab Texinfo
 @item @file{.latex} @tab @LaTeX{}
 @item @file{.lytex} @tab @LaTeX{}
 @item @file{.itely} @tab Texinfo
 @item @file{.latex} @tab @LaTeX{}
 @item @file{.lytex} @tab @LaTeX{}


@@ -1017,7 +1018,7 @@ Normal LaTeX text.
 
 More LaTeX text, and options in square brackets.
 
 
 More LaTeX text, and options in square brackets.
 

-\begin[fragment,relative=2,quote,staffsize=26,verbatim]@{lilypond@}
+\begin@{lilypond@}[fragment,relative=2,quote,staffsize=26,verbatim]

 d4 c b a
 \end@{lilypond@}
 \end@{document@}
 d4 c b a
 \end@{lilypond@}
 \end@{document@}


@@ -1126,7 +1127,7 @@ and so on.
 
 The fonts of snippets set with LilyPond will have to be set from
 inside
 
 The fonts of snippets set with LilyPond will have to be set from
 inside

-of the snippet. For this you should read the AU on how to use
+of the snippet.  For this you should read the AU on how to use

 lilypond-book.
 
 \selectlanguage{ngerman}
 lilypond-book.
 
 \selectlanguage{ngerman}