Permalink
Browse files

More little fixes.

  • Loading branch information...
1 parent aa509c6 commit 222e45b3be4a7cd565a7618ed394b88b85a77bc5 @horndude77 committed Dec 31, 2011
@@ -91,7 +91,9 @@ outlineMvtII =
{
\time 6/8
\tempo "Allegro" 4.=80
- \partial 8 s8 |
+ \set Timing.measureLength = #(ly:make-moment 1 8)
+ s8 |
+ \set Timing.measureLength = #(ly:make-moment 6 8)
%s2.*141 |
s2.*24 |
@@ -731,7 +731,7 @@ pianoMvtIILeft = \relative c
<d f>8) r r gis,,4.( |
a8) r r <c e g bes>4.(\sf |
<d f a>8) r r bes4.( |
- a8 r \clef treble <f'' d>8( <e cis>4 <f d>8
+ a8) r \clef treble <f'' d>8( <e cis>4 <f d>8
<e cis>4 <f d>8 <e cis>4) r8 \clef bass
%K
@@ -159,7 +159,7 @@ bassoonIRomanze = \relative c'
c2( bes4) r |
R1*6 |
r2 r8 ees,(\p aes bes) |
- c4.( des16 c) bes8-. g( bes c |
+ c4.( des16 c) bes8-. g( bes c) |
des4.( ees16 des) c8-. r f-. r |
ees r des r c4 r |
R1*2 |
@@ -94,7 +94,9 @@ outlineRondo =
{
\time 6/8
\tempo "Allegro" 4.=112
- \partial 8 s8 |
+ \set Timing.measureLength = #(ly:make-moment 1 8)
+ s8 |
+ \set Timing.measureLength = #(ly:make-moment 6 8)
s2.*33 |
\rMark "A"
@@ -5,7 +5,7 @@ pianoRightAllegro = \relative c'
\key ees \major
bes4 |
g'4.( ees8) aes( f ees d) |
- ees4( bes r8 bes( ees g) |
+ ees4( bes) r8 bes( ees g) |
bes2. bes16( aes g aes) |
<fis d>4( <g ees>) r8 ees'16(\f f g aes bes g) |
<ees ges c>4. <ees, c>8 d4 <bes' bes'> |
@@ -907,7 +907,7 @@ pianoRightRondo = \relative c'
q4. ees,8( bes' des) |
c( aes <ees' c>) <des bes>( <bes g> <f' des>) |
<ees c>4( f16 g) aes8( ees c) |
- bes4( des16( ees) f8 f,( g) |
+ bes4( des16 ees) f8 f,( g) |
<bes g>4.( aes8) r r |
\repeat unfold 2 {r <bes, aes f> <bes g ees>} |
des'( bes g ees des) r |
@@ -13,29 +13,37 @@ stop =
music)
%Add multiple staccato dots for one note.
-tremoloStaccatosOn = #(define-music-function (parser location dots) (number?)
-#{
- \override Script #'stencil = #ly:text-interface::print
- %TODO: Remove eval. Automatically figure out how many dots to add.
- \override Script #'text =
- #(lambda (grob)
- (define (build-lst count)
- (let ((lst (list #:musicglyph "scripts.staccato")))
- (if (> count 1) (append lst '(#:hspace 0.4) (build-lst (- count 1))) lst)))
- (eval (list markup #:concat (build-lst $dots)) (interaction-environment)))
- \override Script #'X-offset =
- #(lambda (grob)
- (let* ((parent (ly:grob-parent grob X))
- (parent-extent (ly:grob-property parent 'X-extent '(0 . 0)))
- (parent-start (car parent-extent))
- (parent-end (cdr parent-extent))
- (parent-center (/ (+ parent-start parent-end) 2.0))
- (extent (ly:grob-property grob 'X-extent '(0 . 0)))
- (start (car extent))
- (end (cdr extent))
- (val (- parent-center (/ (- end start) 2.0))))
- val))
-#})
+tremoloStaccatosOn =
+#(define-music-function (parser location dots) (number?)
+ (let ((text-function
+ (lambda (grob)
+ (define (build-lst count)
+ (let ((lst (list #:musicglyph "scripts.staccato")))
+ (if
+ (> count 1)
+ (append lst '(#:hspace 0.4) (build-lst (- count 1)))
+ lst)))
+ ;TODO: Remove eval. Automatically figure out how many dots to add.
+ (eval
+ (list markup #:concat (build-lst dots))
+ (interaction-environment))))
+ (x-offset-function
+ (lambda (grob)
+ (let* ((parent (ly:grob-parent grob X))
+ (parent-extent (ly:grob-property parent 'X-extent '(0 . 0)))
+ (parent-start (car parent-extent))
+ (parent-end (cdr parent-extent))
+ (parent-center (/ (+ parent-start parent-end) 2.0))
+ (extent (ly:grob-property grob 'X-extent '(0 . 0)))
+ (start (car extent))
+ (end (cdr extent))
+ (val (- parent-center (/ (- end start) 2.0))))
+ val))))
+ #{
+ \override Script #'stencil = #ly:text-interface::print
+ \override Script #'text = $text-function
+ \override Script #'X-offset = $x-offset-function
+ #}))
tremoloStaccatosOff =
{
@@ -145,7 +153,9 @@ outlineMvtIII =
{
\time 6/8
\tempo "Allegro vivace" 4.=120
- \partial 8 s8 |
+ \set Timing.measureLength = #(ly:make-moment 1 8)
+ s8 |
+ \set Timing.measureLength = #(ly:make-moment 6 8)
s2.*16 |
\rMark "R"
@@ -615,7 +615,7 @@ pianoLeftMvtI = \relative c
g'4 r <des' bes>2( |
<c aes> <aes f> |
g) <des' bes>( |
- <c aes> aes8( g aes bes) |
+ <c aes>) aes8( g aes bes) |
}
\\
{

0 comments on commit 222e45b

Please sign in to comment.