From 8070724bd3fd43617ce77b5524f70291a1407765 Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Mon, 8 Sep 2008 20:56:06 +0200 Subject: [PATCH] ActeUnSceneDeux, completed Yeah, this commit adds a bunch of weird permission changes. The hell with that. Oh, and a few syntax updates as well. --- COPYING | 0 LICENSE | 0 PERFORMING | 0 README | 0 THANKS | 0 TODO | 0 definitions/common.ly | 0 definitions/contexts.ly | 0 definitions/functions.ly | 0 definitions/layout.ly | 2 +- definitions/markup.ly | 0 definitions/mesures.ly | 0 definitions/paper.ly | 0 definitions/structure.ly | 27 +++++---- definitions/text-functions.ly | 0 definitions/text_layout.ly | 0 definitions/titling.ly | 4 +- full_score.ly | 14 ++--- instruments/alto1.ly | 0 instruments/alto2.ly | 0 instruments/clarinette1.ly | 0 instruments/clarinette2.ly | 0 instruments/contrebasse.ly | 0 instruments/flute1.ly | 0 instruments/flute2.ly | 0 instruments/percu.ly | 0 instruments/piano.ly | 132 +++++++++++++++++++++++++++++++++++++++++- instruments/reduction.ly | 6 +- instruments/saxophone1.ly | 0 instruments/saxophone2.ly | 0 instruments/violon1.ly | 0 instruments/violon2.ly | 0 instruments/violon3.ly | 0 instruments/violoncelle1.ly | 0 instruments/violoncelle2.ly | 0 livret_score.ly | 0 test.ly | 0 texte/didascalies.ly | 0 texte/livret.ly | 0 texte/personnages.ly | 0 texte/texte.ly | 0 vocal_score.ly | 12 ++-- voix/baryton1.ly | 0 voix/baryton2.ly | 0 voix/contralto.ly | 0 voix/soprano1.ly | 0 voix/soprano2.ly | 0 voix/tenor.ly | 0 48 files changed, 164 insertions(+), 33 deletions(-) mode change 100644 => 100755 COPYING mode change 100644 => 100755 LICENSE mode change 100644 => 100755 PERFORMING mode change 100644 => 100755 README mode change 100644 => 100755 THANKS mode change 100644 => 100755 TODO mode change 100644 => 100755 definitions/common.ly mode change 100644 => 100755 definitions/contexts.ly mode change 100644 => 100755 definitions/functions.ly mode change 100644 => 100755 definitions/layout.ly mode change 100644 => 100755 definitions/markup.ly mode change 100644 => 100755 definitions/mesures.ly mode change 100644 => 100755 definitions/paper.ly mode change 100644 => 100755 definitions/structure.ly mode change 100644 => 100755 definitions/text-functions.ly mode change 100644 => 100755 definitions/text_layout.ly mode change 100644 => 100755 definitions/titling.ly mode change 100644 => 100755 full_score.ly mode change 100644 => 100755 instruments/alto1.ly mode change 100644 => 100755 instruments/alto2.ly mode change 100644 => 100755 instruments/clarinette1.ly mode change 100644 => 100755 instruments/clarinette2.ly mode change 100644 => 100755 instruments/contrebasse.ly mode change 100644 => 100755 instruments/flute1.ly mode change 100644 => 100755 instruments/flute2.ly mode change 100644 => 100755 instruments/percu.ly mode change 100644 => 100755 instruments/piano.ly mode change 100644 => 100755 instruments/reduction.ly mode change 100644 => 100755 instruments/saxophone1.ly mode change 100644 => 100755 instruments/saxophone2.ly mode change 100644 => 100755 instruments/violon1.ly mode change 100644 => 100755 instruments/violon2.ly mode change 100644 => 100755 instruments/violon3.ly mode change 100644 => 100755 instruments/violoncelle1.ly mode change 100644 => 100755 instruments/violoncelle2.ly mode change 100644 => 100755 livret_score.ly mode change 100644 => 100755 test.ly mode change 100644 => 100755 texte/didascalies.ly mode change 100644 => 100755 texte/livret.ly mode change 100644 => 100755 texte/personnages.ly mode change 100644 => 100755 texte/texte.ly mode change 100644 => 100755 vocal_score.ly mode change 100644 => 100755 voix/baryton1.ly mode change 100644 => 100755 voix/baryton2.ly mode change 100644 => 100755 voix/contralto.ly mode change 100644 => 100755 voix/soprano1.ly mode change 100644 => 100755 voix/soprano2.ly mode change 100644 => 100755 voix/tenor.ly diff --git a/COPYING b/COPYING old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/PERFORMING b/PERFORMING old mode 100644 new mode 100755 diff --git a/README b/README old mode 100644 new mode 100755 diff --git a/THANKS b/THANKS old mode 100644 new mode 100755 diff --git a/TODO b/TODO old mode 100644 new mode 100755 diff --git a/definitions/common.ly b/definitions/common.ly old mode 100644 new mode 100755 diff --git a/definitions/contexts.ly b/definitions/contexts.ly old mode 100644 new mode 100755 diff --git a/definitions/functions.ly b/definitions/functions.ly old mode 100644 new mode 100755 diff --git a/definitions/layout.ly b/definitions/layout.ly old mode 100644 new mode 100755 index e3709b3..0637abc --- a/definitions/layout.ly +++ b/definitions/layout.ly @@ -47,7 +47,7 @@ includeLayout = \layout { \override PaperColumn #'keep-inside-line = ##t \override NonMusicalPaperColumn #'keep-inside-line = ##t autoBeamSettings = #modern-auto-beam-settings - %autoAccidentals = #modern-style + autoAccidentals = #modern-style ignoreMelismata = ##t } diff --git a/definitions/markup.ly b/definitions/markup.ly old mode 100644 new mode 100755 diff --git a/definitions/mesures.ly b/definitions/mesures.ly old mode 100644 new mode 100755 diff --git a/definitions/paper.ly b/definitions/paper.ly old mode 100644 new mode 100755 diff --git a/definitions/structure.ly b/definitions/structure.ly old mode 100644 new mode 100755 index 20d04cf..7c072e7 --- a/definitions/structure.ly +++ b/definitions/structure.ly @@ -5,8 +5,11 @@ % % %------------------------------------------------------------------% + +%% TODO: improve indentation, and use a markup function. + OperaTitre = \markup { -\center-align {\fontsize #8.5 \OperaTitreTexte +\center-column {\fontsize #8.5 \OperaTitreTexte \fontsize #5 \OperaSousTitreTexte } } @@ -29,46 +32,46 @@ Livret = "Paroles et didascalies" %%%%%% PrologueTitre = \markup { -\fill-line { \center-align {\fontsize #10 \PrologueTitreTexte " "}} +\fill-line { \center-column {\fontsize #10 \PrologueTitreTexte " "}} } ActeUnSceneUnTitre = \markup { - \fill-line { \center-align {\fontsize #10 \ActeUnTitreTexte " " + \fill-line { \center-column {\fontsize #10 \ActeUnTitreTexte " " \fontsize #6 \SceneUnTitreTexte " "}} } ActeUnSceneDeuxTitre = \markup { - \fill-line { \center-align {\fontsize #6 \SceneDeuxTitreTexte " "}} + \fill-line { \center-column {\fontsize #6 \SceneDeuxTitreTexte " "}} } ActeUnSceneTroisTitre = \markup { - \fill-line { \center-align {\fontsize #6 \SceneTroisTitreTexte " "}} + \fill-line { \center-column {\fontsize #6 \SceneTroisTitreTexte " "}} } ActeUnSceneQuatreTitre = \markup { - \fill-line { \center-align {\fontsize #6 \FinaleTitreTexte " "}} + \fill-line { \center-column {\fontsize #6 \FinaleTitreTexte " "}} } EntracteTitre = \markup { - \fill-line { \center-align {\fontsize #10 \EntracteTitreTexte " "}} + \fill-line { \center-column {\fontsize #10 \EntracteTitreTexte " "}} } ActeDeuxSceneUnTitre = \markup { - \fill-line { \center-align {\fontsize #10 \ActeDeuxTitreTexte " " + \fill-line { \center-column {\fontsize #10 \ActeDeuxTitreTexte " " \fontsize #6 \SceneUnTitreTexte " "}} } ActeDeuxSceneDeuxTitre = \markup { - \fill-line { \center-align { \fontsize #6 \SceneDeuxTitreTexte " "}} + \fill-line { \center-column { \fontsize #6 \SceneDeuxTitreTexte " "}} } ActeDeuxSceneTroisTitre = \markup { - \fill-line { \center-align { \fontsize #6 \FinaleTitreTexte " "}} + \fill-line { \center-column { \fontsize #6 \FinaleTitreTexte " "}} } Interlude = \markup { -\fill-line { \center-align {\fontsize #6 \InterludeTitreTexte }}} +\fill-line { \center-column {\fontsize #6 \InterludeTitreTexte }}} Separateur = \markup { - \fill-line { \center-align {\fontsize #10 " " "***" " "}} + \fill-line { \center-column {\fontsize #10 " " "***" " "}} } diff --git a/definitions/text-functions.ly b/definitions/text-functions.ly old mode 100644 new mode 100755 diff --git a/definitions/text_layout.ly b/definitions/text_layout.ly old mode 100644 new mode 100755 diff --git a/definitions/titling.ly b/definitions/titling.ly old mode 100644 new mode 100755 index 1927210..14325ce --- a/definitions/titling.ly +++ b/definitions/titling.ly @@ -570,14 +570,14 @@ sceneDescription = maintainerEmail = "v.villenave@gmail.com" maintainerWeb = "http://valentin.villenave.info" copyright = \markup \copyright - longcopyright = \markup \center-align { + longcopyright = \markup \center-column { \line { \copyright \hspace #-1 . } \line { GNU General Public License v.3 or later.} } tagline = \markup { \override #'(box-padding . 1.0) \override #'(baseline-skip . 2.7) - \box \center-align { + \box \center-column { \small \line { \copyright \with-url #"http://valentin.villenave.info" \teeny "" diff --git a/full_score.ly b/full_score.ly old mode 100644 new mode 100755 index 951fea1..299e72e --- a/full_score.ly +++ b/full_score.ly @@ -329,19 +329,19 @@ ActeUnSceneDeux = { \header { piece = \ActeUnSceneUnTitre } - } %} + } % \score { - \ActeUnSceneUnBis - \header { - piece = \Separateur - } - } %{ + \ActeUnSceneUnBis + \header { + piece = \Separateur + } + } %} \score { \ActeUnSceneDeux \header { piece = \ActeUnSceneDeuxTitre } - } % + } %{ \score { \ActeUnSceneTrois \header { diff --git a/instruments/alto1.ly b/instruments/alto1.ly old mode 100644 new mode 100755 diff --git a/instruments/alto2.ly b/instruments/alto2.ly old mode 100644 new mode 100755 diff --git a/instruments/clarinette1.ly b/instruments/clarinette1.ly old mode 100644 new mode 100755 diff --git a/instruments/clarinette2.ly b/instruments/clarinette2.ly old mode 100644 new mode 100755 diff --git a/instruments/contrebasse.ly b/instruments/contrebasse.ly old mode 100644 new mode 100755 diff --git a/instruments/flute1.ly b/instruments/flute1.ly old mode 100644 new mode 100755 diff --git a/instruments/flute2.ly b/instruments/flute2.ly old mode 100644 new mode 100755 diff --git a/instruments/percu.ly b/instruments/percu.ly old mode 100644 new mode 100755 diff --git a/instruments/piano.ly b/instruments/piano.ly old mode 100644 new mode 100755 index 3582597..a582e63 --- a/instruments/piano.ly +++ b/instruments/piano.ly @@ -117,6 +117,69 @@ ActeUnSceneDeuxPiano = { \Piano \ottava #1 2\fermata \ottava #0 | %%% Récitatif %%% + R2.*2 R1 R2.*3 R1 R2.*5 + 8 r r2 \clef bass + r8 \t {sold,,16 la si} re8 r | + R2. R1*2 R2.*5 R1 + + %%% Duo %%% + \repeat unfold 34 8 + \repeat unfold 14 + \repeat unfold 8 + \repeat unfold 8 r4 \clef treble | + R2 + \repeat unfold 12 { r8 } + r \clef bass | + r4 \clef treble + | + | + \clef bass | + \clef treble | + \arpeggio 8 | + r4 r2 \clef bass | + + %%% Piu vivo %%% + r4 sol,,16 lab sol sib lab sib lab reb | + sib reb sib mib reb mib reb mi red mi red fad mi fad mi la | + fad la fad si la si la do si do si re \clef treble | + do re do fa re fa re sol fa sol fa lab \clef bass | + \gauche 8 \droite sol' \gauche \droite + ~ 2 | + dod2 dod4 + \gauche sol,8 re' \droite sol \gauche \droite 2 | + dod2. + \gauche sol,8 re' \droite lab' sol \gauche \droite + 4. | + dod,4 r2 \clef treble | R2. + \gauche sol,8 re' la' \droite 4.\laissezVibrer R2. + \gauche si,,8 fad' dod'\droite 4.\laissezVibrer R2. + \gauche 8. re''16 \droite 8 4.\laissezVibrer R2.*2 + r8 r2 | R2.*2 \clef bass + r4 r8 r4 | R2. + \pl {fa2 s2} 1\arpeggio 1\arpeggio \clef treble + 2\laissezVibrer r \clef bass | + + %%% Tempo giusto %%% + \repeat unfold 16 8 + \repeat unfold 8 + \repeat unfold 8 + \clef treble + \t {r si si'} \t {la la' do} | + 2 r4 \clef bass | + r8 lad' \clef treble r mi' \clef bass | + r lad' \clef treble r mi' | R2. + 2\arpeggio \clef bass | + r8 dod' \clef treble \ottava #1 r + \clef bass \ottava #0 r dod' \clef treble \ottava #1 + r 2. \ottava #0 + \tt {la,,,16 mi' si' re mi} \stemUp 4 | + 4 \stemNeutral | + \tt {la'16 sol, la re mi} \stemUp 4 | + s + 8 \t {la,16 re sol} 4 | + R2. + + R1 R2.*3 R2 R2. R1*4 } } { \clef bass @@ -138,9 +201,76 @@ ActeUnSceneDeuxPiano = { \Piano sol''!4 do | si8 sol fa4 si8 do | si sol fa sol si4 | sol4 fa8 do' si4 do8 si | sol fa sol si r do fa, sol | si4 do fa, | si8 sol fa4 si8 fa | sol1~|sol2. \ottava #0 r4 | R2.*2 | - R1*2 |R2.*2 | R1*2 | R2.*2 | R1 r2 2\fermata | + R1*2 |R2.*2 | R1*2 | R2.*2 | R1 r2 2\fermata \clef bass | %%% Récitatif %%% + r4 r8 mi,4. dod2.\laissezVibrer R1 R2. + r4 r8 reb4. sib2.\laissezVibrer R1 R2.*2 + r4 r8 mib4 lab,8~ lab2.\laissezVibrer R2. + 8 r r2 | + r8 \t {sold,16 la si} re8 r | + R2. + sol!1\laissezVibrer R1 R2.*5 R1 + + %%% Duo %%% + \repeat unfold 17 4 + \repeat unfold 7 + \repeat unfold 4 + \repeat unfold 4 r + R2 reb'4 reb lab reb lab fa lab reb lab fa reb | + reb' r8 lab r4 | + si' | + | + | + | + | + \arpeggio \clef treble + 8 + r4 r2 \clef bass | + + %%% Piu vivo %%% + r4 sol,,,16 lab sol sib lab sib lab reb | + sib reb sib mib reb mib reb mi red mi red fad mi fad mi la | + fad la fad si la si la do si do si re | + do re do fa re fa re sol fa sol fa lab | + s1 dod,,2. s1 dod4 dod2 | + s1 dod4 r2 | R2. + s2. R2. s2. R2. s2. R2.*5 + %FIXME: keep this staff alive + r4 r8 r4 | R2. + \pl 1\arpeggio {2\arpeggio fad'} + sol\arpeggio lab\laissezVibrer R1 | + + %%% Tempo giusto %%% + \repeat unfold 8 4 + \repeat unfold 4 + \repeat unfold 4 | + r8 4 8 | + 2 r4 | + 2~ 8 sol' \t {sol sol sol} | + 2~ 8 sol' \t {sol sol sol} | + 8 r r2 | r4 \t {re''8 si dod } | + 2~ 8 sold' \t {sold sold sold} | + 4~ 8 sold' \t {sold sold sold} | + 8 r r | + \pl 2\laissezVibrer + {s4 \stemDown \ttt {mi''16 la re \droite sol si mi} } + \gauche \ttt {si,, mi la re \droite sol mi'} + \gauche \ttt {sol,,,re'la' \droite mi' si' sol'} + \gauche \stemNeutral \pl 2\laissezVibrer + {s4 \clef treble \stemDown + \ttt {re'''16 mi fa sol \droite si mi \gauche \clef bass } } + \ttt {sol,, do re \droite la' si mi} + \gauche \ttt {do,, sol' re' \droite la' mi' si' \gauche} + fa,,,32 la si mi \droite sol la do re \gauche \clef treble \stemNeutral + mi fa sol la \droite si re mi la \gauche \clef bass | + \pl 2\laissezVibrer + {s4 \stemDown \clef treble \ttt {sol''16 re' la' \droite mi' fad si } } + \gauche \ttt {fad,, si mi \droite la re sol } + \gauche \clef bass \ttt {fad,,, mib' sib' \droite fa' do' sol'} + \gauche \clef treble \ttt {fa, si mi \droite \ottava #1 + sib' mib la } \ottava #0 \gauche R2. + R1 R2.*3 R2 R2. R1*4 } } } diff --git a/instruments/reduction.ly b/instruments/reduction.ly old mode 100644 new mode 100755 index 04c8d65..98845f0 --- a/instruments/reduction.ly +++ b/instruments/reduction.ly @@ -1697,9 +1697,9 @@ ActeUnSceneTroisTerMainGauche = { {s2 s2 mib4~ \hideNotes mib} >> r2 | 8 | | - << {\change Staff = droite \stemDown 8 \change Staff = gauche \stemUp } + << {\droite \stemDown 8 \gauche \stemUp } \\{mib,4\laissezVibrer s4 }>> 8 | - << {\change Staff = droite \stemDown 8 \change Staff = gauche \stemUp } + << {\droite \stemDown 8 \gauche \stemUp } \\{mi,,!4\laissezVibrer s4 }>> \clef treble 8 \clef bass | 8 sol do fad, lad si sol sold la fad sib sol lab reb sol, si | @@ -1755,7 +1755,7 @@ ActeUnSceneTroisTerMainGauche = { 2 r4} >> | << { \voiceTwo 2. ~ ~ 4 2 } \\ { \voiceOne r4 4 - r4 s4} >> | + r4 s4} >> | << { \voiceTwo 2. ~ ~ ~ 2 \laissezVibrer } \\ { \voiceOne s2. s2. s2 8 ~ 4 8~2 } >> diff --git a/instruments/saxophone1.ly b/instruments/saxophone1.ly old mode 100644 new mode 100755 diff --git a/instruments/saxophone2.ly b/instruments/saxophone2.ly old mode 100644 new mode 100755 diff --git a/instruments/violon1.ly b/instruments/violon1.ly old mode 100644 new mode 100755 diff --git a/instruments/violon2.ly b/instruments/violon2.ly old mode 100644 new mode 100755 diff --git a/instruments/violon3.ly b/instruments/violon3.ly old mode 100644 new mode 100755 diff --git a/instruments/violoncelle1.ly b/instruments/violoncelle1.ly old mode 100644 new mode 100755 diff --git a/instruments/violoncelle2.ly b/instruments/violoncelle2.ly old mode 100644 new mode 100755 diff --git a/livret_score.ly b/livret_score.ly old mode 100644 new mode 100755 diff --git a/test.ly b/test.ly old mode 100644 new mode 100755 diff --git a/texte/didascalies.ly b/texte/didascalies.ly old mode 100644 new mode 100755 diff --git a/texte/livret.ly b/texte/livret.ly old mode 100644 new mode 100755 diff --git a/texte/personnages.ly b/texte/personnages.ly old mode 100644 new mode 100755 diff --git a/texte/texte.ly b/texte/texte.ly old mode 100644 new mode 100755 diff --git a/vocal_score.ly b/vocal_score.ly old mode 100644 new mode 100755 index f0f09cf..cfab3a5 --- a/vocal_score.ly +++ b/vocal_score.ly @@ -356,8 +356,7 @@ ActeDeuxSceneTrois = { poet = \OperaLivret composer = \OperaPartition tagline = \OperaNotice - } -% + } % \score { \Prologue \header { @@ -371,10 +370,10 @@ ActeDeuxSceneTrois = { } } % \score { - \ActeUnSceneUnBis - \header { - piece = \Separateur - } + \ActeUnSceneUnBis + \header { + piece = \Separateur + } } % \score { \ActeUnSceneDeux @@ -436,5 +435,4 @@ ActeDeuxSceneTrois = { piece = \ActeDeuxSceneTroisTitre } } % -% } diff --git a/voix/baryton1.ly b/voix/baryton1.ly old mode 100644 new mode 100755 diff --git a/voix/baryton2.ly b/voix/baryton2.ly old mode 100644 new mode 100755 diff --git a/voix/contralto.ly b/voix/contralto.ly old mode 100644 new mode 100755 diff --git a/voix/soprano1.ly b/voix/soprano1.ly old mode 100644 new mode 100755 diff --git a/voix/soprano2.ly b/voix/soprano2.ly old mode 100644 new mode 100755 diff --git a/voix/tenor.ly b/voix/tenor.ly old mode 100644 new mode 100755 -- 2.11.4.GIT