X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Forchestra%2C-choir-and-piano-template.ly;h=e7c190465e603a8084ce2123804c2d1ed1214d07;hb=54b02666750062788185bd3f99e644d621e348c2;hp=c773279a7b7adbb4e3d44cc4337ce46e585770d5;hpb=90fbf91f6169ddb2f07a1d95d132babf33934620;p=lilypond.git

diff --git a/Documentation/snippets/orchestra,-choir-and-piano-template.ly b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
index c773279a7b..e7c190465e 100644
--- a/Documentation/snippets/orchestra,-choir-and-piano-template.ly
+++ b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
@@ -1,25 +1,54 @@
-%% 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.10"
+\version "2.14.0"
 
 \header {
-  lsrtags = "template"
+%% Translation of GIT committish: 4077120c18ac1dc490501b3d7d5886bc93e61a42
+  texidocit = "
+Questo modello mostra come usare i contesti annidati @code{StaffGroup} e
+@code{GrandStaff} per creare sottogruppi degli strumenti dello stesso
+tipo.  Mostra anche come usare @code{\\transpose} in modo che le variabili
+mantengano la musica per gli strumenti traspositori nell'intonazione reale.
+
+"
+  doctitleit = "Modello per orchestra coro e pianoforte"
+
+  lsrtags = "pitches, staff-notation, vocal-music, template"
+
+
 
-%% Translation of GIT committish: 4385ed4cc738e164a95798862580b4b86703356f
-  texidoces = "
 
+%% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
+  texidoces = "
 Esta plantilla muestra el uso de contextos @code{StaffGroup} y
 @code{GrandStaff} anidados para sub-agrupar instrumentos del mismo
-tipo, y el uso de @code{\\transpose} para los instrumentos
-transpositores.  Toda la música que está dentro de variables se
-almacena en Do.  La música se puede introducir en Do, o (de forma
-alternativa) escribirse en el tono del instrumento y transportada
-a Do antes de ser asignada a una variable.
+tipo, y una forma de usar @code{\\transpose} de manera que unas
+variables contengan la música para instrumentos transpositores en
+afinación de concierto.
 
 "
   doctitlees = "Plantilla de orquesta con coro y piano"
-%% Translation of GIT committish: 892286cbfdbe89420b8181975032ea975e79d2f5
+
+%% Translation of GIT committish: 64feeff58e5ce3397de87188a08ac99f7ef8e37b
+
+  texidocde = "
+Diese Vorlage zeigt die Benutzung von geschachtelten
+@code{StaffGroup}- und @code{GrandStaff}-Kontexte, um
+Instrumente in Untergruppen zu unterteilen, und die
+Benutzung von @code{\\transpose} für transponierende
+Instrumente.  Alle Noten werden in C geschrieben.  Noten
+können in C eingegeben werden, oder auch in der Tonart
+des Instrumentes: dann müssen sie zuerst nach C transponiert
+werden, bevor sie einer Variable zugewiesen werden.
+
+"
+  doctitlede = "Orchester Chor und Klavier"
+
+%% Translation of GIT committish: bdfe3dc8175a2d7e9ea0800b5b04cfb68fe58a7a
   texidocfr = "
 Ce canevas illustre l'utilisation de contextes @code{StaffGroup} pour
 regrouper les instruments selon leur famille, imbriqués dans un
@@ -35,91 +64,75 @@ d'être transposées puis affectées à une variable.
   texidoc = "
 This template demonstrates the use of nested @code{StaffGroup} and
 @code{GrandStaff} contexts to sub-group instruments of the same type
-together, and the use of @code{\\transpose} for transposing
-instruments.  All music in variables is stored in C.  Music may be
-entered in C or, alternatively, entered in the instrument key and
-transposed to C before being assigned to a variable.
+together, and a way to use @code{\\transpose} so that variables hold
+music for transposing instruments at concert pitch.
 
 "
   doctitle = "Orchestra choir and piano template"
 } % begin verbatim
 
 #(set-global-staff-size 17)
-
 \paper {
-  indent = 3.0\cm
-  short-indent = 1.5\cm
+  indent = 3.0\cm  % space for instrumentName
+  short-indent = 1.5\cm  % space for shortInstrumentName
 }
 
