Permalink
Browse files

Add piano part. Other misc fixes.

  • Loading branch information...
1 parent e73e90a commit cdfb0ee6ff6f4cde6a42590e89633511a623147d @horndude77 committed Jan 25, 2012
@@ -1,18 +1,44 @@
\version "2.15.19"
+#(define-markup-command (align-dyn-text layout props dyn text) (string? markup?)
+ (let* ((text-stencil (interpret-markup layout props (markup #:normal-text #:italic text)))
+ (dyn-stencil (interpret-markup layout props (markup #:dynamic dyn)))
+ (text-x-ext (ly:stencil-extent text-stencil X))
+ (dyn-x-ext (ly:stencil-extent dyn-stencil X))
+ (text-x (- (cdr text-x-ext) (car text-x-ext)))
+ (dyn-x (- (cdr dyn-x-ext) (car dyn-x-ext)))
+ (hspace 0.5)
+ (x-align (- (/ (/ dyn-x 2.0) (+ text-x dyn-x hspace)) 1.0)))
+ (interpret-markup layout props (markup #:halign x-align #:whiteout #:concat (#:dynamic dyn #:hspace hspace #:normal-text #:italic text)))))
+
+#(define (make-dynamic-script-dyn-text dyn text)
+ (let ((dynamic (make-dynamic-script (markup #:align-dyn-text dyn text))))
+ (ly:music-set-property! dynamic 'tweaks (acons 'X-offset 0 (ly:music-property dynamic 'tweaks)))
+ dynamic))
+
#(define (make-dynamic-script-text-dyn-left text dyn)
(let ((dynamic (make-dynamic-script (markup #:normal-text #:italic text #:dynamic dyn))))
(ly:music-set-property! dynamic 'tweaks (acons 'X-offset -1.5 (ly:music-property dynamic 'tweaks)))
(ly:music-set-property! dynamic 'tweaks (acons 'self-alignment-X LEFT (ly:music-property dynamic 'tweaks)))
dynamic))
semprePiuPP = #(make-dynamic-script-text-dyn-left "sempre più" "pp")
+%pCantabile = #(make-dynamic-script #{ \markup { \dynamic "p" \normal-text \italic "cantabile" } #})
+pCantabile = #(make-dynamic-script-dyn-text "p" "cantabile")
pocoAPocoPiuAnimato = \markup{\italic "poco a poco più animato"}
dolceEspress = \markup{\italic "dolce espress."}
+leggiero = \markup{\italic "leggiero"}
+legato = \markup{\italic "legato"}
+benLegato = \markup{\italic "ben legato"}
+appassionato = \markup{\italic "appassionato"}
justDim = #(make-music 'DecrescendoEvent 'span-direction START 'span-type 'text 'span-text "dim." 'tweaks '((dash-period . -1)))
+justMoltoDim = #(make-music 'DecrescendoEvent 'span-direction START 'span-type 'text 'span-text "molto dim." 'tweaks '((dash-period . -1)))
justCresc = #(make-music 'CrescendoEvent 'span-direction START 'span-type 'text 'span-text "cresc." 'tweaks '((dash-period . -1)))
+justMoltoCresc = #(make-music 'CrescendoEvent 'span-direction START 'span-type 'text 'span-text "molto cresc." 'tweaks '((dash-period . -1)))
+justPocoCresc = #(make-music 'CrescendoEvent 'span-direction START 'span-type 'text 'span-text "poco cresc." 'tweaks '((dash-period . -1)))
+justPocoAPocoCresc = #(make-music 'CrescendoEvent 'span-direction START 'span-type 'text 'span-text "poco a poco cresc." 'tweaks '((dash-period . -1)))
afterGraceFraction = #(cons 15 16)
@@ -38,18 +38,18 @@
f4.(\f e8)\> d( c) |
c8.\p c16( f c) c8( b bes) |
a4~( a16 aes g8) r r |
- e'8(\sf^\pocoAPocoPiuAnimato gis, c) b( a8. g16) |
+ e'8(\sf^\pocoAPocoPiuAnimato gis, c) b( a8. gis16) |
b4~\> b16 a c8\! r r |
- e8(\sf gis, c) c16( b) a8.(-> g16) |
+ e8(\sf gis, c) c16( b) a8.(-> gis16) |
b4-> a8~ a16 gis-> a-> gis-> a-> b-> |
b8(-> c4~)\< c16 b-> c-> b-> c-> cis-> |
d4.~\sf d8 c\> bes |
- ces-.(\< des-. ees-.) f4( e8)\! |
+ ces-.(\< des-. ees-.) f4( ees8)\! |
d4.~\> d8 c bes |
- ces-.(\< des-. ees-.) f4( e8)\! |
+ ces-.(\< des-. ees-.) f4( ees8)\! |
ees4.~\> ees8 d c |
des8-.( ees-. f-.) g4( f8) |
- ees4.~\f ees8 d c |
+ e4.~\f e8 d c |
f4.~\sf f8 ees des |
ges2.~\sf |
ges8 ges4~-> ges8 ges4~-> |
@@ -77,7 +77,7 @@
R2. |
r4 d8~(\p d16 e \times 2/3 {f16\justCresc e d} \times 2/3 {e d c)} |
g'8\f d~( d32 e-. c-. e-.) d8 a~( a32 b-. g-. b-.) |
- a16\p a8 a16( aes) a g4 r8 |
+ a16\p a8 a16( aes) aes g4 r8 |
e8.\(\p b16 c( g') fis c( f8) e\) |
ees2. |
R2.*2 |
@@ -1,5 +1,5 @@
{
- \tempo "Adagio"
+ \tempo "Adagio" 8=72
\time 6/8
s2.*53 |
@@ -0,0 +1,44 @@
+\version "2.15.26"
+
+\include "defs.ily"
+
+instrument = "Piano"
+
+\include "header.ily"
+
+#(set-global-staff-size 18)
+
+\pageBreak \allowPageTurn
+
+\score
+{
+ <<
+ \new Staff
+ \with
+ {
+ instrumentName = \markup { \center-column {Horn \line { in E } } }
+ midiInstrument = "french horn"
+ }
+ <<
+ { \include "horn.ily" }
+ { \include "outline.ily" }
+ >>
+ \new PianoStaff \with { instrumentName = "Piano" }
+ <<
+ \new Staff=up { \include "piano_right.ily" }
+ \new Dynamics { \include "piano_dynamics.ily" }
+ \new Staff=down
+ \with
+ {
+ \consists "Span_arpeggio_engraver"
+ connectArpeggios = ##t
+ }
+ <<
+ { \include "piano_left.ily" }
+ { \include "piano_pedals.ily" }
+ >>
+ >>
+ >>
+ \layout {}
+ \midi {}
+}
@@ -0,0 +1,87 @@
+{
+ s2.\p |
+ s2.\pCantabile |
+ s8*4 s8\< s\> s1*0\! |
+ s2. |
+ s2.\p |
+ s4.\pp s\pp |
+ s8*4 s8\< s\> s1*0\! |
+ s2.-\legato |
+ s2.*3 |
+ s2.\pp |
+ s2.*5 |
+ s2.\pp |
+ s2.*3 |
+ s2.\ff |
+ s4.\p s\justCresc |
+ s2.\ff |
+ s4.\p s8\< s\> s s1*0\! |
+ s2. |
+ s8*5 s8\< |
+ s\> s\! s16*5 s16*3\< |
+ s2.\mf |
+ s16*5 s16\< s8\> s4\! |
+ s4. s8 s\< s\> s1*0\! |
+ s16*9 s16*3\< |
+ s4.\> s8\! s s\< |
+ s4.\> s\justCresc |
+ s4.\f s\justDim |
+ s2.\p |
+ s2. |
+ %poco a poco più animato
+ s2.\pp |
+ s2.*2 |
+ s2.\p\justCresc |
+ s\justCresc |
+ s\pp |
+ s1*0-\appassionato s4.\< s\> |
+ s2.\pp |
+ s4.\< s\> |
+ s2. |
+ s2.\< |
+ s\justCresc |
+ s2. |
+ s4.\ff s\< |
+ s2.\! |
+ s2. |
+
+ %Tempo I
+ s4. s\p |
+ s2. |
+ s4. s\pp |
+ s2. |
+ s4. s-\benLegato | \noBreak
+ s2.*2 |
+ s4 s8*4\justMoltoCresc |
+ s2.\justMoltoDim |
+ s2.\pp |
+ s2.*3 |
+ s2.\p |
+ s2. |
+ s\justPocoCresc |
+ s\justDim |
+ s2. |
+ s\pp |
+ s2. |
+ s4. s\< |
+ s\justCresc s\justDim |
+ s2.\pp\justPocoAPocoCresc |
+ s2. |
+ s\justCresc |
+ s\pp |
+ s\ff |
+ s4.\p s\justCresc |
+ s2.\ff |
+ s4.\p s8\< s4\> s1*0\! |
+ s2. |
+ s4. s\pp |
+ s s\< |
+ s s\> |
+ s2.\! |
+ s |
+ s\pp |
+ s |
+ s |
+ s\semprePiuPP |
+ s |
+}
Oops, something went wrong.

0 comments on commit cdfb0ee

Please sign in to comment.