Docs: LM A.5.1 Improve orchestral template

diff --git a/input/lsr/orchestra-choir-and-piano-template.ly b/input/lsr/orchestra-choir-and-piano-template.ly
index c251038f84cabd18f98b1bb17b02e92ae3c64542..52950206a9bc37cfa4269e0d954631a213466349 100644 (file)
--- a/input/lsr/orchestra-choir-and-piano-template.ly
+++ b/input/lsr/orchestra-choir-and-piano-template.ly
@@ -10,8 +10,7 @@ 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 (véase la trompeta, por ejemplo) antes de ser asignada a una
-variable.
+a Do antes de ser asignada a una variable.
 
 "
   doctitlees = "Plantilla de orquesta, coro y piano"
@@ -23,119 +22,128 @@ 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 (see trumpet for an example) before being assigned
-to a variable.
+transposed to C before being assigned to a variable.
 "
   doctitle = "Orchestra, choir and piano template"
 } % begin verbatim
 
+#(set-global-staff-size 17)
 
-fluteMusic    = \relative c' { \key c \major c1 d }
-saxMusic      = \relative c' { \key c \major c1 d }
-oboeMusic     = \relative c' { \key c \major c1 d }
-clarinetMusic = \relative c' { \key c \major c1 d }
-bassoonMusic  = \relative c  { \key c \major c1 d }
-trumpetMusic  = \transpose c' bes {
-  \relative c' { \key d \major d1 e }
+\paper {
+  indent = 3.0\cm
+  short-indent = 1.5\cm
 }
