From a361fae6a232cfa02c27c3b69e47b5ade13e5c5e Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 22:23:55 +0000
Subject: [PATCH] lilypond-1.1.61

---
 lily/include/tempo-performer.hh  |  34 +++
 lily/performance.cc              |   7 +-
 lily/script-engraver.cc          |   4 +
 lily/tempo-performer.cc          |  73 ++++++
 lily/time-signature-performer.cc |   2 +-
 ly/auto-beam-settings.ly         |   6 +-
 ly/performer.ly                  |   2 +
 mutopia/N.W.Gade/brass.ly        |  26 +-
 mutopia/N.W.Gade/global.ly       |   2 +
 mutopia/N.W.Gade/parts.ly        |   1 +
 mutopia/N.W.Gade/score.ly        |  13 +-
 mutopia/N.W.Gade/strings.ly      |  72 +++---
 mutopia/N.W.Gade/wood.ly         | 421 +++++++++++++++----------------
 mutopia/gallina.ly               | 151 +++++------
 scm/lily.scm                     |   2 +-
 15 files changed, 472 insertions(+), 344 deletions(-)
 create mode 100644 lily/include/tempo-performer.hh
 create mode 100644 lily/tempo-performer.cc

diff --git a/lily/include/tempo-performer.hh b/lily/include/tempo-performer.hh
new file mode 100644
index 0000000000..97c272f131
--- /dev/null
+++ b/lily/include/tempo-performer.hh
@@ -0,0 +1,34 @@
+/*
+  tempo-performer.hh -- declare Tempo_performer
+
+  source file of the GNU LilyPond music typesetter
+
+  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#ifndef TEMPO_PERFORMER_HH
+#define TEMPO_PERFORMER_HH
+
+#include "lily-proto.hh"
+#include "performer.hh"
+
+class Tempo_performer : public Performer
+{
+public:
+  VIRTUAL_COPY_CONS(Translator);
+  
+  Tempo_performer();
+  ~Tempo_performer();
+
+protected:
+  void do_print() const;
+  virtual bool do_try_music (Music* req_l);
+  virtual void do_process_requests();
+  virtual void do_pre_move_processing ();
+
+private:
+  Tempo_req* tempo_req_l_;
+  Audio_tempo* audio_p_;
+};
+
+#endif // TEMPO_PERFORMER_HH
diff --git a/lily/performance.cc b/lily/performance.cc
index b97df6b69c..7818d856de 100644
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -115,9 +115,10 @@ Performance::output_header_track (Midi_stream& midi_stream)
 			
   midi_track.add (Moment (0), &track_name);
 
-  Audio_tempo tempo_a (midi_l_->get_tempo_i (Moment (1, 4)));
-  Midi_tempo tempo (&tempo_a);
-  midi_track.add (Moment (0), &tempo);
+  // Some sequencers read track 0 last.
+  //  Audio_tempo tempo_a (midi_l_->get_tempo_i (Moment (1, 4)));
+  //  Midi_tempo tempo (&tempo_a);
+  //  midi_track.add (Moment (0), &tempo);
 
   midi_stream << midi_track;
 }
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 6842e4f4ed..f36e5e11a1 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -70,6 +70,10 @@ Script_engraver::do_process_requests()
       else
 	  ss->dir_ = force_dir;
 
+      Scalar dir_prop (get_property ("articulationScriptVerticalDirection", 0));
+      if (dir_prop.isnum_b () && (int) dir_prop != CENTER)
+	ss->dir_ = (int) dir_prop;
+
       if (l->dir_)
 	ss->dir_ = l->dir_;
 
diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
new file mode 100644
index 0000000000..bb9f4ae762
--- /dev/null
+++ b/lily/tempo-performer.cc
@@ -0,0 +1,73 @@
+/*
+  tempo-performer.cc -- implement Tempo_performer
+
+  source file of the GNU LilyPond music typesetter
+
+  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "tempo-performer.hh"
+#include "command-request.hh"
+#include "audio-item.hh"
+
+ADD_THIS_TRANSLATOR (Tempo_performer);
+
+Tempo_performer::Tempo_performer ()
+{
+  tempo_req_l_ = 0;
+  audio_p_ = 0;
+}
+
+Tempo_performer::~Tempo_performer ()
+{
+}
+
+void 
+Tempo_performer::do_print () const
+{
+#ifndef NPRINT
+  if (tempo_req_l_)
+    tempo_req_l_->print ();
+#endif
+}
+
+void
+Tempo_performer::do_process_requests ()
+{
+  if (tempo_req_l_)
+    {
+      audio_p_ = new Audio_tempo (tempo_req_l_->dur_.length_mom () /
+				  Moment (1, 4) 
+				  * Moment(tempo_req_l_->metronome_i_));
+      Audio_element_info info (audio_p_, tempo_req_l_);
+      announce_element (info);
+      tempo_req_l_ = 0;
+    }
+}
+
+void
+Tempo_performer::do_pre_move_processing ()
+{
+  if (audio_p_)
+    {
+      play_element (audio_p_);
+      audio_p_ = 0;
+    }
+}
+
+bool
+Tempo_performer::do_try_music (Music* req_l)
+{
+  if (tempo_req_l_)
+    return false;
+
+  if (Tempo_req *t =
+      dynamic_cast <Tempo_req *> (req_l))
+    {
+      tempo_req_l_ = t;
+      return true;
+    }
+
+  return false;
+}
+
diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index 95eeacabc0..9a326de1d1 100644
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -1,5 +1,5 @@
 /*
-  time_signature-performer.cc -- implement Time_signature_performer
+  time-signature-performer.cc -- implement Time_signature_performer
 
   source file of the GNU LilyPond music typesetter
 
diff --git a/ly/auto-beam-settings.ly b/ly/auto-beam-settings.ly
index 329da4ec89..c1911c7074 100644
--- a/ly/auto-beam-settings.ly
+++ b/ly/auto-beam-settings.ly
@@ -54,7 +54,11 @@ time6_8beamAutoEnd_32 = "1/8";
 
 time9_8beamAutoEnd_8 = "3/8";
 time9_8beamAutoEnd_16 = "3/8";
-time6_8beamAutoEnd_32 = "1/8";
+time9_8beamAutoEnd_32 = "1/8";
+
+time12_8beamAutoEnd_8 = "3/8";
+time12_8beamAutoEnd_16 = "3/8";
+time12_8beamAutoEnd_32 = "1/8";
 
 %{
 
diff --git a/ly/performer.ly b/ly/performer.ly
index 184f18144f..f98ea244f5 100644
--- a/ly/performer.ly
+++ b/ly/performer.ly
@@ -13,6 +13,7 @@ StaffContext = \translator {
 
 	\consists "Key_performer";
 	\consists "Time_signature_performer";
+	\consists "Tempo_performer";
 };
 \translator { \StaffContext }
 
@@ -99,6 +100,7 @@ PianoStaffContext = \translator {
 	\accepts LyricVoice;
 	\name Lyrics;
 	\consists "Time_signature_performer";
+	\consists "Tempo_performer";
 }
 \translator {
 	\type Performer_group_performer;
diff --git a/mutopia/N.W.Gade/brass.ly b/mutopia/N.W.Gade/brass.ly
index 6eb446c670..0ed9fa42a7 100644
--- a/mutopia/N.W.Gade/brass.ly
+++ b/mutopia/N.W.Gade/brass.ly
@@ -32,7 +32,7 @@ r r \times 2/3 {[g8 \f ( e ) g] }
 d4 () g r |
 r r [d16 \f ( g, e' d ] |
 [g, d' e ) d ] g,4 r |
-r \grace g8 \f d'2 \> (|
+r \grace g8 d'2 \f \> (|
 [g,8. a16 g8. a16 \! g8. ) a16 ] |
 g4 r r |
 R2. |
@@ -155,12 +155,12 @@ e r d4 ( |
 ) e8 r d4_"dim." ( |
 ) c8 r g4 |
 g8 r [g'8.^""^"solo" ( \< \! a16 ] |
-g4. \> \! ) e8 |
-c4 ( d |
+g4. \> \! e8 |
+c4 d |
 e d |
 ) c  [g'8. ( \< \! a16 ] |
-g4. \> \! ) e8 |
-c4 ( d |
+g4. \> \! e8 |
+c4 d |
 e d |
 ) c  [c8. ( d16 ] |
 ) c2 ( |
@@ -250,8 +250,8 @@ corII=\notes\relative c'' {
 \property Staff."midiInstrument" = "french horn"
 
 R2.*19 |
-r4 r [g8^"solo" \p (\< \! ) e'] |
-\grace d8 g2 \> ( [e8. ) \! c16 ] |
+r4 r [g8^"solo" \p (\< ) e'] |
+\grace d8 \! g2 \> ( [e8. ) \! c16 ] |
 g2 r 4 |
 r r \times 2/3 {[e'8 \p ( g, ) g' ]} |
 g4 \> () \! e r |
@@ -336,7 +336,7 @@ R2*13 |
 c,4. \f c8 ( |
 )c,4. r8 |
 R2*2 |
-c'4. \f c8 ( |
+c'4. c8 ( |
 )c,4. c''8 |
 c,4. c'8 |
 c,4. r8 |
@@ -427,7 +427,7 @@ d'4 r |
 R2 |
 d4 r |
 R2*2 |
-e8 r r4 |
+e8 \f r r4 |
 R2*19 |
 c4. \f r8 |
 c4. r8 |
@@ -599,8 +599,8 @@ c4. r8 |
 R2*8 |
 e4. \f r8 |
 e4. r8 |
-r4 g4 ( |
-) fis8 r g4 ( |
+r4 g4-> ( | % added >
+) fis8 r g4-> ( | % added >
 ) fis8 r d'4 ( |
 ) e8 r r4 |
 r g, ( |
@@ -718,7 +718,7 @@ R2*14 |
   [e8 e e g,,] | % In reality: e e e e | e
   g8 r r4 }
  {\voicetwo r2 | r |
-  r4_" Timp." r8 \clef bass; c, |
+  r4_" Timp." r8 \clef bass; c, \p |
   [c-. \< c-. c-. \! c-.] |
   c4.:8 \f r8 |
   R2 |
@@ -744,7 +744,7 @@ c,2:8 \< |
 R2*4 |
 c4 \f r |
 c4 r |
-c2:32 |
+c2:32 ~ | % Added tie
 c8 r r4 |
 c4 r |
 c4_"dim." r |
diff --git a/mutopia/N.W.Gade/global.ly b/mutopia/N.W.Gade/global.ly
index 5908b22d5d..82221cbef6 100644
--- a/mutopia/N.W.Gade/global.ly
+++ b/mutopia/N.W.Gade/global.ly
@@ -1,10 +1,12 @@
 
 globalNoKey=\notes {
 \time 3/4;
+\tempo 4=100; % My own suggestion, M.B.
 \skip 2.*31;
 s4 s4^\fermata s8^\fermata \bar "||"; \break
 s8 
 \time 2/4;
+\tempo 4=130; % My own suggestion, M.B.
 \skip 2*224;
 s4 s4^\fermata
 \bar "|.";
diff --git a/mutopia/N.W.Gade/parts.ly b/mutopia/N.W.Gade/parts.ly
index e49da7e460..6fefbe715f 100644
--- a/mutopia/N.W.Gade/parts.ly
+++ b/mutopia/N.W.Gade/parts.ly
@@ -32,6 +32,7 @@ my_paper = \paper {
     textScriptPadding = 5.0;
     textStyle = "italic";
     textEmptyDimension = 1;
+    beamAuto = 0; % Beams inserted explicitly as in the original.
   }
 }
 
diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly
index b42398670c..1d68186fa3 100644
--- a/mutopia/N.W.Gade/score.ly
+++ b/mutopia/N.W.Gade/score.ly
@@ -58,10 +58,12 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
       \context Voice = corI <
 	\globalNoKey
 	\stemup \property Voice.dynamicDir = \up 
+	 \property Voice.articulationScriptVerticalDirection = \up 
 	\corI 
       >
       \context Voice = corII { 
 	\stemdown \property Voice.dynamicDir = \down 
+	 \property Voice.articulationScriptVerticalDirection = \down
 	\corII 
       }
     >
@@ -71,17 +73,19 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
       \context Voice = trpI <
 	\globalNoKey
 	\stemup \property Voice.dynamicDir = \up 
+	 \property Voice.articulationScriptVerticalDirection = \up 
 	\trpI
       >
       \context Voice = trpII { 
 	\stemdown \property Voice.dynamicDir = \down 
+	 \property Voice.articulationScriptVerticalDirection = \down
 	\trpII
       }
     >
   >
     \context StaffGroup = percussion <\context Voice = timpani <
       \property Staff.instrument = "Timp. \& Triang."
-      \property Staff.instr = "Tmp \& Trg"
+      \property Staff.instr = "Tmp\&{}Trg"
       \global
       \timpani
     >
@@ -123,12 +127,13 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
 >
  \paper {
 %    \paper_sixteen;
-    linewidth = 185.\mm;
+    linewidth = 180.\mm;
     textheight = 260.\mm;
     \translator {
 	\OrchestralScoreContext
         minVerticalAlign = 2.5*\staffheight;
         barNumberScriptPadding = "12.0";
+        markScriptPadding = "20.0";
     }
     \translator { \StaffContext
 	\consists "Staff_margin_engraver";
@@ -137,12 +142,13 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
 	textStyle = "italic";
 	textScriptPadding = 5.0;
         textEmptyDimension = 1;
+	beamAuto = 0; % Beams inserted explicitly as in the original.
     }
   }
 }
 
 \score{
-  \context StaffGroup <
+  \context StaffGroup < \global
     \context Staff = oboe \oboe
     \context Staff = flauto \flauto
     \context Staff = clarinetsInBes {\notes \transpose bes <\clarI \clarII >}
@@ -157,6 +163,5 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
     \context Staff = contrabass \cb
   >
   \midi {
-    \tempo 4=120;
   }
 }
diff --git a/mutopia/N.W.Gade/strings.ly b/mutopia/N.W.Gade/strings.ly
index e19eb2518c..9a831dbf58 100644
--- a/mutopia/N.W.Gade/strings.ly
+++ b/mutopia/N.W.Gade/strings.ly
@@ -139,7 +139,7 @@ R2*4 |
 [c16 ( \pp d c a][f a c d] |
 [f8 d ) c d ( ] |
 [ ) a bes () g d' ( ] |
-[ a ) bes g ] [d'16 ( es ] |
+[ ) a bes () g ] [d'16 ( es ] |
 [ d es d bes][g bes d es] |
 [ g8 es ) d bes ( ] |
 [) g a () f c' ( ] |
@@ -170,7 +170,7 @@ bes4 ( \< c |
 \! d2 ~ |
 d4 \> c |
 \! d2 |
-[d8 c][bes g] |
+[d8_"dim." c][bes g] |
 [e c] \grace e8 [d ) c ] |
 R2 |
 r4 r8 d' \mf |
@@ -390,8 +390,8 @@ a4:16 \p \< \! b4:16 \> |
 b4:16 \p \< \! c4:16 \> |
 \! b2:16 |
 b4:16 \p \< \! c4:16 \> |
-\! b2:16 |
-\grace d8 f2 ( \> | % grace note c8 corrected to d8
+b2:16 |
+\grace d8 \! f2 ( \> | % grace note c8 corrected to d8
 \! ) e |
 b-> ( |
 ) e4 r |
@@ -418,7 +418,7 @@ d ( |
 ) c4 r |
 r r8 d' ( |
 [ ) a bes () g d' ( ] |
-[ a ) bes g ] r |
+[ ) a bes () g ] r |
 R2 |
 r4 r8 bes ( |
 [) g a () f c' ( ] |
@@ -439,8 +439,8 @@ r4 r8 [c'16 \fz ( d ] |
 [f g f e][ ) d8 d,16 ( e ] |
 [ ) f8 e16 ( f][ ) g8 f16 ( g ] |
 [as bes as g][ ) f8 g'16 ( a! ] | % misprint fz to early
-[bes! \fz c bes a][g a g ) f ] |
-e r r8 r4 |
+[bes! \fz c bes a][g a g f ] |
+) e r r8 r4 |
 <{e,2 \p ~ |
   e4 \< \! f |
   e2 \> |
@@ -469,14 +469,14 @@ b2:8 \< |
 < \! g4 bes! \f > r8 a ( |
 <c4._> ) a'> a8 ( |
 <c4._> ) a'> f,8 \p |
-[fis-. g-. a-. bes-.] |
+[fis-. \< g-. a-. \! bes-.] | % cresc. added
 bes4. a8 ( \f |
 <c4._> ) a'> a8 ( |
 <c4._> ) a'> f,8 \p |
 [fis-. \< g-. a-. \! bes-.] |
 [bes \f c16 ( d][)c8 c, \p ] |
-c4^\trill ( d^\trill |
-e^\trill \grace{[d16 e]} [ f8 ) c ] |
+c4^\trill ( \< \! d^\trill |
+e^\trill \> \grace{[d16 e]} [ \! f8 ) c ] |
 c4^\trill ( d^\trill |
 e^\trill \grace{[d16 e]} [ ) f8 a ( \f ] |
 <a4. ) c4.> d8 |
@@ -510,8 +510,8 @@ c2 \> ~ |
 \! c |
 a4 ( \< c |
 d \! des |
-c \f \> \! ) bes |
-a ( \> g |
+c \f \> ) bes |
+a ( g |
 \! ) a r |
 R2 |
 c8 \p r r4 |
@@ -522,8 +522,8 @@ c d4 e8 ~ |
 e f4 c8 ~ |
 c d4 e8 ~ |
 e \< e4 \! e8 ( |
-) bes'!4. \fz \> \! a8 |
-[g-. f-. e-.] r |
+) bes'!4. \fz \> a8 |
+[ \! g-. f-. e-.] r |
 R2 |
 r4 r8 es \p ~ |
 es es4 es8 ~ |
@@ -631,7 +631,7 @@ d4 \> \! g |
 [f! ( g f g][e g e ) g] |
 [d ( g d g ][d g d g ] |
 [d g d g ] [c, g' c, g' ]
-) d4 r |
+) d4 \p r |
 r r8 <c \p g'> |
 <c2:8 g'2:8 > |
 <c2:8 g'2:8 \< > |
@@ -760,7 +760,7 @@ r r8 <f \p c'> |
 [c-. \< bes-. a-. \! g-. ] |
 <{c,4. f,8 \f |
   f'4._> f,8 |
-  f'4. }
+  f'4._> } % added >
  {e4. c8 ( |
   ) c'4. c,8 ( |
   ) c'4. }> d'8 \p | % \p added
@@ -862,7 +862,7 @@ e2 (\< \! f4 |
 g \> ) \! f r |
 e'2 ( f4 |
 g ) f f, ( \< | % added slur
-) \! e2 f'4 ( |
+) \! e2 f'4 \pp ( |
 ) e2 dis4 ( \< |
 \! ) e2 dis4 ( \pp |
 ) e2. ~ |
@@ -915,8 +915,8 @@ r4 r8 c''8 \f (|
 [cis-. \< d-. e-. \! f-. ] |
 g,4.  c8 \f ( |
 < ) c4. f,_> > c8 ( | % slur added
-< ) c4. f,> c8-> | 
-[cis-. \p \< d-. e-. \! f-. ] |
+< ) c4.-> f,> c8 \p | % > and \p moved one quaver backwards
+[cis-. \< d-. e-. \! f-. ] |
 g,4 r8 <{ c8 \p |
   c2:8 |
   c2:8 \< |
@@ -927,8 +927,8 @@ g,4 r8 <{ c8 \p |
   g2:8 |
   g2:8 |
   g2:8 |
-  [g8 g c cis] |
-  e,4.-> }> a8 |
+  [g8 g c cis (] | % added slur
+  ) e,4.-> }> a8 |
 [d-. e-. f-. b ( ] |
 ) b,4. \f b'8 ( |
 < ) d,4.  \f g,> g8 ( |
@@ -941,16 +941,16 @@ g,4 r8 <{ c8 \p |
 [e ( g fis ) g][c, ( a' gis ) a] |
 [b ( c d ) b][g ( a f )d ] |
 [c ( g' fis ) g][c, ( g' fis ) g] |
-[c, ( g' fis ) g][c, ( g' fis ) g] |
-c,4_"dim." r |
+[c,_"dim." ( g' fis ) g][c, ( g' fis ) g] |
+c,4 r |
 c4 r |
-c8 r8 r4 |
+c8 \p r8 r4 |
 R2 |
 r8 [c-.^"solo" \p d-. dis-. ] |
 e r e, r |
 c'4:16 \p d4:16 |
 e4:16 \< \! fis4:16 |
-g!2:16 \> |
+g2:16 \> |
 g4:16 \! a4:16 |
 g4:16 \< \! a4:16 |
 g4:16 \> \! a4:16 |
@@ -962,9 +962,9 @@ f! ( |
 [e8 d c ) b ] |
 c4:16 \p d4:16 |
 e4:16 \< \! fis4:16 |
-g!2:16 \> |
-\! g4:16 \p \< \! a4:16 |
-g4:16 \> \! a4:16 |
+g2:16 \fz \> | 
+\! g4:16 \p \< a4:16 |
+\! g4:16 \> \! a4:16 |
 g4:16 \< \! a4:16 |
 g4:16 \> a4:16 |
 g4:16 \! a4:16 |
@@ -980,7 +980,7 @@ e |
 ) e4 r |
 [f16 ( g f_"dim." g][f g f8 ] |
 ) e4 r |
-[c'16 ( d c a][f a c ) d] |
+[c'16 \pp ( d c a][f a c ) d] |
 [f8 ( d ) c] r |
 fis,8-. r g-. r |
 d r [g d'16 ( es] |
@@ -988,8 +988,8 @@ d r [g d'16 ( es] |
 [g8 es ) d] r |
 c, r f-. r |
 c r [f-. c'-. ] |
-[bes-. a-. g-. f-.] |
-[e d][c a'16 \f ( f] |
+[bes-. \< a-. g-. \! f-.] |
+[e-. d-.][c-. a'16 \f ( f] |
 [a f a f][a f a ) f] | % Misprint trem 8
 [bes ( f bes f][a f a ) f] |
 [bes ( f bes f][) a8 f-.] |
@@ -1022,13 +1022,13 @@ r4 r8 f' \f (|
 R2 |
 r4 r8 f'' (|
 ) f,4.-> f8 ( |
-) f,4.-> f'8 (|
+) f,4. f'8 (|
 <) c4. f, > f8 ( |
 <) c4. f,> f8 \p |
 [fis-. \< g-. a-. \! bes-. ] |
 c,4.  f8 \f ( |
 <) f4. bes,_> > f8 (|
-<) f4. bes,> f8 \p | % \p added
+<) f4. bes,_> > f8 \p | % \p added
 [fis-. \< g-. a-. \! bes-. ] |
 c,4 r8 <{ f8 \p |
  f2:8 \< |
@@ -1054,7 +1054,7 @@ c,4 r8 <{ f8 \p |
 [f16 ( c' b ) c][f,16 ( c' b ) c] |
 [f,16 ( c' b ) c][f,16 ( c' b ) c] |
 f,8 r e'4 ( |
-) f8 r bes,4 ( |
+) f8 r bes,4 \p ( |
 ) a2 ( |
 ) bes |
 a4 \< ( \! bes |
@@ -1073,8 +1073,8 @@ c8 r r4 |
 <c f,> r <c f,> r |
 e, r e r |
 e r [e () c] |
-c'4. \f \> \! d8 |
-[e-._"dim." f-. g-.] r |
+c'4. \f \> d8 |
+[\! e-._"dim." f-. g-.] r |
 <c,8 \p f,> r <c f,> r |
 <c f,> r <c f,> r |
 <c f,> r <c f,> r |
diff --git a/mutopia/N.W.Gade/wood.ly b/mutopia/N.W.Gade/wood.ly
index 99230fd85b..8e25033682 100644
--- a/mutopia/N.W.Gade/wood.ly
+++ b/mutopia/N.W.Gade/wood.ly
@@ -1,5 +1,184 @@
 \version "1.1.52";
 
+flauto=\notes\relative c''' {
+\clef "treble";
+\property Staff."midiInstrument" = "flute"
+
+[c8. \f ( d16] c2 |
+)c,8 r r4 r |
+R2.*4 |
+[c8. \p ( d16] c4. ) a8 |
+[f8. ( e16 ] f4. ) a8 |
+[c8. ( d16] c4. ) a8 |
+[a8. ( g16 ] ) f4 r |
+R2.*4 |
+[c'8. ( d16] c4. ) a8 |
+[g8. ( a16 ] f4. ) a8 |
+[c8. ( d16] c4. ) a8 |
+[a8. ( g16 ] ) f4 r |
+R2.*13 |
+r4 r4 r8 r8 \time 2/4;
+R2*4 |
+a'8-. \pp r g-. r |
+a8-. r g-. r |
+R2*2 |
+g8-. r f-. r |
+g8-. r f-. r |
+R2 |
+r4 r8 [c'16 \f ( d] |
+[c d c a][f a c d] |
+[f8 d ) c] f, ( |
+[f'8 d ) c] a ( |
+[a'8 f ) e] a ( |
+dis,2 |
+) e4 r8 a8 ( |
+dis,2 |
+) e4 r8 a ( |
+) es r d r |
+c r d r |
+g, r r4 |
+R2*10 |
+r4 r8 e' \p |
+e [es-. es-.] d-. |
+d-. [cis-. cis-.] c-. |
+c \f [c16 ( d] [es8 d16 c] | % slur and \f added
+) d4 r8 e!-. \p |
+e-. [es-. es-.] d-. |
+d-. [cis-. cis-.] c |
+c-. \f [c16 ( d][es8 d16 c] | % \f added
+) d4 r8 e,! ( |
+)e'4.-> e,8 ( |
+)e'4.-> a8 \p |
+[g-. f-. e-. d-.] |
+[cis16 ( \< e d \! b ] ) g8 e \f ( |
+)e'4.-> e,8 ( |
+)e'4.-> a8 \p |
+[g-. \< f-. e-. \! d-.] |
+g r r e-. \p |
+e-. [es-. \< es-.] d-. |
+d-. [c-. \! c-.] g-. |
+g-. [fis-. \< fis-.] f-. |
+f-. [e-. \! e-.] bes \f ( |
+) bes'4.-> a8-. |
+[f'-. e-. d-.] f, ( |
+) f'4. \fz g,8 ( |
+) g'4. \fz g,8 ( |
+) e' r g4-> ( |
+) e8 r g4-> ( |
+) e8 r es4-> ( |
+) d8 r r g, ( |
+) e'! r g4 ( |
+) e8 r g4 ( |
+) e8 r es4-> ( |
+) d8 r r g, ( |
+) e'! r g4 ( |
+) e8 r d4 ( |
+) e8 r r4 |
+R2*27 |
+d2 ( \p |
+) gis, |
+R2*2 |
+d'2 ( \p |
+) gis, |
+a ( |
+) gis |
+a_"dim." ( |
+) gis ( |
+) a ( |
+bes!4 ) a8 r |
+a r bes r |
+fis r g r |
+bes2 ( |
+c4 ) bes8 r |
+bes r a r |
+e! r f r |
+R2 |
+r4 r8 [c'16 \f ( d] | % \f added
+[c d c a][f a c d] |
+[f8 d ) c] f, ( |
+[f'8 d ) c] f,-. |
+[g-. a-. bes-. a-. ] |
+bes4 r8 bes,8 ( |
+[bes' g ) f] bes,8 ( |
+[bes' g ) f] bes,8 ( |
+[d' g ) f! ] d ( |
+gis,2 |
+) a4. d8 ( |
+gis,2 |
+) a4. d,8 ( |
+) d' r d-. r |
+d-. r d-. r |
+c r r4 |
+R2*10 |
+r4 r8 [c16^""^"solo" \p ( d] |
+) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] |
+)bes8-. [a16 ( \! bes ] ) a8-. [as16 ( bes ] |
+) as8-. \f [f16 ( g][as8 g16  f ] |
+) g4 r8 [c16 ( d] |
+) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] |
+)bes8-. [a16 ( \! bes ] ) a8-. [as16 bes ] |
+as8 \f [f16 ( g][as8 g16  f ] |
+) g4 r8 es ( | 
+)es'4.-> es,8 ( | 
+)es'4.-> d8 \p |
+[c8-. \< bes-. a \! g ] |
+[fis16 ( a g e! ] ) c8 es ( \f |
+) es'4.-> es,8 ( | 
+) es'4.-> d8 \p |
+[c8-. \< bes-. a \! g ] |
+c r r a'-. \p |
+a-. [gis-. \< gis-.] \! g-. |
+g-. [f-. f-.] c-. |
+c-. [b-. \<  b-.] bes-. |
+bes-. [a-. \! a-.] a( \f |
+) es'4.-> d8 |
+[bes-. a-. g-.] bes, ( |
+) d'4. \fz c,8 ( |
+) c'4. \fz c,8 ( |
+) a' r c4-> ( |
+) a8 r c4-> ( |
+) a8 r as4-> ( |
+) g8 r r c ( |
+) a! r c4 ( |
+) a8 r c4 ( |
+) a8 r as4-> ( |
+) g8 r r c, ( |
+) a'! r c4_"dim." ( |
+) a8 r g4 ( |
+) f8 r c4 ( |
+) a8 r r4 |
+R2*19 |
+r4 r8 [c'16 \p ( d] |
+) c8-. [b16 ( c ] ) b8-. [bes16 ( c ] |
+)bes8-. [a16 ( bes ] ) a8-. [c16 ( d] |
+) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] |
+)bes8-. [a16 ( \! bes ] ) a8-. bes ( \f |
+) bes,4. d8 ( |
+) d'4. c8 ( |
+) c,4. e8 ( |
+) e'4. c8 ( |
+) a'4 r |
+[f8 ( d ) c ] c ( |
+) a'4 r |
+[f8 ( d ) c ] f, ( |
+) f'4. e,8 ( |
+) e'4. e8 |
+[f-. e-. f-. e-.] |
+[f-. e-. f-. e-.] |
+f r e r |
+f r e r |
+f r a, r |
+c r a r |
+f4 r8 c' ( |
+) a4 r8 c ( |
+) f4 r8 c ( |
+) a4 r8 c ( |
+) f4 r |
+R2 |
+f4 \fz r
+
+}
+
 oboe=\notes\relative c'' {
 \clef "treble";
 \property Staff."midiInstrument" = "oboe"
@@ -80,7 +259,7 @@ R2*2 |
 r8 [g,-.^""^"solo" \p a-. b-. ] |
 c r r4 |
 R2*10 |
-\grace d8 \fz f2 \> ( |
+\grace d8 f2 \fz \> ( |
 \! b,4 [c8 b] |
 a2-> |
 ) gis |
@@ -92,7 +271,7 @@ e ( \> [ d8 \! c ] |
 \! e ) b |
 \grace e8 g4 ( \> dis |
 \! e_"dim." ) b |
-\grace d!8 \fz f2 ( \> |
+\grace d!8 f2 \fz ( \> |
 b,4 [ \! c8 b] |
 a2 \p |
 ) gis |
@@ -157,7 +336,7 @@ r4 r8 bes, ( |
 ) a8 r g4 ( |
 ) f8 r r4 |
 R2*7 |
-\grace f8 \f a4 \> ( e |
+\grace f8 a4 \f \> ( e |
 f \! b, |
 ) c r |
 R2*7 |
@@ -167,7 +346,7 @@ bes!4. \f r8 |
 R2 |
 c8-. \p r b-. r |
 bes!-. r a-. r |
-c-. \p r b-. r |
+c-. r b-. r |
 bes!-. r a-. bes \f ( |
 ) bes'4. bes,8 ( |
 ) bes'4. bes,8 ( |
@@ -194,186 +373,6 @@ R2 |
 f4-. \fz r
 }
 
-
-flauto=\notes\relative c''' {
-\clef "treble";
-\property Staff."midiInstrument" = "flute"
-
-[c8. \f ( d16] c2 |
-)c,8 r r4 r |
-R2.*4 |
-[c8. \p ( d16] c4. ) a8 |
-[f8. ( e16 ] f4. ) a8 |
-[c8. ( d16] c4. ) a8 |
-[a8. ( g16 ] ) f4 r |
-R2.*4 |
-[c'8. ( d16] c4. ) a8 |
-[g8. ( a16 ] f4. ) a8 |
-[c8. ( d16] c4. ) a8 |
-[a8. ( g16 ] ) f4 r |
-R2.*13 |
-r4 r4 r8 r8 \time 2/4;
-R2*4 |
-a'8-. \pp r g-. r |
-a8-. r g-. r |
-R2*2 |
-g8-. r f-. r |
-g8-. r f-. r |
-R2 |
-r4 r8 [c'16 \f ( d] |
-[c d c a][f a c d] |
-[f8 d ) c] f, ( |
-[f'8 d ) c] a ( |
-[a'8 f ) e] a ( |
-dis,2 |
-) e4 r8 a8 ( |
-dis,2 |
-) e4 r8 a ( |
-) es r d r |
-c r d r |
-g, r r4 |
-R2*10 |
-r4 r8 e' \p |
-e [es-. es-.] d-. |
-d-. [cis-. cis-.] c-. |
-c [c16 ( d] [es8 d16 c] | % slur added
-) d4 r8 e!-. \p |
-e-. [es-. es-.] d-. |
-d-. [cis-. cis-.] c |
-c-. [c16 ( d][es8 d16 c] |
-) d4 r8 e,! ( |
-)e'4.-> e,8 ( |
-)e'4.-> a8 \p |
-[g-. f-. e-. d-.] |
-[cis16 ( \< e d \! b ] ) g8 e \f ( |
-)e'4.-> e,8 ( |
-)e'4.-> a8 \p |
-[g-. \< f-. e-. \! d-.] |
-g r r e-. \p |
-e-. [es-. \< es-.] d-. |
-d-. [c-. \! c-.] g-. |
-g-. [fis-. \< fis-.] f-. |
-f-. [e-. \! e-.] bes \f ( |
-) bes'4.-> a8-. |
-[f'-. e-. d-.] f, ( |
-) f'4. \fz g,8 ( |
-) g'4. \fz g,8 ( |
-) e' r g4-> ( |
-) e8 r g4-> ( |
-) e8 r es4-> ( |
-) d8 r r g, ( |
-) e' r g4 ( |
-) e8 r g4 ( |
-) e8 r es4-> ( |
-) d8 r r g, ( |
-) e' r g4 ( |
-) e8 r d4 ( |
-) e8 r r4 |
-R2*27 |
-d2 ( \p |
-) gis, |
-R2*2 |
-d'2 ( \p |
-) gis, |
-a ( |
-) gis |
-a_"dim." ( |
-) gis ( |
-) a ( |
-bes!4 ) a8 r |
-a r bes r |
-fis r g r |
-bes2 ( |
-c4 ) bes8 r |
-bes r a r |
-e! r f r |
-R2 |
-r4 r8 [c'16 \f ( d] | % \f added
-[c d c a][f a c d] |
-[f8 d ) c] f, ( |
-[f'8 d ) c] f,-. |
-[g-. a-. bes-. a-. ] |
-bes4 r8 bes,8 ( |
-[bes' g ) f] bes,8 ( |
-[bes' g ) f] bes,8 ( |
-[d' g ) f! ] d ( |
-gis,2 |
-) a4. d8 ( |
-gis,2 |
-) a4. d,8 ( |
-) d' r d-. r |
-d-. r d-. r |
-c r r4 |
-R2*10 |
-r4 r8 [c16^""^"solo" \p ( d] |
-) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] |
-)bes8-. [a16 ( \! bes ] ) a8-. [as16 ( bes ] |
-) as8-. \f [f16 ( g][as8 g16  f ] |
-) g4 r8 [c16 ( d] |
-) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] |
-)bes8-. [a16 ( \! bes ] ) a8-. [as16 bes ] |
-as8 \f [f16 ( g][as8 g16  f ] |
-) g4 r8 es ( | 
-)es'4.-> es,8 ( | 
-)es'4.-> d8 \p |
-[c8-. \< bes-. a \! g ] |
-[fis16 ( a g e! ] ) c8 es ( \f |
-) es'4.-> es,8 ( | 
-) es'4.-> d8 \p |
-[c8-. \< bes-. a \! g ] |
-c r r a'-. \p |
-a-. [gis-. \< gis-.] \! g-. |
-g-. [f-. f-.] c-. |
-c-. [b-. \<  b-.] bes-. |
-bes-. [a-. \! a-.] a( \f |
-) es'4.-> d8 |
-[bes-. a-. g-.] bes, ( |
-) d'4. \fz c,8 ( |
-) c'4. \fz c,8 ( |
-) a' r c4-> ( |
-) a8 r c4-> ( |
-) a8 r as4-> ( |
-) g8 r r c ( |
-) a! r c4 ( |
-) a8 r c4 ( |
-) a8 r as4-> ( |
-) g8 r r c, ( |
-) a'! r c4_"dim." ( |
-) a8 r g4 ( |
-) f8 r c4 ( |
-) a8 r r4 |
-R2*19 |
-r4 r8 [c'16 \p ( d] |
-) c8-. [b16 ( c ] ) b8-. [bes16 ( c ] |
-)bes8-. [a16 ( bes ] ) a8-. [c16 ( d] |
-) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] |
-)bes8-. [a16 ( \! bes ] ) a8-. bes ( \f |
-) bes,4. d8 ( |
-) d'4. c8 ( |
-) c,4. e!8 ( |
-) e'4. c8 ( |
-) a'4 r |
-[f8 ( d ) c ] c ( |
-) a'4 r |
-[f8 ( d ) c ] f, ( |
-) f'4. e,8 |
-e'4. e8 |
-[f-. e-. f-. e-.] |
-[f-. e-. f-. e-.] |
-f r e r |
-f r e r |
-f r a, r |
-c r a r |
-f4 r8 c' ( |
-) a4 r8 c ( |
-) f4 r8 c ( |
-) a4 r8 c ( |
-) f4 r |
-R2 |
-f4 \fz r
-
-}
-
 clarI=\notes\relative c'' {
 \key G;
 \clef "treble";
@@ -386,11 +385,11 @@ R2.*8 |
 [fis8. \> e16 ] \! d4 ) a |
 b2. \pp \< ( |
 \! ais4 ) b2 |
-a4 \p ( [g8. a16 ] g4 |
+a!4 \p ( [g8. a16 ] g4 |
 fis ) g8 r r4 |
 a4 ( [g8. a16 ] g4 |
-fis ) g8 r [d^""^"solo" \mf \< () \! b' ] |
-\grace a8 d2 ( \> [b8. \! g16] |
+fis ) g8 r [d^""^"solo" \mf \< () b' ] |
+\grace a8 \! d2 ( \> [b8. \! g16] |
 ) d2 r4 |
 R2. |
 r4 r \times 2/3 { [b'8^""^"solo" ( \ff d, ) d' ] } |
@@ -410,8 +409,8 @@ fis r g d'-. \p |
 [d e d b][g b d e] |
 [g8 e ) d ] g, ( |
 [g' e ) d ] b ( |
-[b' g ) fis] b |
-f2 ( |
+[b' g ) fis] b ( | % slur added
+) f2 ( |
 ) fis!4 r8 b ( |
 ) f2 ( |
 ) fis!4 r8 b |
@@ -437,7 +436,7 @@ d r b4 \f ( |
 [e-. dis-. dis-. d-. ] |
 d r b4 \f ( |
 ) cis8 [a'16-> ( b] ) a8 r |
-d,4. r8 |
+d,4.-> r8 | % added > 
 d4.-> r8 |
 R2*2 |
 d4. \f r8 |
@@ -466,10 +465,10 @@ cis4.-> fis8-. \p | % \p added
 ) fis8 r e4 \p ( |
 ) fis8 r r4 |
 R2*3 |
-fis,2 \pp ~ |
-fis ~ |
-fis ~ |
-fis4 r |
+fis,2 \pp \< ~ |
+\! fis ~ |
+fis \> ~ | % cresc. added
+\! fis4 r | % dim. added
 R2*4 |
 e'2 \fz \> ( |
 ) \! fis,4 r |
@@ -621,11 +620,11 @@ R2.*8 |
 [a8. ( \> g16 ] \! ) fis4 r |
 b2. \pp \< ( |
 \! ais4 ) b2 |
-a4 \p ( [g8. a16 ] g4 |
+a!4 \p ( [g8. a16 ] g4 |
 fis ) g8 r r4 |
 a4 ( [g8. a16 ] g4 |
-fis ) g8 r [d^""^"solo" \mf \< () \! b' ] |
-\grace a8 d2 ( \> [b8. \! g16] |
+fis ) g8 r [d^""^"solo" \mf \< () b' ] |
+\grace a8 \! d2 ( \> [b8. \! g16] |
 ) d2 r4 |
 R2. |
 r4 r \times 2/3 { [b'8 ( \f d, ) d' ] } |
@@ -684,7 +683,7 @@ r4 r8 g,8 ( |
 a8 r a4-> ~ |
 a8 r gis4 ( |
 [ ) g!8 g-. g-. g ( ] |
-) fis! r a4 ~ |
+) fis! r a4-> ~ | % added >
 a8 r a4-> ~ |
 a8 r gis4 ( |
 ) g!8 [g-. g-.] g ( |
@@ -695,8 +694,8 @@ a8 r a4 \p ~ |
 a8 r r4 |
 R2*3 |
 fis2 \pp \< ~ |
-fis ~ |
-\! fis \>~ |
+\! fis ~ |
+fis \>~ |
 \! fis4 r |
 R2*4 |
 g2 \f \> ( |
@@ -704,8 +703,8 @@ g2 \f \> ( |
 b2 \> ( |
 ) \! ais4 r |
 fis2 \pp \< ~ |
-fis ~ |
-\! fis \>~ |
+\! fis ~ |
+fis \>~ |
 \! fis4 r |
 R2*16 |
 f2 \pp ( |
@@ -788,8 +787,8 @@ r4 [g8. ( \f a16 ] |
 d ~ |
 d4. r8 |
 R2*6 |
-fis4. \fz \> \! g8 |
-[a-. b-. c-. ] r |
+fis4. \fz \> g8 |
+[ \! a-. b-. c-. ] r |
 R2*3 |
 r4 r8 e, \f ( |
 ) e'4. a,8 ( |
@@ -797,10 +796,10 @@ r4 r8 e, \f ( |
 ) a'4. fis,8 ( |
 ) d'4. c8 ( |
 ) b4 r8 g ( |
-e'4 [d8 ) c ] |
-b4 r8 g ( |
-e'4 () ) d8 g, |
-cis4. fis,8 ( |
+e'4 [ ) d8 c ( ] |
+) b4 r8 g ( |
+e'4 () ) d8 g, ( | % ending slur added
+) cis4. fis,8 ( |
 ) c'!4. c8 |
 [b-. c-. b-. c-. ] |
 [b-. c-. b-. c-. ] |
@@ -902,7 +901,7 @@ e2 \p \< ~ |
 \! e \> ~ |
 \! e \< ~ |
 \! e \> |
-\grace \! d'8 \fz ( ) f2 \> ( |
+\grace d'8 ( )  \! f2 \fz \> ( |
 ) \! e4. r8 |
 f,2 \> ( ( |
 [ ) \! e8 d c ) b ] | 
@@ -914,7 +913,7 @@ e2 \p ~
 e ~ |
 e ~ |
 e |
-\grace d'8 \fz ( ) f2 \> ( |
+\grace d'8 ( ) f2 \fz \> ( |
 ) \! e4. r8 |
 f,2 \p ( |
 ) e4 r |
@@ -967,7 +966,7 @@ r r8 c' |
 [c c c ] f ( |
 ) c4.-> f8 ( |
 ) c4.-> r8 |
-r4 r8 f8 ( |
+r4 r8 d8 ( |
 ) e!4. c8 \f ( |
 ) f4.-> c8 ( | % slur added
 ) f4.-> r8 |
diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly
index 047efd54f0..e3a08a46fd 100644
--- a/mutopia/gallina.ly
+++ b/mutopia/gallina.ly
@@ -50,7 +50,7 @@ definition below. --MB
 global = \notes {
   \property StaffGroup.timeSignatureStyle = "old"
   \time 4/4;
-  \tempo 4=80;
+  \tempo 4=100;
   \skip 1*31;
   \property StaffGroup.timeSignatureStyle = "1"
   \time 3/2;
@@ -58,43 +58,45 @@ global = \notes {
   \skip 1.*15;
   \property StaffGroup.timeSignatureStyle = "old"
   \time 4/4;
-  \tempo 4=80;
+  \tempo 4=100;
 }
 
 vi1=\context Staff = vi1 <
 \global
 \notes \relative c'' {
+\property Staff.instrument = "Violin 1"
+\property Staff.midiInstrument = "recorder" % The default midi violin is terrible
 
-  [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 |
+  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 |
-  [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 |
+  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 |
-  [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!] |
+  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 |
   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] |
-  [e8 g ][ g g16 f][ e8 g ][ g g16 a] |
+  r16 g f e  d c b a g8 g'  g g16 f |
+  e8 g  g g16 f e8 g  g g16 a |
   b4 c2 b4 |
-  [c8 g ][ g g16 f] e4 d |
-  r8 g [g g16 f] e4 d |
-  r8 [d16 a ][ b8 b16 c] a2 |
+  c8 g  g g16 f e4 d |
+  r8 g g g16 f e4 d |
+  r8 d16 a  b8 b16 c a2 |
   b1 | 
   
   \repeat "semi" 2 {
@@ -102,31 +104,31 @@ vi1=\context Staff = vi1 <
   e1. |
   r4 c c c c c |
   d1. |
-  r4 [d8 c] b4 [c8 d] g,4 [a8 b] |
+  r4 d8 c b4 c8 d g,4 a8 b |
   e,1. |
-  r4 [e'8 d] cis4 [d8 e] a,4[ b8 cis!] |
+  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] |
+  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] |
+  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 |
+  a d,8 c b4 c8 d a2 |
   }
 
   \repeat "semi" 2 {
   b1 |
-  [d8 d d d] d4 [a16 b c a] |
-  [b8 g ][ g g16 a] [b8 g ][ g g16 a] | 
-  [b8 g]  c2 b4 |
+  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 |
-  [g'8 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] |
-  e2 r8 d [d d16 e] |
-  [fis a g fis ][ e d c b] [a8 d ][ d d16 e] |
+  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 |
   fis4 g2 fis!4 |
   \cadenza 1;
   g\breve
@@ -136,67 +138,69 @@ vi1=\context Staff = vi1 <
 vi2=\context Staff = vi2 <
 \global
 \notes \relative c'' {
+\property Staff.instrument = "Violin 2"
+\property Staff.midiInstrument = "recorder" % The default midi violin is terrible
 
   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 |
+  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 |
-  [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 |
+  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 |
   c2 r |
   r1 |
-  [g'8 g g g] g4 [d16 e f d] |
-  e2 r8 g, [g g16 a] |
-  b4 g r8 g [g a16 b] | 
+  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] |
+  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] |
+  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] |
+  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 |
 
   \repeat "semi" 2 {
   r1. |
-  r4 [g'8 f] e4 [f8 g] c,4 [d8 e] |
+  r4 g'8 f e4 f8 g c,4 d8 e |
   a,1. |
-  r4 [a'8 g] fis4 [g8 a] d,4 [e8 fis!] |
+  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 [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] |
+  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 |
+  b d8 c b4 c8 d d,4 e |
   fis2 g fis! |
   }
 
   \repeat "semi" 2 {
   g1 |
   r1 | r1 |
-  [g'8 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] |
+  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' |
+  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
   }
@@ -207,6 +211,9 @@ bc=\context Staff = bc <
 \global
 \notes\transpose c'{
   \clef "bass";
+\property Staff.instrument = "Basso Continuo"
+\property Staff.midiInstrument = "bassoon" % The default midi violin is terrible
+
 
   G2 d^"4 3" | G1 |
   g2 c4 G | d1^"3 4 3" |
@@ -256,12 +263,9 @@ bc=\context Staff = bc <
     \bc
   >
   \paper{
-    gourlay_maxmeasures=7.;
-
     \translator { \VoiceContext
-
+      textScriptPadding = 3;
 %% Uncomment to get the original layout without beams.
-%%%% Compare to the definition in init/engraver.ly.
 
 %  \remove "Beam_engraver";
 %  \remove "Auto_beam_engraver";
@@ -269,6 +273,5 @@ bc=\context Staff = bc <
  }
   }
   \midi{ 
-        \tempo 4=80;
   }
 }
diff --git a/scm/lily.scm b/scm/lily.scm
index 26920e72b1..1e66463e58 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -105,7 +105,7 @@
    (("Clef_item"  "Span_bar") . (minimum_space 3.7))
    (("Time_signature" "Span_bar") . (minimum_space 2.0))
    (("Key_item"  "Span_bar") . (minimum_space 2.5))
-   (("Staff_bar" "Time_signature") . (minimum_space 1.5)) ;double check this.
+   (("Staff_bar" "Time_signature") . (minimum_space 2.0)) ;double check this.
    (("Time_signature" "begin-of-note") . (extra_space 2.0)) ;double check this.
    (("Key_item" "begin-of-note") . (extra_space 2.5))
    (("Staff_bar" "begin-of-note") . (extra_space 1.0))
-- 
2.39.2