Merge branch 'master' into translation

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

diff --git a/Documentation/snippets/staff-headword.ly b/Documentation/snippets/staff-headword.ly
index db1e93e2b19e5f99070cff16fb50678e76b59716..b959f0713a1156785b5c5e0291af566afbbbffb2 100644 (file)
--- a/Documentation/snippets/staff-headword.ly
+++ b/Documentation/snippets/staff-headword.ly
@@ -4,8 +4,8 @@
 % and then run scripts/auxiliar/makelsr.py
 %
 % This file is in the public domain.
-%% Note: this file works from version 2.16.0
-\version "2.16.0"
+%% Note: this file works from version 2.19.55
+\version "2.19.55"
 \include "catalan.ly"
 
 \header {
@@ -36,29 +36,20 @@ trompette = \relative do'' {
   \key mib \major
   \time 2/4
   R2^\markup { \italic Comodo } |
-  r8 \once \override TextScript #'padding = #2.0
+  r8 \once \override TextScript.padding = #2.0
   sib16-.^\markup {\dynamic p \italic grazioso} do-. mib( re)-. do-. sib-. |
   re8-. r8 re4->( |
   re8) do16-. re-. mib( re) do-. re-. |
   do8-. r8 sib4-> |
 }
 
-tambourin = \relative do' {
+tambourin = \drummode {
   \time 2/4
-  r8 do16 do do8 do |
-  r8 do16 do do8 do |
-  r8 do r do |
-  r8 do16 do do8 do |
-  r8 do r do |
-}
-
-tambourinMidi = \drummode {
-  \time 2/4
-  r8 tamb16 tamb tamb8 tamb |
-  r8 tamb16 tamb tamb8 tamb |
-  r8 tamb r tamb |
-  r8 tamb16 tamb tamb8 tamb |
-  r8 tamb r tamb |
+  r8 tamb16 16 8 8 |
+  r8 16 16 8 8 |
+  r8 8 r8 8 |
+  r8 16 16 8 8 |
+  r8 8 r8 8 |
 }
 
 upper = \relative do' {
@@ -86,38 +77,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" {
-      \tambourinMidi
+      \tambourin
     }
-    \context Staff = "piano" <<
+    \context Staff = "piano"
+    <<
       \upper
       \lower
     >>
   >>
-  \midi {
-    \tempo 4 = 72
-  }
+  \midi { \tempo 4 = 72 }
 }