From 9aa60abe3d03c7a5c24b5127f48e54c7242262d7 Mon Sep 17 00:00:00 2001 From: rekado Date: Sat, 3 Dec 2016 12:27:43 +0100 Subject: white noise: Unify section names. --- 04-white-noise/music/bass.ly | 8 ++++---- 04-white-noise/music/keys.ly | 4 +++- 04-white-noise/music/stick.ly | 8 ++++---- 3 files changed, 11 insertions(+), 9 deletions(-) (limited to '04-white-noise') diff --git a/04-white-noise/music/bass.ly b/04-white-noise/music/bass.ly index 8d3023f..02c1ced 100644 --- a/04-white-noise/music/bass.ly +++ b/04-white-noise/music/bass.ly @@ -1,9 +1,9 @@ -bassBeautyA = \relative fis,, { +bassIntro = \relative fis,, { d4. fis ~ fis4 | e4. gis a4 | d,2. cis4 | fis1 | } -bassBeautyB = \relative fis,, { +bassBeauty = \relative fis,, { d4. fis fis4 | e4. gis a4 | d,4. d cis4 | fis8 fis fis fis cis' b a b | } @@ -123,7 +123,7 @@ bassMusic = { \key fis \minor \relative fis,, { - \time 4/4 R1*4 \bassBeautyA + \time 4/4 R1*4 \bassIntro \time 5/4 \repeat volta 2 \bassThemeWithoutEnd \alternative { @@ -138,7 +138,7 @@ bassMusic = { \time 5/4 \repeat volta 2 \bassTheme \time 4/4 \bassThunder - \time 4/4 \repeat volta 2 \bassBeautyB + \time 4/4 \repeat volta 2 \bassBeauty \bassSolo diff --git a/04-white-noise/music/keys.ly b/04-white-noise/music/keys.ly index f8beb9e..ed029d0 100644 --- a/04-white-noise/music/keys.ly +++ b/04-white-noise/music/keys.ly @@ -42,6 +42,8 @@ keysThunder = \relative c'' { d-. d-. d-. d-. d-. d-. d-. d-. | } +keysBeauty = \keysIntro + keysArpeggio = \relative d' { d8 a' d a e' a, d e, fis cis gis' a gis cis, fis e @@ -146,7 +148,7 @@ keyboard = { \time 4/4 \keysThunder \time 4/4 - \repeat volta 2 \keysIntro + \repeat volta 2 \keysBeauty \repeat unfold 2 \keysArpeggio \keysTransition diff --git a/04-white-noise/music/stick.ly b/04-white-noise/music/stick.ly index ce148fb..a85cb6a 100644 --- a/04-white-noise/music/stick.ly +++ b/04-white-noise/music/stick.ly @@ -44,10 +44,10 @@ stickThemeRight = \relative c { } %% TODO -stickBeautyBLeft = \relative c { +stickBeautyLeft = \relative c { r1 | r1 | r1 | r1 | } -stickBeautyBRight = \relative c { +stickBeautyRight = \relative c { %% TODO: this is terrible and I would never play this 2 2 | 2 2 | @@ -170,7 +170,7 @@ stickLeft = { \time 5/4 \repeat volta 2 \stickThemeLeft \time 4/4 \stickThunderLeft - \time 4/4 \repeat volta 2 \stickBeautyBLeft + \time 4/4 \repeat volta 2 \stickBeautyLeft \stickSoloLeft \stickTransitionLeft \stickFastLeft @@ -189,7 +189,7 @@ stickRight = { \time 5/4 \repeat volta 2 \stickThemeRight \time 4/4 \stickThunderRight - \time 4/4 \repeat volta 2 \stickBeautyBRight + \time 4/4 \repeat volta 2 \stickBeautyRight \stickSoloRight \stickTransitionRight \stickFastRight -- cgit v1.2.3