X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mutopia%2FCoriolan%2Fcoriolan.ly;h=d3a93330399974bf0438995b57d90862ce596a4d;hb=701c5e3d2e865da2a464b6460a30f14f061089ea;hp=9b117f67cfdee6a8ceedcc1a632cda9b8d20994f;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git

diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index 9b117f67cf..d3a9333039 100644
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -1,19 +1,11 @@
-%% run this through ly2dvi (afterwards -- urg ly2dvi should tee lily output)
-%% on my printer, I use dvips -O 5mm,0mm -o x.ps coriolan
+\version "1.3.120";
 
-\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.93";
+instrument = "Orchestra"
+% instrument = ""
 
+\include "header.ly"
 \include "global.ly"
+
 \include "paper16.ly"
 
 \include "bassi.ly"
@@ -24,37 +16,37 @@ copyright =	 "public domain";
 \include "oboi.ly"
 \include "timpani.ly"
 \include "trombe.ly"
-\include "violi.ly"
+\include "viole.ly"
 \include "violino-1.ly"
 \include "violino-2.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
 >
 
-archiGroup = \context StaffGroup = archi_group <
+archiGroup =  \context StaffGroup = archi_group <
 	\violiniGroup
-	\violiGroup
+	\violeGroup
 	\bassiGroup
 >
 
@@ -67,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"
 }
 
+
+
+%%
+%% 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"
+}