From 423f2d20335452f21a2ee460d68f6ff9966a4773 Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Mon, 6 Oct 2008 19:13:40 +0200 Subject: [PATCH] ActeDeuxSceneUn, take 1 This commits also adds improvements in the accidentals rule. --- definitions/functions.ly | 13 ++++++++----- definitions/layout.ly | 4 +++- definitions/mesures.ly | 6 ++++-- definitions/structure.ly | 1 + full_score.ly | 8 +++----- instruments/alto1.ly | 34 +++++++++++++++++++++++++++++++++- instruments/alto2.ly | 34 ++++++++++++++++++++++++++++++++++ instruments/clarinette1.ly | 34 +++++++++++++++++++++++++++------- instruments/clarinette2.ly | 35 ++++++++++++++++++++++++++++++----- instruments/flute1.ly | 24 ++++++++++++++++++++++++ instruments/flute2.ly | 24 ++++++++++++++++++++++++ instruments/saxophone1.ly | 22 ++++++++++++++++++++++ instruments/saxophone2.ly | 24 ++++++++++++++++++++++++ instruments/violon1.ly | 28 ++++++++++++++++++++++++++++ instruments/violon2.ly | 28 ++++++++++++++++++++++++++++ instruments/violon3.ly | 29 +++++++++++++++++++++++++++++ vocal_score.ly | 7 ++----- voix/soprano1.ly | 2 +- 18 files changed, 325 insertions(+), 32 deletions(-) diff --git a/definitions/functions.ly b/definitions/functions.ly index 39e237c..e8435fb 100755 --- a/definitions/functions.ly +++ b/definitions/functions.ly @@ -219,11 +219,14 @@ gauche = { \change Staff = "gauche" } ((end * * 5 8) . ,(ly:make-moment 5 8)) ))) -#(define modern-style - `(Staff ,(make-accidental-rule 'same-octave 0) - ,(make-accidental-rule 'any-octave 0) - ,(make-accidental-rule 'same-octave 1) - ,neo-modern-accidental-rule)) +#(define modern-accidentals-style + `(Staff ,(make-accidental-rule 'same-octave 0) + ,(make-accidental-rule 'any-octave 0) + ,(make-accidental-rule 'same-octave 1) + ,neo-modern-accidental-rule)) +#(define modern-cautionaries-style + `(Staff ,(make-accidental-rule 'same-octave 1) + ,(make-accidental-rule 'any-octave 1))) %% Music formatting -----------------------------------------------% diff --git a/definitions/layout.ly b/definitions/layout.ly index bd16170..24123fe 100755 --- a/definitions/layout.ly +++ b/definitions/layout.ly @@ -47,7 +47,9 @@ includeLayout = \layout { \override PaperColumn #'keep-inside-line = ##t \override NonMusicalPaperColumn #'keep-inside-line = ##t autoBeamSettings = #modern-auto-beam-settings - autoAccidentals = #modern-style + autoAccidentals = #modern-accidentals-style + autoCautionaries = #modern-cautionaries-style + extraNatural = ##f ignoreMelismata = ##t tieWaitForNote = ##f %% uglier, but safer } diff --git a/definitions/mesures.ly b/definitions/mesures.ly index f7882ef..ca1db7a 100755 --- a/definitions/mesures.ly +++ b/definitions/mesures.ly @@ -926,7 +926,6 @@ ActeDeuxSceneUnMesures = { \time 3/4 R2. \time 4/4 R1 \time 3/4 R2. - \time 3/4 \mark \markup \did \ActeDeuxSceneUnG R2.*7 \mark \markup \did \ActeDeuxSceneUnH @@ -942,7 +941,10 @@ ActeDeuxSceneUnMesures = { \time 4/4 R1 \time 3/4 R2. \time 4/4 R1 - \time 3/4 R2. + \time 3/4 + \once \set Score.tempoHideNote = ##t + \tempo "Molto rallentando..." + R2. \time 4/4 r2 \mark \markup \did \ActeDeuxSceneUnJ r2 diff --git a/definitions/structure.ly b/definitions/structure.ly index 1b5ae81..927efbc 100755 --- a/definitions/structure.ly +++ b/definitions/structure.ly @@ -7,6 +7,7 @@ %% TODO: improve indentation, and use a markup function. +%% Nope -- better: redefine BookTitleMarkup or whatever. OperaTitre = \markup { \center-column {\fontsize #8.5 \OperaTitreTexte diff --git a/full_score.ly b/full_score.ly index e7611ff..a9f5be9 100755 --- a/full_score.ly +++ b/full_score.ly @@ -5,11 +5,9 @@ % % %------------------------------------------------------------------% -%%% This is the main file for the full (orchestral) score. This version -%%% is (obviously) not ready yet; please compile vocal_score.ly instead... -\version "2.11.58" -%% This opéra has been coded on over several years, from version 2.9 -%% to 2.12 -- some inconsistencies may remain through the code. +%%% This is the main file for the full (orchestral) score. + +\version "2.12" %%%%%%%%%%%%%%%%%%%%%%%%%%%% Inclusions %%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/instruments/alto1.ly b/instruments/alto1.ly index 585a760..1eb7a61 100755 --- a/instruments/alto1.ly +++ b/instruments/alto1.ly @@ -456,7 +456,39 @@ ActeDeuxSceneUnAltoUn = { \AltoUn } \ttt { \simile la''16 la la la la la } \repeat unfold 68 { \ttt { la[ la la la la la] } } la4 r \ttt { si,8[ si16 si si si] } | - \repeat unfold 8 { \ttt { mi,[ mi mi mi mi mi] } } | + \repeat unfold 8 { \ttt { mi,[ mi mi mi mi mi] } } | + + %%% Entrée de la Soprano Deux %%% + R2.*2 r4 \ttt {8 16 } 8 r r4 | + r4 r8 \t {8 16} + \ttt {8 16 } \clef alto | + R1 R2. R2 R2. R1 + + %%% Andantino %%% + R1*2 R2.*4 R2 + r4 \pizz si mi, r si' lad8 fad mi4 fad8 mi si' lad | + r fad lad4 r | r8 si lad4 si8 lad fad4 r8 si r fad lad4 | + \arco si2 r4 | R2 + \pizz fad4 r2 | R1 R2. R1 R2. R1 + r4 do' mi, R1 r4 \arco lab r lab r lab r | R2. + r4 la? r la r la r | + 1~ 2. 2 + 2.~2 2.~ 2. r4 | + 2.~ 1~ 2 r4 | R1 + + %%% Entrée de la Contralto %%% + \pizz fad4 r2 | R1 + fa4 r2 R1 fad4 r fad r fa r mib | + r \arco r r r | re r re | + r mi r mi r mi r | r r mi r r mi r mi | + r8 \pizz la,4 do re,8 | r4 lab' do re, | r8 la'4 do re,8 | r4 lab' do re, | + r8 la'4 do re,8 | r lab'4 do re,8 | r sol r2 | + r8 la4 do re,8 | r lab'4 do re,8 | r la'4 do re,8 | r lab'4 do8 reb,4 | + r4 la' r8 do | r4 \arco re r re r re | mib,2 r4 si' | r re r | + r dod r dod r do r | R1 + r8 \pizz la4 do re,8 | r lab'4 lab8 do4 re, | r8 la'4 do re,8 | + r4 \arco sol2.~ sol2. r4 lab sol fa | + re2.:32~ re1:32~ re2.~ re4 r | R1 R2. R1 R2. R1 R2. R1 } } diff --git a/instruments/alto2.ly b/instruments/alto2.ly index 78838e2..893790f 100644 --- a/instruments/alto2.ly +++ b/instruments/alto2.ly @@ -443,6 +443,40 @@ ActeDeuxSceneUnAltoDeux = { \AltoDeux la4 r \ttt { la,8[ la16 la la la] } | \ttt { la[ la la la la la] } \repeat unfold 7 { \ttt { re,[ re re re re re] } } | + + %%% Entrée de la Soprano Deux %%% + R2.*2 r4 \ttt {8 16 } + 8 r r4 \clef alto | + r4 r8 \t {8 16} + \ttt {8 16 } | + R1 R2. R2 R2. R1 + + %%% Andantino %%% + R1*2 R2.*4 R2 + r4 \pizz si mi, r si' lad8 fad mi4 fad8 mi si' lad | + r2 fad4 mi r si'8 lad fad4 r r8 fad4. | + \arco mi2 r4 | R2 + \pizz fad4 r2 | R1 R2. R1 R2. R1 + r4 sol mi8 do R1 r4 \arco mib r mib r mib r | R2. + r4 mi? r mi r mi r | + 1~ 2. 2 + 2.~2 2.~ 2. r4 | + 2.~ 1~ 2 r4 | R1 + + %%% Entrée de la Contralto %%% + \pizz fad4 r2 | R1 + fa4 r2 R1 fad4 r fad r fa r mib | + r \arco r r r | do r do | + r r r r | + r r r r r | + r8 \pizz la4 do re,8 | r4 lab' do re, | r8 la'4 do re,8 | r4 lab' do re, | + r8 la'4 do re,8 | r lab'4 do re,8 | r sol r2 | + r8 la4 do re,8 | r lab'4 do re,8 | r la'4 do re,8 | r lab'4 do8 reb,4 | + r4 la' r8 do | r4 \arco do r do r do | mib,2 r4 la | r do r | + r si r si r sib r | R1 + r8 \pizz la4 do re,8 | r lab'4 lab8 do4 re, | r8 la'4 do re,8 | + r4 \arco sol2.~ sol2. r4 lab sol fa | + re2.~ re1~ re4 r2 R2 | R1 R2. R1 R2. R1 R2. R1 } } diff --git a/instruments/clarinette1.ly b/instruments/clarinette1.ly index 841d333..5b8b54c 100755 --- a/instruments/clarinette1.ly +++ b/instruments/clarinette1.ly @@ -436,13 +436,33 @@ EntracteClarinetteUn = { \ClarinetteUn } } -ActeDeuxSceneUnClarinetteUn = { \ClarinetteUn + +ActeDeuxSceneUnClarinetteUn = { \ClarinetteBasse \relative { - R2.*3 | re''8 sib~ sib2~ | sib4 r | - si!8 sol~ sol2~ | sol2 r4 | r sold | - mi2.~ | mi2.~ | mi2.~ | mi4 r | - R2. R2 R2.*2 r4 r8 la, | - mi2.~ | mi2.~ | mi2.~ | mi4 r | - R2. R2 R2.*2 R2 | R2. mi'2.~| mi2.~| mi4 r | + R2.*4 R2 R2.*2 R2 | mi2.~ | mi2.~ | mi2.~ | mi4 r \clef treble + mib'4 sib2~ | sib4 r | do8 sol~ sol2~| sol2.~ | sol4 r \clef bass | + mi,2.~ | mi2.~ | mi2.~ | mi4 r | + R2. R2 R2.*2 R2 | R2. \clef treble | re''2.~| re2.~| re4 r \clef bass | + + %%% Entrée de la Soprano Deux %%% + R2.*2 R1 R2. do,,1 fa,2.~ fa4 r | mi2.~ mi2 r | + + %%% Andantino %%% + R1*2 r8 lad4 si dod8 mi2.~ mi~ mi~ mi4 r | + r lad8 fad mi4~ | mi2.~ mi~ mi2 r4 R2. R1 R2. r8 lad si mi,~ | + mi2 r4 R1 R2. do4 sol' fad8 re do4 | R2. R1 + sib4 fa' mi8 do sib2. r4 | R2. R1 sib2 r4 R1 R2. | + R1 R2. R1 R2. R1 R2. R1 + r4 \clef treble fad''8 sold si sold fad re dod re fad sold si fad | + + %%% Entrée de la Contralto %%% + sold2.~ sold2. r4 \clef bass | R2. R1 R2. R1 R2. R1 + do,,2.~ do2. r4 | R2. r4 do2 r4 reb2.~ reb2. r4 | r4 do r R1 | + fad,8 r r2 | R1 R2. R1 R2. sol2.~ sol2 r4 | + R2.*4 r4 mi'2 mib2.~ mib~ mib4 r r2 | R2. + re1~ re4 r2 | R1 lab2. la2. r4 lab2. sol2. r4 | R2. R1 + R2. do'4 sib la sol la8 sol la sib do4 sol r | fa2. r4 | + R2. R1 R2. R1 R2. \clef treble sol'4 mi r2 | } } + diff --git a/instruments/clarinette2.ly b/instruments/clarinette2.ly index 740545c..90b3e4c 100755 --- a/instruments/clarinette2.ly +++ b/instruments/clarinette2.ly @@ -359,10 +359,35 @@ EntracteClarinetteDeux = { \ClarinetteDeux ActeDeuxSceneUnClarinetteDeux = { \ClarinetteDeux \relative { - R2.*4 R2 R2.*2 R2 | mi2.~ | mi2.~ | mi2.~ | mi4 r | - mib'4 sib2~ | sib4 r | do8 sol~ sol2~| sol2.~ | sol4 r | - mi,2.~ | mi2.~ | mi2.~ | mi4 r | - R2. R2 R2.*2 R2 | R2. | re''2.~| re2.~| re4 r | + R2.*3 | re''8 sib~ sib2~ | sib4 r | + si!8 sol~ sol2~ | sol2 r4 | r sold | + mi2.~ | mi2.~ | mi2.~ | mi4 r | + R2. R2 R2.*2 r4 r8 la, | + mi2.~ | mi2.~ | mi2.~ | mi4 r | + R2. R2 R2.*2 R2 | R2. mi'2.~| mi2.~| mi4 r | + + %%% Entrée de la Soprano Deux %%% + R2.*2 R1 R2. sib,1 la2.~ la4 r | lab2.~ lab2 r | + + %%% Andantino %%% + R1*2 R2.*3 r2 solb'4 lab r | + si si, r R2.*4 R1 R2. R2 + R2. R1 R2. R1 R2. R1 + sold''8 la sold mi re mi sold2. r4 | + R2. R1 R2. R1 R2. + fad,,2. r4 | fa2.~ fa2. r4 | R2. fad2. r4 fa2.~ fa2. r4 | + sold''8 la re la sold mi re la' sold mi re mi re si | + + %%% Entrée de la Contralto %%% + la2.~ la2. r4 R2. R1 + R2. R1 R2. R1 r2 la,4~ la4 la2 r4 R2. | + r4 la2 r4 r la2~ la4 r la r r la2~ la4 r r2 | + fad8 r r2 R1 R2. R1 R2. do'2 re4 mib8 lab sib4 r | + R2.*5 + r4 la'8 sib la fa mib fa la2~ la4 r r2 | r2 la4~ | + la4. lab4 si8 solb4 | lab mib r re la2 r4 | + r4 la2 r4 lab2. r4 la2 r4 fa2 r4 | R2. R1 + R2. r2 r4 fad mi re dod | re8 dod re mi fad2. r4 | + R2. R1 R2. R1 mi4 reb r mi reb r2 | } } - diff --git a/instruments/flute1.ly b/instruments/flute1.ly index 87f7c42..433ff0f 100755 --- a/instruments/flute1.ly +++ b/instruments/flute1.ly @@ -371,5 +371,29 @@ ActeDeuxSceneUnFluteUn = { \FluteUn r \tt {sib16 mib dod fad mi} la4~ | la4. sib,8 la'4~ | la2.~| la4 r | R2. R2 | R2.*2 R2 | mi2.~| mi2.~| mi2.~| mi4 r | + + %%% Entrée de la Soprano Deux %%% + R2.*2 R1 R2. \t { r2 mi,, la} lab2.~ lab4 r sib2.~sib2 r | + + %%% Andantino %%% + r2 mi,~ mi2. r4 R2. | r2 mi4~ mi2.~ mi4 r mi~ mi r | + mi r2 r mi4~ mi2.~ mi4 r2 R2. | R1 R2. R2 + re2 r4 r mi la2~ la4 r2 R1 R2. R1 + re2.~ re2. r4 | R2. R1 mi,2 r4 R1 R2. + re4 la' sold8 mi~ mi4~ mi2.~ mi2. r4 | + r8 re la'2~ la2. r4 | r mi2 la2. r4 | + mi'4. la4. sold4 mi re r | + + %%% Entrée de la Contralto %%% + sold,8 la sold mi re mi | sold la sold mi re mi sold4~ sold2.~ sold4 r r2 | + R2. R1 R2. R1 r2 re4~ re re2 r4 | r2 re4~ | + re2. r4 | r4 mi2~ mi4 r mi r | r re2~ re4 r r2 | + re''8 r r2 | r r8 re r8 r16 re, | re'8 r r2 | R1 r4 r8 re, r4 | + re,4 fa8 sib4 mib8~ | mib2 r4 | + R2.*5 r4 re2~ re r4 | r mib8 fa la2~ la4 r2 | + R1 lab,4 solb fa mib fa8 mib fa solb lab4 | mib2.~ mib4 r r2 | + R2. R1 re'8 mib re sib lab sib re4 r r2 | + la4 sol fa mi fa8 mi fa sol la4 | mi2.~ mi4 r | fad2. r4 | + R2. R1 R2. R1 R2. R1 } } diff --git a/instruments/flute2.ly b/instruments/flute2.ly index 8fa1b41..7a44373 100755 --- a/instruments/flute2.ly +++ b/instruments/flute2.ly @@ -348,5 +348,29 @@ ActeDeuxSceneUnFluteDeux = { \FluteDeux \tt {si!16 do si sold sol } mib'16 mi,!8.~ mi4~| mi r | R2. R2 R2.*2 R2 | la2.~| la2.~| la2.~| la4 r | + + %%% Entrée de la Soprano Deux %%% + R2.*2 R1 R2. \t { r2 mi,1} do2.~ do4 r re2.~re2 r | + + %%% Andantino %%% + r2 re~ re2. r4 R2. | r2 re4~ re2.~ re4 r re~ re r | + re r2 r re4~ re2.~ re4 r2 R2. | R1 R2. R2 + dod2 r4 r re sold2~ sold4 r2 R1 R2. R1 + do2.~ do2. r4 | R2. R1 re,2 r4 R1 R2. + r2 r4 re~ re2.~ re2. r4 | + mi2.~ mi2. r4 | r re2 mi2. r4 | + re'4. mi4. si4 re la r | + + %%% Entrée de la Contralto %%% + sold8 la sold mi re mi | sold la sold mi re2~ re2.~ re4 r r2 | + R2. R1 R2. R1 r2 do4~ do do2 r4 | r2 do4~ | + do2. r4 | r4 re2~ re4 r re r | r do2~ do4 r r2 | + do''8 r r2 | r r8 do r8 r16 do, | do'8 r r2 | R1 r4 r8 do, r4 | + do,4 re8 fa4 re8~ | re2 r4 | + R2.*5 r4 do2~ do r4 | R1 R2. | + R1 lab'4 solb fa mib fa8 mib fa solb lab4 | mib2.~ mib4 r r2 | + R2. r4 do2 r4 R2. R1 | + la'4 sol fa mi fa8 mi fa sol la4 | mi2.~ mi4 r | re2. r4 | + R2. R1 R2. R1 R2. R1 } } diff --git a/instruments/saxophone1.ly b/instruments/saxophone1.ly index 8cf2c6e..967f50b 100755 --- a/instruments/saxophone1.ly +++ b/instruments/saxophone1.ly @@ -242,5 +242,27 @@ ActeDeuxSceneUnSaxophoneUn = { \SaxAltoUn R2.*4 R2 R2.*2 R2 R2.*3 R2 | R2. R2 R2.*2 R2 R2.*3 R2 | la'4 re,2~ | re4 r | mi4. la,8~ la4~ | la2 r4 | si2 | mi,2.~ | mi2.~ | mi2.~ | mi4 r | + + %%% Entrée de la Soprano Deux %%% + R2.*2 R1 R2. R1 mib'2.~ mib4 r re2.~ re2 r | + + %%% Andantino %%% + R1*2 R2.*4 R2 + R2.*5 R1 R2. R2 + R2. R1 R2. R1 R2. R1 + R2. R1 R2. R1 R2. R1 R2. + R1 R2. R1 R2. R1 R2. R1 + r8 mi' sold mi re mi sold mi si re si lab solb re | + + %%% Entrée de la Contralto %%% + reb2.~ reb2. r4 | R2. R1 + R2. R1 R2. R1 R2. R1 R2. + R1 R2. R1 R2. R1 + solb,8 r r2 | R1 R2. R1 R2. r2 r8 mib'' re sib lab4 r | + R2.*7 R1 R2. + R1 R2. R1 r4 la,?2 r4 lab2 re,4 | r la'2 r4 sol2 r4 | + R2. re''8 mib re sib lab fa mib fad | + re2.~ re1~ re4 r2 R2 lab2. r4 | + R2. R1 si4 lab r si lab si do si lab r si lab r2 | } } diff --git a/instruments/saxophone2.ly b/instruments/saxophone2.ly index 18c9954..80883f8 100755 --- a/instruments/saxophone2.ly +++ b/instruments/saxophone2.ly @@ -260,5 +260,29 @@ ActeDeuxSceneUnSaxophoneDeux = { \SaxophoneBaryton R2.*4 R2 R2.*2 R2 mi,2.~ mi2.~ mi2.~ mi4 r | R2. R2 R2.*2 R2 | R2.*3 R2 | la4 re,2~ | re4 r | mi4. la,8~ la4~ | la2 r4 | si2 | mi,2.~ | mi2.~ | mi2.~ | mi4 r | + + %%% Entrée de la Soprano Deux %%% + R2.*2 R1 R2. fa'1 mi2.~ mi4 r mib2.~ mib4 r8 mi,4 fa sol8 | + + %%% Andantino %%% + sib1~ sib2. r4 R2.*4 R2 + R2.*5 R1 R2. R2 + solb4 reb' do8 lab | solb2. r4 | + lab8 solb reb' do r solb | do r r4 r2 | + solb8 lab do4 reb solb,8 reb' r4 r2 | + R2. R1 solb,2.~ solb2. r4 | R2. solb1~ solb2 r4 | + R1 R2. R1 R2. R1 R2. R1 + solb2.~ solb2. r4 | + + %%% Entrée de la Contralto %%% + lab'2.~ lab2. r4 | R2. R1 + R2. R1 R2. R1 R2. R1 R2. + R1 R2. R1 do,2. reb2 mib | + solb8 r r2 | R1 R2. R1 R2. fa2.~ fa4 r fa, | + sib2. si2 r4 sib2. si2 dod4 | mi2 r4 R2.*2 R1 R2. + R1 re2 mib4~ mib fa2. | lab2. la2. r4 | lab2. sol2. r4 | R2. R1 + re2.~ re1~ re4 r2 R2 sib2. r4 | + lab' fa r lab fa r2 lab4 fa r lab fa lab la | + lab fa r lab fa r2 | } } diff --git a/instruments/violon1.ly b/instruments/violon1.ly index c59719e..f568b4b 100755 --- a/instruments/violon1.ly +++ b/instruments/violon1.ly @@ -408,5 +408,33 @@ ActeDeuxSceneUnViolonUn = { \ViolonUn la2.~| la4 r | la2.~ | la4 la~ | la2~ la4~ | la8 la4. la4 | la la | \repeat unfold 11 { \ttt { la16[ la la la la la] } } | + + %%% Entrée de la Soprano Deux %%% + R2.*2 r4 \ttt {la16[ la la la la la] } \t {la la la} r8 r4 | + r4 r8 \t {re,16 re re} \ttt {re re re re re re} | R1 R2. R2 R2. R1 + + %%% Andantino %%% + R1*2 R2.*4 R2 + R2.*5 R1 R2. R2 + r4 r r r | r | + r r | r r | r r | + r sol r | r sol r sol | r fa r | fa r fa r | + r mi r | r re r re | r re r | + r mi r mi r mi r | mi r mi r | mi r mi | + r mi r mi | r mi r | 2. r4 | + 2.~ 2. r4 | + + %%% Entrée de la Contralto %%% + r2 4 | r r | r r | r r | + r r | r r | r r | r r | + r8 \pizz re r re r re | r fad r fad r do' r do | r sol r fad r re | + r re r la r2 R2. r4 r8 re r la' r la | r mi r re r la | r2 r4 \arco | + r2 \pizz re4 | r4 r8 re r2 | r2 re4 | r4 r8 re r4 r8 re | + r4 re sol sol, fa' sib mib lab r | + r4 r8 \arco r4 | r4 r8 r4 | + r4 r8 r4 | r4 r8 r4 | + r8 4 8 4 2.~2 r4 | R1 R2. + R1 R2. R1 r4 solb r r fa r fa | r solb r r fa r sib | R2. R1 + re,2.:32~ re1:32~ re2.~ re4 r | R1 R2. R1 R2. R1 R2. R1 } } diff --git a/instruments/violon2.ly b/instruments/violon2.ly index cb79694..5568cb0 100755 --- a/instruments/violon2.ly +++ b/instruments/violon2.ly @@ -404,6 +404,34 @@ ActeDeuxSceneUnViolonDeux = { \ViolonDeux \ttt { mi16[ mi mi mi mi mi] } \ttt { mi16[ mi mi mi mi mi] } | \repeat unfold 8 { \ttt { re16[ re re re re re] } } | + + %%% Entrée de la Soprano Deux %%% + R2.*2 r4 \ttt {mi16[ mi mi mi mi mi] } \t {mi mi mi} r8 r4 | + r4 r8 \t {la,16 la la} \ttt {la la la la la la} | R1 R2. R2 R2. R1 + + %%% Andantino %%% + R1*2 R2.*4 R2 + R2.*5 R1 R2. R2 + r4 sold, r sold r sold r | sold r sold | + r sold r sold | r sold r | sold r sold r | + r fad r | r fad r fad | r re r | re r re r | + r r | r sib r sib | r sib r | + r re r re r re r | re r re r | re r re | + r re r re | r re r | re2. r4 | + sold2.~ sold2. r4 | + + %%% Entrée de la Contralto %%% + r2 sold4 | r sold r sold | r sold r | sold r sold r | + r sold r | sold r sold r | r sold r | sold r sold r | + r8 \pizz do, r do r do | r re r re r sol r sol | r fad r re r do | + r la r la r la r4 R2. r8 si r si r mi r mi | r re r la r la | r la r4 r \arco sol' | + r2 \pizz re4 | r4 r8 re r2 | r2 re4 | r4 r8 re r4 r8 re | + r4 re re sol, re' lab' re mib r | + r4 r8 fa, r4 | r4 r8 mi r4 | + r4 r8 fa r4 | r4 r8 mi r4 | + r8 \arco mi4 fa8 sol4 sib2.~ sib2 r4 | R1 R2. + R1 R2. R1 r4 solb r r fa r fa | r solb r r fa r fa | R2. R1 + re2.~\CaV re1~\CaV re4\CaV r2 R2 | R1 R2. R1 R2. R1 R2. R1 } } diff --git a/instruments/violon3.ly b/instruments/violon3.ly index 6c5692d..4ee9ae3 100755 --- a/instruments/violon3.ly +++ b/instruments/violon3.ly @@ -390,6 +390,35 @@ ActeDeuxSceneUnViolonTrois = { \ViolonTrois \ttt { re16[ re re re re re] } | \repeat unfold 3 { \ttt { si16[ si si si si si] } } | \repeat unfold 5 { \ttt { si16[ si si si si si] } } + + %%% Entrée de la Soprano Deux %%% + R2.*2 r4 \ttt {re16[ re re re re re] } \t {re re re} r8 r4 | + r4 r8 \t {mi,16 mi mi} \ttt {mi mi mi mi mi mi} | R1 R2. R2 R2. R1 + + %%% Andantino %%% + R1*2 R2.*4 R2 + R2.*5 R1 R2. R2 + r4 re, r re r re r | re r re | + r re r re | r re r | re r re r | + r r | r r | r sib r | sib r sib r | + r sold r | r la r la | r la r | + r la r la r la r | la r la r | la r la | + r la r la | r la r | la2. r4 | + si2.~ si2. r4 | + + %%% Entrée de la Contralto %%% + r2 4 | r r | r r | r r | + r r | r r | r r | r r | + r8 \pizz la r la r la | r do r do r fad r fad | r re r do r la | + r la r la r la r la r2 r8 la | + r la r la r re r re | r la r la r la | r la r la r4 \arco si | + r2 \pizz do4 | r4 r8 do r2 | r2 do4 | r4 r8 do r4 r8 do | + r4 do do sol do fa sib re r | + r4 r8 do, r4 | r4 r8 si r4 | + r4 r8 do r4 | r4 r8 si r4 | + r8 \arco si4 do8 re4 fa2.~ fa2 r4 | R1 R2. + R1 R2. R1 r4 mib r r do r do | r mib r r do r do | R2. R1 + re2.~\CaV re1~\CaV re4\CaV r2 R2 | R1 R2. R1 R2. R1 R2. R1 } } diff --git a/vocal_score.ly b/vocal_score.ly index ddd8a32..1a4dca3 100755 --- a/vocal_score.ly +++ b/vocal_score.ly @@ -6,12 +6,9 @@ %------------------------------------------------------------------% %%% This is the main file for the so-called vocal version, i.e. with -%%% piano accompaniment. Compile it using "lilypond vocal_score.ly" -%%% and wait a few minutes... +%%% piano accompaniment. -\version "2.11.58" -%% This opéra has been coded on over several years, from version 2.9 -%% to 2.12 -- some inconsistencies may remain through the code. +\version "2.12" %%%%%%%%%%%%%%%%%%%%%%%%%%%% Inclusions %%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/voix/soprano1.ly b/voix/soprano1.ly index 9ea168d..e058887 100755 --- a/voix/soprano1.ly +++ b/voix/soprano1.ly @@ -135,7 +135,7 @@ ActeDeuxSceneUnSopranoUn= { \SopranoUn lab sib \ten mib2)~ mib4 r2 | r2 r8 la,!( \f lab do re2) | r2 r8 la!( - lab do re4) r8 lab?8( | + lab do re4) r8 lab8( | la! do re4.) lab8( | sol\< re' \ten sol2)\!~ | sol2.~ sol4 r4 r2 | R2. R1 R2. r2 r4 r8 lab,(\mf| -- 2.11.4.GIT