check

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..45e83ea
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*.pdf
+*.ps
+*.midi
+*.mid
+*.log
+*~
+.DS_Store

diff --git a/book.ly b/book.ly
index 4f1492d5970de6d94a8ab62ccb91957e38a5052a..5370b26891845182f0cde9286534e763b953352e 100644 (file)
--- a/book.ly
+++ b/book.ly
@@ -11,33 +11,33 @@
   \header {
     tagline = ##f
   }
+%  \bookpart {
+%    \tocItem \markup { "I. " \bold "Largo; Allegro moderato" }
+%    \score {
+%      \header {
+%        title = \markup { \fontsize #1 \xtitle }
+%        subtitle = \markup { \medium \italic \xsub }
+%        composer = \xcomp
+%        poet = \markup { \xinst }
+%        piece = \markup { \large \bold "I. " }
+%      }
+%      <<
+%        \include "manuscripts/I-clarinet.ly"
+%        \include "manuscripts/I-piano.ly"
+%      >>
+%      %\midi { }
+%      \layout {
+%        \context {
+%          \Score
+%          \override RehearsalMark.break-visibility = #begin-of-line-invisible
+%          \override BarNumber.font-size = #1
+%          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/8)
+%        }
+%      }
+%    }
+%  }
   \bookpart {
-    \tocItem \markup { "I. " \bold "Largo; Allegro moderato" }
-    \score {
-      \header {
-        title = \markup { \fontsize #1 \xtitle }
-        subtitle = \markup { \medium \italic \xsub }
-        composer = \xcomp
-        poet = \markup { \xinst }
-        piece = \markup { \large \bold "I. " }
-      }
-      <<
-        \include "manuscripts/I-clarinet.ly"
-        \include "manuscripts/I-piano.ly"
-      >>
-      %\midi { }
-      \layout {
-        \context {
-          \Score
-          \override RehearsalMark.break-visibility = #begin-of-line-invisible
-          \override BarNumber.font-size = #1
-          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/8)
-        }
-      }
-    }
-  }
-  \bookpart {
-    \tocItem \markup { "III. " \bold "Lento, poco Rubato" }
+    \tocItem \markup { "III. " \bold "Lento, poco Rubato;" \italic "Calma" }
     \score {
       \header {
         piece = \markup { \large \bold "III. " }
@@ -53,6 +53,7 @@
           \override RehearsalMark.break-visibility = #begin-of-line-invisible
           \override BarNumber.font-size = #1
           \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/8)
+          \override Hairpin.to-barline = ##f
         }
       }
     }

diff --git a/manuscripts/III-clarinet.ly b/manuscripts/III-clarinet.ly
index 9157c0bf0331cc632ce3ea729b75c05a94dad81c..4669e3c763543fe23c711b71e129bcbd79c71b91 100644 (file)
--- a/manuscripts/III-clarinet.ly
+++ b/manuscripts/III-clarinet.ly
@@ -3,12 +3,12 @@
 \new Staff \with {
   instrumentName = \markup { clarinet in \concat { \bold "B" \tiny \flat " " } }
   shortInstrumentName = \markup { cl }
-  \override DynamicLineSpanner.staff-padding = \phds
+  \override DynamicLineSpanner.staff-padding = \sods
 }
-\relative {
+\transpose bes c' \relative {
   \numericTimeSignature
   \clef treble
-  \tempo "Lento, poco rubato" 4=50
+  \tempo \markup { "Lento, poco rubato;" \italic "calma" } 4=50
   \time 5/4 R1*5/4 |
   \time 4/4 R1 |
   \time 5/4 R1*5/4 |
@@ -16,12 +16,12 @@
   R1*5/4 |
   \time 4/4 R1 |
   \time 3/4 R1*3/4 |
-  \time 4/4 d'4(\mp c2.~ |
-  \time 3/4 c8) r8 r4 r8 dis8~ |
-  \time 7/8 4. b4( e |
-  \time 3/4 cis'2) r8 g8( |
-  \time 7/8 a4. ges,2) | \override TextSpanner.bound-details.left.text = \markup { \upright "Accel." }
-  \time 4/4 r8\startTextSpan f4.~ 8 ges8( aes'4~ |
+  \time 4/4 d'4(\pp\< c2.~ |
+  \time 3/4 c8)\mp r8 r4 r8 ees8~-> |
+  \time 7/8 4. b4(\> e |
+  \time 3/4 cis'2)\p r8 g8(\< |
+  \time 7/8 a4. ges,2)\mp | \override TextSpanner.bound-details.left.text = \markup { \upright "Accel " }
+  \time 4/4 r8\startTextSpan f4.~ 8 ges8_( aes'4~ |
   aes8) r8 c,4~-> c8 b8~-> \tuplet 3/2 { 8 d8_( g8\stopTextSpan } | \tempo "Piu Mosso" 4=65
   fis'2~ 8) r8 r8 des8( |
   ees,1 |
@@ -29,7 +29,7 @@
   1 |
   bes,1) |
   r2 a'2~( |
