From: fred <fred>
Date: Tue, 26 Mar 2002 21:47:39 +0000 (+0000)
Subject: lilypond-1.1.33
X-Git-Tag: release/1.5.59~2558
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c4b10807426f6a050561831eaf9ed3b2e2396002;p=lilypond.git

lilypond-1.1.33
---

diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo
index 6cad45cc87..251d65d461 100644
--- a/Documentation/tex/refman.yo
+++ b/Documentation/tex/refman.yo
@@ -522,7 +522,7 @@ mudela(fragment,verbatim,center)(
 )
 Some more elaborate constructions:
 mudela(fragment,verbatim,center)(
-[a'16 <a' c''> c'' <a' c''>] 
+[a'16 <a' c''> c'' <a' c''>]
 \times 2/3 { [e'8 f' g'] }
 )
 
@@ -1475,6 +1475,12 @@ note.  Set to \center to align the center of the text with the note.
 dit(code(textstyle)) Set the text style for superscripts and
 subscripts.  See above for list of text styles.
 
+dit(code(textScriptPadding)) Determines the extra space added between
+super-/subscripted text and the closest staff line or note.
+
+dit(code(textScriptPadding)) Determines the extra space added between
+super-/subscripted text and the closest staff line or note.
+
 dit(code(fontsize)) Can be used to select smaller font sizes for
 music.  The normal font size is 0, and the two smaller sizes are -1
 and -2.
diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh
index 2e85d6dc56..7bc71c2333 100644
--- a/lily/include/local-key-item.hh
+++ b/lily/include/local-key-item.hh
@@ -10,6 +10,21 @@
 #include "array.hh"
 #include "musical-pitch.hh"
 
+struct Local_key_cautionary_tuple
+{
+  Musical_pitch pitch_;
+  bool cautionary_b_;
+
+  Local_key_cautionary_tuple ()
+    {
+      cautionary_b_ = false;
+    }
+  static int compare (Local_key_cautionary_tuple const&s1, Local_key_cautionary_tuple const&s2)
+    {
+      return Musical_pitch::compare (s1.pitch_, s2.pitch_);
+    }
+};
+
 /**
   Accidentals which can be different for each octave.
 
@@ -22,18 +37,17 @@
   
  */
 class Local_key_item : public Item {
+  Array<Local_key_cautionary_tuple> accidental_arr_;
+  Link_array<Item> support_items_;
 public:
-    
-    Array<Musical_pitch> accidental_pitch_arr_;
-    Link_array<Item> support_items_;
-    int c0_position_i_;
-    Local_key_item ();
-    void add_support (Item*);
-    void add (Musical_pitch);
+  int c0_position_i_;
+  Local_key_item ();
+  void add_support (Item*);
+  void add_pitch (Musical_pitch, bool cautionary);
 protected:
-    virtual void do_pre_processing();    
-    virtual void do_substitute_element_pointer (Score_element*,Score_element*);
-    virtual Molecule* do_brew_molecule_p() const;
+  virtual void do_pre_processing();    
+  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
+  virtual Molecule* do_brew_molecule_p() const;
 };
 #endif // LOCALKEYITEM_HH
 
diff --git a/lily/include/musical-pitch.hh b/lily/include/musical-pitch.hh
index e961f5cc9b..d4d0a60854 100644
--- a/lily/include/musical-pitch.hh
+++ b/lily/include/musical-pitch.hh
@@ -21,7 +21,7 @@
 */
 struct Musical_pitch : public Input
 {
-  Musical_pitch (int notename=0, int accidental=0, int octave=0, bool cautionary=false);
+  Musical_pitch (int notename=0, int accidental=0, int octave=0);
 
   /// 0 is c, 6 is b
   int notename_i_;
@@ -29,8 +29,6 @@ struct Musical_pitch : public Input
   int accidental_i_;
   /// 0 is central c
   int octave_i_;
-  /// Used for cautionary accidentals
-  bool cautionary_b_;
 
   Musical_pitch to_relative_octave (Musical_pitch);
   void transpose (Musical_pitch);
diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index aa461fe1c4..42a2937cbf 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -12,6 +12,15 @@
 
 #include "bar.hh"
 
+/**
+   This is a barline that is spanned across other bar lines.  This is
+   the implementation of the long barlines that occur in orchestral
+   score and other multi-staff music.
+
+   TODO: Is this usable for other stuff besides barlines? We only have
+   to span a Score_element.  Perhaps this can be used for large time
+   sigs?
+*/
 class Span_bar : public Bar
 {
   Link_array<Score_element> spanning_l_arr_;
@@ -22,9 +31,8 @@ public:
   Span_bar();
     
   VIRTUAL_COPY_CONS(Score_element);
-  void add_bar (Bar*);
+  void add_bar (Score_element*);
   void set_align (Align_element *);
-
 protected:
   void evaluate_empty ();
   virtual Interval do_width() const;
diff --git a/lily/include/tie-engraver.hh b/lily/include/tie-engraver.hh
index 68b0ff2cd6..448ed17230 100644
--- a/lily/include/tie-engraver.hh
+++ b/lily/include/tie-engraver.hh
@@ -14,7 +14,7 @@
 #include "engraver.hh"
 
 struct CHead_melodic_tuple {
-  Melodic_req *mel_l_ ;
+  Melodic_req *req_l_ ;
   Note_head *head_l_;
   Moment end_;
   CHead_melodic_tuple ();
@@ -29,6 +29,13 @@ inline int compare (CHead_melodic_tuple const &a, CHead_melodic_tuple const &b)
 }
 
 
+/**
+   Manufacture ties.  Acknowledge noteheads, and put them into a
+   priority queue. If we have a Tie_req, connect the notes that finish
+   just at this time, and note that start at this time.
+
+   TODO: should share code with Beam_engraver, Extender_engraver?
+ */
 class Tie_engraver : public Engraver
 {
   PQueue<CHead_melodic_tuple> past_notes_pq_;
diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc
index 41eb5e8fc3..44747ad824 100644
--- a/lily/local-key-engraver.cc
+++ b/lily/local-key-engraver.cc
@@ -68,15 +68,9 @@ Local_key_engraver::process_acknowledged ()
 	      announce_element (Score_element_info (key_item_p_, 0));	      
 	    }
 
-	  /*
-	    UGH!  Changes input ! 
-	   */
-	  if (note_l->cautionary_b_)
-	    {
-	      note_l->pitch_.cautionary_b_ = true;
-	    }
 
-	  key_item_p_->add (note_l->pitch_);
+	  key_item_p_->add_pitch (note_l->pitch_,
+				  note_l->cautionary_b_);
 	  key_item_p_->add_support (support_l);
 	  local_key_.set (note_l->pitch_);
 	}
diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc
index d00b40657e..d035e5aa4d 100644
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -29,19 +29,22 @@ Local_key_item::add_support (Item*head_l)
 }
 
 void
-Local_key_item::add (Musical_pitch p)
+Local_key_item::add_pitch (Musical_pitch p, bool cautionary)
 {
-  for (int i=0; i< accidental_pitch_arr_.size(); i++)
-    if (!Musical_pitch::compare (p, accidental_pitch_arr_[i]))
+  for (int i=0; i< accidental_arr_.size(); i++)
+    if (!Musical_pitch::compare (p, accidental_arr_[i].pitch_))
       return;
-  
-  accidental_pitch_arr_.push (p);
+
+  Local_key_cautionary_tuple t;
+  t.pitch_ = p;
+  t.cautionary_b_ = cautionary;
+  accidental_arr_.push (t);
 }
 
 void
 Local_key_item::do_pre_processing()
 {
-  accidental_pitch_arr_.sort (Musical_pitch::compare);
+  accidental_arr_.sort (Local_key_cautionary_tuple::compare);
 }
 
 Molecule*
@@ -51,10 +54,11 @@ Local_key_item::do_brew_molecule_p() const
 
   Molecule *octave_mol_p = 0;
   int lastoct = -100;
-  for  (int i = 0; i <  accidental_pitch_arr_.size(); i++) 
+  for  (int i = 0; i <  accidental_arr_.size(); i++) 
     {
+      Musical_pitch p (accidental_arr_[i].pitch_);
       // do one octave
-      if (accidental_pitch_arr_[i].octave_i_ != lastoct) 
+      if (p.octave_i_ != lastoct) 
 	{
 	  if (octave_mol_p)
 	    {
@@ -66,12 +70,12 @@ Local_key_item::do_brew_molecule_p() const
 	  octave_mol_p= new Molecule;
 	}
       
-      lastoct = accidental_pitch_arr_[i].octave_i_;
+      lastoct = p.octave_i_;
       Real dy =
-	(c0_position_i_ + accidental_pitch_arr_[i].notename_i_)
+	(c0_position_i_ + p.notename_i_)
 	* paper()->internote_f ();
-      Molecule m (lookup_l ()->accidental (accidental_pitch_arr_[i].accidental_i_, 
-	      accidental_pitch_arr_[i].cautionary_b_));
+      Molecule m (lookup_l ()->accidental (p.accidental_i_, 
+					   accidental_arr_[i].cautionary_b_));
 
       m.translate_axis (dy, Y_AXIS);
       octave_mol_p->add_at_edge (X_AXIS, RIGHT, m, 0);
@@ -85,7 +89,7 @@ Local_key_item::do_brew_molecule_p() const
       delete octave_mol_p;
     }
   
- if (accidental_pitch_arr_.size()) 
+ if (accidental_arr_.size()) 
     {
       Box b(Interval (0, paper()->internote_f ()), Interval (0,0));
       Molecule m (lookup_l ()->fill (b));
@@ -116,8 +120,6 @@ Local_key_item::do_brew_molecule_p() const
 void
 Local_key_item::do_substitute_element_pointer (Score_element*o,Score_element*n)
 {
-  Item* o_l = dynamic_cast <Item *> (o);
-  Item* n_l = n?dynamic_cast <Item *> (n):0;
-
-  support_items_.substitute (o_l, n_l);
+  if (Item* o_l = dynamic_cast <Item *> (o))
+    support_items_.substitute (o_l,dynamic_cast <Item *> (n));
 }
diff --git a/lily/musical-pitch.cc b/lily/musical-pitch.cc
index df668d2115..35df93bcc5 100644
--- a/lily/musical-pitch.cc
+++ b/lily/musical-pitch.cc
@@ -10,12 +10,11 @@
 #include "debug.hh"
 #include "main.hh"
 
-Musical_pitch::Musical_pitch (int n, int a, int o, bool c)
+Musical_pitch::Musical_pitch (int n, int a, int o)
 {
   notename_i_ = n;
   accidental_i_ = a;
   octave_i_ = o;
-  cautionary_b_ = c;
 }
 
 void
diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 38f0c9d809..c221cbb2dd 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -10,6 +10,7 @@
 #include <time.h>
 #include <fstream.h>
 
+#include "dimensions.hh"
 #include "dictionary-iter.hh"
 #include "virtual-methods.hh"
 #include "paper-outputter.hh"
@@ -105,16 +106,23 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm)
       output_comment (nm);
     }
       
-
+#ifdef ATOM_SMOB
+  for (SCM ptr = m->atom_list_; ptr != SCM_EOL; ptr = SCM_CDR(ptr))
+    {
+      Atom *i = Atom::atom_l (SCM_CAR(ptr));
+#else
   for (Cons<Atom> *ptr = m->atom_list_; ptr; ptr = ptr->next_)
     {
       Atom * i = ptr->car_;
+#endif
       Offset a_off = i->off_;
       a_off += o;
 
       if (!i->func_)
 	continue; 
 
+      assert (a_off.length () < 100 CM);
+	
       if (i->font_)
 	{
 	  output_scheme (gh_list (ly_symbol ("select-font"),
@@ -125,8 +133,8 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm)
       SCM box_scm
 	= gh_list (ly_symbol ("placebox"),
 		   gh_double2scm (a_off.x ()),
-		   gh_double2scm (a_off.y ()), 
-		   i->func_.to_SCM(),
+		   gh_double2scm (a_off.y ()),
+		   SCM(i->func_),
 		   SCM_UNDEFINED);
       
       output_scheme (box_scm);
@@ -279,6 +287,6 @@ Paper_outputter::output_int_def (String k, int v)
 void
 Paper_outputter::stop_line ()
 {
-  SCM scm =    gh_list (ly_symbol ("stop-line"), SCM_UNDEFINED);
+  SCM scm = gh_list (ly_symbol ("stop-line"), SCM_UNDEFINED);
   output_scheme (scm);
 }
diff --git a/lily/parser.yy b/lily/parser.yy
index 26e916196d..0e94082cc2 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1153,12 +1153,12 @@ close_request_parens:
 	| E_SMALLER {
 		Span_dynamic_req*s =new Span_dynamic_req;
 		$$ = s;
-		s->dynamic_dir_ = SMALLER;
+		s->dynamic_dir_ = UP;
 	}
 	| E_BIGGER {
 		Span_dynamic_req*s =new Span_dynamic_req;
 		$$ = s;
-		s->dynamic_dir_ = BIGGER;
+		s->dynamic_dir_ = DOWN;
 	}
 	;
 
diff --git a/lily/score.cc b/lily/score.cc
index 455cebd63d..7c4fbd5a84 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -35,7 +35,7 @@ Score::Score (Score const &s)
   music_p_ = (s.music_p_) ? s.music_p_->clone() : 0;
   for (int i=0; i < s.def_p_arr_.size (); i++)
     def_p_arr_.push(s.def_p_arr_[i]->clone());
-
+  errorlevel_i_ = s.errorlevel_i_;
   header_p_ =  (s.header_p_) ? new Header (*s.header_p_): 0;
 }
 
diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 9eb41b018b..62c2c66fac 100644
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -9,13 +9,13 @@
 #include "span-bar.hh"
 #include "lookup.hh"
 #include "dimensions.hh"
-
 #include "paper-def.hh"
 #include "molecule.hh"
 #include "align-element.hh"
+#include "warn.hh"
 
 void
-Span_bar::add_bar (Bar*b)
+Span_bar::add_bar (Score_element*b)
 {
   spanning_l_arr_.push (b);
   add_dependency (b);
@@ -117,9 +117,16 @@ Molecule*
 Span_bar::do_brew_molecule_p () const
 {
   Interval iv (get_spanned_interval ());
-  Molecule*output = new Molecule (lookup_l ()->bar (type_str_, iv.length ()));
-
-  output->translate_axis (iv.center (), Y_AXIS);
+  Molecule*output = new Molecule;
+  if (!iv.empty_b())
+    {
+      output->add_molecule (lookup_l ()->bar (type_str_, iv.length ()));
+      output->translate_axis (iv.center (), Y_AXIS);
+    }
+  else
+    {
+      warning("Huh? My children deflated (FIXME)");
+    }
   return output;
 }
 
diff --git a/lily/span-score-bar-engraver.cc b/lily/span-score-bar-engraver.cc
index 0eb1cf7790..1efa242c6a 100644
--- a/lily/span-score-bar-engraver.cc
+++ b/lily/span-score-bar-engraver.cc
@@ -16,7 +16,7 @@ Span_score_bar_engraver::get_span_bar_p () const
 {
   Span_bar*s =  new Span_bar;
   s->visibility_lambda_
-    = gh_eval_str ("spanbar_non_postbreak_visibility");
+    = gh_eval_str ("Span_score_bar_visibility");
   s->type_str_ = "scorebar";
     
   return s;
@@ -34,7 +34,7 @@ Piano_bar_engraver::get_span_bar_p () const
 {
   Span_bar *s= new Span_bar;
   s->visibility_lambda_
-    = gh_eval_str ("spanbar_postbreak_only_visibility");
+    = gh_eval_str ("Piano_bar_visibility");
   s->no_width_b_ =true;
   s->type_str_ = "{";
   return s;
@@ -45,7 +45,7 @@ Staff_group_bar_engraver::get_span_bar_p () const
 {
   Span_bar *s= new Span_bar;
   s->visibility_lambda_
-    = gh_eval_str ("spanbar_postbreak_only_visibility");
+    = gh_eval_str ("Staff_group_bar_visibility");
   s->no_width_b_ =true;
   s->type_str_ = "[";
   return s;
diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 1b544269a2..177566d034 100644
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -60,18 +60,24 @@ Tie_engraver::do_process_requests ()
 void
 Tie_engraver::process_acknowledged ()
 {
+  bool old_behavior = get_property ("oldTieBehavior", 0).to_bool ();
+  
   if (req_l_)
     {
-      if (now_heads_.size () != stopped_heads_.size ())
+      if (old_behavior)
 	{
-	  req_l_->warning ("Unequal number of note heads for tie");
-	}
-      int sz = now_heads_.size () <? stopped_heads_.size ();
+	  if (now_heads_.size () != stopped_heads_.size ())
+	    {
+	      req_l_->warning ("Unequal number of note heads for tie");
+	    }
+	  int sz = now_heads_.size () <? stopped_heads_.size ();
+
+	  /* hmm. Should do something more sensible.
+       because, we assume no more noteheads come along after the 1st pass.
+	  */
+	  if (sz <= tie_p_arr_.size ())
+	    return;
 
-      // hmm. Should do something more sensible.
-      // because, we assume no more noteheads come along after the 1st pass.
-      if (sz > tie_p_arr_.size ())
-	{
 	  now_heads_.sort (CHead_melodic_tuple::pitch_compare);
 	  stopped_heads_.sort(CHead_melodic_tuple::pitch_compare);
 
@@ -84,6 +90,46 @@ Tie_engraver::process_acknowledged ()
 	      announce_element (Score_element_info (p, req_l_));
 	    }
 	}
+      else
+	{
+	  now_heads_.sort (CHead_melodic_tuple::pitch_compare);
+	  stopped_heads_.sort(CHead_melodic_tuple::pitch_compare);
+	  int i=0;
+	  int j=0;
+	  int tie_count=0;
+	  while  ( i < now_heads_.size () && j < stopped_heads_.size ())
+	    {
+	      int comp
+		= Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
+					  stopped_heads_[j].req_l_->pitch_);
+
+	      if (comp)
+		{
+		  (comp < 0) ? i ++ : j++;
+		  continue;
+		}
+	      else
+		{
+		  tie_count ++;
+
+		  /* don't go around recreating ties that were already
+		  made. Not infallible. Due to reordering in sort (),
+		  we will make the wrong ties when noteheads are
+		  added.  */
+		  if (tie_count > tie_p_arr_.size ())
+		    {
+		      Tie * p = new Tie;
+		      p->set_head (LEFT, stopped_heads_[j].head_l_);
+		      p->set_head (RIGHT, now_heads_[i].head_l_);
+		      tie_p_arr_.push (p);
+		      announce_element (Score_element_info (p, req_l_));
+		    }
+		  i++;
+		  j++;
+
+		}
+	    }
+	}
     }
 }
 
@@ -128,14 +174,14 @@ ADD_THIS_TRANSLATOR(Tie_engraver);
 CHead_melodic_tuple::CHead_melodic_tuple ()
 {
   head_l_ =0;
-  mel_l_ =0;
+  req_l_ =0;
   end_ = 0;
 }
 
 CHead_melodic_tuple::CHead_melodic_tuple (Note_head *h, Melodic_req*m, Moment mom)
 {
   head_l_ = h;
-  mel_l_ = m;
+  req_l_ = m;
   end_ = mom;
 }
 
@@ -143,7 +189,7 @@ int
 CHead_melodic_tuple::pitch_compare (CHead_melodic_tuple const&h1,
 			     CHead_melodic_tuple const &h2)
 {
-  return Melodic_req::compare (*h1.mel_l_, *h2.mel_l_);
+  return Melodic_req::compare (*h1.req_l_, *h2.req_l_);
 }
 
 int
diff --git a/mutopia/N.W.Gade/GNUmakefile b/mutopia/N.W.Gade/GNUmakefile
new file mode 100644
index 0000000000..ef093ade58
--- /dev/null
+++ b/mutopia/N.W.Gade/GNUmakefile
@@ -0,0 +1,12 @@
+# 
+
+depth = ../..
+
+EXTRA_DIST_FILES += README global.tex
+
+examples=
+LOCALSTEPMAKE_TEMPLATES=mutopia
+
+include $(depth)/make/stepmake.make
+
+
diff --git a/mutopia/N.W.Gade/README b/mutopia/N.W.Gade/README
new file mode 100644
index 0000000000..132bb62307
--- /dev/null
+++ b/mutopia/N.W.Gade/README
@@ -0,0 +1,16 @@
+This ouverture "Imellan Fjeldene" ("Between the Mountains") by 
+Niels W. Gade (1788-1854) is typeset from handwritten parts 
+available at Statens Musikbibliotek, Stockholm, Sweden. 
+No score was available.
+
+A few obvious misprints and inconsistencies between the parts 
+have been corrected. This is indicated with comments in the
+different source files.
+
+The piece will be performed in Ludvika and Östervåla, March 13-14, 1999,
+by Bergslagens Kammarsymfoniker conducted by Ola Karlsson.
+
+The score and parts may be freely copied.
+
+Stockholm 1999. Mats Bengtsson, matsb@s3.kth.se
+
diff --git a/mutopia/N.W.Gade/global.tex b/mutopia/N.W.Gade/global.tex
new file mode 100644
index 0000000000..13015a5e4c
--- /dev/null
+++ b/mutopia/N.W.Gade/global.tex
@@ -0,0 +1,60 @@
+% Defined as macros so Lilypond doesn't assign any horisontal spacing.
+\newcommand{\Allegromoltovivace}{\hspace{-10mm}\raise 20pt\hbox{
+    \Large \textbf{Allegro molto vivace}}}
+%\newcommand{\Andanteconmoto}{\hspace{-12mm}\raise 20pt\hbox{
+%    \Large Andante con moto}}
+\newcommand{\Andanteconmoto}{}
+\renewcommand{\thepiece}{Andante con moto}
+
+\newcommand{\okt}{$8^{va}$}
+
+\newcommand{\thecopyright}{
+  \begin{tabular}{l}
+    \copyright{} mats.bengtsson@s3.kth.se, 1999. Free circulation permitted and
+    encouraged.\\ Typeset from handwritten parts at Statens
+    Musikbibliotek, Stockholm, Sweden
+  \end{tabular}
+}
+
+% Modified from lilypond/tex/headers.tex:
+\advance\topmargin-5mm
+\advance\headsep-4mm
+\addtolength{\textheight}{12mm}
+\advance\footskip-3mm
+
+\usepackage{fancyheadings}
+\lhead{\textbf{\large\theinstrument}}
+\chead{}
+\lfoot{}
+\cfoot{\ifnum\thepage=1{\thecopyright\hfill\LilyIdString}\fi}
+\rfoot{\ifnum\thepage>1{\hfill\thepage\hfill}\fi}
+\headrulewidth0mm
+\pagestyle{fancy}
+
+% Modified from lilypond/tex/titledefs.tex:
+\def\makelilytitle{%
+  \begin{center}
+        \bfseries
+        \ifx\mudelanull\thetitle\else\sethuge{\thetitle}\\ \fi
+        \ifx\mudelanull\thesubtitle\else\setLarge{\thesubtitle}\\ \fi
+  \end{center}
+  \bigskip
+  % urg
+  \edef\saveparskip{\parskip}\parskip-5mm
+  \begin{minipage}[t]{0.45\textwidth}
+        \ifx\mudelanull\thepoet\else\settext{\thepoet}\\ \fi
+        \ifx\mudelanull\themetre\else\settext{\themetre}\\ \fi
+  \end{minipage}\hspace*{\fill}
+  \begin{minipage}[t]{0.45\textwidth}
+      \begin{flushright}
+          \ifx\mudelanull\thecomposer\else\setlarge{\normalfont\scshape\thecomposer}\\ \fi
+          \ifx\mudelanull\theopus\else\settext{\theopus}\\ \fi
+          \ifx\mudelanull\thearranger\else\settext{\thearranger}\\ \fi
+        \end{flushright}%
+  \end{minipage}\par
+  \parskip\saveparskip
+%  {\center\setlarge{\theinstrument}\par}
+%  {\flushleft\setLarge{\normalfont\scshape\thepiece}}
+  {\flushleft\setLarge{\textbf\thepiece}}
+  \leavevmode
+}
diff --git a/mutopia/N.W.Gade/parts.ly b/mutopia/N.W.Gade/parts.ly
new file mode 100644
index 0000000000..7491098fda
--- /dev/null
+++ b/mutopia/N.W.Gade/parts.ly
@@ -0,0 +1,313 @@
+\header{
+title =         "Imellan Fjeldene. Ouverture";
+composer =      "Niels W Gade";
+enteredby =     "Mats Bengtsson";
+latexheaders =  "\\input global";
+copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " + 
+		"encouraged.\\\\ Typeset from handwritten parts at " +
+		"Statens Musikbibliotek, Stockholm, Sweden";
+}
+
+\version "1.0.14";
+
+\include "global.ly"
+\include "wood.ly"
+\include "brass.ly"
+\include "strings.ly"
+
+my_paper = \paper {
+  textheight = 275.0 \mm;
+  \translator {
+    \OrchestralPartStaffContext
+    textScriptPadding = 5.0;
+  }
+\translator{\VoiceContext
+\remove Auto_beam_engraver;
+}
+  \translator { 
+    \ScoreContext
+    SkipBars = 1;
+    markScriptPadding = "6.0";
+    textstyle = "italic";
+  }
+}
+%{
+\score{
+  \type Staff <
+    \global
+    \marks
+    \oboe
+    \oboehelp
+  >
+  \header{
+    instrument = "Oboe";
+  }
+  \paper{
+    \my_paper;
+    output = "oboe";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \global
+    \marks
+    \flauto
+    \flautohelp
+  >
+  \header{
+    instrument = "Flauto";
+  }
+  \paper{
+    \my_paper;
+    output = "flauto";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \globalNoKey
+    \marks
+    \clarI
+  >
+  \header{
+    instrument = "Clarinetto I in B\\textflat";
+  }
+  \paper{
+    \my_paper;
+    output = "clarI";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \globalNoKey
+    \marks
+    \clarII
+  >
+  \header{
+    instrument = "Clarinetto II in B\\textflat";
+  }
+  \paper{
+    \my_paper;
+    output = "clarII";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \global
+    \marks
+    \fagotto
+  >
+  \header{
+    instrument = "Fagotto";
+  }
+  \paper{
+    \my_paper;
+    output = "fagotto";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \globalNoKey
+    \marks
+    \corI
+    \corIhelp
+  >
+  \header{
+    instrument = "Corno I in F";
+  }
+  \paper{
+    \my_paper;
+    output = "corI";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+%}
+\score{
+  \type Staff <
+    \globalNoKey
+    \marks
+    \corII
+    \corIIhelp
+  >
+  \header{
+    instrument = "Corno II in F";
+  }
+  \paper{
+    \my_paper;
+    output = "corII";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+%{
+\score{
+  \type Staff <
+    \globalNoKey
+    \marks
+    \trpI
+    \trpIhelp
+  >
+  \header{
+    instrument = "Tromba I in B\\textflat";
+  }
+  \paper{
+    \my_paper;
+    output = "trpI";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \globalNoKey
+    \marks
+    \trpII
+    \trpIIhelp
+  >
+  \header{
+    instrument = "Tromba II in B\\textflat";
+  }
+  \paper{
+    \my_paper;
+    output = "trpII";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \globalNoKey
+    \marks
+    \timpani
+    \timphelp
+  >
+  \header{
+    instrument = "Timpani";
+  }
+  \paper{
+    \my_paper;
+    output = "timpani";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \global
+    \marks
+    \viI
+  >
+  \header{
+    instrument = "Violino I";
+  }
+  \paper{
+    \my_paper;
+    output = "viI";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \global
+    \marks
+%    \notes{s2.*32 s2*141 \break}
+    \viII
+  >
+  \header{
+    instrument = "Violino II";
+  }
+  \paper{
+    \my_paper;
+    output = "viII";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \global
+    \marks
+    \notes{s2.*32 s2*142 \break}
+    \vla
+  >
+  \header{
+    instrument = "Viola";
+  }
+  \paper{
+    \my_paper;
+    output = "viola";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \global
+    \marks
+    \vlc
+  >
+  \header{
+    instrument = "Violoncello";
+  }
+  \paper{
+    \my_paper;
+    output = "violoncello";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+
+\score{
+  \type Staff <
+    \global
+    \marks
+    \cb
+  >
+  \header{
+    instrument = "Contrabasso";
+  }
+  \paper{
+    \my_paper;
+    output = "cb";
+  }
+  \midi {
+    \tempo 4=120;
+  }
+}
+%}
\ No newline at end of file
diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly
new file mode 100644
index 0000000000..23181116e2
--- /dev/null
+++ b/mutopia/N.W.Gade/score.ly
@@ -0,0 +1,151 @@
+\header{
+title =         "Imellan Fjeldene. Ouverture";
+composer =      "Niels W Gade";
+enteredby =     "Mats Bengtsson";
+latexheaders = "\\input global";
+copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " + 
+		"encouraged.\\\\ Typeset from handwritten parts at " +
+		"Statens Musikbibliotek, Stockholm, Sweden";
+}
+
+\version "1.0.14";
+
+\include "global.ly"
+\include "wood.ly"
+\include "brass.ly"
+\include "strings.ly"
+\include "paper16.ly";
+
+
+\score{ <
+  \type StaffGroup = wood <
+    \type Staff = flauto <
+      \property Staff.instrument = "Flauto"
+      \property Staff.instr = "Fl."
+      \global
+      \flauto
+    >
+    \type Staff = oboe <
+      \property Staff.instrument = "Oboe"
+      \property Staff.instr = "Ob."
+      \global
+      \marks
+      \oboe
+    >
+    \type Staff = clarI <
+      \property Staff.instrument = "Clarinetto I"
+      \property Staff.instr = "Cl. I"
+      \global
+      \clarI
+    >
+    \type Staff = clarII <
+      \property Staff.instrument = "Clarinetto II"
+      \property Staff.instr = "Cl. II"
+      \global
+      \clarII
+    >
+    \type Staff = fagotto <
+      \property Staff.instrument = "Fagotto"
+      \property Staff.instr = "Fg."
+      \global
+      \fagotto
+    >
+  >
+  \type StaffGroup = brass <
+    \type Staff = cor <
+      \global
+      \property Staff.instrument = "2 Corni in F"
+      \property Staff.instr = "Cor."
+      \type Voice = corI { \stemup \corI }
+      \type Voice = corII { \stemdown \corII }
+    >
+    \type Staff = trp <
+      \global
+      \property Staff.instrument = "2 Trp. in B\\textflat  "
+      \property Staff.instr = "Trp."
+      \type Voice = trpI { \stemup \trpI }
+      \type Voice = trpII { \stemdown \trpII }
+    >
+  >
+    \type StaffGroup = percussion <\type Staff = timpani <
+      \property Staff.instrument = "Timpani"
+      \property Staff.instr = "Timp."
+      \global
+      \timpani
+    >
+  >
+  \type StaffGroup = strings <
+    \type GrandStaff = violins <
+      \type Staff = viI <
+        \property Staff.instrument = "Violin I"
+        \property Staff.instr = "Vi. I"
+        \global
+        \viI
+      >
+      \type Staff = viII <
+        \property Staff.instrument = "Violin II"
+        \property Staff.instr = "Vi. II"
+        \global
+        \viII
+      >
+    >
+    \type Staff = vla <
+      \property Staff.instrument = "Viola"
+      \property Staff.instr = "Vla."
+      \global
+      \vla
+    >
+    \type Staff = vlc <
+      \property Staff.instrument = "Violoncello"
+      \property Staff.instr = "Vlc"
+      \global
+      \vlc
+    >
+    \type Staff = cb <
+      \property Staff.instrument = "Contrabasso"
+      \property Staff.instr = "C.B."
+      \global
+      \cb
+    >
+  >
+>
+ \paper {
+    \paper_sixteen
+    linewidth = 185.\mm;
+    textheight = 260.\mm;
+    \translator {
+	\OrchestralScoreContext
+        minVerticalAlign = 2.5*\staffheight;
+    }
+    \translator { \StaffContext
+	\consists "Staff_margin_engraver";
+        marginHangOnClef = 1;
+        marginScriptPadding = "20.0";
+	textstyle = "italic";
+	textScriptPadding = 5.0;
+    }
+\translator{\VoiceContext
+\remove Auto_beam_engraver; % Bug workaround!
+}
+  }
+}
+
+\score{
+  \type StaffGroup <
+    \oboe
+    \flauto
+    \type Staff = cor {\notes \transpose bes <\clarI \clarII >}
+    \fagotto
+    \type Staff = cor {\notes \transpose f <\corI \corII >}
+    \type Staff = cor {\notes \transpose bes <\trpI \trpII >}
+    \timpani
+    \viI
+    \viII
+    \vla
+    \vlc
+    \cb
+  >
+  \midi {
+    \tempo 4=120;
+  }
+}
diff --git a/mutopia/N.W.Gade/strings.ly b/mutopia/N.W.Gade/strings.ly
new file mode 100644
index 0000000000..afc4eb1a37
--- /dev/null
+++ b/mutopia/N.W.Gade/strings.ly
@@ -0,0 +1,1335 @@
+\version "1.0.14";
+
+viI=\notes\relative c'' {
+
+\property Staff."midi_instrument" = "violin"
+
+r4 r [g8.-> \mf ( a16 ] |
+) g4 r c, \p |
+[c'8. ( d16 ] c4. a8 |
+[f8. e16 ] f4. ) a8 |
+[c8. ( d16 ] c4. ) a8 |
+[a8. ( g16 ] ) f4 r |
+[c'8. ( d16 ] c4. a8 |
+[f8. e16 ] f4. ) a8 |
+[c8. ( d16 ] c4. ) a8 |
+[a8. ( g16 ] ) f4 r |
+[c'8. \mf ( \< d16 ] [b8 c] \! ) f4 |
+[ e8. \> ( d16 ] c4 \! ) g \pp |
+[c8. ( \< d16 ] [b8 c] \! ) f4 |
+[ e8. \> ( d16 ] ) \! c2 \p |
+[c8. ( d16 ] c4. a8 |
+[g8. a16 ] f4. ) a8 |
+[c8. ( d16 ] c4. ) a8 |
+[a8. ( g16 ] ) f4 r |
+g2 \< ( \! f4 |
+e \> \! ) f r |
+r8 [ c ( g' c, f c ] |
+[ bes c a8 c a ) c ] |
+[a ( c a c a c ] |
+[a \pp c a c a ) c ] |
+[bes ( c ] bes4 [a8 c ] |
+[ bes c ] ) bes2 ~ |
+bes r4 |
+R2.*4 |
+r4 r^\fermata r8^\fermata [c'16 \pp ( d] | \time 2/4;
+) c8 r r [c16 ( d] |
+) c8 r r [c16 ( d] |
+[c d c a][f a c d] |
+[f8 d ) c d ( ] |
+[ ) a bes () g d' ( ] |
+[ ) a bes () g ] [d'16 ( es ] |
+[ d es d bes][g bes d es] |
+[ g8 es ) d bes ( ] |
+[) g a () f c' ( ] |
+[) g a () f ][ c'16 ( d ] |
+[ ) c8 c16 ( d ][ ) c8 c16 ( d ] |
+[ ) c8 c16 ( d ][ ) c8 c16 \f ( d ] |
+[c d c a][f a c d] |
+[f8 d ) c f, ( ] |
+[f' d ) c a ( ] |
+[a' f ) e ] [a,,16 ( b ] |
+[c-> d c b ][ ) a8 a'16 ( b ] |
+[c d c b ][ ) a8 a,16 ( b ] |
+[c \> d c \! b ][ ) a8 a'16 ( b ] |
+[c d c b ][ ) a8 a,16 ( b ] |
+[) c8-. b16 ( c][ ) d8-. c16 ( d ] |
+[ es f es ) d ][c8-. d'16 ( e ] |
+[f! \sfz g f e][d \> e d c ] |
+[ b c b \! a][g a g ) fis ] |
+f4 ( \p \< g |
+\! a2 |
+a4 \> [g8 \! f'] |
+[e c a ) g ] |
+f4 ( \< g |
+\! a2~ |
+a4 \> ) g |
+\! a2 ( |
+[a8_"dim." g f d] |
+<{[b g ][a ) g ] |} % grace note b8 b
+  \type Voice=x {s8.. \tiny b8}>
+R2 |
+r4 r8 a'-. \mf |
+[a-. \< a-. a-. \! a-. ] |
+b4. \sfz r8 |
+R2 |
+r4 r8 a-. \mf |
+[a-. \< a-. a-. \! a-. ] |
+b4. \f bes8 ( |
+) bes'4.-> bes,8 ( |
+) bes'4.-> a8 |
+[g-. \< f-. e-. \! d-. ] |
+[cis16 ( e d b][ ) g8 \f bes8 (] |
+) bes'4.-> bes,8 ( |
+) bes'4.-> a8 \p |
+[g-. \< f-. e-. \! d-. ] |
+[g, g'16 \f ( a ][ ) g8 g,, \p ] |
+g4 ( a | % added longer slur
+b \tiny [a16*1/2 b*1/2] \normalsize[c8*1/2 ) g ] | % grace notes [a16 ( b][) c
+g4 ( a |
+b \tiny [a16*1/2 b*1/2] \normalsize [) c8*1/2 bes' \f ( ] | % grace notes [a16 ( b][) c
+) bes'4.-> a8 |
+[f-. e-. d-. f, ( ] |
+< ) d'4. \sfz a'> g,8 ( |
+< ) d'4. \sfz g> g,8 ( |
+) e' r g4-> ( |
+) e8 r g4-> ( |
+) e8 r es4 ( |
+[) d8 g16 ( a ] [ ) g8 g, ( ] |
+) e'! r g4-> ( |
+) e8 r g4-> ( |
+) e8 r es4 ( |
+[) d8 g16 ( a ] [ ) g8 g, ( ] |
+) e' r g4_"dim." ( |
+) e8 r d4 ( |
+) e8 r g4 ( |
+) e8 r d4 ( |
+[ ) e8 \p g,-. a-. b-.] |
+c r r4 |
+R2 |
+r4 e,-. \p |
+a ( \< ) e' |
+e-. () \! e-. |
+e \sfz \> [ d8 \! c ] |
+b2 \p | % \p added
+\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4
+\! e ) b |
+\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4
+\! e ) b |
+\tiny d8*1/2 \normalsize f2 \sfz ( *7/8 |
+b,4 [c8 ) b] |
+a2-> ~ |
+gis4 e |
+a ( ) e' |
+e-.  \< () \! e-. |
+e ( \sfz \> [ d8 \! c ] |
+) b2 \p |
+\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4
+\! e ) b |
+\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4
+\! e ) b |
+\tiny d8*1/2 \normalsize f2 \sfz ( *7/8 |
+b,4 [c8 ) b] |
+a2 \p ~ |
+gis |
+\tiny a8*1/2 \normalsize d2 ( \> *7/8 | % grace note a8 () d2
+b4 [ c8 \! b ] |
+a2 \p |
+) gis |
+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 ] |
+[ d es d bes][g bes d es] |
+[ g8 es ) d bes ( ] |
+[) g a () f c' ( ] |
+[) g a () f ][ c'16 ( d ] |
+[ ) c8 c16 ( d ][ ) c8 c16 ( d ] |
+[ ) c8 c16 ( d ][ ) c8 c16 \ff ( d ] |
+[c d c a][f a c d] |
+[f8 d ) c f, ( ] |
+[f' d ) c ][f,16 ( g] |
+[ ) f8 f16 ( g][ ) f8 f'16 ( g] |
+[f g f d][bes d f g] |
+[bes8 g ) f bes, ( ] |
+[bes'8 g ) f d ( ] |
+[d' bes ) a d,,16 ( e ] |
+[f g f e ][ ) d8 d'16 ( e ] |
+[f-> g f e][ ) d8 d,16 ( e ] |
+[f g f e ][ ) d8 d'16 ( e ] |
+[f g f e][ ) d8 d,16 ( e ] |
+[ ) f8 e16 ( f][ ) g8 f16 ( g ] |
+[as bes as g][ ) f8 g'16 ( a! ] |
+[bes! \sfz c bes a][g a g ) f ] |
+[e ( f e d][c d c ) b ] |
+bes!4 \p ( \< c | % \p added
+\! d2 ~ |
+d4 [c8 bes' \> ] |
+[a f d ) \! c ] |
+bes4 ( \< c |
+\! d2 ~ |
+d4 \> c |
+\! d2 |
+[d8 c][bes g] |
+[e c] \tiny e8*1/4 \normalsize [d *3/4 ) c ] | % grace note e8() d
+R2 |
+r4 r8 d' \mf |
+d2:8 \< |
+\! e4 \f r |
+R2 |
+r4 r8 d |
+d2:8 \< |
+\! e4 \f r8 es ( |
+) es'4.-> es,8 ( |
+) es'4.-> d8 \p |
+[c-. \< bes-. a-. \! g-. ] |
+[fis16 ( a g ) e!] [c8 es8 ( \f ] |
+) es'4.-> es,8 ( |
+) es'4.-> d8 \p |
+[c-. \< bes-. a-. \! g-. ] |
+[c, c'16 ( \f d] [) c8 c,, \p ] |
+c4^\trill ( d^\trill |
+e^\trill \tiny [d16*1/2 e*1/2] \normalsize [f8 *1/2 ) c ] | % grace notes [d16 ( e] )f
+c4^\trill ( d^\trill |
+e^\trill \tiny [d16*1/2 e*1/2] \normalsize [f8 *1/2 ) es' \f ( ] | % grace notes [d16 ( e] )f % \f added 
+) es'4. d8 |
+[bes-. a-. g-. bes, ( ] |
+) d'4. \sfz c,8 ( |
+) c'4. \sfz c,8 ( |
+) a' r c4-> ( |
+) a8 r c4-> ( |
+) a8 r as4 ( |
+[) g8 c16 ( d][) c8 c, ( ] |
+) a' r c4 ( |
+) a8 r c4 ( |
+) a8 r as4 ( |
+[) g8 c16 ( d][) c8 c, ( ] |
+) a' r c4_"dim." ( |
+) a8 r g4 ( |
+) f8 r c4 ( |
+) a8 r g4 \p ( |
+) f2 \< ~ |
+\! f2 ( ~ |
+f4 g |
+f ) e |
+es2 ~ |
+d4 r |
+\tiny f'8*1/2 \normalsize a4 \sfz ( *3/4 e | % grace note f8() a
+f b, |
+) c r |
+R2 |
+f,8 \p r r4 | % \p added
+e8 r r [c'16 ( \pp d] |
+[ ) c8-. b16 ( c ][ ) b8-. bes16 ( c ] |
+[ ) bes8-. a16 ( bes ][ ) a8-. c16 ( d ] |
+[ ) c8-. b16 ( c ][ ) b8-. bes16 ( c ] |
+[ ) bes8-. a16 ( bes ][ ) a8-. e'16 ( f ] |
+[ ) e8-. d16 ( e ][ ) d8-. c16 \< ( d ] |
+[ ) c8-. b16 ( \! c ][ ) b8-. bes ] |
+bes'4. \sfz \> a8 |
+[g-. \! f-. ] [e-. c16 ( d ] | 
+[ ) c8-. b16 ( c ][ ) b8-. bes16 ( c ] |
+[ ) bes8-. a16 ( bes ][ ) a8-. c16 ( d ] |
+[ ) c8-. b16 ( c ][ ) b8-. bes16 ( c ] |
+[ ) bes8-. a16 \< ( bes ][ ) a8-. \! bes ( ] |
+) bes'4. \f d,8 ( |
+) d'4.-> c,8 ( |
+) c'4.-> e,8 ( |
+) e'4.-> [c16 ( d] |
+[c d c a][f a c d] |
+[f8 d ) c ][ c16 ( d ] |
+[c d c a][f a c d] |
+[f8 d ) c ][f,16 ( g ] |
+[f g f d ][ ) b8 bes'!16 ( c ] |
+[bes c bes g][ ) e8 c'16 ( d ] |
+[) c8 c16 ( d ][) c8-. c16 ( d ] |
+[) c8-. c16 ( d ][) c8-. c16 ( d ] |
+) c8-. r c r |
+a r <e bes> r |
+<a, f'> r a' r |
+c r a r |
+<f4 a,> r8 c ( |
+<a4 ) a'> r8 c ( |
+<a4 ) f'> r8 c ( |
+<a4 ) a'> r8 c, |
+f2 ~ |
+f ( |
+<f4 \sfz c' ) a'> r^\fermata
+
+}
+
+viII=\notes\relative c' {
+
+\property Staff."midi_instrument" = "violin"
+
+r4 r e->  \mf ~ |
+e r e ( \p |
+) f2 f4 ( |
+) c r r |
+f2 f4 ( |
+) e f r |
+f2 f4 ( |
+) c r r |
+f2 f4 ( |
+e \< [f8. d16][c8. \! ) d16] |
+[e8. \mf ( f16][d8 ) e] f4 ~ |
+f ( e [c8 ) e] |
+a2. \pp ( |
+gis4 e ) f |
+g! \p [f8. ( g16] ) f8 r |
+c4 ( ~ [c8. d16] ) c8 r |
+g'4 [f8. ( g16] ) f8 r |
+c4 r r |
+<c2. { s4. \< \! s4. \>}> ~ |
+\! c2._"dim." ~ |
+c \pp ~ |
+c \< ~ |
+\! c \> ~ |
+\! c \pp \< ~ |
+\! c \> ~ |
+\! c \pp ~ |
+c2 r4 |
+R2.*4 |
+r4 r^\fermata r8^\fermata [c'16 \pp ( d] | \time 2/4;
+) c8 r r [c16 ( d] |
+) c8 r r [c16 ( d] |
+[c d c a][f a c d] |
+[f8 d ) c ] r |
+fis,-. r g-. r |
+fis r [g d'16 ( es ] |
+[ d es d bes][g bes d es] |
+[ g8 es ) d ] r |
+e,! r f r |
+e r f r |
+R2 |
+r4 r8 [ c'16 \f ( d ] |
+[c d c a][f a c d] |
+[f8 d ) c f, ( ] |
+[f' d ) c f, ( ] |
+[f' d ) c ] [a,16 ( b ] |
+[c d c b ][ ) a8 a'16 ( b ] |
+[c-> d c b ][ ) a8 a,16 ( b ] |
+[c d c b ][ ) a8 a'16 ( b ] |
+[c-> d c b ][ ) a8 a,16 ( b ] |
+[) c8-. b16 ( c][ ) d8-. c16 ( d ] |
+[ es f es ) d ][c8-. d'16 ( e! ] |
+[f! g f e][d e d c ] |
+) b r r8 r4 |
+<{d,2 ( \p ~ |
+  d4 e |
+  f2 |
+  ) e |
+  d ( \p ~ |
+  d4 e |
+  f2 |
+  f |
+  ) f4 }
+ {b,2 ( ~ |
+  b4 c |
+  b2 |
+  ) c |
+  b ( ~ |
+  b4 c |
+  b2 |
+  b4 c |
+  ) d \p } > r |
+R2*2 |
+r4 r8  fis-. \mf |
+[fis-. \< fis-. fis-. \! fis-. ] |
+f!4. \f r8 |
+R2 |
+r4 r8  fis-. |
+fis2:8 |
+f!4. \f e8 ( |
+) e'4.-> e,8 ( |
+) e'4.-> c,8 \p |
+[cis-. \< d-. e-. \! f-. ] |
+f4. \f e8 ( |
+) e'4.-> e,8 ( |
+) e'4.-> c,8 \p |
+[cis-. \< d-. e-. \! f-. ] |
+[f \f g16 ( a][ ) g8 g, \p ] |
+g4^\trill ( \< \! a^\trill |
+b^\trill \> \tiny [a16*1/2 b*1/2] \normalsize [ ) c8 *1/2 \! g] | % grace notes [a16 b] [c8
+g4^\trill ( \< \! a^\trill |
+b^\trill \> \tiny [a16*1/2 b*1/2] \normalsize [ ) \! c8 *1/2 g' \f ( ] |
+< ) g4.-> bes> a8 |
+[a a a f ( ] |
+<d'4. \sfz ) a'> g,8 ( |
+<d'4. \sfz ) g> g,8 ( |
+<{ ) e r f4_> ( |
+  ) e8 r f4_> ( |
+  ) e8 }
+ {c'8 s d4 ( |
+  ) c8 s d4 ( |
+  ) c8 }> r fis4 ( |
+[ ) f!8 g16 ( a][ ) g8 f ( ] |
+<{ ) e! r f4_> ( |
+  ) e8 r f4_> ( |
+  ) e8 }
+ {c'8 s d4 ( |
+  ) c8 s d4 ( |
+  ) c8 }> r fis4 ( |
+[ ) f!8 g16 ( a][ ) g8 f ( ] |
+<{ ) e r f4 ( |
+  ) e8 r f4_"dim." ( |
+  ) e8 r f4 ( |
+  ) e8 r f4 ( |
+  [ ) e8 \p }
+ {c'8 s d4 ( |
+  ) c8 s b4 ( |
+  ) c8 s d4 ( |
+  ) c8 s b4 ( |
+  [ ) c8 }> g,-. a-. b-. ] |
+c r r4 |
+R2*2 |
+a4:16 \p \< \! b4:16 \> |
+\! c2:16 \< |
+\! b2:16 \> |
+\! b2:16 |
+b4:16 \p \< \! c4:16 \> |
+\! b2:16 |
+b4:16 \p \< \! c4:16 \> |
+\! b2:16 |
+\tiny d8*1/2 \normalsize f2 ( \> *7/8 | % grace note c8 f2 % corrected to d8
+\! ) e |
+b-> ( |
+) e4 r |
+a,4:16 \p b4:16 |
+c2:16 \< |
+\! b2:16 \sfz \> |
+\! b2:16 |
+b4:16 \p \< \! c4:16 \> |
+\! b2:16 |
+b4:16 \p \< \! c4:16 \> |
+\! b2:16 |
+\tiny d8*1/2 \normalsize f2 ( \sfz *7/8 | % grace note d8 f2 
+) e |
+[ a,16 ( \p d a d ][a d a d] |
+[ b16 d b d ][b d b ) d] |
+f2 ( \> |
+) \! e | 
+[ a,16 ( d a d ][a d a d] |
+[ b16 d b d ][b d b ) d] |
+R2 |
+r8 [e16^"solo" ( f] ) e4 ~ |
+d2_"dim." ~ |
+d ~ |
+c4 r |
+r r8 d' ( |
+[ ) a bes () g d' ( ] |
+[ a ) bes g ] r |
+R2 |
+r4 r8 bes ( |
+[) g a () f c' ( ] |
+[) g a () f ] r |
+R2 |
+r4 r8 [c'16 \sfz ( d ] |
+[c d c a][f a c d] |
+[f8 d ) c f, ( ] |
+[f' d ) c ][f,16 ( g] |
+[ ) f8 f16 ( g][ ) f8 f'16 ( g] |
+[f g f d][bes d f g] |
+[bes8 g ) f bes, ( ] |
+[bes' g ) f bes, ( ] |
+[bes' g ) f d,16 ( e! ] |
+[f-> g f e ][ ) d8 d'16 ( e ] |
+[f g f e][ ) d8 d,16 ( e ] |
+[f g f e ][ ) d8 d'16 ( e ] |
+[f g f e][ ) d8 d,16 ( e ] |
+[ ) f8 e16 ( f][ ) g8 f16 ( g ] |
+[as bes as g][ ) f8 g'16 ( a! ] | % misprint sfz to early
+[bes! \sfz c bes a][g a g ) f ] |
+e r r8 r4 |
+<{e,2 \p ~ |
+  e4 \< \! f |
+  e2 \> |
+  \! f |
+  e \< |
+  e4 \! f |
+  e2 ( |
+  ) e4 ( f |
+  ) g4 \p }
+ {g2 ( ~ |
+  g4 a |
+  bes2 |
+  ) a |
+  g2 |
+  g4 a |
+  bes2 ( 
+  ) bes2 (
+  ) bes4}> r |
+R2*2 |
+r4 r8 b \p |
+b2:8 \< |
+< \! g4 bes! \sfz > r |
+R2 |
+r4 r8 b \p |
+b2:8 \< |
+< \! g4 bes! \f > r8 a ( |
+<c4._> ) a'> a8 ( |
+<c4._> ) a'> f,8 \p |
+[fis-. g-. a-. bes-.] |
+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 \tiny [d16*1/2 e*1/2] \normalsize [ f8 *1/2 ) c ] | % grace notes [d16 ( e] )f
+c4^\trill ( d^\trill |
+e^\trill \tiny [d16*1/2 e*1/2] \normalsize [ ) f8 *1/2 a ( \f ] | % grace notes [d16 ( e] )f
+<a4. ) c4.> d8 |
+[d d d bes \f (] |
+<bes4. ) g'4.> bes8 (|
+<bes4. \f ) g'4.> bes8 (|
+<{a r bes4 ( |
+  ) a8 r bes4 ( |
+  ) a8}
+ { ) f' r g4^> ( |
+  ) f8 r g4^> ( |
+  ) f8}> r b4 ( |
+[ ) bes!8 c16 ( d][ ) c8 bes ( ] |
+<{a r bes4 ( |
+  ) a8 r bes4 ( |
+  ) a8}
+ {) f' r g4 ( |
+  ) f8 r g4 ( |
+  ) f8}> r b4 ( |
+[ ) bes!8 c16 ( d][ ) c8 bes ( ] |
+<{a r bes4_"dim." ( |
+  ) a8 r bes4 ( |
+  ) a8}
+ {) f' r g4 ( |
+  ) f8 r e4 ( |
+  ) f8}> r g4 ( |
+) c,8 r e4 \p |
+es2 ( |
+) d4 \< \! des |
+c2 \> ~ |
+\! c |
+a4 ( \< c |
+d \! des |
+c \f \> \! ) bes |
+a ( \> g |
+\! ) a r |
+R2 |
+c8 \p r r4 |
+c8 r r4 |
+R2 |
+r4 r8 c \p ~ |
+c d4 e8 ~ |
+e f4 c8 ~ |
+c d4 e8 ~ |
+e \< e4 \! e8 ( |
+) bes'!4. \sfz \> \! a8 |
+[g-. f-. e-.] r |
+R2 |
+r4 r8 es \p ~ |
+es es4 es8 ~ |
+es \< es4 \! d8 \f |
+  d'4.-> <{bes8 ( |
+  ) g'4. bes,8 ( |
+  ) g'4. bes,8 ( |
+  ) g'4. }
+ {d,8 |
+  bes'4. g8 |
+  bes4._> g8 |
+  bes4._> }> [c,16 ( d] |
+[c d c a][f a c d] |
+[f8 d ) c ][ c16 ( d ] |
+[c d c a][f a c ) d] |
+[f8 ( d ) c ][f16 ( g ] |
+[f g f d ][ ) b8 bes!16 ( c ] |
+[bes c bes g][ ) e8 < bes' g'^. > ] |
+<{[a bes a bes] |
+  [a bes a bes] |
+  [a}
+ {[f'-. g-. f-. g-.] |
+  [f-. g-. f-. g-.] |
+  [ f}> c16 ( d ][ ) c8-. c16 ( d ] |
+[ ) c8-. c16 ( d ][ ) c8-. c16 ( d ] |
+) c8-. r <c f,> r |
+ <c f,> r <c f,> r |
+<a4 f> r8 c ( |
+<a4 ) a'> r8 c ( |
+<a4 ) f'> r8 c ( |
+<a4 ) a'> r8 c, |
+[a16 ( gis a gis][a gis a gis] |
+[a gis a gis][a gis a gis] |
+<) a4 f' \sfz > r^\fermata 
+}
+
+vla=\notes\relative c' {
+\clef "alto";
+
+\property Staff."midi_instrument" = "viola"
+
+[c8. \f ( d16 ] ) c2_"dim." |
+\type Staff <{\voiceone s4 c2 |
+  c2. ~ |
+  c2. ~ |
+  c2. ~ |
+  c2. ~ |
+  c2. ~ |
+  c2. ~ |
+  c2. ~ | } 
+ { \voicetwo [c8. ( d16 ] c4 ) bes |
+  [a8 \p ( bes ] a4. ) c8 | % added \p 
+  [a8 ( bes ] a4. ) c8 |
+  [a8 ( bes ] a4. ) c8 |
+  [c8 ( bes ] ) a2 |
+  [a8 ( bes ] a4. ) c8 |
+  [a8 ( bes ] a4. ) c8 |
+  [a8 ( bes ] a4. ) c8 |} >
+[c8. ( \< bes16 ] ) \! a2 |
+g2 \mf [a8 \< ( \! d ] |
+[ c \> b \! c g e ) c] |
+[e'8. \pp ( f16 d8 e f d ] |
+b4 [c8 \< a f \! ) a ] |
+c,2 \p ~ c'4 |
+c,2 ~ c'4 |
+c,2 ~ c'4 |
+c, ~ c' r |
+[c,8 ( g' ][ c g c a ] |
+[bes c ] ) a4 r |
+R2. |
+r4 r dis, \< ~ |
+\! e r dis' \pp ~ |
+e r r |
+R2. |
+r4 r c, \pp ~ |
+c2. ~ |
+c4 r r |
+R2.*3 |
+r4 r^\fermata r8^\fermata r8 |
+R2*4 |
+c'8-. \pp r bes-. r |
+c-. r bes-. r |
+R2*2 |
+bes8-. r a-. r |
+bes-. r [a-. c16 ( d ] |
+[ ) c8 c16 ( d ] [ ) c8 c16 ( d ] |
+[ ) c8 c16 ( d ] [ ) c8 c16 () f ] |
+[c ( \f f c f][ c f c ) f ] |
+[d ( f d f][ c f c ) f ] |
+[d ( f d f][ c f c ) f ] |
+[d ( f d f] ) a8 r |
+f,4.-> [a16 ( b] |
+[c d c b] ) a8 r |
+f4. [a16 ( b] |
+[c d c b] ) a8 r |
+<f8 a> r <f a> r |
+<fis a> r <fis a> r |
+[<g \sfz d'> d'16 ( e][f g f e ] |
+[d e d c] ) b8 r |
+[as16 ( \p g as g] [fis g fis ) g ] |
+[f! ( g f g][e g e ) g] |
+d4 \> \! g |
+[c,16 ( g' a g ] [a g a ) g ] |
+[as16 ( \p g as g] [fis g fis ) 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 |
+r r8 <c \p g'> |
+<c2:8 g'2:8 > |
+<c2:8 g'2:8 \< > |
+< \! c2:8 \f g'2:8 > |
+<{[c8 c c c \p ]}{[g' g g g]}> |
+<c2:8 g'2:8 > |
+<c2:8 g'2:8 > |
+<c2:8 \f g'2:8 > |
+<{[c8 c c c ] |
+  c'4.-> c,8 |
+  c'4. }
+ {[g8 g g g (] |
+  ) g'4. g,8 ( |
+  ) g'4. }
+     > a'8-. \p |
+[g-. \< f-. e-. \! d-. ] |
+b4. <{c,8 \f |
+  c'4.-> c,8 |
+  c'4. }
+ { g8 ( |
+  ) g'4. g,8 ( |
+  ) g'4. }> a'8-. \p |
+[g-. \< f-. e-. \! d-. ] |
+b4 r8 <c, \p g'> |
+<c2:8 g'2:8 > |
+<c2:8 g'2:8 \< > |
+< c2:8 g'2:8 > |
+<{[ \! c8 c c cis \f (]}{[g' g g s ]}> |
+) cis'4.-> cis8 |
+[d a d <d ( g,> ] |
+<f4. ) d' \sfz > <d8 ( g,> |
+<f4. ) d' \sfz > g,8 ( |
+[c,16 g' fis ) g] [c, (g' fis ) g ] |
+[c, ( g' fis ) g] [c, (g' fis ) g ] |
+[c, ( 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, ( g' fis ) g] [c, (a' gis ) a ] |
+[b ( c d ) b ][g ( a f ) d ] |
+[c ( g' fis ) g] [c, (g' fis ) g ] |
+[c,_"dim." ( g' fis ) g] [c, (g' fis ) g ] |
+[c, ( g' fis ) g] [c, (g' fis ) g ] |
+[c, ( g' fis ) g] [c, (g' fis ) g ] |
+c,8 \p r r4 |
+r8 [g'-. a-. b-.] |
+c r r4 |
+r8 <{[b c d] | c }{gis-. a-. b!-. | a}>
+  r r4 |
+R2*2 |
+g'4 \p ( [fis8 \< dis ] |
+\! e4 fis |
+g \> [fis8 ) \! dis ] |
+e4 \< ( \! fis |
+g \> [fis8 ) \! dis ] |
+<d!2 \sfz e, > ~ |
+<d2 e, > |
+<d b > ~ |
+<d b > |
+c4 r |
+R2*2 |
+g'4 \p ( [fis8 \< dis ] |
+\! e4 fis |
+g \> [fis8 ) \! dis ] |
+e4 \< ( \! fis |
+g \> [fis8 ) \! dis ] |
+<d!2 \f e, > ~ |
+<d e, > |
+d \p ~ |
+d |
+<d a \> > ~ |
+<d \! gis, > |
+d \p ~ |
+d ~ |
+d ~ |
+d_"dim." ~ |
+d4 r |
+r8 [e16 ( f ] e4 |
+) es \pp r |
+R2*3 |
+g,2 ~ |
+g4. r8 |
+R2 |
+r4 r8 [c16 \p ( d ] |
+[ ) c8 c16 ( d ] [ ) c8 c16 ( d ] |
+[ ) c8 c16 ( d ] [ ) c8 c16 ( f ] |
+[c \sfz f c f][ c f c ) f ] |
+[d ( f d f][ c f c ) f ] |
+[d ( f d f] ) c8 r |
+r4 r8 [ f16 () g ] |
+<d2:16 f2:16> |
+<es4:16 g4:16> <d4:16 f4:16> |
+<es4:16 g4:16> <d4:16 f4:16> |
+<g4:16 bes4:16> <f!8 a> r |
+bes,4.-> [d16 ( e ] |
+[f g f e ] ) d8 r |
+bes4.-> [d16 ( e ] |
+[f g f e ] ) d8 r |
+<bes d> r <bes d> r |
+<b d> r <b d> r |
+[<c \sfz e^. > g'16 ( a ] [bes! \> c \! bes a ] |
+[g a g f ] ) e r r8 |
+[des16 ( \p c des c ] [ b c b c ] |
+[bes! \< c bes c ] [ \! a c a ) c ] |
+g4 \> \! c, ( |
+[f16 c' d c][d c d ) c] |
+[des16 ( \p c des c ] [ b c b c ] |
+[bes! \< c bes c ] [ \! a c a ) c ] |
+[g \> ( c g c][g c g \! c ] |
+[g c g c][f, c' f, ) c'] |
+e,4 \p r |
+r r8 <f \p c'> |
+<f2:8 c'2:8> |
+<f2:8 \< c'2:8> |
+<f2:8 \! c'2:8> |
+<{[f8 \f f f f \p ]}{[c'8 c c c]}> |
+<f2:8 \< c'2:8> |
+<f2:8 \! c'2:8> |
+<f2:8 \f c'2:8> |
+<{[f8 f f f] |
+  f'4._> f,8 |
+  f'4._> }
+ {[c8 c c c ( ] |
+  ) c'4. c,8 ( |
+  ) c'4. }> d'8 \p |
+[c-. \< bes-. a-. \! g-. ] |
+<{c,4. f,8 \f |
+  f'4._> f,8 |
+  f'4. }
+ {e4. c8 ( |
+  ) c'4. c,8 ( |
+  ) c'4. }> d'8 |
+[c-. \< bes-. a-. \! g-. ] |
+<e4 c> r8 <f, \p c'> |
+<f2:8 c'2:8> |
+<f2:8 \< c'2:8> |
+<f2:8 \! c'2:8> |
+<{[f8 f f fis \f ~ ]}{[c'8 c c s]}> |
+<a4. fis'4.> fis'8 |
+[g d g <g, ( c,> ] |
+<c4. \sfz ) g'> <g8 ( c,> |
+<c4. \sfz ) g'> c,8 ( |
+[f16 c' b ) c ][ f, ( c' b ) c ] |
+[ f, ( c' b ) c ] [ f, ( c' b ) c ] |
+[ f, ( c' b ) c ] [ f, ( d' cis ) d ] |
+[e ( f g ) e ][c ( d bes ) g] |
+[ f ( c' b ) c ] [ f, ( c' b ) c ] |
+[ f, ( c' b ) c ] [ f, ( c' b ) c ] |
+[ f, ( c' b ) c ] [ f, ( d' cis ) d ] |
+[e ( f g ) e ][c ( d bes ) g] |
+[ f ( c' b ) c ] [ f, ( c' b ) c ] |
+[ f,_"dim." ( c' b ) c ] [ f, ( c' b ) c ] |
+[ f, ( c' b ) c ] [ f, ( c' b ) c ] |
+[ f, ( c' b ) c ] [ f, ( c' b ) c ] |
+f,2 \p ~ |
+f4 r |
+R2*2 |
+f'2 ( ~ |
+f |
+f4 \f g |
+) f [f8. ( \> g16 ] |
+\! f2 |
+) c |
+a8 \p r r4 |
+g8 r r a \pp ~ |
+a as4 g8 ~ |
+g f4 a!8 ~ |
+a as4 g8 ~ |
+g f4 e8 ~ |
+e \< f4 e8 ~ |
+\! e d4 c8 ( |
+<g'4. \sfz ) e'> f8 |
+[g-. a-. bes-. a ~ ] |
+a as4 g8 ~ |
+g f4 a!8 ~ |
+a \< as4 \! g8 ~ |
+g f4 \f f8 ( |
+<bes4._> ) f' > g8 ( |
+<d'4._> ) bes' > e,!8 ( |
+<c'4._> ) g' > <g8 ( c, > |
+<c4._> ) g' > c,8 ~ |
+f4. a8 ( |
+[d f ) a ] c,,8 ~ |
+f4. a8 ( |
+[d f ) a ] [f16 ( g ] |
+[f g f d ][ ) b8 bes'!16 ( c ] |
+[bes c bes g][ ) e8 c'16 ( d ] |
+[) c8-. c16 ( d ][) c8-. c16 ( d ] |
+[) c8-. c16 ( d ][) c8-. c16 ( d ] |
+[) c8-. c,16 ( d ][) c8-. c16 ( d ] |
+[) c8-. c16 ( d ][) c8-. c16 ( d ] |
+) c8-. r c-. r |
+a r c-. r |
+<c4 a'> r8 c ( |
+<f4 ) c'> r8 c, ( |
+<c'4 ) a'> r8 c ( |
+<f4 ) c'> r8 c, |
+[c'16 ( b c b][c b c b] |
+[c b c b][c b c b] |
+<c4 \sfz ) a'> r^\fermata 
+}
+
+vlc=\notes\relative c' {
+\clef "bass";
+
+\property Staff."midi_instrument" = "cello"
+
+r4 r [bes8. \mf ( c16] |
+) bes4 r bes \p ( |
+[ a8 bes ) a f, ( c' f] |
+[ a8 bes ) a f, ( c' f] |
+[ a8 bes ) a f, ( c' f] |
+[c' bes ) a f, ( c' f] |
+[ a8 bes ) a f, ( c' f] |
+[ a8 bes ) a f, ( c' f] |
+[ a8 bes ) a f, \< ( c' f] |
+[c' bes a f \! c ) f, ] |
+<{g2. ( | ) g2 }
+ {c,2. \mf ( | ) c2 \> ( ) \! c'4 |}
+ {s2. \< \! s8}>
+a2  \pp d4 \< ( |
+e ) \! a2 |
+[bes8 \p ( c] [a c a c] |
+[bes8 c] [a c a c] |
+[bes8 c] [a c a ) c] |
+[c ( bes a f c ) f, ] |
+e2 (\< \! f4 |
+g \> ) \! f r |
+e'2 ( f4 |
+g ) f f, ( \< | % added slur
+) \! e2 f'4 ( |
+) e2 dis4 ( \< |
+\! ) e2 dis4 ( \pp |
+) e2. ~ |
+e2 r4 |
+R2.*4 |
+r4 r4^\fermata r8^\fermata [c'16 \pp ( d] | \time 2/4; % \pp added
+) c8 r r [c16 ( d] | 
+) c8 r r [c16 ( d] |
+[c d c a][f a c d] |
+[f8 d ) c] r |
+d,-. \pp r g-. r |
+d-. r [g-. d'16 ( es] |
+[d es d bes][g bes d es] |
+[g8 es ) d] r |
+c,-. r f-. r |
+c-. r [f-. c'-. ] |
+[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][a f a ) f] |
+[a ( d, a' d,][)a8 a'16 ( b] |
+[c d c b ][) a8 f ( ] |
+) e4. [a16 ( b] |
+[c d c b ][) a8 f ( ] |
+) e4. [a,16 ( b ] |
+[)c8 b16 ( c][)d8 c16 ( d] |
+[es f es d] ) c8 r |
+[g \sfz d''16 ( e] [f g f e] |
+[d e d c][b c b ) a] |
+[as \p ( g as g][fis g fis g ] |
+[f! \< g f g][e g e ) \! g] |
+[d \> ( g d g] [d g d ) \! g] |
+c,2 |
+[as'16 ( g as g][fis g fis g ] |
+[f! g f g][e g e ) g] |
+[d ( g d g] [d g d g] |
+d4 c \p |
+) b r |
+R2*2 |
+r4 r8 c'8 \f ( |  % Misprint, missing slur
+) c,4. c8 ( |
+) c,4. r8 |
+R2 |
+r4 r8 c''8 \f (|
+) c,4. c8 ( |
+) c,4. c''8 ( |
+< ) g4. c,_> > c8 ( |
+< ) g4. c,> c,8 |
+[cis-. \p \< d-. e-. \! f-. ] |
+g,4.  c8 \f ( |
+< ) c4. f,_> > c8 ( | % slur added
+< ) c4. f,> c8-> | 
+[cis-. \p \< d-. e-. \! f-. ] |
+g,4 r8 <{ c8 \p |
+  c2:8 |
+  c2:8 \< |
+  \! c2:8 |
+  [c8 c s s] |
+  a4.}
+ {g'8 |
+  g2:8 |
+  g2:8 |
+  g2:8 |
+  [g8 g c cis] |
+  e,4.-> }> a8 |
+[d-. e-. f-. b ( ] |
+) b,4. \f b'8 ( |
+< ) d,4.  \f g,> g8 ( |
+[)c,16 g' (fis) g][c,( g' fis ) g] |
+[c, ( g' fis ) g][c, ( g' fis ) g] |
+[c, ( 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] |
+[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 |
+c4 r |
+c8 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 \> |
+g4:16 \! a4:16 |
+g4:16 \< \! a4:16 |
+g4:16 \> \! a4:16 |
+g4:16 \< \! a4:16 |
+g4:16 \> \! a4:16 |
+gis2 \sfz ~ |
+gis |
+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 |
+g4:16 \< \! a4:16 |
+g4:16 \> a4:16 |
+g4:16 \! a4:16 |
+gis2 \sfz ~ |
+gis ~ |
+f \p \> |
+\! e_"dim." |
+d |
+e |
+f |
+e |
+[f16 ( g f g][f g f8 ] |
+) e4 r |
+[f16 ( g f_"dim." g][f g f8 ] |
+) e4 r |
+[c'16 ( d c a][f a c ) d] |
+[f8 ( d ) c] r |
+fis,8-. r g-. r |
+d r [g d'16 ( es] |
+[d es d bes][g bes d es] |
+[g8 es ) d] r |
+c, r f-. r |
+c r [f-. c'-. ] |
+[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-.] |
+[e-. es-. d-. c-. ] |
+[bes16 ( f' bes f][bes f bes ) f] |
+[bes, ( a bes a][bes d f ) bes ] |
+[bes, ( a bes a][bes d f ) bes ] |
+g4 ( [ ) d8 d'16 ( e] |
+[f g f ) e] [d8 bes^._> ] |
+a4. [d16 ( e] |
+[f g f ) e] [d8 bes ( ] |
+) a4. [d,16 ( e ] |
+[) f8-. e16 ( f] [) g8-. f16 ( g] |
+[)as ( bes as g ] ) f8 r |
+c \sfz r r [e'16 ( f ] |
+[g a_"dim." g f][e f e ) d] |
+[des \p \< ( c des c][b c b \! ) c ] |
+[bes! ( c bes c][a c a ) c ] |
+[g ( c g c][g c g ) c] | % misprint a c a c a c a c, comp. bar 59
+f,2 |
+[des'16 \p ( c des c][b c b ) c ] |
+[bes! ( c bes c][a c a ) c ] |
+[g ( c g c][g c g c] | % misprint a c a c a c a c, comp. bar 64
+g4 f |
+) e r |
+R2*2 |
+r4 r8 f' \f (|
+) f,4.-> f8 ( |
+) f,4.-> r8 |
+R2 |
+r4 r8 f'' (|
+) f,4.-> f8 ( |
+) 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 |
+[fis-. \< g-. a-. \! bes-. ] |
+c,4 r8 <{ f8 \p |
+ f2:8 \< |
+ f2:8 |
+ \! f2:8 | }
+ {c'8 |
+ c2:8 |
+ c2:8 |
+ c2:8 |}>
+ [c'8 c f fis ( \f ] |
+ < ) a,4. d,_> > d,8 |
+[g-. a-. bes-. e! ( ] |
+) e,4.-> e'8 |
+< g,4.  c,_> > c8 |
+[f,16 ( c' b c][f,16 c' b ) c] |
+[f,16 ( c' b c][f,16 c' b ) c] |
+[f,16 ( c' b ) c][f, ( d' cis ) d] |
+[e ( f g ) e][c ( d bes ) g] |
+[f16 ( c' b ) c][f,16 ( c' b ) c] |
+[f,16 ( c' b ) c][f,16 ( c' b ) c] |
+[f,16 ( c' b ) c][f, ( d' cis ) d] |
+[e ( f g ) e][c ( d bes ) g] |
+[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 ( |
+) a2 ( |
+) bes |
+a4 \< ( \! bes |
+a \> ) \! g |
+a2 ( \< |
+) \! bes |
+f4 \f \> ( cis |
+d \! g, |
+) c!8 r r4 |
+R2 |
+c8 r r4 |
+c8 r r4 |
+<c8 \pp f,> r <c f,> r |
+<c f,> r <c f,> r |
+<c f,> r <c f,> r |
+<c f,> r <c f,> r |
+e, r e r |
+e r [e () c] |
+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 |
+<c f,> r <c f,> bes' \f |
+bes,4.-> g'8 ( |
+) g,4.-> e'!8 ( |
+) e,!4.-> c'8 ( |
+) c,4.-> [c''16 ( d ] |
+[c d c a][f a c d] |
+[f8 d ][) c c16 ( d] 
+[c d c a][f a c d] |
+[f8 d ][) c d, ( ] |
+) g,4.-> g'8 ( |
+) c,4.-> c'8 ( |
+[ ) f, c-. f-. c-. ] |
+[f-. c-. f-. c-. ] |
+f r c r |
+f r c' r |
+f, r c r |
+a r c r |
+f4 r8 c8 ( |
+) f4 r8 c8 ( |
+) f,4 r8 c'8 ( |
+) f4 r8 c8 ( |
+) f,2 ~ |
+f ( |
+) f'4 \sfz r^\fermata
+}
+
+cb=\notes\relative c {
+\clef "bass";
+
+\property Staff."midi_instrument" = "contrabass"
+
+r4 r c-> \mf ~ |
+c r c \p ( |
+) f,2. ~ |
+f ~ |
+f2 f'4 ( |
+c ) f r |
+f,2. ~ |
+f ~ |
+f ~ |
+f2 r4 |
+c'2. ~ |
+c |
+a2 d4 ( |
+e a ) f |
+c2. \p ~ |
+c ~ |
+c ~ |
+c4 () f r |
+e2 f4 ( |
+g ) f r |
+R2. |
+r4 r f ( \< |
+\! ) e2 r4 |
+r r dis ( \< |
+\! ) e2 r4 |
+R2.*6 |
+r4 r^\fermata r8^\fermata r |
+R2*4 |
+d8-. \pp r g-. r |
+d-. r g-. r |
+R2*2 |
+c,8-. r f-. r |
+c-. r f-. r |
+R2 |
+r4 r8 f8 \f ~ |
+f2 |
+f |
+f |
+d4 () a8 r |
+f4.-> f'8 ( |
+) e4. r8 |
+f,4.-> f'8 ( |
+) e4. r8 |
+f,8 r f' r |
+fis r fis r |
+g \sfz r r4 |
+R2*3 |
+r4 g, ( |
+) c r |
+R2*8 |
+c'4_"pizz." \f r |
+c, r |
+R2*2 |
+c'4_"pizz." r |
+c, r8 c'8_"arco?" ( |
+) c,4.-> c'8 ( |
+) c,4. f8-. |
+[f-. \p \< f-. f-. \! f-.] |
+g4. c,8 ( |
+) f,4.-> c'8 ( |
+) f,4.-> f'8 |
+[f-. \p \< f-. f-. \! f-.] |
+g4 r8 c, \p |
+c2:8 \< |
+c2:8 |
+c'2:8 |
+\! c4.:8 cis8 \f ( |
+) a,4. a8 |
+[d e f b ( ] |
+) b,4. \f b'8 ( |
+) g,4. \f g'8-> |
+c,4 c-> ~ |
+c c-> ~ |
+c c-> ~ |
+c r |
+c c ~ |
+c c ~ |
+c c ~ |
+c r |
+c r |
+c r |
+c_"dim." r | % dim. added
+c r |
+c8 r r4 |
+R2 |
+r8 [c-.^"solo" \p d-. dis-.] |
+e r e, r |
+a2 \p |
+a \< ( |
+\! e' \> |
+\! ) e4 r |
+e2 \< ~ |
+\! e4 \> \! r |
+e2 \< ~ |
+\! e4 \> \! r |
+e2 \sfz ~ |
+e |
+f! ( |
+[e8 d c ) b]
+a2 \p ~ |
+a |
+e' \sfz \> ~ |
+\! e4 r |
+e2 \> ~ |
+\! e4 r |
+e2 \> ~ |
+\! e4 r |
+e2 \sfz ~ |
+e ~ |
+f \p ~ |
+e |
+d \> ( |
+e |
+\! f \p |
+) e4 r |
+R2*6 |
+fis8-. r g-. r |
+d-. r g-. r |
+R2*2 |
+c,8-. r f-. r |
+c-. r f-. r |
+R2 |
+r4 r8 f \f ~ |
+f2 |
+f |
+f,4. f'8 |
+[e8-. es-. d-. c-. ] |
+bes2 |
+bes |
+bes |
+g'4 () d8 r |
+bes4. bes'8 ( |
+) a4. r8 |
+bes,4. bes'8 ( |
+) a4. r8 |
+bes, r bes' r |
+b r b, r |
+c \sfz r r4 |
+R2*3 |
+r4 c ( |
+) f r |
+R2*8 |
+f4_"pizz." r  |
+f, r |
+R2*2 |
+f'4 r |
+f, r |
+f'4._"arco" r8 |
+f4. bes,8 \p |
+bes2:8 \< |
+\! c4. f8 \f ( |
+) bes,4.-> <f'8 \p bes ( > |
+) bes,4. bes'8 |
+c2: \< |
+\! c4 r8 f, \p |
+f2:8 \< |
+f2:8 |
+\! f2:8 |
+f4.:8 fis8 \f ( |
+) d4.-> d8 |
+[g-. a-. bes-. e ( ] |
+) e,4.-> e'8 |
+c,4.-> c'8 ( |
+) f,4 f~ |
+f f~ |
+f f~ |
+f r |
+f, f ~ |
+f f ~ |
+f f' ~ |
+f r |
+f r |
+f_"dim." r |
+f r |
+f r |
+f2 \p \< ~ |
+f ~ |
+\! f \> ~ |
+\! f |
+f, \< ~ |
+\! f | 
+f'4 ( \f \> cis |
+\! d g, |
+) c! r |
+R2 |
+c8 \p r r4 |
+c8 r r4 |
+f8 \pp r f r |
+f r f r |
+f r f r |
+f r f r |
+e r e r |
+e r e r |
+c4. \f \> d8 |
+[e-. f-. \! g-.] r |
+f \p r f r |
+f r f r |
+f r f r |
+f r f r |
+bes4.-> r8 |
+g4.-> r8 |
+e!4.-> r8 |
+c4. c8 ( |
+) f2 ( |
+) f,4. c'8 |
+f2 ( |
+) f,4. d'8 ( |
+) g,4.-> g'8 ( |
+) c,4.-> c'8 ( |
+[ ) f, c-. f-. c-. ] |
+[ f-. c-. f-. c-. ] |
+f r c r |
+f r c' r |
+f, r c r |
+a r c r |
+f4 r8 c8 ( |
+) f4 r8 c8 ( |
+) f,4 r8 c'8 ( |
+) f4 r8 c8 ( |
+) f,2 ~ |
+f ( |
+) f'4 \sfz r^\fermata
+}
\ No newline at end of file
diff --git a/scm/lily.scm b/scm/lily.scm
index 4cea79ddbf..a87b677c26 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -60,7 +60,14 @@
 (define (postbreak_only_visibility d) (if (= d 1) '(#f . #f) '(#t . #t)))
 (define (non_postbreak_visibility d) (if (= d -1) '(#t . #t) '(#f . #f)))
 (define (spanbar_non_postbreak_visibility d) (if (= d -1) '(#t . #t) '(#f . #f)))
-(define (spanbar_postbreak_only_visibility d) (if (= d 1) '(#f . #f) '(#t . #t)))
+
+;; Score_span_bars are only visible at start of line
+;; i.e. if break_dir == RIGHT == 1
+(define Span_score_bar_visibility postbreak_only_visibility)
+(define Piano_bar_visibility postbreak_only_visibility)
+(define Staff_group_bar_visibility postbreak_only_visibility)
+
+
 
 
 ;;;;;;;; TeX