Add cues; final layout; octavation, clefs, etc.

Franck_PanisAngelicus_Instrument_O.ly

@@ -9,7 +9,7 @@
 }
 
 \layout {
-  system-count = #7
+  system-count = #6
   between-system-padding =#0
   between-system-space =#0
 }

Franck_PanisAngelicus_Instrument_SSolo.ly → Franck_PanisAngelicus_Instrument_TSolo.ly

@@ -2,11 +2,11 @@
 \include "Franck_PanisAngelicus_Settings_Vocal.ily"
 
 \header {
-  instrument = \SSoloInstrumentName
-  scorenumber = \markup{\scoreNumber \SSoloNumber}
+  instrument = \TSoloInstrumentName
+  scorenumber = \markup{\scoreNumber \TSoloNumber}
 }
 \paper {
   ragged-bottom = ##t
 }
-\createScore #"PanisAngelicus" #'("SSolo")
+\createScore #"PanisAngelicus" #'("TSolo")
 

Franck_PanisAngelicus_Instrument_Vc.ly

@@ -9,5 +9,42 @@
   ragged-last-bottom = ##t
 }
 
+VcClef = \clef "tenor"
+
+
+  \context Lyrics = "OmnesDeSabaVenientSCueLyricsAbove" \lyricsto "cue" {
+    \small \override LyricText #'font-shape = #'italic 
+    \skip4 an -- nun -- ti -- an -- tes, lau -- dem Do -- mi -- ni.
+  }
+
+
+
+PanisAngelicusVcStaff = <<
+  \new Staff = "PanisAngelicusVcStaff" \with {
+           instrumentName = \VcInstrumentName
+           shortInstrumentName = \VcShortInstrumentName
+  } <<
+    \new Voice = "PanisAngelicusVcVoice" {
+      \PanisAngelicusSettings 
+      \VcClef
+      \PanisAngelicusKey 
+      \PanisAngelicusTimeSignature 
+      \PanisAngelicusVcMusic
+    }
+  >>
+%   \new Lyrics = "OmnesDeSabaVenientSCueLyricsAbove" \with { alignAboveContext = #"OmnesDeSabaVenientSSoloStaff" } { }
+%   \new Lyrics = "PanisAngelicusCueLyricsAbove" \with { alignAboveContext = #"PanisAngelicusVcStaff" } { }
+%   \context Lyrics = "OmnesDeSabaVenientSSoloLyricsAbove" \lyricsto "OmnesDeSabaVenientSSoloVoice" \OmnesDeSabaVenientSSoloLyricsAbove
+%   \context Lyrics = "OmnesDeSabaVenientSSoloLyricsBelow" \lyricsto "OmnesDeSabaVenientSSoloVoice" \OmnesDeSabaVenientSSoloLyrics
+%   \context Lyrics = "OmnesDeSabaVenientSLyrics" \lyricsto "OmnesDeSabaVenientSVoice" \OmnesDeSabaVenientSLyrics
+
+  \new Lyrics = "PanisAngelicusCueLyricsAbove" % \lyricsto "cue" 
+  \lyricmode {
+    \set associatedVoice = #"cue"
+    \small \override LyricText #'font-shape = #'italic 
+    \skip1*36 Pa2 -- nis4  an-4  % -- ge8. -- li16 -- cus4
+  }
+>>
+
 \createScore #"PanisAngelicus" #'("Vc")
 

Franck_PanisAngelicus_Music_PanisAngelicus.ily

@@ -16,8 +16,10 @@ PanisAngelicusSettings = \notemode {
 }
 % VcClef = \clef "tenor" 
 
+\addQuote #"TSoloI" { \repeat unfold 33 c'1 }
+
 PanisAngelicusVcMusic = \relative c' {
-  a2_"Dolce. Molto cantabile." a4 gis | % 2
+  a2_\markup{\italic "Dolce. Molto cantabile."} a4 gis | % 2
   gis8.[ fis16] fis2 fis'4 | % 3
   e4 d8[ cis] h4 cis | % 4
   a2( gis8[) cis( d h]) | % 5
@@ -29,7 +31,8 @@ PanisAngelicusVcMusic = \relative c' {
   << {h2~ } {s4 s\dim} >> h8[ cis d fis,] | % 11
   a4 gis8[\pocorall fis] e4 a8[ cis] | % 12
   h4. a8 a4\! r | % 13
-  R1*25 | % 38
+  R1*24 | % 37
+  \namedCueDuring #"TSolo" #UP #"Solo" #"" { R1 } | % 38
   cis2\p\cantabile cis4 h | % 39
   h8.[ a16] a4 r2 | \barNumberCheck #40
   << cis2 {s4 s\cresc} >> cis4 h | % 41
@@ -48,7 +51,7 @@ PanisAngelicusVcMusic = \relative c' {
   fis4\ff fis2 fis4 | % 54
   fis2~  fis8[ d cis h] | % 55
   e1~\dim | % 56
-  e2 d4.\rall cis8 | % 57
+  e2\! d4.\rall cis8 | % 57
   cis4\atempo a( e' d)~ | % 58
   d h8[ d] cis4 h8[ a] | % 59
   h2~ h4.\rall a8 | \barNumberCheck #60
@@ -57,8 +60,9 @@ PanisAngelicusVcMusic = \relative c' {
 }
 \addQuote "PanisAngelicusVcMusic" { \PanisAngelicusVcMusic }
 
-PanisAngelicusSSoloMusic = \relative c'' {
-  R1*12 | % 13
+PanisAngelicusTSoloMusic = \relative c' {
+  R1*9 | \barNumberCheck #10
+  \namedCueDuring #"PanisAngelicusVcMusic" #DOWN #"Vc." #"" { R1*3 } | % 13
   cis2 cis4 h | % 14
   h8. a16 a4 r2 | % 15
   cis2 cis4 h | % 16
@@ -79,7 +83,12 @@ PanisAngelicusSSoloMusic = \relative c'' {
   d'4.(\cresc h8) a4 r | % 31
   dis4\f e8 fis cis4. dis8 | % 32
   e2 r2 | % 33
-  R1*4 | % 37
+  R1*2 | % 35
+  << 
+    { \tag #'cued \voiceTwo R1*2 \tag #'cued \oneVoice }
+    \tag #'cued \context CueVoice="cuesI" { \cueText "Org." \voiceOne fis4 gis8[ a] gis4 fis | e2. d4 }
+    \tag #'cued \context CueVoice="cuesII" { \voiceTwo a1 | gis4 a ais h}
+  >>
   cis2\p cis4 h | % 38
   h8. a16 a4 r2 | % 39
   cis2 cis4 h | \barNumberCheck #40
@@ -98,14 +107,14 @@ PanisAngelicusSSoloMusic = \relative c'' {
   a2\! r | % 53
   fis'2~\ff fis8[ d] cis[ h] | % 54
   e4.( cis8) d4 d~  |
-  d h8[\dim d] cis4 h8 a |
+  d h8[\dim d] cis4 h8 a\! |
   h2~^\rall h4. a8 |
   a2 r |
   R1*4 \bar"|."
 }
-\addQuote "PanisAngelicusSSoloMusic" { \PanisAngelicusSSoloMusic }
+\addQuote "TSolo" { \dynamicUp \removeWithTag #'cued \PanisAngelicusTSoloMusic }
 
-PanisAngelicusSSoloLyrics = \lyricmode {
+PanisAngelicusTSoloLyrics = \lyricmode {
   Pa -- nis an -- ge -- li -- cus 
   Fit pa -- nis ho -- mi -- num;
   Dat pa -- nis coe -- li -- cus Fi -- gu -- ris ter -- mi -- num:
@@ -252,7 +261,7 @@ PanisAngelicusODynMusic = \relative c' {
   s2 s\cresc | % 9
   s1 | \barNumberCheck #10
   s2\dim s | % 11
-  s4 s4_\pocorall s2 | % 12
+  s4\! s4_\pocorall s2 | % 12
   s1 | % 13
   s1\pp | % 14
   s1*12 | % 26

Franck_PanisAngelicus_Score_Full.ly

@@ -8,5 +8,7 @@
   scorenumber = \markup{\scoreNumber \FullScoreNumber}
 }
 
-\createScore #"PanisAngelicus" #'("FullScore")
+VcClef = \clef "tenor"
+
+\createNoCuesScore #"PanisAngelicus" #'("FullScore")
 

Franck_PanisAngelicus_Score_FullTransposedLow.ly

@@ -5,12 +5,22 @@
 
 \header {
   scoretype = \FullScoreTitle
-  scorenumber = \markup{\concat {\scoreNumber \FullScoreNumber b}}
-  subtitle = "Für tiefe Stimme / For low voice, Original: A-Dur / a major"
+  scorenumber = \markup{\concat {\scoreNumber \FullScoreNumber c}}
+  subtitle = "Tiefe Stimme / Low voice, Original: A-Dur / a major"
 }
 
-PanisAngelicusTransposeFrom = f
+PanisAngelicusTransposeFrom = d
 PanisAngelicusTransposeTo = a
+% PanisAngelicusSSoloTransposeFrom = d
+% PanisAngelicusSSoloTransposeTo = a
 
-\createScore #"PanisAngelicus" #'("FullScore")
+% PanisAngelicusOISettings = { \ottava #-1 }
+% PanisAngelicusOIaSettings = { \ottava #-1 }
+% PanisAngelicusOIbSettings = { \ottava #-1 }
+PanisAngelicusOIaClef = \clef "treble_8"
+PanisAngelicusOIbClef = \clef "treble_8"
+
+SSoloClef = \clef "bass"
+VcClef = { \clef "bass" \dynamicUp}
+\createNoCuesScore #"PanisAngelicus" #'("FullScore")
 

Franck_PanisAngelicus_Score_FullTransposedMedium.ly

@@ -5,12 +5,12 @@
 
 \header {
   scoretype = \FullScoreTitle
-  scorenumber = \markup{\concat {\scoreNumber \FullScoreNumber a}}
-  subtitle = "Für mittlere Stimme / For medium voice, Original: A-Dur / a major"
+  scorenumber = \markup{\concat {\scoreNumber \FullScoreNumber b}}
+  subtitle = "Mittlere Stimme / Medium voice, Original: A-Dur / a major"
 }
 
-PanisAngelicusTransposeFrom = g
+PanisAngelicusTransposeFrom = f
 PanisAngelicusTransposeTo = a
 
-\createScore #"PanisAngelicus" #'("FullScore")
+\createNoCuesScore #"PanisAngelicus" #'("FullScore")
 

Franck_PanisAngelicus_Score_FullTransposedMediumHigh.ly

+\version "2.13.1"
+\include "Franck_PanisAngelicus_Settings_FullScore.ily"
+\setCreateMIDI ##t
+\setCreatePDF ##t
+
+\header {
+  scoretype = \FullScoreTitle
+  scorenumber = \markup{\concat {\scoreNumber \FullScoreNumber a}}
+  subtitle = "Mittel-hohe Stimme / Medium high voice, Original: A-Dur / a major"
+}
+
+PanisAngelicusTransposeFrom = g
+PanisAngelicusTransposeTo = a
+
+\createNoCuesScore #"PanisAngelicus" #'("FullScore")
+