-  a4 e,2.) | \override TextSpanner.bound-details.left.text = \markup { \upright "Rit." }
+  a4 e,2.) | \override TextSpanner.bound-details.left.text = \markup { \upright "Rit " }
   \time 3/4 gis,4.(\startTextSpan fis'8 cis'4)\stopTextSpan | \tempo "A tempo" 4=50
   r8 f,,4( ees8 bes'4~ |
   8) a4( d8 g,[ c8~] |

diff --git a/manuscripts/III-piano.ly b/manuscripts/III-piano.ly
index a657c57064c6877b2163c2fd31ac9914042cfe91..0f47d46e4ad85847b683a82fac57cca1c2994a71 100644 (file)
--- a/manuscripts/III-piano.ly
+++ b/manuscripts/III-piano.ly
@@ -2,6 +2,7 @@
 
 \new PianoStaff \with {
   instrumentName = \markup { "piano " }
+  shortInstrumentName = \markup { "pno " }
 }
 <<
   \set PianoStaff.connectArpeggios = ##t
@@ -9,24 +10,25 @@
   \new Staff = "u" \with { \consists "Merge_rests_engraver" }
   {
     \clef bass
+    \override DynamicLineSpanner.staff-padding = \phds
     \accidentalStyle piano
     <<
       \relative {
         \numericTimeSignature
-        \tempo "Lento, poco rubato" 4=50
-        \time 5/4 r8 f8~\mp 2~ f4. gis8( |
-        \time 4/4 <fis cis'>2.) <ais dis>4~ |
-        \time 5/4 4 b8( e,~ e2.) |
+        \tempo \markup { "Lento, poco rubato;" \italic "calma" } 4=50
+        \time 5/4 r8\p f8~^\markup { \italic "piu" \dynamic f } 2~ f4. gis8( |
+        \time 4/4 <fis cis'>2.) <ais dis>4~-> |
+        \time 5/4 4\mp\> b8( e,~ e2.)\p |
         r4 <g d'>4( <a c>2.) |
-        r4 <f bes>2~ 4. cis'8( |
-        \time 4/4 <fis, gis~>4 <gis dis'>2.) |
+        r4 <f bes>2~ 4. cis'8(->\mp\> |
+        \time 4/4 <fis, gis~>4 <gis dis'>2.)\p |
         \time 3/4 r4 a8( <e b'>~ 4) |
-        \clef treble \time 4/4 d'4( <c g'>2.) |
+        \clef treble \time 4/4 d'4(\mp <c g'>2.) |
         \time 3/4 r8 f8~ <f bes,>4~ 8 dis8( |
         \time 7/8 gis4.) b,4(~ <b e>4) |
         \time 3/4 cis'4.( d,8~ 8)[ g]( |
-        \time 7/8 a4. ges,8~ <ges c>~ 4) | \override TextSpanner.bound-details.left.text = \markup { \upright "Accel." }
-        \time 4/4 r8\startTextSpan f8( fis cis') r8 (bes aes' ees~ |
+        \time 7/8 a4. ges,8~ <ges c>~ 4) | \override TextSpanner.bound-details.left.text = \markup { \upright "Accel " }
+        \time 4/4 r8\startTextSpan f8( fis cis') r8 bes( aes' ees~ |
         2) r4 \tuplet 3/2 { r8 a,( e')\stopTextSpan } \bar "||" \tempo "Piu Mosso" 4=65
         r2 \tuplet 3/2 { r8 c'4~-> } 8 \clef bass e,,8 |
         <d g>1~\arpeggio |
@@ -34,7 +36,7 @@
         R1 |
         r2 ees2~ |
         4 \clef treble <fis cis' gis'>2.~\arpeggio |
-        1 |\override TextSpanner.bound-details.left.text = \markup { \upright "Rit." }
+        1 |\override TextSpanner.bound-details.left.text = \markup { \upright "Rit " }
         \time 3/4 r4 a'2 \bar "||" \tempo "A tempo" 4=50
         R1*3/4 |
         R1*3/4 |
@@ -116,10 +118,10 @@
     \override Score.SpacingSpanner.strict-grace-spacing = ##t
     \relative {
         \numericTimeSignature
-        \tempo "Lento, poco rubato" 4=50
-        \time 5/4 c8(~^\p <c g'>~ <c g' d'>1) |
+        \tempo \markup { "Lento, poco rubato;" \italic "calma" } 4=50
+        \time 5/4 c8(~ <c g'>~ <c g' d'>1) |
         \time 4/4 a8(~ <a e'>~ <a e' b'>2.) |
-        \time 5/4 fis4. cis'8(~ <cis gis'>2.) |
+        \time 5/4 fis4. cis'8_(~ <cis gis'>2.) |
         ees,8(~ <ees bes'>4~ <ees bes' f'>8~ 2.) |
         c'8(~ <c g'>4~ <c g' d'>8~ <c g' d'~>2 d'4) |
         \time 4/4 a,8(~ <a e'>~ <a e' b'>2.) |