From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 7 Mar 2000 22:59:44 +0000 (+0100)
Subject: patch::: 1.3.30.jcn1
X-Git-Tag: release/1.3.31~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2e6337e7736c3fa1a5e6e0ea1dce1658b37f26a0;p=lilypond.git

patch::: 1.3.30.jcn1

1.3.30.jcn1
===========

* More Coriolan: flute-1,2; oboe-1,2; clarinet-1,2;
  fixes and remainder french horn-1,2; trombone-1,2;
  fagotto-1,2; timpani; and several fixes.
---
Generated by janneke@gnu.org,
From = lilypond-1.3.30, To = lilypond-1.3.30.jcn1

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.30.jcn1.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
---

diff --git a/CHANGES b/CHANGES
index e8cdce201b..3bba7a6711 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,15 @@
-1.3.30.mb1
+--- ../lilypond-1.3.30/CHANGES	Mon Mar  6 12:10:00 2000
+++ b/CHANGES	Tue Mar  7 23:59:44 2000
+@@ -1,3 +1,9 @@
+1.3.30.jcn1
+===========
+
+* More Coriolan: flute-1,2; oboe-1,2; clarinet-1,2; 
+  fixes and remainder french horn-1,2; trombone-1,2;
+  fagotto-1,2; timpani; and several fixes.
+ 
+ 1.3.29.hwn1
+ ===========1.3.30.mb1
 =========
 
 * Fixed the page layout, reintroducing space for the header and
diff --git a/TODO b/TODO
index f51f179fd6..1ef055e129 100644
--- a/TODO
+++ b/TODO
@@ -14,7 +14,9 @@ Grep -i for TODO, FIXME and ugh/ugr/urg.
     broken
 . * use ports iso. iostream. 
 . * hard constraints for  broken slurs to.
-. * mondrup
+. * Staff_margin_engraver placement is broken for Staff.instr(ument)
+. * Bracket/brace placement and stacking is broken
+. * Mondrup:
 
 - In some cases I don't get the large textsize within note examples I request.
 Consider for example the entry 'c clef', where \property Lyrics.textStyle = "large"
diff --git a/VERSION b/VERSION
index a1633f6851..12548aeb77 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=30
-MY_PATCH_LEVEL=mb1
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly
index dc0bcd1f98..1981674bcd 100644
--- a/input/test/hara-kiri.ly
+++ b/input/test/hara-kiri.ly
@@ -1,8 +1,8 @@
 \version "1.3.5";
 
 toeter_i = \notes\relative c <{
-		\property Staff.instrument = "Toeters"
-		\property Staff.instr = "Ttr." }
+		\property Staff.instrument = #"Toeters"
+		\property Staff.instr = #"Ttr." }
 	\context Voice = lower { \stemdown s1*6 }
 	\context Voice = upper { \stemup s1*6 }
 	\context Voice = together  { 
@@ -35,13 +35,13 @@ toeters = \context Staff = toeters <
  
 zager = \context Staff = zager \notes \relative c'' {
 	\clef treble;
-	\property Staff.instrument = "Zager"
-	\property Staff.instr = "Zag."
+	\property Staff.instrument = #"Zager"
+	\property Staff.instr = #"Zag."
 	c4^"zag" d e f 
-	\property Staff.instr = "Zag. \& Zog."
+	\property Staff.instr = #"Zag. \\& Zog."
 	f e d c 
 	c d e f 
-	\property Staff.instr = "Zag."
+	\property Staff.instr = #"Zag."
 	\stemup
 	f e d c 
 	c d e f 
@@ -50,8 +50,8 @@ zager = \context Staff = zager \notes \relative c'' {
 
 zoger = \context Staff = zoger \notes \relative c'' {
 	\clef treble;
-	\property Staff.instrument = "Zoger"
-	\property Staff.instr = "Zog."
+	\property Staff.instrument = #"Zoger"
+	\property Staff.instr = #"Zog."
 	c4^"zog" d e f 
 	\skip 1*2;
 
diff --git a/ly/engraver.ly b/ly/engraver.ly
index 44c508c1ba..fda4b54200 100644
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -55,10 +55,11 @@ StaffContext=\translator {
 	The Staff_margin_engraver puts the name of the instrument
 	(\property Staff.instrument; Staff.instr for subsequent lines)
 	to the left of a staff.
-%}
-%{
+	Usually, you only want this in the full score, not in the parts.
+
 	\consists "Staff_margin_engraver";
 %}
+
 	defaultClef = #"treble"
 
 	\consists "Separating_line_group_engraver";
@@ -298,6 +299,7 @@ HaraKiriStaffContext = \translator {
 	\StaffContext
 	\remove "Axis_group_engraver";
 	\consistsend "Hara_kiri_engraver";	  
+	\consists "Staff_margin_engraver";
 	\accepts "Voice";
 };
 
diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly
index ee3fdac7c0..1701fdfcda 100644
--- a/mutopia/Coriolan/clarinetti-part.ly
+++ b/mutopia/Coriolan/clarinetti-part.ly
@@ -1,4 +1,4 @@
-header{
+\header{
 filename =	 "clarinetti-part.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly
index 0c08f9fe15..d69be00afe 100644
--- a/mutopia/Coriolan/clarinetti.ly
+++ b/mutopia/Coriolan/clarinetti.ly
@@ -15,13 +15,14 @@ copyright =	 "public domain";
 \include "clarinetto-2.ly"
 
 $clarinetti_staff = \context Staff = clarinetti <
-	\property Staff.midiInstrument = "clarinet"
-	\property Staff.instrument = "2 Clarinetti (B\\textflat)"
-	\property Staff.instr = "Cl. (B\\textflat)"
+	\property Staff.midiInstrument = #"clarinet"
+	\property Staff.instrument = #"2 Clarinetti (B\\textflat)"
+	\property Staff.instr = #"Cl. (B\\textflat)"
 	% urg: can't; only My_midi_lexer:<non-static> () parses pitch?
 	%\property Staff.transposing = "bes"
-	\property Staff.transposing = -3
-	\notes \context Voice=one < 
+	\property Staff.transposing = #-2
+	%\notes \context Voice=clarinetti < 
+	\notes \context Staff=clarinetti < 
 		\time 4/4;
 		\key F;
 		\$clarinetto1
diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly
index b875cabb01..6e6b0e148a 100644
--- a/mutopia/Coriolan/clarinetto-1.ly
+++ b/mutopia/Coriolan/clarinetto-1.ly
@@ -12,11 +12,223 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 clarinetto1 = \notes \relative c {
-	R1 *2 | d''4-.\ff r r2 | R1 *3 | e4-. r r2 | R1 *3 |
-	f4-. r r2 | r1 | f4-. r r2 | e4-. r r2 | R1 *4 |
-	bes'2\p_"\ \ \ cresc." ( a | 
-	%20
-	)gis2. a4-.\f | R1*13 | d1\ff % ~ |
-	%35
+	R1 *2 |
+	d''4-.\ff r r2 |
+	R1 *3 |
+	e4-. r r2 |
+	R1 *3 |
+	f4-. r r2 |
+	r1 |
+	f4-. r r2 |
+	e4-. r r2 |
+	R1 *4 |
+	bes2\p-"\ \ \ cresc." ( a |
+	)gis2. a4-.\f |
+	R1*13 |
+	d1\ff ~ |
+	d4(f, bes)a|
+	a'4. r8 a4. r8|
+	g4. r8 d4. r8|
+	d4. r8 bes4. r8|
+	c4. r8 d4. r8|
+	f2\sf r|
+	f\sf r|
+	e\sf r|
+	e\sf r|
+	es1\sf|
+	d\sf|
+	c2. c4\sf|
+	c2. c4\sf|
+	c2. c4\sf|
+	c2. c4\sf|
+	c4 r r2|
+	R1*5|
+	a'2.\p-"\ \ \ cresc." ( bes4|
+	a g e)c|
+	c'2.( d4|
+	c2)bes|
+	a2.(bes4|
+	a g e)c|
+	c'2\ff es,|
+	d1~|
+	d\pp~|
+	d~|
+	d~|
+	d|
+	bes2.-"cresc."( c4|
+	bes a fis)d|
+	d'2\ff f|
+	e1~|
+	e4\p r r2|
+	R1*11|
+	f2.\ff()e4|
+	d(c d)c|
+	f2.()e4|
+	d(c d)c|
+	bes2.()a4|
+	g(f g)f|
+	bes2.()a4|
+	g(f g)f|
+	r r8 bes bes4\sf()c|
+	r r8 bes bes4\sf()c|
+	r r8 bes bes4\sf()c|
+	r r8 bes bes4\sf()c|
+	bes2 b|
+	e a,|
+	d1~|
+	d|
+	d4 r f r|
+	d r e r|
+	a,\p r r2|
+	r r4 r8 e'\f|
+	e4 r r2|
+	r r4 r8 e|
+	e4 r r2|
+	R1*3|
+	c4\f r b r|
+	a r g r|
+	f r a r8 c|
+	c4 r8 e e4 r8 e|
+	e1~|
+	e|
+	e4. e8 e4 r8 e|
+	e4 r8 e e4 r8 e|
+	e4\p r r2|
+	R1*3|
+	r4 r8 es d4 r8 a |
+	bes4 r r2|
+	r4 r8 es d4 r8 a|
+	fis4 r r2|
+	R1*3|
+	r4 r8 g'8 f4 r8 c|
+	d4 r r2|
+	R1*2|
+	r4 r8 as'-"cresc" g4 r8 d|
+	es4 r r2|
+	R1*5|
+	g,4 r r r8 f|
+	es4 r r r8 d|
+	c4 r8 c' c4 r8 c|
+	c4 r8 c c4 r8 c|
+	R1*4|
+	bes4\ff r8 es d4 r8 a|
+	g4 r8 c bes4 r8 f|
+	es4 r8 a g4 r8 bes|
+	a4 r8 a a4 r8 a|
+	g4 r r2|
+	R1|
+	es'4-.\ff r r2|
+	R1*3|
+	e2\sf r|
+	e\sf r|
+	R1*3|
+	a,2\ff r|
+	a\ff r|
+	R1*2|
+	r2 r4 es'\ff(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. f4\sf(|
+	)e2. f4\sf(|
+	)e2. f4\sf(|
+	)e2. f4\sf(|
+	)e2. f4\sf(|
+	)e4 r r2|
+	R1*9|
+	fis2.\p-"\ \ \ cresc."(g4|
+	fis e cis)a|
+	a2\ff c|
+	b1~|
+	b4\pp r r2|
+	R1*5|
+	b2\ff d|
+	cis1~|
+	cis\p~|
+	cis~|
+	cis~|
+	cis|
+	d2.\f(\>c4|
+	\!c\p bes2)a4|
+	R1|
+	r2 r4 d(|
+	)cis r r2|
+	r r4 r8 cis|
+	d4-"cresc." r r2|
+	r r4 r8 d|
+	e4 r r r8 e|
+	f4 r r r8 f|
+	cis2.\ff()d4|
+	cis(d cis)d|
+	cis2.\ff()d4|
+	cis(d cis)d|
+	es2.()d4|
+	c(bis c)bes|
+	es2.()d4|
+	c(bis c)bes|
+	r2 es4\sf()d|
+	r2 es4\sf()d|
+	r2 es4\sf()d|
+	r2 es4\sf()d|
+	es2 bis|
+	d b|
+	cis d|
+	e d|
+	cis4 r bes r|
+	g r a r |
+	d,\p r r2|
+	r r4 r8 a'\f|
+	a4 r r2|
+	r r4 r8 a\f|
+	a4 r r2|
+	R1*3|
+	f'4\f r8 bes a4 r8 e|
+	d4 r8 g f4 r8 c|
+	bes4 r r2|
+	R1*11|
+	f'2.\p-"\ \ \ cresc."(g4|
+	f e cis)a|
+	a1|
+	b\f~|
+	b|
+	c\f~|
+	c\p|
+	d\f~|
+	d\p-"\ \ \ cresc."~|
+	d~|
+	d~|
+	d~|
+	d4.\ff e8 f4.\sf()e8|
+	r4 r8 e e4.\sf()e8|
+	r4 r8 fis8 g4.\sf()fis8|
+	r4 r8 fis8 g4.\sf()fis8|
+	r4 r8 fis8 a4.\sf()g8|
+	r4 r8 g8 bes4.\sf()a8|
+	f4.-"sempre\ \ \ \ \ \ \ "\ff cis8 d4. bes8|
+	a4. bes8 a4. g'8|
+	f4. cis8 d4. bes8|
+	a4. bes8 a4. g'8|
+	f4 r8 e f4 r8 cis|
+	d4 r8 cis d4 r8 cis|
+	d1~|
+	d|
+	d4-. r r2|
+	R1|
+	d1~ d|
+	e4-. r r2|
+	R1|
+	d1~|
+	d|
+	f4-. e-. r2|
+	R1|
+	d4-. d-. r2|
+	d4-. d-. r2|
+	d4-"dim." r e r|
+	R1|
+	a,4\p r r2|
+	R1|
+	a4 r r2|
+	R1|
+	d,4\pp r r2|
+	R1*18|
 }
-
diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly
index 4fdf51d8dc..baacc0aa9c 100644
--- a/mutopia/Coriolan/clarinetto-2.ly
+++ b/mutopia/Coriolan/clarinetto-2.ly
@@ -12,10 +12,199 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 clarinetto2 = \notes \relative c { 
-	R1*2 bes''4-.\ff r r2 | R1*3 | cis4-. r r2 | R1 *3 | 
-	d4-. r r2 | r1 | d4-. r r2 | cis4-. r r2 | R1 *5 |
-	%20
-	r2 r4 cis,4-. | R1*13 | g1\ff % ~ |
-	%35
+	R1*2 bes''4-.\ff r r2 |
+	R1*3 |
+	cis4-. r r2 |
+	R1 *3 |
+	d4-. r r2 |
+	r1 |
+	d4-. r r2 |
+	cis4-. r r2 |
+	R1 *5 |
+	r2 r4 cis,4-. |
+	R1*13 |
+	g'1\ff ~ |
+	g4( f g)f|
+	a4. r8 a4. r8|
+	e'4. r8 a,4. r8|
+	a4. r8 g4. r8|
+	a4. r8 bes4. r8|
+	d2\sf r|
+	d\sf r|
+	cis\sf r|
+	cis\sf r|
+	c1\sf|
+	b|
+	g2. as4\sf(|
+	)g2. as4\sf(|
+	)g2. as4\sf(|
+	)g2. as4\sf(|
+	)g4 r r2|
+	R1*9|
+	%a deux; urg: copied clarinetto-1(60,61)|
+	a'2.(bes4|
+	a g e)c|
+	c2\ff es,|
+	d1~|
+	d\p~|
+	d~|
+	d~|
+	d|
+	%a deux|
+	bes'2.-"cresc."(c4|
+	bes a fis)d|
+	d'2\ff f,|
+	e1~|
+	e4\p r r2|
+	R1*11|
+	f2.\ff()e4|
+	d'(c d)c|
+	f,2.()e4|
+	d'(c d)c|
+	R1*4|
+	r4 r8 f, f4\sf()a|
+	r4 r8 f f4\sf()a|
+	r4 r8 f f4\sf()a|
+	r4 r8 f f4\sf()a|
+	b2 gis|
+	a fis|
+	g f|
+	b a|
+	gis4 r f r|
+	d r e r |
+	a,\p r r2|
+	r r4 r8 b'\f|
+	c4 r r2|
+	r r4 r8 b\f|
+	c4 r r2|
+	R1*3|
+	%a deux; urg|
+	c4\f r b r|
+	a r g r |
+	f r a r8 a|
+	a4 r8 e e4 r8 e|
+	c'1~|
+	c|
+	c4. c8 c4 r8 c|
+	c4 r8 c c4 r8 c|
+	c4\p r r2|
+	R1*21|
+	%a deux; urg|
+	g4\f r r r8 f|
+	es4 r r r8 d|
+	c4 r8 fis g4 r8 g|
+	a4 r8 a a4 r8 a|
+	R1*4|
+	%a deux|
+	b4\ff r8 es d4 r8 a|
+	g4 r8 c bes4 r8 f|
+	es4 r8 a g4 r8 g|
+	g4 r8 g fis4 r8 fis|
+	g4 r r2|
+	R1|
+	c4-.\ff r r2|
+	R1*3|
+	g2\sf r|
+	g\sf r|
+	R1*3|
+	fis2\ff r|
+	fis\sf r|
+	R1*2|
+	r2 r4 es4\ff(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. f4\sf(|
+	)e2. f4\sf(|
+	)e2. f4\sf(|
+	)e2. f4\sf(|
+	)e2. f4\sf(|
+	)e4 r r2|
+	R1*9|
+	fis2.\p-"\ \ \ cresc."( g4|
+	fis e cis)a|
+	%a deux; urg|
+	a'2\ff c|
+	b1~|
+	b4 r r2|
+	R1*5|
+	b2\ff d|
+	cis1~|
+	cis4\p r r2|
+	R1*13|
+	e,2.\ff()f4|
+	g(f g)f|
+	e2.\ff()f4|
+	g(f g)f|
+	es2.()d4|
+	c(bes c)bes|
+	es2.()d4|
+	c(bes c)bes|
+	r2 es'4\sf()d|
+	r2 es4\sf()d|
+	r2 es4\sf()d|
+	r2 es4\sf()d|
+	bes2 a~|
+	a g~|
+	g bes~|
+	bes g|
+	%a deux; urg|
+	g4 r bes r|
+	g r a r|
+	d,\p r r2|
+	r r4 r8 e\f|
+	f4 r r2|
+	r r4 r8 e\f|
+	f4 r r2|
+	R1*3|
+	f4\f r8 bes a4 r8 e|
+	d4 r8 g f4 r8 c|
+	bes4 r r2|
+	R1*14|
+	bes'1\f~|
+	bes4\p r r2|
+	%a deux; urg|
+	c1\f~|
+	c\p|
+	a1\f|
+	d,\p-"\ \ \ cresc."~|
+	d~|
+	d~|
+	d~|
+	d4.\ff e8 f4.\sf()e8|
+	r4 r8 e f4.\sf()e8|
+	r4 r8 fis g4.\sf()fis8|
+	r4 r8 fis g4.\sf()fis8|
+	r4 r8 fis a4.\sf()g8|
+	r4 r8 g bes4.\sf()a8|
+	%a deux; urg copied clarinetto-1(270,273)|
+	f'4.-"sempre\ \ \ \ \ \ \ "\ff cis8 d4. bes8||
+	a4. bes8 a4. g'8||
+	f4. cis8 d4. bes8||
+	a4. bes8 a4. g'8||
+	f4 r8 cis d4 r8 e,|
+	f4 r8 e f4 r8 e|
+	d1~|
+	d|
+	bes'4-. r r2|
+	R1|
+	d,1~|
+	d|
+	cis'4-. r r2|
+	R1|
+	d,1~|
+	d|
+	d'4-. cis-. r2|
+	R1|
+	a4-. c-. r2|
+	bes4-. c-. r2|
+	bes4-"dim." r a r|
+	R1|
+	a4\p r r2|
+	R1|
+	g4 r r2|
+	R1|
+	d4\pp r r2|
+	R1*18|
 }
 
diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly
index f10bb426bd..f17711f794 100644
--- a/mutopia/Coriolan/contrabasso.ly
+++ b/mutopia/Coriolan/contrabasso.ly
@@ -44,7 +44,8 @@ contrabasso = \notes \relative c {
 	%60
 	)es4 r r r8 es(|
 	)as,4 r r r8 as(|
-	)g2\ff f | e c' |
+	)g2\ff f |
+	e c' |
 	f,4\p r r r8 f(|
 	%65
 	)bes4 r r r8 bes(|
@@ -53,34 +54,56 @@ contrabasso = \notes \relative c {
 	)f4-"cresc." r r r8 f(|
 	)bes4 r r r8 bes(|
 	%70
-	)as2\ff g | fis d' |
+	)as2\ff g |
+	fis d' |
 	g,4\p-"cresc." r r r8 g(|
 	)c4 r r r8 c(|
 	% )<b1\sf\> { s2 s4 \!s8}> |
 	)b1 |
 	%75
 	\skip 1*3; |
-	d4\pp r d r | d r d r | d r d-"cresc." r | 
-	d r d r | d r d r | d r d r | 
+	d4\pp r d r |
+	d r d r |
+	%80
+	d r d-"cresc." r |
+	d r d r |
+	d r d r |
+	d r d r |
 	\skip 1*8; |
-	c4 r r2 | c4 r r2 | c4 r r2 | c4 r r2 |
+	c4 r r2 |
+	c4 r r2 |
+	c4 r r2 |
+	%95
+	c4 r r2 |
 	\skip 1*6; |
-	g4\p r r2 | r2 r4 r8 fis\f |
-	g4 r r2 | r2 r4 r8 fis\f |
-	g4 r r2 | 
-	R1*3 | 
-	\skip 1*8; | g4\p r r2 |
+	g4\p r r2 |
+	r2 r4 r8 fis\f |
+	%105
+	g4 r r2 |
+	r2 r4 r8 fis\f |
+	g4 r r2 |
+	R1*3 |
+	% urg, aargh burp: skip 'same as cello' part
+	\skip 1*8; |
+
+	g4\p r r2 |
+	
 	% urg, this is *rest*, not skip: 
 	% need own staff for rests, mustn't collapse to one cello staff!
 	%120 - 1
 	R1*21 |
+
 	% play with cello
 	\skip 1*4; |
 	f'4\p r r2 |
 	R1*3 |
 	\skip 1*10; |
-	b,2\sf r | b2\sf r | R1*3 |
-	bes2\ff r | bes2\sf r | R1*2 | 
+	b,2\sf r |
+	b2\sf r |
+	R1*3 |
+	bes2\ff r |
+	bes2\sf r |
+	R1*2 |
 	r2 r4 bes\ff( |
 	)as2. bes4\sf(|
 	)as2. bes4\sf(|
@@ -90,7 +113,8 @@ contrabasso = \notes \relative c {
 	)b2. c4\sf(|
 	)b2. c4\sf(|
 	)b2. c4\sf(|
-	)b4 r r2 | R1 |
+	)b4 r r2 |
+	R1 |
 	c4\p r r r8 c(|
 	)f,4 r r r8 f(|
 	%180
@@ -103,7 +127,8 @@ contrabasso = \notes \relative c {
 	)b4 r r r8 b(|
 	)c4 r r r8 c(|
 	)f,4 r r r8 f(|
-	)e2\ff d' | cis a | 
+	)e2\ff d' |
+	cis a |
 	%190
 	d4\p r r r8 d(|
 	)g,4 r r r8 g(|
@@ -112,37 +137,54 @@ contrabasso = \notes \relative c {
 	)d4-"cresc." r r r8 d(|
 	%195
 	)g,4 r r r8 g( |
-	)d2\ff e' | dis b | 
+	)d2\ff e' |
+	dis b |
 	e4\p r r r8 e(|
 	% )a4\< r r r8 a(|
 	%200
-	% g1 | <f {s2 s4 \!s8}> | 
+	% g1 |
+	<f {s2 s4 \!s8}> |
 	)a4 r r r8 a(|
 	%200
-	)g1 | f | 
+	)g1 |
+	f |
 	\skip 1*18; |
 	%220
-	f4 r r2 | f'4 r r2 | f4 r r2 | f4 r r2 | 
+	f4 r r2 |
+	f'4 r r2 |
+	f4 r r2 |
+	f4 r r2 |
 	\skip 1*6; |
-	c,4\p r r2 | r2 r4 r8 b\f |
-	c4 r r2 | r2 r4 r8 b\f |
-	c4 r r2 | 
+	c,4\p r r2 |
+	r2 r4 r8 b\f |
+	c4 r r2 |
+	r2 r4 r8 b\f |
+	c4 r r2 |
 	R1*3 |
 	\skip 1*59; |
-	r2 r4 f, | c' r r2 |
-	r2 r4 f, | c' r r2 | R1 | 
-	f,4 r r2 | R1 |
-	c'4 r r2 | R1 |
-	f,4 r r2 | R1*3 | c'4\pp r r2 | R1 |
+	r2 r4 f, |
+	c' r r2 |
+	r2 r4 f, |
+	c' r r2 |
+	R1 |
+	f,4 r r2 |
+	R1 |
+	c'4 r r2 |
+	R1 |
+	f,4 r r2 |
+	R1*3 |
+	c'4\pp r r2 |
+	R1 |
 	c4 r r2 |
 	c4 r r2 |
 	c4 r r2 |
 }
 
 $contrabasso_staff = \context Staff = contrabasso <
-	\property Staff.midiInstrument = "contrabass"
-	\property Staff.instrument = "Contrabasso"
-	\property Staff.instr = "Cb."
+	\property Staff.midiInstrument = #"contrabass"
+	\property Staff.instrument = #"Contrabasso"
+	\property Staff.instr = #"Cb."
+	\property Staff.transposing = #-12
 	\clef "bass";
 	\notes \context Voice=one< 
 		\global
diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly
index 9b1377d666..7b8d3cdadd 100644
--- a/mutopia/Coriolan/coriolan-part-paper.ly
+++ b/mutopia/Coriolan/coriolan-part-paper.ly
@@ -1,6 +1,9 @@
 \paper {
 	\translator { \OrchestralPartStaffContext }
-	\translator { \VoiceContext beamAuto=0; }
-	\translator { \ScoreContext skipBars = 1; }
-	castingalgorithm = \Wordwrap;
+	\translator { 
+		\VoiceContext
+%		noAutoBeam = ##t 
+		\consists "Line_number_engraver";
+	}
+	\translator { \ScoreContext skipBars = ##t }
 }
diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index bf55e888cf..fd852672ae 100644
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -25,14 +25,14 @@ copyright =	 "public domain";
 \include "violino-2.ly"
 \include "violoncello.ly"
 
-legno = \context StaffGroup = legno_group <
+legni = \context StaffGroup = legni_group <
 	\$flauti_staff
 	\$oboi_staff
 	\$clarinetti_staff
 	\$fagotti_staff
 >
 
-koper = \context StaffGroup = koper_group <
+ottoni = \context StaffGroup = otonni_group <
 	\$corni_staff
 	\$trombe_staff
 >
@@ -57,7 +57,7 @@ $bassi = \context GrandStaff = bassi_group <
 	\$contrabasso_staff
 >
 
-strijkers = \context StaffGroup = strijkers_group <
+archi = \context StaffGroup = archi_group <
 	\$violini
 	\$violi
 	\$bassi
@@ -68,10 +68,10 @@ strijkers = \context StaffGroup = strijkers_group <
 	<
 		\property Score . textStyle =  "italic"
 
-		\$legno
-		\$koper
+		\$legni
+		\$ottoni
 		\$timpani_g
-		\$strijkers
+		\$archi
 	>
 	\paper{
 		linewidth = 130.0\mm;
diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly
index e692c12565..ad9a73051e 100644
--- a/mutopia/Coriolan/corni.ly
+++ b/mutopia/Coriolan/corni.ly
@@ -15,13 +15,14 @@ copyright =	 "public domain";
 \include "corno-2.ly"
 
 $corni_staff = \context Staff = corni <
-	\property Staff.midiInstrument = "french horn"
-	\property Staff.instrument = "2 Corni (E\\textflat)"
-	\property Staff.instr = "Cor. (E\\textflat)"
+	\property Staff.midiInstrument = #"french horn"
+	\property Staff.instrument = #"2 Corni (E\\textflat)"
+	\property Staff.instr = #"Cor. (E\\textflat)"
 	% urg: can't; only My_midi_lexer:<non-static> () parses pitch?
 	%\property Staff.transposing = "es"
-	\property Staff.transposing = 3
-	\notes \context Voice=corni < 
+	\property Staff.transposing = #3
+	%\notes \context Voice=corni < 
+	\notes \context Staff=corni < 
 		\time 4/4;
 		\$corno1
 		\$corno2
diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly
index 2c75ca8f62..207b6ac969 100644
--- a/mutopia/Coriolan/corno-1.ly
+++ b/mutopia/Coriolan/corno-1.ly
@@ -10,13 +10,26 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 corno1 = \notes \relative c {
-	R1 *2 | f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
-	c4-. r r2 | r1 | e4-. r r2 | e4-. r r2 | R1 *5 |
-	%20
-	r2 r4 g4-.\f | R1*6 | r4 g-.\f r2 | R1*2 | 
+	R1*2 |
+	f''4-.\ff r r2 |
+	R1*3 |
+	f4-. r r2 |
+	R1*3 |
+	c4-. r r2 |
+	r1 |
+	e4-. r r2 |
+	e4-. r r2 |
+	R1*5 |
+	r2 r4 e4-.\f |
+	R1*6 |
+	r4 g-.\f r2 |
+	R1*2 |
 	% `a 2
-	r8 f\p_"\ \ \ cresc." f2 e4 | r8 f f2 e4 |
-	f4. e8 f4. e8 | f4. e8 f4. e8 | f1\ff % ~ |
+	r8 f\p-"\ \ \ cresc." f2 e4 |
+	r8 f f2 e4 |
+	f4. e8 f4. e8 |
+	f4. e8 f4. e8 |
+	f1\ff % ~ |
 	f4 ( e f )e
 	e4. r8 	e4. r8 |
 	e4. r8 	e4. r8 |
@@ -25,83 +38,170 @@ corno1 = \notes \relative c {
 	c2 \sf r2
 	c2 \sf r2
 	R1*2
-	e1 \sf c1\sf  g2. g4 \sf g2. g4 \sf g2. g4\sf g2. g4\sf g r4 r2 |
-	r1 g1 ~ g ~ g~ g~ g~ g~ g~ g~ g
-	g2\ff d'2 e1
-	R1*14
-	c2. \ff e4
-	r4 e r e c2. e4 r4 e r e
-	f2. e4 e e e e f2. e4 e e e e |
-	r4 r8 c8 c2\sf
-	r4 r8 c8 c2\sf
-	r4 r8 c8 c2\sf
-	r4 r8 c8 c2\sf			
-	c4 r4 c r |
-	e4 r e r
-	r2 e4 r
-	r2 e4 r |
-	R1*4	
-	e4\f r4 r2 r1
-	e4\f r4 r2
-	R1*3
-	e4\f r8 e e4 r8 e |
-	e4   r8 e e4 r8 e |
-	e4   r8 e g4 r8 g |
-	g4   r8 g8 r2
-	g1 ~ g |
-	g4. g8 g4 r8 g |
-	g4  r8 g8 g4 r8 g8
-	g4\p r4 r2
-	R1*16
-	d4\f r4 r2
-	g4 r r2
-	g4 r8 g g4 r8 g |
-	g4 r8 g g4 r8 g |
-	f4\p r4 r2 |
-	R1*3
-	f4 r e r
-	d r c r
-	g' r f r
-	e r e r
-	d r r2 |
-	r1
-	d4-.\ff r4 r2
-	R1*3
-	f2\sf r2 f2 \sf r2
-	R1*3
-	e2\ff r2 e \sf r2
-	R1*3
-	d2.\ff r4 	d2. r4 |
-	d2. r4  	d2. r4
-	e2. r4		e2. r4
-	e2. r4		e2. r4
-	e4 r4 r2 r1
-	R1*11
-	e2 d2
-	R1*17
-	r4 r8 e,8 e4. e8|
-	r4 r8 e8 e4. e8|
-	r4 r8 e8 e4. e8|
-	r4 r8 e8 e4. e8|
-	r4 r8 e8 e4. e8|
-	r4 r8 e8 e4. e8|
-	f2. e4 d e d e
-	f2. e4 d e d e
-	g2. f4 g f g f 		
-	g2. f4 g f g f 		
-	r4 r8 f f2
-	r4 r8 f f2
-	r4 r8 f f2
-	r4 r8 f f2				
-	f2 e~ | e d~ | d1 ~ d1
-	d4 r4 f r d r e r
-	r1
-	r2 r4 r8 e\f e4 r4 r2
-	r2 r4 r8 e8 e4 r r2
-	R1*3
-	
-	
-
-	
+	e1\sf
+	c1\sf
+	g2. g4\sf
+	g2. g4\sf
+	g2. g4\sf
+	g2. g4\sf
+	g r4 r2 |
+	R1 |
+	g\p~ |
+	g~|
+	g~|
+	g~|
+	g~|
+	g~|
+	g~|
+	g~|
+	g~|
+	g|
+	g2\ff d'2 e1|
+	R1*20|
+	c2. \ff e4|
+	r4 e r e c2. e4 r4 e r e|
+	f2. e4|
+	e e e e |
+	f2. e4|
+	e e e e ||
+	r4 r8 c8 c2\sf|
+	r4 r8 c8 c2\sf|
+	r4 r8 c8 c2\sf|
+	r4 r8 c8 c2\sf			|
+	c4 r4 c r ||
+|
+	e4 r e r|
+	r2 e4 r|
+	r2 e4 r ||
+|
+	R1*4	|
+	e4\f r4 r2 r1|
+	e4\f r4 r2|
+	R1*3|
+	e4\f r8 e e4 r8 e ||
+|
+	e4   r8 e e4 r8 e ||
+|
+	e4   r8 e g4 r8 g ||
+|
+	g4   r8 g8 r2|
+	g1~|
+	g|
+	g4. g8 g4 r8 g ||
+|
+	g4  r8 g8 g4 r8 g8|
+	g4\p r4 r2|
+	R1*21|
+	d4\f r4 r2|
+	g4 r r2|
+	g4 r8 g g4 r8 g ||
+|
+	g4 r8 g g4 r8 g ||
+|
+	f4\p r4 r2 ||
+|
+	R1*3|
+	f4 r e r|
+	d r c r|
+	g' r f r|
+	e r e r|
+	d r r2 ||
+|
+	r1|
+	d4-.\ff r4 r2|
+	R1*3|
+	f2\sf r2 f2 \sf r2|
+	R1*3|
+	e2\ff r2 e \sf r2|
+	R1*3|
+	d2.\ff r4|
+	d2. r4 ||
+	d2. r4|
+	d2. r4|
+	e2. r4|
+	e2. r4|
+	e2. r4|
+	e2. r4|
+	e4 r4 r2|
+	R1*11|
+	e2 d2|
+	R1*17|
+	r4 r8 e,8 e4. e8||
+	r4 r8 e8 e4. e8||
+	r4 r8 e8 e4. e8||
+	r4 r8 e8 e4. e8||
+	r4 r8 e8 e4. e8||
+	r4 r8 e8 e4. e8||
+	f'2. e4|
+	d e d e|
+	f2. e4|
+	d e d e|
+	g2. f4|
+	g f g f 		|
+	g2. f4|
+	g f g f 		|
+	r4 r8 f f2|
+	r4 r8 f f2|
+	r4 r8 f f2|
+	r4 r8 f f2				|
+	f2 e~ ||
+	e d~ ||
+	d1 ~ d1|
+	d4 r4 f r |
+	d r e r|
+	R1|
+	r2 r4 r8 e\f |
+	e4 r4 r2|
+	r2 r4 r8 e8 |
+	e4 r r2|
+	R1*3|
+	%a deux|
+	c4\f r e r|
+	d r c r |
+	d r r2|
+	R1|
+	e1\p~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e-"cresc."~|
+	e~|
+	e|
+	%a deux|
+	c\f|
+	d\p|
+	d\f|
+	e\p|
+	e\f|
+	d4\p r r2|
+	R1*3|
+	%a deux|
+	d\ff|
+	d|
+	e|
+	e|
+	f|
+	e|
+	e4.-"sempre\ \ \ \ \ \ \ "\ff e8 e4. e8|
+	e4. e8 e4. e8|
+	e4. e8 e4. e8|
+	e4. e8 e4. e8|
+	e4 r8 e e4 r8 e|
+	e4 r8 e e4 r8 e|
+	R1*2|
+	d4-. r r2|
+	R1*3|
+	f4-. r r2|
+	R1*5|
+	%a deux|
+	e4-. e-. r2|
+	d4-. e-. r2|
+	R1*25|
 }
 
diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly
index 5e2c861791..572a5bd10c 100644
--- a/mutopia/Coriolan/corno-2.ly
+++ b/mutopia/Coriolan/corno-2.ly
@@ -10,16 +10,210 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 corno2 = \notes \relative c {
-	R1 *2 | d''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 |
-	c4-. r r2 | r1 | e,4-. r r2 | e4-. r r2 | R1 *5 |
-	%20
-	r2 r4 e4-.\f | R1*6 | r4 g-.\f r2 | R1*2 | 
+	R1*2 |
+	d''4-.\ff r r2 |
+	R1*3 |
+	d4-. r r2 |
+	R1*3 |
+	c4-. r r2 |
+	r1 |
+	e,4-. r r2 |
+	e4-. r r2 |
+	R1*5 |
+	r2 r4 e4-.\f |
+	R1*6 |
+	r4 g-.\f r2 |
+	R1*2 |
 	% `a 2
 	% urg, yes this is a-deux, but lily doesn't know about I. / a2 yet.
-%	r8 f'\p_"\ \ \ cresc." f2 e4 | r8 f f2 e4 |
-%	f4. e8 f4. e8 | f4. e8 f4. e8 | 
-	R1*4 |
-	d1\ff % ~ |
-	%35
+	r8 f'\p-"\ \ \ cresc." f2 e4 |
+	r8 f f2 e4 |
+	f4. e8 f4. e8 |
+	f4. e8 f4. e8 |
+	d1\ff ~|
+	d4(e d)c|
+	d4. r8 c4. r8|
+	e,4. r8 e4. r8|
+	e'4. r8 d4. r8|
+	e,4. r8 d'4. r8|
+	c2\sf r|
+	c\sf r|
+	R1*2|
+	e1\sf|
+	c,\sf|
+	g2. g4\sf|
+	g2. g4\sf|
+	g2. g4\sf|
+	g2. g4\sf|
+	g4 r r2|
+	R1|
+	g1\p~|
+	g1~|
+	g1~|
+	g1~|
+	g1~|
+	g1~|
+	g1~|
+	g1~|
+	g1~|
+	g1|
+	g2\ff d''|
+	e1|
+	R1*20|
+	c2.\ff e,4|
+	r e r e|
+	c'2. e,4|
+	r e r e|
+	d'2. c4|
+	d c d c|
+	d2. c4|
+	d c d c|
+	%a deux|
+	r r8 c c2\sf|
+	r4 r8 c c2\sf|
+	r4 r8 c c2\sf|
+	r4 r8 c c2\sf|
+	c4 r c r|
+	e, r e r|
+	r2 c'4 r|
+	r2 c4 r|
+	R1*4|
+	e,4\f r r2|
+	R1|
+	e4\f r r2|
+	R1*3|
+	e4\f r8 e e4 r8 e|
+	e4 r8 e e4 r8 e|
+	e'4 r8 e e4 r8 e|
+	e4 r8 e r2|
+	e1~|
+	e~|
+	e4. e8 e4 r8 e|
+	e4. e8 e4 r8 e|
+	e4\p r r2|
+	R1*21|
+	d4\f r r2|
+	g,4 r r2|
+	g4 r8 g g4 r8 g|
+	g4 r8 g g'4 r8 g|
+	d4\p r r2|
+	R1*3|
+	d4\ff r c r|
+	d r c r|
+	e, r d' r|
+	d r e r|
+	d4 r r2|
+	R1|
+	g,4-.\ff r r2|
+	R1*3|
+	d'2\sf r|
+	d2\sf r|
+	R1*3|
+	e2\ff r|
+	e2\sf r|
+	R1*3|
+	%a deux|
+	d2.\ff r4|
+	d2. r4|
+	d2. r4|
+	d2. r4|
+	e2. r4|
+	e2. r4|
+	e2. r4|
+	e2. r4|
+	e4 r r2|
+	R1|
+	e,1\p~|
+	e~|
+	e~|
+	e~|
+	e-"cresc."~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e|
+	e2\ff d'|
+	R1*17|
+	%a deux|
+	r4 r8 e,\p e4. e8|
+	r4 r8 e e4. e8|
+	r4 r8 e-"cresc." e4. e8|
+	r4 r8 e e4. e8|
+	r4 r8 e e4. e8|
+	r4 r8 e e4. e8|
+	d'2.\ff c4|
+	d c d c|
+	d2.\ff c4|
+	d c d c|
+	g2. d'4|
+	g, d' g, d'|
+	g,2. d'4|
+	g, d' g, d'|
+	r4 r8 d d4\sf()es|
+	r4 r8 d d4\sf()es|
+	r4 r8 d d4\sf()es|
+	r4 r8 d d4\sf()es|
+	d2 d|
+	%a deux|
+	e d~|
+	d1~|
+	d|
+	%a deux|
+	d4 r f r|
+	d r e r|
+	R1|
+	r2 r4 r8 e,\f|
+	e4 r r2|
+	r2 r4 r8 e\f|
+	e4 r r2|
+	R1*3|
+	%a deux|
+	c'4\f r e r|
+	d r c r|
+	d r r2|
+	R1|
+	e,1\p~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e~|
+	e-"cresc."~|
+	e~|
+	e|
+	%a deux|
+	c'1\f|
+	d\p|
+	d\f|
+	e\p|
+	e\f|
+	d4\p r r2  |
+	R1*3|
+	%a deux; urg: copied corno|
+	d\ff||
+	d||
+	e||
+	e||
+	f||
+	e||
+	e4.-"sempre\ \ \ \ \ \ \ "\ff e8 e4. e8||
+	e4. e8 e4. e8||
+	e4. e8 e4. e8||
+	e4. e8 e4. e8||
+	e4 r8 e, e4 r8 e|
+	e4 r8 e e4 r8 e|
+	R1*2|
+	d'4-. r r2|
+	R1*3|
+	d4-. r r2|
+	R1*5|
+	%a deux|
+	e4-. e-. r2|
+	d4-. e-. r2|
+	R1*25||
 }
-
diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly
index 60d63f4482..46df47d628 100644
--- a/mutopia/Coriolan/fagotti.ly
+++ b/mutopia/Coriolan/fagotti.ly
@@ -15,11 +15,12 @@ copyright =	 "public domain";
 \include "fagotto-2.ly"
 
 $fagotti_staff = \context Staff = fagotti <
-	\property Staff.midiInstrument = "bassoon"
-	\property Staff.instrument = "2 Fagotti"
-	\property Staff.instr = "Fg."
+	\property Staff.midiInstrument = #"bassoon"
+	\property Staff.instrument = #"2 Fagotti"
+	\property Staff.instr = #"Fg."
 	\clef "bass";
-	\notes \context Voice=fagotti < 
+	%\notes \context Voice=fagotti < 
+	\notes \context Staff=fagotti < 
 		\global
 		\$fagotto1
 		\$fagotto2
diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly
index e7b182a340..965d250d40 100644
--- a/mutopia/Coriolan/fagotto-1.ly
+++ b/mutopia/Coriolan/fagotto-1.ly
@@ -12,11 +12,301 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 fagotto1 = \notes \relative c {
-	R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 |
-	a4-. r r2 | r1 | c4-. r r2 | b4-. r r2 | R1 *5 |
-	%20
-	r2 r4 g4-.\f | R1*5 | ges'2\p_"\ \ \ cresc." f2 ~ | f4 e-.\f r2 |
-	R1 | f2\p()es | d1-"cresc." | d | d2 d | d d | c1\ff % ~ |
-	%35
+	R1*2 |
+	as'4-.\ff r r2 |
+	R1 *3 |
+	as4-. r r2 |
+	R1*3 |
+	a4-. r r2 |
+	r1 |
+	c4-. r r2 |
+	b4-. r r2 |
+	R1*5 |
+	r2 r4 g4-.\f |
+	R1*5 |
+	ges'2\p-"\ \ \ cresc." f2 ~ |
+	f4 e-.\f r2 |
+	R1 |
+	f2\p()es |
+	d1-"cresc." |
+	d |
+	d2 d |
+	d d |
+	c1\ff ~ |
+	c4(bes as)g|
+	f4. r8 es4. r8|
+	b'4. r8 c4. r8|
+	bes4. r8 as4. r8|
+	g4. r8 f4. r8|
+	fis2\sf r|
+	fis\sf r|
+	f\sf r|
+	f\sf r|
+	e1\sf es\sf|
+	d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d4 r r2|
+	R1*9|
+	\clef "tenor";
+	g'2.(as4 \p-"\ \ \ cresc."|
+	g f d)bes
+	\clef "bass";
+	|
+	bes2\ff as|
+	g c~|
+	c1\p~|
+	c~|
+	c~|
+	c~|
+	c-"cresc."~|
+	c|
+	c2\ff bes|
+	a d~|
+	d1~|
+	d~|
+	d2.()f4|
+	f(es2)d4|
+	d(c2)bes4|
+	bes(a bes)g|
+	fis r8 a\pp a4. a8|
+	r4 r8 a a4. a8|
+	r4 r8 bes-"cresc." bes4. bes8|
+	r4 r8 bes bes4. bes8|
+	r4 r8 c8 c4. c8|
+	r4 r8 d d4. d8|
+	es2.\ff()d4|
+	c(bes c)bes|
+	es2.()d4|
+	c(bes c)bes|
+	d2.()es4|
+	d( c d)c|
+	d2.()es4|
+	d( c d)c|
+	r r8 c c4\sf()des|
+	r r8 c c4\sf()des|
+	r r8 c c4\sf()des|
+	r r8 c c4\sf()des|
+	es1|
+	d2 des|
+	c1~|
+	c|
+	d4 r es r|
+	c r d r|
+	g,4\p r r2|
+	R1*7|
+
+	%% 110|
+	% copied from cello, copied from viola|
+	[g8 bes d es][f, a cis d] ||
+	[es,8:8 g: b: c!:][d,: f: a: bes:] ||
+	[c,: es: g: a:][cis,: e: g: bes:] ||
+	[d,: g: bes: d:][d,: fis: a: d:] | |
+	g,2 ~ g4. g8 ||
+	%115|
+	g2 ~ g4. g8 ||
+	g4. g8 g4 r8 g ||
+	g4 r8 g g4 r8 g ||
+
+	g4\p r r2|
+
+
+	R1*3|
+	r4 r8 des' c4 r8 g|
+	as4 r r2|
+	r4 r8 des c4 r8 g|
+	e4 r r2|
+	R1*3|
+	r4 r8 f' es4 r8 bes|
+	c4-"cresc." r4 r2|
+	R1*2|
+	r4 r8 ges' f4 r8 c|
+	des4 r bes2|
+	c1|
+
+	% 136 a deux
+	des2\p( c|
+	bes as|
+	ges f|
+	)es as,|
+
+	%% 140 copied from cello (from viola)|
+	[des8\f f a bes][c, es g as]||
+	[bes,8:8 des: f: ges:][as,: c: e: f:]||
+	[g,: bes: c: des:][f,: bes: c: des:]||
+	[e,: g: bes: des:][c: e: g: c:]||
+
+	c1\p-"\ \ \ cresc." ~|
+	c1~|
+	c1~|
+	c|
+
+	%%148 copied from cello (from viola)|
+	[f,8:\ff as: c: des:][es,: g: b: c:]||
+	[des,: f: a: bes:][c,: es: g: as:]||
+	%150|
+	% r[des,16 des][e e g g]r8[c,16 c][e e f f]||
+	[bes, des e g][as, c e f]||
+	% r8[des16 des][f f g g][c, c e e][g g c c]||
+	[bes, des f g][c, e g c]||
+	f,1\ff~|
+	f|
+	des'4 r r2|
+	R1|
+	f,1~|
+	f|
+	b2\sf r|
+	b2\sf r|
+	R1*3|
+	bes2\ff r|
+	bes\sf r|
+	R1*2|
+	r2 r4 e,4\ff(|
+	)f2. e4\sf(|
+	)f2. e4\sf(|
+	)f2. e4\sf(|
+	)f2. fis4\sf(|
+	)g2. fis4\sf(|
+	)g2. fis4\sf(|
+	)g2. fis4\sf(|
+	)g2. fis4\sf(|
+	)g4 r r2|
+	R1|
+	g,1\p~|
+	g~|
+	g~|
+	g|
+	e''2.(f4|
+	e d b)g|
+	g'2.(a4|
+	g2)f|
+	e2.(f4|
+	e d b)g|
+	g2\ff f|
+	e a~|
+	a1\p~|
+	a~|
+	a~|
+	a|
+	f'2.(g4|
+	g e cis)a|
+	a2\ff g|
+	fis b~|
+	b1\p~|
+	b~|
+	b~|
+	b|
+	c2.()bes4|
+	bes\p(as2)g4|
+	g'4(f2)es4|
+	es(d es)c|
+	b r8 d\p d4. d8|
+	r4 r8 d d4. d8|
+	r4 r8 es-"cresc." es4. es8|
+	r4 r8 es es4. es8|
+	r4 r8 %
+	\clef "tenor"; %
+	f f4. f8|
+	r4 r8 g g4. g8 %
+	\clef "bass"; %
+	|
+	f2.\ff()es4|
+	d(c d)c|
+	f2.\ff()es4|
+	d(c d)c|
+	bes2.()as4|
+	g(f g)f|
+	bes2.()as4|
+	g(f g)f|
+	r r8 des' des4\sf()es|
+	r r8 des des4\sf()es|
+	r r8 des des4\sf()es|
+	r r8 des des4\sf()es|
+	des2 b|
+	c a|
+	b c|
+	d c|
+	g4 r as r|
+	f r g r|
+	c,4 r r2|
+	R1*7|
+
+	%%238 copied from cello from viola|
+	[c8\f e g as][bes, d fis g]||
+	[as, c e f!][g, bes d es]||
+
+	f4 r r2|
+
+	R1*7|
+	es'2.\p(f4|
+	es d b)g|
+	g'2.(as4|
+	g2)f|
+	es2.-"cresc." f4|
+	es d b g|
+	R1|
+	c1\f|
+	des\p|
+	d\f|
+	es\p|
+	e\f|
+	as,4.\p-"\ \ \ cresc." as8 g4. g8|
+	f4. f8 es4. es8|
+	as4. as8 g4. g8|
+	f4. f8 es4. es8|
+	f4.\ff as8 as2\sf|
+	r4 r8 as as2\sf|
+	r4 r8 bes bes2\sf|
+	r4 r8 bes bes2\sf|
+	r4 r8 c c2\sf|
+	r4 r8 d d2\sf|
+
+	%% 270 copied from cello |
+	[c,8-"sempre\ \ \ \ \ \ \ "\ff b c d][es\ff d es c]||
+	[b c d c][b c b g]||
+	[c8 b c d][es d es c]||
+	[b c d c][b c b g]||
+	[c b c g][c b c g]||
+	%275|
+	[c b c g][c b c g]||
+
+
+	c1~ |
+	c|
+	f4 r r2|
+	R1|
+	c1~ |
+	c|
+	f4 r r2|
+	R1|
+	c1~ |
+	c|
+	es'4-. d-. r2|
+	R1|
+	g,4-. g-. r2|
+	as4-. bes-. r2|
+	c4-"dim." r d r|
+	R1|
+	c,4\p r r2|
+	R1|
+	g4 r r2|
+	R1|
+	c4\pp r r2|
+	r r4 g\p-"\ \ \ sempre pi\\`u piano"~|
+	g1~|
+	g~|
+	g~|
+	g~|
+	g~|
+	g~|
+	g~|
+	g~|
+	g~|
+	g\>~|
+	g~|
+	g|
+	\!c4\pp r r2|
+	R1*4|
 }
 
diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly
index 7de10de2c8..f8e0f33607 100644
--- a/mutopia/Coriolan/fagotto-2.ly
+++ b/mutopia/Coriolan/fagotto-2.ly
@@ -10,11 +10,293 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 fagotto2 = \notes \relative c {
-	R1 *2 | f4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
-	fis4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
-	%20
+	R1*2 |
+	f4-.\ff r r2 |
+	R1*3 |
+	f4-. r r2 |
+	R1*3 |
+	fis4-. r r2 |
+	r1 |
+	g4-. r r2 |
+	g4-. r r2 |
+	R1*5 |
 	r2 r4 g,4-. |
-	R1*6 | r4 g'\f r2 | R1*6 | as1\ff %~ |
-	%35
+	R1*6 |
+	r4 g'\f r2 |
+	R1*6 |
+	as1\ff ~ |
+	as4(g f)es|
+	d4. r8 c4. r8|
+	b4. r8 c4. r8|
+	bes4. r8 as4. r8|
+	g4. r8 f4. r8|
+	fis2\sf r|
+	fis\sf r|
+	f\sf r|
+	f\sf r|
+	e1\sf |
+	es\sf|
+	d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d4 r r2|
+	R1*9|
+	\clef "tenor";
+	g''2.(as4 \p-"\ \ \ cresc."||
+	g f d)bes||
+	\clef "bass";
+	
+	g2\ff f|
+	e c~|
+	c1\p~|
+	c~|
+	c~|
+	c~|
+	c-"cresc."~|
+	c|
+	c2\ff g'|
+	fis d|
+	g,4 \p-"\ \ \ cresc." r r r8 g(|
+	)c4 r r r8 c(|
+	)b1\sf\>|
+	\!c4\p r4 r2|
+	R1*2|
+	r4 r8 fis\pp fis4. fis8|
+	r4 r8 fis fis4. fis8|
+	r4 r8 g-"cresc." g4. g8|
+	r4 r8 g g4. g8|
+	r4 r8 a a4. a8|
+	r4 r8 bes bes4. bes8|
+	c2.\ff()bes4|
+	a(g a)g|
+	c2.()bes4|
+	a(g a)g|
+	b2.()c4|
+	d,(c d)c|
+	b'2.()c4|
+	d,(c d)c|
+	r4 r8 c'8 c4\sf()des|
+	r4 r8 c8 c4\sf()des|
+	r4 r8 c8 c4\sf()des|
+	r4 r8 c8 c4\sf()des|
+	c1|
+	b2 bes|
+	as g|
+	fis es|
+	d4 r es r |
+	c r d r|
+	g1\p|
+	fis|
+	g\fp|
+	fis|
+	g2\fp(f|
+	es d|
+	c bes|
+	)a d|
+
+	%a deux|
+	%% 110|
+	% copied from cello, copied from viola||
+	[g8 bes d es][f, a cis d] |||
+	[es,8:8 g: b: c!:][d,: f: a: bes:] |||
+	[c,: es: g: a:][cis,: e: g: bes:] |||
+	[d,: g: bes: d:][d,: fis: a: d:] | ||
+	g,,2 ~ g4. g8 |||
+	%115||
+	g2 ~ g4. g8 |||
+	g4. g8 g4 r8 g |||
+	g4 r8 g g4 r8 g |||
+
+	g'1\p||
+
+
+	fis|
+	g|
+	f|
+	e|
+	f|
+	e|
+	c|
+	f|
+	e|
+	f|
+	g|
+	as-"cresc."|
+	g|
+	as|
+	a|
+	bes|
+	c|
+
+	%a deux|
+	des2\p( c||
+	bes as||
+	ges f||
+	)es as,||
+
+	%% 140 copied from cello (from viola)||
+	[des8\f f a bes][c, es g as]|||
+	[bes,8:8 des: f: ges:][as,: c: e: f:]|||
+	[g,: bes: c: des:][f,: bes: c: des:]|||
+	[e,: g: bes: des:][c: e: g: c:]|||
+
+	f,4\p r r2|
+	R1*3|
+
+	% a deux|
+	%%148 copied from cello (from viola)||
+	[f8:\ff as: c: des:][es,: g: b: c:]|||
+	[des,: f: a: bes:][c,: es: g: as:]|||
+	%150||
+	% r[des,16 des][e e g g]r8[c,16 c][e e f f]|||
+	[bes, des e g][as, c e f]|||
+	% r8[des16 des][f f g g][c, c e e][g g c c]|||
+	[bes, des f g][c, e g c]|||
+	f,1\ff~|
+	f|
+	bes,4-. r r2|
+	R1|
+	f'1\ff~|
+	f|
+	b,2\sf r|
+	b\sf r|
+	R1*3|
+	bes2 r\ff|
+	bes2 r\sf|
+	R1*2|
+	r2 r4 bes\ff(|
+	)as2. bes4\sf(|
+	)as2. bes4\sf(|
+	)as2. bes4\sf(|
+	)as2. c4\sf(|
+	)b2. c4\sf(|
+	)b2. c4\sf(|
+	)b2. c4\sf(|
+	)b2. c4\sf(|
+	)b4 r r2|
+	R1|
+	% a deux|
+	g1\p~|
+	g~|
+	g~|
+	g~|
+	g-"cresc."~|
+	g~|
+	g~|
+	g~|
+	g~|
+	g|
+	e'2\ff d|
+	cis a~|
+	a1\p~|
+	a~|
+	a~|
+	a~|
+	a-"cresc."~|
+	a|
+	f'2\ff e|
+	dis b~|
+	b1\p|
+	a\<|
+	g|
+	f|
+	\!es4\f r r2|
+	R1*3|
+	r4 r8 b'' b4. b8|
+	r4 r8 b b4. b8|
+	r4 r8 c-"cresc." c4. c8|
+	r4 r8 c c4. c8|
+	\clef "tenor";
+	r4 r8 d d4. d8|
+	r4 r8 es es4. es8|
+	\clef "bass"; 
+	f,2.\ff()es4|
+	d(c d)c|
+	f2.\ff()es4|
+	d(c d)c|
+	bes2.()as4|
+	g(f g)f|
+	bes2.()as4|
+	g(f g)f|
+	f4 r r2|
+	f4 r r2|
+	f4 r r2|
+	f4 r r2|
+	f'2 f|
+	e es|
+	d c|
+	b' as|
+	% a deux|
+	g4 r as r|
+	f r g r|
+	c,1\p|
+	b|
+	c|
+	b|
+	c2\fp( bes|
+	as g|
+	f es'|
+	)d g,|
+
+	%a deux|
+	%%238 copied from cello from viola||
+	[c8\f e g as][bes, d fis g]|||
+	[as, c e f!][g, bes d es]|||
+
+	f4 r r2||
+
+	R1*14|
+	ges\f|
+	f\p|
+	as\f|
+	g\p|
+	bes\f|
+	%a deux|
+	as4.\p-"\ \ \ cresc." as8 g4. g8|
+	f4. f8 es4. es8|
+	as4. as8 g4. g8|
+	f4. f8 es4. es8|
+	f4.\sf f8 f2\sf|
+	r4 r8 f f2\sf|
+	r4 r8 g g2\sf|
+	r4 r8 g g2\sf|
+	r4 r8 as as2\sf|
+	r4 r8 b b2\sf|
+
+	% a deux|
+	%% 270 copied from cello ||
+	[c,8-"sempre\ \ \ \ \ \ \ "\ff b c d][es\ff d es c]|||
+	[b c d c][b c b g]|||
+	[c8 b c d][es d es c]|||
+	[b c d c][b c b g]|||
+	[c b c g][c b c g]|||
+	%275||
+	[c b c g][c b c g]|||
+
+	% a deux|
+	c1~|
+	c|
+	f,4-. r r2|
+	R1|
+	c'1~|
+	c|
+	f,4-. r r2|
+	R1|
+	c'1~|
+	c|
+	c'4-. b-. r2|
+	R1|
+	es,4-. e-. r2|
+	f4-. g-. r2|
+	as4-"dim." r b r|
+	R1|
+	%a deux|
+	c,4\p r r2|
+	R1|
+	g4 r r2|
+	R1|
+	c4\pp r r2|
+	R1*18|
 }
 
diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly
index 5b295d1f48..127427a2f9 100644
--- a/mutopia/Coriolan/flauti.ly
+++ b/mutopia/Coriolan/flauti.ly
@@ -15,10 +15,11 @@ copyright =	 "public domain";
 \include "flauto-2.ly"
 
 $flauti_staff = \context Staff = flauti <
-	\property Staff.midiInstrument = "flute"
-	\property Staff.instrument = "2 Flauti"
-	\property Staff.instr = "Fl."
-	\notes \context Voice=flauti < 
+	\property Staff.midiInstrument = #"flute"
+	\property Staff.instrument = #"2 Flauti"
+	\property Staff.instr = #"Fl."
+	%\notes \context Voice=flauti < 
+	\notes \context Staff=flauti < 
 		\global
 		\$flauto1
 		\$flauto2
diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly
index 7e6c1f6b5a..950efe9c5b 100644
--- a/mutopia/Coriolan/flauto-1.ly
+++ b/mutopia/Coriolan/flauto-1.ly
@@ -10,16 +10,235 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 flauto1 = \notes \relative c {
-	R1 *2 | c'''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 |
-	es4-. r r2 | r1 | g4-. r r2 | b,4-. r r2 | R1 *4 |
-	r2 es\p_"\ \ \ cresc." ( | 
-	%20
-	)dis2. es4-.\f |
-	R1*5 | r2 f\p_"\ \ \ cresc." ~ | 
-	f4 e-.\f r2 | R1 | f2()es | 
-	%30
-	d1-"cresc."  | d1 | 
-	d2 d2 | d2 d2 | f1\ff % ~
-	%35
+	R1 *2 |
+	c'''4-.\ff r r2 |
+	R1 *3 |
+	d4-. r r2 |
+	R1 *3 |
+	es4-. r r2 |
+	r1 |
+	g4-. r r2 |
+	b,4-. r r2 |
+	R1 *4 |
+	r2 g'\p_"\ \ \ cresc." ( |
+	)fis2. g4-.\f |
+	R1*5 |
+	r2 f\p_"\ \ \ cresc." ~ |
+	f4 e-.\f r2 |
+	R1 |
+	f2()es |
+	d1-"cresc."  |
+	d1 |
+	d2 d2 |
+	d2 d2 |
+	f1\ff ~|
+	f4(es des)c |
+	b4. r8 c4. r8 |
+	d4. r8 es4. r8 |
+	e4. r8 f4. r8 |
+	g4. r8 as4. r8 |
+	a2\sf r |
+	a\sf r |
+	as\sf r |
+	as\sf r |
+	g1\sf |
+	ges\sf |
+	f2. ges4\sf (|
+	)f2. ges4\sf (|
+	)f2. ges4\sf (|
+	)f2. ges4\sf|
+	f4 r r2 |
+	R1*9|
+	g2.(f4|
+	as g d)bes
+	bes2\ff des|
+	c1~|
+	c\p~|
+	c~|
+	c~|
+	c~|
+	c-"cresc."~|
+	c~|
+	c2\ff es|
+	d1~|
+	d\p-"\ \ \ cresc."~|
+	d~| 
+	d2.()f4|
+	f(es2)d4|
+	d(c2)bes4|
+	bes(a bes)g|
+	fis\pp r r2|
+	r2 r4 r8 a|
+	bes4 r r2|
+	r r4 r8 bes-"cresc."|
+	c4 r r r8 c |
+	d4 r r r8 d|
+	es2.\ff()d4|
+	fis(g fis)g|
+	es2.()d4|
+	fis(g fis)g|
+	a2.()g4|
+	b,(c b)c|
+	a'2.()g4|
+	b,(c b)c|
+	r2 es\sf|
+	r es\sf|
+	r es\sf|
+	r es\sf|
+	es1|
+	d2 des|
+	c1~|
+	c|
+	c4 r es r|
+	c r d r|
+	g,\p r r2|
+	r r4 r8 a\sf|
+	bes4 r r2|
+	r r4 r8 a\f|
+	bes4 r r2|
+	R1*3|
+	bes,4\f r8 es' d4 r 8 a|
+	g4 r8 c bes4 r8 f|
+	es4 r8 a g4 r8 g'|
+	g4 r8 g fis4 r8 fis|
+	g1~|
+	g~|
+	g4 r8 g g4 r8 g|
+	g4 r8 g g4 r8 g|
+	g4\p r r2|
+	R1*3|
+	r4 r8 des\p c4 r8 g|
+	as4 r r2|
+	r4 r8 des c4 r8 g|
+	e4 r r2|
+	R1*3|
+	r4 r8 f' es4 r8 bes|
+	c4 r r2|
+	R1*2|
+	r4 r8 ges'-"cresc." f4 r8 c|
+	des4 r r2|
+	R1*5|
+	f4 r r r8 es|
+	des4 r r r8 c|
+	bes4 r8 e f4 r8 f|
+	g4 r8 g e4 r8 e|
+	R1*4|
+	as,4\ff r8 des8 c4 r8 g|
+	f4 r8 bes as4 r8 es|
+	des4 r8 g f4 r8 f'|
+	f4 r8 f e4 r8 e|
+	f4 r r2|
+	R1|
+	des4-.\ff r r2|
+	R1*3|
+	d2\sf r|
+	d2\sf r|
+	R1*3|
+	d2\ff r|
+	d2\sf r|
+	R1*2|
+	r2 r4 des4\ff(|
+	)c2. des4\sf(|
+	)c2. des4\sf(|
+	)c2. des4\sf(|
+	)c2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d r r2|
+	R1*9|
+	e2.\p-"\ \ \ cresc."(f4|
+	e d b )g|
+	g2\ff bes|
+	a1~a4\p r r2|
+	R1*3|
+	a1-"cresc."~|
+	a|
+	a2\ff c|
+	b a|
+	g2.\p( a4|
+	g fis dis )b|
+	g'1~|
+	g|
+	g4\f r r2|
+	R1|
+	r4 f'2\p()es4|
+	es(d es)d|
+	b r r2|
+	R1*5|
+	as2.\ff()g4|
+	b(c b)c|
+	as2.\ff()g4|
+	b(c b)c|
+	des2.()c4|
+	e(f e)f|
+	des2.()c4|
+	e(f e)f|
+	r2 des4\sf()c|
+	r2 des4\sf()c|
+	r2 des4\sf()c|
+	r2 des4\sf()c|
+	des2 b|
+	c2 f~|
+	f f~|
+	f1|
+	f4 r as r|
+	f r g r|
+	c,\p r r2|
+	r r4 r8 des\f|
+	es4 r r2|
+	r r4 r8 des\f|
+	es4 r r2|
+	R1*3|
+	es4\f r d r |
+	c r8 f8 es4 r8 bes|
+	as4-. des4-. r2|
+	R1*11|
+	es2.\p-"\ \ \ cresc."(f4|
+	es d b)g|
+	g1|
+	as\f~|
+	as\p|
+	bes\f~|
+	bes\p|
+	c1\f~|
+	c\p~|
+	c~|
+	c~|
+	c~|
+	c\ff~|
+	c~|
+	c~|
+	c~|
+	c|
+	d|
+	es4.-"sempre\ \ \ \ \ \ \ "\ff b8 c4. as8|
+	g4. as8 g4. f'8|
+	es4. b8 c4. as8|
+	g4. as8 g4. f'8|
+	es4 r8 b c4 r8 b|
+	c4 r8 b c4 r8 b|
+	c4 r r2|
+	R1|
+	c4-. r r2|
+	R1|
+	c,~|
+	c|
+	d'4 r r2
+	R1
+	c,~|
+	c|
+	es'4-. b-. r2|
+	R1|
+	c4-. c4-. r2|
+	c4-. c4-. r2|
+	c4-"dim." r d r|
+	R1|
+	es4\p r r2|
+	R1|
+	d,4 r r2|
+	R1|
+	c4\pp r r2|
+	R1*18
 }
-
diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly
index cbb400044c..517034177c 100644
--- a/mutopia/Coriolan/flauto-2.ly
+++ b/mutopia/Coriolan/flauto-2.ly
@@ -6,15 +6,169 @@ composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 }
-
 \version "1.3.4";
