X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fexamples.itely;h=9bb3dede2af22e9ff3bc89035c8a1f3962271d54;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=015df0e8c49c772d19af6cc03d75b412705a7d03;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index 015df0e8c4..9bb3dede2a 100644
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -27,7 +27,7 @@ instrument or a melodic fragment.  Cut and paste this into a file,
 add notes, and you're finished!
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.7.39"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -39,7 +39,7 @@ melody = \relative c' {
 \score {
    \new Staff \melody
    \layout { }
-   \midi {}
+   \midi { \tempo 4=60 }
 }
 @end lilypond
 
@@ -52,7 +52,7 @@ automatic beaming, you'll have to change or comment out the relevant
 line.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.7.39"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -74,7 +74,7 @@ text = \lyricmode {
       \new Lyrics \lyricsto "one" \text
    >>
    \layout { }
-   \midi { }
+   \midi { \tempo 4=60 }
 }
 @end lilypond
 
@@ -83,7 +83,7 @@ text = \lyricmode {
 Want to prepare a lead sheet with a melody and chords?  Look no further!
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.7.39"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -107,7 +107,7 @@ harmonies = \chordmode {
    >>
 
    \layout{ }
-   \midi { }
+   \midi { \tempo 4=60}
 }
 @end lilypond
 
@@ -116,7 +116,7 @@ harmonies = \chordmode {
 This template allows you to prepare a song with melody, words, and chords.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.7.39"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -146,7 +146,7 @@ harmonies = \chordmode {
    \new Lyrics \lyricsto "one" \text
    >>
    \layout { }
-   \midi { }
+   \midi { \tempo 4=60 }
 }
 @end lilypond
 
