X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=blobdiff_plain;f=Documentation%2Fsnippets%2Forchestra%2C-choir-and-piano-template.ly;h=0aa89b54b504699cec58f107d2ed107ffd0310fc;hp=e3b6eff96372d43b43449a4326853c5b619dc94c;hb=3f57efa0cde39bf0642fb6fb3672a19262ceda83;hpb=094be7d770e887169f70249804e1e96e04a44ca5

diff --git a/Documentation/snippets/orchestra,-choir-and-piano-template.ly b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
index e3b6eff963..0aa89b54b5 100644
--- a/Documentation/snippets/orchestra,-choir-and-piano-template.ly
+++ b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
@@ -1,10 +1,11 @@
-%% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.di.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.18.0"
+% DO NOT EDIT this file manually; it is automatically
+% generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
+% This file is in the public domain.
+%% Note: this file works from version 2.19.56
+\version "2.19.56"
 
 \header {
   lsrtags = "pitches, staff-notation, template, vocal-music"
@@ -21,129 +22,139 @@ music for transposing instruments at concert pitch.
 
 #(set-global-staff-size 17)
 \paper {
-  paper-height = 10\cm
-  indent = 3.0\cm  % space for instrumentName
-  short-indent = 1.5\cm  % space for shortInstrumentName
-}
+  indent = 3.0\cm  % add space for instrumentName
+  short-indent = 1.5\cm  % add less space for shortInstrumentName
+} % begin verbatim
+
 
 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 StaffGroup = "StaffGroup_woodwinds" <<
-      \new Staff = "Staff_flute" {
-        \set Staff.instrumentName = #"Flute"
-        % shortInstrumentName, midiInstrument, etc.
-        % may be set here as well
-        \fluteMusic
-      }
-      \new Staff = "Staff_clarinet" {
-        \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_flute" \with { instrumentName = #"Flute" }
+      \fluteMusic
+
+      \new Staff = "Staff_clarinet" \with {
+        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 StaffGroup = "StaffGroup_brass" <<
-      \new Staff = "Staff_hornI" {
-        \set Staff.instrumentName = #"Horn in F"
-        \transposition f
+      \new Staff = "Staff_hornI" \with { instrumentName = #"Horn in F" }
+       % \transposition f
         \transpose f c' \hornMusic
-      }
-      \new Staff = "Staff_trumpet" {
-        \set Staff.instrumentName = #"Trumpet in  C"
-        \trumpetMusic
-      }
+
+      \new Staff = "Staff_trumpet" \with { instrumentName = #"Trumpet in  C" }
+      \trumpetMusic
+
     >>
-    \new RhythmicStaff = "RhythmicStaff_percussion" <<
-      \set RhythmicStaff.instrumentName = #"Percussion"
+    \new RhythmicStaff = "RhythmicStaff_percussion"
+    \with { instrumentName = #"Percussion" }
+    <<
       \percussionMusic
     >>
-    \new PianoStaff <<
-      \set PianoStaff.instrumentName = #"Piano"
+    \new PianoStaff \with { instrumentName = #"Piano" }
+    <<
       \new Staff { \pianoRHMusic }
       \new Staff { \pianoLHMusic }
     >>
     \new ChoirStaff = "ChoirStaff_choir" <<
-      \new Staff = "Staff_soprano" {
-        \set Staff.instrumentName = #"Soprano"
-        \new Voice = "soprano"
-        \sopranoMusic
-      }
+      \new Staff = "Staff_soprano" \with { instrumentName = #"Soprano" }
+      \new Voice = "soprano"
+      \sopranoMusic
+
       \new Lyrics \lyricsto "soprano" { \sopranoLyrics }
       \new GrandStaff = "GrandStaff_altos"
       \with { \accepts Lyrics } <<
-        \new Staff = "Staff_altoI"  {
-          \set Staff.instrumentName = #"Alto I"
-          \new Voice = "altoI"
-          \altoIMusic
-        }
+        \new Staff = "Staff_altoI"  \with { instrumentName = #"Alto I" }
+        \new Voice = "altoI"
+        \altoIMusic
+
         \new Lyrics \lyricsto "altoI" { \altoILyrics }
-        \new Staff = "Staff_altoII" {
-          \set Staff.instrumentName = #"Alto II"
-          \new Voice = "altoII"
-          \altoIIMusic
-        }
+        \new Staff = "Staff_altoII" \with { instrumentName = #"Alto II" }
+        \new Voice = "altoII"
+        \altoIIMusic
+
         \new Lyrics \lyricsto "altoII" { \altoIILyrics }
       >>
-      \new Staff = "Staff_tenor" {
-        \set Staff.instrumentName = #"Tenor"
+
+      \new Staff = "Staff_tenor" \with { instrumentName = #"Tenor" }
         \new Voice = "tenor"
         \tenorMusic
-      }
+
       \new Lyrics \lyricsto "tenor" { \tenorLyrics }
     >>
     \new StaffGroup = "StaffGroup_strings" <<
       \new GrandStaff = "GrandStaff_violins" <<
-        \new Staff = "Staff_violinI" {
-          \set Staff.instrumentName = #"Violin I"
-          \violinIMusic
-        }
-        \new Staff = "Staff_violinII" {
-          \set Staff.instrumentName = #"Violin II"
-          \violinIIMusic
-        }
+        \new Staff = "Staff_violinI" \with { instrumentName = #"Violin I" }
+        \violinIMusic
+
+        \new Staff = "Staff_violinII" \with { 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
-      }
+
+      \new Staff = "Staff_viola" \with { instrumentName = #"Viola" }
+      \violaMusic
+
+      \new Staff = "Staff_cello" \with { instrumentName = #"Cello" }
+      \celloMusic
+
+      \new Staff = "Staff_bass" \with { instrumentName = #"Double Bass" }
+      \bassMusic
     >>
   >>
   \layout { }