-fluteMusic = \relative c { \key c \major c'1 d }
-oboeMusic = \relative c { \key c \major c'1 d }
-clarinetMusic = \relative c { \key c \major c'1 d }
-bassoonMusic = \relative c { \clef bass \key c \major c1 d }
-trumpetMusic = \relative c { \key c \major c''1 d }
-tromboneMusic = \relative c { \key c \major c1 d }
-hornIMusic = \relative c { c'1 d }
-hornIIMusic = \relative c { c1 d }
-percussionMusic = \relative c { \key c \major c1 d }
-sopranoMusic = \relative c'' { \key c \major c1 d }
-sopranoLyrics = \lyricmode { Sop -- ra }
-altoIMusic = \relative c' { \key c \major c1 d }
-altoILyrics = \lyricmode { A -- one }
-altoIIMusic = \relative c' { \key c \major c1 d }
-altoIILyrics = \lyricmode { A -- two }
-tenorMusic = \relative c' { \key c \major c1 d }
-tenorLyrics = \lyricmode { Ten -- or }
-pianoRHMusic = \relative c { \key c \major c'1 d }
-pianoLHMusic = \relative c { \key c \major c1 d }
-violinIMusic = \relative c { \key c \major c'1 d }
-violinIIMusic = \relative c { \key c \major c'1 d }
-violaMusic = \relative c { \clef alto \key c \major c'1 d }
-celloMusic = \relative c { \clef bass \key c \major c1 d }
-bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d }
+fluteMusic = \relative c' { \key g \major g'1 b }
+% Pitches as written on a manuscript for Clarinet in A
+% are transposed to concert pitch.
+clarinetMusic = \transpose c' a
+  \relative c'' { \key bes \major bes1 d }
+trumpetMusic = \relative c { \key g \major g''1 b }
+% Key signature is often omitted for horns
+hornMusic = \transpose c' f
+  \relative c { d'1 fis }
+percussionMusic = \relative c { \key g \major g1 b }
+sopranoMusic = \relative c'' { \key g \major g'1 b }
+sopranoLyrics = \lyricmode { Lyr -- ics }
+altoIMusic = \relative c' { \key g \major g'1 b }
+altoIIMusic = \relative c' { \key g \major g'1 b }
+altoILyrics =  \sopranoLyrics
+altoIILyrics = \lyricmode { Ah -- ah }
+tenorMusic = \relative c' { \clef "treble_8" \key g \major g1 b }
+tenorLyrics = \sopranoLyrics
+pianoRHMusic = \relative c { \key g \major g''1 b }
+pianoLHMusic = \relative c { \clef bass \key g \major g1 b }
+violinIMusic = \relative c' { \key g \major g'1 b }
+violinIIMusic = \relative c' { \key g \major g'1 b }
+violaMusic = \relative c { \clef alto \key g \major g'1 b }
+celloMusic = \relative c { \clef bass \key g \major g1 b }
+bassMusic = \relative c { \clef "bass_8" \key g \major g,1 b }
 
 \score {
-  \new GrandStaff = "GrandStaff_score" <<
+  <<
     \new StaffGroup = "StaffGroup_woodwinds" <<
       \new Staff = "Staff_flute" {
         \set Staff.instrumentName = #"Flute"
+        % shortInstrumentName, midiInstrument, etc.
+        % may be set here as well
         \fluteMusic
       }
-      \new Staff = "Staff_oboe" {
-        \set Staff.instrumentName = #"Oboe"
-        \oboeMusic
-      }
       \new Staff = "Staff_clarinet" {
-        \set Staff.instrumentName = \markup \concat { "Clarinet in B" \flat }
+        \set Staff.instrumentName =
+        \markup { \concat { "Clarinet in B" \flat } }
+        % Declare that written Middle C in the music
+        %  to follow sounds a concert B flat, for
+        %  output using sounded pitches such as MIDI.
         \transposition bes
+        % Print music for a B-flat clarinet
         \transpose bes c' \clarinetMusic
       }
-      \new Staff = "Staff_bassoon" {
-        \set Staff.instrumentName = #"Bassoon"
-        \bassoonMusic
-      }
     >>
     \new StaffGroup = "StaffGroup_brass" <<
-      \new GrandStaff <<
-        \new Staff = "Staff_hornI" {
-          \set Staff.instrumentName = #"Horn I"
-          \transposition f
-          \transpose f c' \hornIMusic
-        }
-        \new Staff = "Staff_hornII" {
-          \set Staff.instrumentName = #"Horn II"
-          \clef bass
-          \transposition f'
-          \transpose f c \hornIIMusic
-        }
-      >>
+      \new Staff = "Staff_hornI" {
+        \set Staff.instrumentName = #"Horn in F"
+        \transposition f
+        \transpose f c' \hornMusic
+      }
       \new Staff = "Staff_trumpet" {
-        \set Staff.instrumentName = #"Trumpet in C"
+        \set Staff.instrumentName = #"Trumpet in  C"
         \trumpetMusic
       }
-      \new Staff = "Staff_trombone" {
-        \set Staff.instrumentName = #"Trombone"
-        \clef bass
-        \tromboneMusic
-      }
     >>
     \new RhythmicStaff = "RhythmicStaff_percussion" <<
       \set RhythmicStaff.instrumentName = #"Percussion"
@@ -128,10 +141,7 @@ bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d }
     \new PianoStaff <<
       \set PianoStaff.instrumentName = #"Piano"
       \new Staff { \pianoRHMusic }
-      \new Staff {
-        \clef bass
-        \pianoLHMusic
-      }
+      \new Staff { \pianoLHMusic }
     >>
     \new ChoirStaff = "ChoirStaff_choir" <<
       \new Staff = "Staff_soprano" {
@@ -140,7 +150,8 @@ bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d }
         \sopranoMusic
       }
       \new Lyrics \lyricsto "soprano" { \sopranoLyrics }
-      \new GrandStaff = "GrandStaff_altos" \with { \accepts Lyrics } <<
+      \new GrandStaff = "GrandStaff_altos"
+      \with { \accepts Lyrics } <<
         \new Staff = "Staff_altoI"  {
           \set Staff.instrumentName = #"Alto I"
           \new Voice = "altoI"
@@ -156,7 +167,6 @@ bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d }
       >>
       \new Staff = "Staff_tenor" {
         \set Staff.instrumentName = #"Tenor"
-        \clef "treble_8"
         \new Voice = "tenor"
         \tenorMusic
       }
@@ -187,4 +197,6 @@ bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d }
       }
     >>
   >>
+  \layout { }
 }
+