Snippets: Replace \set Staff.instrumentName

[lilypond.git] / Documentation / snippets / new / staff-headword.ly

diff --git a/Documentation/snippets/new/staff-headword.ly b/Documentation/snippets/new/staff-headword.ly
index 4c7aff1f023ed1ed6ea421079000e28327407366..ce794e9f143415e4f08215e0980d714a823f8c65 100644 (file)
--- a/Documentation/snippets/new/staff-headword.ly
+++ b/Documentation/snippets/new/staff-headword.ly
@@ -1,4 +1,4 @@
-\version "2.19.0"
+\version "2.19.55"
 \include "catalan.ly"
 
 \header {
@@ -69,38 +69,39 @@ lower = \relative do {
 
 \score {
   <<
-    \context Staff = "trumpet" <<
-      \set Staff.instrumentName = \markup { "Trumpet" \concat{ B \teeny \raise #0.4 \flat } }
+    \context Staff = "trumpet"
+    \with { instrumentName = \markup { "Trumpet" \concat{ B \teeny \raise #0.4 \flat } } }
+    <<
       \transpose sib do'
       \trompette
     >>
-    \context RhythmicStaff = "tambourin" <<
-      \set Staff.instrumentName = "Tambourine"
+    \context RhythmicStaff = "tambourin"
+    \with { instrumentName = "Tambourine" }
+    <<
       \tambourin
     >>
-    \context PianoStaff = "prima" <<
-      \set PianoStaff.instrumentName = "Piano  "
+    \context PianoStaff = "prima"
+    \with { instrumentName = "Piano" }
+    <<
       \context Staff = "uppera" \upper
       \context Staff = "lowera" \lower
     >>
   >>
   \layout { }
 }
+
 \score {
   <<
-    \context Staff = "trumpet" {
-      \set Staff.midiInstrument = "trumpet"
-      \trompette
-    }
+    \context Staff = "trumpet" \with { midiInstrument = "trumpet" }
+    \trompette
     \context DrumStaff = "tambourin" {
       \tambourin
     }
-    \context Staff = "piano" <<
+    \context Staff = "piano"
+    <<
       \upper
       \lower
     >>
   >>
-  \midi {
-    \tempo 4 = 72
-  }
+  \midi { \tempo 4 = 72 }
 }