From 2a5da9ea901070aa8df2145e4d303b37a46d124a Mon Sep 17 00:00:00 2001 From: Nicolas Sceaux Date: Sat, 6 Sep 2014 10:04:09 +0200 Subject: [PATCH] Les Horaces : corrections et mise en page 1er acte --- Salieri/LesHoraces/AAAouverture/alto.ily | 2 +- Salieri/LesHoraces/AAAouverture/bassi.ily | 2 +- Salieri/LesHoraces/AAAouverture/global.ily | 2 +- Salieri/LesHoraces/AAAouverture/oboi.ily | 2 +- Salieri/LesHoraces/AAAouverture/parts.ily | 8 ++++++-- Salieri/LesHoraces/AAAouverture/score.ily | 2 +- Salieri/LesHoraces/AAAouverture/violini.ily | 6 +++--- Salieri/LesHoraces/AACcamille/parts.ily | 4 ++-- Salieri/LesHoraces/AAIcamille/global.ily | 2 +- Salieri/LesHoraces/AAIcamille/parts.ily | 4 ++-- Salieri/LesHoraces/AAIcamille/score.ily | 2 +- Salieri/LesHoraces/ABAcamilleChoeur/global.ily | 2 +- Salieri/LesHoraces/ABAcamilleChoeur/parts.ily | 4 ++-- Salieri/LesHoraces/ACAhccChoeur/global.ily | 2 +- Salieri/LesHoraces/ACAhccChoeur/parts.ily | 4 ++-- Salieri/LesHoraces/ADFchoeur/score.ily | 17 ++++++++++++----- Salieri/LesHoraces/common.ily | 18 +++++++++++++++++- Salieri/LesHoraces/livret.ily | 2 +- Salieri/LesHoraces/livret1-raw.ily | 2 +- Salieri/LesHoraces/main.ly | 1 + 20 files changed, 58 insertions(+), 30 deletions(-) diff --git a/Salieri/LesHoraces/AAAouverture/alto.ily b/Salieri/LesHoraces/AAAouverture/alto.ily index 539450b2..aa9ded8b 100644 --- a/Salieri/LesHoraces/AAAouverture/alto.ily +++ b/Salieri/LesHoraces/AAAouverture/alto.ily @@ -93,7 +93,7 @@ R1 | r2 r4 lad'\f | si' re''2 dod''8 si' | si'4 lad' r2 | -R1*9 | +R1*9 | \allowPageTurn r2 r4 fad'\p | sol'( mi' si dod') | \repeat unfold 2 \rt#4 re'8 | diff --git a/Salieri/LesHoraces/AAAouverture/bassi.ily b/Salieri/LesHoraces/AAAouverture/bassi.ily index 7c92c5b4..800823c9 100644 --- a/Salieri/LesHoraces/AAAouverture/bassi.ily +++ b/Salieri/LesHoraces/AAAouverture/bassi.ily @@ -180,7 +180,7 @@ mi2 << r2 fad4.\f fad8 | sol2.\mordent fad8 sol | fad2 r | - R1*9 | + R1*9 | \allowPageTurn r2 r4 fad\p | sol( mi si, dod) | \repeat unfold 10 \rt#4 re8 | diff --git a/Salieri/LesHoraces/AAAouverture/global.ily b/Salieri/LesHoraces/AAAouverture/global.ily index 3297a20a..ad23b26c 100644 --- a/Salieri/LesHoraces/AAAouverture/global.ily +++ b/Salieri/LesHoraces/AAAouverture/global.ily @@ -1,3 +1,3 @@ -\key re \major \midiTempo#160 +\tag #'all \key re \major \midiTempo#160 \tempo "Allegro assai" \time 2/2 s1*179 \bar "|." \ No newline at end of file diff --git a/Salieri/LesHoraces/AAAouverture/oboi.ily b/Salieri/LesHoraces/AAAouverture/oboi.ily index f055f7ca..3328794a 100644 --- a/Salieri/LesHoraces/AAAouverture/oboi.ily +++ b/Salieri/LesHoraces/AAAouverture/oboi.ily @@ -180,7 +180,7 @@ R1*5 >> \tag #'oboe2-conducteur R1*25 >> -R1*4 | +R1*4 | \allowPageTurn la'4 la'8 la' la'4 la' | re''1 | R1*4 | diff --git a/Salieri/LesHoraces/AAAouverture/parts.ily b/Salieri/LesHoraces/AAAouverture/parts.ily index dfc919de..ed97982e 100644 --- a/Salieri/LesHoraces/AAAouverture/parts.ily +++ b/Salieri/LesHoraces/AAAouverture/parts.ily @@ -1,6 +1,10 @@ \piecePartSpecs -#`((tromba1 #:instrument , #{ \markup\center-column { Tromba col Corno } #}) - (tromba2 #:instrument , #{ \markup\center-column { Tromba col Corno } #}) +#`((tromba1 #:tag-global () #:instrument "Tromba I en ré") + (tromba2 #:tag-global () #:instrument "Tromba II en ré") + (corno1 #:tag-global () #:instrument "Corno I en ré" + #:tag-notes tromba1 #:notes "trombe") + (corno2 #:tag-global () #:instrument "Corno II en ré" + #:tag-notes tromba1 #:notes "trombe") (oboe1) (oboe2) (fagotto1) diff --git a/Salieri/LesHoraces/AAAouverture/score.ily b/Salieri/LesHoraces/AAAouverture/score.ily index 644cb17e..f453828d 100644 --- a/Salieri/LesHoraces/AAAouverture/score.ily +++ b/Salieri/LesHoraces/AAAouverture/score.ily @@ -7,7 +7,7 @@ \consists "Metronome_mark_engraver" } << \transpose re do \global - \keepWithTag #'tromba1 \includeNotes "trombe" + \keepWithTag #'trombe \includeNotes "trombe" >> \new GrandStaff \with { \oboiInstr } << \new Staff << diff --git a/Salieri/LesHoraces/AAAouverture/violini.ily b/Salieri/LesHoraces/AAAouverture/violini.ily index a4100a01..42be1488 100644 --- a/Salieri/LesHoraces/AAAouverture/violini.ily +++ b/Salieri/LesHoraces/AAAouverture/violini.ily @@ -113,13 +113,13 @@ q2 << r la mi'( dod') | r la la'( fad') | r la la'( mi') | - R1*7 | + R1*7 | \allowPageTurn } \tag #'violino2 { sold'2-\sug\sf( | la' si') | mi'4 r r2 | - R1*19 | + R1*19 | \allowPageTurn } >> r4 la2\f si8 dod' | @@ -181,7 +181,7 @@ R1 | r2 fad'4.\f fad'8 | sol'2.^\markup\italic trille _\mordent fad'8 sol' | fad'2 r | -R1*9 | +R1*9 | \allowPageTurn r2 r4 fad'\p | sol'!( mi' si dod') | re'2. la8 si16 dod' | diff --git a/Salieri/LesHoraces/AACcamille/parts.ily b/Salieri/LesHoraces/AACcamille/parts.ily index d82f7726..bcbc2c3c 100644 --- a/Salieri/LesHoraces/AACcamille/parts.ily +++ b/Salieri/LesHoraces/AACcamille/parts.ily @@ -1,6 +1,6 @@ \piecePartSpecs -#`((corno1) - (corno2) +#`((corno1 #:instrument "Corno I en do") + (corno2 #:instrument "Corno II en do") (clarinetto1 #:notes "clarinetto1") (clarinetto2 #:notes "clarinetto2") (fagotto1) diff --git a/Salieri/LesHoraces/AAIcamille/global.ily b/Salieri/LesHoraces/AAIcamille/global.ily index 113eeee9..e1eba124 100644 --- a/Salieri/LesHoraces/AAIcamille/global.ily +++ b/Salieri/LesHoraces/AAIcamille/global.ily @@ -1,2 +1,2 @@ -\key sib \major \midiTempo#120 +\tag #'all \key sib \major \midiTempo#120 \time 2/2 \tempo "Allegro" s1*79 s8 \tempo "Presto" s2.. s1*3 \ No newline at end of file diff --git a/Salieri/LesHoraces/AAIcamille/parts.ily b/Salieri/LesHoraces/AAIcamille/parts.ily index c23725cf..0fb52a80 100644 --- a/Salieri/LesHoraces/AAIcamille/parts.ily +++ b/Salieri/LesHoraces/AAIcamille/parts.ily @@ -1,6 +1,6 @@ \piecePartSpecs -#`((corno1) - (corno2) +#`((corno1 #:tag-global () #:instrument "Corno I en si♭") + (corno2 #:tag-global () #:instrument "Corno II en si♭") (oboe1) (oboe2) (fagotto1 #:notes "fagotti") diff --git a/Salieri/LesHoraces/AAIcamille/score.ily b/Salieri/LesHoraces/AAIcamille/score.ily index 0b9a55dc..eccad206 100644 --- a/Salieri/LesHoraces/AAIcamille/score.ily +++ b/Salieri/LesHoraces/AAIcamille/score.ily @@ -13,7 +13,7 @@ instrumentName = "Corni en si" shortInstrumentName = "Cor." } << - \transpose sib do \global + \keepWithTag #'() \global \keepWithTag #'corni \includeNotes "corni" >> \new Staff \with { \fagottiInstr } << diff --git a/Salieri/LesHoraces/ABAcamilleChoeur/global.ily b/Salieri/LesHoraces/ABAcamilleChoeur/global.ily index 9825216d..f20e7874 100644 --- a/Salieri/LesHoraces/ABAcamilleChoeur/global.ily +++ b/Salieri/LesHoraces/ABAcamilleChoeur/global.ily @@ -1,4 +1,4 @@ -\key sol \minor \midiTempo#160 +\tag #'all \key sol \minor \midiTempo#160 \time 2/2 s1*32 s2 \bar "||" \midiTempo#80 s2 s1*10 s2. \bar "||" \midiTempo#160 s4 s1*16 \ No newline at end of file diff --git a/Salieri/LesHoraces/ABAcamilleChoeur/parts.ily b/Salieri/LesHoraces/ABAcamilleChoeur/parts.ily index e9a6f0b3..c44955ae 100644 --- a/Salieri/LesHoraces/ABAcamilleChoeur/parts.ily +++ b/Salieri/LesHoraces/ABAcamilleChoeur/parts.ily @@ -1,6 +1,6 @@ \piecePartSpecs -#`((corno1) - (corno2) +#`((corno1 #:tag-global () #:instrument "Corno I en si♭") + (corno2 #:tag-global () #:instrument "Corno II en si♭") (flauto1) (flauto2) (oboe1) diff --git a/Salieri/LesHoraces/ACAhccChoeur/global.ily b/Salieri/LesHoraces/ACAhccChoeur/global.ily index 00bd1c1c..db74dd5d 100644 --- a/Salieri/LesHoraces/ACAhccChoeur/global.ily +++ b/Salieri/LesHoraces/ACAhccChoeur/global.ily @@ -1,2 +1,2 @@ -\key sol \minor \midiTempo#100 +\tag #'all \key sol \minor \midiTempo#100 \time 4/4 s1*12 \tempo "Allegro" s1*6 \bar "|." diff --git a/Salieri/LesHoraces/ACAhccChoeur/parts.ily b/Salieri/LesHoraces/ACAhccChoeur/parts.ily index e9a6f0b3..c44955ae 100644 --- a/Salieri/LesHoraces/ACAhccChoeur/parts.ily +++ b/Salieri/LesHoraces/ACAhccChoeur/parts.ily @@ -1,6 +1,6 @@ \piecePartSpecs -#`((corno1) - (corno2) +#`((corno1 #:tag-global () #:instrument "Corno I en si♭") + (corno2 #:tag-global () #:instrument "Corno II en si♭") (flauto1) (flauto2) (oboe1) diff --git a/Salieri/LesHoraces/ADFchoeur/score.ily b/Salieri/LesHoraces/ADFchoeur/score.ily index d4eef937..6b5a60c8 100644 --- a/Salieri/LesHoraces/ADFchoeur/score.ily +++ b/Salieri/LesHoraces/ADFchoeur/score.ily @@ -1,14 +1,21 @@ \score { \new StaffGroupNoBar \notemode << \new StaffGroupNoBracket << - \new Staff \with { + \new GrandStaff \with { instrumentName = \markup\center-column { Corni en mi♭ } shortInstrumentName = "Cor." - \consists "Metronome_mark_engraver" - \consists "Mark_engraver" } << - \keepWithTag #'() \global - \keepWithTag #'corni \includeNotes "corni" + \new Staff \with { + \consists "Metronome_mark_engraver" + \consists "Mark_engraver" + } << + \keepWithTag #'() \global + \keepWithTag #'corno1 \includeNotes "corni" + >> + \new Staff << + \keepWithTag #'() \global + \keepWithTag #'corno2 \includeNotes "corni" + >> >> \new GrandStaff \with { instrumentName = \markup\center-column { diff --git a/Salieri/LesHoraces/common.ily b/Salieri/LesHoraces/common.ily index 9397405f..2405c43c 100644 --- a/Salieri/LesHoraces/common.ily +++ b/Salieri/LesHoraces/common.ily @@ -1,7 +1,7 @@ \header { copyrightYear = "2014" composer = "Antonio Salieri" - poet = "Nicholas-François Guillard" + poet = "Nicolas-François Guillard" } %% LilyPond options: @@ -187,6 +187,10 @@ bassoInstr = \with { instrumentName = "Basso" shortInstrumentName = "B." } +violoncelliInstr = \with { + instrumentName = "Violoncelli" + shortInstrumentName = "Vc." +} cbInstr = \with { instrumentName = "Contrabasso" shortInstrumentName = "Cb." @@ -255,3 +259,15 @@ intermede = (markup #:act (string-upper-case title))) (add-no-page-break parser) (make-music 'Music 'void #t)) + +annexe = +#(define-music-function (parser location title) (string?) + (add-page-break parser) + (add-toc-item parser 'tocActMarkup title) + (add-even-page-header-text parser (string-upper-case (*opus-title*)) #f) + (*act-title* title) + (add-odd-page-header-text + parser + (format #f "~a" (string-upper-case (*act-title*))) + #f) + (make-music 'Music 'void #t)) diff --git a/Salieri/LesHoraces/livret.ily b/Salieri/LesHoraces/livret.ily index 6cf3111f..76eae5b0 100644 --- a/Salieri/LesHoraces/livret.ily +++ b/Salieri/LesHoraces/livret.ily @@ -249,7 +249,7 @@ \livretPers\line { LE VIEIL HORACE, LE JEUNE HORACE } \livretVerse#8 { O Ciel sur Rome & ma famille } \livretVerse#8 { Verse tes bienfaits en ce jour. } -\Livretdescatt\wordwrap-center{ DIVERTISSEMENT GÉNÉRAL } +\livretDescAtt\wordwrap-center{ DIVERTISSEMENT GÉNÉRAL } \livretFinAct Fin du premier acte \sep \livretAct PREMIER INTERMEDE diff --git a/Salieri/LesHoraces/livret1-raw.ily b/Salieri/LesHoraces/livret1-raw.ily index 84b86862..ea73758b 100644 --- a/Salieri/LesHoraces/livret1-raw.ily +++ b/Salieri/LesHoraces/livret1-raw.ily @@ -247,7 +247,7 @@ \livretPers\line { LE VIEIL HORACE, LE JEUNE HORACE } %# O Ciel sur Rome & ma famille %# Verse tes bienfaits en ce jour. -\Livretdescatt\wordwrap-center{ DIVERTISSEMENT GÉNÉRAL } +\livretDescAtt\wordwrap-center{ DIVERTISSEMENT GÉNÉRAL } \livretFinAct Fin du premier acte \sep \livretAct PREMIER INTERMEDE diff --git a/Salieri/LesHoraces/main.ly b/Salieri/LesHoraces/main.ly index 906bef9f..4a05020a 100644 --- a/Salieri/LesHoraces/main.ly +++ b/Salieri/LesHoraces/main.ly @@ -191,6 +191,7 @@ %% Livret \bookpart { \paper { #(define page-breaking ly:minimal-breaking) } + \annexe "" \include "Salieri/LesHoraces/livret.ily" \pageBreak\markup\null } -- 2.11.4.GIT