Merge commit 'origin' into includes

[lilypond.git] / input / lsr / guitar-strum-rhythms.ly

diff --git a/input/lsr/guitar-strum-rhythms.ly b/input/lsr/guitar-strum-rhythms.ly
index c7335894cd239c2681fbd2504c8bd2e49237cfce..8a76a480972a92f32958afe1b2da3fba552dc208 100644 (file)
--- a/input/lsr/guitar-strum-rhythms.ly
+++ b/input/lsr/guitar-strum-rhythms.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.62"
+\version "2.12.0"
 
 \header {
   texidoces = "
@@ -10,6 +10,14 @@ además de las notas de la melodía, acordes y diagramas de posiciones.
 "
   doctitlees = "Ritmos rasgueados de guitarra"
 
+%% Translation of GIT committish :<6ce7f350682dfa99af97929be1dec6b9f1cbc01a>
+  texidocde = "
+In Guitarrennotation kann neben Melodie, Akkordbezeichnungen und
+Bunddiagrammen auch der Schlagrhythmus angegeben werden.
+
+"
+  doctitldee = "Schlagrhythmus für Guitarren"
+
   lsrtags = "rhythms,fretted-strings"
   texidoc = "
 For guitar music, it is possible to show strum rhythms, along
@@ -18,6 +26,7 @@ with melody notes, chord names, and fret diagrams.
   doctitle = "Guitar strum rhythms"
 } % begin verbatim
 
+
 \include "predefined-guitar-fretboards.ly"
 <<
   \new ChordNames {
@@ -25,35 +34,30 @@ with melody notes, chord names, and fret diagrams.
       c1 f g c
     }
   }
-
   \new FretBoards {
     \chordmode {
       c1 f g c
     }
   }
-
-
   \new Voice \with {
-    \consists Pitch_squash_engraver
-  } \relative c'' {
-    \improvisationOn
-    c4 c8 c c4 c8 c
-    f4 f8 f f4 f8 f
-    g4 g8 g g4 g8 g
-    c4 c8 c c4 c8 c
+    \consists "Pitch_squash_engraver"
+  } {
+    \relative c'' {
+      \improvisationOn
+      c4 c8 c c4 c8 c
+      f4 f8 f f4 f8 f
+      g4 g8 g g4 g8 g
+      c4 c8 c c4 c8 c
+    }
   }
-
-
   \new Voice = "melody" {
     \relative c'' {
-      \improvisationOff
       c2 e4 e4
       f2. r4
       g2. a4
       e4 c2.
     }
   }
-
   \new Lyrics {
     \lyricsto "melody" {
       This is my song.