-tromboneMusic = \relative c  { \key c \major c1 d }
-hornOneMusic  = \relative c' { \key c \major c1 d }
-hornTwoMusic  = \relative c  { \key c \major c1 d }
+
+\layout {
+   \context {
+     \Score
+     \override InstrumentName #'self-alignment-X = #CENTER
+   }
+}
+
+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 { \key c \major c'1 d }
+hornIIMusic = \relative c { \key c \major c1 d }
+percussionMusic = \relative c { \key c \major c1 d }
 sopranoMusic  = \relative c'' {\key c \major c1 d }
 sopranoLyrics = \lyricmode { Sop -- ra }
-altoOneMusic  = \relative c' { \key c \major c1 d }
-altoOneLyrics = \lyricmode { A -- one }
-altoTwoMusic  = \relative c' { \key c \major c1 d }
-altoTwoLyrics = \lyricmode { A -- two }
+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 c1 d }
-pianoLHMusic  = \relative c  { \key c \major c1 d }
+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 }
 
 \score {
-  <<  % Start full staff group
-    \new StaffGroup <<  % Woodwinds
-      \new Staff {  % Flute
+  \new GrandStaff = "GrandStaff_score" <<
+    \new StaffGroup = "StaffGroup_woodwinds" <<
+      \new Staff = "Staff_flute" {
         \set Staff.instrumentName = "Flute"
         \fluteMusic
       }
-      \new StaffGroup <<
-        \new Staff {  % Bb Sax
-          \set Staff.instrumentName = \markup { \concat {"B" \flat} "Sax" }
-          \transposition bes
-          \transpose bes c' \saxMusic
-        }
-        \new Staff {  % Oboe
-          \set Staff.instrumentName = "Oboe"
-          \oboeMusic
-         }
-        \new Staff {  % Clarinet in A
-          \set Staff.instrumentName = "Clarinet"
-          \transposition a
-          \transpose a c' \clarinetMusic
-        }
-      >>
-      \new Staff {  % Bassoon
-        \set Staff.instrumentName = "Bassoon"
-        \clef bass
-        \transposition a,
-        \transpose a c' \bassoonMusic
+      \new Staff = "Staff_oboe" {
+        \set Staff.instrumentName = "Oboe"
+        \oboeMusic
       }
-    >>
-    \new StaffGroup <<  % Start Brass group
-      \new Staff {  % Trumpet
-        \set Staff.instrumentName = "Trumpet"
+      \new Staff = "Staff_clarinet" {
+        \set Staff.instrumentName = \markup \concat { "Clarinet in B" \flat }
         \transposition bes
-        \transpose bes c' \trumpetMusic
+        \transpose bes c' \clarinetMusic
       }
-      \new Staff {  % Trombone
-        \set Staff.instrumentName = "Trombone"
-        \clef bass
-        \tromboneMusic
+      \new Staff = "Staff_bassoon" {
+        \set Staff.instrumentName = "Bassoon"
+        \bassoonMusic
       }
-      \new GrandStaff << % Horns need a GrandStaff (same instrument)
-        \new Staff {  % Horn 1
-          \set Staff.instrumentName = "Horn 1"
+    >>
+    \new StaffGroup = "StaffGroup_brass" <<
+      \new GrandStaff <<
+        \new Staff = "Staff_hornI" {
+          \set Staff.instrumentName = "Horn I"
           \transposition f
-          \transpose f c' \hornOneMusic
+          \transpose f c' \hornIMusic
         }
-        \new Staff {  % Horn 2
-          \set Staff.instrumentName = "Horn 2"
+        \new Staff = "Staff_hornII" {
+          \set Staff.instrumentName = "Horn II"
           \clef bass
           \transposition f
-          \transpose f c' \hornTwoMusic
+          \transpose f c' \hornIIMusic
         }
       >>
-    >>  % End Brass group
-    \new ChoirStaff <<
-      \new Staff {
-        \set Staff.instrumentName = "S"
+      \new Staff = "Staff_trumpet" {
+        \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"
+      \percussionMusic
+    >>
+    \new ChoirStaff = "ChoirStaff_choir" <<
+      \new Staff = "Staff_soprano" {
+        \set Staff.instrumentName = "Soprano"
         \new Voice = "soprano"
         \sopranoMusic
       }
       \new Lyrics \lyricsto "soprano" { \sopranoLyrics }
-      \new GrandStaff \with { \accepts Lyrics } <<
-        \new Staff  {
-          \set Staff.instrumentName = "A1"
-          \new Voice = "altoOne"
-          \altoOneMusic
+      \new GrandStaff = "GrandStaff_altos" \with { \accepts Lyrics } <<
+        \new Staff = "Staff_altoI"  {
+          \set Staff.instrumentName = "Alto I"
+          \new Voice = "altoI"
+          \altoIMusic
         }
-        \new Lyrics \lyricsto "altoOne" { \altoOneLyrics }
-        \new Staff {
-          \set Staff.instrumentName = "A2"
-          \new Voice = "altoTwo"
-          \altoTwoMusic
+        \new Lyrics \lyricsto "altoI" { \altoILyrics }
+        \new Staff = "Staff_altoII" {
+          \set Staff.instrumentName = "Alto II"
+          \new Voice = "altoII"
+          \altoIIMusic
         }
-        \new Lyrics \lyricsto "altoTwo" { \altoTwoLyrics }
+        \new Lyrics \lyricsto "altoII" { \altoIILyrics }
       >>
-      \new Staff {
-        \set Staff.instrumentName = "T"
+      \new Staff = "Staff_tenor" {
+        \set Staff.instrumentName = "Tenor"
         \clef "treble_8"
         \new Voice = "tenor"
         \tenorMusic
       }
       \new Lyrics \lyricsto "tenor" { \tenorLyrics }
-    >>  % End ChoirStaff
+    >>
     \new PianoStaff \with { \consists Instrument_name_engraver } <<
       \set PianoStaff.instrumentName = "Piano"
       \new Staff { \pianoRHMusic }
@@ -143,7 +151,30 @@ pianoLHMusic  = \relative c  { \key c \major c1 d }
         \clef bass
         \pianoLHMusic
       }
-    >>  % End PianoStaff
-  >>  % End full staff group
+    >>
+    \new StaffGroup = "StaffGroup_strings" <<
+      \new GrandStaff = "GrandStaff_horns" <<
+        \new Staff = "Staff_violinI" {
+          \set Staff.instrumentName = "Violin I"
+          \violinIMusic
+        }
+        \new Staff = "Staff_violinII" {
+          \set Staff.instrumentName = "Violin II"
+          \violinIIMusic
+        }
+      >>
+      \new Staff = "Staff_viola" {
+        \set Staff.instrumentName = "Viola"
+        \violaMusic
+      }
+      \new Staff = "Staff_cello" {
+        \set Staff.instrumentName = "Cello"
+        \celloMusic
+      }
+      \new Staff = "Staff_bass" {
+        \set Staff.instrumentName = "Double Bass"
+        \bassMusic
+      }
+    >>
+  >>
 }
-

diff --git a/input/new/orchestra-choir-and-piano-template.ly b/input/new/orchestra-choir-and-piano-template.ly
index 83da4208d443031996a1ee285b2aba99e75a4314..7e643d412c4bdbd8aea15b0085507e36c54accf2 100644 (file)
--- a/input/new/orchestra-choir-and-piano-template.ly
+++ b/input/new/orchestra-choir-and-piano-template.ly
@@ -13,112 +13,123 @@ to a variable.
   doctitle = "Orchestra, choir and piano template"
 }
 
-fluteMusic    = \relative c' { \key c \major c1 d }
-saxMusic      = \relative c' { \key c \major c1 d }
-oboeMusic     = \relative c' { \key c \major c1 d }
-clarinetMusic = \relative c' { \key c \major c1 d }
-bassoonMusic  = \relative c  { \key c \major c1 d }
-trumpetMusic  = \transpose c' bes {
-  \relative c' { \key d \major d1 e }
+#(set-global-staff-size 17)
+
+\paper {
+  indent = 3.0\cm
+  short-indent = 1.5\cm
+}
+
+\layout {
+   \context {
+     \Score
+     \override InstrumentName #'self-alignment-X = #CENTER
+   }
 }
-tromboneMusic = \relative c  { \key c \major c1 d }
-hornOneMusic  = \relative c' { \key c \major c1 d }
-hornTwoMusic  = \relative c  { \key c \major c1 d }
+
+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 { \key c \major c'1 d }
+hornIIMusic = \relative c { \key c \major c1 d }
+percussionMusic = \relative c { \key c \major c1 d }
 sopranoMusic  = \relative c'' {\key c \major c1 d }
 sopranoLyrics = \lyricmode { Sop -- ra }
-altoOneMusic  = \relative c' { \key c \major c1 d }
-altoOneLyrics = \lyricmode { A -- one }
-altoTwoMusic  = \relative c' { \key c \major c1 d }
-altoTwoLyrics = \lyricmode { A -- two }
+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 c1 d }
-pianoLHMusic  = \relative c  { \key c \major c1 d }
+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 }
 
 \score {
-  <<  % Start full staff group
-    \new StaffGroup <<  % Woodwinds
-      \new Staff {  % Flute
+  \new GrandStaff = "GrandStaff_score" <<
+    \new StaffGroup = "StaffGroup_woodwinds" <<
+      \new Staff = "Staff_flute" {
         \set Staff.instrumentName = "Flute"
         \fluteMusic
       }
-      \new StaffGroup <<
-        \new Staff {  % Bb Sax
-          \set Staff.instrumentName = \markup { \concat {"B" \flat} "Sax" }
-          \transposition bes
-          \transpose bes c' \saxMusic
-        }
-        \new Staff {  % Oboe
-          \set Staff.instrumentName = "Oboe"
-          \oboeMusic
-         }
-        \new Staff {  % Clarinet in A
-          \set Staff.instrumentName = "Clarinet"
-          \transposition a
-          \transpose a c' \clarinetMusic
-        }
-      >>
-      \new Staff {  % Bassoon
-        \set Staff.instrumentName = "Bassoon"
-        \clef bass
-        \transposition a,
-        \transpose a c' \bassoonMusic
+      \new Staff = "Staff_oboe" {
+        \set Staff.instrumentName = "Oboe"
+        \oboeMusic
       }
-    >>
-    \new StaffGroup <<  % Start Brass group
-      \new Staff {  % Trumpet
-        \set Staff.instrumentName = "Trumpet"
+      \new Staff = "Staff_clarinet" {
+        \set Staff.instrumentName = \markup \concat { "Clarinet in B" \flat }
         \transposition bes
-        \transpose bes c' \trumpetMusic
+        \transpose bes c' \clarinetMusic
       }
-      \new Staff {  % Trombone
-        \set Staff.instrumentName = "Trombone"
-        \clef bass
-        \tromboneMusic
+      \new Staff = "Staff_bassoon" {
+        \set Staff.instrumentName = "Bassoon"
+        \bassoonMusic
       }
-      \new GrandStaff << % Horns need a GrandStaff (same instrument)
-        \new Staff {  % Horn 1
-          \set Staff.instrumentName = "Horn 1"
+    >>
+    \new StaffGroup = "StaffGroup_brass" <<
+      \new GrandStaff <<
+        \new Staff = "Staff_hornI" {
+          \set Staff.instrumentName = "Horn I"
           \transposition f
-          \transpose f c' \hornOneMusic
+          \transpose f c' \hornIMusic
         }
-        \new Staff {  % Horn 2
-          \set Staff.instrumentName = "Horn 2"
+        \new Staff = "Staff_hornII" {
+          \set Staff.instrumentName = "Horn II"
           \clef bass
           \transposition f
-          \transpose f c' \hornTwoMusic
+          \transpose f c' \hornIIMusic
         }
       >>
-    >>  % End Brass group
-    \new ChoirStaff <<
-      \new Staff {
-        \set Staff.instrumentName = "S"
+      \new Staff = "Staff_trumpet" {
+        \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"
+      \percussionMusic
+    >>
+    \new ChoirStaff = "ChoirStaff_choir" <<
+      \new Staff = "Staff_soprano" {
+        \set Staff.instrumentName = "Soprano"
         \new Voice = "soprano"
         \sopranoMusic
       }
       \new Lyrics \lyricsto "soprano" { \sopranoLyrics }
-      \new GrandStaff \with { \accepts Lyrics } <<
-        \new Staff  {
-          \set Staff.instrumentName = "A1"
-          \new Voice = "altoOne"
-          \altoOneMusic
+      \new GrandStaff = "GrandStaff_altos" \with { \accepts Lyrics } <<
+        \new Staff = "Staff_altoI"  {
+          \set Staff.instrumentName = "Alto I"
+          \new Voice = "altoI"
+          \altoIMusic
         }
-        \new Lyrics \lyricsto "altoOne" { \altoOneLyrics }
-        \new Staff {
-          \set Staff.instrumentName = "A2"
-          \new Voice = "altoTwo"
-          \altoTwoMusic
+        \new Lyrics \lyricsto "altoI" { \altoILyrics }
+        \new Staff = "Staff_altoII" {
+          \set Staff.instrumentName = "Alto II"
+          \new Voice = "altoII"
+          \altoIIMusic
         }
-        \new Lyrics \lyricsto "altoTwo" { \altoTwoLyrics }
+        \new Lyrics \lyricsto "altoII" { \altoIILyrics }
       >>
-      \new Staff {
-        \set Staff.instrumentName = "T"
+      \new Staff = "Staff_tenor" {
+        \set Staff.instrumentName = "Tenor"
         \clef "treble_8"
         \new Voice = "tenor"
         \tenorMusic
       }
       \new Lyrics \lyricsto "tenor" { \tenorLyrics }
-    >>  % End ChoirStaff
+    >>
     \new PianoStaff \with { \consists Instrument_name_engraver } <<
       \set PianoStaff.instrumentName = "Piano"
       \new Staff { \pianoRHMusic }
@@ -126,7 +137,31 @@ pianoLHMusic  = \relative c  { \key c \major c1 d }
         \clef bass
         \pianoLHMusic
       }
-    >>  % End PianoStaff
-  >>  % End full staff group
+    >>
+    \new StaffGroup = "StaffGroup_strings" <<
+      \new GrandStaff = "GrandStaff_horns" <<
+        \new Staff = "Staff_violinI" {
+          \set Staff.instrumentName = "Violin I"
+          \violinIMusic
+        }
+        \new Staff = "Staff_violinII" {
+          \set Staff.instrumentName = "Violin II"
+          \violinIIMusic
+        }
+      >>
+      \new Staff = "Staff_viola" {
+        \set Staff.instrumentName = "Viola"
+        \violaMusic
+      }
+      \new Staff = "Staff_cello" {
+        \set Staff.instrumentName = "Cello"
+        \celloMusic
+      }
+      \new Staff = "Staff_bass" {
+        \set Staff.instrumentName = "Double Bass"
+        \bassMusic
+      }
+    >>
+  >>
 }