From 8ffe314fe1a31cf2ce070c9929d5782be0126d4f Mon Sep 17 00:00:00 2001 From: Valentin Date: Tue, 16 Dec 2008 13:55:37 +0100 Subject: [PATCH] ActeUnSceneTroisBis, COMPLETED --- definitions/graphics.ly | 4 ++++ instruments/alto1.ly | 2 +- instruments/alto2.ly | 2 +- instruments/clarinette1.ly | 10 +++++----- instruments/clarinette2.ly | 2 +- instruments/flute1.ly | 5 +++-- instruments/flute2.ly | 2 +- instruments/piano.ly | 6 +++--- instruments/saxophone1.ly | 6 +++--- instruments/saxophone2.ly | 4 ++-- instruments/violon1.ly | 3 +-- master/master.ly | 6 +++--- 12 files changed, 28 insertions(+), 24 deletions(-) diff --git a/definitions/graphics.ly b/definitions/graphics.ly index b5f5cb7..c07f632 100644 --- a/definitions/graphics.ly +++ b/definitions/graphics.ly @@ -506,6 +506,10 @@ stroke grestore grestore" +%%%%%%%%%%%%%%%%%%%%% Cover and title pages %%%%%%%%%%%%%%%%%%%%%%%% + +copyleft = \markup { \sans \rotate #180 © } + Couronne = \markup \with-dimensions #'(0 . 30) #'(-24 . 16) \postscript #" 0 8 translate diff --git a/instruments/alto1.ly b/instruments/alto1.ly index 51473ea..25f4480 100755 --- a/instruments/alto1.ly +++ b/instruments/alto1.ly @@ -525,7 +525,7 @@ ActeUnSceneTroisBisAltoUn = { \AltoUn r fad\upbow \simile do\thumbpizz r | fad\upbow do\thumbpizz fad\upbow do\thumbpizz | r4 2\pp r4 | - \ten do'1~\CaV do2\CaV reb( do si) fad1~\pp fad~ fad4 r la2~\> la fad~\! fad4 r r2 | + \ten do'1\p~\CaV do2\CaV reb( do si) fad1~\pp fad~ fad4 r la2~\> la fad~\! fad4 r r2 | R1*7 } } diff --git a/instruments/alto2.ly b/instruments/alto2.ly index 0cb695c..c74e8a9 100644 --- a/instruments/alto2.ly +++ b/instruments/alto2.ly @@ -514,7 +514,7 @@ ActeUnSceneTroisBisAltoDeux = { \AltoDeux r16 mib' re'-> mib, r do si'-> do, r do si'-> do, r sib la'-> sib,| \t {fad'8->\> sib, mib} \t {sol, do mi,} sol dod,\! | - r4 \arco fad2\p fad4\p | mi2\<( fad~\>) fad1\! + r4 \arco fad2\p fad4\< | mi2(\> fad~)\! fad1 R1*3 1\p 2-- -- -- -- | \pizz 4-> r r2 | R1*6 diff --git a/instruments/clarinette1.ly b/instruments/clarinette1.ly index a79fcf3..ab06d56 100755 --- a/instruments/clarinette1.ly +++ b/instruments/clarinette1.ly @@ -425,7 +425,7 @@ ActeUnSceneTroisBisClarinetteUn = { \ClarinetteBasse \tt {\simile fa,16 lab sib reb mi} sol8 r \tt {fa,16 lab sib reb mi} sol8 r \tt {fa,16 lab sib reb mi} sol8 r | - fad,4--->\sf r r2 R1 + fad,4--\sf r r2 R1 fad'4\mp( red8) r fad4( red8) r | fad4( red8) r fad4( red8) r | fad4( red8) r16 sol, @@ -438,10 +438,10 @@ ActeUnSceneTroisBisClarinetteUn = { \ClarinetteBasse fad16---. sol,~-> \t {sol si,( lab} red'8) r | fad16( mi, lab,32 sol' sib do red8) r fad4( red8) r - fad4 red8 r fad4 red8 r | - fad8 la16 r red,8 fad16 r do8 mib16 r sol,8 sib16 r | + fad4( red8) r fad4( red8) r | + fad8(\> la16) r red,8( fad16) r do8( mib16) r sol,8(\! sib16) r | dod,8 r r2 | - r4 fad2\p fad4\<( mi2\> fad~) fad2. r4 | R1*2 + r4 fad2\p fad4\<( mi2\> fad~)\! fad2. r4 | R1*2 \tt {fad16--\pp( sol la do re)} r4 \tt {fad,16--( sol la do re)} r4 | \tt {fad,16--( sol la do re)} fa8 r @@ -455,7 +455,7 @@ ActeUnSceneTroisBisClarinetteUn = { \ClarinetteBasse r fad( do8) r r4 | fad( do8) r fad4( do8) r | R1*7 - do'2 la~\p\>( la4\!) r r2 | + do'2\p\> la~(\! la4) r r2 | R1*5-\markup "Prenez la Clarinette" \ClarinetteUn r2 sol'\mp( do1)\fermata } diff --git a/instruments/clarinette2.ly b/instruments/clarinette2.ly index fa86851..93b33f0 100755 --- a/instruments/clarinette2.ly +++ b/instruments/clarinette2.ly @@ -385,7 +385,7 @@ ActeUnSceneTroisBisClarinetteDeux = { \ClarinetteDeux sol8 r \tt {fa,16 lab sib reb mi} sol8 r \tt {fa,16\< lab sib reb mi} | fad4--\sf r r2 | R1*10 R2. - r4 la,2\p la4\<( do2\> la~) la2. r4 | + r4 la,2\p la4\<( do2\> la~)\! la2. r4 | r2 \tt {fad16--\pp( sol la do re)} r4 | r2 r4 \tt {fad,16--( sol la do re)}| r4 \tt {fad,16--( sol la do re)} diff --git a/instruments/flute1.ly b/instruments/flute1.ly index f0c070a..e73de38 100755 --- a/instruments/flute1.ly +++ b/instruments/flute1.ly @@ -382,7 +382,7 @@ ActeUnSceneTroisBisFluteUn = { \FluteUn r2 \t {sol'8\p( mi) r} \t {sol( mi) r} \t {la\mp( sol) r} \t {la( sol) r} \t {la( sol) r} \t {la( sol) r} | \tt {do16--( reb, mi sol la)} do8 r - \tt {mib16--\<( reb, mi sol do\!)} \tt {mib--( sol, la do mib)} | + \tt {mib16--\<( reb, mi sol do)} \tt {mib--(\! sol, la do mib)} | fad4--\sf r r2 | R1*10 R2. R1*6 r2 r4 \tt {lab,16--\p( sib si do dod)} | mi8 r \tt {re,16--( mib fa lab sib)} @@ -390,7 +390,8 @@ ActeUnSceneTroisBisFluteUn = { \FluteUn mi8 r \tt {re,16--( mib fa lab sib)} mi8 r \tt {mib,16\<( fad la si re)} | fad2.\mp r4 | - R1 r2 r4 dod,\p( | mi2\> dod\!) | r2 r4 do!\<( mib2\> do~) do2. r4 | + R1 r2 r4 dod,\p( | mi2\> dod\!) | + r2 r4 do!\<( mib2\> do~)\! do2. r4 | R1*7 fad2--\p r4 fad\<( la2\> fad~\!) fad4 r r2 R1*9 } diff --git a/instruments/flute2.ly b/instruments/flute2.ly index 9119495..3d44876 100755 --- a/instruments/flute2.ly +++ b/instruments/flute2.ly @@ -356,7 +356,7 @@ ActeUnSceneTroisBisFluteDeux = { \FluteDeux mi2.\> dod8\!) r | R1 \t {sol'8\mp( mi) r} \t {sol( mi) r} \t {sol( mi) r} \t {sol( mi) r} | \t {la( sol) r} \tt {la16--\<( reb, mi sol la)} do8\! r \tt {reb,16\<( mi sol la do)} | - fad,4--\sfz r r2 R1*10 R2. R1*7 + fad,4--\sf r r2 R1*10 R2. R1*7 \tt {fa16--\p( lab sib si do)} dod8 r \tt {fa,16--( lab sib si do)} dod8 r \tt {fa,16--( lab sib si do)} dod8 r diff --git a/instruments/piano.ly b/instruments/piano.ly index 9320405..dd625e2 100755 --- a/instruments/piano.ly +++ b/instruments/piano.ly @@ -630,7 +630,7 @@ ActeUnSceneDeuxPiano = { \Piano mi8(\pp fa la si la fa) mi( fa | la si la4) fa8( la si re | si4) \clef treble la8( si re fa | re4) fa8( sol si do) | - \ottava #1 si''8\pp( do si sol fa sol si4 | + \ottava #1 si''8\pp( do si sol fa sol si4) | si8( do si sol) fa( sol si do) | si( do si sol) fa( sol | fa re) si( re la4) | \ottava #0 @@ -941,8 +941,8 @@ ActeUnSceneTroisBisPiano = { \Piano R1*2 8 ~2 r4 | R1 r2 4-- -- | \ten 1~ ~ 2. r4 | R1*8 r2 r4 dod'--\mp | -- r r2 | - r2 \t {r16 8\p 16} - \t {r16 8 16} | + r2 \t {r16 8--\p -- 16-.} + \t {r16 8-- -- 16-.} | \t {r16 8-- -- 16-.} \t {r16 8-- -- 16-.} \t {r16 8-- -- 16-.} diff --git a/instruments/saxophone1.ly b/instruments/saxophone1.ly index 0500383..cbea20f 100755 --- a/instruments/saxophone1.ly +++ b/instruments/saxophone1.ly @@ -26,7 +26,7 @@ PrologueSaxophoneUn = { \SaxAltoUn la,2--->\mf r4 | R2*2 | reb,2-- r4 | R2 solb4--\mp\< lab-- sib8->\! do~-> | do2\> \ten si2.~\p si2 la2.~\pp la4 r | - sib2~-- sib4 r \t { lab8\fsubito( fa mib } | + sib2~-- sib4 r \t { lab8(\fsubito fa mib } | \ten re2~\fp) re~ re4 r | \ten re'2~\p re~ re4. r8 | \t {reb,4\p( mi fad} \t {sol\< la do} | re4\f) r2 lab2.--\mp( re4--) r2 sib2.\p reb mi | @@ -234,7 +234,7 @@ ActeUnSceneDeuxSaxophoneUn = { \SaxAltoUn r4 re-- do-- do8-> si~-> si4 r2| r4 re-- do-- si8-> mi~-> mi4 r | R2. r4 mi-- re-- si8-> mi~-> mi4 r | - r mi-- re-- mi8->\< sold~->/! sold4 r| + r mi-- re-- mi8->\< sold~->\! sold4 r| R2.*2 r16 sib,-.->\mp r8 r2 | R2.*2 @@ -309,7 +309,7 @@ ActeUnSceneTroisBisSaxophoneUn = { \SaxAltoUn reb4--\p r r2 reb4-- r r2 reb4-- r reb-- r reb-- r \simile reb-- r | reb8.( solb16) r4 reb8~(\t {reb16 solb do)} r8 r16 mi, | reb8--( do'-- reb'--) r reb,,4-- r16 la'8.-- | solb'2.\mp r4 | R1 - r2 r4 sib,\pp( lab2\> sib\!) | r2 r4 la(\< sol2/> la~\!) la2. r4 | + r2 r4 sib,\pp( lab2\> sib\!) | r2 r4 la(\< sol2\> la~\!) la2. r4 | R1*9 } } diff --git a/instruments/saxophone2.ly b/instruments/saxophone2.ly index c99fe91..1a9bb3a 100755 --- a/instruments/saxophone2.ly +++ b/instruments/saxophone2.ly @@ -296,9 +296,9 @@ ActeUnSceneTroisBisSaxophoneDeux = { \SaxophoneBaryton \ten solb1~\pp solb~ solb2. r4 | R1*2 | solb1~ solb~ solb2. r4 | R1*5 r4 \st {re'16\p lab' fa sib reb8 r re,16 lab' fa sib | - reb8 fa,16 sib reb8 fa,16 sib} reb8 fa,16\< sib reb fa, re la | + reb8 fa,16 sib reb8 fa,16 sib} reb8 fa,16\< sib reb fa, re la | solb4--\sf r r2 | R1 - \ten si1~ si~ si2. r4 | R1*6 R2. + \ten si1\p~ si~ si2. r4 | R1*6 R2. re,1~ re~ re2. r4 | fa4\p( re8) r r2 fa4( re8) r r2 | fa4( re8) r fa4( re8) r diff --git a/instruments/violon1.ly b/instruments/violon1.ly index bff0e5b..eb7fb0d 100644 --- a/instruments/violon1.ly +++ b/instruments/violon1.ly @@ -428,7 +428,6 @@ ActeUnSceneDeuxViolonUn = { \ViolonUn %%% Largo assai %%% R1 R2.*3 R2 - %%%%FIXME%%%% \arco \ten sib,,2.~\pp sib2. r4 | r2 \pizz la'4 sold | sol r dod, r | re r r2 | } @@ -490,7 +489,7 @@ ActeUnSceneTroisBisViolonUn = { \ViolonUn \relative { R1*8 r2 la'8\mp( sol) sib4-- fad4-- r r2 | R1*20 - do1-- do2-- do-- do-- do-- do-- do-- | + do1--\pp do2-- do-- do-- do-- do-- do-- | fa'4\mf(\glissando re8) r re4(\glissando si8) r | la\>(\glissando fad16) r fad8(\glissando mib16) r mib8( do16\!) r | R1*16 diff --git a/master/master.ly b/master/master.ly index 8c15b74..754d5f4 100644 --- a/master/master.ly +++ b/master/master.ly @@ -55,19 +55,19 @@ piece = \InterludeTitre dessin = \Arrosoir } -} %} +} % \score { \ActeUnSceneTrois \header { piece = \SceneTroisTitre } -} %{ +} %} \score { \ActeUnSceneTroisBis \header { piece = \Separateur } -} % +} %{ \score { \ActeUnSceneTroisTer \header { -- 2.11.4.GIT