From 8391e37f142ab6b9c5ba59f334a62bde2ff5c42c Mon Sep 17 00:00:00 2001 From: rekado Date: Fri, 27 May 2016 20:18:51 +0200 Subject: circus: Fix repetitions and finish tempo track. --- 03-circus/parts/bass.ly | 20 ++--- 03-circus/parts/keyboard.ly | 24 +++--- 03-circus/parts/stick.ly | 187 ++++++++++++++++++++++++++++++++++---------- 3 files changed, 168 insertions(+), 63 deletions(-) (limited to '03-circus/parts') diff --git a/03-circus/parts/bass.ly b/03-circus/parts/bass.ly index 2232faa..d30b2e9 100644 --- a/03-circus/parts/bass.ly +++ b/03-circus/parts/bass.ly @@ -79,10 +79,10 @@ bassBeauty = \relative cis, { \time 4/4 b'4.->\sustainOff a a8-> g8 ~ | - \time 5/8 - g4 r8 g8 fis | - \time 4/4 - e4. r4 d8 r cis | + \time 6/8 + g4. r8 g8 fis | + \time 9/8 + e2 r4 d8 r cis | \repeat volta 2 { \time 7/8 @@ -111,16 +111,16 @@ bassBeauty = \relative cis, { } \alternative { { \relative cis, { - \time 5/8 - g4 r8 g8 fis | - \time 4/4 - e4. r4 d8 r cis | + \time 6/8 + g4. r8 g8 fis | + \time 9/8 + e2 r4 d8 r cis | } } { \relative cis, { - \time 5/8 - g4 r8 g8 fis | + \time 6/8 + g4. r8 g8 fis | } } } diff --git a/03-circus/parts/keyboard.ly b/03-circus/parts/keyboard.ly index 91048e0..1500866 100644 --- a/03-circus/parts/keyboard.ly +++ b/03-circus/parts/keyboard.ly @@ -141,10 +141,10 @@ keysBeautyUpper = \relative c' { \time 4/4 b'4.-> a a8-> g8 ~ | - \time 5/8 - g4 r8 g8 fis | - \time 4/4 - e4. r4 d8 r cis | + \time 6/8 + g4. r8 g8 fis | + \time 9/8 + e2 r4 d8 r cis | \repeat volta 2 { \time 7/8 { r8*7 |} @@ -157,9 +157,9 @@ keysBeautyUpper = \relative c' { \time 4/4 b'4.-> a a8-> g8 ~ | } \alternative { - { \time 5/8 g4 r8 g8 fis | - \time 4/4 e4. r4 d8 r cis |} - { \time 5/8 g'4 r8 g8 fis |} + { \time 6/8 g4. r8 g8 fis | + \time 9/8 e2 r4 d8 r cis |} + { \time 6/8 g'4. r8 g8 fis |} } } @@ -169,8 +169,8 @@ keysBeautyLower = \relative c { \time 3/4 { d4. cis | } } \time 4/4 { R1 |} - \time 5/8 R8*5 | - \time 4/4 R1 | + \time 6/8 R8*6 | + \time 9/8 R8*9 | \repeat volta 2 { \time 7/8 { b8*7 | } @@ -182,9 +182,9 @@ keysBeautyLower = \relative c { } \time 4/4 { R1 |} } \alternative { - { \time 5/8 R8*5 | - \time 4/4 R1 | } - { \time 5/8 { R8*5 |} } + { \time 6/8 R8*6 | + \time 9/8 R8*9 | } + { \time 6/8 { R8*6 |} } } } diff --git a/03-circus/parts/stick.ly b/03-circus/parts/stick.ly index e33d9ab..4ea8c18 100644 --- a/03-circus/parts/stick.ly +++ b/03-circus/parts/stick.ly @@ -73,10 +73,10 @@ stickBeautyLeft = \relative c, { \time 4/4 4.-> 8-> 8 ~ | - \time 5/8 - 4 r8 g8 fis | - \time 4/4 - e4. r4 d8 r cis | + \time 6/8 + 4. r8 g8 fis | + \time 9/8 + e2 r4 d8 r cis | \repeat volta 2 { \time 7/8 @@ -98,16 +98,16 @@ stickBeautyLeft = \relative c, { } \alternative { { \relative c, { - \time 5/8 - 4 r8 g8 fis | - \time 4/4 - e4. r4 d8 r cis | + \time 6/8 + 4. r8 g8 fis | + \time 9/8 + e2 r4 d8 r cis | } } { \relative c, { - \time 5/8 - 4 r8 g8 fis | + \time 6/8 + 4. r8 g8 fis | } } } @@ -119,8 +119,8 @@ stickBeautyRight = \relative c' { \time 3/4 { R2. | } } \time 4/4 { R1 |} - \time 5/8 R8*5 | - \time 4/4 R1 | + \time 6/8 R8*6 | + \time 9/8 R8*9 | \repeat volta 2 { \time 7/8 { R8*7 | } @@ -132,13 +132,67 @@ stickBeautyRight = \relative c' { } \time 4/4 { R1 |} } \alternative { - { \time 5/8 R8*5 | - \time 4/4 R1 | } - { \time 5/8 { R8*5 |} } + { \time 6/8 R8*6 | + \time 9/8 R8*9 | } + { \time 6/8 { R8*6 |} } } } + +stickBeforeArpeggioLeft = \relative c, { + \time 3/4 + e2. ~ | e2. ~ | e2. ~ | e2. | +} + stickArpeggioLeft = \relative c, { + e8\sustainOn b' g' ~ g4. | + e,8 b' g' ~ g4. | + e,4. g'4. | r2. | + + d,8\sustainOff\sustainOn a' fis' ~ fis4. + d,8 a' fis' ~ fis4. + d,2. ~ d2. + + %% repeat, but with more pathos! + e8\sustainOn b' g' ~ g4. | + e,8 b' g' ~ g4. | + e,8 b' g' ~ g4. | + e,8 b' g' ~ g4. | + + d,8\sustainOff\sustainOn a' fis' ~ fis4. + d,8\sustainOff\sustainOn a' fis' ~ fis4. + d,8\sustainOff\sustainOn a' fis' ~ fis4. + d,8\sustainOff\sustainOn a' fis' ~ fis4. +} + +stickBeforeArpeggioRight = \relative c' { + \time 3/4 + r2. ~ | r2. ~ | r2. ~ | r2. | +} + +stickArpeggioRight = \relative c' { + \time 3/4 + r4.\sustainOn d,8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + d4 b' fis ~ | fis2. + + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r2. r2. + + %% repeat, but with more pathos! + r4.\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis +} + +stickArpeggioLeftHigher = \relative c, { \time 3/4 e8\sustainOn b' g' ~ g4. e,8 b' g' ~ g4. @@ -151,23 +205,73 @@ stickArpeggioLeft = \relative c, { d,8 a' fis' ~ fis4.\sustainOff } -stickArpeggioRight = \relative c' { +stickArpeggioRightHigher = \relative c' { \time 3/4 - \repeat unfold 8 { - r4.\sustainOn d,8 b' fis - } + r4.\sustainOff\sustainOn d,8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis\sustainOff } +stickArpeggioRightLonger = \relative c' { + \time 3/4 + r4.\sustainOn d,8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + d4 b' fis ~ | fis2. + + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r2. r2. r2. + + %% repeat, but with more pathos! + r4.\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis + r4.\sustainOff\sustainOn d8 b' fis +} + +stickArpeggioLeftLonger = \relative c, { + e8\sustainOn b' g' ~ g4. | + e,8 b' g' ~ g4. | + e,4. g'4. | r2. | + + d,8\sustainOff\sustainOn a' fis' ~ fis4. + d,8 a' fis' ~ fis4. + d,2. ~ d2. ~ d2. + + %% repeat, but with more pathos! + e8\sustainOn b' g' ~ g4. | + e,8 b' g' ~ g4. | + e,8 b' g' ~ g4. | + e,8 b' g' ~ g4. | + + d,8\sustainOff\sustainOn a' fis' ~ fis4. + d,8\sustainOff\sustainOn a' fis' ~ fis4. + d,8\sustainOff\sustainOn a' fis' ~ fis4. + d,8\sustainOff\sustainOn a' fis' ~ fis4. +} + + stickDramaLeft = \relative c, { \key b \minor \time 3/4 \repeat unfold 2 { - 2\sustainOff r4 + 2 r4 2 r4 2 r4 2 r4 2 r4 - b8 fis' cis' d4. + b8 fis' cis' d4. ~ | d2. ~ | d2. | } 2.\arpeggio ~ | 2. ~ | 2. ~ | 2. | 2.\arpeggio ~ | 2. ~ | 2. ~ | 2. | @@ -176,8 +280,8 @@ stickDramaRight = \relative c' { \key cis \minor \time 3/4 \repeat unfold 2 { - cis2\sustainOff b4 | cis2 b4 | cis2 b4 | cis4 d cis | - b fis2 ~ | fis2. | + cis2 b4 | cis2 b4 | cis2 b4 | cis4 d cis | + b fis2 ~ | fis2. ~ | fis2. ~ | fis2. | } cis'2. ~ cis2. ~ cis2. b2 a4 gis2. ~ gis2. ~ gis2. ~ gis2. @@ -272,18 +376,19 @@ stick = \new PianoStaff << \stickBeautyRight %% Arpeggio + \tempo 4 = 170 \key e \minor + \stickBeforeArpeggioRight + \stickArpeggioRight + \key fis \minor + \transpose c d { \stickArpeggioRightHigher } + \stickDramaRight - \repeat volta 2 { - \stickArpeggioRight - \stickArpeggioRight - \key fis \minor - \transpose c d { \stickArpeggioRight } - } \alternative { - { \stickDramaRight } - { \stickFinalRight } - } + \stickArpeggioRightLonger + \key fis \minor + \transpose c d { \stickArpeggioRightHigher } + \stickDramaRight } %% staff for left hand side @@ -332,16 +437,16 @@ stick = \new PianoStaff << %% Arpeggio \key e \minor + \stickBeforeArpeggioLeft + \stickArpeggioLeft + \key fis \minor + \transpose c d { \stickArpeggioLeftHigher } + \stickDramaLeft - \repeat volta 2 { - \stickArpeggioLeft - \stickArpeggioLeft - \key fis \minor - \transpose c d { \stickArpeggioLeft } - } \alternative { - { \stickDramaLeft } - { \stickFinalLeft } - } + \stickArpeggioLeftLonger + \key fis \minor + \transpose c d { \stickArpeggioLeftHigher } + \stickDramaLeft } >> -- cgit v1.2.3