* Documentation/user/tutorial.itely (Integrating text and music):

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

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 3d458eb7f18ff18bad0c6686d6d82e4602bc312c..d522231ee8764dafce75286357d69be3fcf59268 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -78,7 +78,7 @@ show two simple examples here.  First a complete block:
 @noindent
 produces
 
 @noindent
 produces
 

-@lilypond
+@lilypond[fragment]

   c' d' e' f' g'2 g'
 @end lilypond
 
   c' d' e' f' g'2 g'
 @end lilypond
 


@@ -91,7 +91,7 @@ Then the short version:
 @noindent
 produces
 
 @noindent
 produces
 

-@lilypond[staffsize=11]{ <c' e' g'> }
+@lilypond[fragment,staffsize=11]{ <c' e' g'> }

 
 When producing texinfo, lilypond-book also generates bitmaps of the
 music, so you can make a HTML document with embedded music.
 
 When producing texinfo, lilypond-book also generates bitmaps of the
 music, so you can make a HTML document with embedded music.


@@ -135,7 +135,7 @@ We show some examples here:
 @noindent
 produces
 
 @noindent
 produces
 

-@lilypond[staffsize=26]
+@lilypond[fragment,staffsize=26]

   c' d' e' f' g'2 g'2
 @end lilypond
 
   c' d' e' f' g'2 g'2
 @end lilypond
 


@@ -148,7 +148,7 @@ Then the short version:
 @noindent
 produces
 
 @noindent
 produces
 

-@lilypond[staffsize=11]{<c' e' g'>}
+@lilypond[fragment,staffsize=11]{<c' e' g'>}

 
 The linewidth of the music will be adjust by examining the commands in
 the document preamble, the part of the document before
 
 The linewidth of the music will be adjust by examining the commands in
 the document preamble, the part of the document before


@@ -180,7 +180,7 @@ For printing the LaTeX document, you will need to use dvips. For
 producing PostScript with scalable fonts, add the following options to
 the dvips command line:
 @example
 producing PostScript with scalable fonts, add the following options to
 the dvips command line:
 @example

- -Ppdf -u +lilypond.map
+ -Ppdf -u+lilypond.map -u+ec-mftrace.map

 @end example 
 
 @noindent
 @end example 
 
 @noindent


@@ -224,7 +224,7 @@ music fragments:
 </lilypond>
 @end example
 
 </lilypond>
 @end example
 

-@lilypond[relative=2]
+@lilypond[fragment,relative=2]

   \key c \minor r8 c16 b c8 g as c16 b c8 d | g,4
 @end lilypond
 
   \key c \minor r8 c16 b c8 g as c16 b c8 d | g,4
 @end lilypond
 


@@ -319,7 +319,7 @@ documents are composed from small @file{.ly} files in this way:
   \header @{
     texidoc = "this file demonstrates a single note"
   @}
   \header @{
     texidoc = "this file demonstrates a single note"
   @}

-  \score @{ \notes @{ c'4 @} @} 
+  @{ c'4 @}

 @end example
 
 @item relative, relative=@var{N}
 @end example
 
 @item relative, relative=@var{N}


@@ -379,7 +379,7 @@ Place generated files in @var{dir}.
 
 @item @option{-P @var{process}}, @option{--process=@var{COMMAND}}
 Process lilypond snippets using @var{command}.  The default command is
 
 @item @option{-P @var{process}}, @option{--process=@var{COMMAND}}
 Process lilypond snippets using @var{command}.  The default command is

-@var{lilypond-bin}.
+@code{lilypond}.

 
 @item @option{--verbose}
 Be verbose.
 
 @item @option{--verbose}
 Be verbose.