From 2ed55ff386319ae8014959ece5a34a399c5ad009 Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Fri, 9 Jan 2009 14:11:23 +0100 Subject: [PATCH] Slight modification, upon request from V. Cortez --- main.ly | 6 +++--- master/master.ly | 8 ++++---- texte/texte.ly | 5 ++--- voix/contralto.ly | 9 +++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/main.ly b/main.ly index fe63094..8827c52 100644 --- a/main.ly +++ b/main.ly @@ -34,13 +34,13 @@ %% Uncomment one of the two following lines. -\include "./master/full_score.ly" -%\include "./master/vocal_score.ly" +%\include "./master/full_score.ly" +\include "./master/vocal_score.ly" %%%%%%%%%%%%%%%%%%%%%%%%% The actual score %%%%%%%%%%%%%%%%%%%%%%%%% %showFirstLength = s1*40 \book { \include "./master/common.ly" - \include "./master/titling.ly" + %\include "./master/titling.ly" \include "./master/master.ly" } diff --git a/master/master.ly b/master/master.ly index bbb4ea4..3191c15 100644 --- a/master/master.ly +++ b/master/master.ly @@ -16,7 +16,7 @@ \header { piece = \PrologueTitre } -} % +} %{ \score { \Ouverture \header { @@ -35,14 +35,14 @@ \header { piece = \Separateur } -} % +} %} \score { \InterludeUn \header { piece = \InterludeTitre dessin = \Arrosoir } -} % +} %{ \score { \ActeUnSceneDeux \header { @@ -86,7 +86,7 @@ \header { piece = \FinaleTitre } -} %} +} % \score { \Entracte \header { diff --git a/texte/texte.ly b/texte/texte.ly index 25b628e..25d133a 100755 --- a/texte/texte.ly +++ b/texte/texte.ly @@ -290,9 +290,8 @@ InterludeUnContraltoTexte = \lyricmode { cou -- pons ça… Cou -- pons ça… Cou -- pons ça, - cou -- pons ça, - cou -- pons cou -- pons tout ça… - Cou -- pons, cou -- pons_; cou -- _ pons ça… + cou -- pons cou -- pons tout ça… __ _ + Cou -- pons, cou -- pons_; cou -- _ pons ça… __ _ Cou -- pons ça, cou -- pons ça, cou -- pons ça… __ _ _ diff --git a/voix/contralto.ly b/voix/contralto.ly index 39a0e8f..a239a1b 100755 --- a/voix/contralto.ly +++ b/voix/contralto.ly @@ -29,12 +29,13 @@ InterludeUnContralto = { \Contralto r8 fa,16-.\mp fa-. fad8-- red16-. red-. mi8-- sol16-.\< sol-. sold8-- mi16-. mi-. fa8-- la16-. la-. \t {sib8--\f mi,(\> fa} | \ten mi'2.--) \mp \t {r8 mi,(\mf \> fa} | \ten mi'2.--)\p r4 | - \ttt {r16 mi,\( ( \< fa si) fa( fad} \ttt {dod')\mf \> fad,( sib) la( dod) do-.} - mi2--\p \) r16 \ind #"scherzando" do-.\mf sold16.->-- la32-. fad8-- \t {do16(\> mi mib} | - fad4)\! r \ttt {r16 mi(\mf \< fa mi' fa, si} \t {mi8-- sold,-- dod--) \!} | + \t {r8 mi,\( ( \< fa} \t {dod')\> fad,( sib)} la16( dod) do-. mi~ + mi4~--\p \) r16 \ind #"scherzando" do-.\mf sold8->-- r16 la-. fad8-- | + do16(\> mi mib fad~)\! \t {fad8\breathe mi(\mf \< fa} mi'8 fa,16 si + \t {mi8-- sold,-- dod--) \!} | r8 \ten mi->--~ \f mi2~ | mi4 r2 | fad,16-.\mp sib-. re,8-- r4 r8 mib16-. fad-. | do4-- r2 | R2. do8--\> mib-- la,2--\! | - r4 \t {r mi'(\pdolce \< la} sol2\> ) r4\! | R2.*5 + r4 \t {r mi'(\pdolce \< la } sol2\> ) r4\! | R2.*5 r8 do,16-.\p do-. fad8-- do16-. do-. la4-- | \t {r8 sol( sib} fad'4--) r R2.*2 } } -- 2.11.4.GIT