From db6cf96b70a8be69aece56fa984ca4aefde18b72 Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Wed, 7 Jan 2009 18:18:32 +0100 Subject: [PATCH] Getting ready for RC --- definitions/functions.ly | 3 ++ definitions/settings.ly | 1 + instruments/alto1.ly | 2 +- instruments/alto2.ly | 8 +-- instruments/clarinette.ly | 2 +- instruments/contrebasse.ly | 2 +- instruments/flute1.ly | 118 ++++++++++++++++++++++---------------------- instruments/flute2.ly | 114 +++++++++++++++++++++++------------------- instruments/percu.ly | 117 ++++++++++++++++++++++--------------------- instruments/violoncelle2.ly | 4 +- master/instruments.ly | 6 +-- master/master.ly | 6 +-- master/titling.ly | 4 +- parts.ly | 4 +- 14 files changed, 206 insertions(+), 185 deletions(-) diff --git a/definitions/functions.ly b/definitions/functions.ly index 4c96140..20251ee 100755 --- a/definitions/functions.ly +++ b/definitions/functions.ly @@ -370,6 +370,9 @@ plak = (ly:music-property m 'tweaks))) m) +%%% TODO: custom scripts priority. +#(define modern-scripts default-script-alist) + %%%%%%%%%%%%%%%%%%%%%%%% Layout Functions %%%%%%%%%%%%%%%%%%%%%%%%%% %% Music layout ---------------------------------------------------% diff --git a/definitions/settings.ly b/definitions/settings.ly index 54e2d4c..56eb289 100755 --- a/definitions/settings.ly +++ b/definitions/settings.ly @@ -43,6 +43,7 @@ %\override SystemStartBrace #'collapse-height = #1 \override PaperColumn #'keep-inside-line = ##t \override NonMusicalPaperColumn #'keep-inside-line = ##t + scriptDefinitions = #modern-scripts autoBeamSettings = #modern-auto-beam-settings autoAccidentals = #modern-accidentals-style autoCautionaries = #modern-cautionaries-style diff --git a/instruments/alto1.ly b/instruments/alto1.ly index 7154ade..b43b4c0 100755 --- a/instruments/alto1.ly +++ b/instruments/alto1.ly @@ -1108,7 +1108,7 @@ ActeDeuxSceneTroisAltoUn = { \AltoUn r \pizz \mp r r | r r r | R2.-\fermataMarkup R2.*2 - r8 la16\p la sib8---. sol16 sol sold8---. r | R2. + r8 \arco la16\p la sib8---. sol16 sol sold8---. r | R2. r8 la16 la sib8---. sol16 sol sold8---. r | R2. %%% Interlude %%% diff --git a/instruments/alto2.ly b/instruments/alto2.ly index dc707ac..e30dd83 100644 --- a/instruments/alto2.ly +++ b/instruments/alto2.ly @@ -1095,7 +1095,7 @@ ActeDeuxSceneTroisAltoDeux = { \AltoDeux dod,8-> r | R4 re16\mf sib' r sib dod,8-> r R4 | re16\mp sib' r sib dod,8 - \arco sold''16\mp sold la8---> r | + \arco sold''16\mf sold la8---> r | \pizz 8 \arco sold'16 sold la8---> r | \ten 4~~8 r | r \pizz \mp r r | @@ -1103,7 +1103,7 @@ ActeDeuxSceneTroisAltoDeux = { \AltoDeux R2.-\fermataMarkup R2.*6 %%% Interlude %%% - r8 \st {la16\pp la sib8 r | + r8 \st {\arco la16\pp la sib8 r | do16 do dod8 r red16 red} | fa,2~\p fa~ fa4 r16 \st {si\ppleggiero do si | r si do si r do si8 | @@ -1146,7 +1146,7 @@ ActeDeuxSceneTroisAltoDeux = { \AltoDeux r8 \pizz la'\p sold4 r | R2.*5 R2*2 R2. %%% Air baryton 1 %%% - 2~\pp ~ do r4 | + \flaut 2~\pp ~ do r4 | 2~ ~ do r4 | \t {re'8 mi re} \t {mi re mi} | \t {re( mi re} \t {mi re mi} | @@ -1159,7 +1159,7 @@ ActeDeuxSceneTroisAltoDeux = { \AltoDeux re,8 la'( sol) do r4 \clef treble | sold''16->\mf sold-> la8-> r4 \clef alto | r8 sol,,-- r16 dod,8.-- | sol'2---> r4 \clef treble | - \st {sold''16 sold la la sold sold la la sold sold la la sold sold la la \clef alto | + \st {sold''16\f sold la la sold sold la la sold sold la la sold sold la la \clef alto | sol, sol sol sol re re si si si si si si | fa fa mi mi mi mi fa fa} | diff --git a/instruments/clarinette.ly b/instruments/clarinette.ly index 9c60230..79ac2fa 100755 --- a/instruments/clarinette.ly +++ b/instruments/clarinette.ly @@ -851,7 +851,7 @@ ActeDeuxSceneTroisClarinetteUn = { \ClarinetteUn fa,,2~\p fa4 r | mid'8( fad sold la si do) | fad,,2~\p fad4 r16 \st {fad\pp( fad fad | fad fad fad fad)} si8( do | red mi fad sol) | - r16 \st {fad, fad fad fad fad fad fad} | + r16 \st {fad,( fad fad fad fad fad fad)} | red'8( mi sol sold red' mi) r4 r8 | si8\mf( la) sol( fad) sol16( fad sol la si8) fad~-- fad2~ fad4 r | si'8( fad) sold16( lad si lad) | diff --git a/instruments/contrebasse.ly b/instruments/contrebasse.ly index cc99143..fc9ee32 100644 --- a/instruments/contrebasse.ly +++ b/instruments/contrebasse.ly @@ -839,7 +839,7 @@ ActeDeuxSceneTroisContrebasse = { \Contrebasse do'2--( do--) sol-- r4 | do2~ do~ do r4 | sol8-.\mp\upbow sol~-- sol16 dod8--( sol16-.) | dod4-- r8 | - sol-.\upbow sol~-- sol16 dod8-- sol16-. | mi'4-- r8 | + sol-.\upbow sol~-- sol16 dod8--( sol16-.) | mi'4-- r8 | \ten do2~\p do4 r16 sol8-- do16~--( do sol-.) do8~-- do4 do\upbow\<( | dod4\!)\thumbpizz r | r8 \arco sol~---> sol16 dod8--( si16-.) | diff --git a/instruments/flute1.ly b/instruments/flute1.ly index 4a963b3..da23c7d 100755 --- a/instruments/flute1.ly +++ b/instruments/flute1.ly @@ -814,9 +814,9 @@ ActeDeuxSceneTroisFluteUn = { \FluteUn mi8-> r R4 re16 re re re | mi8-> r R4 | dod16 dod re8 mi->} r | r \slap {mi,\mf fa} r | - dod'16-. dod( red8) | + dod'16-.\mp dod( red8) | la16-. la( si8) la16-. la( si8) | si16-. si-. r8 | - \slap { sold\psempre sold la r fad fad sol r R4 re8 re } | + \slap { sold\mpsempre sold la r fad fad sol r R4 re8 re } | R2.-\fermataMarkup R2.*6 %%% Interlude %%% @@ -850,7 +850,7 @@ ActeDeuxSceneTroisFluteUn = { \FluteUn la2~-- la4 r | R2. la2~-- la4 r | r4 r8 mi( fa sol | la2~) la4 r | - r16 \st {re, re re mib mib mib mib} r4 | + r16 \st {re,( re re mib mib mib mib)} r4 | la4\mp( sol8 fa mi4) r8 | sib'2-- r16 re\p\>( mib) sol-. la( re,) | re'4.--\! r8 | r4 \t {r16 do,,( si')} \t {r la'( fad')} | @@ -932,69 +932,71 @@ ActeDeuxSceneTroisFluteUn = { \FluteUn %%% Boum %%% \slap sold,,4 r2 | R2.*2 - re4. re'8~ re re'~ | - re4 fad la | si2.~ si4 fad8 fa sib, la | - r4 re,2~ | re4 r8 re8~ re4 | - \tt {mi16 sold sol si sib} re2~ re2 r4 | - \t {sol,8 fa lab} mi'2~ | - mi8 fa, mi'4~ mi16 fa, mi' re | - si'4~ \t {si8 fad dod} \tt {sol'16 re la mi si} | - fad8 r \tt {do''16 reb mi fa sol} sold4 | + re4.--\p( re'8~ re re'~ | + re4\< fad la | si2.)\mp~ si4 fad8-.( fa-. sib,-. la-.) | + r4 re,2--\p~ | re4 r8 re8--~ re4 | + \tt {mi16(\< sold) sol(\> si) sib(} re2\p)~ re2 r4 | + \t {sol,8(\< fa lab} mi'2)\mp~ | + mi8 fa,( mi'4)~ mi16 fa,(\< mi') re( | + si'4\!)~ \t {si8 fad( dod)} \tt {sol'16-.( re-. la-. mi-. si-.} | + fad8-.) r \tt {do''16\p( \< reb) mi( fa) sol(} sold4-.)\! | %%% Contralto %%% - re8 r r4 | R2 r4 sold4 | - re8 r r4 | R2*8 R2. R2*6 - la,8 la la la r4 | r8 la la la la4 | - re8 re re re r4 | r8 fa fa fa fa4 | + re8-> r r4 | R2 r4 sold4--(\f | + re8->-.) r r4 | R2*8 R2. R2*6 + la,8-.\pleggiero la-. la-. la-. r4 | + r8 la-. la-. la-. la4-. | + re8-.\mp re-. re-. re-. r4 | + r8 fa-. fa-. fa-. fa4-. | %%% Grand ensemble %%% - la1~ la2 r | - sib4 la do re sold, r r8 re, re re | - re re re re r2 | - la'8 la la4~ \t {la8 re reb} \t {solb dob sib} | - mib2~ \t {mib8 si do} lab mib | - sib4 r r r16 mi, mi' mi | - mi'4 r r2 | - r2 r4 la,,8 la si4 r mi,8 la mi' re' | - r2 la'8 r r4 | - sold,2 la4 re | sold,2 \t {la4 do re} | - sold,4 r r la,8 re sold4 r r8 re mi sold | - la4 r r8 fad, sold do | - fa solb solb fa fa solb solb fa | - sold la la sold sold la la sold | - dod re re dod dod re re dod | - fa solb solb fa r2 | - sold2~ sold8 la~ la4 | - sold4. la8~ la2 | r8 la4. r8 la4. R2. + \ten la1\pp~ la2 r | + sib4(\p la do re sold,) r r8 re,-.(\p re-. re-. | + re-. re-. re-. re-.) r2 | + la'8-. la-. la4--~ \t {la8 re(\< reb)} \t {solb-. dob( sib)} | + mib2--\p~ \t {mib8 si( do)} lab-.( mib-. | + sib4-.) r r r16 mi,\(( mi') mi( | + mi'4)\) r r2 | + r2 r4 la,,8->\mf la-> si4-> r mi,8-.\< la-. mi'-. re'-.\! | + r2 la'8->-. r r4 | + sold,2(\mp la4 re | sold,2) \t {la4( do re} | + sold,4) r r la,8->\mp re-> sold4-> r r8 re( mi) sold-. | + la4-- r r8 fad,( sold) do-. | + fa\p( solb) solb( fa) fa( solb) solb( fa) | + sold( la) la( sold) sold( la) la( sold) | + dod( re) re( dod) dod( re) re( dod) | + fa( solb) solb( fa) r2 | + sold2\f~ sold8 la~ la4 | + sold4. la8~ la2 | r8 la4.---> r8 la4.---> R2. %%% Chute %%% - la4 sold8 sold la4 | - sold8 sold la4 sold8 sold | - la4 do,8 do reb4 | - do8 do reb4 mi,8 mi | - fa4 mi8 mi fa4 | - sold,8 sold sold4 R2*2 + \ind #"scherzando" la4--\f\> sold8-.-> sold-. la4-- | + sold8-.-> sold-. la4-- sold8-.-> sold-. | + la4-- do,8-.-> do-. reb4-- | + do8-.-> do-. reb4-- mi,8-.-> mi-. | + fa4-- mi8-.-> mi-. fa4-- | + sold,8-.\p sold-. sold4-- R2*2 %%% Andante al fine %%% R2.*5 - sol16 mi sol mi sol mi sol mi sol mi sol mi~ | - mi2 r4 | - sol16 mi sol mi sol mi sol mi sol mi sol mi~ | - mi2 r4 | - sol16 mi sol mi sol mi sol mi sol mi sol mi~ | - mi2 r4 | R2. - sold16 mi sold mi sold mi sold mi sold mi sold mi~ | - mi2 r4 | - sold16 mi sold mi sold mi sold mi sold4 | - sol16 mi sol mi sol mi sol mi sol mi sol mi~ | - mi2 r4 | - sol16 mi sol mi sol mi sol mi sol mi sol mi~ | - mi2 r4 | - sol16 mi sol mi sol mi sol mi sol mi sol mi~ | - mi2 r4 | R2.*14 - mi2.~ mi2 r4 | - mi' r2 | - \tt {r16 fad si la re} \t {do4 mib8} si'4 | - r8 mi, \t {mi mi mi} \tt {mi16 mi mi mi mi} | + sol16(\pdolce mi sol mi sol mi sol mi sol mi sol mi~ | + mi2) r4 | + sol16( mi sol mi sol mi sol mi sol mi sol mi~ | + mi2) r4 | + sol16( mi sol mi sol mi sol mi sol mi sol mi~ | + mi2) r4 | R2. + \ind #"senza cresc." sold16( mi sold mi sold mi sold mi sold mi sold mi~ | + mi2) r4 | + sold16( mi sold mi sold mi sold mi sold4) | + \meno sol16( mi sol mi sol mi sol mi sol mi sol mi~ | + mi2) r4 | + sol16( mi sol mi sol mi sol mi sol mi sol mi~ | + mi2) r4 | + sol16( mi sol mi sol mi sol mi sol mi sol mi~ | + mi2) r4 | R2.*14 + \ten mi2.\p~ mi2 r4 | + mi'--->\f r2 | + \tt {r16 fad(\< si) la( re)} \t {do4( mib8)} si'4--->\! | + r8 mi,--\ff\< \t {mi-- mi mi} \tt {mi16-> mi-> mi-> mi-> mi->\!} | } } diff --git a/instruments/flute2.ly b/instruments/flute2.ly index f99660f..d2fe1d8 100755 --- a/instruments/flute2.ly +++ b/instruments/flute2.ly @@ -930,67 +930,77 @@ ActeDeuxSceneTroisFluteDeux = { \FluteDeux %%% Boum %%% R2.*3 - r4 \tt {re16 do sol la fad} r8 \t {mi16 si dod} | - \tt {sib' lab mib fa re'} si,8 r r4 | - r \tt {reb'16 lab solb mib fa} \t {do8 sib' sol'} | R2. - r2 \tt {la,,16 sib la sib la} | \tt {sib la sib la sib} - \t {la sib la} \t {sold la sold} \t {la sib la} \t {do reb do} | - \tttt {re mib re mib re mib re} \tt {sol, si sib re mib} sol4 | R2. - r4 \t { sol16 si sib} re8 \tt {lab16 sol sib si dod} | re4 - \tt {r16 lab, sol si sib} \tt {mi mib sol fad si} | - re4~ re16 sol, do, fa, \t {sib'8 mib, lab,} | - \tt {re,16 mi fa sol la} sib8 r sold'16 la si dod | + r4 \tt {re16(\ppleggiero do sol la fad)} r8 \t {mi16( si dod)} | + \tt {sib'( lab) mib( fa re')} si,8-. r r4 | + r \tt {reb'16( lab solb mib fa)} \t {do8-.( sib'-. sol'-.)} | R2. + r2 \tt {la,,16--(\pp sib la sib la} | \tt {sib la sib la sib)} + \t {la--( sib la)} \t {sold--( la sold)} + \t {la--( sib la)} \t {do--( reb do)} | + \tttt {re--( mib re mib re mib re)} + \tt {sol,( si) sib( re) mib(} sol4) | R2. + r4 \t { sol16(\p si sib} re8) \tt {lab16( sol) sib( si) dod(} | re4) + \tt {r16 lab,( sol) si( sib)} \tt {mi( mib) sol( fad) si-.} | + re4--~ re16 sol,-.( do,-. fa,-.) \t {sib'8-.( mib,-. lab,-.)} | + \tt {re,16( mi) fa( sol) la(} sib8) r sold'16(\< la si dod | %%% Contralto %%% - re8 r r4 | R2 r4 sold,8 \t {la16 si dod} | - re8 r r4 | R2*8-\markup { Prenez la \concat { G \super de } Flûte } \FluteDeux + re8->\!) r r4 | R2 r4 sold,8--\f( \t {la16 si dod} | + re8-.->) r r4 | + R2*8-\markup { Prenez la \concat { G \super de } Flûte } \FluteDeux R2. R2*6 - sold,,,8 sold sold sold r4 | r8 sold sold sold sold4 | - dod8 dod dod dod r4 | r8 mi mi mi mi4 | + sold,,,8-.\pleggiero sold-. sold-. sold-. r4 | + r8 sold-. sold-. sold-. sold4-. | + dod8-.\mp dod-. dod-. dod-. r4 | + r8 mi-. mi-. mi-. mi4-. | %%% Grand ensemble %%% - fa1~ fa2 r | - \tt {mib,8 solb si mi sol}sold2~ sold4 r r8 dod,, dod dod | - dod dod dod dod r2 | sold'8 sold sold4~ sold sib16 mib solb reb | - lab'2. r4 | - mi,2~ mi4~ \t {mi8 lab sol} | si4 r r2 | - r2 r4 sold8 sold fad4 r re8 sold re' sold | - r2 sold8 r r4 | - mi2 fa4 red mi2 mib4 re8 re | mi4 r r sold,8 la | - re4 r4 r8 la do re | fad4 r r8 dod, fad la | - dod re re dod dod re re dod | - fa solb solb fa fa solb solb fa | - fa solb solb fa fa solb solb fa | - sold la la sold r2 | - la2~ la8 sold~ sold4 | + \ten fa1\pp~ fa2 r | + \tt {mib,8(\p \> solb) si( mi) sol-.} + sold2\!--~ sold4 r r8 dod,,-.(\p dod-. dod-. | + dod-. dod-. dod-. dod-.) r2 | + sold'8-. sold-. sold4--~ sold sib16(\< mib) solb-. reb-. | + lab'2.--\p r4 | + mi,2--~ mi4~ \t {mi8 lab( sol} | si4) r r2 | + r2 r4 sold8->\mf sold-> fad4-> r re8-.\< sold-. re'-. sold-.\! | + r2 sold8->-. r r4 | + mi2(\mp fa4 red) mi2( mib4) re8-. re-. | + mi4-> r r sold,8->\mp la-> | + re4-> r4 r8 la( do) re-. | + fad4-- r r8 dod,( fad) la-. | + dod(\p re) re( dod) dod( re) re( dod) | + fa( solb) solb( fa) fa( solb) solb( fa) | + fa( solb) solb( fa) fa( solb) solb( fa) | + sold( la) la( sold) r2 | + la2\f~ la8 sold~ sold4 | la4. sold8~ sold2 | - r8 sold'4. r8 sold4. R2. + r8 sold'4.---> r8 sold4.---> R2. %%% Chute %%% - sold8 sold la4 sold8 sold | - la4 sold8 sold la4 | - do,8 do reb4 do8 do | - reb4 mi,8 mi fa4 | - mi8 mi fa4 sold,8 sold | - re4 re R2*2 + \ind #"scherzando" + sold8-.->\f \> sold-. la4-- sold8-.-> sold-. | + la4-- sold8-.-> sold-. la4-- | + do,8-.-> do-. reb4-- do8-.-> do-. | + reb4-- mi,8-.-> mi-. fa4-- | + mi8-.-> mi-. fa4-- sold,8-.-> sold-. | + re4--\p re-- R2*2 %%% Andante al fine %%% - R2.*4 mi2.~ mi2 r4 | - sol16 mi sol mi sol mi sol mi sol mi sol mi~ | - mi2 r4 | - sol16 mi sol mi sol mi sol mi sol mi sol mi~ | - mi2 r4 | - mi2.~ mi~ mi2 r4 | - sold16 mi sold mi sold mi sold mi sold mi sold mi~ | - mi4. r8 sold16 mi sold mi | sol2 r4 | - sol16 mi sol mi sol mi sol mi sol mi sol mi~ | - mi2 r4 | - sol16 mi sol mi sol mi sol mi sol mi sol mi~ | - mi2 r4 | - mi2.~ mi2 r4 | R2.*13 - mi2.~ mi2 r4 | - mi r2 | - \tt {r16 fad' si la re} \t {do8 fa mib} lab4 | - r8 mi \t {mi mi mi} \tt {mi16 mi mi mi mi} | + R2.*4 \cmb #"pp" #"très clair" \ten mi2.~ mi2 r4 | + sol16(\p mi sol mi sol mi sol mi sol mi sol mi~ | + mi2) r4 | + sol16( mi sol mi sol mi sol mi sol mi sol mi~ | + mi2) r4 | + mi2.\pp~ mi~ mi2 r4 | + \ind #"senza cresc." sold16( mi sold mi sold mi sold mi sold mi sold mi~ | + mi4.) r8 sold16( mi sold mi) | \meno sol2-- r4 | + sol16( mi sol mi sol mi sol mi sol mi sol mi~ | + mi2) r4 | + sol16( mi sol mi sol mi sol mi sol mi sol mi~ | + mi2) r4 | + mi2.\>~ mi2\! r4 | R2.*13 + \ten mi2.\p~ mi2 r4 | + mi--->\f r2 | + \tt {r16 fad'(\< si) la( re)} \t {do8( fa) mib-.} lab4--->\! | + r8 mi--\ff \< \t {mi-- mi mi} \tt {mi16-> mi-> mi-> mi-> mi->\!} | } } diff --git a/instruments/percu.ly b/instruments/percu.ly index 0b94bb2..8e073af 100755 --- a/instruments/percu.ly +++ b/instruments/percu.ly @@ -232,8 +232,9 @@ ProloguePercus = << hh4 hh8 hh4 r8 | r16 hh\> \t {hh hh hh} hh8 | hh4\! r8 R4.*2 | \ind #"bag. douces, sur le bord" + \longHairpins { hh4.:32~\ppp \< hh:~ hh:~\pp \> hh4\! r8 | - hh4.:32~\ppp \< hh:~ hh4\! hh8 r hh r hh4. | R4.*3 + hh4.:32~\ppp \< hh:~ hh4\! hh8 r hh r hh4. | R4.*3 } %%% A tempo %%% R4.*27 @@ -1101,6 +1102,7 @@ ActeUnSceneQuatrePercus = << do'8--->\! \t {do16 do do} do4-> r2 | R1 R2. R1 R2. R1 R2. R1 + \longHairpins { r2 fad,4:32\mp\<\glissando sol4--\! r r2 | sol32-> sol8.. r4 r8 \t {dod16\< dod dod\>} dod4\! | \t {sol16->\> sol sol} sol8\!\laissezVibrer r2 | @@ -1121,7 +1123,7 @@ ActeUnSceneQuatrePercus = << re16-> re re8 r4 re-- r r re\> re re | re8\mp re16 re re4-> re re8 \t {re16 re re} | re4-> r r re8\< re16 re re4->\! r r re8\< re16 re | - re4->\! r r re re-> r r re re-> r r2 | R1*3 + re4->\! r r re re-> r r re re-> r r2 | R1*3 } R2 R2.*2 R2 R1 R2.*21 R1. R1 R1. R1 R1. R1 R1. R1 R1. R1 R1.*5 @@ -1503,6 +1505,7 @@ ActeDeuxSceneUnBisPercus = << %%% Tempo giusto %%% R2.*7 R2*2 R2.*4 R2 R4. R2*2 + \longHairpins { r4 \ind #"Cymb." hh4:32~\< hh4.:32~\> hh4\! r2 | r4 hh4:32~\< hh4.:32~\> hh4\! r2 | R1*5/8 r4 hh-- r8 hh4-- | R2.*4 @@ -1510,7 +1513,7 @@ ActeDeuxSceneUnBisPercus = << r4 hh2:32~\> hh4\! r2 | r4 hh2:32~\> hh4\! r2 | r4 hh4:32~\> hh4\! | r hh4:32~\> hh4\! R2. r8 hh32\> hh hh hh hh2\! R2.-\markup \indic "étouffer" - R2 R4. R2 R1*5/8 R2. + R2 R4. R2 R1*5/8 R2. } %%% Tempo I %%% r2 r4 \ind #"Tambour" sn16\< sn sn sn | @@ -1596,13 +1599,15 @@ ActeDeuxSceneDeuxPercus = << } \new DrumStaff { \Percus \drummode { - R1.*6 R1*2 R2.*5 r1 \ind #"Crécelle" hh2:32~\mf\> hh4\! r r1 R1. R1*2 + R1.*6 R1*2 R2.*5 + \longHairpins { + r1 \ind #"Crécelle" hh2:32~\mf\> hh4\! r r1 R1. R1*2 R2. R1 R4. R1*5 r4 \ind #"Crécelle" hh2.:32-- R2. R1. R1*2 R2.*3 R2 R2.*3 R2 R4. R1*5 R2*6 R1 r4 \ind #"Crécelle" hh2:32 R1. R1 R1.*2 R2. r2 hh4:32 hh4 | - + } R2. R1 R2. R1 R2. R1 R2. R1 R2. R1 R2. R1 R2. R1 R2. R1 R2. R1 R2. R1 R2. @@ -1693,7 +1698,7 @@ ActeDeuxSceneTroisPercus = << si4-- \gauche fa-- \droite | re'''8-. la4.-- | r8 si fad4-- | si16( fad sold8) red4-- | - r mib8( sib) + r mib8( sib) %%FIXME: Issue #721 \gauche \t { r8 mib,( sib)} \droite lab'( \gauche fa,) \droite | fad''-. dod4-. si'8-. \tt {fad16\<( @@ -1756,40 +1761,40 @@ ActeDeuxSceneTroisPercus = << %%% Baryton 2 %%% R2.*11\GrandVibraphone R4. R2.*14 - re''4 re re re2*3/2\laissezVibrer | - \gauche r8 sib,, \droite \t {la' solb fa'} re16 dod'8. | - re4 re re re2*3/2\laissezVibrer | - \gauche r16 lab,, \droite mib' sib' + re''4--\pp re-- re-- re2*3/2--\laissezVibrer | + \gauche r8 sib,,(\< \droite \t {la') solb( fa')} re16( dod'8.) | + re4--\pp re-- re-- re2*3/2--\laissezVibrer | + \gauche r16 lab,,( \droite mib' sib' \t {dod,8 fad si} \tt {fa16 do' sol' mi la} | - re4 re re re2*3/2\laissezVibrer | - \gauche \t {r8 do,,, si'~} \t {si \droite la' fad'~} - fad16 \gauche lab,, \droite sol' fa' | - re'4 re re re2*3/2\laissezVibrer - \tt {mi,,16 sold sol si dod,} fa mi' mi, sold' - \t {sol,8 si sib'} | - \pl re,4 re' r | - R2*11R2. R2*6 R2.*4 + re4--) re-- re-- re2*3/2--\laissezVibrer | + \gauche \t {r8 do,,,\mp( si')~} \t {si \droite la'( fad')~} + fad16 \gauche lab,,( \droite sol' fa') | + re'4-- re-- re-- re2*3/2--\laissezVibrer + \tt {mi,,16(\< sold sol si) dod,(} fa mi') mi,( sold') + \t {sol,8( si sib')\!} | + \pl re,4-> re'-> r | + R2*11 R2. R2*6 R2.*4 %%% Ensemble %%% - R1 r4 mi,, sold la sib1 R1*3 - \gauche r8 mi,, si' do \droite sol' lab - mib' si | sib'4 r8 ~ - \t {4 si,! sib'} lab'1 - s1 R1 r2 s2 1 | - r4 la8 sold do4 la | sold' r r - \pl { } { } r r2 | - R1 s1*2 re,8 sib' la' re,, sold' sold la re,, | - si' \gauche fa, mi' \droite re' si'4 \t {do,8 \gauche lab, reb \droite} | - r2 4 | - \pl {red red8 dod} {la' mi la si} | - 4 reb'8 do reb mib fa4 | R2. + R1 r4 mi,,--( sold-- la-- sib1--) R1*3 + \gauche r8 mi,,(\pdolce si' do \droite sol' lab + mib' si | sib'4) r8 --~ + \t {4 si,!(\> sib'} lab'1)\pp + s1 R1 r2 s2 1->-- | + r4 la8( sold) do4-. la-. | sold'---. r r + \pl {-.-- -.--} {-.-- -.--} r r2 | + R1 s1*2 re,8( sib' la') re,, sold'-> sold-> la-> re,, | + si' \gauche fa,( mi' \droite re' si'4) \t {do,8( \gauche lab, reb) \droite} | + r2 4--\mf -- | + -- --\< \pl {red red8( dod)} {la'( mi la si)} | + 4-- reb'8( do reb mib fa4--)\! | R2. %%% Chute %%% R2.*5 R2*3 %%% Andante al fine %%% - R2.*6 2.~ 4. ~ 4 2\laissezVibrer | - R2.*5 2. \laissezVibrer R2.*24 + R2.*6 2.--\p~ 4. --~ 4 2--\laissezVibrer | + R2.*5 2.--\> \!\laissezVibrer R2.*24 } \relative { %%% Larghetto %%% @@ -1862,21 +1867,21 @@ ActeDeuxSceneTroisPercus = << R2.*16 s4 r2 R2.*2 s4 r2 R2.*2 - s2. R2. r4 \tt {mi16 sold sol si sib} re4 | + s2. R2. r4 \tt {mi16(\mf sold sol si sib} re4) | R2. R2*12 R2. R2*6 R2.*4 %%% Ensemble %%% - \t {r4 fa, la} sold8 do si red~ red1 R1*4 - s1 R1 r4 re,2. re4 sold \droite re' sold \gauche | - re, si' sold8 fad re4 | - dod8 re sold la \t {\droite re4 lab' \gauche sib,}| - r2 r8 sol si sib | re4 r r2 | R1*3 - re,8 la' \droite mi' \gauche re, - \droite sold' \gauche re, la' \droite mi' | - \gauche la, re \droite sold - \gauche la, \droite do' \gauche la, re \droite do' \gauche R1 s1 - re,,1\laissezVibrer s1 R1 R2. + \t {r4 fa,(\p la} sold8 do si red)~ red1 R1*4 + s1 R1 r4 re,2.-- re4-. sold-. \droite re'-. sold-. \gauche | + re,-. si'-. sold8( fad) re4-. | + dod8( re sold la \t {\droite re4) lab'( \gauche sib,)}| + r2 r8 sol-.\mf si-. sib-. | re4-.-- r r2 | R1*3 + re,8\p( la' \droite mi') \gauche re, + \droite sold'-- \gauche re,( la' \droite mi') | + \gauche la,( re \droite sold) + \gauche la, \droite do'-- \gauche la,( re \droite do')\gauche R1 s1 + re,,1--\laissezVibrer s1 R1 R2. %%% Chute %%% R2.*5 R2*3 @@ -1939,15 +1944,15 @@ ActeDeuxSceneTroisPercus = << R2.*11 R4. R2.*11 \ind #"Tam-tam" cb2-> s4 | R2.*14 R2*2 - r8 \ind #"Crécelle" hh hh4:32 hh4 r | R2 - r4 hh4:32 hh4 r | R2*3 - r4 hh8 hh hh4 r | + r8 \ind #"Crécelle" hh-.\f hh4:32-- hh4-> r | R2 + r4 hh4:32-- hh4-> r | R2*3 + r4 hh8-> hh-> hh4-> r | R2. R2*6 R2.*4 %%% Ensemble %%% R1*24 R2. - r2 r8 \ind #"Tam-tam (bag. de timbale)" \t {cb16 cb cb} | - cb2\laissezVibrer s4 R2. \ind #"Cymbale" hh2\laissezVibrer s4 | + r2 r8 \ind #"Tam-tam (bag. de timbale)" \t {cb16\< cb cb} | + cb2\f\laissezVibrer s4 R2. \ind #"Cymbale" hh2->\laissezVibrer s4 | R2. R2*3 %%% Épilogue %%% @@ -2023,15 +2028,15 @@ ActeDeuxSceneTroisPercus = << %%% Ensemble %%% R1*24 R2. - R2. r2 r8 sold, r sold \t {sold sold sold} sold4 | - r4 sold2:32\glissando lad4.:32\glissando mi8 \t {re' mi, re'} - re re r re r re r4 R2 | + R2. r2 r8 sold,\ff r sold\> \t {sold sold sold} sold4\! | + r4 sold2:32\mf\<\glissando lad4.:32\>\glissando mi8\p \t {re' mi, re'} + re\> re r re r re\! r4 R2 | %%% Épilogue %%% - R2.*32 - mi2.:32~ mi:~ mi4 r mi8 mi | - mi,2.:32~ mi4 mi'8 mi \t {mi mi mi} | - mi,2.:32~ mi:~ mi8 mi' \t { mi' mi} - \tt {16 mi' mi mi, mi'} + R2.*32 \longHairpins { + mi2.:32\ppp~ mi:~ mi4 r mi8->\mf mi-> | + mi,2.:32~\fpp mi4 mi'8\mf\< mi \t {mi mi mi} | + mi,2.:32~\fpp \< mi:~\f\> mi8\! mi'\ffsubito \< \t {-- mi' mi} + \tt {16-- mi' mi-> mi,-> mi'->\!} } } >> diff --git a/instruments/violoncelle2.ly b/instruments/violoncelle2.ly index 8f07a65..13c07be 100644 --- a/instruments/violoncelle2.ly +++ b/instruments/violoncelle2.ly @@ -1038,7 +1038,7 @@ ActeDeuxSceneTroisVioloncelleDeux = { \VioloncelleDeux %%% Interlude %%% R2*2 - fa2~\p fa~ fa4 si~ si2~ si2 | + \arco fa2~\p fa~ fa4 si~ si2~ si2 | fa2~ fa4. si8~ si2. | fad2~ fad4 r16 do8.~ do4 r8 r16 fad~ | fad2 r16 do'8.~\< do4~ do4. dod8~\! | @@ -1080,7 +1080,7 @@ ActeDeuxSceneTroisVioloncelleDeux = { \VioloncelleDeux r8 sol~--\mp sol16 dod,8--( sol'16-.) dod,4-- r8 | r sol'~-- sol16 dod,8--( sol'16-.) mi4-- r8 | \ten 2~\p 4 r16 sol'8-- do,16~--( do sol'-.) do,8~-- do4. r8 | - \pizz dod16-> sold'\mf mi'8 dod, -> | dod,4 r | + \pizz dod16->\mf sold' mi'8 dod, -> | dod,4 r | \arco 2---> r4 | \ten re1~--->\f re2. r4 la'16-> la-> sold8-> | diff --git a/master/instruments.ly b/master/instruments.ly index 47c66b4..402bbf9 100644 --- a/master/instruments.ly +++ b/master/instruments.ly @@ -26,7 +26,7 @@ \include "./instruments/violoncelle2.ly" \include "./instruments/contrebasse.ly" \include "./instruments/piano.ly" -%{ +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%% Flutes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -50,7 +50,7 @@ ActeDeuxSceneTrois = \makeSection \ActeDeuxSceneTroisFluteUn \ActeDeuxSceneTrois \bookpart { \include "./master/master.ly" -} % +} %{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%% Clarinettes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -539,7 +539,7 @@ ActeDeuxSceneTrois = \makePianoPart \ActeDeuxSceneTroisPiano \ActeDeuxSceneTrois \include "./master/master.ly" } -%} +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%% Percus %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Prologue = \makePianoPart \ProloguePercus \PrologueMesures diff --git a/master/master.ly b/master/master.ly index 9cf53ba..fc73053 100644 --- a/master/master.ly +++ b/master/master.ly @@ -10,7 +10,7 @@ %%% Depends on: either vocal_score.ly or full_score.ly, %%% plus everything else. -%{ +% \score { \Prologue \header { @@ -22,7 +22,7 @@ \header { piece = \OuvertureTitre } -} % +} %} \score { \ActeUnSceneUn \header { @@ -112,7 +112,7 @@ \header { piece = \SceneDeuxTitre } -} %} +} % \score { \ActeDeuxSceneTrois \header { diff --git a/master/titling.ly b/master/titling.ly index 310553c..22b70e9 100755 --- a/master/titling.ly +++ b/master/titling.ly @@ -40,8 +40,8 @@ \paper { indent = #0 - left-margin = #9 % ??? - right-margin = #10 + left-margin = #15 % ??? + right-margin = #16 line-width = #(- paper-width (+ left-margin right-margin)) bookTitleMarkup = \markup { \vspace #20 diff --git a/parts.ly b/parts.ly index 4e19619..f486376 100644 --- a/parts.ly +++ b/parts.ly @@ -52,10 +52,10 @@ PercuDeuxMains= \include "./master/common.ly" \header { - scoretype = "Contrebasse" + scoretype = "Flûtes" } -%\include "./master/titling.ly" +\include "./master/titling.ly" \include "./master/instruments.ly" -- 2.11.4.GIT