Merge branch 'master' into 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 7547f03eb07a2b065399c5ecb122a3eb4b8b8bb8..4c7aff1f023ed1ed6ea421079000e28327407366 100644 (file)
--- a/Documentation/snippets/new/staff-headword.ly
+++ b/Documentation/snippets/new/staff-headword.ly
@@ -1,15 +1,8 @@
-\version "2.14.0"
+\version "2.19.0"
 \include "catalan.ly"
-#(set-global-staff-size 15)
-\paper{
-  ragged-right=##t
-  line-width=17\cm
-  indent=0\cm
-}
-
 
 \header {
-  lsrtags = "headwords"
+  lsrtags = "headword"
   texidoc = ""
   doctitle = "headword"
 }
@@ -35,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' {
-  \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 {
+tambourin = \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' {
@@ -109,7 +93,7 @@ lower = \relative do {
       \trompette
     }
     \context DrumStaff = "tambourin" {
-      \tambourinMidi
+      \tambourin
     }
     \context Staff = "piano" <<
       \upper
@@ -117,10 +101,6 @@ lower = \relative do {
     >>
   >>
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 4)
-    }
+    \tempo 4 = 72
   }
 }
-