Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

[lilypond.git] / Documentation / user / putting.itely

diff --git a/Documentation/user/putting.itely b/Documentation/user/putting.itely
index 003b4373b915a79bf6a8d54ffef711db47975cc5..0cc5ecd908ff926d5c6b9226482325ee3f4d314f 100644 (file)
--- a/Documentation/user/putting.itely
+++ b/Documentation/user/putting.itely
@@ -26,7 +26,7 @@ cello.  In this case, we would start with ``Notes and lyrics'' (for the
 soprano part).
 
 @example
-\version "2.7.39"
+\version "2.9.13"
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -48,14 +48,14 @@ text = \lyricmode @{
     \new Lyrics \lyricsto "one" \text
   >>
   \layout @{ @}
-  \midi @{ \tempo 4=60 @}
+  \midi @{ @}
 @}
 @end example
 
 Now we want to add a cello part.  Let's look at the ``Notes only'' example:
 
 @example
-\version "2.7.39"
+\version "2.9.13"
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -63,11 +63,11 @@ melody = \relative c' @{
 
   a4 b c d
 @}
-     
+
 \score @{
 \new Staff \melody
 \layout @{ @}
-\midi @{ \tempo 4=60 @}
+\midi @{ @}
 @}
 @end example
 
@@ -78,9 +78,9 @@ as a duet.  Within the @code{\score} section, we don't need two
 @code{\layout} or @code{\midi}.
 
 If we simply cut and paste the @code{melody} section, we would end up with
-two @code{melody} sections.  So let's rename them.  We'll call the one
-for the soprano @code{sopranoMusic}, and the one for the cello can be
-called @code{celloMusic}.  While we're doing this, let's rename @code{text}
+two @code{melody} sections.  So let's rename them.  We'll call the section
+for the soprano @code{sopranoMusic} and the section for the cello
+@code{celloMusic}.  While we're doing this, let's rename @code{text}
 to be @code{sopranoLyrics}.  Remember to rename both instances of all
 these names -- both the initial definition (the
 @code{melody = relative c' @{ } part) and the name's use (in the
@@ -91,7 +91,7 @@ normally use bass clef.  We'll also give the cello some different
 notes.
 
 @example
-\version "2.7.39"
+\version "2.9.13"
 sopranoMusic = \relative c' @{
   \clef treble
   \key c \major
@@ -121,7 +121,7 @@ celloMusic = \relative c @{
     \new Lyrics \lyricsto "one" \sopranoLyrics
   >>
   \layout @{ @}
-  \midi @{ \tempo 4=60 @}
+  \midi @{ @}
 @}
 @end example
 
@@ -136,7 +136,7 @@ want the cello part to appear under the soprano part, we need to add
 @noindent
 underneath the soprano stuff.  We also need to add @code{<<} and
 @code{>>} around the music -- that tells LilyPond that there's
-more than one thing (in this case staff) happening at once.  The
+more than one thing (in this case, @code{Staff}) happening at once.  The
 @code{\score} looks like this now
 
 @example
@@ -152,7 +152,7 @@ more than one thing (in this case staff) happening at once.  The
     \new Staff \celloMusic
   >>
   \layout @{ @}
-  \midi @{ \tempo 4=60 @}
+  \midi @{ @}
 @}
 @end example
 
@@ -161,7 +161,7 @@ This looks a bit messy; the indentation is messed up now.  That is
 easily fixed.  Here's the complete soprano and cello template.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.7.39"
+\version "2.9.13"
 sopranoMusic = \relative c' {
   \clef treble
   \key c \major
@@ -194,7 +194,7 @@ celloMusic = \relative c {
     \new Staff \celloMusic
   >>
   \layout { }
-  \midi { \tempo 4=60 }
+  \midi { }
 }
 @end lilypond
 
@@ -272,7 +272,6 @@ The @code{\score} can contain other things, such as
 \score @{
   @{ c'4 a b c' @}
   \layout @{ @}
-  \paper @{ @}
   \midi @{ @}
   \header @{ @}
 @}
@@ -324,9 +323,9 @@ We didn't skip over it at all.  The big mystery is simply
 that there @emph{is} no mystery.  This line explains it
 all:
 
-@example
-A @code{\score} must begin with a single music expression.
-@end example
+@quotation
+@emph{A @code{\score} must begin with a single music expression.}
+@end quotation
 
 @noindent
 You may find it useful to review