update

diff --git a/general/scorePaper.ly b/general/scorePaper.ly
index d824d306535294fbe92658e80dc7a9c9fa8584b0..450cdf7109866a03d6d3c74732d53b3532ef2389 100644 (file)
--- a/general/scorePaper.ly
+++ b/general/scorePaper.ly
@@ -1,3 +1,4 @@
+% root = ../evenings-in-the-west.ly
 \paper {
   line-width = 120
   first-page-number = -1
@@ -10,7 +11,7 @@
   bottom-margin = 0.5\in
   left-margin = 0.9\in
   right-margin = 0.9\in
-  ragged-last = ##t
+  %ragged-last = ##t
   indent = 0.75\in
   short-indent = 0\cm
   #(define fonts (set-global-fonts #:music "scorlatti" #:brace "scorlatti" #:roman "Junicode" #:sans "sans"))

diff --git a/manuscripts/bass.ly b/manuscripts/bass.ly
index 0724e60c0e173df1b14d579445864f0c58c58ffe..a1ab5e1a89cef5ee416b35dddbc174376ce8e154 100644 (file)
--- a/manuscripts/bass.ly
+++ b/manuscripts/bass.ly
@@ -31,17 +31,17 @@ bassMusic =
   <<
     {
       \voiceTwo
-      r8 a,8~\p^"solo" a4~ a2~ |
+      r8 a,8~\mp^"solo" a4~ a2~ |
       a1~ |
       a1~ |
       a2~\> |
-      a2\pp
+      a2\p
     }
     \new Voice {
       \voiceOne
-      r2  r8 \override NoteHead.style = #'harmonic-mixed a'8~^"solo" a4~ |
+      r2  r8 a'8~\flageolet^\mp^"solo 2" a4~ |
       a2. r4 |
-      r8 a8~ a4~ a2~ |
+      r8 a8~\flageolet a4~ a2~ |
       a2~ |
       a8 r8 r4
     }

diff --git a/manuscripts/cello.ly b/manuscripts/cello.ly
index eebe0ca5f7e40a4331109d026ef01ac5b94c9a13..9fc4bb42a8386e316c039644c333dbbede8e7aab 100644 (file)
--- a/manuscripts/cello.ly
+++ b/manuscripts/cello.ly
@@ -25,7 +25,7 @@ celloMusic =
   >>
   \oneVoice
   f'4(\> fis4~\p fis2)\fermata |
-  r8 a,8~\p^"solo" a2 r4 |
+  r8 a,8~\mp^"solo" a2 r4 |
   r2 r8 a8~ a4~ |
   a4 r4 r2 |
   R1*2/4 |

diff --git a/manuscripts/clarinet1.ly b/manuscripts/clarinet1.ly
index 88ad99070c9354219cce959766e23527810ba6f7..40cadc5f4ffa1e2f68bae262a32a3132baefa6d0 100644 (file)
--- a/manuscripts/clarinet1.ly
+++ b/manuscripts/clarinet1.ly
@@ -8,11 +8,10 @@ clarinetONEMusic =
   a2.~ a8 e8) |
   a2. |
   \tuplet 3/2 { fis4\pp\< e d\p } |
-  ees4--\> cis4~\ppp cis2\fermata |
-  R1*3 |
-  r4 r8 d'8~\p d2~ |
-  d8 cis8~ cis4 b2~\fermata |
-  b8 r8 r4 r2 |
+  ees4--\> e4~\ppp e2\fermata |
+  R1*4 |
+  r2 r2\fermata |
+  R1 |
   R1*5/4 |
   \tuplet 3/2 { a4(\pp\< e4) d4\mp } |
   ees4(\> cis4~\pp cis2)\fermata |

diff --git a/manuscripts/clarinet2.ly b/manuscripts/clarinet2.ly
index af3cecb7cc61512195a9eab042cc65d3256c1990..b78fc7cededf925c4a9c9ff6e0fed68de3cdc636 100644 (file)
--- a/manuscripts/clarinet2.ly
+++ b/manuscripts/clarinet2.ly
@@ -10,15 +10,14 @@ clarinetTWOMusic =
   a2 bes,4\pp |
   \tuplet 3/2 { b4\< c b\p } |
   ees4--\> cis4~\ppp cis2\fermata |