-
 flauto2 = \notes \relative c {
-	R1 *2 | as'''4-.\ff r r2 | R1 *3 | b4-. r r2 | R1 *3 | 
-	c4-. r r2 | r1 | es4-. r r2 | d,4-. r r2 | R1 *4 |
-	r2 r2 | 
-	%20
-	r2 r4 b4-. | R1*6 | r4 c r2 | R1*6 | c1 % ~ |
-	%35
+	R1 *2 |
+	as'''4-.\ff r r2 |
+	R1 *3 |
+	b4-. r r2 |
+	R1 *3 |
+	c4-. r r2 |
+	r1 |
+	es4-. r r2 |
+	d,4-. r r2 |
+	R1 *4 |
+	r2 r2 |
+	r2 r4 b'4-. |
+	R1*6 |
+	r4 c r2 |
+	R1*6 |
+	c1 ~ |
+	c4( es, des)c|
+	g'4. r8 g4. r8|
+	d4. r8 es4. r8|
+	c'4. r8 c4. r8|
+	c4. r8 c4. r8|
+	a2\sf r|
+	a\sf r|
+	as\sf r|
+	as\sf r|
+	g1\sf|
+	ges\sf|
+	f4 bes2.~|
+	bes4 bes2.~|
+	bes4 bes2.~|
+	bes4 bes2.~|
+	bes4 r r2|
+	R1*33|
+	a2.\ff()bes4|
+	c(bes c)bes|
+	a2.()bes4|
+	c(bes c)bes|
+	b2.()c4|
+	f,(es f)es|
+	b'2.()c4|
+	f,(es f)es|
+	r2 c'4\sf()bes|
+	r2 c4\sf()bes|
+	r2 c4\sf()bes|
+	r2 c4\sf()bes|
+	R1|
+	r2 g2|
+	as2 c,~|
+	c1|
+	c4 r es r|
+	c r d r|
+	es,\p r r2|
+	r r4 r8 d'\f|
+	d4 r r2 |
+	r r4 r8 d\f|
+	d4 r r2|
+	R1*3|
+	bes4\f r8 es d4 r8 a|
+	g4 r8 c bes4 r8 f|
+	es4 r8 a g4 r8 bes'|
+	bes4 r8 bes a4 r8 a|
+	bes1~|
+	bes~|
+	bes4 r8 bes bes4 r8 bes|
+	bes4 r8 bes bes4 r8 bes|
+	bes4\p r4 r2|
+	R1*21|
+	f4\f r r r8 es|
+	des4 r r r8 c|
+	bes4 r8 bes bes4 r8 bes|
+	bes4 r8 bes bes4 r8 bes|
+	R1*4|
+	as4\ff r8 des c4 r8 g|
+	f4 r8 bes as4 r8 es|
+	des4 r8 g f4 r8 as'|
+	g4 r8 g g4 r8 g|
+	as4 r r2|
+	R1|
+	f4\ff r r2|
+	R1*3|
+	d'2\sf r|
+	d2\sf r|
+	R1*3|
+	des2\ff r|
+	des2\sf r|
+	R1*35|
+	e,1(|
+	)d|
+	c4\f r r2|
+	R1*9|
+	d2.\ff()es4|
+	b(c b)c|
+	d2.\ff()es4|
+	b(c b)c|
+	g'2.()as4|
+	bes( as bes)as|
+	g2.()as4|
+	bes( as bes)as|
+	% 220 a deux?|
+	R1*5|
+	r2 a|
+	b c |
+	d c|
+	b4 r as r|
+	f r g r|
+	c,\p r r2|
+	r r4 r8 g'\f|
+	g4 r r2 |
+	r r4 r8 g\f|
+	g4 r r2|
+	R1*3|
+	es4\f r d r|
+	c r8 f es4 r8 bes|
+	as4 des r2|
+	R1*14|
+	%a deux|
+	as'1\f~|
+	as\p|
+	bes\f~|
+	bes\p|
+	c1\f~|
+	c\p-"\ \ \ cresc."~|
+	c~|
+	c~|
+	c~|
+	c\ff~|
+	c~|
+	c~|
+	c~|
+	c|
+	d|
+	%a deux urg: copied flauto-1(270,277)|
+	es4.-"sempre\ \ \ \ \ \ \ "\ff b8 c4. as8||
+	g4. as8 g4. f'8||
+	es4. b8 c4. as8||
+	g4. as8 g4. f'8||
+	es4 r8 b c4 r8 b||
+	c4 r8 b c4 r8 b||
+	c4 r r2||
+	R1||
+	as4-. r r2|
+	R1|
+	%a deux|
+	c,1~|
+	c|
+	b'4-. r r2|
+	R1|
+	%a deux|
+	c,1~|
+	c|
+	es4-. d-. r2|
+	R1|
+	c4-. g'-. r2|
+	as4-. e-. r2|
+	f4-"dim." r f r|
+	R1|
+	es4\p r r2|
+	R1|
+	b4 r r2|
+	R1|
+	c4\pp r r2|
+	R1*18|
 }
 
diff --git a/mutopia/Coriolan/instruments.ly b/mutopia/Coriolan/instruments.ly
new file mode 100644
index 0000000000..b3646502ca
--- /dev/null
+++ b/mutopia/Coriolan/instruments.ly
@@ -0,0 +1,13 @@
+flauti.ly
+oboi.ly
+clarinetti.ly
+fagotti.ly
+corni.ly
+trombe.ly
+timpani.ly
+violino-1.ly
+violino-2.ly
+viola-1.ly
+viola-2.ly
+violoncello.ly
+contrabasso.ly
diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly
index 0afed078f6..de4cef9e0b 100644
--- a/mutopia/Coriolan/oboe-1.ly
+++ b/mutopia/Coriolan/oboe-1.ly
@@ -10,12 +10,242 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 oboe1 = \notes \relative c'' {
-	R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 |
-	a4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *4 |
-	as2\p_"\ \ \ cresc." ( g |
-	%20
-	)fis2. g4-.\f | R1*5 | ges2\p_"\ \ \ cresc."  f ~ | f4 e\f r2 |
-	R1 | f2\p()es | d1-"cresc." | d | d2 d | d d | f1\ff % ~
-	%35
+	R1*2 |
+	as'4-.\ff r r2 |
+	R1*3 |
+	as4-. r r2 |
+	R1*3 |
+	a4-. r r2 |
+	r1 |
+	g4-. r r2 |
+	g4-. r r2 |
+	R1 *4 |
+	as2\p-"\ \ \ cresc." ( g |
+	)fis2. g4-.\f |
+	R1*5 |
+	ges2\p-"\ \ \ cresc."  f ~ |
+	f4 e\f r2 |
+	R1 |
+	f2\p()es |
+	d1-"cresc." |
+	d |
+	d2 d |
+	d d |
+	f1\ff ~|
+	f4(es des)c|
+	f4. r8 es4. r8|
+	g4. r8 g4. r8|
+	g4. r8 f4. r8|
+	g4. r8 as4. r8|
+	a2\sf r|
+	a\sf r|
+	as\sf r|
+	as\sf r|
+	g1\sf|
+	ges\sf|
+	f2. ges4(|
+	)f2. ges4(|
+	)f2. ges4(|
+	)f2. ges4(|
+	)f4 r r2|
+	R1*9|
+	g2.\p-"\ \ \ cresc."( as4|
+	g f d)bes|
+	bes'2\ff des|
+	c bes|
+	as4\p r r2|
+	R1*3|
+	as2.\p-"\ \ \ cresc."( bes4|
+	as g e)c|
+	c'2\ff es,|
+	d1~|
+	d\p-"\ \ \ cresc." ~|
+	d~|
+	d2.\sf\>()f4|
+	\!f\p( es2)d4|
+	d(c2)bes4|
+	bes(a bes)g|
+	fis\pp r r2|
+	r r4 r8 fis' |
+	g4 r r2|
+	r r4 r8 g-"cresc."|
+	a4 r r r8 a|
+	bes4 r r r8 bes|
+	fis2.\ff()g4|
+	fis(g fis)g|
+	fis2.()g4|
+	fis(g fis)g|
+	as2.()g4|
+	b,(c b)c|
+	as'2.()g4|
+	b,(c b)c|
+	r2 as'4\sf()g|
+	r2 as4\sf()g|
+	r2 as4\sf()g|
+	r2 as4\sf()g|
+	as2 fis|
+	g e|
+	f es|
+	a g|
+	fis4 r es r|
+	c r d r|
+	g,\p r r2|
+	r r4 r8 a'\f|
+	bes4 r r2|
+	r r4 r8 a\f|
+	bes4 r r2|
+	R1*3|
+	bes4\f r a r|
+	g r f r|
+	es r g r8 bes|
+	bes4 r8 bes a4 r8 a|
+	g1~|
+	g~|
+	g4. g8 g4 r8 g|
+	g4 r8 g g4 r8 g|
+	g4\p r r2|
+	R1*15|
+	r4 r8 as-"cresc" ges4 r8 des|
+	es4 r8 bes' as4 r8 es |
+	f4 r r2|
+	R1*3|
+	f4\f r r r8 es|
+	des4 r r r8 c|
+	bes4 r8 es f4 r8 f|
+	g4 r8 g e4 r 8 e|
+	c'1\p-"\ \ \ cresc." ~|
+	c~|
+	c~|
+	c|
+	c4\ff r8 c c4 r8 c|
+	c4 r8 c c4 r8 c|
+	c4 r8 c c4 r8 c|
+	des4 r8 des c4 r8 c|
+	f,4 r r2|
+	R1|
+	f4-.\ff r r2|
+	R1*3|
+	as2\sf r|
+	as2\sf r|
+	R1*3|
+	g2\ff r|
+	g2\sf r|
+	R1*2|
+	r2 r4 e\ff(|
+	)f2. e4\sf(|
+	)f2. e4\sf(|
+	)f2. e4\sf(|
+	)f2. fis4\sf(|
+	)g2. fis4\sf(|
+	)g2. fis4\sf(|
+	)g2. fis4\sf(|
+	)g2. fis4\sf(|
+	)g4 r r2|
+	R1*5|
+	e2.\p-"\ \ \ cresc." (f4|
+	e d b)g|
+	g'2.(a4g2)f|
+	e2.( f4|
+	e d b)g|
+	g'2\ff bes|
+	a1~|
+	a\p~|
+	a~|
+	a~|
+	a|
+	f2.-"cresc."( g4|
+	f e cis)a|
+	a'2\ff c|
+	b1\p~|
+	b~|
+	b~|
+	b~|
+	b|
+	c2.\f\>()bes4|
+	\!bes\p(as2)g4|
+	g4(f2)es4|
+	es(d es)c|
+	b r r2|
+	r r4 r8 d|
+	es4-"cresc." r r2|
+	r r4 r8 es|
+	f4 r r r8 f|
+	g4 r r r8 g|
+	as2.\ff()g4|
+	f(es f)es|
+	as2.\ff()g4|
+	f(es f)es|
+	e2.()f4|
+	e(f e)f|
+	e2.()f4|
+	e(f e)f|
+	r2 as|
+	r as\sf|
+	r as\sf|
+	r as\sf|
+	as g~|
+	g f~|
+	f1~|
+	f|
+	f4 r as r|
+	f r g r|
+	c,\p r r2|
+	r r4 r8 g'\f|
+	g4 r r2 r r4 r8 g\f|
+	g4 r r2|
+	R1*3|
+	c4\f r8 c c4 r8 c|
+	c4\f r8 c c4 r8 d|
+	as4 r r2|
+	R1*7|
+	es2.\p( f4|
+	es d b)g|
+	g'2.(as4|
+	g2)f|
+	es2.-"cresc."( f4|
+	es d b)g|
+	c1|
+	es\f|
+	f\p|
+	f\f|
+	g\p|
+	g\f|
+	c\p-"\ \ \ cresc."~|
+	c~|
+	c~|
+	c~|
+	c\ff~|
+	c~|
+	c~|
+	c~|
+	c|
+	d|
+	es,4.-"sempre\ \ \ \ \ \ \ "\ff b8 c4. as8|
+	g4. as8 g4. f'8|
+	es4. b8 c4. as8|
+	g4. as8 g4. f'8|
+	es4 r8 b'8 c4 r8 d,|
+	es4 r8 g g4 r8 g|
+	c,1~|
+	c|
+	as'4-. r r2|
+	R1|
+	c,1~|
+	c|
+	b'4 r r2|
+	R1|
+	c,1~|
+	c|
+	c'4-. b-. r2|
+	R1|
+	c4-. g-. r2|
+	as4-. e-. r2|
+	f4-"dim" r f r|
+	R1|
+	es4\p r r2|
+	R1|
+	d4 r r2|
+	R1|
+	c4\pp r r2|
+	R1*18|
 }
-
diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly
index 39ae9c267a..5ab784437f 100644
--- a/mutopia/Coriolan/oboe-2.ly
+++ b/mutopia/Coriolan/oboe-2.ly
@@ -12,10 +12,179 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 oboe2 = \notes \relative c{
-	R1 *2| f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
-	es4-. r r2 | r1 | es4-. r r2 | b4-. r r2 | R1 *5 | 
-	%20
-	r2 r4 b4-. | R1*6 | r4 bes\f r2 | R1*6 | c1\ff %~ |
-	%35
+	R1*2|
+	f''4-.\ff r r2 |
+	R1*3 |
+	f4-. r r2 |
+	R1*3 |
+	es4-. r r2 |
+	r1 |
+	es4-. r r2 |
+	b4-. r r2 |
+	R1*5 |
+	r2 r4 b4-. |
+	R1*6 |
+	r4 bes\f r2 |
+	R1*6 |
+	c1\ff ~ |
+	c4( es des)c|
+	b4. r8 c4. r8|
+	d4. r8 es4. r8|
+	e4. r8 c4. r8|
+	e4. r8 f4. r8|
+	es2\sf r|
+	es2\sf r|
+	d2\sf r|
+	d2\sf r|
+	R1*2|
+	bes2. bes4\sf|
+	bes2. bes4\sf|
+	bes2. bes4\sf|
+	bes2. bes4\sf|
+	bes4 r r2|
+	R1*33|
+	es2.\ff()d4|
+	c(bes c)bes|
+	es2.()d4|
+	c(bes c)bes|
+	R1*4|
+	r2 es\sf|
+	r es\sf|
+	r es\sf|
+	r es\sf|
+	es1|
+	d2 des|
+	c1~|
+	c|
+	%a deux; urg: copied oboe-1(100:2,102)|
+	c4 r es r|
+	c r d r|
+	g,\p r r2|
+	r r4 r8 d'\f|
+	d4 r r2|
+	r r4 r8 d\f|
+	d4 r r2|
+	R1*3|
+	%a deux; urg: copied oboe-1(110,111)|
+	bes'4\f r a r|
+	g r f r |
+	es r g r8 g|
+	g4 r8 g fis4 r8 fis|
+	bes,1~|
+	bes~|
+	bes4. bes8 bes4 r8 bes|
+	bes4 r8 bes bes4 r8 bes|
+	bes4\p r r2|
+	R1*15|
+	r4 r8 as'-"cresc." ges4 r8 des|
+	es4 r8 bes' as4 r8 es|
+	f4 r r2|
+	R1*3|
+	%a deux; urg copied ...|
+	f4\f r r r8 es|
+	des4 r r r8 c|
+	bes4 r8 bes bes4 r8 bes|
+	bes4 r8 bes bes4 r8 bes|
+	c1\p-"\ \ \ cresc." ~||
+	c~|
+	c~|
+	c|
+	c4\ff r8 c c4 r8 c|
+	c4 r8 c c4 r8 c|
+	c4 r8 c c4 r8 c|
+	des4 r8 des c4 r8 c|
+	f,4 r r2|
+	R1|
+	des'4\ff r r2|
+	R1*3|
+	f2\sf r|
+	f2\sf r|
+	R1*3|
+	e2\ff r|
+	e2\sf r|
+	R1*23|
+	g,2\ff bes|
+	a1~|
+	a\p~|
+	a~|
+	a~|
+	a~|
+	R1*2|
+	a2\ff c|
+	b1~|
+	b4\p r r2|
+	R1*13|
+	d2.\ff()es4|
+	b(c b)c|
+	d2.\ff()es4|
+	b(c b)c|
+	g2.()as4|
+	bes(as bes)as|
+	g2.()as4|
+	bes(as bes)as|
+	%a deux; urg copied oboe-1(220,230)|
+	r2 as'||
+	r as\sf||
+	r as\sf||
+	r as\sf||
+	as g~||
+	g f~||
+	f1~||
+	f||
+	f4 r as r||
+	f r g r||
+	c,\p r r2||
+	r r4 r8 d\f|
+	es4 r r2|
+	r r4 r8 d\f|
+	es4 r r2|
+	R1*3|
+	c4\f r8 c c4 r8 c|
+	c4 r8 c c4 r8 bes|
+	as4 r r2|
+	R1*14|
+	c1\f|
+	des\p|
+	d\f|
+	es\p|
+	e\f|
+	c\p-"\ \ \ cresc." ~|
+	c~|
+	c~|
+	c~|
+	c\ff~|
+	c~|
+	c~|
+	c~|
+	c|
+	d|
+	%a deux; urg: copied oboe-1(270,274:1)|
+	es4.-"sempre\ \ \ \ \ \ \ "\ff b8 c4. as8||
+	g4. as8 g4. f'8||
+	es4. b8 c4. as8||
+	g4. as8 g4. f'8||
+	es4 r8 d es4 r8 b|
+	c4 r8 d es4 r8 d|
+	c,1~|
+	c|
+	f'4-. r r2|
+	R1|
+	c,1~|
+	c|
+	d'4 r r2|
+	R1|
+	c,1~|
+	c|
+	es'4-. d-. r2|
+	R1|
+	c4-. c-. r2|
+	c4-. c-. r2|
+	c4-"dim." r d r|
+	R1|
+	c4\p r r2|
+	R1|
+	b4 r r2|
+	R1|
+	c4 r r2\pp|
+	R1*18|
 }
