Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / snippets / satb-choir-template---four-staves.ly

diff --git a/Documentation/snippets/satb-choir-template---four-staves.ly b/Documentation/snippets/satb-choir-template---four-staves.ly
index 4bc0d0e17580de24803008442d880b172c1b03b8..29c0a8c2f4b13245f36dc2d8a375aa5b8aa045e2 100644 (file)
--- a/Documentation/snippets/satb-choir-template---four-staves.ly
+++ b/Documentation/snippets/satb-choir-template---four-staves.ly
@@ -1,9 +1,32 @@
-%% Do not edit this file; it is automatically
+%% DO NOT EDIT this file manually; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.14.0"
 
 \header {
+%% Translation of GIT committish: 4077120c18ac1dc490501b3d7d5886bc93e61a42
+  texidocit = "
+Modello per coro SATB (quattro righi)
+
+"
+  doctitleit = "Modello per coro SATB - quattro righi"
+
+  lsrtags = "vocal-music, template"
+
+
+
+%% Translation of GIT committish:  144cd434d02e6d90b2fb738eeee99119a7c5e1d2
+
+  texidocde = "
+SATB-Chorvorlage auf vier Systemen
+
+"
+  doctitlede = "SATB-Chorvorlage auf vier Systemen"
+
+
 %% Translation of GIT committish: 092f85605dcea69efff5ef31de4ff100346d6ef8
 
   texidocfr = "
@@ -14,8 +37,6 @@ portée.
   doctitlefr = "Modèle pour chœur SATB sur quatre portées"
 
 
-  lsrtags = "vocal-music, template"
-
   texidoc = "
 SATB choir template (four staves)
 
@@ -26,38 +47,57 @@ SATB choir template (four staves)
 global = {
   \key c \major
   \time 4/4
+  \dynamicUp
+}
+sopranonotes = \relative c'' {
+  c2 \p \< d c d \f
 }
-sopranonotes = \relative c'' {c2 d2}
-sopranowords = \lyricmode { do do }
-altonotes = \relative c'' {c2 d2}
-altowords = \lyricmode { re re }
+sopranowords = \lyricmode { do do do do }
+altonotes = \relative c'' {
+  c2\p d c d
+}
+altowords = \lyricmode { re re re re }
 tenornotes = {
-  \clef "G_8" c2 d2}
-tenorwords = \lyricmode { mi mi }
+  \clef "G_8"
+  c2\mp d c d
+}
+tenorwords = \lyricmode { mi mi mi mi }
 bassnotes = {
-  \clef bass c2 d2}
-basswords = \lyricmode { mi mi }
-
-\score{
-  \context ChoirStaff
-  <<
-    \context Staff = soprano <<
-      \context Voice = sop { << \global \sopranonotes >> }
-      \lyricsto "sop" \new Lyrics \sopranowords
+  \clef bass
+  c2\mf d c d
+}
+basswords = \lyricmode { mi mi mi mi }
+
+\score {
+  \new ChoirStaff <<
+    \new Staff <<
+      \new Voice = "soprano" <<
+        \global
+        \sopranonotes
+      >>
+      \lyricsto "soprano" \new Lyrics \sopranowords
     >>
-    \context Staff = alto <<
-      \context Voice = alt { << \global \altonotes >> }
-      \lyricsto "alt" \new Lyrics \altowords
+    \new Staff <<
+      \new Voice = "alto" <<
+        \global
+        \altonotes
+      >>
+      \lyricsto "alto" \new Lyrics \altowords
     >>
-    \context Staff = tenor <<
-      \context Voice = ten { << \global \tenornotes >> }
-      \lyricsto "ten" \new Lyrics \tenorwords
+    \new Staff <<
+      \new Voice = "tenor" <<
+        \global
+        \tenornotes
+      >>
+      \lyricsto "tenor" \new Lyrics \tenorwords
     >>
-    \context Staff = bass <<
-      \context Voice = bas { << \global \bassnotes >> }
-      \lyricsto "bas" \new Lyrics \basswords
+    \new Staff <<
+      \new Voice = "bass" <<
+        \global
+        \bassnotes
+      >>
+      \lyricsto "bass" \new Lyrics \basswords
     >>
   >>
 }
 
-