diff --git a/Makefile b/Makefile index 2e1cd2f4a73028d19703e7174a14b7e6f2be2392..90f277f446530eebf07ae2770c472426796d2182 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ OUT=out base = Preindl_InTuoNomine SRCS = $(base)_Music_InTuoNomine.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_VocalScore.ily $(base)_Settings_ChoralScore.ily $(base)_Settings_VocalVoice.ily $(base)_Settings_FullScore.ily $(base)_Settings_Instrument.ily -instruments = FlI FlII ObI ObII ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII ASolo S A T B Vc Cb +instruments = FlI FlII ObI ObII ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII ASolo S A T B Vc Cb VcB scores = Long Full Vocal Choral Original pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \ $(scores:%=$(OUT)/$(base)_Score_%.pdf) @@ -15,7 +15,7 @@ texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \ $(OUT)/TeX_$(texbase)_Score_Instruments.pdf -additionalscores = +additionalscores = .PHONY: all clean all: $(OUT) $(instruments) $(scores) $(additionalscores) tex diff --git a/Preindl_InTuoNomine_Instrument_VcB.ly b/Preindl_InTuoNomine_Instrument_VcB.ly new file mode 100644 index 0000000000000000000000000000000000000000..11d7b20a1b913c90836e3abf681368e032970d3f --- /dev/null +++ b/Preindl_InTuoNomine_Instrument_VcB.ly @@ -0,0 +1,10 @@ +\version "2.13.29" +\include "Preindl_InTuoNomine_Settings_Instrument.ily" + +\header { + instrument = \VcBInstrumentName + scorenumber = \markup{\scoreNumber \VcBNumber} +} + +\createScore #"InTuoNomine" #'("VcB") + diff --git a/Preindl_InTuoNomine_Music_InTuoNomine.ily b/Preindl_InTuoNomine_Music_InTuoNomine.ily index b3d27d273f30e31f66fc0231151fb9826dd2267b..6919d91430f4a7d5731aa6baf0d65ea47801ea76 100644 --- a/Preindl_InTuoNomine_Music_InTuoNomine.ily +++ b/Preindl_InTuoNomine_Music_InTuoNomine.ily @@ -3751,7 +3751,7 @@ InTuoNomineVcMusic = \relative c { d r | d r | d r | - r4 \cueText "Fagotto solo" d | + r4 d | fis a | d d, | r d | @@ -3887,16 +3887,61 @@ InTuoNomineVcMusic = \relative c { \addQuote "InTuoNomineVcMusic" { \InTuoNomineVcMusic } -InTuoNomineCbMusic = \relative c' { - s8 - % TODO +InTuoNomineCbMusic = \relative c { + \quoteDuring "InTuoNomineVcMusic" { s2*2 } | + d2 | + d4 \quoteDuring "InTuoNomineVcMusic" { s4 | + s2*68 } \InTuoNomineSettingsII + \quoteDuring "InTuoNomineVcMusic" { s4 | + s2*106 } | + R2*12 | + r8 fis8[\p \quoteDuring "InTuoNomineVcMusic" { s4 | + s2*26 } | + a,4 r | + a r | + \quoteDuring "InTuoNomineVcMusic" { s2*91 } + \bar "|." } \addQuote "InTuoNomineCbMusic" { \InTuoNomineCbMusic } InTuoNomineVcBMusic = \relative c' { - \quoteDuring "InTuoNomineVcMusic" { s2*311 } - - % TODO + \quoteDuring "InTuoNomineVcMusic" { s2*2 } | + << \context Voice = "InTuoNomineVcVoice" { + \voiceOne + \override Voice.InstrumentSwitch #'direction = #UP + \cueText "Cello" + \quoteDuring "InTuoNomineVcMusic" { s2 | s4 } + } + \context Voice = "InTuoNomineCbVoice" { + \voiceTwo + \override Voice.InstrumentSwitch #'direction = #DOWN + \cueText "Basso" + \quoteDuring "InTuoNomineCbMusic" { s2 | s4 } + } + >> \quoteDuring "InTuoNomineVcMusic" { s4 | + s2*68 } \InTuoNomineSettingsII + \quoteDuring "InTuoNomineVcMusic" { s4 | + s2*106 } | + \cueText "Cello solo" + \quoteDuring "InTuoNomineVcMusic" { s2*12 | s8 } + \cueText "con Basso" \quoteDuring "InTuoNomineVcMusic" { s8 s4 | + s2*26 } | + << \context Voice = "InTuoNomineVcVoice" { + \voiceOne + \cueText "Cello" + \override Voice.InstrumentSwitch #'direction = #UP + \quoteDuring "InTuoNomineVcMusic" { s2*2 } + } + \context Voice = "InTuoNomineCbVoice" { + \voiceTwo + \cueText "Basso" + \override Voice.InstrumentSwitch #'direction = #DOWN + \quoteDuring "InTuoNomineCbMusic" { s2*2 } + } + >> + \quoteDuring "InTuoNomineVcMusic" { s2*91 } + \bar "|." + % TODO } \addQuote "InTuoNomineVcBMusic" { \InTuoNomineVcBMusic } diff --git a/out/Preindl_InTuoNomine_Instrument_Cb.pdf b/out/Preindl_InTuoNomine_Instrument_Cb.pdf index b500cbd10ceca635108d83c6e1a6c1517c974a77..85b261c780a57f4afa2c71b171b8bd50f0944563 100644 Binary files a/out/Preindl_InTuoNomine_Instrument_Cb.pdf and b/out/Preindl_InTuoNomine_Instrument_Cb.pdf differ diff --git a/out/Preindl_InTuoNomine_Instrument_Vc.pdf b/out/Preindl_InTuoNomine_Instrument_Vc.pdf index 745e03444ae28c5875d1c66972c38881941c0c6f..2fdaaefb104a850fe6b311a925af858423dcd3d9 100644 Binary files a/out/Preindl_InTuoNomine_Instrument_Vc.pdf and b/out/Preindl_InTuoNomine_Instrument_Vc.pdf differ diff --git a/out/Preindl_InTuoNomine_Instrument_VcB.pdf b/out/Preindl_InTuoNomine_Instrument_VcB.pdf new file mode 100644 index 0000000000000000000000000000000000000000..2cf7c6fdb11c13e1cd151ca0a635aa5622ef7ac9 Binary files /dev/null and b/out/Preindl_InTuoNomine_Instrument_VcB.pdf differ