Fixed example.

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

diff --git a/Documentation/user/putting.itely b/Documentation/user/putting.itely
index c95dff598d2f361a9172bec421000508052560f3..8e87ef6464867945c590dbacd160ac17d06b1dca 100644 (file)
--- a/Documentation/user/putting.itely
+++ b/Documentation/user/putting.itely
@@ -47,7 +47,7 @@ it quicker.  How often is ``every so often''?  It depends on the complexity
 of the music.  For very simple music, perhaps just once or twice.  For
 very complex music, every bar.
 
-@item One bar per line.  If there is anything complicated, either in the music
+@item One bar per line of text.  If there is anything complicated, either in the music
 itself or in the output you desire, it's often good to write only one bar
 per line.  Saving screen space by cramming eight bars per line just isn't
 worth it if you have to `debug' your files.
@@ -65,12 +65,13 @@ in the number of @code{@{} and @code{@}}.
 @end itemize
 
 If you are entering music from an existing score (ie typesetting a
-piece of public domain music),
+piece of existing sheet music),
 
 @itemize @bullet
 
-@item Enter one manuscript (the physical copy) line at a time, and
-check each line when you finish it.  You may use the
+@item Enter one manuscript (the physical copy) system at a time (but still
+only one bar per line of text), and
+check each system when you finish it.  You may use the
 @code{showLastLength} command to speed up processing -- see
 @ref{Skipping corrected music}.
 
@@ -113,11 +114,11 @@ text = \lyricmode @{
 
 \score@{
   <<
-    \context Voice = one @{
+    \new Voice = "one" @{
       \autoBeamOff
       \melody
     @}
-    \lyricsto "one" \new Lyrics \text
+    \new Lyrics \lyricsto "one" \text
   >>
   \layout @{ @}
   \midi @{ \tempo 4=60 @}
@@ -186,11 +187,11 @@ celloMusic = \relative c @{
 
 \score@{
   <<
-    \context Voice = one @{
+    \new Voice = "one" @{
       \autoBeamOff
       \sopranoMusic
     @}
-    \lyricsto "one" \new Lyrics \sopranoLyrics
+    \new Lyrics \lyricsto "one" \sopranoLyrics
   >>
   \layout @{ @}
   \midi @{ \tempo 4=60 @}
@@ -213,16 +214,16 @@ more than one thing (in this case staff) happening at once.  The
 
 @example
 \score@{
-<<
   <<
-    \context Voice = one @{
-      \autoBeamOff
-      \sopranoMusic
-    @}
-    \lyricsto "one" \new Lyrics \sopranoLyrics
+    <<
+      \new Voice = "one" @{
+        \autoBeamOff
+        \sopranoMusic
+      @}
+      \new Lyrics \lyricsto "one" \sopranoLyrics
+    >>
+    \new Staff \celloMusic
   >>
-  \new Staff \celloMusic
->>
   \layout @{ @}
   \midi @{ \tempo 4=60 @}
 @}
@@ -256,14 +257,14 @@ celloMusic = \relative c {
 
 \score{
   <<
-  <<
-    \context Voice = one {
-      \autoBeamOff
-      \sopranoMusic
-    }
-    \lyricsto "one" \new Lyrics \sopranoLyrics
-  >>
-  \new Staff \celloMusic
+    <<
+      \new Voice = "one" {
+        \autoBeamOff
+        \sopranoMusic
+      }
+      \new Lyrics \lyricsto "one" \sopranoLyrics
+    >>
+    \new Staff \celloMusic
   >>
   \layout { }
   \midi { \tempo 4=60 }
@@ -493,9 +494,9 @@ though.
 \score @{
   @{
     <<
-      \context Staff = singer <<
+      \new Staff = "singer" <<
       >>
-      \context PianoStaff = piano <<
+      \new PianoStaff = piano <<
       >>
     >>
   @}
@@ -511,13 +512,13 @@ the vocal part and piano part at the same time!
 \score @{
   @{
     <<
-      \context Staff = singer <<
-        \context Voice = vocal @{ @}
+      \new Staff = "singer" <<
+        \new Voice = "vocal" @{ @}
       >>
       \new Lyrics \lyricsto vocal \new Lyrics @{ @}
-      \context PianoStaff = piano <<
-        \context Staff = upper @{ @}
-        \context Staff = lower @{ @}
+      \new PianoStaff = "piano" <<
+        \new Staff = "upper" @{ @}
+        \new Staff = "lower" @{ @}
       >>
     >>
   @}
@@ -534,7 +535,7 @@ it contains an upper staff (right hand) and a lower
 staff (left hand).
 
 At this stage, we could start filling in notes.  Inside
-the curly braces next to @code{\context Voice = vocal},
+the curly braces next to @code{\new Voice = vocal},
 we could start writing
 
 @example
@@ -556,13 +557,13 @@ lower = @{ @}
 \score @{
   @{
     <<
-      \context Staff = singer <<
-        \context Voice = vocal @{ \melody @}
+      \new Staff = "singer" <<
+        \new Voice = "vocal" @{ \melody @}
       >>
       \new Lyrics \lyricsto vocal \new Lyrics @{ \text @}
-      \context PianoStaff = piano <<
-        \context Staff = upper @{ \upper @}
-        \context Staff = lower @{ \lower @}
+      \new PianoStaff = "piano" <<
+        \new Staff = "upper" @{ \upper @}
+        \new Staff = "lower" @{ \lower @}
       >>
     >>
   @}