-  R1*3 |
-  r4 r8 d'8~\p d2~ |
-  d8 cis8~ cis4 b2~\fermata |
-  b8 r8 r4 r2 |
+  R1*4 |
+  r2 r2\fermata |
+  R1 |
   R1*5/4 |
   R1*2/4 |
   r2 r2\fermata |
   R1*2 |
-  a,1~\p |
+  a1~\p |
   a2~ |
   a2 c2 |
   fis,1\fermata |

diff --git a/manuscripts/flute1.ly b/manuscripts/flute1.ly
index 4ae82ac7a878b99b968da3cdf3e401545f000619..057cc916b49d63d458881a322bae97f41f2a9716 100644 (file)
--- a/manuscripts/flute1.ly
+++ b/manuscripts/flute1.ly
@@ -14,9 +14,9 @@ fluteONEMusic =
   r4 r8 \pitchedTrill c''8~\startTrillSpan d c2~ |
   c8\stopTrillSpan \pitchedTrill des8~\startTrillSpan ees des4\stopTrillSpan \pitchedTrill b2~\fermata\startTrillSpan c |
   b8\stopTrillSpan r8 r4 r2 |
-  R1*5/4 |
+  gis,2~\mp \after 2 \! 2.\> |
   R1*2/4 |
-  ees,,4(\< e4~\mf e2)\fermata |
+  ees4(\< e4~\mf e2)\fermata |
   R1*3 |
   R1*2/4 |
   R1 |

diff --git a/manuscripts/flute2.ly b/manuscripts/flute2.ly
index 56ae242b5dd562d821e63eb3606a0c927f59422b..42fc7a27247a463d85a75210ec5b8a4cc64cabc0 100644 (file)
--- a/manuscripts/flute2.ly
+++ b/manuscripts/flute2.ly
@@ -14,9 +14,9 @@ fluteTWOMusic =
   r4 r8 \pitchedTrill a''8~\p\startTrillSpan c a2~ |
   a8\stopTrillSpan \pitchedTrill a8~\startTrillSpan bes a4\stopTrillSpan \pitchedTrill a2~\fermata\startTrillSpan bes |
   a8\stopTrillSpan r8 r4 r2 |
-  R1*5/4 |
+  e,2~\mp \after 2 \! 2.\> |
   R1*2/4 |
-  ees,4(\< e4~\mf e2)\fermata |
+  ees4(\< e4~\mf e2)\fermata |
   R1*3 |
   R1*2/4 |
   R1 |

diff --git a/manuscripts/horn1.ly b/manuscripts/horn1.ly
index 376650190dc53b96b3060f9c7c3defd776faf00e..597bd12a98908a67f4c3e14e65d08d54a9579d34 100644 (file)
--- a/manuscripts/horn1.ly
+++ b/manuscripts/horn1.ly
@@ -9,13 +9,15 @@ hornONEMusic =
   R1 |
   R1*3/4 |
   R1*2/4 |
-  dis4\<\halfopen\glissando e4~\f\open e2\fermata |
+  \footnote \markup &dagger; #'(-0.5 . 0.5) \markup \tiny { &dagger; "Maintain 16th note length for staccato notes." }
+  dis4\<\halfopen\glissando
+  e4~\mp\open e2\fermata |
   R1*4 |
   r2 r2\fermata |
   R1 |
   R1*5/4 |
   R1*2/4 |
-  dis4\<\halfopen\glissando e4~\f\open e2\fermata |
+  dis4\<\halfopen\glissando e4~\mp\open e2\fermata |
   R1*3 |
   R1*2/4 |
   R1 |

diff --git a/manuscripts/horn2.ly b/manuscripts/horn2.ly
index 05a480abe8901ee46d1faadb8165733077cffa8c..d7407c450406393456ac4d055ae968a428858e8a 100644 (file)
--- a/manuscripts/horn2.ly
+++ b/manuscripts/horn2.ly
@@ -9,13 +9,13 @@ hornTWOMusic =
   R1 |
   R1*3/4 |
   R1*2/4 |
-  r4 cis'4~\f cis2\fermata |
+  r4 cis'4~\mp cis2\fermata |
   R1*4 |
   r2 r2\fermata |
   R1 |
   R1*5/4 |
   R1*2/4 |
