From e21b546fe84fa0bbf0d114fc0afe599048c50041 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:13:16 +0000
Subject: [PATCH] lilypond-1.0.1

---
 input/keys.ly                                 |  18 +-
 input/kortjakje.ly                            |  41 +-
 input/pedal.ly                                |   7 +-
 input/praeludium-fuga-E.ly                    |  74 ++--
 input/rhythm.ly                               |  30 +-
 input/scales.ly                               |  47 +--
 input/scripts.ly                              |  13 +-
 input/test/a.ly                               |  54 +++
 input/test/beams.ly                           |  32 +-
 input/test/broken.ly                          |  12 +-
 input/test/collisions.ly                      |  31 +-
 input/test/denneboom.ly                       |  10 +-
 input/test/font-body.ly                       |  62 +--
 input/test/font.ly                            |   2 +-
 input/test/font16.ly                          |   2 +-
 input/test/gourlay.ly                         |   7 +-
 input/test/knee.ly                            |   5 +-
 input/test/sleur.ly                           |  51 ++-
 input/test/slur-damping.ly                    |   7 +-
 input/test/slurs.ly                           |  16 +-
 input/test/spacing.ly                         |   4 +-
 input/test/stem.ly                            |  21 +-
 input/test/title.ly                           |  24 +-
 input/test/transposition.ly                   |  64 +++
 input/tril.ly                                 |   2 +-
 input/twinkle-pop.ly                          |  16 +-
 input/twinkle.ly                              |  68 ++--
 mutopia/Coriolan/bassi-part.ly                |  32 ++
 mutopia/Coriolan/clarinetti-part.ly           |  10 +-
 mutopia/Coriolan/clarinetti.ly                |  23 +-
 mutopia/Coriolan/clarinetto-1.ly              |  19 +-
 mutopia/Coriolan/clarinetto-2.ly              |  25 +-
 mutopia/Coriolan/contrabasso-part.ly          |  20 +
 mutopia/Coriolan/contrabasso.ly               | 151 ++++++-
 mutopia/Coriolan/coriolan.ly                  |  39 +-
 mutopia/Coriolan/corni-part.ly                |  10 +-
 mutopia/Coriolan/corni.ly                     |  21 +-
 mutopia/Coriolan/corno-1.ly                   |  23 +-
 mutopia/Coriolan/corno-2.ly                   |  28 +-
 mutopia/Coriolan/fagotti-part.ly              |   8 +-
 mutopia/Coriolan/fagotti.ly                   |  12 +-
 mutopia/Coriolan/fagotto-1.ly                 |  19 +-
 mutopia/Coriolan/fagotto-2.ly                 |  21 +-
 mutopia/Coriolan/flauti-part.ly               |   8 +-
 mutopia/Coriolan/flauti.ly                    |  12 +-
 mutopia/Coriolan/flauto-1.ly                  |  26 +-
 mutopia/Coriolan/flauto-2.ly                  |  23 +-
 mutopia/Coriolan/global.ly                    |  11 +-
 mutopia/Coriolan/oboe-1.ly                    |  22 +-
 mutopia/Coriolan/oboe-2.ly                    |  20 +-
 mutopia/Coriolan/oboi-part.ly                 |   8 +-
 mutopia/Coriolan/oboi.ly                      |  12 +-
 mutopia/Coriolan/timpani.ly                   |  26 +-
 mutopia/Coriolan/trombe-part.ly               |   8 +-
 mutopia/Coriolan/trombe.ly                    |  13 +-
 mutopia/Coriolan/trombo-1.ly                  |  21 +-
 mutopia/Coriolan/trombo-2.ly                  |  23 +-
 mutopia/Coriolan/viola-1.ly                   | 304 ++++++++++++++
 mutopia/Coriolan/viola-2.ly                   |  44 ++
 mutopia/Coriolan/viola-part.ly                |  33 ++
 mutopia/Coriolan/violino-1-part.ly            |  20 +
 mutopia/Coriolan/violino-1.ly                 | 283 ++++++++++++-
 mutopia/Coriolan/violino-2-part.ly            |  20 +
 mutopia/Coriolan/violino-2.ly                 | 297 +++++++++++++-
 mutopia/Coriolan/violoncello-part.ly          |  20 +
 mutopia/Coriolan/violoncello.ly               | 305 +++++++++++++-
 .../J.S.Bach/Petites-Preludes/preludes-1.ly   | 119 ++++++
 .../J.S.Bach/Petites-Preludes/preludes-2.ly   | 130 ++++++
 .../J.S.Bach/Petites-Preludes/preludes-3.lym4 | 182 +++++++++
 .../J.S.Bach/Petites-Preludes/preludes-4.ly   | 207 ++++++++++
 .../J.S.Bach/Petites-Preludes/preludes-5.ly   | 225 +++++++++++
 .../J.S.Bach/Petites-Preludes/preludes-6.ly   | 133 +++++++
 .../Solo-Cello-Suites/allemande-alto.ly       |  49 +++
 .../Solo-Cello-Suites/allemande-cello.ly      |  49 +++
 .../Solo-Cello-Suites/courante-alto.ly        |  49 +++
 .../Solo-Cello-Suites/courante-cello.ly       |  49 +++
 .../J.S.Bach/Solo-Cello-Suites/gigue-alto.ly  |  50 +++
 .../J.S.Bach/Solo-Cello-Suites/gigue-cello.ly |  49 +++
 .../Solo-Cello-Suites/menuetto-alto.ly        |  95 +++++
 .../Solo-Cello-Suites/menuetto-cello.ly       |  96 +++++
 .../Solo-Cello-Suites/prelude-alto.ly         |  44 ++
 .../Solo-Cello-Suites/prelude-cello.ly        |  44 ++
 .../Solo-Cello-Suites/sarabande-alto.ly       |  46 +++
 .../Solo-Cello-Suites/sarabande-cello.ly      |  46 +++
 mutopia/J.S.Bach/wtk1-fugue1.ly               | 246 ++++++------
 mutopia/J.S.Bach/wtk1-fugue2.ly               | 213 +++++-----
 mutopia/J.S.Bach/wtk1-prelude1.ly             |  15 +-
 mutopia/W.A.Mozart/cadenza.ly                 |   2 +-
 mutopia/W.A.Mozart/horn-concerto-3.ly         |  48 ++-
 mutopia/gallina.ly                            | 202 +++++-----
 mutopia/los-toros-oboe.ly                     |  52 +--
 mutopia/standchen-16.ly                       |   2 +-
 mutopia/standchen-20.ly                       |   2 +-
 mutopia/standchen.ly                          | 375 +++++++++---------
 scripts/convert-mudela.py                     | 264 ++++++++++++
 95 files changed, 4632 insertions(+), 1191 deletions(-)
 create mode 100644 input/test/a.ly
 create mode 100644 input/test/transposition.ly
 create mode 100644 mutopia/Coriolan/bassi-part.ly
 create mode 100644 mutopia/Coriolan/contrabasso-part.ly
 create mode 100644 mutopia/Coriolan/viola-1.ly
 create mode 100644 mutopia/Coriolan/viola-2.ly
 create mode 100644 mutopia/Coriolan/viola-part.ly
 create mode 100644 mutopia/Coriolan/violino-1-part.ly
 create mode 100644 mutopia/Coriolan/violino-2-part.ly
 create mode 100644 mutopia/Coriolan/violoncello-part.ly
 create mode 100644 mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
 create mode 100644 mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
 create mode 100644 mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
 create mode 100644 mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
 create mode 100644 mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
 create mode 100644 mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly
 create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly
 create mode 100644 scripts/convert-mudela.py

