From 997aa0083a2094f7d7e57552f22d538e1539616f Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Thu, 29 May 2008 12:53:13 +0200 Subject: [PATCH] Major improvements in code structure I have also updated cleaned up, commented and updated quite a few things since I'm about to contact RMS :-) --- definitions/common.ly | 59 ++++++++- definitions/layout.ly | 105 ++-------------- definitions/mesures.ly | 1 + definitions/paper.ly | 33 +++++ full_score.ly | 3 + instruments/reduction.ly | 3 + license | 26 ++-- texte/texte.ly | 22 ++++ todo | 5 +- vocal_score.ly | 306 ++++++++++++++++++++++++----------------------- voix/baryton1.ly | 3 + voix/baryton2.ly | 3 + voix/contralto.ly | 3 + voix/soprano1.ly | 3 + voix/soprano2.ly | 5 +- voix/tenor.ly | 3 + 16 files changed, 322 insertions(+), 261 deletions(-) create mode 100644 definitions/paper.ly diff --git a/definitions/common.ly b/definitions/common.ly index 74329ac..dbb1441 100644 --- a/definitions/common.ly +++ b/definitions/common.ly @@ -5,6 +5,62 @@ % % %------------------------------------------------------------------% +%%%%%%%%%%%%%%%%%%%%%%%%%% Common Layout %%%%%%%%%%%%%%%%%%%%%%%%%%% + +%% Paper size -----------------------------------------------------% +#(set-default-paper-size "a4" 'landscape) + +%% Page breaking --------------------------------------------------% +#(define page-breaking ly:optimal-breaking) + +%% Staff size -----------------------------------------------------% +#(set-global-staff-size 14) + +%% Time Signatures layouts ----------------------------------------% + +% FIXME: move to layout.ly + +CoolSignatures = { + \override TimeSignature #'break-visibility = #end-of-line-invisible + \override TimeSignature #'font-size = #3 + \override TimeSignature #'break-align-symbol = ##f + \override TimeSignature #'X-offset = #ly:self-alignment-interface::x-aligned-on-self + \override TimeSignature #'self-alignment-X = #0 + \override TimeSignature #'after-line-breaking = #shift-right-at-line-begin +} + +topTimeSig = { + \CoolSignatures + \override TimeSignature #'font-size = #4 +} + +middleTimeSig = { + \CoolSignatures +% \override TimeSignature #'break-visibility = ##(#f #t #f) + \override TimeSig.TimeSignature #'font-size = #3 + \override TimeSig.VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 5) +} + +PianoDynamics = { + \override Dynamics.TimeSignature #'font-size = #1 + \override Dynamics.VerticalAxisGroup #'minimum-Y-extent = #'(-1.5 . 1.5 ) +} + + + +%%%%%%%%%%%%%%%%%%%% Functions initialization %%%%%%%%%%%%%%%%%%%%%% + +#(use-modules (srfi srfi-39)(ice-9 regex)) +#(ly:set-option 'point-and-click #f) + + + + + + + + + %%% -*- Mode: scheme -*- %%% The following functions were provided by @@ -15,9 +71,6 @@ %% Scheme functions -----------------------------------------------% -#(use-modules (srfi srfi-39) - (ice-9 regex)) - #(define *composer* (make-parameter "")) #(define *category* (make-parameter "")) #(define *opus* (make-parameter "")) diff --git a/definitions/layout.ly b/definitions/layout.ly index edbdd62..84d568a 100644 --- a/definitions/layout.ly +++ b/definitions/layout.ly @@ -5,66 +5,11 @@ % % %------------------------------------------------------------------% -#(use-modules (srfi srfi-39)) -#(ly:set-option 'point-and-click #f) - -%%%%%%%%%%%%%%%%%%%%%%%%%%% Paper Layout %%%%%%%%%%%%%%%%%%%%%%%%%%% - -%% Staff size -----------------------------------------------------% -#(set-global-staff-size 14) - -%% Paper size -----------------------------------------------------% -#(set-default-paper-size "a4" 'landscape) - -%% Page breaking --------------------------------------------------% -#(define page-breaking ly:optimal-breaking) -pageBreakingVariables = \paper { - page-limit-inter-system-space = ##t - page-limit-inter-system-space-factor = 1.4 -} - -%% Horizontal margins ---------------------------------------------% - -horizontalMarginsVariables = \paper { - left-margin = #20 - right-margin = #20 - line-width = #(- paper-width (* 40 mm)) -} - -%% Vertical margins -----------------------------------------------% - -verticalMarginsVariables = \paper { - page-top-space = #(* 5 mm) - between-system-space = 10 \mm - between-system-padding = 4 \mm - before-title-space = 10 \mm - between-title-space = 2 \mm - after-title-space = 5 \mm - ragged-bottom = ##f - ragged-last-bottom = ##f - bottom-margin = #20 -} - %%%%%%%%%%%%%%%%%%%%%%%%%%% Score Layout %%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Common Layout --------------------------------------------------% - -indentVariables = \layout { - #(define (compute-indent amount) - (let ((indent (* amount mm))) - (if (or (eqv? #t (ly:get-option 'ancient-style)) - (eqv? #t (ly:get-option 'non-incipit))) - (begin ;(format #t "~% indent: ~a" indent) - indent) - (+ indent (* incipit-width mm))))) - - smallindent = #(compute-indent 10) - noindent = #(compute-indent 0) - largeindent = #(compute-indent 25) - indent = \smallindent -} - -spacingVariables = \layout { +includeLayout = \layout { +%% Spacing Variables ----------------------------------------------% + indent = 2.0\cm \context { \Staff \remove "Axis_group_engraver" @@ -77,9 +22,8 @@ spacingVariables = \layout { \Score \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 5) } -} -autoRulesVariables = \layout { +%% Notation Rules -------------------------------------------------% \context { \Score \override TimeSignature #'style = #'() @@ -91,9 +35,8 @@ autoRulesVariables = \layout { autoAccidentals = #modern-style ignoreMelismata = ##t } -} -textVariables = \layout { +%% Text inclusion -------------------------------------------------% \context { \type "Engraver_group" \name "TopLine" @@ -119,9 +62,8 @@ textVariables = \layout { \override MetronomeMark #'side-axis = #Y \override MetronomeMark #'direction = #DOWN } -} -miscVariables = \layout { +%% Look and feel --------------------------------------------------% \context { \Score \override Accidental #'minimum-X-extent = #'(-0.2 . 0 ) @@ -131,38 +73,8 @@ miscVariables = \layout { \override LyricText #'self-alignment-X = #-0.5 markFormatter = #format-mark-box-letters } -} - -%% Time Signatures layouts ----------------------------------------% -CoolSignatures = { - \override TimeSignature #'break-visibility = #end-of-line-invisible - \override TimeSignature #'font-size = #3 - \override TimeSignature #'break-align-symbol = ##f - \override TimeSignature #'X-offset = #ly:self-alignment-interface::x-aligned-on-self - \override TimeSignature #'self-alignment-X = #0 - \override TimeSignature #'after-line-breaking = #shift-right-at-line-begin -} - -topTimeSig = { - \CoolSignatures - \override TimeSignature #'font-size = #4 -} - -middleTimeSig = { - \CoolSignatures -% \override TimeSignature #'break-visibility = ##(#f #t #f) - \override TimeSig.TimeSignature #'font-size = #3 - \override TimeSig.VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 5) -} - -PianoDynamics = { - \override Dynamics.TimeSignature #'font-size = #1 - \override Dynamics.VerticalAxisGroup #'minimum-Y-extent = #'(-1.5 . 1.5 ) -} - %% Vocal score layout --------------------------------------------% -vocalScoreVariables = \layout { \context { \Staff \type "Engraver_group" @@ -202,10 +114,13 @@ vocalScoreVariables = \layout { \accepts "StaffUp" \accepts "Dynamics" \accepts "StaffDown" - connectArpeggios = ##t % to avoid collisions with pianoDynamicss + connectArpeggios = ##t % to avoid collisions with pianoDynamics } \context { \Score \override RehearsalMark #'font-size = #4 \override TimeSignature #'X-extent = #'(0 . 2) + } + +%%-----------------------------------------------------------------% } diff --git a/definitions/mesures.ly b/definitions/mesures.ly index effb908..c2c68d9 100644 --- a/definitions/mesures.ly +++ b/definitions/mesures.ly @@ -5,6 +5,7 @@ % % %------------------------------------------------------------------% +% FIXME : find this file a relevant place. PrologueMesures = { %%% Introduction %%% diff --git a/definitions/paper.ly b/definitions/paper.ly new file mode 100644 index 0000000..43f0311 --- /dev/null +++ b/definitions/paper.ly @@ -0,0 +1,33 @@ +%------------------------------------------------------------------% +% Opéra Libre -- paper.ly % +% % +% (c) Valentin Villenave, 2008 % +% % +%------------------------------------------------------------------% + +%%%%%%%%%%%%%%%%%%%%%%%%%%% Paper Layout %%%%%%%%%%%%%%%%%%%%%%%%%%% + +includePaper = \paper { +%% Page variables -------------------------------------------------% + page-limit-inter-system-space = ##t + page-limit-inter-system-space-factor = 1.4 + +%% Horizontal margins ---------------------------------------------% + left-margin = #20 + right-margin = #20 + line-width = #(- paper-width (* 40 mm)) + +%% Vertical margins -----------------------------------------------% + page-top-space = #(* 5 mm) + between-system-space = 10 \mm + between-system-padding = 4 \mm + before-title-space = 10 \mm + between-title-space = 2 \mm + after-title-space = 5 \mm + ragged-bottom = ##f + ragged-last-bottom = ##f + bottom-margin = #20 + +%%-----------------------------------------------------------------% +} + diff --git a/full_score.ly b/full_score.ly index cb051f6..20af581 100644 --- a/full_score.ly +++ b/full_score.ly @@ -5,6 +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" \include "./texte/decoupage.ly" diff --git a/instruments/reduction.ly b/instruments/reduction.ly index df44dd0..0895e0c 100644 --- a/instruments/reduction.ly +++ b/instruments/reduction.ly @@ -2043,6 +2043,9 @@ EntracteMainGauche = { } } +EntracteNuances = { +} + ActeDeuxSceneUnMainDroite = { \relative{ #(set-octavation 1) diff --git a/license b/license index 2f69006..0098f94 100644 --- a/license +++ b/license @@ -1,17 +1,15 @@ - If you want to redistribute Opéra Libre, you must comply with the GNU -General Public License (reproduced below). This license applies to -Opéra Libre with the following exceptions: - -- Non-free public performances can be allowed by special authorization -of the author. - -- Recordings of the score can be released under another license, by special -authorization of the author. - -- Some of the lyrics, text indications or their translations can be released -using a different license, by special authorization of the author. - - + If you want to redistribute Opéra Libre as a score, you must comply +with the GNU General Public License (reproduced below) v3 or later. + + If you want to perform and/or record and/or distribute any recording +based on this score, you must comply with the Creative Commons +Attribution-Noncommercial-Share Alike license, to be read on +http://creativecommons.org/licenses/by-nc-sa/3.0/ + + Special authorizations can be given by at least one of the authors. + + + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/texte/texte.ly b/texte/texte.ly index 687ffc6..20959ac 100644 --- a/texte/texte.ly +++ b/texte/texte.ly @@ -630,6 +630,28 @@ ActeUnSceneQuatreContraltoTexte = \lyricmode { %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% ENTR'ACTE % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +EntracteSopranoUnTexte = \lyricmode { +} + +EntracteSopranoDeuxTexte = \lyricmode { +} + +EntracteContraltoTexte = \lyricmode { +} + +EntracteTenorTexte = \lyricmode { +} + +EntracteBarytonUnTexte = \lyricmode { +} + +EntracteBarytonDeuxTexte = \lyricmode { +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ACTE II % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/todo b/todo index 51d3642..134faab 100644 --- a/todo +++ b/todo @@ -7,13 +7,16 @@ ALREADY ACHIEVED: CURRENTLY PROCESSED: - Complete Vocal score (with piano accompaniment in instruments/reduction.ly) -- Add dynamics and articulation marks +- Add dynamics, articulation marks, text indication everywhere +- improve coding style +- implement Nicolas Sceaux's framework NOT ACHIEVED YET: - Orchestration (full_score.ly) - Layout improvements (graphics, etc) - Interludes +- automatize variable inclusions using a Scheme function LONG-TERM TODO LIST: diff --git a/vocal_score.ly b/vocal_score.ly index a4940aa..5b6e866 100644 --- a/vocal_score.ly +++ b/vocal_score.ly @@ -5,14 +5,28 @@ % % %------------------------------------------------------------------% +%%% 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... + +\version "2.11.47" +%% This opéra has been coded on over two years, from version 2.9 to +%% 2.12 -- some inconsistencies may remain through the code. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%% Inclusions %%%%%%%%%%%%%%%%%%%%%%%%%%%% + \include "italiano.ly" +\include "./definitions/common.ly" \include "./definitions/functions.ly" +\include "./definitions/paper.ly" +\include "./definitions/layout.ly" +\include "./definitions/markup.ly" + \include "./texte/decoupage.ly" \include "./texte/personnages.ly" \include "./definitions/structure.ly" \include "./texte/didascalies.ly" -\include "./definitions/layout.ly" \include "./definitions/mesures.ly" \include "./texte/texte.ly" @@ -26,21 +40,18 @@ \include "./instruments/reduction.ly" -\layout { - \indentVariables - \spacingVariables - \autoRulesVariables - \textVariables - \miscVariables - \vocalScoreVariables -} +%%%%%%%%%%%%%%%%%% Paper and layout declarations %%%%%%%%%%%%%%%%%%% \paper { - \pageBreakingVariables - \horizontalMarginsVariables - \verticalMarginsVariables + \includePaper } +\layout { + \includeLayout +} + +%%%%%%%%%%%%%%%%%% Scene-by-scene music inclusion %%%%%%%%%%%%%%%%%% + Prologue = { << \new TopLine \PrologueMesures @@ -203,30 +214,32 @@ ActeUnSceneQuatre = { >> } -%{ Entracte = { -<< -\new ChoirStaff - << - \new Staff \new Voice = "sopranoUn" \EntracteSopranoUn - \new Lyrics \lyricsto "sopranoUn" { \EntracteSopranoUnTexte } - \new Staff \new Voice = "sopranoDeux" \EntracteSopranoDeux - \new Lyrics \lyricsto "sopranoDeux" { \EntracteSopranoDeuxTexte } - \new Staff \new Voice = "alto" \EntracteAlto - \new Lyrics \lyricsto "alto" { \EntracteAltoTexte } - \new Staff \new Voice = "tenor" \EntracteTenor - \new Lyrics \lyricsto "tenor" { \EntracteTenorTexte } - \new Staff \new Voice = "barytonUn" \EntracteBarytonUn - \new Lyrics \lyricsto "barytonUn" { \EntracteBarytonUnTexte } - \new Staff \new Voice = "barytonDeux" \EntracteBarytonDeux - \new Lyrics \lyricsto "barytonDeux" { \EntracteBarytonDeuxTexte } - >> -\new PianoStaff { \Accompagnement << - \new StaffUp = "droite" \EntracteMainDroite - \new Dynamics << \PianoDynamics \EntracteMesures >> - \new StaffDown = "gauche" \EntracteMainGauche - >> } ->> -} %} +Entracte = { + << + \new ChoirStaff + << + \new Staff \new Voice = "sopranoUn" \EntracteSopranoUn + \new Lyrics \lyricsto "sopranoUn" { \EntracteSopranoUnTexte } + \new Staff \new Voice = "sopranoDeux" \EntracteSopranoDeux + \new Lyrics \lyricsto "sopranoDeux" { \EntracteSopranoDeuxTexte } + \new Staff \new Voice = "alto" \EntracteContralto + \new Lyrics \lyricsto "alto" { \EntracteContraltoTexte } + \new Staff \new Voice = "tenor" \EntracteTenor + \new Lyrics \lyricsto "tenor" { \EntracteTenorTexte } + \new Staff \new Voice = "barytonUn" \EntracteBarytonUn + \new Lyrics \lyricsto "barytonUn" { \EntracteBarytonUnTexte } + \new Staff \new Voice = "barytonDeux" \EntracteBarytonDeux + \new Lyrics \lyricsto "barytonDeux" { \EntracteBarytonDeuxTexte } + >> + \new PianoStaff { \Accompagnement + << + \new StaffUp = "droite" \EntracteMainDroite + \new Dynamics << \PianoDynamics \EntracteNuances >> + \new StaffDown = "gauche" \EntracteMainGauche + >> + } + >> +} ActeDeuxSceneUn = { << @@ -271,56 +284,62 @@ ActeDeuxSceneUnBis = { } ActeDeuxSceneDeux = { -<< -\new TopLine \ActeDeuxSceneDeuxMesures -\new ChoirStaff - << - \new Staff \new Voice = "sopranoUn" \ActeDeuxSceneDeuxSopranoUn - \new Lyrics \lyricsto "sopranoUn" { \ActeDeuxSceneDeuxSopranoUnTexte } - \new Staff \new Voice = "sopranoDeux" \ActeDeuxSceneDeuxSopranoDeux - \new Lyrics \lyricsto "sopranoDeux" { \ActeDeuxSceneDeuxSopranoDeuxTexte } - \new Staff \new Voice = "contralto" \ActeDeuxSceneDeuxContralto - \new Lyrics \lyricsto "contralto" { \ActeDeuxSceneDeuxContraltoTexte } - \new Staff \new Voice = "tenor" \ActeDeuxSceneDeuxTenor - \new Lyrics \lyricsto "tenor" { \ActeDeuxSceneDeuxTenorTexte } - \new Staff \new Voice = "barytonUn" \ActeDeuxSceneDeuxBarytonUn - \new Lyrics \lyricsto "barytonUn" { \ActeDeuxSceneDeuxBarytonUnTexte } - \new Staff \new Voice = "barytonDeux" \ActeDeuxSceneDeuxBarytonDeux - \new Lyrics \lyricsto "barytonDeux" { \ActeDeuxSceneDeuxBarytonDeuxTexte } - >> - \new PianoStaff { \Accompagnement << - \new StaffUp = "droite" \ActeDeuxSceneDeuxMainDroite - \new Dynamics << \PianoDynamics \ActeDeuxSceneDeuxMesures >> - \new StaffDown = "gauche" \ActeDeuxSceneDeuxMainGauche - >> } ->> + << + \new TopLine \ActeDeuxSceneDeuxMesures + \new ChoirStaff + << + \new Staff \new Voice = "sopranoUn" \ActeDeuxSceneDeuxSopranoUn + \new Lyrics \lyricsto "sopranoUn" { \ActeDeuxSceneDeuxSopranoUnTexte } + \new Staff \new Voice = "sopranoDeux" \ActeDeuxSceneDeuxSopranoDeux + \new Lyrics \lyricsto "sopranoDeux" { \ActeDeuxSceneDeuxSopranoDeuxTexte } + \new Staff \new Voice = "contralto" \ActeDeuxSceneDeuxContralto + \new Lyrics \lyricsto "contralto" { \ActeDeuxSceneDeuxContraltoTexte } + \new Staff \new Voice = "tenor" \ActeDeuxSceneDeuxTenor + \new Lyrics \lyricsto "tenor" { \ActeDeuxSceneDeuxTenorTexte } + \new Staff \new Voice = "barytonUn" \ActeDeuxSceneDeuxBarytonUn + \new Lyrics \lyricsto "barytonUn" { \ActeDeuxSceneDeuxBarytonUnTexte } + \new Staff \new Voice = "barytonDeux" \ActeDeuxSceneDeuxBarytonDeux + \new Lyrics \lyricsto "barytonDeux" { \ActeDeuxSceneDeuxBarytonDeuxTexte } + >> + \new PianoStaff { \Accompagnement + << + \new StaffUp = "droite" \ActeDeuxSceneDeuxMainDroite + \new Dynamics << \PianoDynamics \ActeDeuxSceneDeuxMesures >> + \new StaffDown = "gauche" \ActeDeuxSceneDeuxMainGauche + >> + } + >> } ActeDeuxSceneTrois = { -<< -\new ChoirStaff - << - \new Staff \new Voice = "sopranoUn" \ActeDeuxSceneTroisSopranoUn - \new Lyrics \lyricsto "sopranoUn" { \ActeDeuxSceneTroisSopranoUnTexte } - \new Staff \new Voice = "sopranoDeux" \ActeDeuxSceneTroisSopranoDeux - \new Lyrics \lyricsto "sopranoDeux" { \ActeDeuxSceneTroisSopranoDeuxTexte } - \new Staff \new Voice = "contralto" \ActeDeuxSceneTroisContralto - \new Lyrics \lyricsto "contralto" { \ActeDeuxSceneTroisContraltoTexte } - \new Staff \new Voice = "tenor" \ActeDeuxSceneTroisTenor - \new Lyrics \lyricsto "tenor" { \ActeDeuxSceneTroisTenorTexte } - \new Staff \new Voice = "barytonUn" \ActeDeuxSceneTroisBarytonUn - \new Lyrics \lyricsto "barytonUn" { \ActeDeuxSceneTroisBarytonUnTexte } - \new Staff \new Voice = "barytonDeux" \ActeDeuxSceneTroisBarytonDeux - \new Lyrics \lyricsto "barytonDeux" { \ActeDeuxSceneTroisBarytonDeuxTexte } - >> - \new PianoStaff { \Accompagnement << - \new StaffUp = "droite" \ActeDeuxSceneTroisMainDroite - \new Dynamics << \PianoDynamics \ActeDeuxSceneTroisMesures >> - \new StaffDown = "gauche" \ActeDeuxSceneTroisMainGauche - >> } ->> + << + \new ChoirStaff + << + \new Staff \new Voice = "sopranoUn" \ActeDeuxSceneTroisSopranoUn + \new Lyrics \lyricsto "sopranoUn" { \ActeDeuxSceneTroisSopranoUnTexte } + \new Staff \new Voice = "sopranoDeux" \ActeDeuxSceneTroisSopranoDeux + \new Lyrics \lyricsto "sopranoDeux" { \ActeDeuxSceneTroisSopranoDeuxTexte } + \new Staff \new Voice = "contralto" \ActeDeuxSceneTroisContralto + \new Lyrics \lyricsto "contralto" { \ActeDeuxSceneTroisContraltoTexte } + \new Staff \new Voice = "tenor" \ActeDeuxSceneTroisTenor + \new Lyrics \lyricsto "tenor" { \ActeDeuxSceneTroisTenorTexte } + \new Staff \new Voice = "barytonUn" \ActeDeuxSceneTroisBarytonUn + \new Lyrics \lyricsto "barytonUn" { \ActeDeuxSceneTroisBarytonUnTexte } + \new Staff \new Voice = "barytonDeux" \ActeDeuxSceneTroisBarytonDeux + \new Lyrics \lyricsto "barytonDeux" { \ActeDeuxSceneTroisBarytonDeuxTexte } + >> + \new PianoStaff { \Accompagnement + << + \new StaffUp = "droite" \ActeDeuxSceneTroisMainDroite + \new Dynamics << \PianoDynamics \ActeDeuxSceneTroisMesures >> + \new StaffDown = "gauche" \ActeDeuxSceneTroisMainGauche + >> + } + >> } +%%%%%%%%%%%%%%%%%%%%%%%%% The actual score %%%%%%%%%%%%%%%%%%%%%%%%% + \book { \header { title = \OperaTitre @@ -329,90 +348,83 @@ ActeDeuxSceneTrois = { composer = \OperaPartition tagline = \OperaNotice } - -%{\score { + + \score { \Prologue \header { piece = \PrologueTitre } -}%} -%{\score { + } + \score { \ActeUnSceneUn \header { piece = \ActeUnSceneUnTitre } -}%} -\score { - \ActeUnSceneUnBis - \header { - piece = \Separateur + } + \score { + \ActeUnSceneUnBis + \header { + piece = \Separateur + } } -}%} -%{\score { - \ActeUnSceneDeux - \header { - piece = \ActeUnSceneDeuxTitre + \score { + \ActeUnSceneDeux + \header { + piece = \ActeUnSceneDeuxTitre } -}%} -%{\score { - \ActeUnSceneTrois - \header { - piece = \ActeUnSceneTroisTitre + } + \score { + \ActeUnSceneTrois + \header { + piece = \ActeUnSceneTroisTitre } -}%} -%{\score { - \ActeUnSceneTroisBis - \header { - piece = \Separateur + } + \score { + \ActeUnSceneTroisBis + \header { + piece = \Separateur } -}%} -%{\score { - \ActeUnSceneTroisTer - \header { - piece = \Separateur + } + \score { + \ActeUnSceneTroisTer + \header { + piece = \Separateur } -}%} -%{\score { - \ActeUnSceneQuatre - \header { - piece = \ActeUnSceneQuatreTitre + } + \score { + \ActeUnSceneQuatre + \header { + piece = \ActeUnSceneQuatreTitre } -}%} -%{\score { - \Entracte - \header { - piece = \EntracteTitre + } + \score { + \Entracte + \header { + piece = \EntracteTitre } -}%} -%{\score { - \ActeDeuxSceneUn - \header { - piece = \ActeDeuxSceneUnTitre + } + \score { + \ActeDeuxSceneUn + \header { + piece = \ActeDeuxSceneUnTitre } -}%} -%{\score { - \ActeDeuxSceneUnBis - \header { + } + \score { + \ActeDeuxSceneUnBis + \header { piece = \Separateur } -}%} -%{\score { - \ActeDeuxSceneDeux - \header { - tableau = \ActeDeuxSceneDeuxTitre - indication = \ActeDeuxSceneDeuxAAA - piece = \markup { \column { - \fill-line { \fromproperty #'header:tableau } - \vspace #4 - %\init-did { \fromproperty #'header:indication } - } - } } -}%} -%{\score { - \ActeDeuxSceneTrois - \header { - piece = \ActeDeuxSceneTroisTitre + \score { + \ActeDeuxSceneDeux + \header { + piece = \ActeDeuxSceneDeuxTitre + } + } + \score { + \ActeDeuxSceneTrois + \header { + piece = \ActeDeuxSceneTroisTitre + } } -}%} } diff --git a/voix/baryton1.ly b/voix/baryton1.ly index ff87270..3125268 100644 --- a/voix/baryton1.ly +++ b/voix/baryton1.ly @@ -205,6 +205,9 @@ ActeUnSceneQuatreBarytonUn = { \BarytonUn } } +EntracteBarytonUn = { +} + ActeDeuxSceneUnBisBarytonUn = { \BarytonUn \relative { R1 R2. R2 R1*5/4*17 diff --git a/voix/baryton2.ly b/voix/baryton2.ly index 89a8a71..248ebb9 100644 --- a/voix/baryton2.ly +++ b/voix/baryton2.ly @@ -255,6 +255,9 @@ ActeUnSceneQuatreBarytonDeux = { \BarytonDeux } } +EntracteBarytonDeux = { +} + ActeDeuxSceneUnBisBarytonDeux = { \BarytonDeux \relative { R1 R2. R2 R1*5/4*11 diff --git a/voix/contralto.ly b/voix/contralto.ly index 526bd47..48152bc 100644 --- a/voix/contralto.ly +++ b/voix/contralto.ly @@ -60,6 +60,9 @@ ActeUnSceneQuatreContralto = { \Contralto } } +EntracteContralto = { +} + ActeDeuxSceneUnContralto= { \Contralto \relative { R2.*4 R2 R2.*2 R2 R2.*3 R2 | diff --git a/voix/soprano1.ly b/voix/soprano1.ly index 79322c2..30715fe 100644 --- a/voix/soprano1.ly +++ b/voix/soprano1.ly @@ -99,6 +99,9 @@ ActeUnSceneTroisTerSopranoUn= { \SopranoUn } } +EntracteSopranoUn = { +} + ActeDeuxSceneUnSopranoUn= { \SopranoUn \relative { R2.*4 R2 R2.*2 R2 R2.*3 R2 | R2. R2 R2.*2 diff --git a/voix/soprano2.ly b/voix/soprano2.ly index 3312a42..f2d1f06 100644 --- a/voix/soprano2.ly +++ b/voix/soprano2.ly @@ -111,7 +111,10 @@ ActeUnSceneQuatreSopranoDeux = { \SopranoDeux } } -ActeDeuxSceneUnSopranoDeux= { \SopranoDeux +EntracteSopranoDeux = { +} + +ActeDeuxSceneUnSopranoDeux = { \SopranoDeux \relative { R2.*4 R2 R2.*2 R2 R2.*3 R2 | R2. R2 R2.*2 R2 R2.*3 R2 | R2. R2 R2.*2 R2 R2.*3 R2 | r4 sold'8 sold sold4 | sol!8 si4 si8 sib sib | re4 r r8 re re re | diff --git a/voix/tenor.ly b/voix/tenor.ly index bae7ec3..babad01 100644 --- a/voix/tenor.ly +++ b/voix/tenor.ly @@ -134,6 +134,9 @@ ActeUnSceneQuatreTenor = { \Tenor } } +EntracteTenor = { +} + ActeDeuxSceneUnBisTenor = { \Tenor \relative { R1 R2. R2 R1*5/4*15 -- 2.11.4.GIT