patch::: 1.3.133.jcn1

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

diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index ea8f927ad3aefe468d6b9b473eb49b7d8ac5af9b..d3a93330399974bf0438995b57d90862ce596a4d 100644 (file)
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -1,19 +1,14 @@
-\header{
-filename =      "coriolan.ly";
-title =         "Ouverture"; 
-subtitle = "Coriolan";
-opus = "Op. 62";
-composer =      "Ludwig van Beethoven (1770-1827)";
-enteredby =     "JCN";
-copyright =     "public domain";
-}
+\version "1.3.120";
 
-\version "1.3.59";
+instrument = "Orchestra"
+% instrument = ""
 
+\include "header.ly"
 \include "global.ly"
+
 \include "paper16.ly"
 
-\include "contrabasso.ly"
+\include "bassi.ly"
 \include "clarinetti.ly"
 \include "corni.ly"
 \include "fagotti.ly"
@@ -21,78 +16,37 @@ copyright =  "public domain";
 \include "oboi.ly"
 \include "timpani.ly"
 \include "trombe.ly"
-\include "viola-1.ly"
-\include "viola-2.ly"
+\include "viole.ly"
 \include "violino-1.ly"
 \include "violino-2.ly"
-\include "violoncello.ly"
 
 
-legniGroup = \context StaffGroup = legni_group <
+legniGroup =  \context StaffGroup = legni_group <
        \flautiStaff
        \oboiStaff
        \clarinettiStaff
        \fagottiStaff
 >
 
-ottoniGroup = \context StaffGroup = otonni_group <
+ottoniGroup =  \context StaffGroup = otonni_group <
        \corniStaff
        \trombeStaff
 >
 
-timpaniGroup = \context StaffGroup = timpani_group <
+timpaniGroup =  \context StaffGroup = timpani_group <
        \timpaniStaff
        % Force a staff bracket (?)
-       \context Staff = timpany { \skip 1*314; }
+       \context Staff = timpany \End
 >
 
-violiniGroup = \context GrandStaff = violini_group <
+violiniGroup =  \context GrandStaff = violini_group <
        \violinoIStaff
        \violinoIIStaff
 >
 
-violiGroup = \context PianoStaff = violi_group \notes <
-       \context StaffCombineStaff=one {
-               \clef "alto"; 
-               \key es \major;
-               \skip 1*314; 
-               \bar "|."; 
-       }
-       \context StaffCombineStaff=two {
-               \clef "alto"; 
-               \key es \major;
-               \skip 1*314; 
-               \bar "|."; 
-       }
-
-       \context StaffCombineStaff=one \partcombine StaffCombineStaff
-               \context StaffCombineVoice=one \violaI
-               \context StaffCombineVoice=two \violaII
->
-
-bassiGroup = \context PianoStaff = bassi_group \notes <
-       \context StaffCombineStaff=one {
-               \clef "bass"; 
-               \key es \major;
-               \skip 1*314; 
-               \bar "|."; 
-       }
-       \context StaffCombineStaff=two {
-               \clef "bass"; 
-               \key es \major;
-               \skip 1*314; 
-               \bar "|."; 
-       }
-
-       \context StaffCombineStaff=one \partcombine StaffCombineStaff
-               \context StaffCombineVoice=one \violoncello
-               \context StaffCombineVoice=two \contrabasso
->
-
-
-archiGroup = \context StaffGroup = archi_group <
+archiGroup =  \context StaffGroup = archi_group <
        \violiniGroup
-       \violiGroup
+       \violeGroup
        \bassiGroup
 >
 
@@ -105,14 +59,75 @@ archiGroup = \context StaffGroup = archi_group <
                \archiGroup
        >
        \header{
-               title = "Coriolan";
-               subtitle = "Ouverture"; 
-               opus = "Opus 62";
-               composer = "Ludwig van Beethoven (1770-1827)";
-               enteredby = "JCN";
-               copyright = "public domain";
+               instrument = "";
        }
        \include "coriolan-paper.ly"
-       \include "coriolan-midi.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"
+}