From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Sep 2000 00:16:55 +0000 (+0200)
Subject: patch::: 1.3.89.jcn1
X-Git-Tag: release/1.3.90~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=593c61593d668d4e6ed766cbd87bf003971d68eb;p=lilypond.git

patch::: 1.3.89.jcn1

1.3.89.jcn1
===========

* Changed lilypond to LilyPond in ly2dvi, Mudela to LilyPond source.

* Website fixes: Changed \interline to \staffspace in manual, removed offending
  braces from mudela-book.tely.

* Fixed slur attachment correction bug.

* Added some comments about brokenness of non-empty text, ie text that has
  a width.

* Made some fixes to Coriolan.
---

diff --git a/CHANGES b/CHANGES
index 95feb90029..8e8ce43ea2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,18 @@
+1.3.89.jcn1
+===========
+
+* Changed lilypond to LilyPond in ly2dvi, Mudela to LilyPond source.
+
+* Website fixes: Changed \interline to \staffspace in manual, removed offending
+  braces from mudela-book.tely.
+
+* Fixed slur attachment correction bug.
+
+* Added some comments about brokenness of non-empty text, ie text that has
+  a width.
+
+* Made some fixes to Coriolan.
+
 1.3.89
 ======
 
diff --git a/Documentation/user/mudela-book.tely b/Documentation/user/mudela-book.tely
index cc16d77403..b135ca2f90 100644
--- a/Documentation/user/mudela-book.tely
+++ b/Documentation/user/mudela-book.tely
@@ -125,7 +125,7 @@ These commands should be in the beginning of the document:
 @end itemize
 @code{@@pagesizes} are not supported.
 
-@subsection{Examples}
+@subsection Examples
 
 Two simple examples. First a complete block:
 