-  r4 cis4~\f cis2\fermata |
+  r4 cis4~\mp cis2\fermata |
   R1*3 |
   R1*2/4 |
   R1 |

diff --git a/manuscripts/horn3.ly b/manuscripts/horn3.ly
index a62fc06d7346121bc05ade8d1b4d34902463f299..7f8b46ae0365a9a570d9d5060d1843781f315da0 100644 (file)
--- a/manuscripts/horn3.ly
+++ b/manuscripts/horn3.ly
@@ -9,13 +9,13 @@ hornTHREEMusic =
   R1 |
   R1*3/4 |
   R1*2/4 |
-  f,4\halfopen\glissando fis4~\open fis2\fermata |
+  f,4\<\halfopen\glissando fis4~\mp\open fis2\fermata |
   R1*4 |
   r2 r2\fermata |
   R1 |
   R1*5/4 |
   R1*2/4 |
-  f4\halfopen\glissando fis4~\open fis2\fermata |
+  f4\<\halfopen\glissando fis4~\mp\open fis2\fermata |
   R1*3 |
   R1*2/4 |
   R1 |

diff --git a/manuscripts/horn4.ly b/manuscripts/horn4.ly
index 37e8abd31681ea42c2e0a4700700dd78171ee349..162347f201ea17aa7b0686c7157e453522637f15 100644 (file)
--- a/manuscripts/horn4.ly
+++ b/manuscripts/horn4.ly
@@ -7,14 +7,14 @@ hornFOURMusic =
   R1 |
   R1*3/4 |
   R1*2/4 |
-  r4 fis,4~ fis2\fermata |
+  r4 fis,4~\mp fis2\fermata |
   r8 a8~\p\> a4~ a2\pp |
   R1*3 |
   r2 r2\fermata |
   R1 |
   R1*5/4 |
   R1*2/4 |
-  r4 fis4~ fis2\fermata |
+  r4 fis4~\mp fis2\fermata |
   R1*3 |
   R1*2/4 |
   R1 |

diff --git a/manuscripts/oboe1.ly b/manuscripts/oboe1.ly
index 102936105912d9de129e0d2bfeec6353954a2da0..405ba57a44d7c9b29c2131dcf2f2e2e621ee853a 100644 (file)
--- a/manuscripts/oboe1.ly
+++ b/manuscripts/oboe1.ly
@@ -6,13 +6,14 @@ oboeONEMusic =
   R1*3/4 |
   r2 r8 aes''4(\p g8 |
   aes2.) |
-  \tuplet 3/2 { r4 r4 cis,4\p } |
-  d4--\> e,4~\ppp e2\fermata |
-  R1*4 |
-  r2 r2\fermata |
-  R1 |
+  R1*2/4 |
+  r2 r2\fermata
+  R1*3 |
+  r4 r8 c8~\p c2~ |
+  c8 a8~ a4 a2~\fermata |
+  a8 r8 r4 r2 |
   R1*5/4 |
