Merge remote-tracking branch 'origin/translation'

[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 64ebf5d4d3033c8e43679703ce255ac782566011..a23b5cb06323cb9f337bc8f8b4f8789e6efad74c 100644 (file)
--- a/Documentation/snippets/new/staff-headword.ly
+++ b/Documentation/snippets/new/staff-headword.ly
@@ -1,4 +1,4 @@
-\version "2.16.0"
+\version "2.17.6"
 \include "catalan.ly"
 
 \header {
@@ -28,29 +28,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' {
@@ -102,7 +93,7 @@ lower = \relative do {
       \trompette
     }
     \context DrumStaff = "tambourin" {
-      \tambourinMidi
+      \tambourin
     }
     \context Staff = "piano" <<
       \upper
@@ -113,4 +104,3 @@ lower = \relative do {
     \tempo 4 = 72
   }
 }
-