@@ -150,7 +150,7 @@ and its music:
 @mudela[11pt]{<c' e' g'>}
 
 
-@subsection{@@example and @@code}
+@subsection @@example and @@code
 
 I'm not sure if this will go into the final documentation, this is
 here mostly to remember me on why things are the way they are.
@@ -221,7 +221,7 @@ to whatever he wants.
 @strong{[UGH: THIS DOES NOT HAPPEN WHEN
 YOU USE THE SHORT FORM, \MUDELA@{ ... @}, CHECK OUT WHY]}
 
-@subsection{@code{landscape} package}
+@subsection @code{landscape} package 
 There is some simple support for landscape paper format, and this
 can be combined with the @code{\twocolumn} command. Only a4 and
 letter paper is supported, more to come...
@@ -241,7 +241,7 @@ BLA BLA BLA
 \end@{document@}
 @end example
 
-@subsection{Examples}
+@subsection Examples 
 
 @example
 \begin[26pt]@{mudela@}
@@ -265,7 +265,7 @@ and its music:
 @mudela[11pt]{<c' e' g'>}
 
 
-@subsection{\begin@{verbatim@} and \verb|\verb|}
+@subsection \begin@{verbatim@} and \verb|\verb| 
 
 There work just as expected. Look at @file{mb-latex.tex} for details.
 
@@ -395,7 +395,7 @@ The La@TeX{} \includeonly@{...@} command is ignored.
 
 Ignores almost all La@TeX{} commands that changes margins and linewidths.
 
-La@TeX{} comments can confuse command{mudela-book}:
+La@TeX{} comments can confuse @command{mudela-book}:
 @example
 % this music will be displayed: \mudela@{c d e@}
 @end example
diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely
index 63b40860eb..6bb4426d22 100644
--- a/Documentation/user/properties.itely
+++ b/Documentation/user/properties.itely
@@ -300,7 +300,7 @@ r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
 @end mudela		
 
 @item @code{stemLength}@indexcode{stemLength}  
-    Set length of stems.  Unit is `@code{interline}/2', so
+    Set length of stems.  Unit is `@code{staffspace}/2', so
     @code{stemLength} defaults to 7.
 @mudela[verbatim]
 g''4 \property Voice.stemLength = #14  g4 \property Voice.stemLength = #3 g4  g,,4  
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index cd30314058..47df65e699 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -696,7 +696,7 @@ r1 r2 r4 r8 r16 r32 r64 r64
     r1 r2 r4 r8 r16 r32 r64 r64 
   }
   \paper {
-    loose_column_distance = 2.5 * \interline;
+    loose_column_distance = 2.5 * \staffspace;
     linewidth = -1.0;
     \translator {
 	\StaffContext
@@ -2471,7 +2471,7 @@ Nevertheless, here are some variables you may want to use or change:
   @item @code{indent}@indexcode{indent}  
     The indentation of the first line of music.
 
-  @item @code{interline}@indexcode{interline}  
+  @item @code{staffspace}@indexcode{staffspace}
     The distance between two staff lines, calculated from the center
     of the lines.  You should use either this or @code{rulethickness}
     as a unit for distances you modify.
diff --git a/VERSION b/VERSION
index 23eb5f64a8..c3a40bd443 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=89
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/input/test/non-empty-text.ly b/input/test/non-empty-text.ly
index 7054d872f6..03030e0b15 100644
--- a/input/test/non-empty-text.ly
+++ b/input/test/non-empty-text.ly
@@ -4,7 +4,10 @@
 %
 \score{
 	\notes\relative c''{
-		\property Staff.textNonEmpty=##t
+%%%		\property Staff.textNonEmpty=##t
+%%% burp?
+		\context Staff \property basicTextScriptProperties \pop #'no-spacing-rods
+		\context Staff \property Staff.basicTextScriptProperties \push #'no-spacing-rods = ##f
 		c4_"longlonglonglonglonglong" c4_"text" 
 		}
 	  \paper{
diff --git a/input/test/slur-positions.ly b/input/test/slur-positions.ly
new file mode 100644
index 0000000000..f78dd10a99
--- /dev/null
+++ b/input/test/slur-positions.ly
@@ -0,0 +1,17 @@
+\score{
+	\notes\relative c''{
+		\slurup
+		a2 () a\break
+		\slurdown
+		a2 () a\break
+		\slurup
+		c2 () c\break
+		\slurdown
+		c2 () c\break
+
+	}
+	\paper{
+		linewidth=-1.\mm;
+	}
+}
+
diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 7655ed74a8..37538e28be 100644
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -41,8 +41,7 @@ Multi_measure_rest::brew_molecule (SCM smob)
 {
   Score_element *me = unsmob_element (smob);
   Spanner * sp = dynamic_cast<Spanner*> (me);
-  Real staff_space
-    = Staff_symbol_referencer::staff_space (me);
+  Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   Interval sp_iv;
   Direction d = LEFT;
@@ -174,6 +173,7 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
   Item * rb = r->find_prebroken_piece (LEFT);      
   
   Item* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}};
+  Real staff_space = Staff_symbol_referencer::staff_space (me);
   for (int i=0; i < 4; i++)
     {
       Item * l =  combinations[i][0];
@@ -190,7 +190,7 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
 	  should do something more advanced.
 	 */
       rod.distance_f_ = l->extent (X_AXIS)[BIGGER] - r->extent (X_AXIS)[SMALLER]
-	+ gh_scm2double (me->get_elt_property ("minimum-width"));
+	+ gh_scm2double (me->get_elt_property ("minimum-width")) * staff_space;
   
       rod.add_to_cols ();
     }
diff --git a/lily/slur.cc b/lily/slur.cc
index 0ef9b48299..c0b3e4b9e4 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -233,7 +233,7 @@ Slur::get_attachment (Score_element*me,Direction dir,
   if (Note_column::has_interface (sp->get_bound (dir)))
     {
       Score_element * n =sp->get_bound (dir);
-      if (Score_element *stem = Note_column::stem_l (n))
+      if ((stem = Note_column::stem_l (n)))
 	{
 
 	  if (str == "head")
@@ -291,10 +291,12 @@ Slur::get_attachment (Score_element*me,Direction dir,
 
 
   // FIXME
+  int stemdir = stem ? Stem::get_direction (stem) : 1;
+  int slurdir = gh_scm2int (me->get_elt_property ("direction"));
   SCM l = scm_assoc
     (scm_listify (a,
-		  gh_int2scm (stem ? Stem::get_direction (stem) : 1 * dir),
-		  gh_int2scm (Directional_element_interface::get (me) * dir),
+		  gh_int2scm (stemdir * dir),
+		  gh_int2scm (slurdir * dir),
 		  SCM_UNDEFINED),
      scm_eval2 (ly_symbol2scm ("slur-extremity-offset-alist"), SCM_EOL));
   
diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index ffb578c120..ec8cc78071 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -78,6 +78,9 @@ Text_engraver::do_process_music ()
     {
       Text_script_req * r = reqs_[i];
 
+      /*
+	Urg:  Text_engraver loads TextScriptProperties
+       */
       Item *text = new Item (get_property ("basicTextScriptProperties"));
       
 
@@ -89,7 +92,7 @@ Text_engraver::do_process_music ()
 	make sure they're in order by adding i to the priority field.
 	*/
       text->set_elt_property ("script-priority",
-			    gh_int2scm (200 + i));
+			      gh_int2scm (200 + i));
 
       if (r->get_direction ())
 	Side_position::set_direction (text, r->get_direction ());
@@ -106,6 +109,11 @@ Text_engraver::do_process_music ()
 
        Anyway, non-empty text has been broken for some time now.
        */
+
+
+      /// URG this is broken by basicTextScriptProperties which defines
+      /// no-spacing-rods
+      /// FIXME
       SCM nonempty = get_property ("textNonEmpty");
       if (!to_boolean (nonempty))
 	/*
diff --git a/ly/engraver.ly b/ly/engraver.ly
index f41e94da6f..5194f47460 100644
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -10,6 +10,7 @@ StaffContext=\translator {
 	\consists "Property_engraver";
 	
 	\consists "Multi_measure_rest_engraver";
+
 	\consists "Bar_engraver";
  % Bar_engraver must be first so default bars aren't overwritten
 % with empty ones.
@@ -608,13 +609,13 @@ ScoreContext = \translator {
 	  (name . "rehearsal mark")
 	)
 	basicMultiMeasureRestProperties = #`(
-		(spacing-procedure . ,Multi_measure_rest::set_spacing_rods)		
+		(interfaces . (multi-measure-rest-interface))
+		(spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
 		(molecule-callback . ,Multi_measure_rest::brew_molecule)
 		(staff-position . 0)
 		(expand-limit . 10)
 		(padding . 2.0) ; staffspace
 		(minimum-width . 12.5) ; staffspace
-
 		(name . "multi-measure rest")
 	)
 	basicNoteColumnProperties = #`(
@@ -644,7 +645,10 @@ ScoreContext = \translator {
 		(axes 0)
 		(rank . -1)
 	)
+
+	%% These text props are only used by line-number-engraver...
 	basicTextProperties = #`( )
+
 	basicRestProperties = #`(
 		(interfaces . (rest-interface rhythmic-head-interface))
 		(after-line-breaking-callback . ,Rest::after_line_breaking)
diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly
index 00184d02d0..af20caefed 100644
--- a/mutopia/Coriolan/bassi-part.ly
+++ b/mutopia/Coriolan/bassi-part.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "bassi.ly"
 
diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly
index 785c8405dd..cd6756fd96 100644
--- a/mutopia/Coriolan/bassi.ly
+++ b/mutopia/Coriolan/bassi.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "violoncello.ly"
diff --git a/mutopia/Coriolan/c-midi.ly b/mutopia/Coriolan/c-midi.ly
new file mode 100644
index 0000000000..a7f76b8e84
--- /dev/null
+++ b/mutopia/Coriolan/c-midi.ly
@@ -0,0 +1,103 @@
+\header{
+filename =	 "c-midi.ly";
+title =	 "Ouverture"; 
+subtitle = "Coriolan";
+opus = "Op. 62";
+composer =	 "Ludwig van Beethoven (1770-1827)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+
+%%
+%% Hopefully, this can be junked when part-combiner+midi+dynamics work ok.
+%%
+
+\version "1.3.88";
+
+\include "global.ly"
+
+\include "flauto-1.ly"
+\include "flauto-2.ly"
+\include "oboe-1.ly"
+\include "oboe-2.ly"
+\include "clarinetto-1.ly"
+\include "clarinetto-2.ly"
+\include "fagotto-1.ly"
+\include "fagotto-2.ly"
+\include "corno-1.ly"
+\include "corno-2.ly"
+\include "trombo-1.ly"
+\include "trombo-2.ly"
+\include "timpani.ly"
+\include "violino-1.ly"
+\include "violino-2.ly"
+\include "viola-1.ly"
+\include "viola-2.ly"
+\include "violoncello.ly"
+\include "contrabasso.ly"
+
+
+
+\score{
+	<
+	\global;
+	\context Staff=flauti <
+		\property VoiceCombineStaff.midiInstrument = #"flute"
+		\flautoI
+		\flautoII
+	>
+	\context Staff=oboi <
+		\property VoiceCombineStaff.midiInstrument = #"oboe"
+		\oboeI
+		\oboeII
+	>
+	\context Staff=clarinetti <
+		\property VoiceCombineStaff.midiInstrument = #"clarinet"
+		\property VoiceCombineStaff.transposing = #-2
+		\clarinettoI
+		\clarinettoII
+	>
+	\context Staff=fagotti <
+		\property VoiceCombineStaff.midiInstrument = #"bassoon"
+		\fagottoI
+		\fagottoII
+	>
+	\context Staff=corni <
+		\property VoiceCombineStaff.midiInstrument = #"french horn"
+		\property VoiceCombineStaff.transposing = #3
+		\cornoI
+		\cornoII
+	>
+	\context Staff=trombe <
+		\property VoiceCombineStaff.midiInstrument = #"trumpet"
+		\tromboI
+		\tromboII
+	>
+	\context Staff=timpani <
+		\property Staff.midiInstrument = #"timpani"
+		\timpani
+	>
+	\context Staff=violini <
+		\property Staff.midiInstrument = #"violin"
+		\violinoI
+		\violinoII
+	>
+	\context Staff=violi <
+		\property VoiceCombineStaff.midiInstrument = #"viola"
+		\violaI
+		\violaII
+	>
+	\context Staff=violoncello <
+		\property StaffCombineStaff.midiInstrument = #"cello"
+		\violoncello
+	>
+	\context Staff=contrabasso <
+		\property StaffCombineStaff.midiInstrument = #"contrabass"
+        	\property StaffCombineStaff.transposing = #-12
+		\contrabasso
+	>
+	>
+	\include "coriolan-midi.ly"
+}
+
diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly
index 118aa53631..c538c7fe4b 100644
--- a/mutopia/Coriolan/clarinetti-part.ly
+++ b/mutopia/Coriolan/clarinetti-part.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "clarinetti.ly"
diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly
index 735770136d..2931222184 100644
--- a/mutopia/Coriolan/clarinetti.ly
+++ b/mutopia/Coriolan/clarinetti.ly
@@ -5,27 +5,25 @@ description =	 "";
 composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "clarinetto-1.ly"
 \include "clarinetto-2.ly"
 
-clarinettiStaff = \context Staff = clarinetti <
-	\property Staff.midiInstrument = #"clarinet"
-	\property Staff.instrument = #"2 Clarinetti\n(B\\textflat)"
-	\property Staff.instr = #"Cl.\n(B\\textflat)"
+clarinettiStaff = \context VoiceCombineStaff = clarinetti <
+	\property VoiceCombineStaff.midiInstrument = #"clarinet"
+	\property VoiceCombineStaff.instrument = #"2 Clarinetti\n(B\\textflat)"
+	\property VoiceCombineStaff.instr = #"Cl.\n(B\\textflat)"
 	% urg: can't; only My_midi_lexer:<non-static> () parses pitch?
-	%\property Staff.transposing = "bes"
-	\property Staff.transposing = #-2
+	%\property VoiceCombineStaff.transposing = "bes"
+	\property VoiceCombineStaff.transposing = #-2
 	\time 4/4;
 	\notes \key f \major;
 	\skip 1*314; \bar "|.";
-	\context Voice=one \partcombine Voice
-		\context Thread=one \clarinettoI
-		\context Thread=two  \clarinettoII
+	\context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+		\context VoiceCombineThread=one \clarinettoI
+		\context VoiceCombineThread=two  \clarinettoII
 >
 
diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly
index 8ffb31b876..dd1a90b1c1 100644
--- a/mutopia/Coriolan/clarinetto-1.ly
+++ b/mutopia/Coriolan/clarinetto-1.ly
@@ -5,11 +5,9 @@ description =	 "";
 composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 clarinettoI = \notes \relative c {
 	R1 *2 |
@@ -18,12 +16,12 @@ clarinettoI = \notes \relative c {
 	e4-. r r2 |
 	R1 *3 |
 	f4-. r r2 |
-	r1 |
+	R1 |
 	f4-. r r2 |
 	e4-. r r2 |
 	R1 *4 |
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	bes2\p\< ( a |
 	)gis2. \!a4-.\f |
 	R1*13 |
@@ -45,8 +43,8 @@ clarinettoI = \notes \relative c {
 	c2. c4\sf|
 	c4 r r2|
 	R1*5|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	a'2.\p\< ( bes4|
 	a g e)c|
 	c'2.( d4|
@@ -59,8 +57,8 @@ clarinettoI = \notes \relative c {
 	d~|
 	d~|
 	d|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	bes2.\<( c4|
 	bes a fis)d|
 	\!d'2\ff f|
@@ -142,8 +140,8 @@ clarinettoI = \notes \relative c {
 	)e2. f4\sf(|
 	)e4 r r2|
 	R1*9|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	fis2.\p\<(g4|
 	fis e cis)a|
 	\!a2\ff c|
@@ -162,8 +160,8 @@ clarinettoI = \notes \relative c {
 	r2 r4 d(|
 	)cis r r2|
 	r r4 r8 cis|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	d4\< r r2|
 	r r4 r8 d|
 	e4 r r r8 e|
@@ -196,8 +194,8 @@ clarinettoI = \notes \relative c {
 	d4 r8 g f4 r8 c|
 	bes4 r r2|
 	R1*11|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	f'2.\p\<(g4|
 	f e cis)a|
 	a1|
@@ -206,8 +204,8 @@ clarinettoI = \notes \relative c {
 	c\f~|
 	c\p|
 	d\f~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	d\p\<~|
 	d~|
 	d~|
@@ -237,8 +235,8 @@ clarinettoI = \notes \relative c {
 	R1|
 	d4-. d-. r2|
 	d4-. d-. r2|
-	\property Voice.decrescendoText = "dim."
-	\property Voice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = "dim."
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	d4\> r e r|
 	R1|
 	\!a,4\p r r2|
diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly
index 1f68736ad7..f6c936a712 100644
--- a/mutopia/Coriolan/clarinetto-2.ly
+++ b/mutopia/Coriolan/clarinetto-2.ly
@@ -5,11 +5,9 @@ description =	 "";
 composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 clarinettoII = \notes \relative c { 
 	R1*2 bes''4-.\ff r r2 |
@@ -17,7 +15,7 @@ clarinettoII = \notes \relative c {
 	cis4-. r r2 |
 	R1 *3 |
 	d4-. r r2 |
-	r1 |
+	R1 |
 	d4-. r r2 |
 	cis4-. r r2 |
 	R1 *5 |
@@ -51,8 +49,8 @@ clarinettoII = \notes \relative c {
 	d~|
 	d|
 	%a deux|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	bes'2.\<(c4|
 	bes a fis)d|
 	\!d'2\ff f,|
@@ -123,8 +121,8 @@ clarinettoII = \notes \relative c {
 	)e2. f4\sf(|
 	)e4 r r2|
 	R1*9|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	fis2.\p\<( g4|
 	fis e cis)a|
 	%a deux; urg|
@@ -171,8 +169,8 @@ clarinettoII = \notes \relative c {
 	c1\f~|
 	c\p|
 	a1\f|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	d,\p\<~|
 	d~|
 	d~|
@@ -204,8 +202,8 @@ clarinettoII = \notes \relative c {
 	R1|
 	a4-. c-. r2|
 	bes4-. c-. r2|
-	\property Voice.decrescendoText = "dim."
-	\property Voice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = "dim."
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	bes4\> r a r|
 	R1|
 	\!a4\p r r2|
diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly
index 77544490e5..f7336aa497 100644
--- a/mutopia/Coriolan/contrabasso.ly
+++ b/mutopia/Coriolan/contrabasso.ly
@@ -7,28 +7,28 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 contrabasso = \notes \relative c {
 	% copied 21 from cello
 	c1\ff ~ |
 	c |
 	f,4-. r r2 |
-	r1 |
+	R1 |
 	c'1\ff ~ |
 	c |
 	f,4-. r r2 |
-	r1 |
+	R1 |
 	c'1\ff ~ |
 	c |
 	fis,4-. r r2 |
-	r1 |
+	R1 |
 	g4-. r r2 |
 	g4-. r r2 |
 	c4\p r4 r2 |
 	c4 r4 r2 |
 	c4 r4 r2 |
-	r1 |
+	R1 |
 	\property StaffCombineVoice.crescendoText = "cresc."
 	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
 	c'4.\< c8 bes4. bes8 |
diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly
index e8d1a3358c..05808d950c 100644
--- a/mutopia/Coriolan/coriolan-paper.ly
+++ b/mutopia/Coriolan/coriolan-paper.ly
@@ -1,8 +1,10 @@
 \paper{
 	\paper_sixteen
 
-	textheight = 295.0\mm;
-	linewidth = 180.0\mm;
+	%textheight = 290.0\mm;
+	%linewidth = 195.0\mm;
+	textheight = 285.0\mm;
+	linewidth = 190.0\mm;
 
 	\translator{ \HaraKiriStaffContext }
 	%
@@ -49,7 +51,9 @@
 		soloADue = ##t
 		soloText = #""
 		soloIIText = #""
-		aDueText = #""
+		% This is non-conventional, but currently it is
+		% the only way to tell the difference.
+		aDueText = #"\\`a2"
 		splitInterval = #'(1 . 0)
 		changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1))
 	}
@@ -75,8 +79,6 @@
 		%% URG: this changes dynamics too
 		%%textStyle = #"italic"
 		timeSignatureStyle = #"C"
-		instrumentScriptPadding = #60  %% urg, this is in pt
-		instrScriptPadding = #40 %% urg, this is in pt
 		marginScriptHorizontalAlignment = #1
 		maximumRestCount = #1
 	}
diff --git a/mutopia/Coriolan/coriolan-part-combine-paper.ly b/mutopia/Coriolan/coriolan-part-combine-paper.ly
index 844bf454e3..32f8d1ea19 100644
--- a/mutopia/Coriolan/coriolan-part-combine-paper.ly
+++ b/mutopia/Coriolan/coriolan-part-combine-paper.ly
@@ -48,7 +48,9 @@
 		soloADue = ##t
 		soloText = #""
 		soloIIText = #""
-		aDueText = #""
+		% This is non-conventional, but currently it is
+		% the only way to tell the difference.
+		aDueText = #"\\`a2"
 		splitInterval = #'(1 . 0)
 		changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1))
 	}
@@ -74,8 +76,6 @@
 		%% URG: this changes dynamics too
 		%%textStyle = #"italic"
 		timeSignatureStyle = #"C"
-		instrumentScriptPadding = #60  %% urg, this is in pt
-		instrScriptPadding = #40 %% urg, this is in pt
 		marginScriptHorizontalAlignment = #1
 		maximumRestCount = #1
 	}
diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly
index f9f5401a5c..31fa654e03 100644
--- a/mutopia/Coriolan/coriolan-part-paper.ly
+++ b/mutopia/Coriolan/coriolan-part-paper.ly
@@ -16,8 +16,6 @@
 		%% URG: this changes dynamics too
 		%%textStyle = #"italic"
 		timeSignatureStyle = #"C"
-      		instrumentScriptPadding = #60  %% urg, this is in pt
-      		instrScriptPadding = #40 %% urg, this is in pt
 		marginScriptHorizontalAlignment = #1
 		maximumRestCount = #1
 	}
diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index 0c9a454a81..229b884455 100644
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -1,3 +1,6 @@
+%% run this through ly2dvi (afterwards -- urg ly2dvi should tee lily output)
+%% on my printer, I use dvips -O 5mm,0mm -o x.ps coriolan
+
 \header{
 filename =	 "coriolan.ly";
 title =	 "Ouverture"; 
@@ -8,7 +11,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "paper16.ly"
@@ -72,6 +75,6 @@ archiGroup = \context StaffGroup = archi_group <
 		copyright = "public domain";
 	}
 	\include "coriolan-paper.ly"
-	\include "coriolan-midi.ly"
+%	\include "coriolan-midi.ly"
 }
 
diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly
index 49b80354bd..419a3f3a38 100644
--- a/mutopia/Coriolan/corni-part.ly
+++ b/mutopia/Coriolan/corni-part.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "corni.ly"
diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly
index 6e241a7ab3..00804fd0c0 100644
--- a/mutopia/Coriolan/corni.ly
+++ b/mutopia/Coriolan/corni.ly
@@ -5,26 +5,24 @@ description =	 "";
 composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "corno-1.ly"
 \include "corno-2.ly"
 
-corniStaff = \context Staff = corni <
-	\property Staff.midiInstrument = #"french horn"
-	\property Staff.instrument = #"2 Corni\n(E\\textflat)"
-	\property Staff.instr = #"Cor.\n(E\\textflat)"
+corniStaff = \context VoiceCombineStaff = corni <
+	\property VoiceCombineStaff.midiInstrument = #"french horn"
+	\property VoiceCombineStaff.instrument = #"2 Corni\n(E\\textflat)"
+	\property VoiceCombineStaff.instr = #"Cor.\n(E\\textflat)"
 	% urg: can't; only My_midi_lexer:<non-static> () parses pitch?
-	%\property Staff.transposing = "es"
-	\property Staff.transposing = #3
+	%\property VoiceCombineStaff.transposing = "es"
+	\property VoiceCombineStaff.transposing = #3
 	\time 4/4;
 	\skip 1*314; \bar "|.";
-	\context Voice=one \partcombine Voice
-		\context Thread=one \cornoI
-		\context Thread=two \cornoII
+	\context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+		\context VoiceCombineThread=one \cornoI
+		\context VoiceCombineThread=two \cornoII
 >
 
diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly
index ff2ca983b5..c355bbf558 100644
--- a/mutopia/Coriolan/corno-1.ly
+++ b/mutopia/Coriolan/corno-1.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 cornoI = \notes \relative c {
 	R1*2 |
@@ -16,7 +16,7 @@ cornoI = \notes \relative c {
 	f4-. r r2 |
 	R1*3 |
 	c4-. r r2 |
-	r1 |
+	R1 |
 	e4-. r r2 |
 	e4-. r r2 |
 	R1*5 |
@@ -25,8 +25,8 @@ cornoI = \notes \relative c {
 	r4 g-.\f r2 |
 	R1*2 |
 	% `a 2
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r8 f\p\< f2 e4 |
 	r8 f f2 e4 |
 	f4. e8 f4. e8 |
@@ -77,7 +77,7 @@ cornoI = \notes \relative c {
 	r2 e4 r ||
 |
 	R1*4	|
-	e4\f r4 r2 r1|
+	e4\f r4 r2 R1|
 	e4\f r4 r2|
 	R1*3|
 	e4\f r8 e e4 r8 e ||
@@ -109,7 +109,7 @@ cornoI = \notes \relative c {
 	e r e r|
 	d r r2 ||
 |
-	r1|
+	R1|
 	d4-.\ff r4 r2|
 	R1*3|
 	f2\sf r2 f2 \sf r2|
@@ -172,8 +172,8 @@ cornoI = \notes \relative c {
 	e~|
 	e~|
 	e~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	e\<~|
 	e~|
 	e|
diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly
index 030c795d77..54df42524d 100644
--- a/mutopia/Coriolan/corno-2.ly
+++ b/mutopia/Coriolan/corno-2.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 cornoII = \notes \relative c {
 	R1*2 |
@@ -16,7 +16,7 @@ cornoII = \notes \relative c {
 	d4-. r r2 |
 	R1*3 |
 	c4-. r r2 |
-	r1 |
+	R1 |
 	e,4-. r r2 |
 	e4-. r r2 |
 	R1*5 |
@@ -26,8 +26,8 @@ cornoII = \notes \relative c {
 	R1*2 |
 	% `a 2
 	% urg, yes this is a-deux, but lily doesn't know about I. / a2 yet.
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r8 f'\p\< f2 e4 |
 	r8 f f2 e4 |
 	f4. e8 f4. e8 |
@@ -129,8 +129,8 @@ cornoII = \notes \relative c {
 	e~|
 	e~|
 	e~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	e\<~|
 	e~|
 	e~|
@@ -142,8 +142,8 @@ cornoII = \notes \relative c {
 	%a deux|
 	r4 r8 e,\p e4. e8|
 	r4 r8 e e4. e8|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r4 r8 e\< e4. e8|
 	r4 r8 e e4. e8|
 	r4 r8 e e4. e8|
@@ -189,8 +189,8 @@ cornoII = \notes \relative c {
 	e~|
 	e~|
 	e~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	e\<~|
 	e~|
 	e|
diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly
index 2408f7e8e7..7656907998 100644
--- a/mutopia/Coriolan/fagotti-part.ly
+++ b/mutopia/Coriolan/fagotti-part.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "fagotti.ly"
diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly
index c829f89afa..ff12fd44f7 100644
--- a/mutopia/Coriolan/fagotti.ly
+++ b/mutopia/Coriolan/fagotti.ly
@@ -7,19 +7,19 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "fagotto-1.ly"
 \include "fagotto-2.ly"
 
-fagottiStaff = \context Staff = fagotti <
-	\property Staff.midiInstrument = #"bassoon"
-	\property Staff.instrument = #"2 Fagotti"
-	\property Staff.instr = #"Fg."
+fagottiStaff = \context VoiceCombineStaff = fagotti <
+	\property VoiceCombineStaff.midiInstrument = #"bassoon"
+	\property VoiceCombineStaff.instrument = #"2 Fagotti"
+	\property VoiceCombineStaff.instr = #"Fg."
 	\clef "bass";
 	\global
-	\context Voice=one \partcombine Voice
-		\context Thread=one \fagottoI
-		\context Thread=two \fagottoII
+	\context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+		\context VoiceCombineThread=one \fagottoI
+		\context VoiceCombineThread=two \fagottoII
 >
 
diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly
index 9926d3b677..b3f185cb28 100644
--- a/mutopia/Coriolan/fagotto-1.ly
+++ b/mutopia/Coriolan/fagotto-1.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 fagottoI = \notes \relative c {
 	R1*2 |
@@ -16,20 +16,20 @@ fagottoI = \notes \relative c {
 	as4-. r r2 |
 	R1*3 |
 	a4-. r r2 |
-	r1 |
+	R1 |
 	c4-. r r2 |
 	b4-. r r2 |
 	R1*5 |
 	r2 r4 g4-.\f |
 	R1*5 |
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	ges'2\p\< f2 ~ |
 	f4 \!e-.\f r2 |
 	R1 |
 	f2\p()es |
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	d1\< |
 	d |
 	d2 d |
@@ -52,8 +52,8 @@ fagottoI = \notes \relative c {
 	)d4 r r2|
 	R1*9|
 	\clef "tenor";
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	g'2.(as4 \p\<|
 	g f d)bes
 	\clef "bass";
@@ -64,8 +64,8 @@ fagottoI = \notes \relative c {
 	c~|
 	c~|
 	c~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c\<~|
 	c|
 	\!c2\ff bes|
@@ -78,8 +78,8 @@ fagottoI = \notes \relative c {
 	bes(a bes)g|
 	fis r8 a\pp a4. a8|
 	r4 r8 a a4. a8|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r4 r8 bes\< bes4. bes8|
 	r4 r8 bes bes4. bes8|
 	r4 r8 c8 c4. c8|
@@ -127,8 +127,8 @@ fagottoI = \notes \relative c {
 	e4 r r2|
 	R1*3|
 	r4 r8 f' es4 r8 bes|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c4\< r4 r2|
 	R1*2|
 	r4 r8 ges' f4 r8 c|
@@ -147,8 +147,8 @@ fagottoI = \notes \relative c {
 	[g,: bes: c: des:][f,: bes: c: des:]||
 	[e,: g: bes: des:][c: e: g: c:]||
 
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c1\p\< ~|
 	c1~|
 	c1~|
@@ -215,8 +215,8 @@ fagottoI = \notes \relative c {
 	es(d es)c|
 	b r8 d\p d4. d8|
 	r4 r8 d d4. d8|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r4 r8 es\< es4. es8|
 	r4 r8 es es4. es8|
 	r4 r8 %
@@ -257,8 +257,8 @@ fagottoI = \notes \relative c {
 	es d b)g|
 	g'2.(as4|
 	g2)f|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	es2.\<( f4|
 	es d b)g|
 	R1|
@@ -267,8 +267,8 @@ fagottoI = \notes \relative c {
 	d\f|
 	es\p|
 	e\f|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	as,4.\p\< as8 g4. g8|
 	f4. f8 es4. es8|
 	as4. as8 g4. g8|
@@ -304,8 +304,8 @@ fagottoI = \notes \relative c {
 	R1|
 	g,4-. g-. r2|
 	as4-. bes-. r2|
-	\property Voice.decrescendoText = "dim."
-	\property Voice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = "dim."
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	c4\> r d r|
 	R1|
 	\!c,4\p r r2|
@@ -313,8 +313,10 @@ fagottoI = \notes \relative c {
 	g4 r r2|
 	R1|
 	c4\pp r r2|
-	\property Voice.decrescendoText = "sempre pi\\`u piano"
-	\property Voice.decrescendoSpanner = ""
+	\property VoiceCombineVoice.decrescendoText = "sempre pi\\`u piano"
+	% urg, "" is assumed to be hairpin...
+	%\property VoiceCombineVoice.decrescendoSpanner = ""
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	r r4 g\p\>~|
 	g1~|
 	g~|
diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly
index 2ab53247db..c7c5f77070 100644
--- a/mutopia/Coriolan/fagotto-2.ly
+++ b/mutopia/Coriolan/fagotto-2.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 fagottoII = \notes \relative c {
 	R1*2 |
@@ -16,7 +16,7 @@ fagottoII = \notes \relative c {
 	f4-. r r2 |
 	R1*3 |
 	fis4-. r r2 |
-	r1 |
+	R1 |
 	g4-. r r2 |
 	g4-. r r2 |
 	R1*5 |
@@ -43,8 +43,8 @@ fagottoII = \notes \relative c {
 	)d4 r r2|
 	R1*9|
 	\clef "tenor";
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	g''2.(as4 \p\<||
 	g f d)bes||
 	\clef "bass";
@@ -55,14 +55,14 @@ fagottoII = \notes \relative c {
 	c~|
 	c~|
 	c~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c\<~|
 	c|
 	\!c2\ff g'|
 	fis d|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	g,4 \p\< r r r8 g(|
 	)c4 r r r8 c(|
 	\!)b1\sf\>|
@@ -70,8 +70,8 @@ fagottoII = \notes \relative c {
 	R1*2|
 	r4 r8 fis\pp fis4. fis8|
 	r4 r8 fis fis4. fis8|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r4 r8 g\< g4. g8|
 	r4 r8 g g4. g8|
 	r4 r8 a a4. a8|
@@ -130,8 +130,8 @@ fagottoII = \notes \relative c {
 	e|
 	f|
 	g|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	as\<|
 	g|
 	as|
@@ -191,8 +191,8 @@ fagottoII = \notes \relative c {
 	g~|
 	g~|
 	g~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	g\<~|
 	g~|
 	g~|
@@ -205,8 +205,8 @@ fagottoII = \notes \relative c {
 	a~|
 	a~|
 	a~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	a\<~|
 	a|
 	\!f'2\ff e|
@@ -219,8 +219,8 @@ fagottoII = \notes \relative c {
 	R1*3|
 	r4 r8 b'' b4. b8|
 	r4 r8 b b4. b8|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r4 r8 c\< c4. c8|
 	r4 r8 c c4. c8|
 	\clef "tenor";
@@ -269,8 +269,8 @@ fagottoII = \notes \relative c {
 	g\p|
 	bes\f|
 	%a deux|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	as4.\p\< as8 g4. g8|
 	f4. f8 es4. es8|
 	as4. as8 g4. g8|
@@ -307,8 +307,8 @@ fagottoII = \notes \relative c {
 	R1|
 	es,4-. e-. r2|
 	f4-. g-. r2|
-	\property Voice.decrescendoText = "dim."
-	\property Voice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = "dim."
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	as4\> r b r|
 	R1|
 	%a deux|
diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly
index 088d93c799..979e7514d3 100644
--- a/mutopia/Coriolan/flauti-part.ly
+++ b/mutopia/Coriolan/flauti-part.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "flauti.ly"
diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly
index d1f7ed8e56..894ccf822b 100644
--- a/mutopia/Coriolan/flauti.ly
+++ b/mutopia/Coriolan/flauti.ly
@@ -7,18 +7,18 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "flauto-1.ly"
 \include "flauto-2.ly"
 
-flautiStaff = \notes \context Staff = flauti <
-	\property Staff.midiInstrument = #"flute"
-	\property Staff.instrument = #"2 Flauti"
-	\property Staff.instr = #"Fl."
+flautiStaff = \notes \context VoiceCombineStaff = flauti <
+	\property VoiceCombineStaff.midiInstrument = #"flute"
+	\property VoiceCombineStaff.instrument = #"2 Flauti"
+	\property VoiceCombineStaff.instr = #"Fl."
 	\global
-	\context Voice=one \partcombine Voice
-		\context Thread=one \flautoI
-		\context Thread=two \flautoII
+	\context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+		\context VoiceCombineThread=one \flautoI
+		\context VoiceCombineThread=two \flautoII
 >
 
diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly
index 4b81af8df7..421655303e 100644
--- a/mutopia/Coriolan/flauto-1.ly
+++ b/mutopia/Coriolan/flauto-1.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 flautoI = \notes \relative c {
 	R1 *2 |
@@ -16,23 +16,23 @@ flautoI = \notes \relative c {
 	d4-. r r2 |
 	R1 *3 |
 	es4-. r r2 |
-	r1 |
+	R1 |
 	g4-. r r2 |
 	b,4-. r r2 |
 	R1 *4 |
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r2 g'\p\< ( |
 	)fis2. \!g4-.\f |
 	R1*5 |
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r2 f\p\< ~ |
 	f4 \!e-.\f r2 |
 	R1 |
 	f2\p()es |
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	d1\<  |
 	d1 |
 	d2 d2 |
@@ -55,8 +55,8 @@ flautoI = \notes \relative c {
 	)f2. ges4\sf|
 	f4 r r2 |
 	R1*9|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	g2.\p\<(f4|
 	as g d)bes
 	\!bes2\ff des|
@@ -65,14 +65,14 @@ flautoI = \notes \relative c {
 	c~|
 	c~|
 	c~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c\<~|
 	c~|
 	\!c2\ff es|
 	d1~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	d\p\<~|
 	d~| 
 	d2.()f4|
@@ -82,8 +82,8 @@ flautoI = \notes \relative c {
 	\!fis\pp r r2|
 	r2 r4 r8 a|
 	bes4 r r2|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r r4 r8 bes\<|
 	c4 r r r8 c |
 	d4 r r r8 d|
@@ -129,8 +129,8 @@ flautoI = \notes \relative c {
 	r4 r8 f' es4 r8 bes|
 	c4 r r2|
 	R1*2|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = ""
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r4 r8 ges'\< f4 r8 c|
 	des4 r r2|
 	R1*5|
@@ -164,15 +164,15 @@ flautoI = \notes \relative c {
 	)d2. es4\sf(|
 	)d r r2|
 	R1*9|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	e2.\p\<(f4|
 	e d b )g|
 	\!g2\ff bes|
 	a1~a4\p r r2|
 	R1*3|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	a1\<~|
 	a|
 	\!a2\ff c|
@@ -215,8 +215,8 @@ flautoI = \notes \relative c {
 	c r8 f8 es4 r8 bes|
 	as4-. des4-. r2|
 	R1*11|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	es2.\p\<(f4|
 	es d b)g|
 	g1|
@@ -255,8 +255,8 @@ flautoI = \notes \relative c {
 	R1|
 	c4-. c4-. r2|
 	c4-. c4-. r2|
-	\property Voice.decrescendoText = "dim."
-	\property Voice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = "dim."
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	c4\> r d r|
 	R1|
 	\!es4\p r r2|
diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly
index 4d79122b6b..5f4712ff7e 100644
--- a/mutopia/Coriolan/flauto-2.ly
+++ b/mutopia/Coriolan/flauto-2.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 flautoII = \notes \relative c {
 	R1 *2 |
@@ -16,7 +16,7 @@ flautoII = \notes \relative c {
 	b4-. r r2 |
 	R1 *3 |
 	c4-. r r2 |
-	r1 |
+	R1 |
 	es4-. r r2 |
 	d,4-. r r2 |
 	R1 *4 |
@@ -131,8 +131,8 @@ flautoII = \notes \relative c {
 	bes\f~|
 	bes\p|
 	c1\f~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c\p\<~|
 	c~|
 	c~|
@@ -166,8 +166,8 @@ flautoII = \notes \relative c {
 	R1|
 	c4-. g'-. r2|
 	as4-. e-. r2|
-	\property Voice.decrescendoText = "dim."
-	\property Voice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = "dim."
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	f4\> r f r|
 	R1|
 	\!es4\p r r2|
diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly
index 6cc38edca0..6e196c4937 100644
--- a/mutopia/Coriolan/global.ly
+++ b/mutopia/Coriolan/global.ly
@@ -5,11 +5,9 @@ description =	 "";
 composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 global = \notes {
 	\time 4/4;
diff --git a/mutopia/Coriolan/music.ly b/mutopia/Coriolan/music.ly
index 240986b5c8..5960da4dbb 100644
--- a/mutopia/Coriolan/music.ly
+++ b/mutopia/Coriolan/music.ly
@@ -13,6 +13,7 @@ trombo-2.ly
 timpani.ly
 violino-1.ly
 violino-2.ly
-viola.ly
+viola-1.ly
+viola-2.ly
 violoncello.ly
 contrabasso.ly
diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly
index 7abc8b5c0a..5f51bb7a8f 100644
--- a/mutopia/Coriolan/oboe-1.ly
+++ b/mutopia/Coriolan/oboe-1.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 oboeI = \notes \relative c'' {
 	R1*2 |
@@ -16,23 +16,23 @@ oboeI = \notes \relative c'' {
 	as4-. r r2 |
 	R1*3 |
 	a4-. r r2 |
-	r1 |
+	R1 |
 	g4-. r r2 |
 	g4-. r r2 |
 	R1 *4 |
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	as2\p\< ( g |
 	)fis2. \!g4-.\f |
 	R1*5 |
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	ges2\p\<  f ~ |
 	f4 \!e\f r2 |
 	R1 |
 	f2\p()es |
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	d1\< |
 	d |
 	d2 d |
@@ -55,22 +55,22 @@ oboeI = \notes \relative c'' {
 	)f2. ges4(|
 	)f4 r r2|
 	R1*9|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	g2.\p\<( as4|
 	g f d)bes|
 	\!bes'2\ff des|
 	c bes|
 	as4\p r r2|
 	R1*3|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	as2.\p\<( bes4|
 	as g e)c|
 	\!c'2\ff es,|
 	d1~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	d\p\< ~|
 	d~|
 	\!d2.\sf\>()f4|
@@ -80,8 +80,8 @@ oboeI = \notes \relative c'' {
 	fis\pp r r2|
 	r r4 r8 fis' |
 	g4 r r2|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r r4 r8 g\<|
 	a4 r r r8 a|
 	bes4 r r r8 bes|
@@ -127,8 +127,8 @@ oboeI = \notes \relative c'' {
 	des4 r r r8 c|
 	bes4 r8 es f4 r8 f|
 	g4 r8 g e4 r 8 e|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c'1\p\< ~|
 	c~|
 	c~|
@@ -158,8 +158,8 @@ oboeI = \notes \relative c'' {
 	)g2. fis4\sf(|
 	)g4 r r2|
 	R1*5|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	e2.\p\< (f4|
 	e d b)g|
 	g'2.(a4 g2)f|
@@ -171,8 +171,8 @@ oboeI = \notes \relative c'' {
 	a~|
 	a~|
 	a|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	f2.\<( g4|
 	f e cis)a|
 	\!a'2\ff c|
@@ -187,8 +187,8 @@ oboeI = \notes \relative c'' {
 	es(d es)c|
 	b r r2|
 	r r4 r8 d|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	es4\< r r2|
 	r r4 r8 es|
 	f4 r r r8 f|
@@ -224,8 +224,8 @@ oboeI = \notes \relative c'' {
 	es d b)g|
 	g'2.(as4|
 	g2)f|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	es2.\<( f4|
 	es d b)g|
 	c1|
@@ -234,8 +234,8 @@ oboeI = \notes \relative c'' {
 	f\f|
 	g\p|
 	g\f|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c\p\<~|
 	c~|
 	c~|
diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly
index aea27fb3b4..92fed5760b 100644
--- a/mutopia/Coriolan/oboe-2.ly
+++ b/mutopia/Coriolan/oboe-2.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 oboeII = \notes \relative c{
 	R1*2|
@@ -16,7 +16,7 @@ oboeII = \notes \relative c{
 	f4-. r r2 |
 	R1*3 |
 	es4-. r r2 |
-	r1 |
+	R1 |
 	es4-. r r2 |
 	b4-. r r2 |
 	R1*5 |
@@ -74,8 +74,8 @@ oboeII = \notes \relative c{
 	bes4 r8 bes bes4 r8 bes|
 	bes4\p r r2|
 	R1*15|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r4 r8 as'\< ges4 r8 des|
 	es4 r8 bes' as4 r8 es|
 	f4 r r2|
@@ -85,8 +85,8 @@ oboeII = \notes \relative c{
 	des4 r r r8 c|
 	bes4 r8 bes bes4 r8 bes|
 	bes4 r8 bes bes4 r8 bes|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c1\p\< ~||
 	c~|
 	c~|
@@ -150,8 +150,8 @@ oboeII = \notes \relative c{
 	d\f|
 	es\p|
 	e\f|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c\p\< ~|
 	c~|
 	c~|
@@ -183,8 +183,8 @@ oboeII = \notes \relative c{
 	R1|
 	c4-. c-. r2|
 	c4-. c-. r2|
-	\property Voice.decrescendoText = "dim."
-	\property Voice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = "dim."
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	c4\> r d r|
 	R1|
 	\!c4\p r r2|
diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly
index a90ea3a419..07e0b59a56 100644
--- a/mutopia/Coriolan/oboi-part.ly
+++ b/mutopia/Coriolan/oboi-part.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "oboi.ly"
diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly
index 73d216c869..1c660bec86 100644
--- a/mutopia/Coriolan/oboi.ly
+++ b/mutopia/Coriolan/oboi.ly
@@ -5,21 +5,19 @@ description =	 "";
 composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "oboe-1.ly"
 \include "oboe-2.ly"
 
-oboiStaff = \context Staff = oboi <
-	\property Staff.midiInstrument = #"oboe"
-	\property Staff.instrument = #"2 Oboi"
-	\property Staff.instr = #"Ob."
+oboiStaff = \context VoiceCombineStaff = oboi <
+	\property VoiceCombineStaff.midiInstrument = #"oboe"
+	\property VoiceCombineStaff.instrument = #"2 Oboi"
+	\property VoiceCombineStaff.instr = #"Ob."
 	\global
-	\context Voice=one \partcombine Voice
-		\context Thread=one \oboeI
-		\context Thread=two \oboeII
+	\context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+		\context VoiceCombineThread=one \oboeI
+		\context VoiceCombineThread=two \oboeII
 >
diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly
index 322d29b5bc..0522f75a57 100644
--- a/mutopia/Coriolan/timpani-part.ly
+++ b/mutopia/Coriolan/timpani-part.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "timpani.ly"
diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly
index 0593edc4c7..230fa26fb7 100644
--- a/mutopia/Coriolan/timpani.ly
+++ b/mutopia/Coriolan/timpani.ly
@@ -5,11 +5,9 @@ description =	 "";
 composer =	 "Ludwig van Beethoven (1770-1827)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 timpani = \notes \relative c {
 	R1*2 |
@@ -18,7 +16,7 @@ timpani = \notes \relative c {
 	c4-. r r2 |
 	R1*3 |
 	c4-. r r2 |
-	r1 |
+	R1 |
 	g4-. r r2 |
 	g4-. r r2 |
 	R1*5 |
diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly
index b2070a0903..c60d58e7eb 100644
--- a/mutopia/Coriolan/trombe-part.ly
+++ b/mutopia/Coriolan/trombe-part.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "trombe.ly"
diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly
index 5a778108a9..c71b550a1c 100644
--- a/mutopia/Coriolan/trombe.ly
+++ b/mutopia/Coriolan/trombe.ly
@@ -7,18 +7,21 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "trombo-1.ly"
 \include "trombo-2.ly"
 
-trombeStaff = \context Staff = trombe <
-	\property Staff.midiInstrument = #"trumpet"
-	\property Staff.instrument = #"2 Trombe\n(C)"
-	\property Staff.instr = #"Tbe.\n(C)"
-	\time 4/4;
-	\context Voice=one \partcombine Voice
-		\context Thread=one \tromboI
-		\context Thread=two \tromboII
+trombeStaff = \context VoiceCombineStaff = trombe <
+	\context VoiceCombineStaff=trombe {
+		\property VoiceCombineStaff.midiInstrument = #"trumpet"
+		\property VoiceCombineStaff.instrument = #"2 Trombe\n(C)"
+		\property VoiceCombineStaff.instr = #"Tbe.\n(C)"
+		\skip 1*314; 
+		\bar "|."; 
+	}
+	\context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+		\context VoiceCombineThread=one \tromboI
+		\context VoiceCombineThread=two \tromboII
 >
 
diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly
index eccad50629..1c5252ec6e 100644
--- a/mutopia/Coriolan/trombo-1.ly
+++ b/mutopia/Coriolan/trombo-1.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 tromboI = \notes \relative c {
 	R1*2 |
@@ -16,7 +16,7 @@ tromboI = \notes \relative c {
 	c4-. r r2 |
 	R1*3 |
 	c4-. r r2 |
-	r1 |
+	R1 |
 	g4-. r r2 |
 	g4-. r r2 |
 	R1*5 |
@@ -24,8 +24,8 @@ tromboI = \notes \relative c {
 	R1*6 |
 	r4 c-.\f r2 |
 	R1*2 |
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r2 c4\p\< r |
 	r2 c4 r |
 	r2 c4 r |
@@ -116,8 +116,8 @@ tromboI = \notes \relative c {
 	c4 r r2|
 	R1*18|
 	e1\f(|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	)c\p\< ~|
 	c~|
 	c~|
@@ -149,8 +149,8 @@ tromboI = \notes \relative c {
 	R1|
 	c4-. c-. r2|
 	c4-. c-. r2|
-	\property Voice.decrescendoText = "dim."
-	\property Voice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = "dim."
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	c4\> r g r|
 	R1|
 	\!g4\p r r2|
diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly
index 057d8fa85c..925a560162 100644
--- a/mutopia/Coriolan/trombo-2.ly
+++ b/mutopia/Coriolan/trombo-2.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 tromboII = \notes \relative c {
 	R1*2 |
@@ -16,7 +16,7 @@ tromboII = \notes \relative c {
 	c4-. r r2 |
 	R1*3 |
 	c4-. r r2 |
-	r1 |
+	R1 |
 	g4-. r r2 |
 	g4-. r r2 |
 	R1*5 |
@@ -24,8 +24,8 @@ tromboII = \notes \relative c {
 	R1*6 |
 	r4 c-.\f r2 |
 	R1*2 |
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	r2 c4\p\< r |
 	r2 c4 r |
 	r2 c4 r |
@@ -116,8 +116,8 @@ tromboII = \notes \relative c {
 	c4 r r2|
 	R1*18|
 	c1\f~|
-	\property Voice.crescendoText = "cresc."
-	\property Voice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c\p\< ~|
 	c~|
 	c~|
@@ -149,8 +149,8 @@ tromboII = \notes \relative c {
 	R1|
 	c,4-. c-. r2|
 	c4-. c-. r2|
-	\property Voice.decrescendoText = "dim."
-	\property Voice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = "dim."
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	c4\> r g r|
 	R1|
 	\!g4\p r r2|
diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly
index 03ffeb7e1b..32c87b6cf2 100644
--- a/mutopia/Coriolan/viola-1.ly
+++ b/mutopia/Coriolan/viola-1.ly
@@ -7,23 +7,23 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 violaI = \notes \relative c {
 	c'1\ff ~ |
 	c |
 	f,4-. r r2 |
-	r1 |
+	R1 |
 	% copied 3 bars from three back...
 	%5
 	c'1 ~ |
 	c |
 	f,4-. r r2 |
-	r1 |
+	R1 |
 	c'1 ~ |
 	c |
 	fis,4-. r r2 |
-	r1 |
+	R1 |
 	g'4-. r r2 |
 	g4-. r r2 |
 	% copied from violino-1...
@@ -32,8 +32,8 @@ violaI = \notes \relative c {
 	[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] |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	es4.\< es8 d4. d8 |
 	%20
 	c4. c8 \!b4\f r4 |
@@ -43,15 +43,15 @@ violaI = \notes \relative c {
 	r4 [des8\p()c][c-. ges'-.][ges()f] |
 	%25
 	[f-. bes-.][bes()a][a-. es'-.][es()des] |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	des4.\< des8 c4. c8 |
 	bes4 \!bes4-.\f r2 |
 	R1
 	% same rhythm as violins...
 	r8 c-.\p c4. c8-. c4~ |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[c8\< c-.]c2.~ |
 	%30
 	[c8 c-.]c2.~ |
@@ -84,8 +84,8 @@ violaI = \notes \relative c {
 	)g4 r r r8 g(|
 	%55
 	)d4 r r r8 d(|
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	)es4 r\< r  r8 es(|
 	)as4 r r r8 as(|
 	)g4 r r r8 g(|
@@ -100,15 +100,15 @@ violaI = \notes \relative c {
 	)bes4 r r r8 bes(|
 	)as4 r r r8 as(|
 	)e4 r r r8 e(|
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	)f4\< r r r8 f(|
 	)bes4 r r r8 bes |
 	%70
 	\!c2:\ff bes: |
 	a: fis: |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	g4\p\< r r r8 g(|
 	)c,4 r r r8 c |
 	[\!f8\sf(\>as f as][f g d)\!g] |
@@ -119,8 +119,8 @@ violaI = \notes \relative c {
 	[d,-.\pp d'-.] es4. es8-. d4 ~ |
 	[d8 d-.] es4. es8-. d4 ~ |
 	%80
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[d8\< d-.] es4. es8-. d4 ~ |
 	[d8 d-.] es4. es8-. d4 ~ |
 	[d8 d-.] es4. es8-. d4 ~ |
@@ -187,8 +187,8 @@ violaI = \notes \relative c {
 	[e g b c][des c g e]|
 	[f as c des][c des as f]|
 	[g bes d es][d es bes g]|
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[as\< c d es][f es c as]|
 	%131
 	[g bes d es][f es bes g]|
@@ -211,8 +211,8 @@ violaI = \notes \relative c {
 	[g,: bes: c: des:][f,: bes: c: des:]|
 	[e,: g: bes: des:][c,: e: g: c:]|
 	%shared with cello from here on
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[f,8\p\< as c des][es, g b c]|
 	[des, f a bes][c, es g as]|
 	% uhuh, still 'same as cello';
@@ -268,8 +268,8 @@ violaI = \notes \relative c {
 	%180
 	)e4 r r r8 e8(|
 	)b'4 r r r8 b8(|
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	)c4 r\< r r8 c,8(|
 	% copied
 	)f4 r r r8 f8(|
@@ -284,8 +284,8 @@ violaI = \notes \relative c {
 	d,4\p r r r8 d8(|
 	)g4 r r r8 g8(|
 	)f4 r r r8 f8(|
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	)cis4\< r r r8 cis8(|
 	)d4 r r r8 d8(|
 	%195
@@ -306,8 +306,8 @@ violaI = \notes \relative c {
 	r[c\p(as)c]r[c(a)c] |
 	[b-. g'-.] as4. as8-. g4 ~ |
 	[g8 g-.] as4. as8-. g4 ~ |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[g8 g-.\<] as4. as8-. g4 ~ |
 	[g8 g-.] as4. as8-. g4 ~ |
 	%210
@@ -350,8 +350,8 @@ violaI = \notes \relative c {
 	%240
 	f,4 r r2 |
 	R1*11 |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c'4\p\< r r r8 c8(|
 	)f4 r r r8 f,8(|
 	)es1 |
@@ -364,8 +364,8 @@ violaI = \notes \relative c {
 	e'2:16\f e: |
 	
 	%260
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[as,8\p\< f']f4. es8 es4 ~ |
 	[es8 as]as4. g8 g4 ~ |
 	[g8 f]f4. es8 es4 ~ |
@@ -400,8 +400,8 @@ violaI = \notes \relative c {
 	es4-. e-. r2 |
 	f4-. g-. r2 |
 	%290
-	\property StaffCombineVoice.decrescendoText = "dim."
-	\property StaffCombineVoice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = "dim."
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	as4\> r g r |
 	R1 |
 	\!c4\p r r2 |
diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly
index b7f3effbd6..5a66c8c0ed 100644
--- a/mutopia/Coriolan/viola-2.ly
+++ b/mutopia/Coriolan/viola-2.ly
@@ -7,23 +7,23 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 violaII = \notes \relative c {
 	c1\ff ~ |
 	c |
 	f4-. r r2 |
-	r1 |
+	R1 |
 	% copied 3 bars from three back...
 	%5
 	c1 ~ |
 	c |
 	f4-. r r2 |
-	r1 |
+	R1 |
 	c1 ~ |
 	c |
 	fis4-. r r2 |
-	r1 |
+	R1 |
 	g4-. r r2 |
 	g4-. r r2 |
 	% copied from violino-1...
@@ -32,8 +32,8 @@ violaII = \notes \relative c {
 	[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] |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	es4.\< es8 d4. d8 |
 	%20
 	c4. c8 \!b4\f r4 |
@@ -43,15 +43,15 @@ violaII = \notes \relative c {
 	r4 [des8\p()c][c-. ges'-.][ges()f] |
 	%25
 	[f-. bes-.][bes()a][a-. es'-.][es()des] |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	des4.\< des8 c4. c8 |
 	bes4 \!bes4-.\f r2 |
 	R1
 	% same rhythm as violins...
 	r8 c,-.\p c4. c8-. c4~ |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[c8\< c-.]c2.~ |
 	%30
 	[c8 c-.]c2.~ |
@@ -84,8 +84,8 @@ violaII = \notes \relative c {
 	)g4 r r r8 g(|
 	%55
 	)d4 r r r8 d(|
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	)es4 r\< r  r8 es(|
 	)as4 r r r8 as(|
 	)g4 r r r8 g(|
@@ -100,15 +100,15 @@ violaII = \notes \relative c {
 	)bes4 r r r8 bes(|
 	)as4 r r r8 as(|
 	)e4 r r r8 e(|
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	)f4\< r r r8 f(|
 	)bes4 r r r8 bes |
 	%70
 	\!as2:\ff g: |
 	fis: d: |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	g4\p\< r r r8 g(|
 	)c,4 r r r8 c |
 	[\!f8\sf(\>as f as][f g d)\!g] |
@@ -119,8 +119,8 @@ violaII = \notes \relative c {
 	[d-.\pp d'-.] es4. es8-. d4 ~ |
 	[d8 d-.] es4. es8-. d4 ~ |
 	%80
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[d8\< d-.] es4. es8-. d4 ~ |
 	[d8 d-.] es4. es8-. d4 ~ |
 	[d8 d-.] es4. es8-. d4 ~ |
@@ -187,8 +187,8 @@ violaII = \notes \relative c {
 	[e g b c][des c g e]|
 	[f as c des][c des as f]|
 	[g bes d es][d es bes g]|
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[as\< c d es][f es c as]|
 	%131
 	[g bes d es][f es bes g]|
@@ -211,8 +211,8 @@ violaII = \notes \relative c {
 	[g,: bes: c: des:][f,: bes: c: des:]|
 	[e,: g: bes: des:][c,: e: g: c:]|
 	%shared with cello from here on
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[f,8\p\< as c des][es, g b c]|
 	[des, f a bes][c, es g as]|
 	% uhuh, still 'same as cello';
@@ -268,8 +268,8 @@ violaII = \notes \relative c {
 	%180
 	)e4 r r r8 e8(|
 	)b'4 r r r8 b8(|
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	)c4 r\< r r8 c,8(|
 	% copied
 	)f4 r r r8 f8(|
@@ -284,8 +284,8 @@ violaII = \notes \relative c {
 	d,4\p r r r8 d8(|
 	)g4 r r r8 g8(|
 	)f4 r r r8 f8(|
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	)cis4\< r r r8 cis8(|
 	)d4 r r r8 d8(|
 	%195
@@ -306,8 +306,8 @@ violaII = \notes \relative c {
 	r[as\p(d,)as']r[a(es)a] |
 	[g-. g'-.] as4. as8-. g4 ~ |
 	[g8 g-.] as4. as8-. g4 ~ |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[g8 g-.\<] as4. as8-. g4 ~ |
 	[g8 g-.] as4. as8-. g4 ~ |
 	%210
@@ -350,8 +350,8 @@ violaII = \notes \relative c {
 	%240
 	f,4 r r2 |
 	R1*11 |
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	c'4\p\< r r r8 c8(|
 	)f4 r r r8 f,8(|
 	)es1|
@@ -364,8 +364,8 @@ violaII = \notes \relative c {
 	bes2:16\f bes: |
 	
 	%260
-	\property StaffCombineVoice.crescendoText = "cresc."
-	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = "cresc."
+	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	[as8\p\< f']f4. es8 es4 ~ |
 	[es8 as]as4. g8 g4 ~ |
 	[g8 f]f4. es8 es4 ~ |
@@ -400,8 +400,8 @@ violaII = \notes \relative c {
 	es4-. e-. r2 |
 	f4-. g-. r2 |
 	%290
-	\property StaffCombineVoice.decrescendoText = "dim."
-	\property StaffCombineVoice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = "dim."
+	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
 	as4\> r g r |
 	R1 |
 	\!c4\p r r2 |
diff --git a/mutopia/Coriolan/violi-part.ly b/mutopia/Coriolan/violi-part.ly
index 0116a65afb..71d6c48167 100644
--- a/mutopia/Coriolan/violi-part.ly
+++ b/mutopia/Coriolan/violi-part.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "violi.ly"
 
diff --git a/mutopia/Coriolan/violi.ly b/mutopia/Coriolan/violi.ly
index ac753a8485..465c167c2b 100644
--- a/mutopia/Coriolan/violi.ly
+++ b/mutopia/Coriolan/violi.ly
@@ -7,12 +7,13 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "viola-1.ly"
 \include "viola-2.ly"
 
+%{
 violiGroup = \context PianoStaff = violi_group \notes <
 	\context StaffCombineStaff=oneVioli {
 		\property StaffCombineStaff.midiInstrument = #"viola"
@@ -37,3 +38,20 @@ violiGroup = \context PianoStaff = violi_group \notes <
 		\context StaffCombineVoice=one \violaI
 		\context StaffCombineVoice=two \violaII
 >
+%}
+
+violiGroup = \notes \context VoiceCombineStaff = violi <
+	\context VoiceCombineStaff=violi {
+		\property VoiceCombineStaff.midiInstrument = #"viola"
+		\property VoiceStaffCombineStaff.instrument = #"Viola"
+		\property VoiceStaffCombineStaff.instr = #"Vla."
+		\clef "alto"; 
+		\key es \major;
+		\skip 1*314; 
+		\bar "|."; 
+	}
+	\context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+		\context VoiceCombineThread=one \violaI
+		\context VoiceCombineThread=two \violaII
+>
+
diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly
index a43139f217..8ce0a1f83d 100644
--- a/mutopia/Coriolan/violino-1-part.ly
+++ b/mutopia/Coriolan/violino-1-part.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "violino-1.ly"
diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly
index 43ee469fb6..fca5ff48e6 100644
--- a/mutopia/Coriolan/violino-1.ly
+++ b/mutopia/Coriolan/violino-1.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 violinoI = \notes \relative c {
 	c'1\ff ~ |
@@ -424,7 +424,9 @@ violinoI = \notes \relative c {
 	R1 |
 	
 	\property Voice.decrescendoText = "sempre pi\\`u piano"
-	\property Voice.decrescendoSpanner = ""
+	% urg, "" is assumed to be hairpin...
+	%\property Voice.decrescendoSpanner = ""
+	\property Voice.decrescendoSpanner = "dashed-line"
 	c1^"arco"\> ~ |
 	c2 b2 |
 	c1 ~ |
diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly
index 9431b99d1f..ee899f6cf7 100644
--- a/mutopia/Coriolan/violino-2-part.ly
+++ b/mutopia/Coriolan/violino-2-part.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "violino-2.ly"
diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly
index 2db6348856..87f75ae7f1 100644
--- a/mutopia/Coriolan/violino-2.ly
+++ b/mutopia/Coriolan/violino-2.ly
@@ -7,7 +7,7 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 violinoII = \notes \relative c {
 	c'1\ff ~ |
diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly
index 7877ef4c1f..c17fa996b0 100644
--- a/mutopia/Coriolan/violoncello.ly
+++ b/mutopia/Coriolan/violoncello.ly
@@ -7,28 +7,27 @@ enteredby =	 "JCN";
 copyright =	 "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 violoncello = \notes \relative c {
 	c1\ff ~ |
 	c |
 	f,4-. r r2 |
-	r1 |
+	R1 |
 	c'1\ff ~ |
 	c |
 	f,4-. r r2 |
-	\property StaffCombineStaff.instr = #"Vc.\nCb."
-	r1 |
+	R1 |
 	c'1\ff ~ |
 	c |
 	fis,4-. r r2 |
-	r1 |
+	R1 |
 	g4-. r r2 |
 	g4-. r r2 |
 	c4\p r4 r2 |
 	c4 r4 r2 |
 	c4 r4 r2 |
-	r1 |
+	R1 |
 	\property StaffCombineVoice.crescendoText = "cresc."
 	\property StaffCombineVoice.crescendoSpanner = "dashed-line"
 	c'4.\< c8 bes4. bes8 |
@@ -458,7 +457,9 @@ violoncello = \notes \relative c {
 	[c8-.-"arco" es-.][es()d][d-. as'-.][as()g] |
 	R1
 	\property StaffCombineVoice.decrescendoText = "sempre pi\\`u piano"
-	\property StaffCombineVoice.decrescendoSpanner = ""
+	% urg, "" is assumed to be hairpin...
+	%\property StaffCombineVoice.decrescendoSpanner = ""
+	\property StaffCombineVoice.decrescendoSpanner = "dashed-line"
 	\times 2/3 {  c,4\> ( es c ~ } \times 2/3 {  c as' )g } |
 
 	%300
diff --git a/scm/slur.scm b/scm/slur.scm
index 2574afd619..27f26ee0ef 100644
--- a/scm/slur.scm
+++ b/scm/slur.scm
@@ -77,7 +77,7 @@
 
 ;; This list defines the offsets for each type of attachment.
 ;; The format of each element is
-;; (attachment stem-dir * attachment-dir slur-dir)
+;; (stem-dir * dir . slur-dir * dir)
 ;; Different attachments have different default points:
 ;;
 ;; head: Default position is centered in X, on outer side of head Y
@@ -85,16 +85,16 @@
 ;; stem: Default position is on stem X, at stem end Y
 (define slur-extremity-offset-alist
   '(
-    ((head 1 1) . (-0.25 . 0.2))
+    ((head 1 1) . (-0.25 . 0.25))
     ((head 1 -1) . (-0.25 . -0.25))
     ((head -1 1) . (-0.25 . 0.25))
-    ((head -1 -1) . (-0.85 . -0.2))
+    ((head -1 -1) . (-0.85 . -0.25))
 
     ((stem 1 1) . (0 . 0.5))
     ((stem -1 -1) . (0 . -0.5))
 
-    ((loose-end -1 1) . (-4 . 0))
-    ((loose-end -1 -1) . (-4 . 0))
     ((loose-end 1 1) . (-0.4 . 0))
     ((loose-end 1 -1) . (-0.4 . 0))
+    ((loose-end -1 -1) . (-4 . 0))
+    ((loose-end -1 1) . (-4 . 0))
     ))
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 54e93d7e92..a6b4af0972 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -397,7 +397,7 @@ class Properties:
         # Requester     Description
         # ---------     -----------
         # init          Initial default values
-        # file          The values found in the lilypond generated TeX files
+        # file          The values found in the LilyPond generated TeX files
         # environment   Envrionment variables LILYINCLUDE, LILYPONDPREFIX
         # rcfile        $LILYPONDPREFIX/.lilyrc
         # rcfile        $HOME/.lilyrc
@@ -880,7 +880,7 @@ class Properties:
     #
     def setRoot(this,path, requester):	
         """
-        Set lilypond root directory
+        Set LilyPond root directory
         """
 
         os.environ['LILYPONDPREFIX'] = path
@@ -960,7 +960,7 @@ def unc2dos(path):
     
 
 def program_id ():
-    return 'ly2dvi (GNU lilypond) ' + version;
+    return 'ly2dvi (GNU LilyPond) ' + version;
 
 
 def mailaddress():
@@ -980,20 +980,20 @@ def help ():
     sys.stdout.write (
 """Usage: %s [OPTION]... [FILE]...
 
-Generate dvi file from mudela or lilypond output
+Generate dvi file from LilyPond source/output
 
 Options:
   -D,--debug           increase verbosity
   -F,--headers=        name of additional LaTeX headers file
   -H,--Height=         set paper height (points) (see manual page)
   -I,--include=DIR     add DIR to LilyPond\'s search path
-  -K,--keeplilypond    keep lilypond output files
+  -K,--keeplilypond    keep LilyPond output files
   -L,--landscape       set landscape orientation
   -N,--nonumber        switch off page numbering
-  -O,--orientation=    set orientation (obsolete - use -L instead)
-  -P,--postscript      generate postscript file
+  -O,--orientation=    set orientation (obsolete -- use -L instead)
+  -P,--postscript      generate PostScript file
   -W,--Width=          set paper width (points) (see manual page)
-  -M,--dependencies    tell lilypond make a dependencies file
+  -M,--dependencies    tell LilyPond to make a dependencies file
   -h,--help            this help text
   -k,--keeply2dvi      keep ly2dvi output files
   -l,--language=       give LaTeX language (babel)
@@ -1001,7 +1001,7 @@ Options:
   -p,--papersize=      give LaTeX papersize (eg. a4)
   -s,--separate        run all files separately through LaTeX
 
-files may be (a mix of) input to or output from lilypond(1)
+files may be (a mix of) input to or output from LilyPond(1)
 """ % name)
 
 
@@ -1011,7 +1011,7 @@ files may be (a mix of) input to or output from lilypond(1)
 #
 
 def main():
-    """Generate dvi files from lilypond source/output"""
+    """Generate dvi files from LilyPond source/output"""
 
     infile = Input()
     outfile = TeXOutput()
@@ -1026,6 +1026,7 @@ def main():
                                        'help', 'keeply2dvi', 'language=',
                                        'output=', 'version', 'papersize=', 'separate',
                                        'postscript'])
+
     for opt in options:
         o = opt[0]
         a = opt[1]
@@ -1065,6 +1066,9 @@ def main():
 	elif o == '--version':
 	    print_version ()
 	    return 0
+	else:
+	    print o
+	    raise getopt.error
 	    
     identify()
     Props.read_titledefs ()
@@ -1144,8 +1148,8 @@ ExitTable = {
     'ExitBadWidth'         : ['Invalid Width specification', 6 ],
     'ExitBadOrient'        : ['Invalid Orientation specification', 7 ],
     'ExitNoWrite'          : ['Permission denied', 8 ],
-    'ExitNoTeXName'        : ['hmm, I could not find an output file name', 9 ],
-    'ExitBadLily'          : ['Lilypond failed', 10 ],
+    'ExitNoTeXName'        : ['Hmm, I could not find an output file name', 9 ],
+    'ExitBadLily'          : ['LilyPond failed', 10 ],
     'ExitBadLatex'         : ['Latex failed', 11 ],
     'ExitBadPostscript'    : ['Postscript failed', 12 ],
     'ExitUnknown'          : ['Unknown Exit Code', 20 ],