-  \tuplet 3/2 { c'4(\pp\< b4) cis4\p } |
+  \tuplet 3/2 { c,4(\pp\< b4) cis4\p } |
   d4(\> e,4~\pp e2)\fermata |
   R1*3 |
   R1*2/4 |

diff --git a/manuscripts/oboe2.ly b/manuscripts/oboe2.ly
index cb142f22ccc9bc26d9731417a69cd2a3cd1588c4..f5948e9b2c004de53fcff0fd9594799e175f933c 100644 (file)
--- a/manuscripts/oboe2.ly
+++ b/manuscripts/oboe2.ly
@@ -7,13 +7,14 @@ oboeTWOMusic =
   R1 |
   R1*3/4 |
   R1*2/4 |
-  g'4--\p\> e4~\ppp e2\fermata |
-  R1*4 |
   r2 r2\fermata |
-  R1 |
+  R1*3 |
+  r4 r8 d''8~\p d2~ |
+  d8 cis8~ cis4 b2~\fermata |
+  b8 r8 r4 r2 |
   R1*5/4 |
   R1*2/4 |
-  g4(\p\> e4~\pp e2)\fermata |
+  r2 r2\fermata |
   R1*3 |
   R1*2/4 |
   R1 |

diff --git a/manuscripts/trumpet1.ly b/manuscripts/trumpet1.ly
index 56b3943ac401046bb4b1807c2340975fcf0f29d9..699dd9920f9cc48dfb6a2599e983042145575a48 100644 (file)
--- a/manuscripts/trumpet1.ly
+++ b/manuscripts/trumpet1.ly
@@ -1,24 +1,20 @@
 % root = ../evenings-in-the-west.ly
 trumpetONEMusic =
 \relative {
-  \tag #'score {
-    \override Voice.TextScript.stencil = ##f
-    \override Voice.Hairpin.stencil = ##f
-    \override Voice.DynamicText.stencil = ##f
-  }
   \clef treble
-  r2^"practice mute" ees''2~\ppp\< |
+  r2^"w/ practice mute" ees''2~\ppp\< |
   ees2~\mp ees16 r8. ees4~\ppp\< |
   ees2\mp \breathe ees2~\ppp\< |
   ees16\mp r8. r4 r4 |
-  R1 |
+  <>^"take harmon mute" R1 |
   R1*3/4 |
   R1*2/4 |
   r2 r2\fermata |
-  R1*4 |
-  r2 r2\fermata |
-  R1 |
-  R1*5/4 |
+  R1*3 |
+  r4 r8 <>^"w/ harmon mute" d8~\p d2~ |
+  d8 des8~ des4 c2~\fermata |
+  c8 r8 r4 r2 |
+  f,2~\p \after 2 \! f2.\> |
   R1*2/4 |
   r2 r2\fermata |
   R1*3 |

diff --git a/manuscripts/trumpet2.ly b/manuscripts/trumpet2.ly
index 968e2518d2ac11e6723008c131ef0a93181eb5ab..90c652d7ebc812212091386e7ebb00c2ebcd3d7b 100644 (file)
--- a/manuscripts/trumpet2.ly
+++ b/manuscripts/trumpet2.ly
@@ -1,23 +1,18 @@
 % root = ../evenings-in-the-west.ly
 trumpetTWOMusic =
 \relative {
-  \tag #'score {
-    \override Voice.TextScript.stencil = ##f
-    \override Voice.Hairpin.stencil = ##f
-    \override Voice.DynamicText.stencil = ##f
-  }
   \clef treble
   r2^"practice mute" des''2~\ppp\< |
   des~\mp des16 r8. des4~\ppp\< |
   des2\mp \breathe des2~\ppp\< |
   des16\mp r8. r4 r4 |
-  R1 |
+  <>^"take harmon mute" R1 |
   R1*3/4 |
   R1*2/4 |
   r2 r2\fermata |
   R1*4 |
-  r2 r2\fermata |
-  R1 |
+  r2 <>^"w/ harmon mute" b2~\p\fermata |
+  b8 r8 r4 r2 |
   R1*5/4 |
   R1*2/4 |
   r2 r2\fermata |

diff --git a/manuscripts/trumpet3.ly b/manuscripts/trumpet3.ly
index ebce37c1c8c917558717cef0299fee4860cde2a8..1ec08498945cdbe48bf57d95a8734301b35a0ecb 100644 (file)
--- a/manuscripts/trumpet3.ly
+++ b/manuscripts/trumpet3.ly
@@ -1,18 +1,23 @@
 % root = ../evenings-in-the-west.ly
 trumpetTHREEMusic =
 \relative {
+  \tag #'score {
+    \override Voice.TextScript.stencil = ##f
+    \override Voice.Hairpin.stencil = ##f
+    \override Voice.DynamicText.stencil = ##f
+  }
   \clef treble
   r2^"practice mute" f'2~\ppp\< |
   f2~\mp f16 r8. f4~\ppp\< |
   f2\mp \breathe f2~\ppp\< |
   f16\mp r8. r4 r4 |
-  R1 |
+  <>^"take harmon mute" R1 |
   R1*3/4 |
   R1*2/4 |
   r2 r2\fermata |
   R1*4 |
-  r2 r2\fermata |
-  R1 |
+  r2 <>^"w/ harmon mute" b2~\p\fermata |
+  b8 r8 r4 r2 |
   R1*5/4 |
   R1*2/4 |
   r2 r2\fermata |

diff --git a/manuscripts/viola.ly b/manuscripts/viola.ly
index f24ad3b655b591ffbb8d3dc2fd65f582ccd4cfdf..c27332584a216c57597e910cfb9828433797c89e 100644 (file)
--- a/manuscripts/viola.ly
+++ b/manuscripts/viola.ly
@@ -9,10 +9,10 @@ violaMusic =
   R1*2/4 |
   r2 r2\fermata |
   R1*3 |
-  r4 r8 d''8~->\p 2~ |
+  r4 r8 d''8~->\p\tasto 2~ |
   8 cis8~-> cis4 a2~->\fermata |
   a8 r8 r4 r2 |
-  \tuplet 3/2 { e4\pp f8( } \tuplet 3/2 { e4) f8( } \tuplet 3/2 { e8 f8 e8\< } \tuplet 3/2 { f8 e8 f8 } e16 f) fis8\p |
+  \tuplet 3/2 { r4 f8(\pp } \tuplet 3/2 { e4) \markSpanner "" "ord." f8(\startTextSpan } \tuplet 3/2 { e8 f8 e8\< } \tuplet 3/2 { f8 e8 f8 } e16\stopTextSpan f) fis8\p |
   \tuplet 3/2 { g4(\< c,) d\mp } |
   cis4(\> d4~\p d2)\fermata |
   R1*3 |

diff --git a/manuscripts/violin1.ly b/manuscripts/violin1.ly
index 3123fef95e6d78876eca2a8371eb2378df3b3799..2154028acdc2fa80ebd9a6e564c174a82a171343 100644 (file)
--- a/manuscripts/violin1.ly
+++ b/manuscripts/violin1.ly
@@ -9,10 +9,10 @@ violinONEMusic =
   R1*2/4 |
   r2 r2\fermata |
   R1*3 |
-  r4 r8 <c''' c'>8~\p 2~ |
+  r4 r8 <c''' c'>8~\p\tasto 2~ |
   8 <bes bes'>8~ 4 <c c'>2~\fermata |
   8 r8 r4 r2 |
-  \tuplet 3/2 { gis,4\pp ais8( } \tuplet 3/2 { gis4) ais8( } \tuplet 3/2 { gis8 ais gis\< } \tuplet 3/2 { ais gis ais } gis16 ais) bes8\p |
+  \tuplet 3/2 { r4 ais,8(\pp } \tuplet 3/2 { gis4) \markSpanner "" "ord." ais8(\startTextSpan } \tuplet 3/2 { gis8 ais gis\< } \tuplet 3/2 { ais gis ais } gis16\stopTextSpan ais) bes8\p |
   \tuplet 3/2 { c4(\< b) cis\mp } |
   d4(\> e,4~\p e2)\fermata |
   R1*3 |

diff --git a/manuscripts/violin2.ly b/manuscripts/violin2.ly
index b0768d9356b7de6aeb9049af9935a068f9aeb59e..0059f75d38bc6027fb4558c9e747d14deba9b295 100644 (file)
--- a/manuscripts/violin2.ly
+++ b/manuscripts/violin2.ly
@@ -9,10 +9,10 @@ violinTWOMusic =
   R1*2/4 |
   r2 r2\fermata |
   R1*3 |
-  r4 r8 <a'' a'>8~\p 2~ |
+  r4 r8 <a'' a'>8~\p\tasto 2~ |
   8 8~ 4 2~\fermata |
   8 r8 r4 r2 |
-  \tuplet 3/2 { e,4\pp g8( } \tuplet 3/2 { e4) g8( } \tuplet 3/2 { e8 g8 e8\< } \tuplet 3/2 { g8 e8 g8 } e16 g16) bes8\p |
+  \tuplet 3/2 { r4 g,8(\pp } \tuplet 3/2 { e4) \markSpanner "" "ord." g8(\startTextSpan } \tuplet 3/2 { e8 g8 e8\< } \tuplet 3/2 { g8 e8 g8 } e16\stopTextSpan g16) bes8\p |
   \tuplet 3/2 { a4(\< e4) d4\mp } |
   g4(\> cis,~\p cis2)\fermata |
   R1*3 |