From ccdbca48e8f2d6ad69120459a2d4eeffef43f830 Mon Sep 17 00:00:00 2001 From: Edwige Hudson Date: Wed, 22 Oct 2008 16:58:44 +0200 Subject: [PATCH] Added expressive marks to ActeUnSceneTroisBis --- definitions/functions.ly | 4 ++++ full_score.ly | 2 +- instruments/flute1.ly | 28 ++++++++++++++++++++++++++++ instruments/flute2.ly | 28 ++++++++++++++++++++++++++++ vocal_score.ly | 8 ++++---- voix/contralto.ly | 34 +++++++++++++++++----------------- 6 files changed, 82 insertions(+), 22 deletions(-) diff --git a/definitions/functions.ly b/definitions/functions.ly index cc32eea..228c932 100755 --- a/definitions/functions.ly +++ b/definitions/functions.ly @@ -395,6 +395,10 @@ ordin = #(define-music-function (parser location music) (ly:music?) #{ \ind #"(ordin.)" $music #}) +meno = +#(define-music-function (parser location music) (ly:music?) +#{ \ind #"meno" $music #}) + #(define (make-text-span music t) (set! (ly:music-property music 'elements) (append (ly:music-property music 'elements) diff --git a/full_score.ly b/full_score.ly index 400fd63..c7568a8 100755 --- a/full_score.ly +++ b/full_score.ly @@ -868,7 +868,7 @@ ActeDeuxSceneDeux = { } %%%%%%%%%%%%%%%%%%%%%%%%% The actual score %%%%%%%%%%%%%%%%%%%%%%%%% -showFirstLength = s1*12 +%showFirstLength = s1*12 \book { \header { title = \OperaTitre diff --git a/instruments/flute1.ly b/instruments/flute1.ly index ec02c70..fcae41e 100755 --- a/instruments/flute1.ly +++ b/instruments/flute1.ly @@ -427,5 +427,33 @@ ActeDeuxSceneUnBisFluteUn = { \FluteUn ActeDeuxSceneDeuxFluteUn = { \FluteUn \relative { R1.*4 la'4 sol fa mi fa8 mi fa sol | la4 mi r1 | R1*2 la4 sol fa | + mi fa8 mi fa sol la4 mi r | R2.*2 | la4 sol fa mi fa8 mi fa sol la1 r2 | + R1. la4 mi r2 | R1 la4 sol fa mi fa8 mi fa sol la4 mi r8 | + r4 r8 la~ la2~ la4 r8 la~ la2~ la4 r8 mib'~ mib2~ | + mib4 r8 mib~ mib4 r | fa8 sib sib dob r4 sib8 sib | fa'4. r8 mib16 mib fa8 r4 | + R2. la,,4 sol fa mi fa8 mi fa sol la4 mi2 r4 | mi2. r4 | R2.*2 r2 r8 la~la mi r4 | + R2.*2 r2 r8 la'~ la mi r4 | R4. mi,1~ mi2. r4 | + r8 mi' r4 r8 mi'16 mi, r4 | r4 r8 r16 re mi8 r r4 | + r2 r4 sold16 sold la8 | sib4 r r sold16 sold la8 | + sib4 r r sold16 sold la8 | sib4 r r sold16 sold lad8 | si1~ si2 r4 | + la,4 sol fa mi fa8 mi fa sol la4 mi r2 | + la4 sol fa mi fa8 mi fa sol | la1.~ la2 r4 | la4 mi r2 | + la2.~ la1~ la2.~ la1~ la2.~ la2. r4 | la2.~ + la1~ la2 r4 R1 la2.~ la1~ la2.~ la1~ | + la2 r4 | R1 R2. R1 R2. R1 r2 r8 r16 \t {mi''32 fa sol} | + la8 r r4 | r r8 \t {mi16 fa sol} | la8 r r4 | + r2 r8 \t {mi16 fa sol} | la8 r r4 r2 | R1*2 + la8 r2 | la,4 r8 sold sold | la sold, sold la r | + mib'4 r8 re re | mib4 la,8 r4 | lab4 r4 r8 | R2*5/4 + lab''8 r2 | R2*5/4 lab,,4 r4 r8 | R2*5/4*4 + R1*3 r4 \slap { \ind #"slap" reb' sib} r r \slap {sib sol} r | R1*4 + lab'4 r2 R2 R1*2 la,!4 sol fa mi fa8 mi fa sol lab2.~ lab2 r4 | R2.*3 + R2*2 R2.*2 R2*2 + mib''4 reb dob sib dob r | r r8 \slap { sold, la} r r4 | + r8 \slap {sold la} r r \slap {sold la fad | + sol} r r4 | R2*4 r4 la8 r | R2 + r4 r8 \slap {sold la} r r4 | R2*7 + la'4 sol fa mi fa8 mi fa sol | la4 mi r | R2.*2 la4 mi r la, mi r | + R2.*9 } } diff --git a/instruments/flute2.ly b/instruments/flute2.ly index 8dcf1b6..2725a62 100755 --- a/instruments/flute2.ly +++ b/instruments/flute2.ly @@ -405,5 +405,33 @@ ActeDeuxSceneUnBisFluteDeux = { \FluteDeux ActeDeuxSceneDeuxFluteDeux = { \FluteDeux \relative { R1.*4 la'4 sol fa mi fa8 mi fa sol | la4 mi r1 | R1*2 la4 sol fa | + mi fa8 mi fa sol la4 mi r | R2.*2 | la4 sol fa mi fa8 mi fa sol la1 r2 | + R1. la4 mi r2 | R1 la4 sol fa mi fa8 mi fa sol la4 mi r8 | + r4 r8 la~ la2~ la4 r8 la~ la2~ la4 r8 mib'~ mib2~ | + mib4 r8 mib~ mib4 r | fa8 sib sib dob r4 sib8 sib | fa'4. r8 mib16 mib fa8 r4 | + R2. la,,4 sol fa mi fa8 mi fa sol la4 mi2 r4 | mi2. r4 | R2.*2 r2 r8 la~la mi r4 | + R2.*2 r2 r8 la'~ la mi r4 | R4. mi,1~ mi2. r4 | + r8 mi' r4 r8 mi'16 mi, r4 | r4 r8 r16 re mi8 r r4 | + r2 r4 sold16 sold la8 | sib4 r r sold16 sold la8 | + sib4 r r sold16 sold la8 | sib4 r r sold16 sold lad8 | si1~ si2 r4 | + la,4 sol fa mi fa8 mi fa sol la4 mi r2 | + la4 sol fa mi fa8 mi fa sol | la1.~ la2 r4 | la4 mi r2 | + la2.~ la1~ la2.~ la1~ la2.~ la2. r4 | la2.~ + la1~ la2 r4 R1 la2.~ la1~ la2.~ la1~ | + la2 r4 | R1 R2. R1 R2. R1 r2 r8 r16 \t {mi''32 fa sol} | + la8 r r4 | r r8 \t {mi16 fa sol} | la8 r r4 | + r2 r8 \t {mi16 fa sol} | la8 r r4 r2 | R1*2 + la8 r2 | la,4 r8 sold sold | la sold, sold la r | + mib'4 r8 re re | mib4 la,8 r4 | lab4 r4 r8 | R2*5/4 + lab''8 r2 | R2*5/4 lab,,4 r4 r8 | R2*5/4*4 + R1*3 r4 \slap { \ind #"slap" reb' sib} r r \slap {sib sol} r | R1*4 + lab'4 r2 R2 R1*2 la,!4 sol fa mi fa8 mi fa sol lab2.~ lab2 r4 | R2.*3 + R2*2 R2.*2 R2*2 + mib''4 reb dob sib dob r | r r8 \slap { sold, la} r r4 | + r8 \slap {sold la} r r \slap {sold la fad | + sol} r r4 | R2*4 r4 la8 r | R2 + r4 r8 \slap {sold la} r r4 | R2*7 + la'4 sol fa mi fa8 mi fa sol | la4 mi r | R2.*2 la4 mi r la, mi r | + R2.*9 } } diff --git a/vocal_score.ly b/vocal_score.ly index f8529d6..1a4dca3 100755 --- a/vocal_score.ly +++ b/vocal_score.ly @@ -384,13 +384,13 @@ ActeDeuxSceneTrois = { \header { piece = \ActeUnSceneTroisTitre } - } % + } %} \score { \ActeUnSceneTroisBis \header { piece = \Separateur } - } % + } %{ \score { \ActeUnSceneTroisTer \header { @@ -426,11 +426,11 @@ ActeDeuxSceneTrois = { \header { piece = \ActeDeuxSceneDeuxTitre } - } %} + } % \score { \ActeDeuxSceneTrois \header { piece = \ActeDeuxSceneTroisTitre } - } % + } %} } diff --git a/voix/contralto.ly b/voix/contralto.ly index a5afaaf..bfdd41a 100755 --- a/voix/contralto.ly +++ b/voix/contralto.ly @@ -15,25 +15,25 @@ Contralto= { ActeUnSceneTroisBisContralto = { \Contralto \relative { - R1*15 r4 fad,8 fad fad4 fad8 fad fad4 r r2 | - R1*7 r4 do'8 do do4 do8 do fad2 r | R1 - r2 r16 do do do si8. si16 | - si si mi8 re mi do do \t {re do re} | - si2 r4 r8 si | lad4. r8 sib4 sol8 r | - sib4 sol8 r sib sol do16 sib mib8~ | + R1*15 r4 fad,8\mp( fad fad4 fad8 fad fad4--) r r2 | + R1*7 r4 do'8\mf-- do-- do4-- do8-- do-- fad2-- r | R1 + r2 r16 do( do do si8.) si16( | + si si mi8--) re--( mi) do--( do) \t {re--( do-- re--)} | + si2-- r4 r8 \meno si( | lad4.) r8 sib4--( sol8) r | + sib4--( sol8) r sib--( sol) do16( sib mib8~--) | mib mib16\<( mib do do mib8) fad--(\mf red16) r fad8--(\< red16) r | fad8--( red16) r fad8--( red16)\! r \parlato fad8 r r4 | - r8 \t {fad16 fad fad} la8 \t { red,16 red red} fad8 r - \tt {do16 do do do do} | mi4 \t {r8 reb mi} \t {do sib reb} | - la2 r | R1*4 r2 r4 r8 sol' | - sib mib,16 mib~ mib mib32 mib fa16. mib32 lab8 - r32 lab lab lab lab8 mib16 lab | si4 r r2 | - r2 r4 r8 r16 sol, | fad'8. mi16 dod'8 r16 sol, fad'4. mi8 | dod'2. r4 | - dod,8 dod dod mi dod4. r8 | - r2 r4 r8 dod | do do do mib do4 r | - fa4. do8~ do mib \t {sol, sol la} | - fad4 r r2 | R1*3 r2 r4 do'8 do | do4 \t {do8 do do} do4 do8 do | - do4 do r do8 do | do4. do8 do do do do | fad2. r4 | R1*11 + r8 \t {fad16( fad fad} la8) \t { red,16( red red} fad8) r + \tt {do16\mp( do do do do} | mi4--) \t {r8 reb--( mi--} \t {do-- sib-- reb--} | + la2--) r | R1*4 r2 r4 r8 sol'->\mf | + sib-- mib,16--( mib~-- mib mib32 mib fa16.--\< mib32 lab8--\!) + r32 lab( lab lab lab8--\< mib16-- lab-- | si4->--\f) r r2 | + r2 r4 r8 r16 sol,\mf( | fad'8.) mi16( dod'8) r16 sol,( fad'4. mi8\> | dod'2.)\p r4 | + dod,8( dod dod mi dod4.) r8 | + r2 r4 r8 dod( | do do do mib do4) r | + fa4.--( do8~ do mib\> \t {sol, sol la} | + fad4--)\! r r2 | R1*3 r2 r4 do'8--\mp do-- | do4-- \t {do8-- do-- do--} do4-- do8-- do-- | + do4-- do-- r do8-- do-- | do4.-- do8(\> do do do do | fad2.--)\pp r4 | R1*11 } } -- 2.11.4.GIT