resolve merge

[lilypond.git] / input / lsr / orchestra,-choir-and-piano-template.ly

diff --git a/input/lsr/orchestra,-choir-and-piano-template.ly b/input/lsr/orchestra,-choir-and-piano-template.ly
deleted file mode 100644 (file)
index 158af83..0000000
--- a/input/lsr/orchestra,-choir-and-piano-template.ly
+++ /dev/null
@@ -1,163 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.12.3"
-
-\header {
-  lsrtags = "template"
-
-  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.
-
-"
-  doctitle = "Orchestra, choir and piano template"
-} % begin verbatim
-
-#(set-global-staff-size 17)
-
-\paper {
-  indent = 3.0\cm
-  short-indent = 1.5\cm
-}
-
-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 }
-
-\score {
-  \new GrandStaff = "GrandStaff_score" <<
-    \new StaffGroup = "StaffGroup_woodwinds" <<
-      \new Staff = "Staff_flute" {
-        \set Staff.instrumentName = #"Flute"
-        \fluteMusic
-      }
-      \new Staff = "Staff_oboe" {
-        \set Staff.instrumentName = #"Oboe"
-        \oboeMusic
-      }
-      \new Staff = "Staff_clarinet" {
-        \set Staff.instrumentName = \markup \concat { "Clarinet in B" \flat }
-        \transposition bes
-        \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_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 PianoStaff <<
-      \set PianoStaff.instrumentName = #"Piano"
-      \new Staff { \pianoRHMusic }
-      \new Staff {
-        \clef bass
-        \pianoLHMusic
-      }
-    >>
-    \new ChoirStaff = "ChoirStaff_choir" <<
-      \new Staff = "Staff_soprano" {
-        \set Staff.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 Lyrics \lyricsto "altoI" { \altoILyrics }
-        \new Staff = "Staff_altoII" {
-          \set Staff.instrumentName = #"Alto II"
-          \new Voice = "altoII"
-          \altoIIMusic
-        }
-        \new Lyrics \lyricsto "altoII" { \altoIILyrics }
-      >>
-      \new Staff = "Staff_tenor" {
-        \set Staff.instrumentName = #"Tenor"
-        \clef "treble_8"
-        \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_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
-      }
-    >>
-  >>
-}