diff --git a/input/keys.ly b/input/keys.ly
index 35f27b18d0..134351df3c 100644
--- a/input/keys.ly
+++ b/input/keys.ly
@@ -1,19 +1,21 @@
-\version "0.1.15";
+\version "1.0.0";
 
 
-blah = \melodic{
-	\meter 4/4;
-	\octave c';
-	\key bes es as;
+blah = \melodic {
+
+\transpose c'' {
+	\time 4/4;
+	\accidentals  es;
 	[cis8 d e f] [e! a b cis'] |
 	es e f e a a' a  a' |
- \clef "bass";       \octave c; [es16 c' b a] [g f es d] [c d es d] [c Bes As G] |
+ \clef "bass";  }
+  [es16 c' b a] [g f es d] [c d es d] [c Bes As G] |
 
 \clef "violin";
-	\key ;
+	\accidentals  c;
 	cis4 c cis cis |
 	<cis dis eis fes ges> cis dis2 ~ | 
-		\meter 2/4 ;
+		\time 2/4 ;
 	dis4 dis ~ | c cis~ | c
 }
 
diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index 657eeaf89f..b3f68e393f 100644
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -1,9 +1,8 @@
-
 \header{
 filename =	 "kortjakje.ly";
-title =	 "Ah,  vous dirais-je, maman (variations)";
+title =	 "Ah  vous dirais-je maman (variations)";
 description =	 "bare bones version. (written down from memory :-)";
-composer =	 "Mozart, KV 265";
+composer =	 "Mozart KV 265";
 enteredby =	 "HWN";
 copyright =	 "public domain";
 }
@@ -11,55 +10,51 @@ copyright =	 "public domain";
 Tested Features: example file with comments
 
 %}
-\version "0.1.15";
+\version "1.0.0";
 
 
 % the % is a comment.
 
 
 % declare melody (which will be in *one* staff ) for the lead voice
-melodie = \melodic {
+melodie = \melodic \relative c' {
 	 			% switch Lilypond in note-mode
 	\clef"violin";
-	\meter 2/4 ;
-	\octave  c'; 		% set the default octave
-	% the default note duratino is 4
+	\time 2/4 ;
 	%%% theme
-	c4 c |			% the '|' checks if there is a new measure here.
-	g g|
+	c4 c |			% the | checks if there is a new measure here.
+	g' g|
 	a a|
 
 	g2|	% g2 means a "g-1" pitched half-note 
 	f4 f|	e e|	d d|  c2
-	g4 g|	f f|	e e| 	d d|	g g|	f f|	e e| 	d d|
+	g'4 g|	f f|	e e| 	d d|	g g|	f f|	e e| 	d d|
  	%%% var 1
 	  c4 r8 c		% r8 means an 8th rest.
 		  (|		% start a slur
 				% NOTE: the slurstart should be directly after the note
 			) 	% end a slur.
-			  g4 r8 g8 () 	 a4 r8 a8 () 	 g4 r4 
+			  g'4 r8 g8 () 	 a4 r8 a8 () 	 g4 r4 
 	  f4 r8 f8 () 	 e4 r8 e8 (|)  d4 r8 d8 () 	 c4 r4 
 }
 
 				% more of this.
-begeleiding = \melodic{ 
+begeleiding = \melodic \relative c { 
 	\clef "bass";
-	\meter 2/4 ;
-	\octave  c'; 		% default octave: 1 below the first octave.
+	\time 2/4 ;
 
 	%%% theme
-	c,4			% ' before note means one octave lower.
-				% Similarly: ' after means one higher.
-	   c	e c	f c	e c	d b,	c a,	f, g,	c,2 |
-	\octave  c ;
-	e4 g,	d g,	c g,	b, g,	e g,	d g,	c g,	b, g,
+	c4			%  before note means one octave lower.
+				% Similarly:  after means one higher.
+	   c'	e c	f c	e c	d b	c a	f g	c,2 |
+	e'4 g,	d' g,	c g	b g	e' g,	d' g,	c g	b g
 	%%%% var 1
-	r8 e8()  c4  	r8 e8()  c4  	r8 f8() c4 	r8 e8() c4
-	r8 d8() b,4 	r8 c8() a,4 	r8 a,8() f,4 	r8 e,8() c,4
+	r8 e'8()  c4  	r8 e8()  c4  	r8 f8() c4 	r8 e8() c4
+	r8 d8() b4 	r8 c8() a4 	r8 a8() f4 	r8 e8() c4
 }
 
 \score{
-	\melodic \type Grand_staff <
+	\type GrandStaff <
 		\melodie
 		\begeleiding 
 	>
diff --git a/input/pedal.ly b/input/pedal.ly
index 651cd94fcb..6810cfa6be 100644
--- a/input/pedal.ly
+++ b/input/pedal.ly
@@ -24,14 +24,13 @@
 % \lbheel \lbheel \lfheel \lftoe
 % \rbheel \rbtoe \rfheel \rftoe
 
-\version "0.1.15";
+\version "1.0.0";
 
 \score{
 		\melodic {
-			\meter 4/4;
-			\key fis cis;
+			\time 4/4;
+			\key D;
 			\clef bass;
-			\octave c;
 			% silly chord testing...
 % these should be stacked...
 %			< c,-\ltoe e,-\lheel > < c'-\rtoe e'-\rheel>
diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index 48ea88df3b..b198ed23f6 100644
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -19,32 +19,41 @@
    * organ staff...
 %}
 
-\version "0.1.15";
+\version "1.0.0";
 
-noShift = { \property Voice.hshift = 0 }
-Shift = { \property Voice.hshift = 1 }
 
 
 praeludium_commands = \melodic {
-  \meter 4/4;
-  \key fis cis gis dis;             % E-major
+  \time 4/4;
+   \key e;
 }
 
-praeludium_right = \melodic {
+praeludium_right = \melodic\transpose c'' {
   \$praeludium_commands
-  \octave c';
   \clef violin;
 
   % 13 -- how to type -- where to split -- this more neatly?
-  \multi 2 <
+  \type Staff <
     { \stemup r4 dis'4 e'4. e'8 ~ |
-      \Shift e'4 [d'8 fis'8] \noShift gis'4 ~ [gis'8 fis'16 e'16] |
+      \shifton e'4 [d'8 fis'8] \shiftoff gis'4 ~ [gis'8 fis'16 e'16] |
       fis'4 ~ [fis'8 e'16 dis'16] e'4 r8 e'8 }
-    { \stemup \Shift r4 bis4 cis'4 \noShift cis'4 |
-      a'4 ~ [a'16 gis'16 a'16 b'16] \Shift dis'4 cis'4 ~ |
+    { \stemup \shifton r4 bis4 cis'4 \shiftoff cis'4 |
+      a'4 ~ [a'16 gis'16 a'16 b'16] \shifton dis'4 cis'4 ~ |
       [cis'8 dis'16 ais16] bis4 cis'4 r8 b8 }
-    { \stemup \Shift s4 gis4 }
-    { \stemdown \Shift r4 fis4 \noShift gis4 gis4 |
+    {
+
+      %\stemup
+      %{
+      this is a diversion from the Griepenkerl/Keller
+       edition; a hack to avoid collisions
+      %}
+      \stemdown
+      \shifton s4 gis4 }
+      
+    { \stemdown
+%      \shifton       % idem
+
+      r4 fis4 \shiftoff gis4 gis4 |
       a4. cis'8 gis2 |
       fis4 gis4 gis4 r8 e8 }
   > |
@@ -53,19 +62,20 @@ praeludium_right = \melodic {
 
 praeludium_left = \melodic {
   \$praeludium_commands
-  \octave c;
   \clef bass;
 
   % 13
-  \multi 2 <
+  \type Staff <
     { \stemup r4 dis'4 cis'4 cis'4 ~ |
       [cis'8 a8 d'8 cis'8] [bis8 gis8] cis'4 |
       dis'2 cis'4 r8 cis'8 }
     { \stemup bis2 }
-    { \stemup \Shift r4 gis4 ~ [gis 8 gis8] ~ \stemdown \noShift gis4 |
+    { \stemup \shifton r4 gis4 ~ [gis 8 gis8] ~ \stemdown \shiftoff gis4 |
       a4. fis8 gis4. a8 ~ |
       a4 gis4 gis4 r8 gis8 }
-    { \stemup \Shift s4 fis4 e}
+%    { \stemup \shifton s4 fis4 e}
+% a quick hack to avoid some collisons
+    { \stemdown \shifton s4 fis4 e}
     { \stemdown s4 dis4 cis4 }
   > |
   % 16
@@ -73,7 +83,6 @@ praeludium_left = \melodic {
 
 praeludium_pedal = \melodic {
   \$praeludium_commands  
-  \octave c;
   \clef bass;
 
   % 13
@@ -85,17 +94,16 @@ praeludium_pedal = \melodic {
 
 
 fuga2_commands = \melodic{
-  \meter 3/4;
-  \key fis cis gis dis;             % E-major
+  \time 3/4;
+  \key e;              % E-major
 }
 
-fuga2_right = \melodic {
+fuga2_right = \melodic\transpose c'' {
   \$fuga2_commands
-  \octave c';
   \clef violin;
 
   % 15
-  \multi 2 <
+  \type Staff <
     { \stemup [b8 fis8] b4 }
     { \stemdown fis2 }
   >
@@ -107,18 +115,18 @@ fuga2_right = \melodic {
       |x
       |
    %}
-   \multi 2 <
-     { \stemup \noShift e'4 }
-     { \stemup \Shift cis'4 }
-     { \stemup \Shift ais4 }
+   \type Staff <
+     { \stemup \shiftoff e'4 }
+     { \stemup \shifton cis'4 }
+     { \stemup \shifton ais4 }
      { \stemdown fis4 }
    > |
   % 16
-  \multi 2 <
+  \type Staff <
     { \stemup dis'2 dis'4 |
       cis'2 cis'4 |
       b4. [cis'8 dis'8 e'8] }
-    { \stemup \Shift [b8 fis8] b2 ~ |
+    { \stemup \shifton [b8 fis8] b2 ~ |
       [b8 a!16 gis16] a2 ~ |
       a4 gis2 }
     { \stemdown fis2. ~ |
@@ -130,11 +138,10 @@ fuga2_right = \melodic {
 
 fuga2_left = \melodic {
   \$fuga2_commands  
-  \octave c;
   \clef bass;
 
   % 15
-  \multi 2 < 
+  \type Staff < 
     { \stemdown b2 \stemup ais4 |
       b2 b4 }
     { \stemdown s2 e4 |
@@ -147,7 +154,6 @@ fuga2_left = \melodic {
 
 fuga2_pedal = \melodic {
   \$fuga2_commands  
-  \octave c;
   \clef bass;
 
   % 15
@@ -159,7 +165,7 @@ fuga2_pedal = \melodic {
 }
 
 breakmusic = \melodic { 
-  %\meter 4/4;
+  %\time 4/4;
   r1
 }
 
@@ -167,7 +173,7 @@ breakmusic = \melodic {
 % these should be two separate scores...
 \score{
   \type Score <
-    \type Grand_staff <
+    \type GrandStaff <
       \type Staff = treble {
         \praeludium_right \breakmusic \fuga2_right }
       \type Staff = bass { 
diff --git a/input/rhythm.ly b/input/rhythm.ly
index e0a019dbbf..a9624effb9 100644
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -7,26 +7,26 @@ TestedFeatures =	 "multiple meters, beaming, unsynced bars, userdefd engravers";
 
 
 
-\version "0.1.15";
+\version "1.0.0";
 
-ritme = \melodic{ %\octave ;
+ritme = \melodic\transpose c'' {
 	\partial 8;
-	\octave c';
-	\meter  4/4;
+
+	\time  4/4;
 	c8					|
 	
 	[a8~  a8. a8 a16 a16 a16] c4.		|	% watch the beams!
 	 r32 r32 r16 r8 r4 r2			|
-	\meter   5/16;
+	\time   5/16;
 
 	% divide measure in 5 equal parts. Usually it 2+3 or 3+2
 	\grouping  16*5 ;	
 	[c8 c16 c8 ]				|	% watch THIS!
 	 [5/4 c16 c16 c16 c16]1/1 |
-	\meter   2/8;
+	\time   2/8;
 	c4 				|
 	c4	c4	c4	c4
-	\meter 4/4;
+	\time 4/4;
 	c1 c1 c1
 	
 %	[c16 c16 c16 c16 ]			|
@@ -37,22 +37,22 @@ ritme = \melodic{ %\octave ;
 	
 
 another = 
-	\melodic{ \meter 4/4; 
-		c1.  c1. c4 c4 c4 c4  \meter  4/4; c1 c1 c1
+	\melodic{ \time 4/4; 
+		c1.  c1. c4 c4 c4 c4  \time  4/4; c1 c1 c1
 	 }
 
 
 yanother = 
-	\melodic{ \meter 4/4; 
+	\melodic{ \time 4/4; 
 		c1 c1 c1 c4 c4 c4 c4  c1 c1 c1
 	 }
 
 
 \score{
-	\type Staff_group <
+	\type StaffGroup <
 		\ritme
 		\another
-		\type Rhythmic_staff {
+		\type RhythmicStaff {
 			\yanother
 		}
 	>
@@ -71,13 +71,13 @@ yanother =
 	\consists "Vertical_align_engraver";
 
 
-	\accepts "Staff_group";
+	\accepts "StaffGroup";
 	\accepts "Staff";
 	\accepts "Lyrics";
-	\accepts "Grand_staff";
+	\accepts "GrandStaff";
 }
 
-Rhythmic_staff = \translator
+RhythmicStaff = \translator
 {
 	  \type "Engraver_group_engraver";
 	nolines  = "1";
diff --git a/input/scales.ly b/input/scales.ly
index 397198f53e..6c18cddc2f 100644
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -12,26 +12,25 @@ copyright =	 "public domain";
 % scales with accents.
 %
 
-\version "0.1.15";
+\version "1.0.0";
 blah = 	\melodic {
-		\meter 6/8;	
-		\octave  c, ;
+		\time 6/8;	
+\transpose c {
 		\clef "bass";
 			c4. d
-		\octave  c ;
+}
 			c d 
 		\clef "violin" ;
-		\octave  c' ;
-		\transpose  d { e f } 
-		\octave  c'' ;
+\transpose c'' {
+		\transpose  d { e f }  }
+\transpose c''' {
 		c4. d 
 	%ugr
-		 |[6/9 a8 \< a a a a a a  \! a a \ff \> ]1/1 |
-		\octave  c' ;
-		 |[6/9 a  a a a a a a a \! a ]1/1 |
-		\octave  c'' ; 
-	
-		 [6/9'c->-.-\fermata \< g,->-.-\fermata 
+		 |[6/9 a8 \< a a a a a a  \! a a \ff \> ]1/1 | }
+		 \transpose c'' {
+		     [6/9 a  a a a a a a a \! a ]1/1 | }
+		 \transpose c''' {
+		 [6/9 c,->-.-\fermata \< g,->-.-\fermata 
 			d->-.-\fermata a->-.-\fermata
 			e'->-.-\fermata b'-. f''-. c'''->-.-\fermata 
 			\! g'''->-.-\fermata \> ]1/1
@@ -40,8 +39,8 @@ blah = 	\melodic {
 			f''->-.-\fermata b'->-.-\fermata e'->-.-\fermata 
 			a->-.-\fermata d->-.-\fermata g,->-.-\fermata \! 
 			c,->-.-\fermata ]1/1
-		 \octave c;
-		[6/9'c->-.-\fermata \< g,->-.-\fermata d->-.-\fermata 
+			
+		[6/9 c,->-.-\fermata \< g,->-.-\fermata d->-.-\fermata 
 		a->-.-\fermata
 			e'->-.-\fermata b'-. f''-. 
 			c'''->-.-\fermata \! g'''->-.-\fermata \> ]1/1
@@ -49,26 +48,27 @@ blah = 	\melodic {
 			f''->-.-\fermata b'->-.-\fermata e'->-.-\fermata 
 			a->-.-\fermata d->-.-\fermata 
 			g,->-.-\fermata \! c,->-.-\fermata ]1/1
-		\octave  c' ;
-		\octave  c' ;   
+		}
+		\transpose c'' {
 		 [2/3 c g d' ]1/1 
 		 [2/3 d' g c ]1/1  
 		 [2/3 f c' g' ]1/1 
-		 [2/3 g' c' f ]1/1  
-		\octave  c ;
+		 [2/3 g' c' f ]1/1
+		 }
+		 \transpose c' {
 		 [2/3 c g d' ]1/1 
 		 [2/3 d' g c ]1/1  
 		 [2/3 f c' g' ]1/1 
 		 [2/3 g' c' f ]1/1 
 		 [2/3 g' c' f ]1/1 
-  \meter 4/4;
+  \time 4/4;
 
-c1
+c1}
 
 		r8-"text" r8^. r8_. r8 r8 r8 r8 r8
 	[c-> d-> e-> f->][g-> a-> b-> c'->] % 1
-\octave c';	[c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
-\octave c;	[c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
+\transpose c'' {	[c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]}
+	[c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
 	[c-. d-. e-. f-.][g-. a-. b-. c'-.]
 	[c'-- b-- a-- g][f-- e-- d c--] % 5
 	[c-\portato d-\portato e-\portato f-\portato]
@@ -86,5 +86,6 @@ c1
 \score{
 	\melodic {\blah}
 	\paper{
+	 castingalgorithm = \Wordwrap;
 	}
 }
diff --git a/input/scripts.ly b/input/scripts.ly
index 31c227d576..bce1fb13ad 100644
--- a/input/scripts.ly
+++ b/input/scripts.ly
@@ -1,9 +1,9 @@
 	
-\version "0.1.15";
+\version "1.0.0";
 
 
-blah = 	\melodic {
-	\octave c';
+blah = 	\melodic{ \transpose c'' {
+
 	c,4 ->-.-\fermata-"text"
 	c ->-.-\fermata-"text"
 	c' ->-.-\fermata-"text"
@@ -43,9 +43,7 @@ blah = 	\melodic {
 	\stemup
 	b,---. c---. d---. e---. f---. g---. a---. b---. c'---.
 	\stemboth
-
-      \meter 4/4;
-	\octave c';
+      \time 4/4;
 	[c8 \< d e \! f][d' \> e' f' \! g'] 
 	[c-> \< d-> e-> \! f->][d'-> \> e'-> f'-> \! g'->] 
 	[c-^ \< d-^ e-^ \! f-^][d'-^ \> e'-^ f'-^ \! g'-^] 
@@ -60,7 +58,8 @@ blah = 	\melodic {
 		[d'-\fermata \> e'-\fermata f'-\fermata \! g'-\fermata] 
 	[c-\lheel \< d-\lheel e-\lheel \! f-\lheel]
 		[d'-\lheel \> e'-\lheel f'-\lheel \! g'-\lheel]
-}
+
+}}
 
 
 \score{
diff --git a/input/test/a.ly b/input/test/a.ly
new file mode 100644
index 0000000000..45c13fc8b5
--- /dev/null
+++ b/input/test/a.ly
@@ -0,0 +1,54 @@
+\header{
+enteredby =	 "jcn";
+copyright =	 "PD";
+TestedFeatures =	 "This file tests Feta embedded slurs"
+	 "(Feta definitively is not an abbreviation of Font-En-TjA)";
+}
+
+\version "1.0.0";
+
+shortlong = \melodic\transpose c'{
+	c4()c( c c  |
+	c c c c |
+	c c c c |
+	\break
+	c c c )c |
+}
+
+sl = \melodic\transpose c''{
+
+%	e4()e( a e  |
+	e4 e( a e  |
+	e e e e |
+	e e e a |
+	\break
+	e e g )e |
+}
+
+broken = \melodic\transpose  c'' {
+      c c c c()
+      c c c c(
+      c )c c c(
+      c c )c c(
+      )a' a' a' a'()
+      a' a' a' a'()
+      c( c c )c 
+      c( c c )f, 
+      f,( c c )c 
+      f,( c c )f,
+}
+
+\score{
+	\melodic{ 
+		\shortlong
+		\sl
+		\broken
+	}
+	\paper{ 
+	      indent = 0.0\pt;
+		%for broken!
+%		linewidth= 30.\mm;
+		castingalgorithm = \Wordwrap;
+	}
+}
+
diff --git a/input/test/beams.ly b/input/test/beams.ly
index f3bb1637dc..686dca2388 100644
--- a/input/test/beams.ly
+++ b/input/test/beams.ly
@@ -6,15 +6,15 @@ copyright =	 "PD";
 
 TestedFeatures =	 "beams and beamflags";
 }
-\version "0.1.15";
+\version "1.0.0";
 
 \score{
 	<
 %		\property Score.beamquantisation = \none
-		\type Grand_staff < 
-		\melodic { 
-			\octave c'; 
-			\meter 8/4;
+		\type GrandStaff < 
+		\melodic\transpose c' { 
+
+			\time 8/4;
 			\stemup [c8 c'' a' f']
 			\stemup [c16 c'' a' f']
 			\stemup [c32 c'' a' f']
@@ -29,39 +29,39 @@ TestedFeatures =	 "beams and beamflags";
 			\stemup [g128 g g g]
 			r32
 
-			\octave c;
-			\stemboth;
+						\transpose c{
+			\stemboth
 			[c'8 c'] [b b] [a a] [g g] [f f] [e e]
 			[c'16 c'] [b b] [a a] [g g]  [f f] [e e]
 			[c'32 c'] [b b] [a a] [g g] [f f] [e e]
-			[c'64 c'] [e e]
+			[c'64 c'] [e e]}
 		}
 	>
 	<	
 		\melodic { 
-			\octave c';  
-			\meter 8/4;
+\transpose c' {
+			\time 8/4;
 			\stemdown [a'8 a, c e]
 			\stemdown [a'16 a, c e]
 			\stemdown [a'32 a, c e]
 			\stemdown [a'64 a, c e]
 			\stemdown [a'128 a, c e]
-			r32
+			r32}
 
-			\octave c;
+			\transpose c{
 			\stemdown [d''8 d'' d'' d'']
 			\stemdown [d''16 d'' d'' d'']
 			\stemdown [d''32 d'' d'' d'']
 			\stemdown [d''64 d'' d'' d'']
 			\stemdown [d''128 d'' d'' d'']
-			r32
+			r32}
 
-			\octave c'';
-			\stemboth;
+			\transpose c''{
+			\stemboth
 			[a8 a] [b b] [c' c'] [d' d'] [e' e'] [f' f']
 			[a16 a] [b b] [c' c'] [d' d']  [e' e'] [f' f']
 			[a32 a] [b b] [c' c'] [d' d']  [e' e'] [f' f']
-			[a64 a] [f' f'] 
+			[a64 a] [f' f']} 
 		}
 	>
 	>
diff --git a/input/test/broken.ly b/input/test/broken.ly
index 16b44a6f6e..8f33fb5490 100644
--- a/input/test/broken.ly
+++ b/input/test/broken.ly
@@ -5,18 +5,18 @@ TestedFeatures =	 "This file tests Feta embedded slurs"
 	 "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.15";
+\version "1.0.0";
 
 shortlong = \melodic{
 	c4()c( c c  |
 	c c c c |
 	c c c c |
-	\break;
+	\break
 	c c c )c |
 }
 
-broken = \melodic{
-      \octave c'';
+broken = \melodic\transpose c''{
+
       c c c c()
       c c c c(
       c )c c c(
@@ -24,9 +24,9 @@ broken = \melodic{
       )a' a' a' a'()
       a' a' a' a'()
       c( c c )c 
-      c( c c )'f 
+      c( c c )f,
       f,( c c )c 
-      f,( c c )'f
+      f,( c c )f,
 }
 
 \score{
diff --git a/input/test/collisions.ly b/input/test/collisions.ly
index 6ab2e5f41e..ade5a27a95 100644
--- a/input/test/collisions.ly
+++ b/input/test/collisions.ly
@@ -5,13 +5,13 @@ enteredby =	 "HWN,JCN";
 copyright =	 "public domain";
 Tested =	 "test the Collision resolution ";
 }
-\version "0.1.15";
+\version "1.0.0";
 
 
 
 two_voice = \melodic 
-	\multi 2 < 
-	  { \stemdown \octave c'; 
+	\type Staff < 
+	  { \stemdown
 		c4 d e f g2~  g4 a [c8 d e f] c2| }
 	  { \stemup
 		g4 f e g ~ g2 g2  c4 g4 g2 } 
@@ -19,9 +19,9 @@ two_voice = \melodic
 	>
 
 two_voice_steminvert = \melodic 
-	\multi 2 <  
+	\type Staff <  
 	  { 
-		\octave c'; \stemup
+ \stemup
 % the f and g on 4th beat are exceptionally ugh.
 		c4 d e f g2 g4 a | }
 	  { \stemdown
@@ -30,7 +30,7 @@ two_voice_steminvert = \melodic
 	>
 
 three_voice = \melodic 
-	\multi 2 <
+	\type Staff <
 	{ \stemup 
 		g4 f e f g a g2 }
 	{ \stemup \property Voice.hshift = 1 
@@ -41,7 +41,7 @@ three_voice = \melodic
 
 
 rests = \melodic  
-	\multi 2 <
+	\type Staff <
 	{ \stemup
 		| r8 r r r  r r r r 
 		[c' b a g] [f e d c]
@@ -53,21 +53,20 @@ rests = \melodic
 	>
 
 restsII = \melodic {
-	\octave c'; 
-	\multi 2 < 
+	\type Staff < 
 		{ \stemup  g' f' e' d' c' b a g f e d c }
 		{ \stemdown r  r  r  r  r  r r r r r r r }
 	>
-	\multi 2 <
+	\type Staff <
 		{ \stemup  r r r r r r r r  r  r  r  r }
 		{ \stemdown c d e f g a b c' d' e' f' g' }
 	>
 	r8 r4
-	\multi 2 <  r8 r8 >
-	\multi 2 <  r8 r8 r8 >
-	\multi 2 <  r8 r8 r8 r8 >
-	\multi 2 <  r r >
-	\multi 2 <  r r r >
+	\type Staff <  r8 r8 >
+	\type Staff <  r8 r8 r8 >
+	\type Staff <  r8 r8 r8 r8 >
+	\type Staff <  r r >
+	\type Staff <  r r r >
 	\stemup
 	[c''8 r8 c''8 c''8]
 	[c8 r8 c8 c8]
@@ -77,7 +76,7 @@ restsII = \melodic {
 }
 
 \score{
-	{  \two_voice  
+	\melodic \transpose c' {  \two_voice  
 	\two_voice_steminvert 
 	\three_voice  
 	\rests 
diff --git a/input/test/denneboom.ly b/input/test/denneboom.ly
index 23ae35e3ba..7dd60edfb8 100644
--- a/input/test/denneboom.ly
+++ b/input/test/denneboom.ly
@@ -7,7 +7,7 @@ TestedFeatures = "This file tests silly line shapes";
 
 \include "paper20.ly"
 
-\version "0.1.15";
+\version "1.0.0";
 
 oden = \lyric{ 
 	O8 |
@@ -33,8 +33,7 @@ ugloeit = \lyric{
 	licht8. ge-16 spreid.4 _8
 }
 
-oboom = \melodic{
-	\octave c';
+oboom = \melodic\transpose c''{
 	g,8 |
 	c8. c16 c4. d8 | 
 	e8. e16 e4. e8 | 
@@ -42,8 +41,7 @@ oboom = \melodic{
 	d8. c16 c4 r8
 }
 
-bos = \melodic{
-	\octave c';
+bos = \melodic\transpose c''{
 	g8 | 
 	g e a4. g8 | 
 	g8. f16 f4 r8 f8 |
@@ -52,7 +50,7 @@ bos = \melodic{
 }
 
 global = \melodic{ 
-	\meter 3/4;
+	\time 3/4;
     	\partial 8;
 	\skip 4*48;
 	\bar "|.";
diff --git a/input/test/font-body.ly b/input/test/font-body.ly
index c9fbb81382..be1e3f0d98 100644
--- a/input/test/font-body.ly
+++ b/input/test/font-body.ly
@@ -1,9 +1,9 @@
-\version "0.1.15";
-FontBody=	\melodic{ 
-		\octave c';
+\version "1.0.0";
+
+FontBody=	\melodic\transpose c''{ 
 		\bar "|:";
-		\meter 4/4;
-		\multi 2  < { \stemup e'\longa a\breve | }
+		\time 4/4;
+		\type Staff  < { \stemup e'\longa a\breve | }
 		{ \stemdown
 		c1 \clef "bass"; b,, \clef "violin"; c' a'
 		c2 \clef "alto"; g c' \clef "violin"; a'
@@ -18,36 +18,38 @@ FontBody=	\melodic{
 		[c \< d e f] [as' ges' f' e']
 		[cis' dis' c' des'] [cisis' disis' \! ceses' deses'] |
 		\clef "bass";
+		  r\longa * 1/4 r\breve *1/2
 		  r1 r2 r4 r8 r16 r32 r64 r128 r128 |
-		\multi 2 < { \stemup r2 r2} {\stemdown c c }>
-		\multi 2 < { \stemup c,,1 } {\stemdown r1}>		
+		\type Staff < { \stemup r2 r2} {\stemdown c c }>
+		\type Staff < { \stemup c,,1 } {\stemdown r1}>		
 		\stemboth
 		\clef "violin";
 		e8_. g'8-> e16^^ g'16_^ 
 		e32 _| g'32^| g''32-\ltoe g''32-\lheel
 		e64-\rtoe g'64-\rheel c4... |
 
-		\octave c'';
-		\meter 4/4;
-		\textstyle "finger";
-		c4^"1" d^"2" e^"3" f^"4" g^"5"
-		
-		% Music to the Martians!
-		< bes4^"6" e_"7" c_"8" >
-		a^"0"_"9"
-		
-		a'^\flageolet
-		\textstyle "roman";
-		\meter 1/2; a2 |
-		\meter 3/2; < a1.
-		{ s4 \ppp \< s4 \! s4 \fff  s4 \> s4 \! s4\ppp} >
-		|
-		\meter 2/4; a2 |
-		\meter 5/4; a1.. |
-		\meter 6/8; a2. |
-		\meter 7/8; a2.. |
-		\meter 9/8; a1... |
-		\meter 12/8; a1. |
-		\meter 12/4;
-		r1. r2. r4. r8. r16. r32. r64. r64. |
+		\transpose c'{
+			\time 4/4;
+			\property Voice . textstyle =  "finger"
+			c4^"1" d^"2" e^"3" f^"4" g^"5"
+
+			% Music to the Martians!
+			< bes4^"6" e_"7" c_"8" >
+			a^"0"_"9"
+
+			a'^\flageolet
+			\property Voice . textstyle =  "roman"
+			\time 1/2; a2 |
+			\time 3/2; < a1.
+			{ s4 \ppp \< s4 \! s4 \fff  s4 \> s4 \! s4\ppp} >
+			|
+			\time 2/4; a2 |
+			\time 5/4; a1.. |
+			\time 6/8; a2. |
+			\time 7/8; a2.. |
+			\time 9/8; a1... |
+			\time 12/8; a1. |
+			\time 12/4;
+			r1. r2. r4. r8. r16. r32. r64. r64. |
 		}
+}
diff --git a/input/test/font.ly b/input/test/font.ly
index 1b72842cd6..2063e9fb96 100644
--- a/input/test/font.ly
+++ b/input/test/font.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.15";
+\version "1.0.0";
 
 \include "font-body.ly"
 \score{
diff --git a/input/test/font16.ly b/input/test/font16.ly
index a79a64d7c4..9b2d190f79 100644
--- a/input/test/font16.ly
+++ b/input/test/font16.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.15";
+\version "1.0.0";
 \include "font-body.ly"
 
 \score{
diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly
index 0e83b364b1..9d82c7aa42 100644
--- a/input/test/gourlay.ly
+++ b/input/test/gourlay.ly
@@ -4,7 +4,7 @@ copyright =	 "PD";
 TestedFeatures =	 "This file tests some nasty Gourlay spacings";
 }
 
-\version "0.1.15";
+\version "1.0.0";
 
 %{
 
@@ -13,10 +13,9 @@ This is taken from [Gourlay]'s paper on breaking lines
 %}
 
 \score{
-       \melodic \multi 2 < \octave c'';
+       \melodic \type Staff  \transpose c''<
                { \stemup; d2 d     | d d | d4 d2. | \break;  c1 }
-               \octave c';
-              { \stemdown; g4 g g g | \[2/3 g2 g2 g2 \] | g4. g8 g2 | c1 }
+               \transpose c, { \stemdown; g4 g g g | \[2/3 g2 g2 g2 \] | g4. g8 g2 | c1 }
                >
        \paper{
            linewidth = 8.\cm;
diff --git a/input/test/knee.ly b/input/test/knee.ly
index f43487c34f..eedb742039 100644
--- a/input/test/knee.ly
+++ b/input/test/knee.ly
@@ -1,7 +1,6 @@
-\version "0.1.15";
+\version "1.0.0";
 \score{
-	\melodic{
-		\octave relative;
+	\melodic\relative c'{
 		[c16 \stemdown c'' \stemboth c,, d]
 		\stemdown [d'' a \stemboth c,, g,]
 		\stemup [g c' \stemboth a'' d']
diff --git a/input/test/sleur.ly b/input/test/sleur.ly
index d0bdc34543..7fec239ef5 100644
--- a/input/test/sleur.ly
+++ b/input/test/sleur.ly
@@ -5,7 +5,7 @@ TestedFeatures =	 "This file tests Feta embedded slurs"
 	 "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.15";
+\version "1.0.0";
 
 shortlong = \melodic{
 	c4()c( c c  |
@@ -15,20 +15,20 @@ shortlong = \melodic{
 	c c c )c |
 }
 
-dirs = \melodic {
-	\octave c';
+dirs = \melodic\transpose c' {
+
 	c'1() g' () c () g () c |
 }
 
 complex = \melodic{
-	\octave c';
-	c,16( e,( g,( b,( d( f( a( c'())))))))c4 c4 |
-	\octave c''';
-	c,16( a( f( d( b,( g,( e,( c,())))))))c4 c4 |
+\transpose c'{
+	c,16( e,( g,( b,( d( f( a( c'())))))))c4 c4 |}
+\transpose c'''{
+	c,16( a( f( d( b,( g,( e,( c,())))))))c4 c4 |}
 }
 
-over = \melodic{
-	\octave c'; 
+over = \melodic\transpose c'{
+
 
 	e( g' g' )e
 	e( a' a' )e
@@ -51,8 +51,8 @@ over = \melodic{
 	e( c'' f )e
 }
 
-under = \melodic{
-	\octave c'; 
+under = \melodic\transpose c'{
+
 	\stemdown 
 	f'( \stemboth d d \stemdown )f'
 	f'( \stemboth c c \stemdown )f'
@@ -76,8 +76,8 @@ under = \melodic{
 	f'( e, f )f'
 }
 
-eccentric = \melodic{
-	\octave c';
+eccentric = \melodic\transpose c'{
+
 	\stemup
 	\[4/7 f( a' f f f f )f \] |
 	\[4/7 f( f f f f a' )f \] |
@@ -86,8 +86,7 @@ eccentric = \melodic{
 	\[4/7 e'( e' e' e' e' c )e' \] |
 }
 
-tiltup = \melodic{
-	\octave c'; 
+tiltup = \melodic\transpose c'{
 	e( c'' c'' )e'
 	\stemup
 	e( c'' c'' )e'
@@ -101,8 +100,7 @@ tiltup = \melodic{
 	f'( a, a, )f''
 }
 
-tiltdown = \melodic{
-	\octave c'; 
+tiltdown = \melodic\transpose c'{
 	e'( c'' c'' )e
 	\stemup
 	e'( c'' c'' )e
@@ -116,8 +114,7 @@ tiltdown = \melodic{
 	f''( a, a, )f'
 }
 
-broken = \melodic{
-      \octave c'';
+broken = \melodic\transpose c''{
       c c c c()
       c c c c(
       c )c c c(
@@ -125,13 +122,12 @@ broken = \melodic{
       )a' a' a' a'()
       a' a' a' a'()
       c( c c )c 
-      c( c c )'f 
+      c( c c )f, 
       f,( c c )c 
-      f,( c c )'f
+      f,( c c )f,
 }
 
-blend =	\melodic{
-	\octave c';
+blend =	\melodic\transpose c'{
 	e( c'' c'' )e
 	\stemup
 	f'( c'' c'' )f'
@@ -152,8 +148,8 @@ blend =	\melodic{
 }
 
 
-bug = \melodic{
-	\octave c';
+bug = \melodic\transpose c'{
+
 	a()g( f )e
 	b'()a'( g' )f'
 	g( f' e' )d'
@@ -161,15 +157,14 @@ bug = \melodic{
 	c' () b () c' c'
 }
 
-clipping = \melodic{
-	\octave c';
+clipping = \melodic\transpose c'{
 	\stemboth
 	c( c''' c''')c
 	c( c''' c )c''
 	c''( c c''' )c
 	\stemdown
 	c( \stemup c,,, c,,, \stemdown )c
-	c( \stemup c,,, c \stemdown )''c
+	c( \stemup c,,, c \stemdown )c,,
 	c,,( \stemup c c,,, \stemdown )c
 }
 
diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly
index 663487904a..7b4f14bf87 100644
--- a/input/test/slur-damping.ly
+++ b/input/test/slur-damping.ly
@@ -1,9 +1,10 @@
 % test damping
+\version "1.0.0";
 
 \score{
-	\melodic{
-		\octave relative;
-		c'()b' ~ 'b c
+	\melodic\relative c'{
+
+		c'()b' ~ b, c
 		c c c c
 		c c c c
 		c c c c
diff --git a/input/test/slurs.ly b/input/test/slurs.ly
index aeb78c5ac8..d723fbb618 100644
--- a/input/test/slurs.ly
+++ b/input/test/slurs.ly
@@ -1,33 +1,27 @@
 
-\version "0.1.15";
+\version "1.0.0";
 
 \score{
-	\melodic{\octave c';
+	\melodic\transpose c'{
 
 		c,4 ~ c, c'' ~ c'' ~ g ~ c ~
 		d ~ e ~ f ~ g ~
 		a ~ b ~ c, ~ c
 
 		< c e ( > <)d f> 
-		\octave c'';
+		\transpose c''
 		< c e ( > <)d f>
-		\octave c';
+		\transpose c'
 		< c e ( > <)d' f'>
 		< { c ~ d }
 		  { e ~ f }
 		>
-%	\multi 2 <
+%	\type Staff <
 %	{ \stemup c'8 ~g ~e( ~c~ [c'~ g' e' )c'] c'' ~ c'' c~c }
 %	{ \stemdown c (e g )c'~( [b a g )d]   	r2 } 
 %	>
 
 	{
-%		\octave c';
-%		c,16( e,( g,( b,( d( f( a( c'~ )))))))c4 c4 |
-%		\octave c''';
-%		c,16( a( f( d( b,( g,( e,( c,~ )))))))c4 c4 |
-%		\octave c';
-%		c'1() g' () c () g () c |
 
 		c4()c( c c  |
 		c c c c |
diff --git a/input/test/spacing.ly b/input/test/spacing.ly
index 3af80b1eb0..e8c72ce3f7 100644
--- a/input/test/spacing.ly
+++ b/input/test/spacing.ly
@@ -6,10 +6,10 @@ copyright =	 "public domain";
 TestedFeatures =	 "This file tests various spacings";
 }
 
-\version "0.1.15";
+\version "1.0.0";
 
 multipart = \melodic{ 
-    \multi 3 < 
+    \type StaffGroup < 
                 { 
                    c4
                    c 
diff --git a/input/test/stem.ly b/input/test/stem.ly
index c707e14ef3..6df99dd73f 100644
--- a/input/test/stem.ly
+++ b/input/test/stem.ly
@@ -8,29 +8,28 @@ of beams";
 	
 }
 
-\version "0.1.15";
+\version "1.0.0";
 
 beamintervals = \melodic{
-		\meter 7/4;
+		\time 7/4;
 		\stemup
-		\octave c';
+\transpose c'{
 		[ c8 d ] [ c e ] [ c f ] [ c g ] [ c a ] [ c b ] [ c c' ] |
 		[ c b, ] [ c a, ] [ c g, ] [ c f, ] [ c e, ] [ c d, ] [ c c, ] |
-		\octave c'';
+		}\transpose c''{
 		[ c b, ] [ c a, ] [ c g, ] [ c f, ] [ c e, ] [ c d, ] [ c c, ] |
-		\stemdown
-		\octave c''';
+		\stemdown}
+		\transpose c'''{
 		[ c b, ] [ c a, ] [ c g, ] [ c f, ] [ c e, ] [ c d, ] [ c c, ] |
-		\octave c'';
+}		\transpose c''{
 		[ c b, ] [ c a, ] [ c g, ] [ c f, ] [ c e, ] [ c d, ] [ c c, ] |
 		[ c d ] [ c e ] [ c f ] [ c g ] [ c a ] [ c b ] [ c c' ] |
-	}
+	}}
 
 \score{
-	\melodic{ 
-		\octave c';
+	\melodic\transpose c'{ 
 		\stemup
-		\meter 17/4;
+		\time 17/4;
 		g,4 a, b, c d e f g a b c' d' e' f' g' a' b' |
 		\stemdown
 		b' a' g' f' e' d' c' b a g f e d c b, a, g, |
diff --git a/input/test/title.ly b/input/test/title.ly
index cae3d93f9f..50209186cd 100644
--- a/input/test/title.ly
+++ b/input/test/title.ly
@@ -3,32 +3,38 @@ filename =	"title.ly";
 title =		"Title";
 subtitle =	"Subtitle";
 composer=	"Composer (xxxx-yyyy)";
-opus = 		"Opus 0";
 arranger =	"Arranger";
 copyright = 	"public domain";
 enteredby = 	"jcn";
 source = 	"urtext";
-piece =		"Piece I";
 instrument=	"Instrument";
 }
 
+\version "1.0.0";
+
 \score{
-	\melodic{
-		\octave relative;	
+	\melodic
+	  \relative c'{
 		c' d e f f e d c \break
 		c d e f f e d c
 	}
+	\header{
+	opus = 		"Opus 0";
+	piece =		"Piece I";
+	override="Overdriven";
+	}
 }
 
-\header{ 
-piece =	"Piece II"; 
-opus = 		"Opus 1";
-}
 
 \score{
-	\melodic{
+	\melodic
+	\relative c' {
 	    f' e d c c d e f \break
 	    f e d c c d e f
 	}
+	\header{ 
+	piece =	"Piece II"; 
+	opus = 		"Opus 1";
+	}
 }
 
diff --git a/input/test/transposition.ly b/input/test/transposition.ly
new file mode 100644
index 0000000000..3c6dac9233
--- /dev/null
+++ b/input/test/transposition.ly
@@ -0,0 +1,64 @@
+%{
+Hi all,
+
+I have extend Mats' patches to allow accidental transposition:
+        \accidentals bes es fis;
+		= \transpose d =>
+        \accidentals gis;
+
+As you can see in output the example file "test.ly" there are a few problems left:
+- key undo (already in the Todo)
+- "wrong" transposition: e.g. \transpose d of fis-major = gis-major (better as-major?).
+	The solution gis=as etc. would concern both note and key transposistion
+
+Eric
+%}
+
+\header{
+title =	 "Test it";
+description =	 "Transposition Test file";
+enteredby =	 "Eric Bullinger";
+copyright =	 "public domain";
+}
+
+
+\version "1.0.0";
+
+vOne = \melodic \relative c''{
+        \clef"violin";
+        \key d;
+        \time 2/4 ;
+        d4 d |       
+        \key fis;
+        fis4 fis |         
+        \key es;
+        c4 c |
+}
+
+vTwo = \melodic \relative c''\transpose d' { \vOne }
+
+vThree = \melodic \relative c''{
+        \clef"violin";
+        \accidentals fis cis;
+        \time 2/4 ;
+        d4 d |       
+        \accidentals bes es fis;
+        fis4 fis |         
+        \accidentals fis cis gis dis ais eis;
+        cis4 ais4 |
+}
+
+vFour = \melodic \relative c''\transpose d' \vThree
+
+\score {
+  \type StaffGroup <
+         \vOne
+         \vTwo
+         \vThree
+         \vFour
+  >
+        \paper { linewidth= 130.\mm; }
+}
+
+
+
diff --git a/input/tril.ly b/input/tril.ly
index a09198ee97..f7d64a5676 100644
--- a/input/tril.ly
+++ b/input/tril.ly
@@ -5,7 +5,7 @@ TestedFeatures =	 "This file tests trills"
 	 "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.15";
+\version "1.0.0";
 
 \score{
 	\melodic{ 
diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 599749f934..eb2cd8e9a3 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -12,23 +12,23 @@ copyright =	 "public domain";
 Tested Features		lyrics and chords
 %}
 
-\version "0.1.15";
+\version "1.0.0";
 
-melodie = \melodic {
+melodie = \melodic\relative c {
         \clef"violin";
-        \meter 2/4 ;
-        \octave  c';
+        \time 2/4 ;
 
-        c4^"C" c |      g     g |       a^"F"  a |      g2^"C"   |
+        c''4^"C" c |    g'    g |       a^"F"  a |      g2^"C"   |
         f4^"F" f |      e^"C" e |       d^"G7" d |      c2^"C"   |
-        g4^"G" g |      f^"F" f |       e^"C"  e |      d^"G7" d |
+        g'4^"G" g |      f^"F" f |       e^"C"  e |      d^"G7" d |
         g^"G"  g |      f^"F" f |       e^"C"  e |      d^"G7" d |
-        c4^"C" c |      g     g |       a^"F"  a |      g2^"C"   |
+        c4^"C" c |      g'    g |       a^"F"  a |      g2^"C"   |
         f4^"F" f |      e^"C" e |       d^"G7" d |      c2^"C"   |
 }
 
 text = \lyric{ 
-        \textstyle "italic";
+        \property Lyrics . textstyle =  "italic"
+
         Ah!4 vous dir- ai_- je ma man2
         Ce4 qui cau- se mon tour- ment2
         Pa-4 pa veut que je rai- so- nne
diff --git a/input/twinkle.ly b/input/twinkle.ly
index ed7bb618b4..926f7abafb 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -15,63 +15,60 @@ copyright =	 "public domain";
 Tested Features: lyrics, interleaving lyrics and staffs
 %}
 
-\version "0.1.15";
+\version "1.0.0";
 
-melody = \melodic{
+melody = \melodic \relative c'' {
 	\clef violin;
-	\octave c';
 	\property Staff.instrument = "alto sax"
 	
-	c4 c | g g | a a | g g |
-	f f | e e | d d8.( e16 | )c2 | % :|
+	c4 c | g' g | a a | g g |
+	f f | e e | d d8.( e16 | )c2 |
 
-	g4 g | f f | e e | d d |
+	g'4 g | f f | e e | d d |
 	g g | f f | e( e8. f16 | e4 )d |
 
-	c c | g g | a a | g g |
-	f f | e e | d d8.( e16 | )c2 % :|
-	\bar ":|";
+	c c | g' g | a a | g g |
+	f f | e e | d d8.( e16 | )c2 |
 }
 
-accompany = \melodic {
+accompany = \melodic \relative c {
 	\clef "bass";
-	\octave c,;
-	c4 c' | e' c' | f' c' | e' c' | 
-	d' b | c' a | f g | c2 | 
+	c4 c' | e c | f c | e c | 
+	d b | c a | f g | c,2 | 
 
-	e'4 g | d g | c' g | b g | 
-	e' g | d' g | c' c'8.( d'16 | c'4 )b |
+	e'4 g, | d' g, | c g | b g | 
+	e' g, | d' g, | c c8.( d16 | c4 )b |
 
-	c c' | e' c' | f' c' | e' c' | 
-	d' b | c' a | f g | c2 
-	\bar ":|";
+	c, c' | e c | f c | e c | 
+	d b | c a | f g | c,2 
 }
 
 global = \melodic {
-		\meter 2 / 4;
-		\skip 2*24;
-%		\bar "|.";
-	}
+	\time 2/4;
+	\skip 2*24;
+	\bar ":|";
+}
 
 tekst = \lyric{ 
  	Al-4 tijd is Kort- jak- je ziek,2
-%	midden4 in_de week maar s,_zon- dags niet.2
+	midden4 in_de week maar s,_zon- dags niet.2
 % ugly hack: insertion of  empty syllables creates columns on extra 
 % moments.  The net result is more spacing.
 %
-	midden8 _8 in_de8 _8 week4 maar s,_zon- dags niet.2
+% probably not necessary anymore
+%	midden8 _8 in_de8 _8 week4 maar s,_zon- dags niet.2
 	s,_Zon-4 dags gaat ze naar de kerk,2
 	met4 een boek vol zil- ver werk.2
 	Al-4 tijd is Kort- jak- je ziek,2
 	midden8 _8  in_de8 _8 week4 maar s,_zon- dags niet.2
 }
 
-%{
 
+%{
 Ja inderdaad. Dit is geen educatieve danwel muzikaal verantwoorde
 tekst. Mogen wij ook af en toe ergens op afgeven?
-
 %}
+
 hegedraagjetekst = \lyric{ 
  	Al-4 tijd zuigt Bill Gates mijn piek,2
 	"\TeX"4 is slecht- ser dan mu- ziek.2
@@ -82,21 +79,18 @@ hegedraagjetekst = \lyric{
 }
 
 texte = \lyric{ 
-	 
-%	\textstyle "italic" ;
-	\textstyle "roman" ;
+	\property Lyrics . textstyle" =  "italic" 
+%	\property Lyrics . textstyle" =  "roman" 
  	Ah!4 vous dir- ai_- je ma man2
 	Ce4 qui cau- se mon tour- ment2
 	Pa-4 pa veut que je rai- sonne2
 	Comme4 un- e grand- e per- sonne2
 	Moi4 je dis que les bon- bons2
 	Val-4 ent mieux que la rai- son2
-	
 }
 
 texti = \lyric{
-	
-	\textstyle "roman";
+	\property "Lyrics"."textstyle" =  "roman"
 	Twin-4 kle, twin- kle, lit- tle star,2
 	How4 I won- der what you are.2
 	Up4 a- bove the world so high,2
@@ -116,18 +110,15 @@ textii = \lyric{
 }
 
 textiii = \lyric{
-	
 	Then4 the tra- veler in the dark2
 	Thanks4 you for your ti- ny spark;2
 	He_could4 not see which way to go,2
 	If4 you did not twin- kle so.2
 	Twin-4 kle, twin- kle, lit- tle star,2
 	How4 I won- der what you are!2
-	
 }
 
 $top_lyrics = \type Lyrics = top <
-	\global 
 	\tekst
 >
 
@@ -142,18 +133,17 @@ $bass_staff = \type Staff = bass <
 >
 
 $middle_lyrics = \type Lyrics = middle <
-	\global
 	\texte
 >
 
 $bottom_lyrics = \type Lyrics = bottom <
-	\global
+%	\global
 	\texti
 	\textii
 	\textiii
 >
 
-$grand_staff = \type Staff_group <
+$grand_staff = \type GrandStaff <
 	\$treble_staff
 	\$middle_lyrics
 	\$bass_staff
@@ -168,8 +158,6 @@ $grand_staff = \type Staff_group <
 		\$bottom_lyrics
 	>
 	\paper{
-		% use a lot of space, to avoid clashing syllables
-%		arithmetic_multiplier = 8.\pt;
 		gourlay_maxmeasures = 14.0;
 	}
 	\midi{ 
diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly
new file mode 100644
index 0000000000..405f6d5169
--- /dev/null
+++ b/mutopia/Coriolan/bassi-part.ly
@@ -0,0 +1,32 @@
+\header{
+filename =	 "bassi-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.0.0";
+
+\include "global.ly"
+\include "violoncello.ly"
+\include "contrabasso.ly"
+
+$bassi = \type GrandStaff = bassi_group <
+	\$violoncello_staff
+	\$contrabasso_staff
+>
+
+
+$bassi = \type GrandStaff = bassi_group <
+	\$violoncello_staff
+	\$contrabasso_staff
+>
+
+\score{
+	\$bassi
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
+}
+
diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly
index ff5f0c7282..0476375b81 100644
--- a/mutopia/Coriolan/clarinetti-part.ly
+++ b/mutopia/Coriolan/clarinetti-part.ly
@@ -1,19 +1,19 @@
-\header{
+header{
 filename =	 "clarinetti-part.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "global.ly"
 \include "clarinetti.ly"
-\include "part-paper.ly"
 \score{
 	\$clarinetti_staff
-	\paper{}
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly
index 217842c7a1..08b129c6ed 100644
--- a/mutopia/Coriolan/clarinetti.ly
+++ b/mutopia/Coriolan/clarinetti.ly
@@ -2,27 +2,30 @@
 filename =	 "clarinetti.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "clarinetto-1.ly"
 \include "clarinetto-2.ly"
 
 $clarinetti_staff = \type Staff = clarinetti <
-	\property Staff.instrument = "clarinet"
-	\melodic< 
-% ugh, key doesn't transpose along
-%		\global
-		\meter 4/4;
-		\key bes;
-		\transpose d \$clarinetto1
-		\transpose d \$clarinetto2
+	\property Staff.midi_instrument = "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
+	\melodic \type Voice=one < 
+		\time 4/4;
+		\key F;
+		\$clarinetto1
+		\$clarinetto2
 	>
 >
 
diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly
index d672bd826c..2eb3869b1a 100644
--- a/mutopia/Coriolan/clarinetto-1.ly
+++ b/mutopia/Coriolan/clarinetto-1.ly
@@ -2,22 +2,21 @@
 filename =	 "clarinetto-1.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-clarinetto1 = \melodic{
-	\octave c';	
-	R1 *2 | c'4-.\ff r r2 | R1 *3 |
-	d'4-. r r2 | R1 *3 |
-	es'4-. r r2 | r1 |
-	es'4-. r r2 | d'4-. r r2 |
-	R1 *4 |
-	as2\p_"\ \ \ cresc." ( g | )fis2. g4-.\f |
+clarinetto1 = \melodic \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
 }
 
diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly
index 285d7497ca..759cb2995f 100644
--- a/mutopia/Coriolan/clarinetto-2.ly
+++ b/mutopia/Coriolan/clarinetto-2.ly
@@ -2,29 +2,20 @@
 filename =	 "clarinetto-2.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-clarinetto2 = \melodic{
-	\octave c';	
-% koor: clarinetto-part.ly
-% lilypond: ../../current/lily/dynamic-grav.cc:58: void Dynamic_engraver::do_process_requests(): Assertion `!dynamic_p_' failed.
-% Aborted (core dumped)
-
-% huh?
-
-%	r1 | r1 | as4-.\ff r r2 | r1 |
-	R1 *2 | as4-. r r2 | R1 *3 |
-	b4-. r r2 | R1 *3 |
-	c'4-. r r2 | r1 |
-	c'4-. r r2 | b4-. r r2 |
-	R1 *5 |
-	r2 r4 b,4-. |
+clarinetto2 = \melodic \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
 }
 
diff --git a/mutopia/Coriolan/contrabasso-part.ly b/mutopia/Coriolan/contrabasso-part.ly
new file mode 100644
index 0000000000..e3cd408778
--- /dev/null
+++ b/mutopia/Coriolan/contrabasso-part.ly
@@ -0,0 +1,20 @@
+\header{
+filename =	 "contrabasso-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.0.0";
+
+\include "global.ly"
+\include "contrabasso.ly"
+
+\score{
+	\$contrabasso_staff 
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
+}
+
diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly
index c1229deec5..71f4ad500d 100644
--- a/mutopia/Coriolan/contrabasso.ly
+++ b/mutopia/Coriolan/contrabasso.ly
@@ -2,30 +2,151 @@
 filename =	 "contrabasso.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-contrabasso = \melodic{
-	\octave c;
-	c1\ff ~ | c | f,4-. r r2 | r1 |
-	c1\ff ~ | c | f,4-. r r2 | r1 |
-	c1\ff ~ | c | fis,4-. r r2 | r1 |
-	g,4-. r r2 | g,4-. r r2 |
-	c4\p r4 r2 | c4 r4 r2 | c4 r4 r2 | r1 |
-	c'4.-"cresc." c'8 bes4. bes8 | as4. as8 g4\f r4 |
+contrabasso = \melodic \relative c {
+%	\translator Staff=violoncello
+	\skip 1*21;
+%	\translator Staff=contrabasso
+	bes4\p r4 r2 |
+	bes4   r4 r2 |
+	bes4   r4 r2 |
+	%25
+	R1 |
+	\skip 1*14;
+	fis2\sf r |
+	fis2\sf r |
+	f!2\sf r |
+	f2\sf r |
+	e2\sf r |
+	%45
+	es!2\sf r |
+	des2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	% 50
+	)d4 r r2 |
+	R1
+	es'4\p r r r8 es(|
+	)as,4 r r r8 as(|
+	)g4 r r r8 g(|
+	)d'4 r r r8 d(|
+	)es4-"cresc." r r r8 es(|
+	)as,4 r r r8 as(|
+	)g4 r r r8 g(|
+	)d'4 r r r8 d(|
+	%60
+	)es4 r r r8 es(|
+	)as,4 r r r8 as(|
+	)g2\ff f | e c' |
+	f,4\p r r r8 f(|
+	%65
+	)bes4 r r r8 bes(|
+	)as4 r r r8 as(|
+	)e4 r r r8 e(|
+	)f4-"cresc." r r r8 f(|
+	)bes4 r r r8 bes(|
+	%70
+	)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 | 
+	\skip 1*8; |
+	c4 r r2 | c4 r r2 | c4 r r2 | 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 |
+	% 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 | 
+	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 |
+	c4\p r r r8 c(|
+	)f,4 r r r8 f(|
+	%180
+	)e4 r r r8 e(|
+	)b'4 r r r8 b(|
+	)c4-"cresc." r r r8 c(|
+	)f,4 r r r8 f(|
+	)e4 r r r8 e'(|
+	%185
+	)b4 r r r8 b(|
+	)c4 r r r8 c(|
+	)f,4 r r r8 f(|
+	)e2\ff d' | cis a | 
+	%190
+	d4\p r r r8 d(|
+	)g,4 r r r8 g(|
+	)f4 r r r8 f(|
+	)cis'4 r r r8 cis(|
+	)d4-"cresc." r r r8 d(|
+	%195
+	)g,4 r r r8 g( |
+	)d2\ff e' | dis b | 
+	e4\p r r r8 e(|
+	% )a4\< r r r8 a(|
+	%200
+	% g1 | <f {s2 s4 \!s8}> | 
+	)a4 r r r8 a(|
+	%200
+	)g1 | f | 
+	\skip 1*18; |
+	%220
+	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 | 
+	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 |
+	c4 r r2 |
+	c4 r r2 |
+	c4 r r2 |
 }
 
 $contrabasso_staff = \type Staff = contrabasso <
-	\property Staff.instrument = "contrabass"
+	\property Staff.midi_instrument = "contrabass"
+	\property Staff.instrument = "Contrabasso"
+	\property Staff.instr = "Cb."
 	\clef "bass";
-	\melodic< 
-		\global;
+	\melodic \type Voice=one< 
+		\global
 		\$contrabasso
 	>
 >
+
diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index 0d584d34c3..7d11fd68a1 100644
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -2,14 +2,12 @@
 filename =	 "coriolan.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "global.ly"
 
@@ -21,55 +19,64 @@ copyright =	 "public domain";
 \include "oboi.ly"
 \include "timpani.ly"
 \include "trombe.ly"
-\include "viola.ly"
+\include "viola-1.ly"
+\include "viola-2.ly"
 \include "violino-1.ly"
 \include "violino-2.ly"
 \include "violoncello.ly"
 
-legno = \type Staff_group = legno_group <
+legno = \type StaffGroup = legno_group <
 	\$flauti_staff
 	\$oboi_staff
 	\$clarinetti_staff
 	\$fagotti_staff
 >
 
-koper = \type Staff_group = koper_group <
+koper = \type StaffGroup = koper_group <
 	\$corni_staff
 	\$trombe_staff
 >
 
-$timpani_g = \type Staff_group = timpani_group <
+$timpani_g = \type StaffGroup = timpani_group <
 	\$timpani_staff
+	\type Staff = urgtimpany \melodic{ \skip 1*34; }
 >
 
-$violini = \type Grand_staff = violini_group <
+$violini = \type GrandStaff = violini_group <
 	\$violino1_staff
 	\$violino2_staff
 >
 
-$bassi = \type Grand_staff = violine_group <
+$violi = \type GrandStaff = violi_group <
+	\$viola1_staff
+	\$viola2_staff
+>
+
+$bassi = \type GrandStaff = bassi_group <
 	\$violoncello_staff
 	\$contrabasso_staff
 >
 
-strijkers = \type Staff_group = strijkers_group <
+strijkers = \type StaffGroup = strijkers_group <
 	\$violini
-	\$viola_staff
+	\$violi
 	\$bassi
 >
 
+default_paper = \include "score-paper.ly"
 \score{
 	<
-		\textstyle "italic";
+		\property Score . textstyle =  "italic"
 
 		\$legno
 		\$koper
 		\$timpani_g
 		\$strijkers
 	>
-	\paper{}
-	\midi{
-		\tempo 4 = 160;
+	\paper{
+		% Give hara-kiri something to do...
+		linewidth = 130.0\mm;
 	}
+	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly
index 0a2eee6464..1f5fc1d3d1 100644
--- a/mutopia/Coriolan/corni-part.ly
+++ b/mutopia/Coriolan/corni-part.ly
@@ -2,20 +2,18 @@
 filename =	 "corni-part.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "global.ly"
 \include "corni.ly"
-\include "part-paper.ly"
 \score{
 	\$corni_staff
-	\paper{}
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly
index 6d3ebdcfd3..b2f3c39fc1 100644
--- a/mutopia/Coriolan/corni.ly
+++ b/mutopia/Coriolan/corni.ly
@@ -2,26 +2,29 @@
 filename =	 "corni.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "corno-1.ly"
 \include "corno-2.ly"
 
 $corni_staff = \type Staff = corni <
-	\property Staff.instrument = "french horn"
-	\melodic< 
-% ugh, key doesn't transpose along
-%		\global
-		\meter 4/4;
-		\transpose a, \$corno1
-		\transpose a, \$corno2
+	\property Staff.midi_instrument = "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
+	\melodic \type Voice=corni < 
+		\time 4/4;
+		\$corno1
+		\$corno2
 	>
 >
 
diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly
index 44b587ba71..1ddbd53db7 100644
--- a/mutopia/Coriolan/corno-1.ly
+++ b/mutopia/Coriolan/corno-1.ly
@@ -2,22 +2,21 @@
 filename =	 "corno-1.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-corno1 = \melodic{
-	\octave c';	
-	R1 *2 | as'4-.\ff r r2 | R1 *3 |
-	as'4-. r r2 | R1 *3 |
-	es'4-. r r2 | r1 |
-	g'4-. r r2 | g'4-. r r2 |
-	R1 *5 |
-	r2 r4 g'4-.\f |
+corno1 = \melodic \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 | 
+	% `a 2
+	r8 f\p_"\ \ \ cresc." f2 e4 | r8 f f2 e4 |
+	f4. e8 f4. e8 | f4. e8 f4. e8 | d,1\ff % ~ |
+	%35
 }
 
diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly
index c3545bbe47..2a02324d51 100644
--- a/mutopia/Coriolan/corno-2.ly
+++ b/mutopia/Coriolan/corno-2.ly
@@ -2,24 +2,24 @@
 filename =	 "corno-2.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-corno2 = \melodic{
-	\octave c';	
-% koor: corno-part.ly
-%	r1 | r1 | f'4-.\ff r r2 | r1 |
-	R1 *2 | f'4-. r r2 | R1 *3 |
-	f'4-. r r2 | R1 *3 |
-	es'4-. r r2 | r1 |
-	g4-. r r2 | g4-. r r2 |
-	R1 *5 |
-	r2 r4 g4-. |
+corno2 = \melodic \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 | 
+	% `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
 }
 
diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly
index a786c65738..6d13a85fde 100644
--- a/mutopia/Coriolan/fagotti-part.ly
+++ b/mutopia/Coriolan/fagotti-part.ly
@@ -2,20 +2,20 @@
 filename =	 "fagotti-part.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "global.ly"
 \include "fagotti.ly"
-\include "part-paper.ly"
 \score{
 	\$fagotti_staff
-	\paper{}
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly
index 288ba66834..4dd33f7f59 100644
--- a/mutopia/Coriolan/fagotti.ly
+++ b/mutopia/Coriolan/fagotti.ly
@@ -2,23 +2,25 @@
 filename =	 "fagotti.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "fagotto-1.ly"
 \include "fagotto-2.ly"
 
 $fagotti_staff = \type Staff = fagotti <
-	\property Staff.instrument = "bassoon"
+	\property Staff.midi_instrument = "bassoon"
+	\property Staff.instrument = "2 Fagotti"
+	\property Staff.instr = "Fg."
 	\clef "bass";
-	\melodic< 
-		\global;
+	\melodic \type Voice=fagotti < 
+		\global
 		\$fagotto1
 		\$fagotto2
 	>
diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly
index 92e38b17cd..c6bc7c80f8 100644
--- a/mutopia/Coriolan/fagotto-1.ly
+++ b/mutopia/Coriolan/fagotto-1.ly
@@ -2,22 +2,21 @@
 filename =	 "fagotto-1.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-fagotto1 = \melodic{
-	\octave c;	
-	R1 *2 | as4-.\ff r r2 | R1 *3 |
-	as4-. r r2 | R1 *3 |
-	a4-. r r2 | r1 |
-	c'4-. r r2 | b4-. r r2 |
-	R1 *5 |
-	r2 r4 g4-.\f |
+fagotto1 = \melodic \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
 }
 
diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly
index 20a0cd83e7..c236e123fe 100644
--- a/mutopia/Coriolan/fagotto-2.ly
+++ b/mutopia/Coriolan/fagotto-2.ly
@@ -2,24 +2,19 @@
 filename =	 "fagotto-2.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-fagotto2 = \melodic{
-	\octave c;	
-% koor
-%	r1 | r1 | f4-.\ff r r2 | r1 |
-	R1 *2 | f4-. r r2 | R1 *3 |
-	f4-. r r2 | R1 *3 |
-	fis4-. r r2 | r1 |
-	g4-. r r2 | g4-. r r2 |
-	R1 *5 |
+fagotto2 = \melodic \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
 	r2 r4 g,4-. |
+	R1*6 | r4 g'\f r2 | R1*5 | as1\ff %~ |
+	%35
 }
 
diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly
index 16750b154d..d0ff7a749b 100644
--- a/mutopia/Coriolan/flauti-part.ly
+++ b/mutopia/Coriolan/flauti-part.ly
@@ -2,21 +2,21 @@
 filename =	 "flauti-part.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "global.ly"
 \include "flauti.ly"
-\include "part-paper.ly"
 
 \score{
 	\$flauti_staff
-	\paper{}
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly
index ae0d52352c..f829429dca 100644
--- a/mutopia/Coriolan/flauti.ly
+++ b/mutopia/Coriolan/flauti.ly
@@ -2,22 +2,24 @@
 filename =	 "flauti.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "flauto-1.ly"
 \include "flauto-2.ly"
 
 $flauti_staff = \type Staff = flauti <
-	\property Staff.instrument = "flute"
-	\melodic< 
-		\global;
+	\property Staff.midi_instrument = "flute"
+	\property Staff.instrument = "2 Flauti"
+	\property Staff.instr = "Fl."
+	\melodic \type Voice=flauti < 
+		\global
 		\$flauto1
 		\$flauto2
 	>
diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly
index 7d624cfddf..a6c7440b6b 100644
--- a/mutopia/Coriolan/flauto-1.ly
+++ b/mutopia/Coriolan/flauto-1.ly
@@ -2,22 +2,24 @@
 filename =	 "flauto-1.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-flauto1 = \melodic{
-	\octave c'';	
-	R1 *2 | c'4-.\ff r r2 | R1 *3 |
-	d'4-. r r2 | R1 *3 |
-	es'4-. r r2 | r1 |
-	g'4-. r r2 | b4-. r r2 |
-	R1 *4 |
-	r2 es'\p_"\ \ \ cresc." ( | )dis'2. es'4-.\f |
+flauto1 = \melodic \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
 }
 
diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly
index 41ecf9fd8f..3132d85146 100644
--- a/mutopia/Coriolan/flauto-2.ly
+++ b/mutopia/Coriolan/flauto-2.ly
@@ -2,24 +2,19 @@
 filename =	 "flauto-2.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-flauto2 = \melodic{
-	\octave c'';	
-% koor
-%	r1 | r1 | as4-.\ff r r2 | r1 |
-	R1 *2 | as4-. r r2 | R1 *3 |
-	b4-. r r2 | R1 *3 | 
-	c'4-. r r2 | r1 |
-	es'4-. r r2 | d4-. r r2 |
-	R1 *4 |
-	r2 r2 | r2 r4 b4-. |
+flauto2 = \melodic \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*5 | c1 % ~ |
+	%35
 }
 
diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly
index a339da0450..28f818a186 100644
--- a/mutopia/Coriolan/global.ly
+++ b/mutopia/Coriolan/global.ly
@@ -2,17 +2,18 @@
 filename =	 "global.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-global = \melodic{
-	\meter 4/4;
-	\key bes es as;
+global = \melodic {
+	\time 4/4;
+	\key es;
+	\skip 1*314;
 }
 
diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly
index ace20d4fac..2a04c174c4 100644
--- a/mutopia/Coriolan/oboe-1.ly
+++ b/mutopia/Coriolan/oboe-1.ly
@@ -2,22 +2,20 @@
 filename =	 "oboe-1.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-oboe1 = \melodic{
-	\octave c'';	
-	R1 *2 | as4-.\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 |
+oboe1 = \melodic \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
 }
 
diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly
index a674f75b44..1b47a5a167 100644
--- a/mutopia/Coriolan/oboe-2.ly
+++ b/mutopia/Coriolan/oboe-2.ly
@@ -2,24 +2,20 @@
 filename =	 "oboe-2.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-oboe2 = \melodic{
-	\octave c'';	
-% koor
-%	r1 | r1 | f4-.\ff r r2 | r1 |
-	R1 *2| f4-. r r2 | R1 *3 |
-	f4-. r r2 | R1 *3 |
-	es4-. r r2 | r1 |
-	es4-. r r2 | b,4-. r r2 |
-	R1 *5 | 
-	r2 r4 b,4-. |
+oboe2 = \melodic \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
 }
 
diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly
index 247b88b643..7ee1996719 100644
--- a/mutopia/Coriolan/oboi-part.ly
+++ b/mutopia/Coriolan/oboi-part.ly
@@ -2,21 +2,21 @@
 filename =	 "oboi-part.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "global.ly"
 \include "oboi.ly"
-\include "part-paper.ly"
 
 \score{
 	\$oboi_staff 
-	\paper{}
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly
index 86ba75309c..9b8de116fa 100644
--- a/mutopia/Coriolan/oboi.ly
+++ b/mutopia/Coriolan/oboi.ly
@@ -2,22 +2,24 @@
 filename =	 "oboi.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "oboe-1.ly"
 \include "oboe-2.ly"
 
 $oboi_staff = \type Staff = oboi <
-	\property Staff.instrument = "oboe"
-	\melodic< 
-		\global;
+	\property Staff.midi_instrument = "oboe"
+	\property Staff.instrument = "2 Oboi"
+	\property Staff.instr = "Ob."
+	\melodic \type Voice=oboi < 
+		\global
 		\$oboe1
 		\$oboe2
 	>
diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly
index ed2a4fb952..28075b3536 100644
--- a/mutopia/Coriolan/timpani.ly
+++ b/mutopia/Coriolan/timpani.ly
@@ -2,30 +2,32 @@
 filename =	 "timpani.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-timpani = \melodic{
-	\octave c;	
-	R1 *2 | c4-.\ff r r2 | R1 *3 |
-	c4-. r r2 | R1 *3 |
-	c4-. r r2 | r1 |
-	g,4-. r r2 | g,4-. r r2 |
-	R1 *5 |
-	r2 r4 g,4-. |
+timpani = \melodic \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
 }
 
 $timpani_staff = \type Staff = timpani <
-	\property Staff.instrument = "timpani"
+	\property Staff.midi_instrument = "timpani"
+	\property Staff.instrument = "2 Timpani (C-G)"
+	\property Staff.instr = "Timp."
 	\clef "bass";
 	\melodic< 
-		\global;
+%		\global
+		\time 4/4;
 		\$timpani
 	>
 >
diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly
index 2e33514bb0..ec77ec0d82 100644
--- a/mutopia/Coriolan/trombe-part.ly
+++ b/mutopia/Coriolan/trombe-part.ly
@@ -2,20 +2,20 @@
 filename =	 "trombe-part.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "global.ly"
 \include "trombe.ly"
-\include "part-paper.ly"
 \score{
 	\$trombe_staff 
-	\paper{}
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly
index c3c3d5d7e1..84b28bdfb5 100644
--- a/mutopia/Coriolan/trombe.ly
+++ b/mutopia/Coriolan/trombe.ly
@@ -2,22 +2,25 @@
 filename =	 "trombe.ly";
 % %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "trombo-1.ly"
 \include "trombo-2.ly"
 
 $trombe_staff = \type Staff = trombe <
-	\melodic< 
-%		\global;
-		\meter 4/4;
+	\property Staff.midi_instrument = "trumpet"
+	\property Staff.instrument = "2 Trombe (C)"
+	\property Staff.instr = "Tbe."
+	\melodic \type Voice=trombe < 
+%		\global
+		\time 4/4;
 		\$trombo1
 		\$trombo2
 	>
diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly
index 05b11dc51d..c7501cf01a 100644
--- a/mutopia/Coriolan/trombo-1.ly
+++ b/mutopia/Coriolan/trombo-1.ly
@@ -2,22 +2,19 @@
 filename =	 "trombo-1.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-trombo1 = \melodic{
-	\octave c';	
-	R1 *2 | c'4-.\ff r r2 | R1 *3 |
-	c'4-. r r2 | R1 *3 |
-	c'4-. r r2 | r1 |
-	g4-. r r2 | g4-. r r2 |
-	R1 *5 |
-	r2 r4 g4-.\f |
+trombo1 = \melodic \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
 }
 
diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly
index 923f42db93..561a701114 100644
--- a/mutopia/Coriolan/trombo-2.ly
+++ b/mutopia/Coriolan/trombo-2.ly
@@ -2,24 +2,19 @@
 filename =	 "trombo-2.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-trombo2 = \melodic{
-	\octave c';	
-% koor
-%	r1 | r1 | c4-.\ff r r2 | r1 |
-	R1 *2 | c4-. r r2 | R1 *3 |
-	c4-. r r2 | R1 *3 |
-	c4-. r r2 | r1 |
-	g,4-. r r2 | g,4-. r r2 |
-	R1 *5 |
-	r2 r4 g,4-. |
+trombo2 = \melodic \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
 }
 
diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly
new file mode 100644
index 0000000000..c639b503de
--- /dev/null
+++ b/mutopia/Coriolan/viola-1.ly
@@ -0,0 +1,304 @@
+\header{
+filename =	 "viola-1.ly";
+%title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =	 "";
+composer =	 "Ludwig van Beethoven (1770-1827)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+\version "1.0.0";
+
+viola1 = \melodic \relative c {
+	\type Voice=one
+	c'1\ff ~ | c | f,4-. r r2 | r1 |
+	% copied 3 bars from three back...
+	%5
+	c'1 ~ | c | f,4-. r r2 | r1 |
+	c'1 ~ | c | fis,4-. r r2 | r1 |
+	g'4-. r r2 | g4-. r r2 |
+	% copied from violino-1...
+	%15
+	[c,,8-.\p es-.] [es()d] [d-. g-.] g4-"ten." |
+	[c,8-. es-.] [es()d] [d-. g-.] g4-"ten." |
+	[c,8-. es-.] [es()d] [d-. as'-.] [as()g] |
+	[g8-. c-.] [c()b] [b-. f'-.] [f()es] |
+	es4.-"cresc." es8 d4. d8 | 
+	%20
+	c4. c8 b4\f r4 |
+	R1 |
+	r4 [des,8\p()c][c-. f-.]f4-"ten." |
+	r4 [des8\p()c][c-. f-.]f4-"ten." |
+	r4 [des8\p()c][c-. ges'-.][ges()f] |
+	%25
+	[f-. bes-.][bes()a][a-. es'-.][es()des] | des4.-"cresc." des8 c4. c8 |
+	bes4 bes4-.\f r2 |
+	R1
+	% same rhythm as violins...
+	r8 c-.\p c4. c8-. c4~ | [c8-"cresc." c-.]c2.~ |
+	%30
+	[c8 c-.]c2.~ | [c8 c-.] c4. c8-. c4~ | [c8 c-.] c4. c8-. c4 |
+	[c16\ff c c c][c c c c]c2:16 |
+      	%35
+	[c16 c c c][bes bes bes bes][as as as as][g g g g] |
+	g2:16 g: | g: g: | c: c: | e: f: |
+	%40
+	c2\sf [c,8-. es-.][es()d] |
+	c'2\sf [c,8-. es-.][es()d] |
+	b'2\f r8 [d,-. d()c] |
+	b'2\f r8 [d,-. d()c] |
+	b'2\f r8 [des,-. des()c] |
+	%45
+	a'2\sf [a8-. c-.][c()bes] |
+	r4 [a8-. c-.][c()bes] r4 |
+	r4 [a8-. c-.][c()bes] r4 |
+	r4 [a8-. c-.][c()bes] r4 |
+	r4 [a8-. c-.][c()bes][bes()a] |
+	%50
+	bes4 r r2 |
+	R1 |
+	es,4\p r r r8 es(|)as4 r r r8 as (|)g4 r r r8 g(|
+	%55
+	)d4 r r r8 d(|)es4 r-"cresc." r  r8 es(|)as4 r r r8 as(|
+	)g4 r r r8 g(|)d4 r r r8 d(|
+	%60
+	)es4 r r r8 es(|)as4 r r r8 as | bes2:16 as: | g: e: |
+	f4\p r r r8 f(|
+	%65
+	)bes4 r r r8 bes(|)as4 r r r8 as(|)e4 r r r8 e(|
+	)f4-"cresc." r r r8 f(|)bes4 r r r8 bes |
+	%70
+	c2:\ff bes: | a: fis: | g4\p-"cresc." r r r8 g(|)c,4 r r r8 c |
+	[f8\sf(\>as f as][f g d)\!g] |
+	%75
+	r [es'\p(c)es] r [d(bes)d] | r [c(g)c] r [bes(g)bes] |
+	r [as(g)as] r [bes(g)bes] |
+	[d,-.\pp d'-.] es4. es8-. d4 ~ |
+	[d8 d-.] es4. es8-. d4 ~ |
+	%80
+	[d8-"cresc." d-.] es4. es8-. d4 ~ |
+	[d8 d-.] es4. es8-. d4 ~ |
+	[d8 d-.] es4. es8-. d4 ~ |
+	[d8 d-.] es4. es8-. d4 |
+	fis,2:\ff fis4: g: |
+	%85
+	d2: d: | fis: fis4: g: | c,: d: c: d: | b2: b4: c: | f': es: f: es: |
+	%90
+	b2: b4: c: | d: c: d: c: |
+	c,4 r8 c' c4\sf()des |
+	r r8 c c4\sf()des | 
+	r r8 c c4\sf()des | 
+	r r8 c c4\sf()des | 
+	[c16 es es es]es4:[es16 fis fis fis]fis4: |
+	[b,16 d d d]d4:[bes16 e e e]e4: |
+	[as,16 c c c ]c4:[g16 c c c]c4: | [a16 c c c]c4:[g16 c c c]c4: |
+	%100
+	[c8 d,]d4. es8-. es4 ~ | [es8 c-.]c4. d8-. d4 |
+	% shared with cello from here on;
+	% except for some abbrevs below...
+	[g8\p bes cis d][es d bes g]|
+	[fis a cis d][es d a fis\f] |
+	[g bes cis\p d][es d bes g]
+	%105
+	[fis a cis d][es d a fis\f] |
+	[g bes cis\p d][f, a cis d] |
+	[es, g b c][d, g a bes] |
+	[c, es g a]r[d, fis g] |
+	r[c, es g][d fis a d] |
+	%110
+	% cello has eighth notes here...
+	[g,16 g bes bes][d d es es][f, f a a][cis cis d d] |
+	[es,8: g: b: c!:][d,: f: a: bes:] |
+	[c,: es: g: a:][cis,: e: g: bes:] |
+	[d,: g: bes: d:][d,: fis: a: d:] | d2: d:
+	%115
+	| d: d: | d: d: | d: d: |
+	% urg, 2 copied from 102
+	[g,8\p bes cis d][es d bes g]|
+	[fis a cis d][es d a fis] |
+	%120
+	[g bes c des][c des bes g]|[f as c des][c des as f]|
+	[e g b c][b c g e]|[f as b c][b c as f]|
+	[e g b c][b c g e]|
+	%125
+	[c e fis g][fis g e c]|[f as b c][des c as f]|
+	[e g b c][des c g e]|[f as c des][c des as f]|
+	[g bes d es][d es bes g]|[as-"cresc." c d es][f es c as]|
+	%131
+	[g bes d es][f es bes g]|
+	% shared with cellos until here
+	% shared with violino-2 from here on
+	[as as c es][f es c as]|[a c es f][ges f c a]|
+	[bes des f ges][as ges des bes]|
+	%135
+	[c es g as][bes as es c]|[des\p f a bes][c, es g as]|
+	[bes, des f ges][as, c e f]|[ges, bes d es][f, as c des]|
+	[es, ges bes des][as c es as,]|
+	%140
+	% shared with cello from here on;
+	% except cello has eighth notes
+	[des,16\f des f f][a a bes bes][c, c es es][g g as as]|
+	[bes8: des: f: ges:][as,: c: e: f:]|
+	[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]|
+	% uhuh, still 'same as cello';
+	% but now rests for notes that viola cannot reach...
+	%145
+	r[des, e g]r[c, e f]|
+	% hmm, don't want to miss more than one note,
+	% take bes octave higher
+	r[bes des, f][c e g c]|
+	% cello has eight notes;
+	% viola has rest where can't reach	
+	[f,:\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]|
+	r8[des16 des][f f g g][c, c e e][g g c c]|
+	f,1\ff ~ | f | f'4 r r2
+	R1
+	%155
+	f,1 ~ | f | d'2\sf [g,8-. bes-.][bes()as] | 
+	es'2\sf [g,8-. bes-.][bes()as] |
+	% ugh, should be quoted and transposed...
+	%160
+	[f8-.\p as-.][as()f][g-. c-.][c()b] |
+	R1*2 | 
+	g2\ff [es8-. g-.][g()f] |
+	g2\sf [es8-. g-.][g()f] |
+	%165
+	[e-. bes'-.][bes()as][g-. des'-.][des()c] |
+	R1*2 |
+	r4 [e,8-.\ff g-.][g()f] r4 |
+	r4 [e8-. g-.][g()f] r4 |
+	%170
+	r4 [e8-. g-.][g()f] r4 |
+	r4 [e8-. g-.][g()f][fis-.fis-.] | 
+	g4 [fis8-.as-.][as()g] r4 |
+	r4 [fis8-.as-.][as()g] r4 |
+	r4 [fis8-.as-.][as()g] r4 |
+	%175
+	r4 [fis8-.as-.][as()g] c4\sf(|)b  r r2 | R1
+	% ugh, should be quoted and transposed
+	c4\p r r r8 c8(|
+	)f4 r r r8 f8(|
+	%180
+	)e4 r r r8 e8(|
+	)b'4 r r r8 b8(|
+	)c4 r-"cresc." r r8 c,8(|
+	% copied
+	)f4 r r r8 f8(|
+	)e4 r r r8 e8(|
+	%185
+	)b'4 r r r8 b8(|
+	)c4 r r r8 c,8(|
+	)f4 r r r8 f8|
+	g2:16\ff f: | e: cis: |
+	%190
+	c,4\p r r r8 c8(|
+	)g'4 r r r8 g8(|
+	)f4 r r r8 f8(|
+	)cis4-"cresc." r r r8 cis8(|
+	)d4 r r r8 d8(|
+	%195
+	)g4 r r r8 g8|
+	% check
+	[a16\ff a' a a]a4: a2: | fis: dis: | 
+	e,4\p r r r8 e8(|
+	)a4\< r r r8 a8(|
+	%200
+	[)g(g e g][e g e)g] |
+	% quote and transpose
+	[f(g f g][f g f)\!g] |
+	[c\f\>(c g)c]r[c(bes)\!c] |
+	r[c\p(as)c]r[c(g)c] |
+	r[c(f,)c']r[c(g)c] |
+	%205
+	r[c\p(as)c]r[c(a)c] |
+	[b-. g'-.] as4. as8-. g4 ~ |
+	[g8 g-.] as4. as8-. g4 ~ |
+	[g8 g-.-"cresc."] as4. as8-. g4 ~ |
+	[g8 g-.] as4. as8-. g4 ~ |
+	%210
+	[g8 g-.] as4. as8-. g4 ~ |
+	[g8 g-.] as4. as8-. g4 ~ |
+	b,2:16\ff b4: c: | g'2: g: | 
+	%214
+	b,2:16\ff b4: c: | g'2: g: | 
+	e2:16\ff e4: f: | b,: c: b: c: | 
+	e2:16\ff e4: f: | b,: c: b: c: | 
+	%220
+	r4 r8 es8 es4\sf()fes |
+	r4 r8 es8 es4\sf()fes |
+	r4 r8 es8 es4\sf()fes |
+	r4 r8 es8 es4\sf()fes |
+	[des16 des f f]des4: [b16 b d d]b4: |
+	%225
+	% check
+	[bes16 bes c c]bes4: [a16 a c c]a4: |
+	[f16 f b b]f4: [as16 as c c]as4: |
+	[as16 as d d]as4: [as16 as c c]as4: |
+	[g8 g]g4. as8 as4 ~ |
+	[as8 as]f4. f8 g4 |
+	%230
+	c\p r r2 | r r4 r8 b\f |
+	c4 r r2 | r r4 r8 b\f | c4 r r2 |
+	R1*3 |
+	[c,16c es es][g g as as][bes bes d d][fis fis g g] |
+	[as, as c c][e e f f][g, g bes bes][d d es es] |
+	%240
+	f,4 r r2 |
+	R1*11 |
+	c'4\p-"cresc." r r r8 c8(|
+	% check slur and oct
+	)f4 r r r8 f8 | % f,8 (|
+	es1 | 
+	%255
+	ges\f | f\p | as\f | g\p
+	e2:16\f e: | 
+	%260
+	[as,8\p-"cresc." f']f4. es8 es4 ~ |
+	[es8 as]as4. g8 g4 ~ |
+	[g8 f]f4. es8 es4 ~ |
+	[es8 as]as4. g8 g4 |
+	r r8 d\ff es4.\sf()d8 |
+	%265
+	r4 r8 d es4.\sf()d8 |
+	r4 r8 e f4.\sf()e8 |
+	r4 r8 e f4.\sf()e8 |
+	r4 r8 e g4.\sf()f8 |
+	r4 r8 f as4.\sf()g8 |
+	%270
+	g2:16-"sempre" g:\ff | g: g: | g: g: | g: g: |
+	[g8 b, c g][c b c g] |
+	%275
+	[c b c g][c b c g] |
+	c,1 ~ | c | f4-. r r2 | R1 |
+	c1 ~ | c | f4-. r r2 | R1 |
+	c1 ~ | c | fis4-. f-. r2 | R1 |
+	es4-. e-. r2 | f4-. g-. r2 |
+	%290
+	as4-"dim." r g r | R1 | c4\p r r2 | R1 |
+	g4-"pizz." r r2 | R1 | c,4 r r2 | R1*15 |
+	c4\pp r r2 |
+	c4 r r2 |
+	c4 r r2 |
+}
+
+% urg
+\include "viola-2.ly";
+
+
+% $viola1_staff = \type Staff = viola1 <
+$viola1_staff = \type Staff = violai <
+	\property Staff.midi_instrument = "viola"
+	\property Staff.instrument = "Viola"
+	\property Staff.instr = "Vla."
+	\clef "alto";
+	\melodic \type Voice=one < 
+		\global
+		\$viola1
+	>
+>
+
diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly
new file mode 100644
index 0000000000..31dc72611b
--- /dev/null
+++ b/mutopia/Coriolan/viola-2.ly
@@ -0,0 +1,44 @@
+\header{
+filename =	 "viola-2.ly";
+%title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =	 "";
+composer =	 "Ludwig van Beethoven (1770-1827)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+\version "1.0.0";
+
+viola2 = \melodic \relative c {
+	% starts on (actualy, most part is on) same staff as viola1
+	%urg, parse error
+%urg	\translator Staff=viola1
+	\translator Staff=violai
+	\type Voice=one
+	c1 ~ | c | s1*2 |
+	% copied 3 bars from three back...
+	c ~ | c | s1*2 % |
+%	\translator Staff=viola
+	c ~ | c | s1*2 | 
+	g'4-. r r2 | g4-. r r2 |
+	%15
+	s1*14
+	% same as viola-1, octave lower
+	r8 c,-.\p c4. c8-. c4~ | [c8-"cresc." c-.]c2.~ |
+	[c8 c-.]c2.~ | [c8 c-.] c4. c8-. c4~ | [c8 c8-.] c4. c8-. c4 |
+	%35
+	[as'16\ff as a as][as as as as]as2:16 |
+}
+
+% $viola2_staff = \type Staff = viola_2 <
+$viola2_staff = \type Staff = violaii <
+	\property Staff.midi_instrument = "viola"
+	\property Staff.instrument = "Viola II"
+	\property Staff.instr = "Vla. II"
+	\clef "alto";
+	\melodic \type Voice=one< 
+		\global
+		\$viola2
+	>
+>
+
diff --git a/mutopia/Coriolan/viola-part.ly b/mutopia/Coriolan/viola-part.ly
new file mode 100644
index 0000000000..5496e50ff5
--- /dev/null
+++ b/mutopia/Coriolan/viola-part.ly
@@ -0,0 +1,33 @@
+\header{
+filename =	 "viola-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.0.0";
+
+\include "global.ly"
+\include "viola-1.ly"
+\include "viola-2.ly"
+
+$viola_staff = \type Staff = violai <
+	\property Staff.midi_instrument = "viola"
+	\property Staff.instrument = "Viola"
+	\property Staff.instr = "Vla."
+	\clef "alto";
+	\melodic \type Voice=one < 
+		\global 
+		\$viola1
+		\$viola2
+	>
+>
+
+\score{
+	\$viola_staff
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
+}
+
diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly
new file mode 100644
index 0000000000..2ad314be9b
--- /dev/null
+++ b/mutopia/Coriolan/violino-1-part.ly
@@ -0,0 +1,20 @@
+\header{
+filename =	 "violino-1-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.0.0";
+
+\include "global.ly"
+\include "violino-1.ly"
+
+\score{
+	\$violino1_staff 
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
+}
+
diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly
index 4d675f24bd..1a3e2f393d 100644
--- a/mutopia/Coriolan/violino-1.ly
+++ b/mutopia/Coriolan/violino-1.ly
@@ -2,33 +2,282 @@
 filename =	 "violino-1.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-violino1 = \melodic{
-	\octave c';	
-	c1\ff ~ | c | <as'4-. c'-. f-.> r r2 | r1 |
-	c1 ~ | c | <d''4-. d'-. d-.> r r2 | r1 |
-	c1 ~ | c | <es''4-. es'-.> r r2 | r1 |
-	<g'4-. c'-. es-.> r r2 | <b4-. d-. g,-.> r r2 |
+violino1 = \melodic \relative c {
+	c'1\ff ~ | c | <f4-. c'-. as'-.> r r2 | R1 |
+	c1 ~ | c | <d4-. d'-. d'-.> r r2 | R1 |
+	c1 ~ | c | <es'4-. es'-.> r r2 | R1 |
+	<es,4-. c'-. g'-.> r r2 | <g,4-. d'-. b'-.> r r2 |
 	[c8-.\p es-.] [es()d] [d-. g-.] g4-"ten." |
-	[c8-. es-.] [es()d] [d-. g-.] g4-"ten." |
-	[c8-. es-.] [es()d] [d-. as-.] [as()g] |
-	[g8-. c'-.] [c'()b] [b-. f'-.] [f'()es'] |
-	[es'8-.-"cresc." as'-.] as'4. g'8-. g'4 ~ |
-	[g'8 fis'] fis'4 ~ fis' g'-.\f |
+	[c,8-. es-.] [es()d] [d-. g-.] g4-"ten." |
+	[c,8-. es-.] [es()d] [d-. as'-.] [as()g] |
+	[g8-. c-.] [c()b] [b-. f'-.] [f()es] |
+	[es8-.-"cresc." as-.] as4. g8-. g4 ~ |
+	%20
+	[g8 fis] fis4 ~ fis g-.\f |
+	R1 | 
+	[bes,,!8\p-. des-.][des()c][c-. f-.]f4-"ten." |
+	[bes,!8\p-. des-.][des()c][c-. f-.]f4-"ten." |
+	[bes,!8\p-. des-.][des()c][c-. ges'-.][ges()f] |
+	%25
+	[f-. bes-.][bes()a][a-. es'-.][es()des]|
+	[des-.-"cresc." ges-.] ges4. f8-. f4~ | [f8 e-.]e4-.\f r2 | 
+	R1 |
+	%29
+	r8 f-.\p f4. es8-. es4~ | [es8-"cresc." d-.]d2.~ |
+	[d8 d-.]d2.~ | [d8 d-.] d4. d8-. d4~ | [d8 d8-.] d4. d8-. d4 |
+	[f16\ff f f f][f f f f]f2:16 |
+	%35
+	[f16 f f f][es es es es][des des des des][c c c c] |
+	b2:16 c: | d!: es: | e: f: | g: as: |
+	%40
+	a2\sf [c,,8-. es-.][es()d] |
+	a''2\sf [c,,8-. es-.][es()d] |
+	as''!2\sf [b,,8-. d-.][d()c] |
+	as''2\sf [b,,8-. d-.][d()c] |
+	g''1\sf | 
+	%45
+	ges\sf | 
+	f2. ges4\sf(|
+	)f2. ges4\sf(|
+	)f2. ges4\sf(|
+	)f2. ges4\sf(|
+	%50
+	)f1\>~ |
+	f4 d( bes)\!as |
+	g2.\p( as4 | g f d ) bes | bes'2.( c4 | 
+	%55
+	bes2 )as |
+	g4 <bes2-"cresc." bes'> <bes4 bes'~> |
+	<bes-"cresc." bes'> <bes2 bes'> <bes4 bes'~> |
+	<bes bes'> <bes2 bes'> <bes4 bes'~>  |
+	<bes bes'> <bes2 bes'> <bes4 bes'> |
+	%60
+	bes'2:16 bes: | bes: bes: |
+	bes:\ff des: | c: bes: |
+	as2.\p( bes4 | 
+	%65
+	as g e )c | c'2.( des4 | c2 ) bes | 
+	[as16-"cresc." c c c][c c c c] c2:16 | c: c: | 
+	%70
+	c:\ff es: | d: c: | bes2.\p-"cresc."( c4 | bes a fis ) d |
+	d'\sf\>( as g )\!f |
+	%75
+	r8[es\p(c)es]r[d(bes)d] | r[c(g)c]r[bes(g)bes] |
+	r[a(g)a]r[bes(g)bes]|[fis-.\pp a-.] a4. a8-. a4~|
+	[a8 a-.] a4. a8-. a4~|
+	%80
+	[a8 bes-.] bes4. bes8-. bes4~|
+	[bes8 bes-.] bes4. bes8-. bes4~|
+	[bes8 c-.] c4. c8-. c4~|
+	[c8 d-.] d4. d8-. d4~|
+	es2:16\ff es4: d: |
+	%85
+	fis: g: fis: g: |
+	es2: es4: d: | 
+	fis: g: fis: g: |
+	as2: as4: g: | 
+	b: c: b: c: |
+	%90
+	as2: as4: g: | 
+	b: c: b: c: |
+	r8 es as,4\sf~as()g |
+	r8 es' as,4\sf~as()g |
+	r8 es' as,4\sf~as()g |
+	%95
+	r8 es' as,4\sf~as()g |
+	r8 es' as,4. fis8 es'4~ |
+	[es8 d] g,4. e8 d'4~ |
+	[d8 c] f,4. c'8 es,4 ~ | 
+	[es8 c'] a4. c8 g4 ~ |
+	%100
+	[g8 fis] d,4. es8-. es4~ | 
+	[es8 c-.] c4. d8-. d4 |
+	g, r8 es'' d4 r8 bes8 | 
+	a4 r8 es' d4 r8 a\f |
+	bes4 r8 es8\p d4 r8 bes |
+	%105
+	a4 r8 es' d4 r8 a8\f | bes4 r8 es\p d4 r8 a |
+	g4 r8 c bes4 r8 f | es4 r8 a g4 r8 d | c4 r8 g' fis4 r8 c' |
+	%110
+	bes4\f r8 es' d4 r8 a | 
+	g4 r8 c bes4 r8 f | 
+	es4 r8 a g4 r8 cis,, |
+	d4 r8 g' d,4 r8 fis' | 
+	bes,,4. g''8 g2 ~ | 
+	%115
+	g4. bes8 bes2 ~ | bes4. g8 g4 r8 bes | bes4 r8 d d4 r8 g | 
+	g4\p r8 es, d4 r8 bes | a4 r8 es' d4 r8 a | 
+	%120
+	bes4 r8 es des4 r8 bes | as!4 r8 es' des4 r8 as | g4 r r2 |
+	r4 r8 es' des4 r8 as | g4 r r2 |
+	%125
+	r4 r8 c bes4 r8 e, | 
+	as4 r8 des c4 r8 as | 
+	g4 r8 des' c4 r8 g |
+	as4 r8 es' des4 r8 as | 
+	bes4 r r2 |
+	%130
+	r4 r8 f'8-"cresc." es4 r8 c | bes4 r8 f' es4 r8 bes |
+	c4 r8 f es4 r8 c | c4 r r2 | r4 r8 as' ges4 r8 des |
+	%135
+	es4 r8 bes' as4 r8 es | f4\p r8 bes as4 r8 es |
+	des4 r8 ges f4 r8 c | bes4 r8 es des4 r8 as |
+	ges4 r8 des' c4 r8 ges' |
+	%140
+	f4\f r8 bes as4 r8 es | des4 r8 ges f4 r8 c |
+	bes4 r8 e f4 r8 bes, | bes4 r8 g'! es4 r8 bes' |
+	as4\p r8 des-"cresc." c4 r8 g | 
+	%145
+	f4 r8 bes as4 r8 es | des4 r8 g f4 r8 c | bes4 r8 f' e4 r8 bes' |
+	as4\ff r8 des c4 r8 g | f4 r8 bes as4 r8 es | 
+	%150
+	des4 r8 g f4 r8 c, | des4 r8 f' c,4 r8 e' | 
+	f,1\ff ~ | f | des''4 r r2 |
+	%155
+	R1  |
+	f,,1 ~ | f | 
+	<f'2\sf d'!> [f,8-. as-.][as()g] |
+	<f'2\sf d'> [f,8-. as-.][as()g] |
+	%160
+	[f8-.\p as-.][as()g] [g-. c-.][c()b] |
+	[b8-. es-.][es()d] [d-. g-.]g4-"ten." | R1 |
+	<des2\ff des'> [e,8-. g-.][g()f] |
+	<des'2\sf des'> [e,8-. g-.][g()f] |
+	%165
+	[e-.\p bes'-.][bes()as][g-.des'-.][des()c] |
+	[bes-. g'-.][g()f][e-. g-.]g4-"ten." | 
+	r2 r4 des'4\ff (|
+	)c2. des4\sf(|
+	)c2. des4\sf(|
+	%170
+	)c2. des4\sf(|
+	)c2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	)d2. es4\sf(|
+	%175
+	)d2. es4\sf(|
+	)d1\> ~ | d4( b g \!)f
+	e2.\p( f4 | e d b ) g |
+	%180
+	g'2.( a4 | g2 )f | e4 g2-"cresc." g4 ~ | 
+	g g2 g4 ~ |
+	g g2 g4 ~ |
+	%185
+	g g2 g4 |
+	[g16 g g g][g g g g]g2:16 | g: g: | g:\ff bes: | a: g: |
+	%190
+	f2.\p( g4 | f e cis ) a | a'2.( bes4 | a2 ) g |
+	[f16-"cresc." a a a][a a a a]a2:16 | 
+	%195
+	a2 a | a2:16\ff c: | b: a: | g2.\p( a4 | g\< fis dis ) b |
+	%200
+	b'1 ~ | \!b 
+	[c8\f\>c,(g)c]r[c(bes)\!c] |
+	r[c\p(as)c]r[c(g)c] |
+	r[c(f,)c']r[c(g)c] |
+	%205
+	r[c(as)c]r[c(a)c] |
+	[b-. d-.]d4. d8-. d4 ~ |
+	[d8-. d-.]d4. d8-. d4 ~ |
+	[d8-. es-.]es4.-"cresc." es8-. es4 ~ |
+	[es8-. es-.]es4. es8-. es4 ~ |
+	%210
+	[es8-. f-.]f4. f8-. f4 ~ |
+	[f8-. g-.]g4. g8-. g4 |
+	as2:16\ff as4: g: | b,: c: b: c: |
+	as'2:16\ff as4: g: | b,: c: b: c: |
+	des'2:16\ff des4: c: | e,: f: e: f: |
+	des'2:16\ff des4: c: | e,: f: e: f: |
+	%220
+	r8 as des,4\sf ~ des()c |
+	r8 as' des,4\sf ~ des()c |
+	r8 as' des,4\sf ~ des()c |
+	r8 as' des,4\sf ~ des()c |
+	r8 as' des,4. b8 g'4 |
+	%225
+	r8 g c,4. a8 f'4 ~ |
+	[f8 f] b,4. f'8 as,4 ~ |
+	[as8 f'] d!4. f8 c4 ~ |
+	[c8 b] g,4. as8 as'4 ~ |
+	[as8 as] f4. f8 g4 |
+	%230
+	c,4\p r8 as' g4 r8 es | 
+	d4\p r8 as' g4 r8 d\f | 
+	es4\p r8 as\p g4 r8 es | 
+	d4\p r8 as' g4 r8 d\f | 
+	es4\p r8 as'\p g4 r8 d | 
+	%235
+	c4 r8 f es4 r8 bes | 
+	as4 r8 d c4 r8 g | 
+	f4 r8 c' b4 r8 f' | 
+	es4\f r8 as g4 r8 d | 
+	c4\f r8 f es4 r8 bes | 
+	%240
+	as4-. des-. r2 | R1*3 |
+	e2.\p( f4 | e d b ) g |
+	g'2.( a4 | g2 ) f |
+	es4 g2 g4 ~ |
+	g4 g2 g4 ~ |
+	%250
+	g4 g2 g4 ~ |
+	g4 g2 g4 ~ |
+	[g16-"cresc." g g g][g g g g]g2:16 |
+	g: g: | g: g: | as:\f as: | as:\p as: | bes:\f bes: | bes:\p bes: |
+	c:\f c: |
+	%260
+	r8 c-"cresc." c4. c8 c4 ~ |
+	[c8 c] c4. c8 c4 ~ |
+	[c8 c] c4. c8 c4 ~ |
+	[c8 c] c4. c8 c4 ~ |
+	c4.\ff <c8 c,> <c2\sf c,~> |
+	%265
+	<c4. c,> <c8 c,> <c2\sf c,~> |
+	<c4. c,> <c8 c,> <c2\sf c,~> |
+	<c4. c,> <c8 c,> <c2\sf c,~> |
+	<c4. c,> <c8 c,> <c2\sf c,> |
+	d4. d8 d2\sf |
+	%270
+	es4.-"sempre" b8\ff c4. as8 |
+	g4. as8 g4. f'8 |
+	es4. b8 c4. as8 |
+	g4. as8 g4. f'8 |
+	es4 r8 b8 c4 r8 b, |
+	%275
+	c4 r8 b,8 c4 r8 b |
+	c1 ~ | c | <f4 c' as'-.> r r2 | R1
+	c1 ~ | c | <d4 d' d'-.> r r2 | R1
+	c1 ~ | c | es''4-. b-. r2 | R1 |
+	c4-. g-. r2 | as4-. e-. r2 | 
+	%290
+	f4-"dim." r d r | R1 | es!4\p r r2 | R1 | d,4-"pizz." r r2 | 
+	%295
+	R1 | c1^"arco"-"sempre" ~ | c2-"pi\\`u piano" b2 |
+	c1 ~ | c2 b2 |
+	%300
+	c1 ~ | c | b ~ | b | c ~ |  
+	%305
+	c | b ~ | b\> ~ | b ~ | \!b | 
+	%310
+	c4\pp r r2 | R1 | 
+	c4-"pizz." r r2 |
+	c4 r r2 |
+	c4 r r2 |
 }
 
 $violino1_staff = \type Staff = violino1 <
-	\property Staff.instrument = "violin"
+	\property Staff.midi_instrument = "violin"
+	\property Staff.instrument = "Violino I"
+	\property Staff.instr = "Vl. I"
 	\melodic< 
-		\global;
+		\global
 		\$violino1
 	>
 >
diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly
new file mode 100644
index 0000000000..cc9a9a1c87
--- /dev/null
+++ b/mutopia/Coriolan/violino-2-part.ly
@@ -0,0 +1,20 @@
+\header{
+filename =	 "violino-2-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.0.0";
+
+\include "global.ly"
+\include "violino-2.ly"
+
+\score{
+	\$violino2_staff 
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
+}
+
diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly
index 8230edc6ff..de6fea2061 100644
--- a/mutopia/Coriolan/violino-2.ly
+++ b/mutopia/Coriolan/violino-2.ly
@@ -2,31 +2,302 @@
 filename =	 "violino-2.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-violino2 = \melodic{
-	\octave c';	
-	c1\ff ~ | c | <as'4-. c'-. f-.> r r2 | r1 |
-	c1 ~ | c | <as'4-. b-. d-.> r r2 | r1 |
-	c1 ~ | c | <c''4-. es'-. fis-.> r r2 | r1 |
-	<c'4-. es-. g,-.> r r2 | <b4-. d-. g,-.> r r2 |
+violino2 = \melodic \relative c {
+	c'1\ff ~ | c | <f4-. c'-. as'-.> r r2 | R1 |
+	c1 ~ | c | <d4-. b'-. as'-.> r r2 | R1 |
+	c1 ~ | c | <fis4-. es'-. c'-.> r r2 | R1 |
+	%13
+	<g,4-. es'-. c'-.> r r2 | <g4-. d'-. b'-.> r r2 |
 	R1 *3 |
-	r2 ['b8-.\p f-.] [f()es] |
+	r2 [b8-.\p f'-.] [f()es] |
 	[es8-. as-.] as4.-"cresc." g8-. g4 ~ |
+	%20
 	[g8 fis-.] fis4 ~ fis g-.\f |
+	R1*4 | r2
+	%25
+	[a,8-.\p es'-.][es()des] | [des-.-"cresc." ges-.]ges4. f8-. f4~ |
+	[f8 e-.]e4-.\f r2 | R1 
+	%29
+	%copied... \transpose c \violino-1(29, 39)
+	r8 f-.\p f4. es8-. es4~ | [es8-"cresc." d-.]d2.~ |
+	[d8 d-.]d2.~ | [d8 d-.] d4. d8-. d4~ | [d8 d8-.] d4. d8-. d4 |
+	[f16\ff f f f][f f f f]f2:16 |
+	%35
+	[f16 f f f][es es es es][des des des des][c c c c] |
+	b2:16 c: | d!: es: | e: f: | 
+	<g: c,:> <as: c,:> |
+	%40
+	a2\sf [c,8-. es-.][es()d] |
+	a'2\sf [c,8-. es-.][es()d] |
+	d2\sf [b8-. d-.][d()c] |
+	d2\sf [b8-. d-.][d()c] |
+	des2\sf [bes8-. d-.][d()c] |
+	%45
+	c2\sf [a8-. c-.][c()bes] |
+	r4[a8-. c-.][c()bes] r4 |
+	r4[a8-. c-.][c()bes] r4 |
+	r4[a8-. c-.][c()bes] r4 |
+	r4[a8-. c-.][c()bes][bes()a]|
+	%50
+	bes4 r r2 |
+	R1*5 |
+	g'2.\p-"cresc."( a4 | g f d ) bes | bes'2.( c4 | bes2 )as |
+	%60
+	[g16 bes bes bes][bes bes bes bes]bes2: | 
+	%copied... \transpose c, violino-1(61,74)
+	bes: bes: |
+	bes:\ff des: | c: bes: |
+	as2.\p( bes4 | 
+	%65
+	as g e )c | c'2.( des4 | c2 ) bes | 
+	[as16-"cresc." c c c][c c c c] c2:16 | c: c: | 
+	%70
+	c:\ff es: | d: c: | bes2.\p-"cresc."( c4 | bes a fis ) d |
+	d'\sf\>( as g )\!f |
+	%75
+	% nono, only looks like transpose
+	r8[c'\p(g)c]r[bes(g)bes] | r[g(es)g]r[g(d)g] |
+	r[g(es)g]r[g(e)g]|r8 fis-.\pp fis4. fis8-. fis4~|
+	% urg, can't copy: \transpose g \violino-1(75,91)
+	% a -> fis
+	% bes -> g 
+	% c -> a
+	% d -> bes
+	[fis8 fis-.] fis4. fis8-. fis4~|
+	%80
+	[fis8 g-.] g4. g8-. g4~|
+	[g8 g-.] g4. g8-. g4~|
+	[g8 a-.] a4. a8-. a4~|
+	[a8 bes-.] bes4. bes8-. bes4|
+	% different
+	a2:16\ff a4: bes: | c: bes: c: bes: |
+	a2:16 a4: bes: | c: bes: c: bes: |
+	b2: b4: c: | f: es: f: es: |
+	%90
+	b2: b4: c: | f: es: f: es: |
+	% copied: \transpose c, \violino-1(92,95)
+	r8 es as,4\sf~as()g |
+	r8 es' as,4\sf~as()g |
+	r8 es' as,4\sf~as()g |
+	%95
+	r8 es' as,4\sf~as()g |
+	% transpose viola...
+	[es16 as as as]as4:16[fis16 a a a]a4:16 |
+	[d,16 g g g]g4:16[e16 g g g]g4:16 |
+	[c,16 f f f]f4:16[c16 es es es]es4:16 |
+	[c16 a' a a]a4:16[c,16 g' g g]g4:16 |
+	%100
+	[fis8 d]d4. es8 es4~|
+	[es8 c-.]c4. d8-. d4 | 
+	g,\p r r2 |
+	r2 r4 r8 <d'\f a'> | 
+	<d4 bes'> r r2 |
+	%105
+	r2 r4 r8 <d\f a'> | 
+	<d4 bes'> r r r8 a'\p |
+	g4 r r r8 f |
+	es4 r r r8 d | 
+	c4 r8 g fis4 r8 c' | 
+	% looks lot like violino-1 110-113
+	%110
+	bes4\f r8 es d4 r8 a | 
+	g4 r8 c bes4 r8 f | 
+	es4 r8 a g4 r8 cis |
+	<[d16 s> <bes g'> <bes g'> <bes g']> <a4:16 fis':> <a2:16 fis':> |
+	<bes: g':> <bes: g':> |
+	<bes: g':> <bes: g':> |
+	<bes: g':> <bes: g':> |
+	<bes: g':> <bes: g':> |
+	<bes4\p g'> r r2 | 
+	% copied... urg: *same* as violino-1(119,128)
+	% URG: or is this R1*10??
+	% should hara-kiri like viola-1/2...
+        a'4 r8 es' d4 r8 a | 
+	%120
+	b4 r8 es des4 r8 bes | as!4 r8 es' des4 r8 as | g4 r r2 |
+	r4 r8 es' des4 r8 as | g4 r r2 |
+	%125
+	r4 r8 c bes4 r8 e, | 
+	as4 r8 des c4 r8 as | 
+	g4 r8 des' c4 r8 g |
+	as4 r8 es' des4 r8 as |
+	R1*3
+	%131
+	% copied from viola(131,140)
+	[as,8 as c es][f es c as]|[a c es f][ges f c a]|
+	[bes des f ges][as ges des bes]|
+	%135
+	[c es g as][bes as es c]|[des\p f a bes][c, es g as]|
+	% [bes, des f ges][as, c e f]|[ges, bes d es][f, as c des]|
+	% urg, copied, but nog ges, f, on violino!
+	[bes, des f ges][as, c e f]|r [bes, d es]r[as, c des]|
+	% [es, ges bes des][as c es as,]|
+	r[bes bes des][as c es ges]|
+	% copied: \transpose c \violino-1(140,149)
+	%140
+	f4\f r8 bes as4 r8 es | des4 r8 ges f4 r8 c |
+	bes4 r8 e f4 r8 bes, | bes4 r8 g'! es4 r8 bes' |
+	as4\p r8 des-"cresc." c4 r8 g | 
+	%145
+	f4 r8 bes as4 r8 es | des4 r8 g f4 r8 c | bes4 r8 f' e4 r8 bes' |
+	as4\ff r8 des c4 r8 g | f4 r8 bes as4 r8 es | 
+	% copied somewhat from violino-1(150,168)
+	%150
+	des4 r8 g f4 r8 c | des4 r8 f' c,4 r8 e' | 
+	f,1\ff ~ | f | <f4 des'> r r2 |
+	%155
+	R1  |
+	f1 ~ | f | 
+	<d2\sf d'!> [f8-. as-.][as()g] |
+	<d2\sf d'> [f8-. as-.][as()g] |
+	%160
+	R1 |
+	[b,8-. es-.][es()d] [d-. g-.]g4-"ten." | R1 |
+	<e2\ff des'> [e8-. g-.][g()f] |
+	<e2\sf des'> [e8-. g-.][g()f] |
+	%165
+	R1
+	[bes,8-.\p g'-.][g()f][e-. g-.]g4-"ten." | 
+	R1 |
+	% copied \transpose c' viola(168, 175)
+	r4 [e8-.\ff g-.][g()f] r4 |
+	r4 [e8-. g-.][g()f] r4 |
+	%170
+	r4 [e8-. g-.][g()f] r4 |
+	r4 [e8-. g-.][g()f][fis-.fis-.] | 
+	g4 [fis8-.as-.][as()g] r4 |
+	r4 [fis8-.as-.][as()g] r4 |
+	r4 [fis8-.as-.][as()g] r4 |
+	%175
+	r4 [fis8-.as-.][as()g] es'4\sf(|
+	% copied violino-1(176,201)
+	)d1\> ~ | d4( b g \!)f
+	e2.\p( f4 | 
+	e d b ) g |
+	%180
+	g'2.( a4 | g2 )f | 
+	e4 g2-"cresc." g4 ~ | 
+	g g2 g4 ~ |
+	g g2 g4 ~ |
+	%185
+	g g2 g4 |
+	[g16 g g g][g g g g]g2:16 | g: g: | g:\ff bes: | a: g: |
+	%190
+	f2.\p( g4 | f e cis ) a | a'2.( bes4 | a2 ) g |
+	[f16-"cresc." a a a][a a a a]a2:16 | 
+	%195
+	a2 a | a2:16\ff c: | b: a: | g2.\p( a4 | g\< fis dis ) b |
+	%200
+	b'1 ~ | \!b 
+	% similar violino-1 only until 219
+	[c8\f\>g(c)g]r[bes(g)\!bes] |
+	r[as\p(f)as]r[g(es)g] |
+	r[f(c)f]r[g(es)g] |
+	%205
+	r[as(d,)as']r[a(es)a] |
+	[g-. b-.]b4. b8-. b4 ~ |
+	[b8-. b-.]b4. b8-. b4 ~ |
+	[b8-. c-.]c4.-"cresc." c8-. c4 ~ |
+	[c8-. c-.]c4. c8-. c4 ~ |
+	%210
+	[c8-. d-.]d4. d8-. d4 ~ |
+	[d8-. es-.]es4. es8-. es4 |
+	as,2:16\ff as4: g: | f: es: f: es: |
+	as2:16\ff as4: g: | f: es: f: es: |
+	des'2:16\ff des4: c: | bes: as: bes: as: |
+	des2:16\ff des4: c: | bes: as: bes: as: |
+	% copied violino-1(220, 223)
+	%220
+	r8 as des,4\sf ~ des()c |
+	r8 as' des,4\sf ~ des()c |
+	r8 as' des,4\sf ~ des()c |
+	r8 as' des,4\sf ~ des()c |
+	% looks lot like viola...
+	[f16 f as as]f4:16[d16 d g g]d4:|
+	%225
+	[c16 c g' g]c,4:16[c16 c f f]c4:|
+	[b16 b f' f]b,4:16[c16 c f f]c4:|
+	[d16 d f f]d4:16[c16 c f f]c4:|
+	[d8 g,] g'4. as8 as4 ~ |
+	[as8 as] f4. f8 g4 | 
+	%230
+	c,4\p r r2 | 
+	r2 r4 r8 <g\f d'> | 
+	<g4 es'> r r2 |
+	r2 r4 r8 <g\f d'> | 
+	<g4 es'> r r2 |
+	%235
+	R1*3 |
+	%copied violino-1(238,243)
+	es'4\f r8 as g4 r8 d | 
+	c4\f r8 f es4 r8 bes | 
+	%240
+	as4-. des-. r2 | R1*3 |
+	%245
+	[g,8\p( e' c e][g e c )g~] |
+	[g8( d' b d][g d b )g~] |
+	[g8( e' c e][g e c )g~] |
+	[g8( f' d f][g f d )g,~] |
+	[g8( es'! c es][g es c )g~] |
+	[g8( d' b d][g d b )g~] |
+	%250
+	[g8( es' c es][g es c )g~] |
+	[g8( f' d f][g f d )g,~] |
+	[g8( es' c es][g es c )g~] |
+	[g8( d' b d][g d b )g~] |
+	[g8( es' c es][g es c )g] |
+	%255
+	<c2:16\f es:> <c: es:> |
+	[as8\p( f' des f][as f des )as] |
+	<d2:16\f f:> <d: f:> |
+	[bes8\p( g' es g][bes g es )bes] |
+	<c2:16\f g':> <c: g':> |
+	%copied viola-1(260, 273) 
+	%260
+	[f8\p-"cresc." f']f4. es8 es4 ~ |
+	[es8 as]as4. g8 g4 ~ |
+	[g8 f]f4. es8 es4 ~ |
+	[es8 as]as4. g8 g4 |
+	r r8 d\ff es4.\sf()d8 |
+	%265
+	r4 r8 d es4.\sf()d8 |
+	r4 r8 e f4.\sf()e8 |
+	r4 r8 e f4.\sf()e8 |
+	r4 r8 e g4.\sf()f8 |
+	r4 r8 f as4.\sf()g8 |
+	%270
+	g2:16-"sempre" g:\ff | g: g: | g: g: | g: g: | 
+	g4. d8 es4. d,8 |
+	%275
+	es4 r8 b8 c4 r8 b |
+	c1 ~ | c | <f4 c' as'-.> r r2 | R1
+	c1 ~ | c | <d4 b' as'-.> r r2 | R1
+	c1 ~ | c | <c'4-. a'-.> <b-. as'-.> r2 | R1 |
+	<c4-. g'-.> <g-. c-.> r2 | as4-. <c,-. e-.> r2 | 
+	%290
+	<c4 f-"dim."> r g' r | R1 | g4\p r r2 | R1 | b,4-"pizz." r r2 | 
+	%295
+	R1 | c4 r r2 | R1*15 |
+	c4-"pizz." r r2 |
+	c4 r r2 |
+	c4 r r2 |
 }
 
 $violino2_staff = \type Staff = violino2 <
-	\property Staff.instrument = "violin"
+ 	% MIDI hoort geeneens verschil tussen een
+	% eerste en tweede viool ;-)
+	\property Staff.midi_instrument = "violin"
+	\property Staff.instrument = "Violino II"
+	\property Staff.instr = "Vl. II"
 	\melodic< 
-		\global;
+		\global
 		\$violino2
 	>
 >
diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly
new file mode 100644
index 0000000000..bec6971a1a
--- /dev/null
+++ b/mutopia/Coriolan/violoncello-part.ly
@@ -0,0 +1,20 @@
+\header{
+filename =	 "violoncello-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.0.0";
+
+\include "global.ly"
+\include "violoncello.ly"
+
+\score{
+	\$violoncello_staff 
+	\include "part-paper.ly"
+	\midi{ \tempo 4 = 160; }
+}
+
diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly
index 4d994a1317..085b31dbf5 100644
--- a/mutopia/Coriolan/violoncello.ly
+++ b/mutopia/Coriolan/violoncello.ly
@@ -2,30 +2,311 @@
 filename =	 "violoncello.ly";
 %title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
 description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1792)";
+composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
 
 
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
-violoncello = \melodic{
-	\octave c;
-	c1\ff ~ | c | f,4-. r r2 | r1 |
-	c1\ff ~ | c | f,4-. r r2 | r1 |
-	c1\ff ~ | c | fis,4-. r r2 | r1 |
-	g,4-. r r2 | g,4-. r r2 |
+violoncello = \melodic \relative c {
+	c1\ff ~ | c | f,4-. r r2 | r1 | c'1\ff ~ | c | f,4-. r r2 |
+	\property Staff.instr = "Vc. \& Cb."
+	r1 |
+	c'1\ff ~ | c | fis,4-. r r2 | r1 |
+	g4-. r r2 | g4-. r r2 |
 	c4\p r4 r2 | c4 r4 r2 | c4 r4 r2 | r1 |
-	c'4.-"cresc." c'8 bes4. bes8 | as4. as8 g4\f r4 |
+	c'4.-"cresc." c8 bes4. bes8 | 
+	%20
+	as4. as8 g4\f r4 |
+	R1 |
+	% 4 bars same as violino-1...
+	[bes,!8\p-. des-.][des()c][c-. f-.]f4-"ten." |
+	[bes,!8\p-. des-.][des()c][c-. f-.]f4-"ten." |
+	[bes,!8\p-. des-.][des()c][c-. ges'-.][ges()f] |
+	%25
+	[f-. bes-.][bes()a][a-. es'-.][es()des]|
+	bes4.-"cresc." bes8 as4. as8 | g4 g4-.\f r2 | R1
+	as4.\p as8 g4. g8 | f2.-"cresc" g4 | f2. g4 | 
+	f4. g8 f4. g8 | 
+	f4. g8 f4. g8 | 
+	as1\ff ~ |
+	%35
+	as4(g f)es|
+	d4. r8 c4. r8 | b4. r8 c4. r8 | bes4. r8 as4. r8 | g4. r8 f4. r8 |
+	%40
+	fis2\sf [c'8-. es-.][es()d]
+	fis,2\sf [c'8-. es-.][es()d]
+	f,!2\sf [b8-. d-.][d()c]
+	f,2\sf [b8-. d-.][d()c]
+	e,2\sf [bes'!8-. des-.][des()c]
+	%45
+	es,!2\sf [a!8-. c-.][c()bes] |
+	d,4 [a'!8-. c-.][c()bes] es,4\sf(|
+	)d4 [a'!8-. c-.][c()bes] es,4\sf(|
+	)d4 [a'!8-. c-.][c()bes] es,4\sf(|
+	)d4 [a'!8-. c-.][c()bes] es,4\sf(|
+	%50
+	)d4 r r2 |
+	R1 |
+	[bes'8\p(g'es g][bes g es)bes~] |
+	[bes(f'd f][bes f d)bes~] |
+	[bes(g'es g][bes g es)bes~] |
+	%55
+	[bes(as'f as][bes as f)bes,~] |
+	[bes-"cresc."(g'es g][bes g es)bes~] |
+	[bes(f'd f][bes f d)bes~] |
+	[bes(g'es g][bes g es)bes~] |
+	[bes(as'f as][bes as f)bes,~] |
+	%60
+	[bes(g'es g][bes g es)bes~] |
+	[bes(f'd f][bes f d)as] |
+	g2\ff f | e c |
+	[f8\p(as'f as][c as f)c~] |
+	[c(g'e g][c g e)c~] |
+	[c(as'f as][c as f)c~] |
+	[c(bes'g bes][c bes g)c,~] |
+	[c(as'f as][c as f)c~] |
+	[c(g'e g][c g e)bes] |
+	%70
+	as2\ff g | fis d |
+	[g8\p-"cresc."(bes' g bes][d bes g)d~] |
+	[d8(a' fis a][d a fis)d] |
+	[f!8\sf\>(as f as][f g d)\!g] |
+	%75
+	c,4\p r d r | es r d r | c r cis r | 
+	d\pp r8 d d4. d8 |
+	r4 r8 d d4. d8 |
+	%80
+	r4 r8 d d4.-"cresc." d8 |
+	r4 r8 d d4. d8 |
+	r4 r8 d d4. d8 |
+	r4 r8 d d4. d8 |
+	c'2.\ff()bes4 | a(g a)g|
+	c2.()bes4 | a(g a)g|
+	f!2.()es4 | d(c d)c|
+	%90
+	f2.()es4 | d(c d)c|
+	c r8 c' c4\sf()des|
+	r r8 c c4\sf()des|
+	r r8 c c4\sf()des|
+	%95
+	r r8 c c4\sf()des|
+	c,4. c'8 c,4. c'8 |
+	b,4. b'8 bes,4. bes'8 |
+	as,4. as'8 g,4. g'8 |
+	fis,4. fis'8 es4. es8 |
+	%100
+	d4 r8 d es4 r8 es |
+	c4 r8 c d4 r8 d |
+	% copied \transpose c, viola-1(102, 130)
+	% except for some abbrevs below...
+	[g8\p bes cis d][es d bes g]|
+	[fis a cis d][es d a fis\f] |
+	[g bes cis\p d][es d bes g]
+	%105
+	[fis a cis d][es d a fis\f] |
+	[g bes cis\p d][f, a cis d] |
+	[es, g b c][d, g a bes] |
+	% [c, es g a]r[d, fis g] |
+	[c, es g a][bes, d fis g] |
+	% r[c, es g][d fis a d] |
+	[a, c es g][d fis a d] |
+	%110
+	% cello has eighth notes here...
+	% [g,16 g bes bes][d d es es][f, f a a][cis cis d d] |
+	% see if this:8 neat trick works...
+	[g,:8 bes d es][f, a cis d] |
+	[es,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. g8 g4 r8 g |
+	% urg, 2 copied from 102
+	[g'8\p bes cis d][es d bes g]|
+	[fis a cis d][es d a fis] |
+	%120
+	[g bes c des][c des bes g]|[f as c des][c des as f]|
+	[e g b c][b c g e]|[f as b c][b c as f]|
+	[e g b c][b c g e]|
+	%125
+	[c e fis g][fis g e c]|[f as b c][des c as f]|
+	[e g b c][des c g e]|[f as c des][c des as f]|
+	[g bes d es][d es bes g]|[as-"cresc." c d es][f es c as]|
+	%131
+	[g bes d es][f es bes g]|
+	% shared with viola until here
+	as1 ( | a | bes | )c | des2\p( c | bes as | ges f | )es [as,8 c es as] |
+	%140
+	% copied from viola-1 (140,152)
+	% except cello has eighth notes
+	% [des,16\f des f f][a a bes bes][c, c es es][g g as as]|
+	[des,8\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:]|
+	%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]|
+	% uhuh, still 'same as cello';
+	% but now rests for notes that viola cannot reach...
+	% r[des, e g]r[c, e f]|
+	[bes, des e g][as, c e f]|
+	% hmm, don't want to miss more than one note,
+	% take bes octave higher
+	% r[bes des, f][c e g c]|
+	[g, bes des f][c e g c]|
+	% cello has eight notes;
+	% viola has rest where can't reach	
+	[f,:\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
+	%155
+	R1 |
+	f'1\ff ~ | f |
+	b,2\sf [f'8-. as-.][as()g] |
+	b,2\sf [f'8-. as-.][as()g] |
+	%160
+	R1*3 |
+	bes,!2\ff [e8-. g-.][g()f] |
+	bes,2\sf [e8-. g-.][g()f] |
+	%165
+	R1*2 |
+	r2 r4 bes,\ff(|
+	)as4 [e'8-. g-.][g()f] bes,4\sf(|
+	)as4 [e'8-. g-.][g()f] bes,4\sf(|
+	%170
+	)as4 [e'8-. g-.][g()f] bes,4\sf(|
+	)as4 [e'8-. g-.][g()f][fis-. fis-.] |
+	g4 [fis8-. as-.][as()g] c,4\sf(|
+	)b4 [fis'8-. as-.][as()g] c,4\sf(|
+	)b4 [fis'8-. as-.][as()g] c,4\sf(|
+	%175
+	)b4 [fis'8-. as-.][as()g] c,4\sf(|
+	)b4 r r2 | R1 |
+	[g8\p(e' c d][g e c )g~] |
+	[g(d' b d][g d b )g~] |
+	%180
+	[g(e' c d][g e c )g~] |
+	[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(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
+	[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
+	[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\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 |
+	%220
+	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
+	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
+	[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
+	[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 | 
+	c4\p r r r8 c(|
+	)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(|
+	)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
+	bes\f |
+	as4.\p-"cresc." as'8 g4. g8 | f4. f8 es4. es8 |
+	as4. as8 g4. g8 | f4. f8 es4. es8 |
+	%265
+	f,4.\ff f'8 f2\sf | 
+	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]|
+	[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 | fis4-. f-. r2 | R1
+	es4-. e-. r2 | f,4-. g-. r2 | as4-"dim." r b r | R1 | c4 r r2 R1 |
+	g4-"pizz." r r2 | R1 | c4 r r2 | 
+	[c8-.-"arco" es-.][es()d][d-. as'-.][as()g] | R1
+	\[/3 c,4-"sempre pi\\`u piano" ( es c ~ \] \[/3 c as' )g \] |
+	r2 r4 c,( | es2. ) d4 | r2 r4 d( | as'2. )g4 ~ | g1 ( |
+	%305
+	es | )d( | )as'\> ~ | as ~ | as2.()\!g4 | c,\pp r r2 | R1 |
+	c4-"pizz." r r2 |
+	c4 r r2 |
+	c4 r r2 |
 }
 
 $violoncello_staff = \type Staff = violoncello <
-	\property Staff.instrument = "cello"
+	\property Staff.midi_instrument = "cello"
+	\property Staff.instrument = "Violoncello"
+	\property Staff.instr = "Vc."
 	\clef "bass";
-	\melodic< 
-		\global;
+	\melodic \type Voice=one< 
+		\global
 		\$violoncello
 	>
 >
+
diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
new file mode 100644
index 0000000000..0c111fa734
--- /dev/null
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
@@ -0,0 +1,119 @@
+\header{
+filename =	 "preludes-1.ly";
+% mmm
+% title =	 "DOUZE PETITES PR\\'ELUDES";
+opus = "BWV 924";
+% piece = "\\numfont 1";
+piece = "1";
+% blz 1
+% Clavierb"uchlein f"ur W. Fr. Bach
+% Clav. W. Fr. Bach: 2-Praeambulum I
+% ca 1720
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "public domain";
+}
+
+\version "1.0.0";
+
+one = \melodic\relative c {
+	\property Voice . textstyle =  "italic"
+	r16\p_"legato"\< [g''-1( c-3 )e-5] r [g,-1( c )e]
+	r [g,( c )d] r [b-1( d-2 \!)g-5] |
+	r\mf [a,( d-2 ) g-5] r [a,(\< d )f-4]
+	r [a,( d )e-3] r [c-1( e-2 \!)a-5] |
+	r\f [b, e a-5] r [b, e-3 g-5] 
+	r [c,-1 e-3 f-4] r [g, d'-3 f-5] |
+	r [g,-"poco a poco dim." d'-4 e] r [g, c-2 e]
+	r [a,-1 c-3 d-4] r [e, b'-3 d-5] |
+	r [e, b' c-4] r [e, a-2 c]
+	r [f,-1 a-3 bes-4] r [c, g'-3 bes-5] |
+	r [c, g' a-4] r [c, f-2 a] 
+	r [d, f-2 b-5] r [e, g-2 c-5] |
+	r\p [d, g c-5] r [d, g b-4]
+	r [c, g'-3 b-5] r [c, fis-2 a-4] |
+	r [b, d a'-5] r [b, d g-4]
+	r [a, c g'-5] r [a, c f!-4] |
+	% ugh arpeggio
+	<
+		{ \voiceone  f4 r s }
+		{ \voicetwo  <g,4 d'> r s }
+	>
+	\onevoice 
+	% ugh beam across staffs slur starts at lower staff
+	r16 [g,-1( b d] |
+	\voiceone 
+	)b s4 [g'16-1( b-2 d] )b s s s [f'-2 g-3 b-5 f-2] |
+	\onevoice 
+	[e-1\f c'-5( g-3 f-2] [e-1 c'-5 g-3 e-2] 
+	[)d c'-5( f,-3 e-2] [d-1 b'-5 f-3 d-2] |
+	[)c b'-5( e,-3 d-2] [c-1 a'-5 e-3 c-2] 
+	[)b-1 a'-5( d,-3 c-2] [b-1 g'-5 d-3 b-2] |
+	[)a g'-5 c,-4 b] [a-"poco a poco dim." fis'-5 c-2 a-1]
+	[b-2 f' d-4 c] [b f' d-4 b-2] |
+	[g e' c-3 b] [a e'-5 c-3 a-1]
+	[fis-2 d' b-3 a] [g-1 d'-5 b-4 g-2] |
+	[e c'-5 a-4 g-3] [fis-2 c'-5 a-4 fis-2] 
+	[d c'-5 b-4 a] [b-4 g-2 d'-5 f,-1] |
+	[g-4 e-2 f-1 d'-5] [c-4 b a g]
+	[f'-5 d-3 es-4 c-2] [fis,-1 es'-4 d-3 c-2] |
+	[b-1 d-5 b-3 g-1] [as-4-"cresc. e rall." f-2 g-3 d-1]
+	[es-2 fis-3 a-4 c-5] 
+	< 
+		{ \voiceone  r [c8 b16] }
+		{ \voicetwo  [d,8 f-2] }
+	>
+	\onevoice  |
+	<c1\mf g e>
+	\bar "|.";
+}
+
+two = \melodic\relative c{
+	\property Voice . textstyle =  "roman"
+	c4-5 e-3 g-\mordent^"(\\textsharp)" g,4 |
+	d'-\mordent-5 f-3 a-\mordent^"(\\textsharp)" a,4 |
+ 	e'-5 e'-\mordent-1 a,-4 b-\upprall |
+ 	c4 e,-4 fis gis-\downprall |
+	a4 c,-4 d e-\upprall |
+	f4-1 e d-3-\prall c |
+	g'-\mordent^"(\\textsharp)" g, g'-\mordent g, |
+	g'-\mordent g, g'-\mordent g, |
+	% ugh f should be at upper staff
+	g'-\mordent r r16 [g,-5( b-4 d] )f-1 s s s |
+	s [g-5( b-4 d-2] )f-1 s s s s \clef "violin"; [g-4 b-2 d-1] 
+	s s s s \clef bass; |
+	<
+		{ \voiceone  g,,1 ~ g ~ g ~ g ~ g ~ g ~ g }
+		{ \voicetwo  g,1 ~ g ~ g ~ g ~ g ~ g ~ g }
+	>
+	<c,1 c,>
+	\bar "|.";
+}
+
+global  = \melodic{
+	\time 4/4;
+}
+
+treble_staff = \type Staff = treble <
+	\global
+	\one
+>
+
+bass_staff = \type Staff = bass <
+% bass = Staff <
+	\clef "bass";
+	\global
+	\two
+>
+
+grand_staff = \type GrandStaff <
+	\treble_staff
+	\bass_staff
+>
+
+\score{
+        % Moderato
+	\grand_staff
+	\include "preludes-paper.ly";
+	\midi{ \tempo 4 = 80; }
+}
diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
new file mode 100644
index 0000000000..585f74e7c5
--- /dev/null
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
@@ -0,0 +1,130 @@
+\header{
+filename =	 "preludes-2.ly";
+title =	 "2";
+opus = "BWV 939";
+% urg?? piece = "\\numfont 2";
+piece = "2";
+% blz 10
+% 
+% Six Petits Pr eludes
+% Collection Johann Peter Kellner
+% ca 1703- 1707
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "public domain";
+}
+
+\version "1.0.0";
+one = \melodic\relative c{
+	\property Voice . textstyle =  "italic"
+	r8\mf [c'-1( e-2 g-4] [e-2 c-1 bes'-5 g-3] |
+	[)a-4\< c,-1( f-2 a-4] [f c c'-5 a-3] |
+	[)b-4 g-1( b-2 d-4] [b-2 g f'-5 \!d-3] |
+	<
+		{\voiceone )e2-4\f r4 e-5 }
+		\type Voice = second {\voicetwo <c2 g > r4 <c g > }
+	>
+	\onevoice |
+	\type Staff < 
+		 { \voiceone d2-4 r4 d-4 }
+		 \type Voice = second { \voicetwo <c2 a > r4 <c a > }
+	>
+	\onevoice |
+	\type Staff < 
+		 { \voiceone d8 }
+		 \type Voice = second { \voicetwo <b 8 g > }
+	>
+	\onevoice 
+	[g, 8-1\mf( b-2 d-4] 
+	<
+		{ \voiceone )b 4 e-5 }
+		\type Voice = second { \voicetwo g, 4 b }
+	>
+	\onevoice |
+	\type Staff <
+		{ \voiceone c2 r4 < {c-5 ~ c8} {a 4 ~ a 8} > }
+		{ \voicetwo c2 r4 e, 4 ~ e 8 }
+	>
+	\onevoice 
+	[d,-1\p( fis-2 a-4] [fis-2 d-1 c'-5 a-3] |
+	[)b-4\< g-1( b-2 d-4] [ b-2 g-1 f'!-5 d-3] |
+	[)e-4 g,-1( c-2 e-4] [c-2 g g'-5 e-3] |
+	[)fis-4 a,-1( c-2 fis-4] [c a a'-5 \!fis-3] |
+	<
+		{ \voiceone )g2-5\f }
+		\type Voice = second { \voicetwo <d2 b > }
+	>
+	\onevoice 
+	r4 b4-2( |
+	[c,8-1 e-2 g c ] [g-2 e-1 bes'-4 g-2] |
+	[)a16->-3 g-2 f-1 e-3] [d c b !-3 a-2] 
+	[b-3\< g-1 a b ] [c-1 d e \!f] |
+	g4-5\ff
+	\type Staff <
+		{ \voiceone c,2-5 b 4-4 }
+		{ \voicetwo g 2-2 d 4-1 }
+	>
+	\onevoice 
+	\type Staff <
+		{ \voiceone  c1^5 }
+		{ \voicetwo e, 1_1}
+	>
+	\onevoice 
+	\bar "|.";
+}
+
+two = \melodic\relative c{
+	\type Staff <
+		{ \voiceone c1 ~ | c ~ | c }
+		{ \voicetwo c,1 ~ | c ~ | c }
+	>
+	\onevoice |
+	r8 [c-5( e-3 g-1] [e-3 c-5 c' e,-4] |
+	[)fis-3 d-5( fis-3 a-1] [fis-3 d-5 d' fis,-4] |
+	)g2-3 r4 g-2( |
+	[)a8 a,-5( c-4 e-2] [c-4 a-5 g' e-3] |
+	)fis2 r4 d-4 |
+	g-\mordent-"(\\textsharp)" g, 4 g'-\mordent g, |
+	% mordents in brackets...
+	g'-\mordent g, g'-\mordent g, |
+	g'-\mordent g, g'-\mordent g, |
+	[g'8 g,-5( b-4 d-2] [b-4 g-5 f'!-1 d-3] |
+	[)e-2 c-4 e-2 g-1] [e-3 c-5 c' e,-4] |
+	\property Voice . textstyle =  "finger"
+	f1^"3\\_1" ~ |
+	[f8 d-3 e-2 c-4] g'4-1 g,^"5\\_2" |
+	<c1 c,1>
+	\bar "|.";
+}
+
+global = \melodic{
+	\time 4/4;
+}
+
+trebleStaff = \type Staff = treble <
+	\global
+	\one
+>
+
+bassStaff = \type Staff = bass <
+	\clef "bass";
+	\global
+	\two
+>
+
+grandStaff = \type GrandStaff <
+	\trebleStaff
+	\bassStaff
+>
+
+a4 = \paper{
+	linewidth= 193.\mm;
+}
+
+\score{
+    % Moderato
+	\grandStaff
+	\paper{ \a4 }
+	\midi{ \tempo 4 = 100; }
+}
+
diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
new file mode 100644
index 0000000000..0b25e9f283
--- /dev/null
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
@@ -0,0 +1,182 @@
+% URG
+
+changequote(^, @)
+define(comma, r16 [$1$4 $2 $3] [$2 $1 $2 $6$1] r $1$7 r $5$1 |)
+define(s, ^comma(translit($*,^ @, ^,@))@)
+define(t, r16 [$1$4 $2 $3] [$2 $1 $2 $6$1] r $1$7 r $5$1 |)
+
+\header{
+filename =	 "preludes-3.ly";
+title =	 "3";
+opus = 	"BWV 999";
+% piece = "\\numfont 3";
+piece = "3";
+% Pr"aludum in C Moll f"ur Laute
+% blz 16
+% Six Petits Preludes`
+% Collection Johann Peter Kellner
+% ca 1703 - 1707
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "public domain";
+}
+
+\version "1.0.0";
+
+
+one = \melodic  \transpose c`` {
+	\textstyle "italic";
+%#	s(^c@ ^es@ ^g@ ^\p(\<@ ^\!@ ^)\!@ ^\>@)
+	t(c,es,g,^\p(\<@,\!,^)\!@,\>)
+%#	s(c es g ^(@ ^@ ^)@)
+	t(c,es,g,^(@,^@,^)@)
+%#	s(c f as ^(@ ^@ ^)@)
+	t(c,f,as,^(@,^@,^)@)
+	s(c f as)
+	s(b` d f \< \!)
+	s(b` d f)
+	s(g` c es \> \!)
+	s(g` c es)
+	s(g` c es \< \!)
+	s(g` c es)
+	s(a` c es)
+	s(a` c es)
+	s(a` bes` d \> \!)
+	s(g` bes` d)
+	s(bes` d g)
+	s(a` es g \mf)
+	s(a` c fis)
+	s(a` c fis)
+	s(bes` d g)
+
+
+%#	s(c fis a -"poco a poco cresc.")
+	t(c,fis,a,-"poco a poco cresc.")
+	s(d g bes)
+	s(d fis c`)
+
+	s(cis g bes)
+	s(c es a !-"dim.")
+	s(bes` e g)
+	s(a` c g)
+
+	s(a` c fis)
+	s(g` bes` e)
+	s(fis` a` es)
+
+	s(g` bes` d -"dim.")
+	s(g` a` c)
+	s(fis` a` c)
+	s(fis` a` c)
+	r16\p [g` a` c] [b` g` b` g`] r g` r g`
+%#	s(a` c fis -"poco cresc.")
+	t(a`,c,fis,-"poco cresc.")
+	s(c fis a)
+	s(b` d g)
+	s(b` d f -"dim.")
+	s(g` c es)
+	s(fis` c es)
+	s(fis` c es)
+	r16 [g`(\< b` d] [b` g` b` d] [es c a` )\!fis] |
+	<
+		{\voiceone g2.-\fermata\mf}
+		{\voicetwo <b`2. d>}
+	>
+	\onevoice
+	\bar "|.";
+}
+
+two = \melodic{
+	\clef bass;
+	% c4 r [g8-.(\ped )es-.\*] |
+	c4 r [g8-.( )es-.] |
+	c4 r [g8-.( )es-.] |
+	c4 r [as8-.( )f-.] |
+
+	c4 r [as8-.( )f-.] |
+	c4 r [as8-.( )f-.] |
+	c4 r [as8-.( )f-.] |
+
+	c4-- r [es8 c] |
+	bes`!4-- r [es8 c] |
+	as`!4-- r [es8 c] |
+
+	g`4-- r [es8 c] |
+	fis`4-- r [es8 c] |
+	fis`4 r [fis8 d] |
+
+	g`4 r [d8 bes`] |
+	g`4 r [bes`8 g`] |
+	es`4 r [g8 es] |
+
+	c4 r [c8 a`] |
+	d`4 r [d8 a`] |
+	d`4 r [d8 a`] |
+	d`4 r [d8 bes`] |
+
+
+	d`4 r [es8 c] |
+	d`4 r [g8 d] |
+	d`4 r [a8 fis] |
+
+	d`4 r [g8 es] |
+	d`4 r [fis8 d] |
+	d`4 r [e8 cis] |
+	d`4 r [es8 c] |
+
+	d`4 r [d8 a`] |
+	d`4 r [cis8 bes`] |
+	d`4 r [c!8 a`] |
+
+	d`4 r [bes`8 g`] |
+	d`4 r [es8 c] |
+	d`4 r [d8 a] |
+
+	g`4 r [es8 c] |
+	g`4 r [d8 b`] |
+	g`4 r [es8 c] |
+	
+	g`4 r [es8 c] |
+	g`4 r [g8 d] |
+	g`4 r [as8 f] |
+	g`4 r [es8 c] |
+
+	g`4 r [es8 c] |
+	g`4 r [es8 c] |
+	g`4 r r |
+	g`2._\fermata 
+	\bar "|.";
+}
+
+global  = \melodic{
+	\meter 3/4;
+	\key es;
+}
+
+treble_staff = \type Staff = treble <
+	\global
+	\one
+>
+
+bass_staff = \type Staff = bass <
+% bass = Staff <
+	\clef "bass";
+	\global
+	\two
+>
+
+grand_staff = \type GrandStaff <
+	\treble_staff
+	\bass_staff
+>
+
+a4 = \paper{
+	linewidth= 193.\mm;
+}
+
+\score{
+	% Semplice e non troppo legato
+	\grand_staff
+	\paper{ \a4 }
+	\midi{ \tempo 4 = 100; }
+}
diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
new file mode 100644
index 0000000000..66e95430a0
--- /dev/null
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
@@ -0,0 +1,207 @@
+\header{
+filename =	 "preludes-4.ly";
+title =	 "4";
+opus = "BWV 925";
+% piece = "\\numfont 4";
+piece = "4";
+% blz 8
+% Clavierb"uchlein f"ur W. Fr. Bach
+% Clav. W. Fr. Bach: 27-Praeludium ex d neutral
+% ca 1720
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "public domain";
+}
+\version "1.0.0";
+
+one = \melodic\relative c{
+	\property Voice . textstyle =  "italic"
+	r16\p_"legato" 
+	\property Voice . textstyle =  "finger"
+	[d'-1( fis-3 d-1] [a'-2 b-3 cis-4 a-3]
+	[d-3 cis-2 d-1 e-2] [d-1 fis-3 e-2 d-1] |
+	\property Voice . textstyle =  "finger"
+	\stemup  
+	)cis4-2 fis-5 ~ [fis8 fis-4] e4-3 ~ | 
+	e16\< \stemboth [a,16( cis a] [d-2 e fis d-1]
+	[g-3 fis g a-4] [g-3 b a \!g] |
+	\stemup
+	)fis4-"2\\_3" [e8-2 a-5] <fis4-4 d-2> <gis-5 e-3> |
+	%5
+	<a4-5( e> <fis-4 d-2> <[)g!16-5 d> fis-2 g-3 a-4] 
+	\stemboth
+	[g-3 b a g] |
+	\property Voice . textstyle =  "italic"
+	[fis_"dim." e fis-3 g] [fis-3 a-5 g fis]
+	\property Voice . textstyle =  "finger"
+	e4-"2\\_5" ~ e16 [e,( fis g ] |
+	\property Voice . textstyle =  "italic"
+	[a-4_"dim." g-1 a b] [a-2 c-4 b a]
+	[g-1 fis-2 g-3 a] [g-3 b a g] |
+	\stemup
+	)fis4\p 
+	\skip 4*7; |
+	%10
+	\property Voice . textstyle =  "finger"
+	d'4.\mf cis8-"4\\_5" ~ cis b4-5 a8-"4\\_5" ~ |
+	\property Voice . textstyle =  "italic"
+	a g4-5 fis8-4 ~ [fis16 fis-4-"dim." e-3 d-2] 
+	\property Voice . textstyle =  "finger"
+	e4-"3\\_5" ~ |
+	[e16 e-5 d cis] d4-5 ~ [d16 d-5 cis b] cis4-5 |
+	\stemboth
+	[fis,16-1\p a-2 d-5\< c-4] [b-1 d-2 g-5 fis-4]
+	[d-1 b'-5 a g] [fis-2 e-1 d-4 \!c!-3] |
+	[b-2 d-1 g a] [fis8-\prall e16-4 d-3]
+	[d8. e16~] [e d8 cis16] |
+	%15
+	\stemup
+	r16 [d-1\< fis d] [g a b g-1] [c-3 b c d] [c e d-4 \!c] |
+	b4-5 a ~ [a8 g-5 ~] [g16 fis8-4 e16-3] |
+	[fis8-4 e-5~] [e d-5~] d4 cis-4 |
+	d2\p-"rall." ~ [d16 a-2( b-3 cis-4] )d4-5 |
+	\bar "|.";
+}
+
+two = \melodic\relative c{
+	\property Voice . textstyle =  "finger"
+	fis4-1( e8-2 a4 a4 gis8-2 | 
+	) a8
+	\translator Staff=treble \stemdown
+	a'4 a8 b4.-"2\\_1" cis8 ~ | 
+	cis8
+	\translator Staff=bass \stemup
+	a,8 ~ [a d] ~ d d4-> cis8 | 
+	d8
+	\translator Staff=treble \stemdown
+	d'4-> cis8-1 ~ cis b4-1 b8 |
+	%5
+	r8 a4 a8
+	\translator Staff=bass \stemup
+	[g8-1( fis-2] )e4-1 ~ | 
+	e4 d ~ [d16 d-1 cis-2 b-1] cis4-2 ~ |
+	[cis8 a-3] d4.-1 d4^> cis8-2 |
+	\translator Staff=treble \stemdown
+	d4 \stemboth r16 [b-1\< d-2 b~] <g'4-5 e-3 b>
+	r16 [cis,-1 e-2 \!cis~] |
+	<a'4-5 fis-3 cis> r16 [d,-1 fis-2 d~] <b'4-5 g-3 d>
+	r16 [fis-1 a fis~] |
+	%10
+	\stemdown
+	fis4 e d cis |
+	b a b4. b8 |
+	a4
+	\translator Staff=bass \stemup
+	r16 [b-3 fis-1 a-2] g4-1 r16 [a-3 e-1 g-2] |
+	\skip 1*1; 
+	s16
+	\translator Staff=treble \stemdown
+	d'8.-1 ~ [d8 c] d4 [a8 g] |
+	%15
+	\translator Staff=bass \stemup
+	[fis'8 c-1] b4-1 \stemdown <a
+	\translator Staff=treble \stemdown
+	a'4.-2>
+	\stemdown
+	a'8~ |
+	[a g-3~] [g16 e fis8~] [fis16 d8.~] [d8. cis!16] |
+	\translator Staff=bass \stemup
+	<
+	%	{ \voiceone  [d,8-2 a~] a4 }
+		{ \voiceone  [d8-2 a~] a4 }
+	%	{ \voicethree  [a,8-1 g] [fis16-2 e-1 fis-2 d-1] }
+		{ \voicethree  [a8-1 g] [fis16-2 e-1 fis-2 d-1] }
+	>
+	\voiceone 
+	[g-1 fis-2 g-1 a-2] [g-1 b-3 a-2 g-1 ~] |
+	[g g-1 fis-2 e-1] fis4-2 ~ fis2
+	\bar "|.";
+}
+
+three = \melodic\relative c{
+%	\stemdown 
+	d4-3 c-4 b e-3 |
+	a16 [a,-5\mf( cis-3 a-5] [d-2 e-1 fis-2 d-4]
+	[g-1 fis-3 g a] [g b a g] |
+	)fis4 fis e a-4 |
+	d16 \stemboth [d,-5\f( fis-3 d-5] [a'-2 b-1 cis-2 a-4]
+	[d-1 cis-3 d e] [d-4 fis-2 e-1 ) d] |
+	%5
+	[cis-3 b-4 cis-3 d-2] [c-4 e-2 d-3 c-4] 
+	\stemdown b4-5 [cis8-4 b-3(] |
+	[a-4 )fis-5 b-2 a-3] [gis-4 e-5 a-3 g-4] |
+	fis4. d8-5 e4-5 a4-3 |
+	\stemboth
+	r16 [d,-4( fis-2 d-4] [)g8-.-1 g,-.-5]
+	r16 [e'-4( g-2 e-4] [)a8-. a,-.-5] |
+	r16 [fis'-4( a fis] [)b8-. b,-.] r16 [g'-4( b g] [)d'8-. d,-.] |
+	%10
+	r16 [d,16-5( fis-3 d] [a'-2 b-1 cis-2 a-4] [d b-5 d-3 b]
+	[fis'-2 g a-2 fis-4] |
+	)fis16 [g,( b g] [d'-2 e fis-2 d-4] [)g8-. g,-.] r16 [cis-4( e cis] |
+	[)fis8-. fis,-.] \stemdown r16 [b-4( d b] [)e8-. e,-.] 
+	r16 [a-4 cis a] |
+	\stemboth
+	[d-1 e-3 fis-2 d-4] [g-1 fis-2 e-3 d-1] [cis!-3 a-5 b cis]
+	[d-2 e fis-2 d-4] |
+	[g8 e-3] \stemdown [a a,] [b8.-4 g16-5] a4-4 |
+	%15
+	[d8-5 a'-2~] [a g-3~] [g g-3] fis4-4 |
+	\stemup
+	r16 [g-2 b-1 g-3] [d'8.-1 c16-1] [b8.-2 bes16-3] [a8-1 g] |
+	\stemdown
+	r16 [a,-2 cis!-1 a'-2] [d,-1 e fis d] [e8-1 d-2] [e-1 a,-2] |
+	[d a-2~] [a16 a-2 b cis-2] d2 |
+}
+
+four = \melodic\relative c{
+	\skip 1*9;
+%	\stemup 
+%	\property Voice.hshift = 1 
+	%10
+	a''2 fis |
+	d s |
+%	\property Voice.hshift = 0 
+	\skip 1*2; |
+	s4
+	\translator Staff=bass \stemup
+	a4 ~ [a16 d,-2 g8-1] [fis e-1] |
+	%15
+	\stemdown
+	d1 ~ | 
+	d ~ | 
+	d, ~
+	d2 d2
+}
+
+global  = \melodic{
+	\time 4/4;
+	\key D;
+}
+
+treble_staff = \type Staff = treble <
+	\global
+	{ \voiceone \one }
+	{ \voicefour \four }
+>
+
+bass_staff = \type Staff = bass <
+% bass = Staff <
+	\clef "bass";
+	\global
+%	{ \voiceone \two }
+	{ \type Voice = bone \skip 1*0; \property Voice.ydirection = \up \two }
+	{ \voicetwo \three }
+>
+
+grand_staff = \type GrandStaff <
+	\treble_staff
+	\bass_staff
+>
+
+\score{
+        % Allegretto
+	\grand_staff	
+	\include "preludes-paper.ly";
+	\midi{ \tempo 4 = 70; }
+}
diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
new file mode 100644
index 0000000000..5a2d50f848
--- /dev/null
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
@@ -0,0 +1,225 @@
+\header{
+filename =	 "preludes-5.ly";
+title =	 "5";
+% piece = "\\numfont 5";
+piece = "5";
+opus = "BWV 926";
+% blz 2
+% Clavierb"uchlein f"ur W. Fr. Bach
+% Clav. W. Fr. Bach: 4-Praeludium 2
+% ca 1720
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "public domain";
+}
+\version "1.0.0";
+
+
+one = \melodic\relative c{
+	\property Voice . textstyle =  "italic"
+	[d'8-1\p a'-5-"legato" f-3 d-1 a'-5 f-3] |
+	[d-1 a'-5 f-3 d-1 a'-5 f-3] |
+	[d-1\< bes'-4 g-2 d-1 bes'-4 \!g-2] |
+	[d-1 bes'-4 g-2 d-1 bes'-5 g-3] |
+	%5
+	[cis,-1\mf g'-4 e-2 cis-1 g'-4 e-2] |
+	[cis-1 bes'-5 g-4 e-2 a-5 g-4] |
+	[f-3\< d-1 f-2 a-4 f-1 a-2] |
+	[d-5 a-1 d-2 f-4 d-1 \!f-2] |
+	[b\> f-3 e d c-3 b] |
+	%10
+	[a gis-3 fis e d'-5 \!b-2] |
+	< 
+		{
+			\voiceone 
+			\property Voice . textstyle =  "roman"
+			c4-\mordent^"(\\textsharp)"\p r r |
+			c4-\mordent^"(\\textsharp)" r r
+			\property Voice . textstyle =  "italic"
+		}
+		{ \voicetwo  a4 r r | a4 r r }
+	> |
+	\onevoice 
+	[a'8\mf( es-3\> d c bes!-3 a] |
+	[g fis-3 e!-2 d-1 c'-4 \!a] |
+	%15
+	[)bes8-\mordent\p( d8-5 bes-3 g-1] )g'4 |
+	r8 [d-5( c bes a-\prall g] |
+	[)a-2 c-4( a f] ) f'4 |
+	r8 [c-5 bes a g-\prall f] |
+	[g-2 bes-4 a g f-1 e-2] |
+	%20
+	[f-3 d-1 f-2 a-3 d-5 g,-2] |
+	< 
+		{ 
+			\voiceone 
+			% ... textnatural
+			[cis8-\prall e8-5-"poco cresc." cis-3 a e' cis]
+		}
+		{ \voicetwo  a4 }
+	>
+	\onevoice 
+	[a8 e'-5 cis a bes!-3 a] |
+	[g e'-5 cis-3 g e'-5 cis-3] |
+	[g-1 e'-5 cis g a-3 g] |
+	[f-"dim." d'-5 bes f d' bes] |
+	%25
+	[f d'-5 bes f d' bes] |
+	[fis-2-"dim." c'-5 a-3 fis-2 c'-5 a-3] |
+	[fis-2 c'-5 a-3 fis-2 c'-5 a-3] |
+	[bes-4 g-1 fis-2 g-3 d-1 g-2] |
+	[bes-4 g-2 d-1 bes'-5 g-3 d-1] |
+	%30
+	[e-2\p g-4 fis-3 g-1 bes-4 g-2] |
+	[es-1 bes'-4 g-2 es bes' g] |
+	[cis,-1 bes'-4 g-2 cis, bes' g] |
+	[cis,-1 bes'-4 g-2 cis,-1 a'-5 g-4] |
+	[f-3 a f d a'-5 f] |
+	%35
+	[d-1 a'-5 f-3 d-1 cis-2 d-1] |
+	[e-3\< g-5 e-3 bes-1 g'-5 e-3] |
+	[bes-1 g'-5 e-3 \!cis-2 a-1 g'-5] |
+	[f16-4\mf d-2 c-1 bes-3] \stemup a-2 s16 s8 s4 |
+% ugh
+%	s1 |
+	s4 s4 s4 |
+	%40
+	s4 s16 [d16-1-"m.d." f-2 a-4] \stemdown [d,-2-"m.g." f a] \stemup d-1 |
+	\stemboth
+	[f a-4 f d] [f-4 d b d-5] [gis-2 b a gis,] |
+	<g'!4.-5\f e a,> a8-5 
+	<
+		{
+			\voiceone 
+			f4-4\> ~ | \![f8 e] [e32-4 f e8. ~] [e8 d-3]
+		}
+		{ \voicetwo  <d4 a> r4 cis-2 }
+	> |
+	\onevoice 
+	[d8-4 c!-3 a-1 d-4 bes-2 g-1] |
+	%45
+	[c-5 a-3 fis-2 bes-4 g e ] |
+	[a-5 fis-"dim. e rall." d g-5 e cis-2] |
+	<
+		{ \voiceone  <fis2-.-5\p a,> }
+		{ \voicetwo  [d32( cis d8. ~] ) d2 }
+	> |
+	\bar "|.";
+}
+
+
+two = \melodic\relative c{
+	\clef "bass";
+%	[d32( cis )d8.] r4 r |
+	d4-\mordent r r |
+	d,4 r r |
+	d'-\mordent r r |
+	d,4 r r |
+	d'-\mordent r r |
+%	d r r |
+	d,4 r r |
+	[d'8-2 a-5 d-2 f-1 d-4 f-2] |
+	[a-1 f-4 a-2 d-1 a-2 d-1] |
+	gis,4-3 r r |
+	e-4( )gis-2 e |
+	[a8-4 e'-1 c-2 a-4 e'-1 c-2 ] |
+	[g!-5 es'-1 c-1 g-5 es'-1 c-1 ] |
+	fis,4-5 r r 
+	d-4( ) fis d-5 |
+	\property Voice . textstyle =  "roman"
+	g4-\mordent^"(\\textsharp)" r r8 f!8 |
+	\property Voice . textstyle =  "italic"
+	e4-\prall r r |
+	f4-\mordent r r8 e |
+	d4 r8 [f-1 e d] |
+	[e-2 d-3 cis-4 e-1 d-2 cis-3] |
+	d4-2( )c! bes-4 |
+	a( )a' a, |
+	a( )a' a, |
+	a( )a' a, |
+	a( )a' a, |
+	bes r r |
+	bes-5( )bes' bes, |
+	a r r |
+	a-2( )d-1 d, |
+	g r r |
+	g( )g' g, |
+	g r r |
+	g( )g' g, |
+	a r r |
+	a( )a' a, |
+	a r r |
+	a( )a' a, |
+	cis, r r |
+	cis( )cis' cis, |
+	d-4 s16
+	\stemdown
+	[g'16-1-"m.g." f e] [f-2 a d,-3 f] | 
+	a,
+	\stemup
+	[d-5-"m.d." c bes] a 
+	\stemdown [g-2 f-"m.g." e] [d f-4 a-2 d-1] |
+	\stemup
+%	[f-2\ped a]
+	[f-2-"Ped." a]
+	\stemdown
+%	[d-4-"m.g." f-"cresc."] a s s8 s4\dep |
+	[d,-4-"m.g." f-"cresc."] a s s8 s4-"*" |
+	\stemboth
+% ugh whole rest has duration of one bar
+%	r1 |
+	r4 r r |
+%{
+  	ugh forget the 8 below:
+	[cis-3( e cis a] [d16-1 c bes a] |
+	and lily dumps koor
+lilypond: ../flower/include/varray.hh:116: struct Rhythmic_grouping *& Array<Rhythmic_grouping *>::elem(int) const: Assertion `i >=0&&i<size_ failed.
+Aborted (core dumped)
+%}
+	[cis,8-3( e cis a] [d16-1 c bes a] |
+	[)g8 g' a-2( g-3 a-1 a,] |
+	)d4-3 d'-1 d, |
+	d r r |
+	d,( )d' d, |
+	d2. |
+	\bar "|.";
+}
+
+global = \melodic{
+	\time 3/4;
+	\key F;
+}
+
+treble_staff = \type Staff = treble <
+	\global
+	\one
+>
+
+bass_staff = \type Staff = bass <
+% bass = Staff <
+	\clef "bass";
+	\global
+	\two
+>
+
+grand_staff = \type GrandStaff <
+	\treble_staff
+	\bass_staff
+>
+
+widea4 = \paper {
+	\paper_twenty
+%	arithmetic_basicspace = 2.;
+%	arithmetic_multiplier = 6.\pt;
+	arithmetic_basicspace = 2.;
+	arithmetic_multiplier = 8.\pt;
+	linewidth= 193.\mm;
+}
+
+\score{
+        % Moderato
+	\grand_staff
+	\paper{ \widea4 }
+	\midi{ \tempo 4 = 90; }
+}
+
diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
new file mode 100644
index 0000000000..feb7345d31
--- /dev/null
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
@@ -0,0 +1,133 @@
+\header{
+filename =	 "preludes-6.ly";
+title =	 "6";
+% piece = "\\numfont 6";
+piece = "6";
+opus = "BWV 940";
+% blz 11
+% Six Petits Preludes
+% Collection Johann Peter Kellner
+% ca 1703 - 1707
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "public domain";
+}
+\version "1.0.0";
+
+
+one = \melodic\relative c{
+	\skip 1; |
+	\stemup
+	r4 d''2-5( cis4-4 |
+	\stemboth
+	[)d16-5\mf a'-4( g f] [e f-4 cis-2 d-1] 
+	[e8.-\mordent f16] [d8.-\prall-1 cis16-3] |
+	\stemup
+	)cis4\> ~ [cis16 a \!d8 ~] d4 c-5 |
+	%5
+	b2-4 ~ b4 a-5 ~ |
+	[a16 a-5 \stemup g! f] g4-4\< ~ g f-3 ~ |
+	[\!f16 a g f] [e16 g8.-5 ~] [g16 g-5 f-4 e-3] [d-1 f8.-4 ~] |
+	[f16 f-3 e d] b'4 a-5 g-5 |
+	fis4-4 g r8\<-"rall." [g16-1( bes-2] \!e4-5 |
+	%10
+	\!)d1-5
+	\bar "|.";
+}
+
+two = \melodic\relative c{
+	r16\p [d''-5( c-4 bes-3] [a-2 bes-3 f-1 g-2] 
+	[a8.-\mordent bes16-1] [g8.-\prall f16-1] |
+	\stemdown
+	)f2 e2 |
+	\translator Staff=bass \stemup
+	r4 a,-1 bes-2 b-1 |
+	\translator Staff=treble \stemdown
+	r16 [b'-3 a-1 g-2] [f8. f16-2] e2 ~ |
+	%5
+	e2 ~ e4 ~ [e16 e-2 f! d-1] |
+	s4 [e32 d e8.~] e4 d4 ~ |
+	d4. [cis16-2 d-1] cis4 d-1 ~ |
+	d8 r r16 [e-2 f d] r16 [e-2 f d] r [d-1 e-3 cis] |
+	r16 [e-3 d-1 c!-2] [bes! d8.] s4 r16\> [bes'-2 a-2 \!g-1] |
+	%10
+	fis1-2
+}
+
+three = \melodic\relative c{
+	\stemup
+	f2-1( e-2 |
+	\stemboth
+	[)d16 d'( c bes] [a-4 bes-2 f-5 g-4] 
+	[a8.-\mordent bes16-2]
+	[g8.-\prall-4 f16-5] |
+	)f2-5 g4-4 gis |
+	a2-2 ~ [a16 a-1( g f] [e-4 f-2 c-5 d] |
+	%5
+	[e8.-\mordent f16] [d8.-\prall-4 c16-5] \stemboth )c4.-5 d8-4 |
+	\stemdown
+	e4 ~ [e16 f-2( e-3 d-4] [cis a b cis-3] [d-4 e-3 f-2 d-4] |
+	\property Voice . textstyle =  "finger"
+	)bes!2-"5\\_4" a ~ |
+	a a |
+	d, cis'-5 |
+	%10
+	a'1-2
+	\bar "|.";
+}
+
+four = \melodic\relative c{
+	\stemdown 
+	d2-3 cis-4 |
+	\skip 1*3; |
+	%5
+	\translator Staff=treble \stemup \property Voice.hshift = 1 
+	a'4 gis-2 ~ [gis16 gis-3 fis e]
+	\skip 4*1;
+	\translator Staff=bass \stemdown \property Voice.hshift = 0 
+	\stemup
+	b2-1 a-1 |
+	g a4. [gis16 a] |
+	gis2 <[g8 cis,> <f-3 d-1]> e4-2 |
+	d4. [fis16-3 g-2] r16 bes8.-1 ~ bes4 |
+	%10
+	\stemdown
+	d,1-5
+}
+
+global = \melodic{
+	\time 4/4;
+	\key F;
+}
+
+
+treble_staff = \type Staff = treble <
+	\global
+	\one
+	\two
+>
+
+bass_staff = \type Staff = bass <
+% bass = Staff <
+	\clef "bass";
+	\global
+	\three
+	\four
+>
+
+grand_staff = \type GrandStaff <
+	\treble_staff
+	\bass_staff
+>
+
+a4 = \paper{
+	linewidth = 193.\mm;
+}
+
+\score{
+        % Allegretto
+	\grand_staff
+	\paper{ \a4 }
+	\midi{ \tempo 4 = 40; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly
new file mode 100644
index 0000000000..e8fbc3bda3
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly
@@ -0,0 +1,49 @@
+\header{
+filename =	 "allemande-alto.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Allemande";
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "allemande-urtext.ly";
+
+allemande_alto_global = \melodic{
+	\time 4/4;
+	\key f;
+	\partial 16;
+	\clef alto;
+	\skip 1*11;
+	s2. s8.
+	\bar ":|:";
+	\skip 1*11;
+	s2. s4 s8
+	\bar ":|";
+}
+
+allemande_alto_scripts = \melodic{
+}
+
+allemande_alto_staff = \type Staff <
+	\melodic \transpose c'' \$allemande
+	\$allemande_alto_global
+	\$allemande_alto_scripts
+>
+
+\score{
+	\$allemande_alto_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 45; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly
new file mode 100644
index 0000000000..114480452c
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly
@@ -0,0 +1,49 @@
+\header{
+filename =	 "allemande-cello.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Allemande";
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "allemande-urtext.ly";
+
+allemande_cello_global = \melodic{
+	\time 4/4;
+	\key f;
+	\partial 16;
+	\clef bass;
+	\skip 1*11;
+	s2. s8.
+	\bar ":|:";
+	\skip 1*11;
+	s2. s4 s8
+	\bar ":|";
+}
+
+allemande_cello_scripts = \melodic{
+}
+
+allemande_cello_staff = \type Staff <
+	\$allemande
+	\$allemande_cello_global
+	\$allemande_cello_scripts
+>
+
+\score{
+	\$allemande_cello_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 45; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly
new file mode 100644
index 0000000000..8e7f0970be
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly
@@ -0,0 +1,49 @@
+\header{
+filename =	 "courante-alto.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Courante";
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "courante-urtext.ly";
+
+courante_alto_global = \melodic{
+	\time 3/4;
+	\key f;
+	\partial 16;
+	\clef alto;
+	\skip 2.*15;
+	s2 s8.
+	\bar ":|:";
+	\skip 2.*15;
+	s2 s8.
+	\bar ":|";
+}
+
+courante_alto_scripts = \melodic{
+}
+
+courante_alto_staff = \type Staff <
+	\melodic \transpose c' \$courante
+	\$courante_alto_global
+	\$courante_alto_scripts
+>
+
+\score{
+	\$courante_alto_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 55; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly
new file mode 100644
index 0000000000..5909c0be7d
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly
@@ -0,0 +1,49 @@
+\header{
+filename =	 "courante-cello.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Courante";
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "courante-urtext.ly";
+
+courante_cello_global = \melodic{
+	\time 3/4;
+	\key f;
+	\partial 16;
+	\clef bass;
+	\skip 2.*15;
+	s2 s8.
+	\bar ":|:";
+	\skip 2.*15;
+	s2 s8.
+	\bar ":|";
+}
+
+courante_cello_scripts = \melodic{
+}
+
+courante_cello_staff = \type Staff <
+	\$courante
+	\$courante_cello_global
+	\$courante_cello_scripts
+>
+
+\score{
+	\$courante_cello_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 55; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly
new file mode 100644
index 0000000000..784dea6b29
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly
@@ -0,0 +1,50 @@
+\header{
+filename =	 "gigue-cello.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Pr\\'elude";		% duh
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "gigue-urtext.ly";
+
+gigue_cello_global = \melodic{
+	\time 3/8;
+	\key f;
+	\clef bass;
+	\partial 8
+	\skip 4.*31;
+	s4
+	\bar ":|:";
+	\skip 4.*44;
+	s4
+	\bar ":|";
+}
+
+gigue_cello_scripts = \melodic{
+}
+
+gigue_cello_staff = \type Staff <
+	\melodic \transpose c' \$gigue
+	\$gigue_cello_global
+	\$gigue_cello_scripts
+>
+
+\score{
+	\$gigue_cello_staff
+	\include "scs-paper.ly";
+%broken
+	\midi{ \tempo 4 = 60; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly
new file mode 100644
index 0000000000..70c72a36f6
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly
@@ -0,0 +1,49 @@
+\header{
+filename =	 "gigue-cello.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Pr\\'elude";		% duh
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "gigue-urtext.ly";
+
+gigue_cello_global = \melodic{
+	\time 3/8;
+	\key f;
+	\clef bass;
+	\partial 8;
+	\skip 4.*31;
+	s4
+	\bar ":|:";
+	\skip 4.*44;
+	s4
+	\bar ":|";
+}
+
+gigue_cello_scripts = \melodic{
+}
+
+gigue_cello_staff = \type Staff <
+	\$gigue
+	\$gigue_cello_global
+	\$gigue_cello_scripts
+>
+
+\score{
+	\$gigue_cello_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 60; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly
new file mode 100644
index 0000000000..96ed306a9f
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly
@@ -0,0 +1,95 @@
+\header{
+filename =	 "menuetto-alto.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Menuetto I";
+description =	 "Transcribed for Alto";
+source =	 "?";
+% opus =	 "BWV 1008 no. 5";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "menuetto-urtext.ly";
+
+menuetto_i_alto_global = \melodic{
+	\time 3/4;
+	\key f;
+	\clef alto;
+	\skip 2.*8;
+	\bar ":|:";
+	\clef violin;
+	\skip 2.*1;
+	\slurdotted
+	\skip 2.*3;
+	\clef alto;
+	\skip 2.*11;
+	s2._"Fine"
+	\bar ":|";
+}
+
+menuetto_i_alto_scripts = \melodic{
+	s2.
+	s8^"~"^1_2_4 s8*5
+	s2.*5
+	s4 s-\upbow s-\downbow
+	s2.-\upbow
+	s2.*5
+	s2 s4-\upbow
+	s4-\downbow s2
+	s2.*1
+	s2^0 s4
+	s2.*1
+	s4-\downbow s4-\upbow
+}
+
+menuetto_i_alto_staff = \type Staff <
+	\melodic \transpose c' \$menuetto_i
+	\$menuetto_i_alto_global
+%	\$menuetto_i_alto_scripts
+>
+
+\score{
+	\$menuetto_i_alto_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 110; }
+}
+
+menuetto_ii_alto_global = \melodic{
+	\time 3/4;
+	\key D;
+	\clef alto;
+	\skip 2.*8;
+	\bar ":|:";
+	\skip 2.*1;
+	\slurdotted
+	\skip 2.*14;
+	s2._"Menuetto I da Capo"
+	\bar ":|";
+}
+
+menuetto_ii_alto_staff = \type Staff <
+	\melodic \transpose c' \$menuetto_ii
+	\$menuetto_ii_alto_global
+%	\$menuetto_ii_alto_scripts
+>
+
+\header{
+piece = "Menuetto II";
+opus =	 "";
+}
+\score{
+	\$menuetto_ii_alto_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 130; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
new file mode 100644
index 0000000000..5d5f9c4d0d
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
@@ -0,0 +1,96 @@
+\header{
+filename =	 "menuetto-cello.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Menuetto I";
+source =	 "?";
+% opus =	 "BWV 1008 no. 5";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "menuetto-urtext.ly";
+
+menuetto_i_cello_global = \melodic{
+	\time 3/4;
+	\key f;
+	\clef bass;
+	\skip 2.*8;
+	\bar ":|:";
+	\skip 2.*1;
+	\slurdotted
+	\skip 2.*14;
+	s2._"Fine"
+	\bar ":|";
+}
+
+menuetto_i_cello_scripts = \melodic{
+	s2.
+	s8^"~"^1_2_4 s8 s4 s^4
+	s4^0_1 s_4 s
+	s2.*5
+	s2^3 s4
+	s4 s8_1 s s4
+	s2.
+	s2 s8^4 s
+	s2.
+	s8 s^2 s^4
+	s_2 s s s_0 s_4 s_1
+	s2.*2
+	s4^3_1
+	s^1_3 s4
+	s2.
+	s4_2 s2
+	s8^2_3 s s s^1 s4^1
+}
+
+menuetto_i_cello_staff = \type Staff <
+	\$menuetto_i
+	\$menuetto_i_cello_global
+%	\$menuetto_i_cello_scripts
+>
+
+\score{
+	\$menuetto_i_cello_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 110; }
+}
+
+menuetto_ii_cello_global = \melodic{
+	\time 3/4;
+	\key D;
+	\clef bass;
+	\skip 2.*8;
+	\bar ":|:";
+	\skip 2.*1;
+	\slurdotted
+	\skip 2.*14;
+	s2._"Menuetto I da Capo"
+	\bar ":|";
+}
+
+menuetto_ii_cello_staff = \type Staff <
+	\$menuetto_ii
+	\$menuetto_ii_cello_global
+%	\$menuetto_ii_cello_scripts
+>
+
+\header{
+piece = "Menuetto II";
+opus =	 "";
+}
+\score{
+	\$menuetto_ii_cello_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 130; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly
new file mode 100644
index 0000000000..2219165c5e
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly
@@ -0,0 +1,44 @@
+\header{
+filename =	 "prelude-alto.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Pr\\'elude";		% duh
+opus =	 "BWV 1008";
+% opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "prelude-urtext.ly";
+
+prelude_alto_global = \melodic{
+	\time 3/4;
+	\key f;
+	\clef alto;
+	\skip 2.*63;
+	\bar "|.";
+}
+
+prelude_alto_scripts = \melodic{
+}
+
+prelude_alto_staff = \type Staff <
+	\melodic \transpose c' \$prelude
+	\$prelude_alto_global
+	\$prelude_alto_scripts
+>
+
+\score{
+	\$prelude_alto_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 40; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly
new file mode 100644
index 0000000000..d872e5ccb8
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly
@@ -0,0 +1,44 @@
+\header{
+filename =	 "prelude-cello.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Pr\\'elude";		% duh
+opus =	 "BWV 1008";
+% opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "prelude-urtext.ly";
+
+prelude_cello_global = \melodic{
+	\time 3/4;
+	\key f;
+	\clef bass;
+	\skip 2.*63;
+	\bar "|.";
+}
+
+prelude_cello_scripts = \melodic{
+}
+
+prelude_cello_staff = \type Staff <
+	\$prelude
+	\$prelude_cello_global
+	\$prelude_cello_scripts
+>
+
+\score{
+	\$prelude_cello_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 40; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly
new file mode 100644
index 0000000000..b39274e169
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly
@@ -0,0 +1,46 @@
+\header{
+filename =	 "sarabande-alto.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Sarabande";
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "sarabande-urtext.ly";
+
+sarabande_alto_global = \melodic{
+	\time 3/4;
+	\key f;
+	\clef alto;
+	\skip 2.*12;
+	\bar ":|:";
+	\skip 2.*16;
+	\bar ":|";
+}
+
+sarabande_alto_scripts = \melodic{
+}
+
+sarabande_alto_staff = \type Staff <
+	\melodic \transpose c' \$sarabande
+	\$sarabande_alto_global
+	\$sarabande_alto_scripts
+>
+
+\score{
+	\$sarabande_alto_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 40; }
+}
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly
new file mode 100644
index 0000000000..4a8002713e
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly
@@ -0,0 +1,46 @@
+\header{
+filename =	 "sarabande-cello.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Sarabande";
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "sarabande-urtext.ly";
+
+sarabande_cello_global = \melodic{
+	\time 3/4;
+	\key f;
+	\clef bass;
+	\skip 2.*12;
+	\bar ":|:";
+	\skip 2.*16;
+	\bar ":|";
+}
+
+sarabande_cello_scripts = \melodic{
+}
+
+sarabande_cello_staff = \type Staff <
+	\$sarabande
+	\$sarabande_cello_global
+	\$sarabande_cello_scripts
+>
+
+\score{
+	\$sarabande_cello_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 40; }
+}
+
diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly
index 1fab56068f..630abd5978 100644
--- a/mutopia/J.S.Bach/wtk1-fugue1.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue1.ly
@@ -11,197 +11,193 @@ copyright =	 "Public Domain";
 %{
 	
 %}
-\version "0.1.14";
+\version "1.0.0";
 
 
 global = 
-    \melodic {
-         \meter 4/4;                % should be \meter C
-    }
-  
+	\melodic {
+	\time 4/4;                % should be \time C
+	}
+	
 tenor =
-    \melodic {
-        \clef "violin";
-        \octave c';
+	\melodic \relative c' {
+	\clef "violin";
 
-        \stemdown
-        r8 [c8 d e] [f. g32 f] [e8 a] |
-        [d g] ~ [g16 a g f] [e f e d] [c d c b,] |
-        [a,8 fis] g4 ~ [g8 fis16 e] [f8 d] |
-        [g f! e d] c r r g ~ |
+	\stemdown
+	r8 [c8 d e] [f. g32 f] [e8 a] |
+	[d, g] ~ [g16 a g f] [e f e d] [c d c b ] |
+	[a 8 fis'] g4 ~ [g8 fis16 e] [f8 d] |
+	[g f! e d] c r r g' ~ |
 %% 5
-        [g f16 e] f4 ~ [f16 f e8] d4 |
-        [c8 f] r16 [g f e] [f8 d] g4 ~ |
+	[g f16 e] f4 ~ [f16 f e8] d4 |
+	[c8 f] r16 [g f e] [f8 d] g4 ~ |
 	g4 r4 r2 |
 	r1 |
-	r8 [g8 a b] [c'. d'32 c'] [b8 e']
+	r8 [g8 a b] [c . d 32 c ] [b8 e ]
 %% 10
-	[a d'] ~ [d'16 e' d' c'] b8 r8 r d |
-	[e fis] [g. a32 g] [fis8 b e a] ~ |
+	[a, d ] ~ [d 16 e  d  c ] b8 r8 r d, |
+	[e fis] [g. a32 g] [fis8 b e, a] ~ |
 	[a16 b a gis] [fis8 f!] [e d] ~ [d16 e fis gis] |
 	[a gis a b] [gis fis gis a] b8 r8 r4 |
-	r8 [c8 d e] \stemup [f. g32 f] [e8 a] |
+	r8 [c,8 d e] \stemup [f. g32 f] [e8 a] |
 %% 15
-	[d g] ~ [g16 a g f] e8 \stemdown [e fis g] ~ |
+	[d, g] ~ [g16 a g f] e8 \stemdown [e fis g] ~ |
 	[g8 fis] [gis8 a] ~ [a g! a b] |
 	\stemboth
-	[c'. d'32 c'] [b8 e'] [a d'] ~ [d'16 e' d' c'] |
-	[b8 g' cis' d'] [e' cis' d' e' ] |
-	\stemdown a8 r8 r e [fis g] \stemboth [a. b32 a] |
+	[c . d 32 c ] [b8 e ] [a, d ] ~ [d 16 e  d  c ] |
+	[b8 g'  cis,  d ] [e  cis  d  e  ] |
+	\stemdown a,8 r8 r e [fis g] \stemboth [a. b32 a] |
 %% 20
-	[g8 c' fis b] ~ [b16 c' b a] \stemdown [g fis e d] \stemboth |
-	e4 \stemdown d ~ [d16 a g f!] [e g f! a] |
-	g4 ~ [g16 a bes8] c'4 [d'8 g] |
+	[g8 c  fis, b] ~ [b16 c  b a] \stemdown [g fis e d] \stemboth |
+	e4 \stemdown d ~ [d16 a' g f!] [e g f! a] |
+	g4 ~ [g16 a bes8] c 4 [d 8 g,] |
 	\stemboth g4. f8 ~ [f e] d4 |
 	\stemdown e8 a4 g8 ~ [g8 f g a] |
 %% 25
-	[bes8. c'32 b] [a8 d'] [g c'] ~ [c'16 d' c' bes] |
+	[bes8. c 32 b] [a8 d ] [g, c ] ~ [c 16 d  c  bes] |
 	[a bes a g] [f g f e] d4 ~ [d8. g16] |
-	a4 r16 [f'16 d'8] e'2 |
-    }
+	a4 r16 [f' 16 d 8] e 2 |
+	}
 
 
 soprane =
-    \melodic {
-        \octave c';
-        \stemup
-        r1 |
-        r2 r8 [g8 a b] |
-        [c'. d'32 c'] [b8 e'] [a d'] ~ [d'16 e' d' c'] |
-        [b g a b] [c' b c' d'] [e' d' e' fis'] [g'8 b] |
+	\melodic \relative c' {
+
+	\stemup
+	r1 |
+	r2 r8 [g'8 a b] |
+	[c . d 32 c ] [b8 e ] [a, d ] ~ [d 16 e  d  c ] |
+	[b g a b] [c  b c  d ] [e  d  e  fis ] [g 8 b,] |
 %% 5
-	[c' a] [d'16 c' b a] [g8. g16] [f e f g] |
-	[a g a b] c'2 b4 |
-	\octave c'';
+	[c  a] [d 16 c  b a] [g8. g16] [f e f g] |
+	[a g a b] c 2 b4 |
 	r8 [c8 d e] [f. g32 f] [e8 a] |
-	[d g] ~ [g16 a g f] [e8 a] ~ [a16 b a g] |
+	[d, g] ~ [g16 a g f] [e8 a] ~ [a16 b a g] |
 	f2 [e8. fis16] g4 ~
 %% 10
-	g4 fis [g16 f! e d] [c d c b,] |
-	[a,16 c b, a,] g,8 r8 r16 [c16 b, a,] [gis,8 e] |
-	[d c16 b,16] [a, gis, a, b,] [c fis, a, gis,] [b,8 a,16 b,]
-	[c8 f e d] ~ [d c16 b,] [b,8. a,16] |
-	a,4 r4 r2 |
+	g4 fis [g16 f! e d] [c d c b ] |
+	[a 16 c b  a ] g 8 r8 r16 [c16 b  a ] [gis 8 e'] |
+	[d c16 b 16] [a  gis  a  b ] [c fis,  a  gis ] [b 8 a 16 b ]
+	[c8 f e d] ~ [d c16 b ] [b 8. a 16] |
+	a 4 r4 r2 |
 %% 15
-	r2 r8 [g,8 a, b,] |
-	[c8. d32 c] [b,8 c] [d e] [f!. g32 f!] |
-	[e8 a d g] ~ [g16 a g f] [e8 a] |
-	[d8 bes] [a g16 f] [g f g e] [f g g f32 g] |
-	[a16 cis d g] [e8. d16] d8 r8 r4 |
+	r2 r8 [g 8 a  b ] |
+	[c8. d32 c] [b 8 c] [d e] [f!. g32 f!] |
+	[e8 a d, g] ~ [g16 a g f] [e8 a] |
+	[d,8 bes'] [a g16 f] [g f g e] [f g g f32 g] |
+	[a16 cis, d g] [e8. d16] d8 r8 r4 |
 %% 20
-	r2 r4 r8 g, |
-	[a, b,] [c. d32 c] [b,8 e a, d] ~ |
-	[e16 e d c] [b, c d e] [f g a g] [f e d c] |
-	b,4 [c8 d] g, c4 b,8 |
-	c4 [b,8 bes,8] a, d4 c8 |
+	r2 r4 r8 g,  |
+	[a  b ] [c. d32 c] [b 8 e a,  d] ~ |
+	[e16 e d c] [b  c d e] [f g a g] [f e d c] |
+	b 4 [c,8 d] g  c4 b 8 |
+	c4 [b 8 bes 8] a  d4 c8 |
 %% 25
 	[d8 e] f4 ~ [f16 a g f] [e f e d] |
-	c2 r16 [g,32 a, b,!16 c] [d e f8] ~ |
-	[f32 c d e f16 g] [a8. b16] <g2 c'2> |
-    }
+	c2 r16 [g 32 a  b !16 c] [d e f8] ~ |
+	[f32 c d e f16 g] [a8. b16] <g2 c 2> |
+	}
 
 alt =
-    \melodic {
-        \clef "bass";
-        \octave c;
+	\melodic \relative c {
+	\clef "bass";
+
 	
 	\stemup
 	r1 |
 	r |
 	r |
-	r8 [g8 a b] [c'. d'32 c'] [b8 e'] |
+	r8 [g'8 a b] [c . d 32 c ] [b8 e ] |
 %% 5
-	[a d'] ~ [d'16 e' d' c'] [b8 c' ~ c' bes8] |
-	[a d' g c'] r16 [a16 b c'] d'4 |
-	g4 r8 g8 [a b] [c'. d'32 c'] |
-	[b8 e' a d'] ~ [d'16 e' d' c'!] [b!8 e'] ~ |
-	e'4 d'4 [c'16 b c' a] [e' d' c' b] |
+	[a, d ] ~ [d 16 e  d  c ] [b8 c  ~ c  bes8] |
+	[a d  g, c ] r16 [a16 b c ] d 4 |
+	g,4 r8 g8 [a b] [c . d 32 c ] |
+	[b8 e  a, d ] ~ [d 16 e  d  c !] [b!8 e ] ~ |
+	e 4 d 4 [c 16 b c  a] [e'  d  c  b] |
 %% 10
-	[c'16 a b c'] [d' c' b a] g4 r4 |
+	[c 16 a b c ] [d  c  b a] g4 r4 |
 	r1 |
-	r8 [e8 fis gis] [a. b32 a] [gis8 c'] |
-	[fis b] ~ [b16 c' b a] gis8 a4 gis8 |
-	a4 r8 g8 [a b] c'. [d'32 c'] |
+	r8 [e8 fis gis] [a. b32 a] [gis8 c ] |
+	[fis, b] ~ [b16 c  b a] gis8 a4 gis8 |
+	a4 r8 g8 [a b] c . [d 32 c ] |
 %% 15
-	[b8 e' a d'] ~ [d' g] d'4 |
-	[c'8 a] e'4 d'8 r8 r4 |
-	r8 [a8 b cis'] [d'. e'32 d'] [c'!8 f'] |
-	[b8 e'] ~ [e'16 f' e' d'] cis'8 r8 r4 |
-	r8 [a8 b cis'] [d'. e'32 d'] [c'!8 fis'] |
+	[b8 e  a, d ] ~ [d'  g,] d 4 |
+	[c 8 a] e' 4 d 8 r8 r4 |
+	r8 [a8 b cis ] [d . e 32 d ] [c !8 f ] |
+	[b,8 e ] ~ [e 16 f  e  d ] cis 8 r8 r4 |
+	r8 [a8 b cis ] [d . e 32 d ] [c !8 fis ] |
 %% 20
-	[b e'] ~ [e'16 fis' e' d'] c'2 ~ |
-	[c'16 d' c' b] [a g a fis] [g8 b c' d'] |
-	[e'. f'32 e'] [d'8 g'] [c' f'] ~ [f'16 g' f' e'] |
-	d'4 [e'8 d'] ~ [d' g] g4 ~
-	[g8 c d e] [f. g32 f] [e8 a] |
+	[b, e ] ~ [e 16 fis  e  d ] c 2 ~ |
+	[c 16 d  c  b] [a g a fis] [g8 b c  d ] |
+	[e . f 32 e ] [d 8 g ] [c,  f ] ~ [f 16 g  f  e ] |
+	d 4 [e 8 d ] ~ [d  g,] g4 ~
+	[g8 c, d e] [f. g32 f] [e8 a] |
 %% 25
-	[d g] ~ [g16 a g f] [e d e f] [g a bes g] |
-	[a e f g] [a b c' a] b2 |
-	c'1 |
-    }
+	[d, g] ~ [g16 a g f] [e d e f] [g a bes g] |
+	[a e f g] [a b c  a] b2 |
+	c 1 |
+	}
 
 bass =
-    \melodic {
-        \clef "bass";
-        \octave c;
+	\melodic \relative c {
+	\clef "bass";
+
 
 	\stemdown
-        r1 |
+	r1 |
 	r |
 	r |
 	r |
 %% 5
 	r2 r8 [c8 d e] |
-	[f. g32 f] [e8 a] [d g] ~ [g16 a g f] |
-	[e f e d] [c d c b,] [a,8 d a fis] |
-	[g16 a bes g] [cis8 d] a4 e4 |
-	[a16 b c' d'] [c' b a g] c'8 r8 r4 |
+	[f. g32 f] [e8 a] [d, g] ~ [g16 a g f] |
+	[e f e d] [c d c b ] [a' 8 d a fis] |
+	[g16 a bes g] [cis,8 d] a'4 e4 |
+	[a16 b c  d ] [c  b a g] c 8 r8 r4 |
 %% 10
-	r2 r8 [g,8 a, b,] |
-	[c. d32 c] [b,8 e] [a, d] ~ [d16 e d c] |
-	b,8 e4 d8 c f!4 e8 ~ |
+	r2 r8 [g, 8 a  b ] |
+	[c. d32 c] [b 8 e] [a,  d] ~ [d16 e d c] |
+	b 8 e4 d8 c f!4 e8 ~ |
 	e d4 e8 [f! e16 d] e4 |
-	a,4 r4 r2 |
+	a, 4 r4 r2 |
 %% 15
-	r8 [g,8 a, b,] [c. d32 c] [b,8 e] |
-	[a,8 d] ~ [d16 e d c] [b,8 bes, a, g'] |
-	[a,8 fis g e] d4 [e8 f!] |
-	[g8. a32 g] [f8 bes] [e a] ~ [a16 bes a g] |
-	[f e f d] [g8 a] d2 ~ |
+	r8 [g 8 a  b ] [c. d32 c] [b 8 e] |
+	[a, 8 d] ~ [d16 e d c] [b 8 bes  a  g'' ] |
+	[a,, 8 fis' g e] d4 [e8 f!] |
+	[g8. a32 g] [f8 bes] [e, a] ~ [a16 bes a g] |
+	[f e f d] [g8 a] d,2 ~ |
 %% 20
-	[d16 e d c] [b, a, g, fis,] [e,8 e fis g] ~ |
+	[d16 e d c] [b  a  g  fis ] [e' 8 e fis g] ~ |
 	[g a16 g16] [fis8 d] g2 ~ |
-	g2 a4 [b8 c'] |
-	[f16 a g f] [e d c b,] [c d e f] [g8 g,] |
+	g2 a4 [b8 c ] |
+	[f,16 a g f] [e d c b ] [c d e f] [g8 g, ] |
 	c1 ~ |
 %% 25
 	c1 ~ |
 	c1 ~ |
 	c1 |
-    }
+	}
 
-        
+	
 \score {
-    \melodic \type Grand_staff < 
-  	         \multi 2 <
-                       \global 
-                       \soprane
-                       \tenor
-                 >
-                 \multi 2 <
-                       \global
-                       \alt
-		       \bass
-                 >
-             >
+	\melodic \type GrandStaff < 
+		\type Staff = one <
+			\global 
+			\soprane
+			\tenor
+		>
+		\type Staff = two <
+			\global
+			\alt
+			\bass
+		>
+	>
 
-    \paper{
+	\paper{
 	gourlay_maxmeasures =5.;
-%	castingalgorithme = \Wordwrap
-    }
-    \midi {
-        \tempo 4 = 84;
-    }
+	castingalgorithme = \Wordwrap
+	}
+%	\midi { \tempo 4 = 84; }
 }
 
 % EOF
diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly
index aa4418b718..1cc7e167be 100644
--- a/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -13,160 +13,157 @@
  Tested Features: stem direction, multivoice, forced accidentals.
 %}
 
-\version "0.1.14";
+\version "1.0.0";
 
 \include "nederlands.ly"                 % for correct parsing of note names
 
 global = \melodic {
-  \meter 4/4;
-  \key bes es as;
+  \time 4/4;
+  \accidentals bes es as;
   \skip 1*31;
   \bar "|."; |
 }
   
-dux = \melodic {
+dux = \melodic \relative c'' {
   \clef violin;
-  \octave c';
 
   \stemdown
-  r8 [c'16 b] [c'8 g] [as c'16 b] [c'8 d'] |
-  [g c'16 b] [c'8 d'] [f16 g] as4 [g16 f] |
-  [es c' b a] [g f! es d] [c8 es' d' c'] |
-  [bes a bes c'] [fis g a fis] |
-%% 5
-  g4 r16 [c d es] [f g as8~] [as16 d es f] |
-  [g a bes8] ~ [bes16 es f g] [as g f es] [d8 c'16 b!] |
+  r8 [c16 b] [c8 g] [as c16 b] [c8 d ] |
+  [g, c16 b] [c8 d ] [f,16 g] as4 [g16 f] |
+  [es c'  b a] [g f! es d] [c8 es'  d  c ] |
+  [bes a bes c ] [fis, g a fis] |
+%%5
+  g4 r16 [c, d es] [f g as8~] [as16 d, es f] |
+  [g a bes8] ~ [bes16 es, f g] [as g f es] [d8 c'16 b!] |
                                                     % forced accident!
-  c'4 r4 r8 [f' es' d'] |
+  c4 r4 r8 [f  es  d ] |
   r8 [as g f] [g f16 es] [f8 d] | 
-  g4 r8 b [c' c'16 b] [c'8 g] |
-%% 10   
+  g4 r8 b [c  c16 b] [c8 g] |
+%%10   
   as4 r8 a [bes bes16 a] [bes8 f] |
   g4 r8 g [as as g f] |
-  \translator Staff = bass \stemup \octave c;
-   r8 [as bes c'] r8 [as16 g] [as8 f8] |
-  [bes8 c' bes as] [bes g f es] |
-  [f des' c' bes] [c' as g f] |
-%% 15
+  \translator Staff = bass \stemup 
+   r8 [as, bes c ] r8 [as16 g] [as8 f8] |
+  [bes8 c  bes as] [bes g f es] |
+  [f des'  c  bes] [c  as g f] |
+%%15
   g8
-   \translator Staff = treble \stemdown \octave c';
-   [g16 fis] [g8 c] [es g16 fis!] [g8 a] |
-  [d g16 fis] [g8 a!] [c16 d] es4 [d16 c] |         % forced accident!
-  bes,8 r8 r16 [d e fis] [g a bes8] ~ [bes16 e f g] |
-  [a bes c'8] ~ [c'16 fis16 g a] [bes8 es!16 d] [es8 g,] |
-  [as, f16 es] [f8 a,8] [bes, g16 f] [g8 b,] |
-%% 20
-  [c16 f es d] [c Bes! As G] [F8 as g f] |
-  [es d es f] [B c d B] |
+   \translator Staff = treble \stemdown
+   [g'16 fis] [g8 c,] [es g16 fis!] [g8 a] |
+  [d, g16 fis] [g8 a!] [c,16 d] es4 [d16 c] |         % forced accident!
+  bes8 r8 r16 [d e fis] [g a bes8] ~ [bes16 e, f g] |
+  [a bes c8] ~ [c16 fis,16 g a] [bes8 es,!16 d] [es8 g, ] |
+  [as  f'16 es] [f8 a,8] [bes  g'16 f] [g8 b, ] |
+%%20
+  [c16 f es d] [c bes! as g] [f8 as' g f] |
+  [es d es f] [b, c d b] |
   c4 r8 e8 [f f16 e] [f8 c] |
-  d4 r8 d8 [es8 es16 d] [es8 Bes] |
+  d4 r8 d8 [es8 es16 d] [es8 bes] |
   c2 ~ [c8 d16 es] [f es f d] |
-%% 25
-  B8 r8 r B c r r es |
+%%25
+  b8 r8 r b c r r es |
   d r r f ~ f r r f |
   [es as g f] [es d es f] |
-  [B c d B] [B c] r c |
-  [f16 d es c] ~ [c8 B] c4 r8 e |
-%% 30
+  [b, c d b] [b c] r c |
+  [f16 d es c] ~ [c8 b] c4 r8 e |
+%%30
   f4 r8 f [f es16 d] [es8 <f as]> |
-  <B d> r <B d> r <G2 c> |
+  <b, d> r <b d> r <g2 c> |
 }
 
 
-comes = \melodic {
-  \octave c'';
+comes = \melodic \relative c''  {
   \stemup
 
   r1 |
   r1 |
-  r8 [g16 fis] [g8 c] [es g16 fis] [g8 a] |
-  [d8 g16 fis] [g8 a] [c16 d] es4 [d16 c] |
-%% 5
-  [bes,8 es16 d] [es8 g,8] [as, f16 es] [f8 a,] 
-  [bes,8 g16 f] [g8 b,] [c8 d16 es] f4 ~ |
-  [f8 es16 d] [c16 bes,! as, g,] [f,8 as g f] 
-  [es d es f] [b, c d b,] |
-  [c g16 fis] [g8 d] es4 r8 e8 |
-%% 10 
+  r8 [g'16 fis] [g8 c,] [es g16 fis] [g8 a] |
+  [d,8 g16 fis] [g8 a] [c,16 d] es4 [d16 c] |
+%%5
+  [bes8 es16 d] [es8 g,8] [as  f'16 es] [f8 a, ] 
+  [bes8 g'16 f] [g8 b, ] [c8 d16 es] f4 ~ |
+  [f8 es16 d] [c16 bes ! as  g ] [f8 as' g f] 
+  [es d es f] [b,  c d b ] |
+  [c g'16 fis] [g8 d] es4 r8 e8 |
+%%10 
   [f f16 e] [f8 c8] d4 r8 d |
-  [es8 es16 d] [es8 bes,] [c es16 d] [es8 f] |
-  \stemboth [bes, es16 d] [es8 f] [as,16 bes,] c4 [bes,16 as,] |
-  [G16 Es F G] [As Bes c d] [es d c d] [es f g a] |
-  [bes F G As] [Bes c d e] [f es d es] [ f g a b] |
-%% 15
-  \stemup [c'8 b16 a] [g f! es d] [c8 es d c] |
-  [Bes A Bes c] [Fis! G A Fis] |                    % forced accident
-  [G8 d16 c] d8 r8 r8 [e16 d] e8 r8 |
-  r [fis16 e] fis8 r r [G16 F] G8 r8 |
-  r8 [A16 G] A8 r r [B16 A] B8 r |
-%% 20
-  r8 [c16 b,] [c8 g,] [As c16 b,] [c8 d] |
-  [G c16 B] [c8 d] [F16 G] As4 [G16 F] |
-  [Es8 c16 B] [c8 G] As4 r8 A |
-  [Bes8 Bes16 A] [Bes8 F8] g,4 r8 G ~ |
-  [G As16 Bes] [c B c As] F2 ~ |
-%% 25
-  [F8 d16 c] [d8 F] [Es es16 d] [es8 G] |
-  [F f16 es] [f8 As] [G16 f es d] [c B A G] |
-  [c8 f es d] r [As G F] |
-  [G F16 Es] [F8 D] [As G] r A |
-  [B c] [F16 Es D C] C8 [c16 B] [c8 G] |
-%% 30
-  [As c16 B] [c8 <d b,! as,!]> [G8 c16 B] [c8 d] |
-  [F16 G] As4 [G16 F] E2 |
+  [es8 es16 d] [es8 bes ] [c es16 d] [es8 f] |
+  \stemboth [bes,  es16 d] [es8 f] [as,16 bes ] c4 [bes16 as ] |
+  [g16 es f g] [as bes c d] [es d c d] [es f g a] |
+  [bes f, g as] [bes c d e] [f es d es] [ f g a b] |
+%%15
+  \stemup [c8 b16 a] [g f! es d] [c8 es d c] |
+  [bes a bes c] [fis,! g a fis] |                    % forced accident
+  [g8 d'16 c] d8 r8 r8 [e16 d] e8 r8 |
+  r [fis16 e] fis8 r r [g,16 f] g8 r8 |
+  r8 [a16 g] a8 r r [b16 a] b8 r |
+%%20
+  r8 [c16 b ] [c8 g ] [as c16 b ] [c8 d] |
+  [g, c16 b] [c8 d] [f,16 g] as4 [g16 f] |
+  [es8 c'16 b] [c8 g] as4 r8 a |
+  [bes8 bes16 a] [bes8 f8] g4 r8 g ~ |
+  [g as16 bes] [c b c as] f2 ~ |
+%%25
+  [f8 d'16 c] [d8 f,] [es es'16 d] [es8 g,] |
+  [f f'16 es] [f8 as,] [g16 f' es d] [c b a g] |
+  [c8 f es d] r [as g f] |
+  [g f16 es] [f8 d] [as' g] r a |
+  [b c] [f,16 es d c] c8 [c'16 b] [c8 g] |
+%%30
+  [as c16 b] [c8 <d b ! as !]> [g,8 c16 b] [c8 d] |
+  [f,16 g] as4 [g16 f] e2 |
 }
 
 
-bassdux = \melodic {
+bassdux = \melodic \relative c' {
   \clef bass;
-  \octave c';
 
   r1 |
   r |
   r |
   r |
-%% 5
+%%5
   r |
   r1 |
-  r8 [c16 B] [c8 G] [As c16 B] [c8 d] |
-  [G c16 B] [c8 d] [F16 G] As4 [G16 F] | 
-  \octave c; [es c' b a] [g f es d] [c d es d] [c Bes! As! G] |
+  r8 [c16 b] [c8 g] [as c16 b] [c8 d] |
+  [g, c16 b] [c8 d] [f,16 g] as4 [g16 f] | 
+ [es c'  b a] [g f es d] [c d es d] [c bes! as! g] |
                                                     % -> \classic_accidentals
-%% 10
-  [F bes as g] [f es d c] [Bes c d c] [Bes As G F] |
-  [Es as g f] [es des c Bes] [As8 c' bes as] |
-  [g8 f g as] [d es f d] |
+%%10
+  [f bes' as g] [f es d c] [bes c d c] [bes as g f] |
+  [es as' g f] [es des c bes] [as8 c'  bes as] |
+  [g8 f g as] [d, es f d] |
   [es as g f] [g es d c] |
-  [d bes as g] [as f es d!] |
-%% 15
-  es8 r8 r4 r8 [c Bes A] |
-  r [es d c] [d c16 Bes] [c8 d] |
-  [G8 bes16 a] [bes8 d] [es c'16 bes] [c'8 e] |
-  [f d'16 c'] [d'8 fis] g4 r16 [G A B] |
-  [c16 d es8~] [es16 A Bes c] [d es f8~] [f16 b, c d] |
-%% 20    
-  es8 r r e [f F Es! D] |                           % -> \classic_accidentals
-  r [As G F] [G F16 Es] [F8 G] |
-  [c16 d  es d] [c Bes As G] [F bes as g] [f es d c] |
-  [Bes c d c] [Bes As G F] [Es as g f] [es d c Bes] |
-  [As Bes c Bes] [As G F Es] [D g f es] [d c B A] |
-%% 25
-  G4 r4 r16 [G A B] [c d es f] |
-  [g f as g] [f es d c] [B8 c16 B] [c8 G] |
-  [As c16 B] [c8 d] [G c16 B] [c8 d] |
-  [F16 G] As4 [G16 F] Es4 r8 es |
-  [d c g G]
-%% 30
-  \multi 2 <
+  [d bes' as g] [as f es d!] |
+%%15
+  es8 r8 r4 r8 [c bes a] |
+  r [es' d c] [d c16 bes] [c8 d] |
+  [g,8 bes'16 a] [bes8 d,] [es c'16 bes] [c8 e,] |
+  [f d'16 c ] [d8 fis,] g4 r16 [g, a b] |
+  [c16 d es8~] [es16 a, bes c] [d es f8~] [f16 b,  c d] |
+%%20    
+  es8 r r e [f f, es! d] |                           % -> \classic_accidentals
+  r [as' g f] [g f16 es] [f8 g] |
+  [c16 d  es d] [c bes as g] [f bes' as g] [f es d c] |
+  [bes c d c] [bes as g f] [es as' g f] [es d c bes] |
+  [as bes c bes] [as g f es] [d g' f es] [d c b a] |
+%%25
+  g4 r4 r16 [g a b] [c d es f] |
+  [g f as g] [f es d c] [b8 c16 b] [c8 g] |
+  [as c16 b] [c8 d] [g, c16 b] [c8 d] |
+  [f16 g] as4 [g16 f] es4 r8 es |
+  [d c g g]
+%%30
+  \type Staff <
     { \stemup c2 ~ | c1 ~ | c1 }
-    { \stemdown C2 ~ | C1 ~ | C1 }
+    { \stemdown c,2 ~ | c1 ~ | c1 }
   >
 }
 
         
 \score {
  
-    \type Grand_staff < 
+    \type GrandStaff < 
       \type Staff = treble < 
         \global 
         \dux
@@ -179,11 +176,13 @@ bassdux = \melodic {
     >
 
   \paper {
-    gourlay_maxmeasures = 5.;
+    gourlay_maxmeasures =5.;
+%    castingalgorithm = \Wordwrap;
+
   }
 
   \midi {
-    \tempo 4 = 84;
+    \tempo 4 =84;
   }
 }
 
diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly
index 368602e9f7..2cb87d2913 100644
--- a/mutopia/J.S.Bach/wtk1-prelude1.ly
+++ b/mutopia/J.S.Bach/wtk1-prelude1.ly
@@ -8,22 +8,21 @@ enteredby =	 "Shay Rojansky";
 copyright =	 "Public Domain";
 }
 
-\version "0.1.14";
+\version "1.0.0";
 
 global = 
     \melodic {
-	 \meter 4/4;                % should be \meter C
+	 \time 4/4;                % should be \time C
     }
   
 
 % should do programmable input.
 
 soprane =
-    \melodic {
+    \melodic \transpose c'' {
         \clef "violin";
-        \octave c';
 
-	\multi 2 <
+	\type Staff <
 	% Real soprane
 	{\stemup
 	r8 [g16 c'] [e' g c' e'] r8 [g16 c'] [e' g c' e'] |
@@ -81,7 +80,7 @@ soprane =
 bass =
     \melodic {
         \clef "bass";
-        \octave c;
+
 
 	\stemdown
 	c'2 c' |
@@ -94,7 +93,7 @@ bass =
 	b b |
 	a a |	
 %% 10
-	\multi 2 <
+	\type Staff <
 	% Alt
 	{\stemup
 	r16 a8. ~ a4 r16 a8. ~ a4 |
@@ -162,7 +161,7 @@ bass =
 
         
 \score {
-    \melodic \type Grand_staff < 
+    \melodic \type GrandStaff < 
                   <
                        \global 
                        \soprane
diff --git a/mutopia/W.A.Mozart/cadenza.ly b/mutopia/W.A.Mozart/cadenza.ly
index 8fcf3f08d7..431214056a 100644
--- a/mutopia/W.A.Mozart/cadenza.ly
+++ b/mutopia/W.A.Mozart/cadenza.ly
@@ -13,7 +13,7 @@ Tested Features: cadenza mode
 Ugh.. Wish we had grace notes....  It adds another dimension to this
 piece of music.  %}
 
-\version "0.1.14";
+\version "1.0.0";
 
 
 cad = \melodic  \relative c' {
diff --git a/mutopia/W.A.Mozart/horn-concerto-3.ly b/mutopia/W.A.Mozart/horn-concerto-3.ly
index 18998066bc..a4a6998269 100644
--- a/mutopia/W.A.Mozart/horn-concerto-3.ly
+++ b/mutopia/W.A.Mozart/horn-concerto-3.ly
@@ -1,12 +1,28 @@
+\header{
+title =	 "Konzert Nr. 3 Es dur"
+subtitle = "f\\\"ur Horn und Orchester";
+description =	 "Third horn concerto, for horn in Es";
+composer =	 "W. A. Mozart (1756-1792)";
+enteredby =	 "HWN";
+opus = "K.V. 447";
+copyright =	 "public domain";
+}
 
 
-\version "0.1.14";
+\version "1.0.0";
 
 allegro =
 	\melodic
 	\relative c'
 {
-
+	\time 4/4;
+	\partial 4;
+	R1*4
+	c'2^"tutti" g
+	c, r
+	R1*1
+	r8 [g' g g] [g g e c]
+	g4 g, r2
 	R1*18
 	r2 r4 g'4 |
 	e'4. () c8 [f (d c )b ]
@@ -61,7 +77,7 @@ allegro =
 	d
 	c
 	c,
-	e''
+	e'
 	e,
 	c'2 [b8( a gis )a]
 	[gis8 e gis b ] e4 r |
@@ -133,8 +149,8 @@ allegro =
 
 romanze = \melodic \relative c' {
 
-	\key bes;
-	\meter 2/2;
+	\key F;
+	\time 2/2;
 	c'4.() f8 a,4 a
 	[bes8( c d bes] )g4 r8 g
 	a r bes r c r [d()bes]
@@ -157,7 +173,7 @@ romanze = \melodic \relative c' {
 	% mark B
 	c1\f
 	R1*9
-	f''4.(\p )d8 b4 r8 g
+	f'4.(\p )d8 b4 r8 g
 	g'4.() e8 c4 r8 cis |
 	d4(~ [d16 e d )e] [f8 () d f() d]
 	c2()b4 r
@@ -220,7 +236,7 @@ rondo = \melodic 	\relative c'
 {
 	\partial 8;
 	g'8 |
-	\meter 6/8;
+	\time 6/8;
 	\grouping 8*3 8*3;
 	\rondotheme
 	
@@ -342,11 +358,14 @@ rondo = \melodic 	\relative c'
 	c4 r8 c4 r8
 	c4 r8 r4 r8
 }
+
+default_paper = \include "part-paper.ly"
+
 \score
 {
-	{ 	\property Score.SkipBars = 1
-		\allegro
-	}
+	\allegro
+	\paper{ }
+	\midi{ \tempo 4=90; }
 }
 
 \score
@@ -354,14 +373,15 @@ rondo = \melodic 	\relative c'
 	{ 	\property Score.SkipBars = 1
 		\romanze
 	}
+		\paper{ \tempo 4 = 70; }	
+	\midi{}
 }
 \score
 {
-	{ 	\property Score.SkipBars = 1
-		\rondo
-	}
+	\rondo
+
 	\paper{
-%	castingalgorithm =\Wordwrap;
+		\tempo 4 = 100;
 	}
 	\midi{}
 }
diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly
index 916a86c6be..5d97250b00 100644
--- a/mutopia/gallina.ly
+++ b/mutopia/gallina.ly
@@ -1,11 +1,13 @@
 \header{
-title =	 "La Gallina a 2 violini";
+title =	 "La Gallina à 2 violini";
 date =	 "1637";
 source =	 "the manuscript of Canzoni overo Sonate Concertate "
 	 "libro terzo, opera duodecima ";
 composer =	 "Tarquinio Merula (1594/95-1665)";
 enteredby =	 "Mats Bengtsson";
 copyright =	 "Public Domain ";
+subtitle = "from Canzoni overo Sonate Concertate libro terzo, "
+	"opera duodecima 1637";
 }
 
 
@@ -43,149 +45,147 @@ Voice engraver by uncommenting the lines in the paper
 definition below. --MB
 %} 
 
-\version "0.1.15";
+\version "1.0.0";
 
-vi1=\melodic{
-  \meter 4/4;
-  \octave c'';
+vi1=\melodic \relative c'' {
+  \time 4/4;
 
-  [d8 d d d] d4 [A16 B c A] |
-  [B8 G ][ G G16 A][ B8 G ][ G G16 A] | 
-  [B8 G ][ G A16 B] c4 B |
-  [A8 D] G2 Fis4 |
-  G2 r2 |
+  [d8 d d d] d4 [a16 b c a] |
+  [b8 g ][ g g16 a][ b8 g ][ g g16 a] | 
+  [b8 g ][ g a16 b] c4 b |
+  [a8 d,] g2 fis4 |
+  g2 r2 |
   r1 |
-  [d8 d d d] d4 [A16 B c A] |
-  [B8 G ][ G G16 A][ B8 G ][ G G16 A] | 
-  [B8 G ][ G A16 B][ c8 e d c] |
-  [B G] c2 B4 |
+  [d'8 d d d] d4 [a16 b c a] |
+  [b8 g ][ g g16 a][ b8 g ][ g g16 a] | 
+  [b8 g ][ g a16 b][ c8 e d c] |
+  [b g] c2 b4 |
   c2 r |
   r1 |
-  [g8 g g g] g4 [d16 e f d] |
+  [g'8 g g g] g4 [d16 e f d] |
   [e8 c ][ c c16 d][ e8 c ][ c c16 d] |
   [e8 c ][ c d16 e] f4 e |
-  [d8 G] c2 B4 |
-  [c8 G ][ G G16 A] B4 G |
-  r8 G [G G16 A] B4 G |
-  r8 [E16 Fis ][ G8 G] [ Fis! G G Fis!] |
-  G2 r |
+  [d8 g,] c2 b4 |
+  [c8 g ][ g g16 a] b4 g |
+  r8 g [g g16 a] b4 g |
+  r8 [e16 fis ][ g8 g] [ fis! g g fis!] |
+  g2 r |
   r1 |
-  r16 [d c B ][ A G Fis E] [D8 d ][ d d16 c] |
-  [B8 d ][ d d16 c][ B8 d ][ d d16 e] |
+  r16 [d' c b ][ a g fis e] [d8 d' ][ d d16 c] |
+  [b8 d ][ d d16 c][ b8 d ][ d d16 e] |
   fis4 g2 fis!4 |
-  r16 [g f e ][ d c B A][ G8 g ][ g g16 f] |
+  r16 [g f e ][ d c b a][ g8 g' ][ g g16 f] |
   [e8 g ][ g g16 f][ e8 g ][ g g16 a] |
-  b4 c'2 b4 |
-  [c'8 g ][ g g16 f] e4 d |
+  b4 c2 b4 |
+  [c8 g ][ g g16 f] e4 d |
   r8 g [g g16 f] e4 d |
-  r8 [d16 A ][ B8 B16 c] A2 |
-  B1 |
-  \meter 3/2;
+  r8 [d16 a ][ b8 b16 c] a2 |
+  b1 |
+  \time 3/2;
   \tempo 2=140;
   r4 d d d d d |
   e1. |
   r4 c c c c c |
   d1. |
-  r4 [d8 c] B4 [c8 d] G4 [A8 B] |
-  E1. |
-  r4 [e8 d] cis4 [d8 e] A4[ B8 cis!] |
-  Fis1. |
-  r4 d d d d d |
-  e [e8 d] c4 [d8 e] A4 [B8 c] |
-  Fis4 [fis8 e] d4 [e8 fis!] B4 [c8 d] |
-  G4 g g g g g |
-  a4 [c'8 b] a4 [b8 c'] f4 [g8 a] |
-  d4 g g g g g |
-  a [d8 c] B4 [c8 d] A2 |
-  \meter 4/4;
+  r4 [d8 c] b4 [c8 d] g,4 [a8 b] |
+  e,1. |
+  r4 [e'8 d] cis4 [d8 e] a,4[ b8 cis!] |
+  fis,1. |
+  r4 d' d d d d |
+  e [e8 d] c4 [d8 e] a,4 [b8 c] |
+  fis,4 [fis'8 e] d4 [e8 fis!] b,4 [c8 d] |
+  g,4 g' g g g g |
+  a4 [c8 b] a4 [b8 c] f,4 [g8 a] |
+  d,4 g g g g g |
+  a [d,8 c] b4 [c8 d] a2 |
+  \time 4/4;
   \tempo 4=80;
-  B1 |
-  [d8 d d d] d4 [A16 B ][ c A] |
-  [B8 G ][ G G16 A] [B8 G ][ G G16 A] | 
-  [B8 G]  c2 B4 |
+  b1 |
+  [d8 d d d] d4 [a16 b c a] |
+  [b8 g ][ g g16 a] [b8 g ][ g g16 a] | 
+  [b8 g]  c2 b4 |
   c2 r |
-  [g8 g g g] g4 [d16 e f d] |
-  [e8 G ][ G G16 A] [B8 d ][ d d16 e] |
+  [g'8 g g g] g4 [d16 e f d] |
+  [e8 g, ][ g g16 a] [b8 d ][ d d16 e] |
   fis4 g2 fis!4 |
-  r16 [g f e ][ d c B A] [G8 g ][ g g16 f] |
+  r16 [g f e ][ d c b a] [g8 g' ][ g g16 f] |
   e2 r8 d [d d16 e] |
-  [fis a g fis ][ e d c B] [A8 d ][ d d16 e] |
+  [fis a g fis ][ e d c b] [a8 d ][ d d16 e] |
   fis4 g2 fis!4 |
   \cadenza 1;
   g\breve
   \bar "|.";
 }
 
-vi2=\melodic{
-  \meter 4/4;
-  \octave c'';
+vi2=\melodic \relative c'' {
+  \time 4/4;
 
   r1 | r | r | 
-  [d8 d d d] d4 [A16 B c A] |
-  [B8 G ][ G G16 A] [B8 G ][ G G16 A] | 
-  [B8 G ][ G A16 B] c4 B |
-  [A8 D] G2 Fis4 |
-  G2 r2 |
+  [d8 d d d] d4 [a16 b c a] |
+  [b8 g ][ g g16 a] [b8 g ][ g g16 a] | 
+  [b8 g ][ g a16 b] c4 b |
+  [a8 d,] g2 fis4 |
+  g2 r2 |
   r1 |
-  [g8 g g g] g4 [d16 e f d] |
+  [g'8 g g g] g4 [d16 e f d] |
   [e8 c ][ c c16 d] [e8 c ][ c c16 d] |
   [e8 c ][ c d16 e] f4 e |
-  [d8 G] c2 B4 |
+  [d8 g,] c2 b4 |
   c2 r |
   r1 |
-  [g8 g g g] g4 [d16 e f d] |
-  e2 r8 G [G G16 A] |
-  B4 G r8 G [G A16 B] | 
-  c4 B A2 |
-  G r16 [d c B ][ A G Fis E] |
-  [D8 d ][ d d16 c] [B8 d ][ d d16 e] |
+  [g'8 g g g] g4 [d16 e f d] |
+  e2 r8 g, [g g16 a] |
+  b4 g r8 g [g a16 b] | 
+  c4 b a2 |
+  g r16 [d' c b ][ a g fis e] |
+  [d8 d' ][ d d16 c] [b8 d ][ d d16 e] |
   fis4 g g4. fis!8 |
   g2 r |
-  r16 [d c B ][ A G Fis E] [D8 d ][ d d16 c] |
-  B4 c2 B4 |
-  c d G2 |
-  r16 [g f e ][ d c B A] [G8 g ][ g g16 f] |
+  r16 [d c b ][ a g fis e] [d8 d' ][ d d16 c] |
+  b4 c2 b4 |
+  c d g,2 |
+  r16 [g' f e ][ d c b a] [g8 g' ][ g g16 f] |
   e4 d r8 g [g g16 f] |
-  e4 d r8 [c16 G ][ B8 B16 c] |
-  A4 G2 Fis4 |
-  G1 |
-  \meter 3/2;
+  e4 d r8 [c16 g ][ b8 b16 c] |
+  a4 g2 fis4 |
+  g1 |
+  \time 3/2;
   r1. |
-  r4 [g8 f] e4 [f8 g] c4 [d8 e] |
-  A1. |
-  r4 [a8 g] fis4 [g8 a] d4 [e8 fis!] |
-  B1. |
-  r4 g g g g g |
+  r4 [g'8 f] e4 [f8 g] c,4 [d8 e] |
+  a,1. |
+  r4 [a'8 g] fis4 [g8 a] d,4 [e8 fis!] |
+  b,1. |
+  r4 g' g g g g |
   a1. |
   r4 a a a a a |
-  b [d8 c] B4 [c8 d] G4 [A8 B] |
-  E4 [g8 f] e4 [f8 g] c4 [d8 e] |
-  A4 [a8 g] fis4 [g8 a] d4 [e8 fis!] |
-  B4 [b8 a] g4 [a8 b] e4 [fis8 g] |
-  c4 A A A A A |
-  B [d8 c] B4 [c8 d] D4 E |
-  Fis2 G Fis! |
-  \meter 4/4;
-  G1 |
+  b [d,8 c] b4 [c8 d] g,4 [a8 b] |
+  e,4 [g'8 f] e4 [f8 g] c,4 [d8 e] |
+  a,4 [a'8 g] fis4 [g8 a] d,4 [e8 fis!] |
+  b,4 [b'8 a] g4 [a8 b] e,4 [fis8 g] |
+  c,4 a a a a a |
+  b [d8 c] b4 [c8 d] d,4 e |
+  fis2 g fis! |
+  \time 4/4;
+  g1 |
   r1 | r1 |
-  [g8 g g g] g4 [d16 e f d] |
-  [e8 c ][ c c16 d] [e8 G ][ G G16 A] |
-  [B8 G] c2 B4 |
+  [g'8 g g g] g4 [d16 e f d] |
+  [e8 c ][ c c16 d] [e8 g, ][ g g16 a] |
+  [b8 g] c2 b4 |
   c2 r |
-  r16 [d c B ][ A G Fis E] [D8 d ][ d d16 c] |
-  B4 c2 B4 |
-  [c8 G ][ G G16 A] [B d c B ][ A G Fis E] |
-  [D8 d ][ d d16 e] [fis16 a g fis ][ e d c B] |
-  [A d c B ][ A G Fis E] D4 d |
+  r16 [d c b ][ a g fis e] [d8 d' ][ d d16 c] |
+  b4 c2 b4 |
+  [c8 g ][ g g16 a] [b d c b ][ a g fis e] |
+  [d8 d' ][ d d16 e] [fis16 a g fis ][ e d c b] |
+  [a d c b ][ a g fis e] d4 d' |
   \cadenza 1;
-  B\breve
+  b\breve
   \bar "|.";
 }
 
-bc=\melodic{
+
+bc=\melodic\transpose c'{
   \clef "bass";
-  \meter 4/4;
-  \octave c;
+  \time 4/4;
 
   G2 d^"4 3" | G1 |
   g2 c4 G | d1^"3 4 3" |
@@ -203,7 +203,7 @@ bc=\melodic{
   G1^"3 4 3" | c4 B c g |
   c B c G | d1^"3 4 3" |
   G1 |
-  \meter 3/2;
+  \time 3/2;
   g1. | c |
   f | d^"\\textsharp" |
   g | c |
@@ -212,7 +212,7 @@ bc=\melodic{
   d^"\\textsharp" | e |
   f | g1 B2 |
   d1.^"3 4 3" |
-  \meter 4/4;
+  \time 4/4;
   G1 |
   g2 fis | g G |
   g1^"3 4 3" | c |
@@ -226,7 +226,7 @@ bc=\melodic{
 }
 
 \score{
-  \type Staff_group <
+  \type StaffGroup <
     \vi1
     \vi2
     \bc
diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly
index e89abf35e7..48fed8cf12 100644
--- a/mutopia/los-toros-oboe.ly
+++ b/mutopia/los-toros-oboe.ly
@@ -8,7 +8,7 @@ enteredby =	 "jcn";
 copyright =	 "public domain";
 latexheaders=    "headers";
 } 
-\version "0.1.15";
+\version "1.0.0";
 
 %{
 Silly latex file dropped; use ly2dvi
@@ -30,16 +30,16 @@ Converted to relative octave from los-toros-oboe.ly:
 hoboonestart = \melodic
   \relative c'{
 % ugh: cant copy: allegro/primo tempo
-	\textstyle "large";
+	\property Voice . textstyle =  "large"
 	[es''16-.^"Allegro" es-. es-. es-.] [es8-. d-.] |
-	\textstyle "italic";
+	\property Voice . textstyle =  "italic"
 }
 
 hobooneintro = \melodic  \relative c'{
 
-%	\textstyle "roman";
+%	\property Voice . textstyle =  "roman"
 %	[es''16-.-"Allegro" es-. es-. es-.] [es8-. d-.] |
-%	\textstyle "italic";
+%	\property Voice . textstyle =  "italic"
 	[f''8.-> es16(] [)d8 c-.] |
 	[bes16( c d es] [)d8 c-.] |
 	[bes-. as->~] [as16( g f g] |
@@ -107,18 +107,18 @@ hoboonemid = \melodic	\relative c'{
 	[d16-. d-. d-. d-.] [d8.-. es16->] |
 	[d16 d d d] [d8 es16-.] r16-\fermata^"court"^"tr\\`es" |
 	% Un peu plus lent.
-	\textstyle "bold";
+	\property Voice . textstyle =  "bold"
 
 % ugh
-%	d4(\<^"Un peu plus lent" \textstyle "italic; _"tr\\`es \\'el\\'egant"
+%	d4(\<^"Un peu plus lent" \property Voice . textstyle =  "italic _"tr\\`es \\'el\\'egant"
 %	d4(\^"Un peu plus lent et \\'el\\'egant"<
-	\textstyle "italic"; 
+	\property Voice . textstyle =  "italic" 
 	d4(\<
 	[e8 \!fis8] |
 %	[)b-. a-.] [g16( fis e )d] |
-	\textstyle "bold";
-	[)b-.^"Un peu plus lent et \\'el\\'egant" a-.] [''g16( fis' e )d] |
-	\textstyle "italic"; 
+	\property Voice . textstyle =  "bold"
+	[)b-.^"Un peu plus lent et \\'el\\'egant" a-.] [g,,16( fis' e )d] |
+	\property Voice . textstyle =  "italic" 
 	[d( c b\< c] [)\!fis'8-. e-.] |
 	d,,4-> ~ [d16 e( fis g] |
 	[a b\< d fis] [)\!a8-. g-.] |
@@ -154,9 +154,9 @@ hoboonemid = \melodic	\relative c'{
 hoboonesecondstart = \melodic   \relative c'{
 
 % ugh: cant copy: allegro/primo tempo
-	\textstyle "large";
+	\property Voice . textstyle =  "large"
 	[es''16-.\ff^"Tempo 1$^o$" es-. es-. es-.] [es8-. d-.] |
-	\textstyle "italic";
+	\property Voice . textstyle =  "italic"
 	
 }
 	
@@ -195,7 +195,7 @@ hoboonelast = \melodic   \relative c'{
 	[bes'16-.\ff bes-. bes-. bes-.] [bes8-. ces16->] r16^"court"-\fermata |
 	% ugh: eight measures rest (ugh: r1 -> four beats...)
 	% eiht measures rest..
-	\textstyle "bold";
+	\property Voice . textstyle =  "bold"
 %	r2^"Un peu plus lent et \\'el\\'egant"
 	R2*8
 %	r4 r8\p bes |
@@ -203,14 +203,14 @@ hoboonelast = \melodic   \relative c'{
 	r8\p bes,, |
 %	g2->^"Un peu plus lent et \\'el\\'egant" ~ |
 	g2-> ~ |
-	\textstyle "italic";
+	\property Voice . textstyle =  "italic"
 	g8 r r c |
 	c2-> ~ |
 	c8 r r bes'\f |
 	[bes8.->\f g16-.] [es16-. bes-. g-. as-.] |
 	[bes-.-"dim." c-. d-. f-.] [es8-. c-.] |
 	d2-> ~ |
-	[d16-"dim."( es f g] [)'as8 as-.] |
+	[d16-"dim."( es f g] [)as,8 as-.] |
 	[ces8.->\p( )bes16-.] bes4 ~ |
 	[bes16( c! d f] [)es8 g,-.] |
 	[g8.->( )as16] as4 ~ |
@@ -233,9 +233,9 @@ hoboonelast = \melodic   \relative c'{
 	g8-. r f4-> ~ |
 	[f8 es-. ces8.-. as16-.] |
 	% `a deux
-	\textstyle "large";
+	\property Voice . textstyle =  "large"
 	[ces8.->^"Plus vite" bes16-.(] [a bes es d] |
-	\textstyle "italic";
+	\property Voice . textstyle =  "italic"
 	[)c!8.-> bes16] [a( bes es )d] |
 	[c->( bes es )d] [c->( bes es )d] |
 	% same measure
@@ -244,9 +244,9 @@ hoboonelast = \melodic   \relative c'{
 	[g )f d( es] [f g as a] |
 	[c )bes bes,( c] [d es f g] |
 	[as g f g] [as bes c d] |
-	\textstyle "large";
+	\property Voice . textstyle =  "large"
 	[)es-.^"Tempo 1$^o$" g,-. g-. g-.] [g8-. g-.] |
-	\textstyle "italic";
+	\property Voice . textstyle =  "italic"
 	bes4.-> g8-. |
 	gis2->( |
 	)as! |
@@ -261,9 +261,9 @@ hoboonelast = \melodic   \relative c'{
 	g4.-> g8-. |
 	es4.-> es8-. |
 	bes4.-> bes8-. |
-	\textstyle "large";
+	\property Voice . textstyle =  "large"
 	g'4.->^"Presto" g8-. |
-	\textstyle "italic";
+	\property Voice . textstyle =  "italic"
 	es4.-> es8-. |
 	[bes-. bes-. es-. g-.] |
 	[bes-. bes,-. es-. g-.] |
@@ -282,13 +282,13 @@ hoboone = \melodic {
 }
 
 global = \melodic{
-	\key bes es as;
-	\meter 2/4;
+	\key es;
+	\time 2/4;
 	\skip 4*110;
-	\key fis; |
+	\key g; |
 	\bar "||";
 	\skip 4*58;
-	\key bes es as; |
+	\key es; |
 	\bar "||";
 	\skip 4*220;
 	\bar "|.";
diff --git a/mutopia/standchen-16.ly b/mutopia/standchen-16.ly
index 8e03c6e663..9454dfede0 100644
--- a/mutopia/standchen-16.ly
+++ b/mutopia/standchen-16.ly
@@ -9,6 +9,6 @@ description = "A schubert song in 16 pt";
 copyright =	 "public domain";
 } 
 
-\version "0.1.15";
+\version "1.0.0";
 
 \include "standchen.ly"
diff --git a/mutopia/standchen-20.ly b/mutopia/standchen-20.ly
index 1eb5190776..ea129b36c3 100644
--- a/mutopia/standchen-20.ly
+++ b/mutopia/standchen-20.ly
@@ -9,7 +9,7 @@ copyright =	 "public domain";
 description = "A schubert song in 20 pt";
 } 
 
-\version "0.1.15";
+\version "1.0.0";
 
 % fool make-website
 % \include "standchen.ly";
diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly
index 2400bf28d6..64f5e71d68 100644
--- a/mutopia/standchen.ly
+++ b/mutopia/standchen.ly
@@ -1,7 +1,7 @@
 \header{
 filename =	 "standchen.ly";
 title    = "St\"andchen";
-subtitle = "(Serenade)\\\``Leise flehen meine Lieder''";
+subtitle = "(Serenade)\\\``Leise flehen meine Lieder";
 opus =	 "D. 957 No. 4";
 composer =	 "Franz Schubert (1797-1828)"
 	 "Text by Ludwig Rellstab (1799-1860)";
@@ -10,68 +10,65 @@ copyright =	 "public domain";
 } 
 
 %{
- Tested Features@ multivoice, accents, lyrics, chords, piano music,
+ Tested Features@ multivoice accents lyrics chords piano music
 multiple \paper{}s in one \score 
 %}
 
-\version "0.1.15";
+\version "1.0.0";
 
-$vocal_verse1 = \melodic{
-	\octave c';
-	
+$vocal_verse1 = \melodic\relative c{
 	% ugh: treble/bass
 %	\clef treble;
 %	\clef violin;
-	[/3 g8( )as] g \] c'4. g8 |
-	[/3 f8( )g] f \] c'4 f8 r |
+	[/3 g''8( )as] g \] c4. g8 |
+	[/3 f8( )g] f \] c'4 f,8 r |
 	g4.-> f8 [/3 f( )es] d \] |
 	es2 r4 |
 	% ugh: a whole should be a measure
 	%r1 |
-	r2. |
-	r2. |
-	[/3 g8( )as] g \] es'4. g8 |
-	[/3 f8( )g] f \] d'4. c'8 |
+	R2. |
+	R2. |
+	[/3 g8( )as] g \] es'4. g,8 |
+	[/3 f8( )g] f \] d'4. c8 |
 	bes4. as8 [/3 as( )g] f \] |
 	g2 r4 |
-	r2. |
-	r2. |
-	g8. b16 es'4. d'8 |
-	c'8. g16 es4. c8 |
+	R2. |
+	R2. |
+	g8. b16 es4. d8 |
+	c8. g16 es4. c8 |
 	% [/3 as\grace( bes ] )
-	[/3 as8( )g] as \] c'4. as8 |
+	[/3 as'8( )g] as \] c4. as8 |
 	g2. |
 	%[/3 f\grace( g] )
 	[/3 f8( )e] f \] as4. f8 |
 	es!2. |
-	g8. b16 es'4. d'8 |
-	c'8. g16 e4. c8 |
+	g8. b16 es4. d8 |
+	c8. g16 e4. c8 |
 	% [/3 a\grace( b] )
-	[/3 a!8( ) gis] a \] c'4. a8 |
+	[/3 a'!8( ) gis] a \] c4. a8 |
 	g!2. |
 	% [/3 a\grace( b] )
-	[/3 d'8\f cis'] d' \] f'4. b8 |
-	c'!2. |
+	[/3 d'8\f cis] d \] f4. b,8 |
+	c!2. |
 }
 
-$vocal_through = \melodic{
-	\octave c';
-	g8. g16 b8. b16 d'8. d16 |
+$vocal_through = \melodic\relative c{
+	g''8. g16 b8. b16 d8. d,16 |
 	c'4 b r |
-	g4. b8 d'8. c'16 |
+	g4. b8 d8. c16 |
 	b2 r4 |
-	e'4. d'8 [/3 d'( )c'] b \] |
-	a8. b16 c'4-> a8 r |
-	r2. |
-	r2. |
+	e4. d8 [/3 d( )c] b \] |
+	a8. b16 c4-> a8 r |
+	R2. |
+	R2. |
 	% 4 bars copied from end verse 1
 	% [/3 a\grace( b] )
-	[/3 a!8( ) gis] a \] c'4. a8 |
+	[/3 a!8( ) gis] a \] c4. a8 |
 	g!2. |
 	% [/3 a\grace( b] )
-	[/3 d'8\f cis'] d' \] f'4. b8 |
-	c'!2. ~ |
-	c'4 r c' |
+	[/3 d'8\f cis] d \] f4. b,8 |
+	c!2. ~ |
+	c4 r c |
 	as2. |
 	g |
 	es2 r4 |
@@ -87,8 +84,8 @@ $lyric_verse1 = \lyric{
 	_ _ _ |
 % 11
 	\[/3 In4 den8 \] stil-4. len8 |
-	\[/3 Hainr4 her-8 \] nie-4. der,8 |
-	Lieb4. chen,8 \[/3 komm4 zu8 \] |
+	\[/3 Hainr4 her-8 \] nie-4. der8 |
+	Lieb4. chen8 \[/3 komm4 zu8 \] |
 	mir!2 _4 |
 	_4 _ _ |
 	_ _ _ |
@@ -102,9 +99,9 @@ $lyric_verse1 = \lyric{
 % 23 
 	Des8. Ver-16 r\"a-4. ters8 |
 	feind-8. lich16 Lau-4. schen8 |
-	\[/3 F\"urch-4 te,8 \] Hol-4. de,8 |
-	nicht,2. |
-	\[/3 f\"urch-4 te,8 \] Hol-4. de,8 |
+	\[/3 F\"urch-4 te8 \] Hol-4. de8 |
+	nicht2. |
+	\[/3 f\"urch-4 te8 \] Hol-4. de8 |
 	nicht.2. |
 }
 	
@@ -113,7 +110,7 @@ $lyric_verse2 = \lyric{
 	\[/3 H\"orst4 die8 \] Nach-4. ti-8 
 	\[/3 gal-4 len8 \] schla-4 gen?8 _8
 	Ach!4. sie8 \[/3 fleh-4 en8 \] 
-	dich,2 _4
+	dich2 _4
 	_4 _ _ 
 	_4_ _
 
@@ -127,11 +124,11 @@ $lyric_verse2 = \lyric{
 
 % 17
 	Sie-8. ver-16 stehn4. des8
-	Bus-8. ens16 Seh-4. nen,8
+	Bus-8. ens16 Seh-4. nen8
 	\[/3 Ken-4 nen8 \] Lieb-4. es-8 
-	schmerz,2.
+	schmerz2.
 	\[/3 Ken-4 nen8 \] Lieb-4. es-8 
-	schmerz,2.
+	schmerz2.
 
 % 23
 	R\"uh-8. ren16 mit4. den8 
@@ -145,14 +142,14 @@ $lyric_verse2 = \lyric{
 $lyric_through = \lyric{
 % 37
 	La\ss8. auch16 dir8. die16 Brust8. be-16 |
-	we-4 gen, _ |
-	Lieb-4. chen,8 h\"o-8. re16 |
+	we-4 gen _ |
+	Lieb-4. chen8 h\"o-8. re16 |
 	mich!2 _4 |
-	Be-8. bend16 harr'4 ich8 _8 |
+	Be-8. bend16 harr4 ich8 _8 |
 	dir8. ent-16 ge-4 gen!8 _8 |
-	\[/3 Komm,4 be-8 \] gl\"u4. cke8 |
+	\[/3 Komm4 be-8 \] gl\"u4. cke8 |
 	mich!2. |
-	\[/3 Komm,4 be-8 \] gl\"u4. cke8 |
+	\[/3 Komm4 be-8 \] gl\"u4. cke8 |
 	mich!2. |
 	_2 be-4 |
 	gl\"u-2. |
@@ -160,189 +157,195 @@ $lyric_through = \lyric{
 	mich!2 _4 |
 }
 
-$treble_intro = \melodic{
-	\octave c';
+$treble_intro = \melodic\relative c{
 	\clef violin;
-	% ugh: i'd like to type this!
-	%r8\pp [<g,-. c-.> <c-. es-.> <g,-. c-.> <c-. es-.> <g,-. c-.>] |
-	r8\pp <[g,-. c-.> <c-. es-.> <g,-. c-.> <c-. es-.> <g,-. c-.]> |
-	r8 <[as,-. c-.> <c-. es-.> <as,-. c-.> <c-. es-.> <as,-. c-.]> |
-	r8 <[as,-. c-.> <c-. d-.> <as,-. c-.> <c-. d-.> <as,-. c-.]> |
-	r8 <[g,-. b,-.> <b,-. d-.> <g,-. b,-.> <b,-. d-.> <g,-. b,-.]> |
+	% ugh: id like to type this!
+	%r8\pp [<g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.>] |
+	r8\pp <[g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.]> |
+	r8 <[as-. c-.> <c-. es-.> <as-. c-.> <c-. es-.> <as-. c-.]> |
+	r8 <[as-. c-.> <c-. d-.> <as-. c-.> <c-. d-.> <as-. c-.]> |
+	r8 <[g-. b-.> <b-. d-.> <g-. b-.> <b-. d-.> <g-. b-.]> |
 	\break
-	
 }
 
-$treble_verse1 = \melodic{
-	\octave c';
+$treble_verse1 = \melodic\relative c{
 %	\clef violin;
-	r8 <[g, c> <c es> <g, c> <c es> <g, c]> |
-	r8 <[f, c> <c d> <f, c> <c d> <f, c]> |
-	r8 <[f, g, b,> <g, b, d> <f, g, b,> <g, b, d> <f, g, b,]> |
-	r8 <[es, g, c> <g, c es> <es, g, c> <g, c es> <es, g, c]> |
-	<g'4.( b> <)f'8 d'> <[/3 f' d'> <es' c'> <d' b]1/1> |
-	<c'2. es'> |
-	r8 <[g, c> <c es> <g, c> <c es> <g, c]> |
-	r8 <[f, c> <c d> <f, c> <c d> <f, c]> |
-	r8 <[f, as, bes,> <as, bes, d> <f, g, bes,> <g, bes, d> <f, g, bes,]> |
-	r8 <[es, g, bes,> <g, bes, es> <es, g, bes,> <g, bes, es]> 
-	<{ es'( | )bes4. as8}{ c'( | )d4.( )f8 } > 
+	%5
+	r8 <[g' c> <c es> <g c> <c es> <g c]> |
+	r8 <[f c'> <c' d> <f, c'> <c' d> <f, c']> |
+	r8 <[f g b> <g b d> <f g b> <g b d> <f g b]> |
+	r8 <[es g c> <g c es> <es g c> <g c es> <es g c]> |
+	<g''4.( b,> <)f8 d> <[/3 f d> <es c> <d b]1/1> |
+	%10
+	<c2. es> |
+	r8 <[g, c> <c es> <g c> <c es> <g c]> |
+	r8 <[f c'> <c' d> <f, c'> <c' d> <f, c']> |
+	r8 <[f as bes> <as bes d> <f g bes> <g bes d> <f g bes]> |
+	r8 <[es g bes> <g bes es> <es g bes> <g bes es]> 
+	<{ es''( | )bes4. as8}{ c( | )d,4.( )f8 } > 
 	< [/3 f as> <es g> <d f]1/1> |
+	%16
 	<es2. g> |
-	r8 <[f, g,> <g, b,> <f, g,> <g, b,> <f, g,]> |
-	r8 <[es, g,> <g, c> <es, g,> <g, c> <es, g,]> |
-	r8\pp <[es, as, c> <as, c es> <es, as, c> <as, c es> <es, as, c]> |
-	r8 <[es, g, bes,> <g, bes, es,> <es, g, bes,> <g, bes, es,> <es, g, bes,]> |
+	r8 <[f, g> <g b> <f g> <g b> <f g]> |
+	r8 <[es g> <g c> <es g> <g c> <es g]> |
+	r8\pp <[es as c> <as c es> <es as c> <as c es> <es as c]> |
+	%20
+	r8 <[es g bes> <g bes es> <es g bes> <g bes es> <es g bes]> |
 	% [/3 as\grace( bes )
-	[/3 as8(( g )as]1/1 c'4.-> ) as8 |
+	[/3 as'8(( g )as]1/1 c4.-> ) as8 |
 	g2. |
-	r8 <[f, g,> <g, b,> <f, g,> <g, b,> <f, g,]> |
-	r8 <[e, g,> <g, c> <e, g,> <g, c> <e, g,]> |
-	r8 <[f, a, c> <a, c f> <f, a, c> <a, c f> <f, a, c]> |
-	r8 <[e, g, c> <g, c e> <e, g, c> <g, c e> <e, g, c]> |
-	<{[/3 f'8\f( e' f']1/1 a'4. )f'8 } {\[/3 f e f \] a4. f8 } > |
+	r8 <[f, g> <g b> <f g> <g b> <f g]> |
+	r8 <[e g> <g c> <e g> <g c> <e g]> |
+	r8 <[f a c> <a c f> <f a c> <a c f> <f a c]> |
+	r8 <[e g c> <g c e> <e g c> <g c e> <e g c]> |
+	<{[/3 f8\f( e f]1/1 a4. )f8 } {\[/3 f' e f \] a4. f8 } > |
 	<e2 e'> r4 |
 }
 
-$treble_eentje = \melodic{
-	\octave c';
-	<f2\mf as!(> <[as8.->( c'> <)f16 )as]> |
+$treble_eentje = \melodic\relative c{
+	<f'2\mf as!(> <[as8.->( c> <)f16 )as]> |
 	<e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
-	<f4. g> <[b,8-. g-.(> <d-. g-.> <f-. )g-.]> |
+	<f4. g> <[b,8-. g'-.(> <d-. g-.> <f-. )g-.]> |
 	<e2 g\pp> <e4 g> |
-	<f2\mf a(> <[a8.( c'> <)f16 )a]> |
+	<f2\mf a(> <[a8.( c> <)f16 )a]> |
 	<e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
-	<f4. g> <[b,8-. g-.(> <d-. g-.> <f-. )g-.]> |
+	<f4. g> <[b,8-. g'-.(> <d-. g-.> <f-. )g-.]> |
+	%60
 	<e2. g> |
 }
 
-$treble_through = \melodic{
-	\octave c';
-	r2. |
+$treble_through = \melodic\relative c{
+	%61
+	R2. |
 	% lily: 221: warning: Junking request: Span_dynamic_req: the \>
-	<[g,8.\< g> <g,16 g> <b,8. b> <\! b,16\> b16> <d8. d'> <d16 d']> |
-	% lily: 222: warning: Can't find cresc to end.
-	< { c4( )b, } { c'4( )b } > \!r |
+	<[g'8.\< g'> <g16 g'> <b8. b'> <\! b16\> b'16> <d8. d'> <d16 d']> |
+	% lily: 222: warning: Cant find cresc to end.
+	< { c4( )b } { c'4( )b } > \!r |
 % ugh
-%	<g,4. g> <b,8 b> <[d8.-> d'->> c'16] |
-	<g,4. g> <b,8 b> [d'8.-> c'16] |
-% ugh, ugh: connecting chords
-	< { d2.\f( )a2} { e2. ~ e2 } { b2. c2 }> r4 |
+%	<g4. g> <b8 b> <[d8.-> d->> c16] |
+	<g4. g'> <b8 b'> [d'8.-> c16] |
+% ugh ugh: connecting chords
+	%65
+	< { d,2.\f( )a'2} { e2. ~ e2 } { b'2. c,2 }> r4 |
 	< 
 		{
 			\voiceone 
-			[a8. b16] c'4->( )a8 r |
-			[a8. b16] c'4->( )a8 r |
+			[a8. b16] c4->( )a8 r |
+			[a8. b16] c4->( )a8 r |
 		}
 		{ 
 			\voicetwo 
-			<d4\f f> <d2 f> |
+			<d,4\f f> <d2 f> |
 			<c!4\f es> <c2 es> |
 		}
 	>
 	% 4 bars copied from end verse1
-	r8 <[f,\p a, c> <a, c f> <f, a, c> <a, c f> <f, a, c]> |
-	r8 <[e, g, c> <g, c e> <e, g, c> <g, c e> <e, g, c]> |
-	<{[/3 f'8\f( e' f']1/1 a'4. )f'8 } {\[/3 f e f \] a4. f8 } > |
-	<e2 e'> r4 |
+	r8 <[f,\p a c> <a c f> <f a c> <a c f> <f a c]> |
+	%70
+	r8 <[e g c> <g c e> <e g c> <g c e> <e g c]> |
+	<{[/3 f8\f( e f]1/1 a4. )f8 } {\[/3 f' e f \] a4. f8 } > |
+	<e'2 e'> r4 |
 	<es2 es'> r4 |
 	<d2 d'> r4 |
-	<b,2 b> r4 |
+	%75
+	<b2 b'> r4 |
 	<c2 c'> <e4\pp g> |
 
 	% four copied from begin eentje
-	<f2\mf as!(> <[as8.->( c'> <)f16 )as]> |
+	<f2\mf as!(> <[as8.->( c> <)f16 )as]> |
 	<e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
-	<f4. g> <[b,8-. g-.(> <d-. g-.> <f-. )g-.]> |
-	\textstyle "italic";
+	<f4. g> <[b,8-. g'-.(> <d-. g-.> <f-. )g-.]> |
+	%80
+	\property Voice . textstyle =  "italic"
 	<e2._"dim." g> |
-	<g,2. e g> |
-	<g,2.-\fermata e g> |
+	<g,2. e' g> |
+	<g2.-\fermata e' g> |
 }
 
-$bass_intro = \melodic{
-	\octave c;
+$bass_intro = \melodic\relative c{
 	\clef bass;
-	<c,2 c> r4 |
-	<as,,2 as,> r4 |
-	<f,,2 f,> r4 |
-	<g,,2 g,> r4 |
+	<c,2 c'> r4 |
+	<as2 as'> r4 |
+	<f2 f'> r4 |
+	<g2 g'> r4 |
 }
 
-$bass_verse1 = \melodic{
-	\octave c;
+$bass_verse1 = \melodic\relative c{
 %	\clef bass;
-	<c,2 c> r4 |
-	<as,,2 as,> r4 |
-	<g,,2 g,> r4 |
-	<c,2 c> r4 |
-	<g,,8 g,> <[g d'> <d' f'> <g d'> <d' f'> <g d']> |
-	<c,8 c> <[g c'> <c' es'> <g c'> <c' es'> <g c']> |
-	<c,2 c> r4 |
-	<as,,2 as,> r4 |
-	<bes,,2 bes,> r4 |
-	<es,,2 es,> r4 |
-	bes,,8 <[bes, f> <f bes> <bes, f> <f bes> <bes, f]> |
-	es,,8 <[bes, es> <es g> <bes, es> <es g> <bes, es]> |
-	<g,,2 g,> r4 |
-	<c,2 c> r4 |
-	<as,,2 as,> r4 |
-	<es,,2 es,> r4 |
-	<bes,,8 bes,> <[f bes> <bes d'> <f bes> <bes d'> <f bes]> |
-	<es,,8 es,> <[es g bes> <g bes es'> <es g bes> <g bes es'> <es g bes]> |
-	<g,,2 g,> r4 |
-	<c,2 c> r4 |
-	<f,,2 f,> r4 |
-	<c,2 c> r4 |
-	<g,,8 g,> <[d g> <g b> <d g> <g b> <d g]> |
-	c,8 <[c e g> <e g c'> <c e g> <e g c'> <c e g]> |
+	<c,2 c'> r4 |
+	<as2 as'> r4 |
+	<g2 g'> r4 |
+	<c2 c'> r4 |
+	<g8 g'> <[g'' d'> <d' f> <g, d'> <d' f> <g, d']> |
+	<c,,8 c'> <[g'' c> <c es> <g c> <c es> <g c]> |
+	<c,,2 c'> r4 |
+	<as2 as'> r4 |
+	<bes2 bes'> r4 |
+	<es,2 es'> r4 |
+	bes'8 <[bes' f'> <f' bes> <bes, f'> <f' bes> <bes, f']> |
+	es,,8 <[bes'' es> <es g> <bes es> <es g> <bes es]> |
+	<g,2 g'> r4 |
+	<c2 c'> r4 |
+	<as2 as'> r4 |
+	<es2 es'> r4 |
+	<bes'8 bes'> <[f'' bes> <bes d> <f bes> <bes d> <f bes]> |
+	<es,,8 es'> <[es'' g bes> <g bes es> <es g bes> <g bes es> <es g bes]> |
+	<g,,2 g'> r4 |
+	<c2 c'> r4 |
+	<f,2 f'> r4 |
+	<c'2 c'> r4 |
+	<g8 g'> <[d'' g> <g b> <d g> <g b> <d g]> |
+	c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
 }
 
-$bass_eentje = \melodic{
-	\octave c;
-	<c,8 c> <[c f as!> <f as c'> <c f as> <f as c'> <c f as]> |
-	c,8 <[c e g> <e g c'> <c e g> <e g c'> <c e g]> |
-	<g,,8 g,> <[d g> <g b> <d g> <g b> <d g]> |
-	c,8 <[e g> <g c'> <e g> <g c'> <e g]> |
-	<c,8 c> <[c f a> <f a c'> <c f a> <f a c'> <c f a]> |
-	c,8 <[c e g> <e g c'> <c e g> <e g c'> <c e g]> |
-	<g,,8 g,> <[d g> <g b> <d g> <g b> <d g]> |
-	c,8 <[e g> <g c'> <e g> <g c'> <e g]> |
+$bass_eentje = \melodic\relative c{
+	<c,8 c'> <[c' f as!> <f as c> <c f as> <f as c> <c f as]> |
+	c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
+	<g,8 g'> <[d'' g> <g b> <d g> <g b> <d g]> |
+	c,8 <[e' g> <g c> <e g> <g c> <e g]> |
+	<c,8 c'> <[c' f a> <f a c> <c f a> <f a c> <c f a]> |
+	c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
+	<g,8 g'> <[d'' g> <g b> <d g> <g b> <d g]> |
+	c,8 <[e' g> <g c> <e g> <g c> <e g]> |
 }
 
-$bass_through = \melodic{
-	\octave c;
-	<g,,8 g,> <[g, b, d> <b, d f> <g, b, d> <as,!-> b-> d->> <b, d f]> |
-	<g,,8 g,> <[g, d> <d f> <g, d> <as,-> b-> d->> <b, d f]> |
+$bass_through = \melodic\relative c{
+	%61
+	<g,8 g'> <[g' b d> <b d f> <g b d> <as!-> b-> d->> <b d, f]> |
+	<g,8 g'> <[g' d'> <d' f> <g, d'> <as-> b'-> d,->> <b d f]> |
 	% copied
-	<g,,8 g,> <[g, d> <d f> <g, d> <as,-> b-> d->> <b, d f]> |
-	<g,,8 g,> <[g, d e> <d f> <g, d> <gis,-> b,-> d->> <b, d f]> |
-	<gis,,8 gis,> <[d e> <e b> <d e> <e b> <d e]> |
-	<a,,8 a,> <[c e> <e a> <c e> <e a> <c e]> |
-	<a,,8 a,> <[a, d f> <d f a> <a, d f> <d f a> <a, d f]> |
-	<a,,8 a,> <[a, c e> <c e a> <a, c e> <c e a> <a, c e]> |
+	<g,8 g'> <[g' d'> <d' f> <g, d'> <as-> b'-> d,->> <b d f]> |
+	<g,8 g'> <[g' d' e> <d' f> <g, d'> <gis-> b-> d->> <b d f]> |
+	%65
+	<gis,8 gis'> <[d'' e> <e b'> <d e> <e b'> <d e]> |
+	<a,8 a'> <[c' e> <e a> <c e> <e a> <c e]> |
+	<a,8 a'> <[a' d f> <d f a> <a d f> <d f a> <a d f]> |
+	<a,8 a'> <[a' c e> <c e a> <a c e> <c e a> <a c e]> |
 	% 4 bars copied from end verse1
-	<f,,2 f,> r4 |
-	<c,2 c> r4 |
-	<g,,8 g,> <[d g> <g b> <d g> <g b> <d g]> |
-	c,8 <[c e g> <e g c'> <c e g> <e g c'> <c e g]> |
-
-	<c,8 c> <[c es! g> <es g c'> <c es! g> <es g c'> <c es! g]> |
-	<f,,8 f,> <[d f> <f as!> <d f> <f as!> <d f]> |
-	<g,,8 g,> <[d f> <f g> <d f> <f g> <d f]> |
-	c,8 <[c e> <e g> <c e> <e g> <c e]> |
-	c,8 <[c f> <f as> <c f> <f as> <c f]> |
-	c,8 <[c e> <e g> <c e> <e g> <c e]> |
-	g,,8 <[g, d> <d f> <g, d> <d f> <g, d]> |
+	<f,2 f'> r4 |
+	%70
+	<c'2 c'> r4 |
+	<g8 g'> <[d'' g> <g b> <d g> <g b> <d g]> |
+	c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
+
+	<c,8 c'> <[c' es! g> <es g c> <c es! g> <es g c> <c es! g]> |
+	<f,,8 f'> <[d'' f> <f as!> <d f> <f as!> <d f]> |
+	%75
+	<g,,8 g'> <[d'' f> <f g> <d f> <f g> <d f]> |
+	c,8 <[c' e> <e g> <c e> <e g> <c e]> |
+	c,8 <[c' f> <f as> <c f> <f as> <c f]> |
+	c,8 <[c' e> <e g> <c e> <e g> <c e]> |
+	g,8 <[g' d'> <d' f> <g, d'> <d' f> <g, d']> |
 	% copied from two bars back
-	c,8 <[c e> <e g> <c e> <e g> <c e]> |
-	c,8 <[c e> <e g> <c e> <e g> <c e]> |
-	<c,2._\fermata g, c> |
+	%80
+	c,8 <[c' e> <e g> <c e> <e g> <c e]> |
+	c,8 <[c' e> <e g> <c e> <e g> <c e]> |
+	<c,2._\fermata g' c> |
 }
 		
 global = \melodic{
-	\meter 3/4; 
-	\key bes es as;
+	\time 3/4; 
+	\key es;
 	\skip 4 * 12;
 	\break
 	\skip 4 * 234;
@@ -357,8 +360,8 @@ $lyric_four = \lyric{
 	_ _ _
 }
 
-lyrics = \melodic{
-	\meter 3/4; 
+lyrics = {
+	\time 3/4; 
 %	\skip 4 * 12; 
 	\$lyric_four
 	\$lyric_verse1
@@ -387,7 +390,6 @@ $vocal_staff = \type Staff = vocal<
 	\$vocals
 >
 
-% treble = \melodic{
 treble = {
 	\$treble_intro 
 	\$treble_verse1 
@@ -401,7 +403,7 @@ $treble_staff = \type Staff = treble<
 	\treble
 >
 
-bass = \melodic{
+bass = {
 	\$bass_intro 
 	\$bass_verse1 
 	\$bass_eentje
@@ -414,23 +416,18 @@ $bass_staff = \type Staff = bass<
 	\bass
 >
 
-$grand_staff = \type Grand_staff<
+$grand_staff = \type GrandStaff<
 	\$treble_staff
 	\$bass_staff
 >
 
-a4 = \paper{
-	linewidth= 193.\mm;
-	\include "score-bar-numbering.ly";
-}
-
 \score{
 	<
 		\$vocal_staff
 		\$lyric_staff
 		\$grand_staff
 	>
-	\paper{ \a4 }
+	\include "score-paper.ly";
 	\midi{
 		\tempo 4 = 54;
 	}
diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
new file mode 100644
index 0000000000..4872dd69f9
--- /dev/null
+++ b/scripts/convert-mudela.py
@@ -0,0 +1,264 @@
+#!@PYTHON@
+
+# convert-mudela.py -- convertor for mudela versions
+# 
+# source file of the GNU LilyPond music typesetter
+# 
+# (c) 1998 
+
+# TODO
+#   use -f and -t for -s output
+
+# NEWS
+# 0.2
+#  - rewrite in python
+
+program_name = 'convert-mudela'
+version = '0.2'
+
+
+
+import os
+import sys
+import __main__
+import getopt
+from string import *
+import regex
+import regsub
+import time
+mudela_version_re_str ='\\\\version *\"\(.*\)\"'
+mudela_version_re = regex.compile(mudela_version_re_str)
+
+def program_id ():
+	return '%s version %s' %(program_name,  version);
+
+def identify ():
+	sys.stdout.write (program_id () + '\n')
+
+def gulp_file(f):
+	try:
+		i = open(f)
+		i.seek (0, 2)
+		n = i.tell ()
+		i.seek (0,0)
+	except:
+		print 'can\'t open file: ' + f + '\n'
+		return ''
+	s = i.read (n)
+	if len (s) <= 0:
+		print 'gulped empty file: ' + f + '\n'
+	i.close ()
+	return s
+
+
+def str_to_tuple (s):
+	return tuple (map (atoi, split (s,'.')))
+
+def tup_to_str (t):
+	return join (map (lambda x: '%s' % x, list (t)), '.')
+
+def version_cmp (t1, t2):
+	for x in [0,1,2]:
+		if t1[x] - t2[x]:
+			return t1[x] - t2[x]
+	return 0
+		
+
+def guess_mudela_version(filename):
+	s = gulp_file (filename)
+	if mudela_version_re.search(s) <> -1:
+		return mudela_version_re.group(1)
+	else:
+		return ''
+
+def help ():
+	sys.stdout.write (
+		("Usage: %s [OPTION]... [FILE]...\n" 
+		+ "Try to convert to newer mudela-versions\n"
+		+ "Options:\n"
+		+ "  -h, --help             print this help\n"
+		+ '  -e, --edit             in place edit\n'
+		+ '  -f, --from=VERSION     start from version\n'
+		+ '  -s, --show-rules       print out all rules.\n'
+		+ '  -t, --to=VERSION       target version\n') % program_name)
+	sys.exit (0)
+
+class FatalConversionError:
+	pass
+
+conversions = []
+
+def show_rules (file):
+	for x in conversions:
+		file.write  ('%s: %s\n' % (tup_to_str (x[0]), x[2]))
+
+############################
+		
+if 1:					# need new a namespace
+	def conv (lines):
+		found =0
+		for x in lines:
+			if regex.search ('\\\\octave', x) <> -1:
+				found = 1
+				break
+		if found:
+			sys.stderr.write ('\nNot smart enough to convert \\octave\n')
+			raise FatalConversionError()
+		return lines
+		
+
+	conversions.append (
+		((0,1,19), conv, 'deprecated \\octave; can\'t convert automatically'))
+
+
+if 1:					# need new a namespace
+	def conv (lines):
+		newlines = []
+		for x in lines:
+			x = regsub.gsub ('\\\\textstyle\\([^;]+\\);',
+					 '\\\\property Lyrics . textstyle = \\1', x)
+			x = regsub.gsub ('\\\\key\\([^;]+\\);', '\\\\accidentals \\1;', x)
+			newlines.append (x)
+		return newlines
+		
+
+	conversions.append (
+		((0,1,20), conv, 'deprecated \\textstyle, new \key syntax'))
+
+
+if 1:					# need new a namespace
+	def conv (lines):
+		newlines = []
+		for x in lines:
+			x = regsub.gsub ('\\\\musical_pitch',
+					 '\\\\musicalpitch',x)
+			x = regsub.gsub ('\\\\meter',
+					 '\\\\time',x)
+			newlines.append (x)
+		return newlines
+		
+
+	conversions.append (
+		((0,1,21), conv, '\\musical_pitch -> \\musicalpitch, '+
+		 '\\meter -> \\time\n'))
+
+if 1:					# need new a namespace
+	def conv (lines):
+		return lines
+
+	conversions.append (
+		((1,0,0), conv, '0.1.21 -> 1.0.0 '))
+
+
+
+############################
+
+def get_conversions (from_version, to_version):
+	def version_b (v, f = from_version, t = to_version):
+		return version_cmp (v[0], f) > 0 and version_cmp (v[0], t) <= 0
+	return filter (version_b, conversions)
+
+
+def latest_version ():
+	return conversions[-1][0]
+
+def do_conversion (infile, from_version, outfile, to_version):
+	
+	conv_list = get_conversions (from_version, to_version)
+
+	sys.stderr.write ('Applying conversions: ')
+	lines = infile.readlines();
+	last_conversion = ()
+	try:
+		for x in conv_list:
+			sys.stderr.write (tup_to_str (x[0])  + ', ')
+			lines = x[1] (lines)
+			last_conversion = x[0]
+			
+		sys.stderr.write ('\n')
+
+	except FatalConversionError:
+		sys.stderr.write ('Error while converting; I won\'t convert any further')
+
+	for x in lines:
+		if last_conversion:
+			x = regsub.sub (mudela_version_re_str, '\\version \"%s\"' % tup_to_str (last_conversion), x)
+		outfile.write(x)
+
+class UnknownVersion:
+	pass
+
+def do_one_file (infile_name):
+	outfile_name = ''
+	if __main__.edit:
+		outfile_name = infile_name + '.NEW'
+	elif __main__.outfile_name:
+		outfile_name = __main__.outfile_name
+
+	if __main__.from_version:
+		from_version = __main__.from_version
+	else:
+		guess = guess_mudela_version (infile_name)
+		if not guess:
+			raise UnknownVersion()
+		from_version = str_to_tuple (guess)
+
+	if __main__.to_version:
+		to_version = __main__.to_version
+	else:
+		to_version = latest_version ()
+
+
+	if infile_name:
+		infile = open (infile_name,'r')
+	else:
+		infile = sys.stdin
+
+	if outfile_name:
+		outfile =  open (outfile_name, 'w')
+	else:
+		outfile = sys.stdout
+
+	
+	do_conversion (infile, from_version, outfile, to_version)
+
+	if __main__.edit:
+		os.rename (infile_name, infile_name + '~')
+		os.rename (infile_name + '.NEW', infile_name)
+
+
+edit = 0
+to_version = ()
+from_version = ()
+outfile_name = ''
+
+identify ()
+(options, files) = getopt.getopt (
+	sys.argv[1:], 'f:t:seh', ['show-rules', 'help', 'edit', 'from', 'to'])
+
+for opt in options:
+	o = opt[0]
+	a = opt[1]
+	if o== '--help' or o == '-h':
+		help ()
+	elif o== '--from' or o=='-f':
+		from_version = str_to_tuple (a)
+	elif o== '--to' or o=='-t':
+		to_version = str_to_tuple (a)
+	elif o== '--edit' or o == '-e':
+		edit = 1
+	elif o== '--show-rules' or o == '-s':
+		show_rules (sys.stdout)
+		sys.exit(0)
+	else:
+		print o
+		raise getopt.error
+
+
+for f in files:
+	if f == '-':
+		f = ''
+	try:
+		do_one_file (f)
+	except UnknownVersion:
+		pass
-- 
2.39.5