Fixed example.

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

diff --git a/Documentation/user/putting.itely b/Documentation/user/putting.itely
index c0fa477a43b050eaac111e5eb6a4250e5e32d18d..8e87ef6464867945c590dbacd160ac17d06b1dca 100644 (file)
--- a/Documentation/user/putting.itely
+++ b/Documentation/user/putting.itely
@@ -114,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 @}
@@ -187,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 @}
@@ -214,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 @}
 @}
@@ -257,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 }
@@ -494,9 +494,9 @@ though.
 \score @{
   @{
     <<
-      \context Staff = singer <<
+      \new Staff = "singer" <<
       >>
-      \context PianoStaff = piano <<
+      \new PianoStaff = piano <<
       >>
     >>
   @}
@@ -512,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" @{ @}
       >>
     >>
   @}
@@ -535,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
@@ -557,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 @}
       >>
     >>
   @}