From 73163ac88ab0c00ce3580a0f83c28f06f3c3f562 Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Mon, 3 Nov 2008 00:32:06 +0100 Subject: [PATCH] Prologue, take 3 This commits also adds a new rounded-whiteout markup function (that looks much better than the default whiteout). --- definitions/functions.ly | 31 ++++++++--- instruments/alto1.ly | 117 ++++++++++++++++++++++++++++++++++++++--- instruments/alto2.ly | 132 ++++++++++++++++++++++++++++++++++++++++++++--- instruments/violon1.ly | 2 +- instruments/violon2.ly | 4 +- instruments/violon3.ly | 10 ++-- 6 files changed, 268 insertions(+), 28 deletions(-) diff --git a/definitions/functions.ly b/definitions/functions.ly index 1c099c0..bc7be75 100755 --- a/definitions/functions.ly +++ b/definitions/functions.ly @@ -6,6 +6,9 @@ %------------------------------------------------------------------% +% Various additional functions. +% TODO: split and rearrange. + %%%%%%%%%%%%%%%%%%%%%%%%% Music Shortcuts %%%%%%%%%%%%%%%%%%%%%%%%%% %% Rhythm shortcuts -----------------------------------------------% @@ -283,11 +286,32 @@ unsk = \set Score.skipTypesetting = ##f %%%%%%%%%%%%%%%%%%%%%%%%%% In-score Text %%%%%%%%%%%%%%%%%%%%%%%%%%% + +#(define-markup-command (vspace layout props amount) (number?) + (let ((amount (* amount 3.0))) + (if (> amount 0) + (ly:make-stencil "" (cons -1 1) (cons 0 amount)) + (ly:make-stencil "" (cons -1 1) (cons amount amount))))) + +#(define-public (rounded-whiteout-stencil stencil blot) + (let* + ((x-ext (ly:stencil-extent stencil X)) + (y-ext (ly:stencil-extent stencil Y))) + (ly:stencil-add + (stencil-with-color (ly:round-filled-box x-ext y-ext blot) + white) + stencil))) + +#(define-markup-command (rounded-whiteout layout props radius arg) + (number? markup?) + (rounded-whiteout-stencil (interpret-markup layout props arg) radius)) + + %% Expressive indications -----------------------------------------% #(define-markup-command (indic layout props arg) (markup?) (interpret-markup layout props - (markup #:whiteout #:small #:italic arg))) + (markup #:rounded-whiteout 1 #:small #:italic arg))) % because of the use of a music-function, % non-predefined composite dynamics have to be entered *before* @@ -520,8 +544,3 @@ long = { #:override '(corner-radius . 2) #:rounded-box #:sans #:italic #:small #:justify-string text)))) -#(define-markup-command (vspace layout props amount) (number?) - (let ((amount (* amount 3.0))) - (if (> amount 0) - (ly:make-stencil "" (cons -1 1) (cons 0 amount)) - (ly:make-stencil "" (cons -1 1) (cons amount amount))))) diff --git a/instruments/alto1.ly b/instruments/alto1.ly index 62c9b54..a88314a 100755 --- a/instruments/alto1.ly +++ b/instruments/alto1.ly @@ -7,7 +7,7 @@ \include "italiano.ly" -AltoUn ={ +AltoUn = { \set Staff.instrumentName = \markup { \hcenter-in #25 "Alto 1 "} \set Staff.shortInstrumentName = "Alt. 1 " \set Staff.midiInstrument = "viola" @@ -15,20 +15,123 @@ AltoUn ={ } PrologueAltoUn = { \AltoUn - \relative { - %%% Introduction %%% + \relative { + %%% Introduction %%% \partial 4 r4 R2.*3 R1 mi,2~| mi4 r | r16 mi8.~ mi8 r r4 | red'2~|red4 r| - mi,2.:32 mi2:32 mi2:32 + mi,2.:32~ mi2:32~ mi2:32 red2. | re!2~|re | - mi2.:32 mi4 ~| 8 si \t {si si si} - \repeat unfold 28 la16 + mi2.:32 mi4 ~| 8 si \t {si si si} | + + %%% Entrée du baryton 2 %%% + la16 la la la la la la la la la la la | + la la la la la la la la | + la la la la la la la la | si4. r8 dod, dod | r8 dod dod r | r dod dod r dod r | r dod dod dod | re re r re re r | r re r4 | - } + mi8 mi r mi mi r | mi mi r mi | + fa2~ fa2 r4 | + + %%% Tempo giusto %%% + 8 r re, mib | + re mib re mib re 'mib re' mib, | + mib, mib mib mib fa fa fa fa | + lab lab lab lab | \clef treble + dod16 la dod mi re mi re fad | + sol mib sol la fa la lab do | + re4 r2 | r16 sol,, sib do mib do mib fad si mib, fad si | + re4 r2 | \clef alto + r16 sib,sib sib sib4:32 r4 | + r16 dod dod dod dod4:32 r4 | + r16 mi mi mi mi4:32 r4 | \clef treble + r16 dod dod dod dod dod dod dod mi mi mi mi | + sol mi sol la do la do mib fa mib fa lab | + re4 r \clef alto re,,,4~ | re re2 | + dod1~ dod4 r R2 R2-\fermataMarkup + + %%% Solo ténor %%% + R1*2 R2. R1 R2. R1 + R2*4 R2.*6 sol''2.~ sol | + R2.*3 \clef treble r4\fermata \pizz lab'8 | + + %%% Andantino %%% + lab, r lab' lab, r4 | + lab8 r lab r si,? si' | + lab r lab' lab, r lab' | + lab, r lab' lab, r lab' | + lab, r lab r sol sol, | + lab' lab, r sol' sol, r \clef alto + sol r4 | R4. + r4 sol'8 r do, r | + r4 sol'8 r do, r | + r4 sol'8 r re r | + r4 sol8 r re r | + r mi r r mi r r fad r | + \arco solb, mib reb | do4.~ do~ do4 r8 | + solb' mib reb | do4.~ do~ do4 r8 | + solb' mib reb | do4.~ do4 r8 | + fad4 mib8~ mib dod4 | + + %%% A tempo %%% + \t {re16 re' re} re'8 r | + sold,,4:32 \t {sold16 sol fa} | + \t {re re' re} re'8 r | + sold,,4:32~ sold16 r | + re8:32 fa: sol: 4.~~ + 8 r16 \t { } | + re,8 \clef treble r16 re' re re | + dod'8 r16 re, re re | dod'8 r16 re, re re | + dod'8 r16 re, re re | mi'8 r16 si si si | + lad'8 r16 si, si si | lad'8 r16 si, si si | + lad'8 r16 si, si si | lad'8 r16 si, si si | + lad' lad, dod mi sol lad | sol8 r16 mi, mi mi | + fa'8 r16 mi, mi mi | mi'8 r16 dod, dod dod | + mi'8 r16 dod, dod dod | mi'8 r16 fa, fa fa \clef alto | + r8 r16 sib, sib sib | r8 r16 fad fad fad | + si8 sib lab | fa4.~ fa~ fa8 r4 | R4.*3 + \t {re16 re re} \t {mi mi mi} \t {fa fa fa} | + \t {sol sol sol} \t {sib sib sib} \t {do do do} | + \t {reb reb reb} \t {mib mib mib} + \t {solb solb solb} \t {lab lab lab} \t {la la la} | + la8 \clef treble r16 la' la la la8 r16 la la la | + la8 r16 re, re re r8 r16 dod dod dod \clef alto | + sol8 r16 \pizz dod, r2 | + + %%% Adagio %%% + R1*4 R1. \arco \ind #"flaut." fa,1:32 mi4 r | + R1*3 R1. \simile mi1:32 mi4 r | + R1*2 r8 do~ \t {do mi si'} \t {la mi' re} | + + %%% Valse %%% + sol,2.~ sol2 \clef treble \t {fa'8 la sold} | + \t {do si red} r2 | re2. la4 fad mi do' r2 | + do4 sold si mib, | sol4 sol,8 fad mib' re | + si' sib \t {sol' fad sib} | + r mi, dod r r dod si r r si sib r | + mi,4 \ttt {do'16 si do si do si}do4 r | + R1 R2. \clef alto | + \pizz do,,4 r2 | fad4 r2 | do4 r2 | fad4 r2 | + mi4 r sol r | + \arco 4 8. 16 8 + ~ 16 8 | + 8. 16 8 ~ + 16 8 | + + %%% Vivo al fine %%% + 8 r re re | + re mib16 mib re8 re | + re fa16 fa re8 re | + re re re re | mib fa lab sib | + do re, re re | re re re re | + re re re re | fad re re re | + re re16 re mib8 r | + r8 re16 re fa8 r | r lab mib r | + re r r4 R2*17 + r4 \pizz mi | + } } ActeUnSceneUnBisAltoUn = { \AltoUn diff --git a/instruments/alto2.ly b/instruments/alto2.ly index d136f91..c348f99 100644 --- a/instruments/alto2.ly +++ b/instruments/alto2.ly @@ -15,20 +15,138 @@ AltoDeux = { } PrologueAltoDeux = { \AltoDeux - \relative { - %%% Introduction %%% + \relative { - \partial 4 r4 R2.*3 R1 + %%% Introduction %%% + \partial 4 r4 R2.*3 R1 mi,2~| mi4 r | r16 \ind #"sul ponti." red8.:32 red8 r r4 | red'2~ \startTrillSpan red4 \stopTrillSpan r | \ind #"pos.nat" mi,2.~ mi2~ mi | - mi2.:32 mi2:32 mi2:32 - dod2. | 4 ~| 8 sol' \t {sol sol fa}| - \repeat unfold 28 mi16 | mi4. r8 sid sid | + mi2.:32~ mi2:32 mi2:32 + dod2. | 4 ~| 8 sol' \t {sol sol fa}| + + %%% Entrée du baryton 2 %%% + mi16 mi mi mi mi mi mi mi mi mi mi mi | + mi mi mi mi mi mi mi mi | + mi mi mi mi mi mi mi mi | + mi4. r8 sid sid | r sid sid r | r sid sid r sid r | r sid sid sid | dod dod r dod dod r | r dod r4 | - } + red8 red r red red r | red red r red | + mi2~ mi2 r4 | + + %%% Tempo giusto %%% + 8 r re,16 re re re | + re re re re re re re re | + re re re re re re re re | + re re re re re re re re | + re re re re re re re re | + mib mib mib mib fa8 r \clef treble | + la16 dod la re mi re fad re | + mib sol mib fa la fa do' lab | + re4 r2 \clef alto | + r16 mi,, sol sib do sol sib do mib do mib fad | + re4 r2 | + r16 fad, fad fad fad4:32 r4 | + r16 mib mib mib mib4:32 r4 | + r16 do do do do4:32 r4 | \clef treble + r16 lab' lab lab lab lab lab lab si si si si | + mi dod mi sol la sol la do mib do mib fa | + re4 r \clef alto re,,4~ | re re2 | + dod1~ dod4 r R2 R2-\fermataMarkup + + %%% Solo ténor %%% + R1*2 R2. R1 R2. R1 + R2*4 R2.*6 lab'2.~ lab | + R2.*3 \clef treble r4\fermata \pizz sol''8 | + + %%% Andantino %%% + sol, r sol' sol, r4 | + sol8 r sol r sib, sib' | + sol r sol' sol, r sol' | + sol, r sol' sol, r sol' | + sol, r sol r sol sol, | + lab' lab, r sol' sol, r \clef alto + sol r4 | R4. + r4 si8 r red, r | + r4 si'8 r red, r | + r4 si'8 r fad r | + r4 si8 r fad r | + r sold r r do r r sib r | + \arco solb mib reb | do4.~ do~ do4 r8 | + solb' mib reb | do4.~ do~ do4 r8 | + solb' mib reb | do4.~ do4 r8 | + fad4 mib8~ mib dod4 | + + %%% A tempo %%% + \t {re16 re' re} re'8 r | + sold,,4:32 \t {sold16 sol fa} | + \t {re re' re} re'8 r | + sold,,4:32~ sold16 r | + re8:32 fa: sol: 4.~~ + 8 r16 \t { } | + re,8 r16 lab' lab lab | + sol'8 r16 lab, lab lab | sol'8 r16 lab, lab lab | + sol'8 r16 lab, lab lab | si'8 \clef treble r16 fa fa fa | + mi'8 r16 fa, fa fa | mi'8 r16 fa, fa fa | + mi'8 r16 fa, fa fa | mi'8 r16 fa, fa fa | + mi' la,? do? mib fad la | fa8 r16 si,, si si | + mi'8 r16 si, si si | mi'8 r16 sold,, sold sold | + mi''8 r16 sold,, sold sold | mi''8 r16 re, re re \clef alto | + r8 r16 la la la | r8 r16 dod, dod dod | + si'8 sib lab | fa4.~ fa~ fa8 r4 | R4.*3 + \t {re16 re re} \t {mi mi mi} \t {fa fa fa} | + \t {mi mi mi} \t {fa fa fa} \t {sol sol sol}| + \t {sib sib sib} \t {do do do} \t {reb reb reb} + \t {mib mib mib} \t {mi mi mi} | + mi8 \clef treble r16 mi' mi mi mi8 r16 mi mi mi | + re8 r16 si si si r8 r16 sold sold sold \clef alto | + re8 r16 \pizz sold, r2 | + + %%% Adagio %%% + R1*4 R1. \arco \ind #"flaut." mi1:32 mi4 r | + R1*3 R1. \simile red1:32 mi4 r | + R1*2 r8 do~ \t {do mi si'} \t {la mi' re} | + + %%% Valse %%% + sol,2.~ sol4~ \t {sol8 si sib} dod mi | + sold si r2 \clef treble | re2. la4 fad mi do' r2 | + do4 sold si mib, | sol4 \clef alto mib,8 re sol fad \clef treble | + mib' re \t {si' sib fad'} | + r si, sib r r sib lab r r lab fa r | + mi4 \ttt {si'16 do si do si do} si4 r | + R1 R2. \clef alto | + \pizz do,,4 r2 | fad4 r2 | do4 r2 | fad4 r2 | + mi4 r sol r | + \arco 4 8. 16 8 + ~ 16 8 | + 8. 16 8 ~ + 16 8 | + + %%% Vivo al fine %%% + re16 re re re re re re re | + re re re re re re re re | + re re re re re re re re | + re re re re re re re re | + re re re re sol sol sol sol | + lab lab lab lab lab lab lab lab | + sib sib sib sib sib sib sib sib | + re,re re re re re re re | + re re re re re re re re | + re re re re re re re re | + re re re re re re re re | + re re re re re re re re | + re re re re re re re re | + re re re re re re re re | + re re re re re re re re | + re re re re re re re re | + re re re re r4 | + re16 re re re r4 | + re8 re r4 | + re8 re r4 | + R2*10 r4 \pizz mi | + } } ActeUnSceneUnBisAltoDeux = { \AltoDeux diff --git a/instruments/violon1.ly b/instruments/violon1.ly index 1f170ef..f3f6630 100755 --- a/instruments/violon1.ly +++ b/instruments/violon1.ly @@ -93,7 +93,7 @@ PrologueViolonUn = { \ViolonUn R1*2 R2. %%% Valse %%% - 2.~ 4 r2 | R2. + 2.~ 4 r2 | R2. \pizz sol,4 si' red | dod, dod' r | sol, sol' si r lab r sol sol, r2 | \ttt {\arco re''16 mib re mib re mib} diff --git a/instruments/violon2.ly b/instruments/violon2.ly index 9679ea4..cb3cab9 100755 --- a/instruments/violon2.ly +++ b/instruments/violon2.ly @@ -75,14 +75,14 @@ PrologueViolonDeux = { \ViolonDeux si'16 si si r r8 | re,16 re re r r8 | fad,16 fad fad r r8 | mi16 mi dod dod si si | lad4.~ lad~ lad8 r4 | R4.*5 R8*5 | - do''16 do do la r8 do'16 do do fad, r8 | + do''16 do do la r8 do16 do do fad, r8 | sol16 sol sol r r8 sol16 sol sol r r8 | re16 si si red, dod' mid, r8 r4 | %%% Adagio %%% R1*4 R1. r2 mi\glissando mi'4 r | R1*3 R1. r2 mi,\glissando red'4 r | - R1*2 r2 la4\glissando la2.~ la4 r2 | R2. + R1*2 r2 la4\glissando la'2.~ la4 r2 | R2. %%% Valse %%% \pizz sol,,4 sol' si | dod, la' r | diff --git a/instruments/violon3.ly b/instruments/violon3.ly index 127ff87..ec918b8 100755 --- a/instruments/violon3.ly +++ b/instruments/violon3.ly @@ -20,8 +20,8 @@ PrologueViolonTrois = { \ViolonTrois \partial 4 r4 R2. la'''2.~ la2.~ la2:16~ la4:32~ la8 r mi,,2~| mi4 r | mi2.~| mi4 r | mi2 mi2.~| mi4 r R2 | - 2.~| 4 r | R2 sib2.~| - si!4 mi'8 mi \t {mi mi mi} \tt {mi16 mi mi mi mi} | + 2.~| 4 r | R2 sib2.~| + si!4 mi8 mi \t {mi mi mi} \tt {mi16 mi mi mi mi} | %%% Entrée du baryton 2 %%% re2 r4 | re16 re re re re re re re @@ -60,7 +60,7 @@ PrologueViolonTrois = { \ViolonTrois r4 lab,8 sol r4 | R4.*12 \arco fa'16 la sib dod fa8 | 4.~ ~ ~ 8 r lab,16 sib | - reb mi8 8.~ | 4.~ ~ 8 r r16 red, | + reb mi8 8.~ | 4.~ ~ 8 r r16 red | mi8 4~ 4.~ r16 sold, si mi sol la | %%% A tempo %%% @@ -87,8 +87,8 @@ PrologueViolonTrois = { \ViolonTrois %%% Adagio %%% %% FIXME: Issue #318 - R1*4 R1. \repeat tremolo 16 {\stemDown \ind #"flaut." mi32 fa \stemNeutral} mi4 r | - R1*3 R1. \repeat tremolo 16 {\ind #"flaut." mi32 red} mi4 r | + R1*4 R1. \stemDown \repeat tremolo 16 {\ind #"flaut." mi32 fa} \stemNeutral mi4 r | + R1*3 R1. \repeat tremolo 16 {\simile mi32 red} mi4 r | R1*2 mi4. si'8 la re | %%% Valse %%% -- 2.11.4.GIT