-
diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly
index b9ab15e912..1b8d63c1a0 100644
--- a/mutopia/Coriolan/oboi.ly
+++ b/mutopia/Coriolan/oboi.ly
@@ -15,10 +15,11 @@ copyright =	 "public domain";
 \include "oboe-2.ly"
 
 $oboi_staff = \context Staff = oboi <
-	\property Staff.midiInstrument = "oboe"
-	\property Staff.instrument = "2 Oboi"
-	\property Staff.instr = "Ob."
-	\notes \context Voice=oboi < 
+	\property Staff.midiInstrument = #"oboe"
+	\property Staff.instrument = #"2 Oboi"
+	\property Staff.instr = #"Ob."
+	%\notes \context Voice=oboi < 
+	\notes \context Staff=oboi < 
 		\global
 		\$oboe1
 		\$oboe2
diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly
new file mode 100644
index 0000000000..3fe5a4dd84
--- /dev/null
+++ b/mutopia/Coriolan/timpani-part.ly
@@ -0,0 +1,20 @@
+\header{
+filename =	 "timpani-part.ly";
+% %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =	 "";
+composer =	 "Ludwig van Beethoven (1770-1827)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+\version "1.3.4";
+
+\include "global.ly"
+\include "timpani.ly"
+
+\score{
+	\$timpani_staff 
+	\include "coriolan-part-paper.ly"
+	\midi{ \tempo 4 = 160; }
+}
+
diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly
index b6d74169b2..17781ef51d 100644
--- a/mutopia/Coriolan/timpani.ly
+++ b/mutopia/Coriolan/timpani.ly
@@ -12,18 +12,138 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 timpani = \notes \relative c {
-	R1 *2 | c4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
-	c4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
-	%20
-	r2 r4 g4-. | R1*6 | r4 c-.\f r2 | R1*2 | r2 c4-.\p_"\ \ \ cresc." r |
-	r2 c4-. r | r2 c4-. r | c r c r | c1\ff-\trill |
-	%35
+	R1*2 |
+	c4-.\ff r r2 |
+	R1*3 |
+	c4-. r r2 |
+	R1*3 |
+	c4-. r r2 |
+	r1 |
+	g4-. r r2 |
+	g4-. r r2 |
+	R1*5 |
+	r2 r4 g4-. |
+	R1*6 |
+	r4 c-.\f r2 |
+	R1*2 |
+	r2 c4-.\p-"\ \ \ cresc." r |
+	r2 c4-. r |
+	r2 c4-. r |
+	c r c r |
+	c1\ff-\trill |
+	c8 r g r g r g r|
+	g4 r g r|
+	g r c r |
+	c r c r|
+	c r c r|
+	c\sf r r2|
+	c4\sf r r2|
+	R1*3|
+	c4\sf r r2|
+	R1*38|
+	c2:16\ff c4 g|
+	c g c g|
+	c2:16 c4 g|
+	c g c g|
+	g2:16 g4 g|
+	g c g c|
+	g2:16 g4 g|
+	g c g c|
+	c r r2|
+	c4 r r2|
+	c4 r r2|
+	c4 r r2|
+	c4 r c r|
+	g r g r|
+	c r c r|
+	c r c r|
+	c r r2|
+	R1*3|
+	g4\f r r2|
+	R1|
+	g4\f r r2|
+	R1*3|
+	g4\f r8 g g4 r8 g|
+	g4 r8 g g4 r8 g|
+	g4 r8 g g4 r8 g|
+	R1|
+	g1\trill~|
+	g|
+	g4 r8 g g4 r8 g|
+	g4\p r r2|
+	R1*24|
+	c4\f r8 c c4 r8 c|
+	R1*4|
+	c4\ff r8 c c4 r8 c|
+	c4 r8 c c4 r8 c|
+	c4 r8 c c4 r8 c|
+	r2 c4 r8 c|
+	c4 r r2|
+	R1*18|
+	r2 r4 c\sf|
+	g r r c\sf|
+	g r r c\sf|
+	g r r c\sf|
+	g r r c\sf|
+	g r r2|
+	R1*35|
+	g2:16\ff g4 g|
+	g c g c|
+	g2:16\ff g4 g|
+	g c g c|
+	c2:16 c4 c|
+	c c c c |
+	c2:16 c4 c|
+	c c c c |
+	R1*8|
+	g4 r c r|
+	c r g r|
+	R1|
+	r2 r4 r8 g\f|
+	c4 r r2|
+	r2 r4 r8 g\f|
+	c4 r r2|
+	R1*3|
+	c4\f r8 c c4 r8 c|
+	c4 r8 c c4 r8 c|
+	c4 r r2|
+	R1*23|
+	c4\ff r r2|
+	c4 r r2|
+	c4 r r2|
+	c4 r r2|
+	c4 r r2|
+	g4 r r2|
+	c4-"sempre\ \ \ \ \ \ \ "\ff r c r|
+	g r r2|
+	c4 r c r|
+	g r r2|
+	c4 r c r|
+	c r c r|
+	c r r2|
+	R1|
+	c4-. r r2|
+	R1*3|
+	c4-. r r2|
+	R1*3|
+	c4-. r r2|
+	R1|
+	c4-. c-. r2|
+	c4-. c-. r2|
+	c4-"dim." r g r|
+	R1|
+	c4\p r r2|
+	R1|
+	g4 r r2|
+	R1|
+	c4\pp r r2|
+	R1*18|
 }
 
 $timpani_staff = \context Staff = timpani <
-	\property Staff.midiInstrument = "timpani"
-	\property Staff.instrument = "2 Timpani (C-G)"
-	\property Staff.instr = "Timp."
+	\property Staff.midiInstrument = #"timpani"
+	\property Staff.instrument = #"2 Timpani (C-G)"
+	\property Staff.instr = #"Timp."
 	\clef "bass";
 	\notes< 
 %		\global
diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly
index b867b99597..dbe06e3a03 100644
--- a/mutopia/Coriolan/trombe.ly
+++ b/mutopia/Coriolan/trombe.ly
@@ -15,10 +15,11 @@ copyright =	 "public domain";
 \include "trombo-2.ly"
 
 $trombe_staff = \context Staff = trombe <
-	\property Staff.midiInstrument = "trumpet"
-	\property Staff.instrument = "2 Trombe (C)"
-	\property Staff.instr = "Tbe."
-	\notes \context Voice=trombe < 
+	\property Staff.midiInstrument = #"trumpet"
+	\property Staff.instrument = #"2 Trombe (C)"
+	\property Staff.instr = #"Tbe."
+	%\notes \context Voice=trombe < 
+	\notes \context Staff=trombe < 
 %		\global
 		\time 4/4;
 		\$trombo1
diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly
index 2775eeb1b3..948dea353a 100644
--- a/mutopia/Coriolan/trombo-1.ly
+++ b/mutopia/Coriolan/trombo-1.ly
@@ -10,11 +10,148 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 trombo1 = \notes \relative c {
-	R1 *2 | c''4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
-	c4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
-	%20
-	r2 r4 g4-.\f | R1*6 | r4 c-.\f r2 | R1*2 | r2 c4\p_"\ \ \ cresc." r |
-	r2 c4 r | r2 c4 r | c r c r | c1\ff % ~ |
-	%35
+	R1*2 |
+	c''4-.\ff r r2 |
+	R1*3 |
+	c4-. r r2 |
+	R1*3 |
+	c4-. r r2 |
+	r1 |
+	g4-. r r2 |
+	g4-. r r2 |
+	R1*5 |
+	r2 r4 g4-.\f |
+	R1*6 |
+	r4 c-.\f r2 |
+	R1*2 |
+	r2 c4\p-"\ \ \ cresc." r |
+	r2 c4 r |
+	r2 c4 r |
+	c r c r |
+	c1\ff ~ |
+	c8 r g r g r g r|
+	g4. r8 g4. r8|
+	g4. r8 c4. r8|
+	c4. r8 c4. r8 |
+	c4. r8 c4. r8 |
+	c2\sf r|
+	c2\sf r|
+	R1*3|
+	c1\sf|
+	R1*38|
+	c2.\ff g4|
+	c g c g|
+	c2. g4|
+	c g c g|
+	g2. g4|
+	g c g c|
+	g2. g4|
+	g c g c|
+	c r r2|
+	c4 r r2|
+	c4 r r2|
+	c4 r r2|
+	c4 r c r|
+	g r g r|
+	c r c r|
+	c r c r|
+	c r r2|
+	r d4 r|
+	R1|
+	r2 r4 r8 d\f|
+	g,4 r r2|
+	r r4 r8 d'\f|
+	g,4 r r2|
+	R1*3|
+	%a deux|
+	g4\f r8 g g4 r8 g|
+	g4 r8 g g4 r8 g|
+	g4 r8 g g4 r8 g|
+	d'4 r8 d d4 r8 d|
+	g,1~|
+	g|
+	g4 r8 g g4 r8 g|
+	g4 r8 g g4 r8 g|
+	g4\p r r2|
+	R1*24|
+	c4\f r8 c c4 r8 c|
+	R1*4|
+	c4\ff r8 c c4 r8 c|
+	c4\ff r8 c c4 r8 c|
+	c4\ff r8 c c4 r8 c|
+	r2 c4 r8 c|
+	c4 r r2|
+	R1*5|
+	d2\sf r|
+	d\sf r|
+	R1*11|
+	r2 r4 c\sf|
+	g2. c4\sf|
+	g2. c4\sf|
+	g2. c4\sf|
+	g2. c4\sf|
+	g4 r r2|
+	R1*35|
+	g2.\ff g4|
+	g c g c|
+	g2.\ff g4|
+	g c g c|
+	c2. c4|
+	c c c c|
+	c2. c4|
+	c c c c|
+	R1*8|
+	g4 r c r|
+	c r g r|
+	R1|
+	r2 r4 r8 g\f |
+	c4 r r2|
+	r r4 r8 g\f|
+	c4 r r2|
+	R1*3|
+	c4\f r8 c c4 r8 c|
+	c4 r8 c c4 r8 c|
+	c4 r r2|
+	R1*18|
+	e1\f(|
+	)c\p-"\ \ \ cresc." ~|
+	c~|
+	c~|
+	c~|
+	c4.\ff c8 c2~|
+	c4. c8 c2~|
+	c4. c8 c2~|
+	c4. c8 c2~|
+	c4. c8 c2|
+	r4 r8 d d2|
+	c4-"sempre\ \ \ \ \ \ \ "\ff r c r|
+	g r r2|
+	c4 r c r|
+	g r r2|
+	c4 r c r |
+	c r c r|
+	%a deux|
+	c,1~|
+	c|
+	c'4-. r r2|
+	R1|
+	c,1~|
+	c|
+	c'4-. r r2|
+	R1|
+	c,1~|
+	c|
+	c'4-. d-. r2|
+	R1|
+	c4-. c-. r2|
+	c4-. c-. r2|
+	c4-"dim." r g r|
+	R1|
+	g4\p r r2|
+	R1 |
+	g4 r r2|
+	R1 |
+	c,4\pp r r2|
+	R1*18|
 }
 
diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly
index 234514fb96..2ace138db3 100644
--- a/mutopia/Coriolan/trombo-2.ly
+++ b/mutopia/Coriolan/trombo-2.ly
@@ -10,11 +10,147 @@ copyright =	 "public domain";
 \version "1.3.4";
 
 trombo2 = \notes \relative c {
-	R1 *2 | c'4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
-	c4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
-	%20
-	r2 r4 g4-.\f | R1*6 | r4 c-.\f r2 | R1*2 | r2 c4\p_"\ \ \ cresc." r |
-	r2 c4 r | r2 c4 r | c r c r | c1\ff % ~ |
-	%35
+	R1*2 |
+	c'4-.\ff r r2 |
+	R1*3 |
+	c4-. r r2 |
+	R1*3 |
+	c4-. r r2 |
+	r1 |
+	g4-. r r2 |
+	g4-. r r2 |
+	R1*5 |
+	r2 r4 g4-.\f |
+	R1*6 |
+	r4 c-.\f r2 |
+	R1*2 |
+	r2 c4\p_"\ \ \ cresc." r |
+	r2 c4 r |
+	r2 c4 r |
+	c r c r |
+	c1\ff ~ |
+	c8 r g r g r g r|
+	g4. r8 g4. r8|
+	g4. r8 c4. r8|
+	c4. r8 c4. r8 |
+	c4. r8 c4. r8 |
+	c2\sf r|
+	c2\sf r|
+	R1*3|
+	c1\sf|
+	R1*38|
+	c2.\ff g4|
+	c g c g|
+	c2. g4|
+	c g c g|
+	g2. g4|
+	g c g c|
+	g2. g4|
+	g c g c|
+	c r r2|
+	c4 r r2|
+	c4 r r2|
+	c4 r r2|
+	c4 r c r|
+	g r g r|
+	c r c r|
+	c r c r|
+	c r r2|
+	r2 d'4 r|
+	R1|
+	r2 r4 r8 d\f|
+	g,,4 r r2|
+	r2 r4 r8 d''8\f|
+	g,,4 r r2|
+	R1*3|
+	%a deux|
+	g'4\f r8 g g4 r8 g|
+	g4 r8 g g4 r8 g|
+	g,4 r8 g g4 r8 g|
+	d''4 r8 d d4 r8 d|
+	g,,1~|
+	g|
+	g4 r8 g g4 r8 g|
+	g4 r8 g g4 r8 g|
+	g4\p r r2|
+	R1*24|
+	c4\f r8 c c4 r8 c|
+	R1*4|
+	c4\ff r8 c c4 r8 c|
+	c4 r8 c c4 r8 c|
+	c4 r8 c c4 r8 c|
+	r2 c4 r8 c|
+	c4 r r2|
+	R1*5|
+	d'2\sf r|
+	d\sf r|
+	R1*11|
+	r2 r4 c,\sf|
+	g2. c4\sf|
+	g2. c4\sf|
+	g2. c4\sf|
+	g2. c4\sf|
+	g4 r r2|
+	R1*35|
+	g2.\ff g4|
+	g c g c|
+	g2.\ff g4|
+	g c g c|
+	c2. c4|
+	c c c c|
+	c2. c4|
+	c c c c|
+	R1*8|
+	g4 r c r|
+	c r g r|
+	R1|
+	r2 r4 r8 g\f|
+	c4 r r2|
+	r r4 r8 g\f|
+	c4 r r2|
+	R1*3|
+	c4\f r8 c c4 r8 c|
+	c4 r8 c c4 r8 c|
+	c4 r r2|
+	R1*18|
+	c1\f~|
+	c\p-"\ \ \ cresc." ~|
+	c~|
+	c~|
+	c~|
+	c4.\ff c8 c2~|
+	c4. c8 c2~|
+	c4. c8 c2~|
+	c4. c8 c2~|
+	c4. c8 c2|
+	r4 r8 g'8 g2|
+	c,4-"sempre\ \ \ \ \ \ \ "\ff r c r||
+	g r r2|
+	c4 r c r|
+	g r r2|
+	c4 r c r|
+	c r c r|
+	%a deux|
+	c1~|
+	c|
+	c4-. r r2|
+	R1|
+	c1~|
+	c|
+	c4-. r r2|
+	R1|
+	c1~|
+	c|
+	c4-. d'-. r2|
+	R1|
+	c,4-. c-. r2|
+	c4-. c-. r2|
+	c4-"dim." r g r|
+	R1|
+	g4\p r r2|
+	R1|
+	g4 r r2|
+	R1|
+	c4\pp r r2|
+	R1*18|
 }
-
diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly
index a8933dca19..df9beb070d 100644
--- a/mutopia/Coriolan/viola-1.ly
+++ b/mutopia/Coriolan/viola-1.ly
@@ -291,9 +291,9 @@ viola1 = \notes \relative c {
 
 % $viola1_staff = \context Staff = viola1 <
 $viola1_staff = \context Staff = violai <
-	\property Staff.midiInstrument = "viola"
-	\property Staff.instrument = "Viola"
-	\property Staff.instr = "Vla."
+	\property Staff.midiInstrument = #"viola"
+	\property Staff.instrument = #"Viola"
+	\property Staff.instr = #"Vla."
 	\clef "alto";
 	\notes \context Voice=one < 
 		\global
diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly
index b08dbbeace..420f81239e 100644
--- a/mutopia/Coriolan/viola-2.ly
+++ b/mutopia/Coriolan/viola-2.ly
@@ -33,9 +33,9 @@ viola2 = \notes \relative c {
 
 % $viola2_staff = \context Staff = viola_2 <
 $viola2_staff = \context Staff = violaii <
-	\property Staff.midiInstrument = "viola"
-	\property Staff.instrument = "Viola II"
-	\property Staff.instr = "Vla. II"
+	\property Staff.midiInstrument = #"viola"
+	\property Staff.instrument = #"Viola II"
+	\property Staff.instr = #"Vla. II"
 	\clef "alto";
 	% notes must go to Staff context: we want to switch Staff translators
 	%\notes \context Voice=one< 
diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly
index ab138a28af..1b482cb822 100644
--- a/mutopia/Coriolan/violino-1.ly
+++ b/mutopia/Coriolan/violino-1.ly
@@ -273,9 +273,9 @@ violino1 = \notes \relative c {
 }
 
 $violino1_staff = \context Staff = violino1 <
-	\property Staff.midiInstrument = "violin"
-	\property Staff.instrument = "Violino I"
-	\property Staff.instr = "Vl. I"
+	\property Staff.midiInstrument = #"violin"
+	\property Staff.instrument = #"Violino I"
+	\property Staff.instr = #"Vl. I"
 	\notes< 
 		\global
 		\$violino1
diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly
index 9f084fd86c..a9c33d5a2c 100644
--- a/mutopia/Coriolan/violino-2.ly
+++ b/mutopia/Coriolan/violino-2.ly
@@ -293,9 +293,9 @@ violino2 = \notes \relative c {
 $violino2_staff = \context Staff = violino2 <
  	% MIDI hoort geeneens verschil tussen een
 	% eerste en tweede viool ;-)
-	\property Staff.midiInstrument = "violin"
-	\property Staff.instrument = "Violino II"
-	\property Staff.instr = "Vl. II"
+	\property Staff.midiInstrument = #"violin"
+	\property Staff.instrument = #"Violino II"
+	\property Staff.instr = #"Vl. II"
 	\notes< 
 		\global
 		\$violino2
diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly
index ed29c77488..ce9b6f179b 100644
--- a/mutopia/Coriolan/violoncello.ly
+++ b/mutopia/Coriolan/violoncello.ly
@@ -13,7 +13,7 @@ copyright =	 "public domain";
 
 violoncello = \notes \relative c {
 	c1\ff ~ | c | f,4-. r r2 | r1 | c'1\ff ~ | c | f,4-. r r2 |
-	\property Staff.instr = "Vc. \& Cb."
+	\property Staff.instr = #"Vc. \& Cb."
 	r1 |
 	c'1\ff ~ | c | fis,4-. r r2 | r1 |
 	g4-. r r2 | g4-. r r2 |
@@ -151,7 +151,8 @@ violoncello = \notes \relative c {
 	[g,: bes: c: des:][f,: bes: c: des:]|
 	[e,: g: bes: des:][c: e: g: c:]|
 	%shared with cello from here on
-	[f,8\p-"cresc." as c des][es, g b c]|[des, f a bes][c, es g as]|
+	[f,8\p-"cresc." as c des][es, g b c]|
+	[des, f a bes][c, es g as]|
 	% uhuh, still 'same as cello';
 	% but now rests for notes that viola cannot reach...
 	% r[des, e g]r[c, e f]|
@@ -200,84 +201,107 @@ violoncello = \notes \relative c {
 	[g(f' d f][g f d )g,~] |
 	[g-"cresc."(e' c d][g e c )g~] |
 	[g(d' b d][g d b )g~] |
-	[g(e' c d][g e c )g~] |
 	%185
+	[g(e' c d][g e c )g~] |
 	[g(f' d f][g f d )g,~] |
 	[g(e' c d][g e c )g~] |
 	[g(d' b d][g d b )g(] |
-	)e2\ff d' | cis a ~ |
 	%190
+	)e2\ff d' | cis a ~ |
 	[a8( f' d f][a f d )a!~] |
 	[a( e' cis e][a e c )a!~] |
 	[a8( f' d f][a f d )a!~] |
 	[a( g' e g][a g e )a,!~] |
-	[a8-"cresc."( f' d f][a f d )a!~] |
 	%195
+	[a8-"cresc."( f' d f][a f d )a!~] |
 	[a( e' cis e][a e c )g] |
 	f2\ff e | dis b'~ | 
 	[b8\p( g' e g][b g e )b!~] |
-	[b8\<( fis' dis fis ][b fis dis )b!~] |
 	%200
+	[b8\<( fis' dis fis ][b fis dis )b!~] |
 	[b8\p( g' e g][e g e )g] |
 	[f(g f g][f g f)\!g] |
-	es!4\fp r e r | f r g r | as r g r | f r fis r | 
-	g r g r | g r g r | g r g-"cresc." r | 
-	g r g r | g r g r | g r g r | 
-	f2.\ff()es4 | d( c d )c |
-	f2.\ff()es4 | d( c d )c |
-	bes2.\ff()as4 | g( f g )f |
-	bes2.\ff()as4 | g( f g )f |
+	es!4\fp r e r | 
+	f r g r | 
+	%205
+	as r g r | 
+	f r fis r | 
+	g r g r | 
+	g r g r | 
+	g r g-"cresc." r | 
+	%210
+	g r g r | 
+	g r g r | 
+	g r g r | 
+	f2.\ff()es4 | 
+	d( c d )c |
+	%215
+	f2.\ff()es4 | 
+	d( c d )c |
+	bes2.\ff()as4 | 
+	g( f g )f |
+	bes2.\ff()as4 | 
 	%220
+	g( f g )f |
 	r4 r8 f' f4\sf()ges |
 	r4 r8 f f4\sf()ges |
 	r4 r8 f f4\sf()ges |
 	r4 r8 f f4\sf()ges |
-	f4. f'8 f,4. f'8 |
 	%225
+	f4. f'8 f,4. f'8 |
 	e,4. e'8 es,4. es'8 |
 	d,4. d'8 c,4. c'8 |
 	b,4. b'8 as,4. as'8 |
 	g,4 r8 g as4 r8 as |
-	f4 r8 f g4 r8 g |
 	%230
+	f4 r8 f g4 r8 g |
 	[c8\p es fis g][as g es c]|
 	[b d fis g][as g d b\f]|
 	[c es fis\p g][as g es c]|
 	[b d fis g][as g d b\f]|
-	[c es g\p as][bes, d fis g]|
 	%235
+	[c es g\p as][bes, d fis g]|
 	[as, c e f!][g, bes d es]|
 	[f, as c d][es g b c]|
 	[d, f as c][g, b d g]|
 	[c,\f e g as][bes, d fis g]|
-	[as, c e f!][g, bes d es]|
 	%240
-	f4 r r2 | R1*3 | 
+	[as, c e f!][g, bes d es]|
+	f4 r r2 | 
+	R1*3 | 
 	c4\p r r r8 c(|
+	%245
 	)f4 r r r8 f(|
 	)e4 r r r8 e(|
 	)b4 r r r8 b(|
 	)c4 r r r8 c(|
-	%250
 	)f4 r r r8 f(|
+	%250
 	)es4 r r r8 es(|
 	)b4 r r r8 b(|
 	)c4-"cresc." r r r8 c(|
 	)f4 r r r8 f,(|
-	)es1 | ges\f | f\p | as\f | g!\p | 
-	%260
+	)es1 | 
+	%255
+	ges\f | 
+	f\p | 
+	as\f | 
+	g!\p | 
 	bes\f |
-	as4.\p-"cresc." as'8 g4. g8 | f4. f8 es4. es8 |
-	as4. as8 g4. g8 | f4. f8 es4. es8 |
-	%265
+	%260
+	as4.\p-"cresc." as'8 g4. g8 | 
+	f4. f8 es4. es8 |
+	as4. as8 g4. g8 | 
+	f4. f8 es4. es8 |
 	f,4.\ff f'8 f2\sf | 
+	%265
 	f,4. f'8 f2\sf | 
 	g,4. g'8 g2\sf | 
 	g,4. g'8 g2\sf | 
 	as,4. as'8 as2\sf | 
-	%270
 	a,4. a'8 a2\sf | 
-	[c,8-"sempre" b c d][es\ff d es c]|
+	%270
+	[c,8-"sempre\ \ \ \ \ \ \ "\ff b c d][es\ff d es c]|
 	[b c d c][b c b g]|
 	[c8 b c d][es d es c]|
 	[b c d c][b c b g]|
@@ -300,9 +324,9 @@ violoncello = \notes \relative c {
 }
 
 $violoncello_staff = \context Staff = violoncello <
-	\property Staff.midiInstrument = "cello"
-	\property Staff.instrument = "Violoncello"
-	\property Staff.instr = "Vc."
+	\property Staff.midiInstrument = #"cello"
+	\property Staff.instrument = #"Violoncello"
+	\property Staff.instr = #"Vc."
 	\clef "bass";
 	\notes \context Voice=one< 
 		\global