Merge remote branch 'origin' into release/unstable

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

diff --git a/Documentation/usage/lilypond-book.itely b/Documentation/usage/lilypond-book.itely
index 2e6dfd113e5d67cf86c683f48996d426984eab8e..2a6ab5039678d0bb320145b91353cb8eec1ee1c6 100644 (file)
--- a/Documentation/usage/lilypond-book.itely
+++ b/Documentation/usage/lilypond-book.itely
@@ -498,7 +498,7 @@ music in HTML files:
 @itemize
 
 @item
-the @code{<lilypond .... />} command, where you can directly enter short lilypond code
+the @code{<lilypond ... />} command, where you can directly enter short lilypond code
 
 @item
 the @code{<lilyond>...</lilypond>} environment, where you can directly enter longer
@@ -801,7 +801,9 @@ as a domain.
 called @file{foo.ly}, it creates a file @file{foo.texidoc} if there
 is a @code{texidoc} field in the @code{\header}.  The @code{texidoc}
 option makes @command{lilypond-book} include such files, adding its
-contents as a documentation block right before the music snippet.
+contents as a documentation block right before the music snippet (but
+outside the @code{example} environment generated by a @code{quote}
+option).
 
 Assuming the file @file{foo.ly} contains
 
@@ -837,13 +839,6 @@ is called with @option{--header=@/texidoc@var{LANG}}, then
 @file{foo.texidoc@var{LANG}} will be included instead of
 @file{foo.texidoc}.
 
-@item lilyquote
-(Only for Texinfo output.)  This option is similar to quote, but only
-the music snippet (and the optional verbatim block implied by
-@code{verbatim} option) is put into a quotation block.  This option is
-useful if you want to @code{quote} the music snippet but not the
-@code{texidoc} documentation block.
-
 @item doctitle
 (Only for Texinfo output.) This option works similarly to
 @code{texidoc} option: if @command{lilypond} is called with the
@@ -979,6 +974,13 @@ them back to the output directory, so in some cases it is necessary to
 invoke further processing commands such as @command{makeinfo} or
 @command{latex} with the same @option{-I @var{dir}} options.
 
+@item -l @var{loglevel}
+@itemx --loglevel=@var{loglevel}
+Set the output verbosity to @var{loglevel}. Possible values are @code{NONE},
+@code{ERROR}, @code{WARNING}, @code{PROGRESS} (default) and @code{DEBUG}. If
+this option is not used, and the environment variable
+@code{LILYPOND_BOOK_LOGLEVEL} is set, its value is used as the loglevel.
+
 @item -o @var{dir}
 @itemx --output=@var{dir}
 Place generated files in directory @var{dir}.  Running
@@ -1006,6 +1008,14 @@ Write lily-XXX files to directory @var{dir}, link into @option{--output}
 directory.  Use this option to save building time for documents in
 different directories which share a lot of identical snippets.
 
+@itemx --lily-loglevel=@var{loglevel}
+Set the output verbosity of the invoked @command{lilypond} calls to @var{loglevel}.
+Possible values are @code{NONE}, @code{ERROR}, @code{WARNING}, @code{BASIC_PROGRESS},
+@code{PROGRESS}, @code{INFO} (default) and @code{DEBUG}. If
+this option is not used, and the environment variable
+@code{LILYPOND_LOGLEVEL} is set, its value is used as the loglevel.
+
+
 @itemx --info-images-dir=@var{dir}
 Format Texinfo output so that Info will look for images of music in
 @var{dir}.
@@ -1046,13 +1056,15 @@ and only if directories implied by @option{--output-dir} and
 
 @item -V
 @itemx --verbose
-Be verbose.
+Be verbose. This is equivalent to @code{--loglevel=DEBUG}.
 
 @item -v
 @itemx --version
 Print version information.
 @end table
 
+
+
 @knownissues
 
 The Texinfo command @code{@@pagesizes} is not interpreted.  Similarly,