* stepmake/aclocal.m4 (STEPMAKE_PANGO_FT2): Define HAVE_PANGO16 too.

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

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index d7472027d5746d2125bfb3becd329053d5b1b631..d5a1871a3523762859303b2dda99507b6a391534 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -552,9 +552,16 @@ ps2pdf yourfile.ps
 
 To produce a Texinfo document (in any output format), follow the normal
 procedures for Texinfo (this is, either call @command{texi2dvi} or
-@command{makeinfo}, depending on the output format you want to create).
+@command{makeinfo}, depending on the output format you want to
+create).
+@ifinfo
 @xref{Format with texi2dvi, , , texinfo, GNU Texinfo}, and @ref{Creating
 an Info File, , , texinfo, GNU Texinfo}.
+@end ifinfo
+@ifnotinfo
+See the documentation of Texinfo for further details.
+@end ifnotinfo
+
 
 @command{lilypond-book} accepts the following command line options:
 
@@ -573,11 +580,12 @@ version, the format @code{texi-html} must be used instead.
 
 @item -F @var{filter}
 @itemx --filter=@var{filter}
-Pipe snippets through @var{filter}.
+Pipe snippets through @var{filter}.  @code{lilypond-book} will
+not --filter and --process at the same time.
 
 Example:
 @example
-lilypond-book --filter='convert-ly --from=2.0.0' my-book.tely
+lilypond-book --filter='convert-ly --from=2.0.0 -' my-book.tely
 @end example
 
 @item -h
@@ -605,7 +613,8 @@ cd out
 @item -P @var{process}
 @itemx --process=@var{command}
 Process LilyPond snippets using @var{command}.  The default command is
-@code{lilypond}.
+@code{lilypond}.  @code{lilypond-book} will not --filter and --process
+at the same time.
 
 @item -V
 @itemx --verbose