better support for stripping content
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
\version "2.24.4"
|
||||
\version "2.24.3"
|
||||
\language "english"
|
||||
|
||||
\header {
|
||||
@@ -26,60 +26,32 @@ parttwo = {
|
||||
\tempo "Un poco Adagio, affetuoso."
|
||||
}
|
||||
|
||||
none = #(define-scheme-function
|
||||
(n1 n2 n3 n4 n5 n6 n7 n8 n9)
|
||||
(ly:music? ly:music? ly:music?
|
||||
ly:music? ly:music? ly:music?
|
||||
ly:music? ly:music? ly:music?)
|
||||
#{ \times 2/3 { $n1 $n2 $n3 }
|
||||
\times 2/3 { $n4 $n5 $n6 }
|
||||
\times 2/3 { $n7 $n8 $n9 }
|
||||
#}
|
||||
)
|
||||
|
||||
tri = #(define-scheme-function
|
||||
(n1 n2 n3)
|
||||
(ly:music? ly:music? ly:music?)
|
||||
#{
|
||||
\times 2/3 { $n1 $n2 $n3 }
|
||||
#}
|
||||
)
|
||||
\include "lilypond-hd/functions.ly"
|
||||
|
||||
ddot = #(define-music-function
|
||||
(n)
|
||||
(ly:music?)
|
||||
(let ((stripped_n (forceAccidental 0 (stripArticulations (rmtext (flattenPitch n))))))
|
||||
;(display stripped_n)(newline)
|
||||
#{
|
||||
#n -. #n -. #n -.
|
||||
$n -. $stripped_n -. $stripped_n -.
|
||||
#}
|
||||
)
|
||||
|
||||
ddott = #(define-scheme-function
|
||||
(n f)
|
||||
(ly:music? ly:music?)
|
||||
#{
|
||||
#n -. #f -. #f -.
|
||||
#}
|
||||
)
|
||||
|
||||
dslur = #(define-scheme-function
|
||||
(n)
|
||||
(ly:music?)
|
||||
(let ((stripped_n (forceAccidental 0 (stripArticulations (rmtext (flattenPitch n))))))
|
||||
;(display stripped_n)(newline)
|
||||
#{
|
||||
$n -. ($n -. $n -.)
|
||||
$n -. ($stripped_n -. $stripped_n -.)
|
||||
#}
|
||||
)
|
||||
|
||||
dslurr = #(define-scheme-function
|
||||
(n f)
|
||||
(ly:music? ly:music?)
|
||||
#{
|
||||
$n -. ($f -. $f -.)
|
||||
#}
|
||||
)
|
||||
|
||||
|
||||
% First violin pieces
|
||||
vIFirst = { \relative c' { d4\p\(-.\downbow-2 d-. d-.\) d2.-0( g-2) \stemUp fs4_\(-. b-3_( a)\) \stemNeutral d2\open c16-4 (b a b )a4 r r } }
|
||||
vIFirst = { \relative c' { \dslur d4\p\downbow-2 d2.-0( g-2) \stemUp fs4_\(-. b-3_( a)\) \stemNeutral d2\open c16-4 (b a b )a4 r r } }
|
||||
|
||||
scoreAViolinI = \relative c' {
|
||||
\partone
|
||||
@@ -88,8 +60,8 @@ scoreAViolinI = \relative c' {
|
||||
\vIFirst
|
||||
\relative c' \dslur d4 { d2.-4( b2. ) a4 (d-0 fs-1) a2 (\afterGrace { g4\trill } { fs16 [g ] } fs4) r r }
|
||||
\vIFirst
|
||||
\relative c' { e4-.-1 e-. e-. e _\(g b\) a2. _\((a4) b _(g) \) fs2-2 (g8 e8 d4) r r }
|
||||
\relative c' { c4-. (c-. c-.) c2 (b4) g'4-. (g-. g-.) fs _\( (g) b-.\) a2 (\relative c' cs!4 ) d, r r }
|
||||
\relative c' { \ddot e4-1 e _\(g b\) a2. _\((a4) b _(g) \) fs2-2 (g8 e8 d4) r r }
|
||||
\relative c' { \dslur c4 c2 (b4) g'4-. (g-. g-.) fs _\( (g) b-.\) a2 (\relative c' cs!4 ) d, r r }
|
||||
|
||||
\mark A
|
||||
\relative c'' {
|
||||
@@ -111,8 +83,8 @@ scoreAViolinI = \relative c' {
|
||||
e2. (e4) a (gs) gs \(fs\trill e (e)\) {\tri fs8 (d b)} cs4 \((cs) b\) {\tri d8 (b gs_1)} a4 r r
|
||||
|
||||
\mark B
|
||||
\ddott as,-.\p as-. as (b) fs'-4\( (\=1(fs\=1) e) gs,-.\)
|
||||
\ddott a!\f a
|
||||
\ddot as,-.\p as (b) fs'-4\( (\=1(fs\=1) e) gs,-.\)
|
||||
\ddot a!\f
|
||||
a4. b16 (c-1 d e-1 fs gs a4-.) a'4.-3 (gs8) gs4-. g2\fz
|
||||
\none fs8\downbow( e) d cs( b) b' b( b,) a'
|
||||
\none a( gs) a b a gs fs e b'
|
||||
@@ -139,9 +111,9 @@ scoreAViolinI = \relative c' {
|
||||
}
|
||||
|
||||
\repeat volta 2 {
|
||||
\dslurr b,4\p b b2. a'2.\f g4( b e) ds( fs a) g( e as, b) b,-.(\p b-.)
|
||||
\dslur b,4\p b2. a'2.\f g4( b e) ds( fs a) g( e as, b) b,-.(\p b-.)
|
||||
\after 4 \> \after 2 \! b2(\< bs4)\!
|
||||
\dslurr cs\p cs cs2. b'2.\f a4( cs fs) es( gs b) a( fs bs,-2) cs( es_2 gs) fs( bs,-._1 bs-.) \decresc cs-.( cs-. cs-.)
|
||||
\dslur cs\p cs2. b'2.\f a4( cs fs) es( gs b) a( fs bs,-2) cs( es_2 gs) fs( bs,-._1 bs-.) \decresc cs-.( cs-. cs-.)
|
||||
cs2( cs8._\reverseturn) ( d16_1) \!
|
||||
e4\p( cs a) g!-0( e cs)
|
||||
|
||||
@@ -163,13 +135,13 @@ scoreAViolinI = \relative c' {
|
||||
\none gs( e) b' gs( e) b' gs( e) b' \!
|
||||
\none gs(\ff es) b' gs( es) b' gs( es) b' gs4 r r
|
||||
|
||||
\dslurr fs,\p fs fs2.-1( b2.) a4-.\( d( cs) \) fs2 e16( d cs d) cs4 r r
|
||||
\dslur fs,\p fs2.-1( b2.) a4-.\( d( cs) \) fs2 e16( d cs d) cs4 r r
|
||||
|
||||
\mark E
|
||||
fs2.(\f ^"I" fs)( fs)\((\upbow fs4) e-.\) e_4\(( e) d-.\) d( d) es, es fs fs\p-.( fs-.)
|
||||
\none fs8( as_2 b cs b as b_1 ^"III" cs d) e2->( d4)
|
||||
\none fs,8( as_2 b cs b as b_1 cs d) e2->( d4)
|
||||
g2.( fs_3 e d4) b'( as a_3 gs g fs es e) e-4( d cs) \dslurr d\cresc d \!
|
||||
g2.( fs_3 e d4) b'( as a_3 gs g fs es e) e-4( d cs) d-.(\cresc d-. d-.)\!
|
||||
b\(( d) d-.\) d2\fz \tri e8( cs as) b4-. d_1\p( d') as2( b4)
|
||||
r d,( d') gs,2_1( a!4_2) r c,( c') cs,2-1( g'!4 b-.) r r
|
||||
r a( g e'-._0) r r r g,( fs d'-.) r r
|
||||
@@ -194,7 +166,7 @@ scoreAViolinI = \relative c' {
|
||||
a4 a-.\pp( a-.) a2.( a4) d'( cs) cs_3\( b\trill a( a)\) \tri b8( g e) fs4\(( fs) e-.\) \tri g8( e c-1) d4-1 r r
|
||||
|
||||
\mark H
|
||||
\dslurr ds,\p^"III" ds ds( e) b'-3\(( b)( a) cs,-.\)
|
||||
\dslur ds,\p^"III" ds( e) b'-3\(( b)( a) cs,-.\)
|
||||
d!-.\f d-. d-.
|
||||
d4.-0 e16( fs g a b cs d4-.) d'4.( cs8) cs4-. c2\fz
|
||||
|
||||
@@ -250,23 +222,23 @@ scoreBViolinI = \relative c' {
|
||||
scoreAViolinII = \relative c'' {
|
||||
\partone
|
||||
% Music follows here.
|
||||
\dslurr d,_2\p\downbow d d2.( cs) d4-0-.\( g( fs)\) fs2 a16( g fs g) fs4 r r
|
||||
\dslurr d-4 d d2.( d2.) d4( a d) fs2( \afterGrace { e4\trill } { d16 e } d4) r r
|
||||
\dslurr d4-2 d d2.( cs) d4-.-0\( g( fs)\) fs2 a16( g fs g) fs4 r r
|
||||
\dslur d,4_2\p\downbow d2.( cs) d4-0-.\( g( fs)\) fs2 a16( g fs g) fs4 r r
|
||||
\dslur d-4 d2.( d2.) d4( a d) fs2( \afterGrace { e4\trill } { d16 e } d4) r r
|
||||
\dslur d4-2 d2.( cs) d4-.-0\( g( fs)\) fs2 a16( g fs g) fs4 r r
|
||||
\dslur e e2\( g4( g) e\) fs\(( fs) g-2( e)\) d2( \afterGrace { cs4\trill } { b16 cs } d4) r r
|
||||
\dslurr c\pp c a2( g4) \dslur b b2--( g'4-.) fs2( e4) d r r
|
||||
\dslur c\pp a2( g4) \dslur b b2--( g'4-.) fs2( e4) d r r
|
||||
|
||||
\mark A
|
||||
<d b'>-.\f <d b'>-. <d b'>-. <d b'>-. r r
|
||||
\dslurr fs\p fs gs2.( a4) a-.( a-.) a-. r r
|
||||
\dslur fs\p gs2.( a4) a-.( a-.) a-. r r
|
||||
<e c'>-.\f <e c'>-. <e c'>-. <e c'>-. r r
|
||||
\dslurr ds\p ds ds2.\(( e2) a4_2-.\) b_\(_(\< gs) gs-.\) \! a\f fs2_2( e4) r r
|
||||
\dslur ds\p ds2.\(( e2) a4_2-.\) b_\(_(\< gs) gs-.\) \! a\f fs2_2( e4) r r
|
||||
a\(( fs) fs-.\) e r r e r r fs r r b, r r
|
||||
b'2->( a4) R2.^"1" b2->\downbow( cs4) cs\(( b) b-.\) b2. a4( cs e-2) fs2.->\p\(( fs4) e( d)\)
|
||||
e2.->\(( e4) d_3( cs)\) d2.\(( d2.\pp)( d2.) cs4\) a_4-.( a-.) a2. gs2( a4) fs2( d4) cs r r
|
||||
|
||||
\mark B
|
||||
\dslurr as\p as as( b) d\((\=1( d) cs\=1) b-.\) a-.\f a-. a-. a4. b16( cs d-4 e fs gs a4-.) e r
|
||||
\dslur as\p as( b) d\((\=1( d) cs\=1) b-.\) a-.\f a-. a-. a4. b16( cs d-4 e fs gs a4-.) e r
|
||||
|
||||
|
||||
|
||||
@@ -309,17 +281,17 @@ scoreACelloPart = \new Staff \with {
|
||||
midiInstrument = "cello"
|
||||
} { \clef bass \scoreACello }
|
||||
|
||||
%
|
||||
%\bookpart {
|
||||
% \header {
|
||||
% subtitle = "I"
|
||||
% }
|
||||
% \score {
|
||||
% \scoreAViolinIPart
|
||||
% \layout { }
|
||||
% }
|
||||
%}
|
||||
%
|
||||
|
||||
\bookpart {
|
||||
\header {
|
||||
subtitle = "I"
|
||||
}
|
||||
\score {
|
||||
\scoreAViolinIPart
|
||||
\layout { }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
\bookpart {
|
||||
\header {
|
||||
@@ -334,15 +306,15 @@ scoreACelloPart = \new Staff \with {
|
||||
}
|
||||
}
|
||||
|
||||
%\bookpart {
|
||||
% \header {
|
||||
% subtitle = "I"
|
||||
% }
|
||||
% \score {
|
||||
% \scoreAViolinIIPart
|
||||
% \layout { }
|
||||
% }
|
||||
%}
|
||||
\bookpart {
|
||||
\header {
|
||||
subtitle = "I"
|
||||
}
|
||||
\score {
|
||||
\scoreAViolinIIPart
|
||||
\layout { }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
%\score {
|
||||
|
||||
Submodule lilypond-hd updated: b4622b991f...b80900f367
Reference in New Issue
Block a user