@@ -157,7 +157,7 @@ harmonies = \chordmode {
 Here is a simple piano staff.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.7.39"
 upper = \relative c'' {
    \clef treble
    \key c \major
@@ -176,12 +176,12 @@ lower = \relative c {
 
 \score {
    \new PianoStaff <<
-      \set PianoStaff.instrumentName = "Piano  "
+      \set PianoStaff.instrument = "Piano  "
       \new Staff = "upper" \upper
       \new Staff = "lower" \lower
    >>
    \layout { }
-   \midi { }
+   \midi { \tempo 4=60 }
 }
 @end lilypond
 
@@ -191,7 +191,7 @@ Here is a typical song format: one staff with the melody and lyrics, with
 piano accompaniment underneath.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.7.39"
 melody = \relative c'' {
    \clef treble
    \key c \major
@@ -236,7 +236,7 @@ lower = \relative c {
    \layout {
       \context { \RemoveEmptyStaffContext }
    }
-   \midi { }
+   \midi { \tempo 4=60 }
 }
 @end lilypond
 
@@ -247,7 +247,7 @@ Instead of having a full staff for the melody and lyrics, you can place
 the lyrics between the piano staff (and omit the separate melody staff).
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.7.39"
 upper = \relative c'' {
    \clef treble
    \key c \major
@@ -281,7 +281,7 @@ text = \lyricmode {
     \context { \GrandStaff \accepts "Lyrics" }
     \context { \Lyrics \consists "Bar_engraver" }
   }
-  \midi { }
+  \midi { \tempo 4=60 }
 }
 @end lilypond
 
@@ -294,7 +294,7 @@ since the template is right here, you don't have to do the
 tweaking yourself.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.7.39"
 upper = \relative c'' {
   \clef treble
   \key c \major
@@ -391,7 +391,7 @@ This template demonstrates a string quartet.  It also uses a @code{\global}
 section for time and key signatures.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.7.39"
 
 global= {
   \time 4/4
@@ -399,26 +399,26 @@ global= {
 }
 
 violinOne = \new Voice { \relative c''{
-  \set Staff.instrumentName = "Violin 1 "
+  \set Staff.instrument = "Violin 1 "
 
   c2 d e1
 
 \bar "|." }}
 violinTwo = \new Voice { \relative c''{
-  \set Staff.instrumentName = "Violin 2 "
+  \set Staff.instrument = "Violin 2 "
 
   g2 f e1
 
 \bar "|." }}
 viola = \new Voice { \relative c' {
-  \set Staff.instrumentName = "Viola "
+  \set Staff.instrument = "Viola "
   \clef alto
 
   e2 d c1
 
 \bar "|." }}
 cello = \new Voice { \relative c' {
-  \set Staff.instrumentName = "Cello     "
+  \set Staff.instrument = "Cello     "
   \clef bass
 
   c2 b a1
@@ -433,7 +433,7 @@ cello = \new Voice { \relative c' {
       \new Staff << \global \cello >>
    >>
    \layout { }
-   \midi { }
+   \midi { \tempo 4=60}
 }
 @end lilypond
 
@@ -451,7 +451,7 @@ contains all the music definitions.  The other files -- @code{score.ly},
 
 @verbatim
 %%%%% piece.ly
-\version "2.9.13"
+\version "2.7.39"
 
 global= {
   \time 4/4
@@ -459,26 +459,26 @@ global= {
 }
 
 Violinone = \new Voice { \relative c''{
-  \set Staff.instrumentName = "Violin 1 "
+  \set Staff.instrument = "Violin 1 "
 
   c2 d e1
 
 \bar "|." }}   %*********************************
 Violintwo = \new Voice { \relative c''{
-  \set Staff.instrumentName = "Violin 2 "
+  \set Staff.instrument = "Violin 2 "
 
   g2 f e1
 
 \bar "|." }}   %*********************************
 Viola = \new Voice { \relative c' {
-  \set Staff.instrumentName = "Viola "
+  \set Staff.instrument = "Viola "
   \clef alto
 
   e2 d c1
 
 \bar "|." }}   %*********************************
 Cello = \new Voice { \relative c' {
-  \set Staff.instrumentName = "Cello     "
+  \set Staff.instrument = "Cello     "
   \clef bass
 
   c2 b a1
@@ -497,18 +497,18 @@ music = {
 
 
 %%%%% score.ly
-\version "2.9.13"
+\version "2.7.39"
 \include "piece.ly"
 #(set-global-staff-size 14)
 \score {
   \new StaffGroup \keepWithTag #'score \music
   \layout { }
-  \midi { }
+  \midi { \tempo 4 = 60 }
 }
 
 
 %%%%% vn1.ly
-\version "2.9.13"
+\version "2.7.39"
 \include "piece.ly"
 \score {
   \keepWithTag #'vn1 \music
@@ -517,7 +517,7 @@ music = {
 
 
 %%%%% vn2.ly
-\version "2.9.13"
+\version "2.7.39"
 \include "piece.ly"
 \score {
   \keepWithTag #'vn2 \music
@@ -526,7 +526,7 @@ music = {
 
 
 %%%%% vla.ly
-\version "2.9.13"
+\version "2.7.39"
 \include "piece.ly"
 \score {
   \keepWithTag #'vla \music
@@ -535,7 +535,7 @@ music = {
 
 
 %%%%% vlc.ly
-\version "2.9.13"
+\version "2.7.39"
 \include "piece.ly"
 \score {
   \keepWithTag #'vlc \music
@@ -555,7 +555,7 @@ parts.  For example, the time signature and key signatures are almost
 always the same for all parts.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.7.39"
 global = {
    \key c \major
    \time 4/4
@@ -636,7 +636,7 @@ to the vocal notes (say, tenorMusic), then the changes will also
 apply to the piano reduction.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.7.39"
 global = {
    \key c \major
    \time 4/4
@@ -739,7 +739,7 @@ notes.  As a compromise, bar lines are often printed between the
 staves rather than on the staves.
 
 @lilypond[quote,verbatim,line-width=11.0\cm]
-\version "2.9.13"
+\version "2.7.39"
 
 global = {
   \set Score.skipBars = ##t
@@ -789,7 +789,7 @@ global = {
 
 discantusNotes = {
   \transpose c' c'' {
-    \set Staff.instrumentName = "Discantus  "
+    \set Staff.instrument = "Discantus  "
 
     % incipit
     \clef "neomensural-c1"
@@ -825,7 +825,7 @@ discantusLyrics = \lyricmode {
 
 altusNotes = {
   \transpose c' c'' {
-    \set Staff.instrumentName = "Altus  "
+    \set Staff.instrument = "Altus  "
 
     % incipit
     \clef "neomensural-c3"
@@ -859,7 +859,7 @@ altusLyrics = \lyricmode {
 
 tenorNotes = {
   \transpose c' c' {
-    \set Staff.instrumentName = "Tenor  "
+    \set Staff.instrument = "Tenor  "
 
     % incipit
     \clef "neomensural-c4"
@@ -893,7 +893,7 @@ tenorLyrics = \lyricmode {
 
 bassusNotes = {
   \transpose c' c' {
-    \set Staff.instrumentName = "Bassus  "
+    \set Staff.instrument = "Bassus  "
 
     % incipit
     \clef "bass"
@@ -965,7 +965,7 @@ quarter noteheads, and special marks, indicating rests of different length.
 
 @lilypond[quote,verbatim,ragged-right]
 \include "gregorian-init.ly"
-\version "2.9.13"
+\version "2.8.0"
 
 chant = \relative c' {
   \set Score.timing = ##f
@@ -1025,7 +1025,7 @@ is within a @code{\transpose} section.
 @c The `line-width' argument is for the \header.
 
 @lilypond[quote,verbatim,ragged-right,line-width]
-\version "2.9.13"
+\version "2.7.39"
 \header {
   title = "Song"
   subtitle = "(tune)"
@@ -1083,7 +1083,7 @@ trpharmony = \transpose c' d {
 }
 trumpet = {
   \global
-  \set Staff.instrumentName = #"Trumpet"
+  \set Staff.instrument = #"Trumpet"
   \clef treble
   <<
     \trpt
@@ -1100,7 +1100,7 @@ altoharmony = \transpose c' a {
 }
 altosax = {
   \global
-  \set Staff.instrumentName = #"Alto Sax"
+  \set Staff.instrument = #"Alto Sax"
   \clef treble
   <<
     \alto
@@ -1117,7 +1117,7 @@ bariharmony = \transpose c' a \chordmode {
 }
 barisax = {
   \global
-  \set Staff.instrumentName = #"Bari Sax"
+  \set Staff.instrument = #"Bari Sax"
   \clef treble
   <<
     \bari
@@ -1134,7 +1134,7 @@ tboneharmony = \chordmode {
 }
 trombone = {
   \global
-  \set Staff.instrumentName = #"Trombone"
+  \set Staff.instrument = #"Trombone"
   \clef bass
   <<
     \tbone
@@ -1154,7 +1154,7 @@ gtrharmony = \chordmode {
 }
 guitar = {
   \global
-  \set Staff.instrumentName = #"Guitar"
+  \set Staff.instrument = #"Guitar"
   \clef treble
   <<
     \gtr
@@ -1205,7 +1205,7 @@ PianoLH = {
 
 piano = {
   <<
-    \set PianoStaff.instrumentName = #"Piano"
+    \set PianoStaff.instrument = #"Piano"
     \new Staff = "upper" \PianoRH
     \new Staff = "lower" \PianoLH
   >>
@@ -1218,7 +1218,7 @@ Bass = \relative c {
 }
 bass = {
   \global
-  \set Staff.instrumentName = #"Bass"
+  \set Staff.instrument = #"Bass"
   \clef bass
   <<
     \Bass
@@ -1240,7 +1240,7 @@ down = \drummode {
 drumContents = {
   \global
   <<
-    \set DrumStaff.instrumentName = #"Drums"
+    \set DrumStaff.instrument = #"Drums"
     \new DrumVoice { \voiceOne \up }
     \new DrumVoice { \voiceTwo \down }
   >>
@@ -1277,7 +1277,7 @@ drumContents = {
     }
   }
 
-  \midi { }
+  \midi { \tempo 4 = 75 }
 }
 @end lilypond
 
@@ -1301,7 +1301,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print
 
 @ The `line-width' is for \header.
 @li lypond[quote,verbatim,ragged-right,line-width]
-\version "2.9.13"
+\version "2.7.39"
 \header {
   dedication = "dedication"
   title = "Title"