patch::: 1.3.133.jcn1

[lilypond.git] / mutopia / Coriolan / coriolan.ly

diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index f55fe473bfc5f0d646607b297129e5547eaf282d..d3a93330399974bf0438995b57d90862ce596a4d 100644 (file)
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -1,19 +1,14 @@
-\header{
-filename =      "coriolan.ly";
-% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
-description =   "";
-composer =      "Ludwig van Beethoven (1770-1792)";
-enteredby =     "JCN";
-copyright =     "public domain";
+\version "1.3.120";
 
+instrument = "Orchestra"
+% instrument = ""
 
-}
-
-\version "0.1.9";
-
+\include "header.ly"
 \include "global.ly"
 
-\include "contrabasso.ly"
+\include "paper16.ly"
+
+\include "bassi.ly"
 \include "clarinetti.ly"
 \include "corni.ly"
 \include "fagotti.ly"
@@ -21,53 +16,118 @@ copyright =         "public domain";
 \include "oboi.ly"
 \include "timpani.ly"
 \include "trombe.ly"
-\include "viola.ly"
+\include "viole.ly"
 \include "violino-1.ly"
 \include "violino-2.ly"
-\include "violoncello.ly"
 
-legno = \type Staff_group = legno_group <
-       \$flauti_staff
-       \$oboi_staff
-       \$clarinetti_staff
-       \$fagotti_staff
->
 
-koper = \type Staff_group = koper_group <
-       \$corni_staff
-       \$trombe_staff
+legniGroup =  \context StaffGroup = legni_group <
+       \flautiStaff
+       \oboiStaff
+       \clarinettiStaff
+       \fagottiStaff
 >
 
-$timpani_g = \type Staff_group = timpani_group <
-       \$timpani_staff
+ottoniGroup =  \context StaffGroup = otonni_group <
+       \corniStaff
+       \trombeStaff
 >
 
-$violini = \type Grandstaff = violini_group <
-       \$violino1_staff
-       \$violino2_staff
+timpaniGroup =  \context StaffGroup = timpani_group <
+       \timpaniStaff
+       % Force a staff bracket (?)
+       \context Staff = timpany \End
 >
 
-$bassi = \type Grandstaff = violine_group <
-       \$violoncello_staff
-       \$contrabasso_staff
+violiniGroup =  \context GrandStaff = violini_group <
+       \violinoIStaff
+       \violinoIIStaff
 >
 
-strijkers = \type Staff_group = strijkers_group <
-       \$violini
-       \$viola_staff
-       \$bassi
+archiGroup =  \context StaffGroup = archi_group <
+       \violiniGroup
+       \violeGroup
+       \bassiGroup
 >
 
+
 \score{
        <
-               \$legno
-               \$koper
-               \$timpani_g
-               \$strijkers
+               \legniGroup
+               \ottoniGroup
+               \timpaniGroup
+               \archiGroup
        >
-       \paper{}
-       \midi{
-               \tempo 4 = 160;
+       \header{
+               instrument = "";
        }
+       \include "coriolan-paper.ly"
+%      \include "coriolan-midi.ly"
 }
 
+
+
+%%
+%% Hopefully, this can be junked when part-combiner+midi+dynamics work ok.
+%%
+\score{
+       <
+       \global
+       \context Staff=flauti <
+               \property Staff.midiInstrument = #"flute"
+               \flautoI
+               \flautoII
+       >
+       \context Staff=oboi <
+               \property Staff.midiInstrument = #"oboe"
+               \oboeI
+               \oboeII
+       >
+       \context Staff=clarinetti <
+               \property Staff.midiInstrument = #"clarinet"
+               \property Staff.transposing = #-2
+               \clarinettoI
+               \clarinettoII
+       >
+       \context Staff=fagotti <
+               \property Staff.midiInstrument = #"bassoon"
+               \fagottoI
+               \fagottoII
+       >
+       \context Staff=corni <
+               \property Staff.midiInstrument = #"french horn"
+               \property Staff.transposing = #3
+               \cornoI
+               \cornoII
+       >
+       \context Staff=trombe <
+               \property Staff.midiInstrument = #"trumpet"
+               \tromboI
+               \tromboII
+       >
+       \context Staff=timpani <
+               \property Staff.midiInstrument = #"timpani"
+               \timpani
+       >
+       \context Staff=violini <
+               \property Staff.midiInstrument = #"violin"
+               \violinoI
+               \violinoII
+       >
+       \context Staff=violi <
+               \property Staff.midiInstrument = #"viola"
+               \violaI
+               \violaII
+       >
+       \context Staff=violoncello <
+               \property Staff.midiInstrument = #"cello"
+               \violoncello
+       >
+       \context Staff=contrabasso <
+               \property Staff.midiInstrument = #"contrabass"
+               \property Staff.transposing = #-12
+               \contrabasso
+       >
+       >
+       \include "coriolan-midi.ly"
+}