diff --git a/Eybler_SiConsistant_HV86_Instrument_B.ly b/Eybler_SiConsistant_HV86_Instrument_B.ly index bac164fffea13a6196e2465cd7be64b24d5bcaae..04816f0a4639c82cd4d7bc7e57f48c9497e8ab13 100644 --- a/Eybler_SiConsistant_HV86_Instrument_B.ly +++ b/Eybler_SiConsistant_HV86_Instrument_B.ly @@ -6,5 +6,76 @@ scorenumber = \markup{\scoreNumber \BNumber} } +SiConsistantBStaff = << +\new Staff = "SiConsistantB1Staff" \with { + instrumentName = "B.1" + shortInstrumentName = "B.1" +} + +\new Lyrics = "SiConsistantB1Lyrics" { s1*44 s2 s4 + s4 s2.*31 + s1*43 } + +\new Staff = "SiConsistantBStaff" \with { + instrumentName = \BInstrumentName +% shortInstrumentName = \BShortInstrumentName +} << + \new Voice = "SiConsistantBVoice" { + \dynamicUp + \SiConsistantSettings + \BClef + \SiConsistantKey + \SiConsistantTimeSignature + \cueText "Tutti" + \quoteDuring #"SiConsistantBMusic" {s1*44 s2 s4 } + \bar"||" \break + \SiConsistantSettingsII + s4 | s2.*31 \bar"||" \break + \set Staff.instrumentName = \BShortInstrumentName + \unset Staff.shortInstrumentName + \SiConsistantSettingsIII + s4 s s + \cueText "Basso Tutti" \BClef + \quoteDuring #"SiConsistantBMusic" {s4 | s1*42 } + \bar"|." + } + \new Voice = "SiConsistantB2SoloInBStaffVoice" { + \dynamicUp + s1*44 | s2 s4 \bar"||" + << { + \BClef + \SiConsistantSettingsII + \set Staff.instrumentName = "B.2" + \set Staff.shortInstrumentName = "B.2" + \quoteDuring #"SiConsistantBSoloIIMusic" {s4 s2.*31 s4 s s} + } + \context Staff = "SiConsistantB1Staff" { + \new Voice = "SiConsistantB1Voice" { + \startStaff + \dynamicUp + \BClef + \set Staff.shortInstrumentName = "B.1" + \quoteDuring #"SiConsistantBSoloIMusic" {s4 s2.*31 } + \SiConsistantSettingsIII + \stopStaff +% \quoteDuring #"SiConsistantBSoloIMusic" {s4 s s} + } + } + >> + s4 s1*42 + } +>> + \context Lyrics = "SiConsistantB1Lyrics" \lyricsto "SiConsistantB1Voice" \SiConsistantBSoloILyrics + \context Lyrics = "SiConsistantBLyrics" \lyricsto "SiConsistantBVoice" \SiConsistantBLyrics + \context Lyrics = "SiConsistantBLyrics" \lyricsto "SiConsistantB2SoloInBStaffVoice" \SiConsistantBSoloIILyrics +>> + +\layout { + \context { + \RemoveEmptyStaffContext + \override VerticalAxisGroup #'remove-first = ##t + } +} + \createScore #"SiConsistant" #'("B") diff --git a/Eybler_SiConsistant_HV86_Instrument_T.ly b/Eybler_SiConsistant_HV86_Instrument_T.ly index d78f139046d009879b605748bf3fa5ee800a801c..e10ca746bc542216294e251a6e2bc5ae0b1a471f 100644 --- a/Eybler_SiConsistant_HV86_Instrument_T.ly +++ b/Eybler_SiConsistant_HV86_Instrument_T.ly @@ -1,77 +1,69 @@ \version "2.13.1" \include "Eybler_SiConsistant_HV86_Settings_VocalVoice.ily" -#(undefine SiConsistantTStaff) - \header { instrument = \TInstrumentName scorenumber = \markup{\scoreNumber \TNumber} } -\layout { - \context { - \Staff - quotedEventTypes = #'(StreamEvent) - } -} SiConsistantTStaff = << \new Staff = "SiConsistantT1Staff" \with { instrumentName = "T.1" shortInstrumentName = "T.1" quotedEventTypes = #'(StreamEvent) -} +} -\new Lyrics = "SiConsistantT1Lyrics" { s1*44 s2 s4 - s4 s2.*31 +\new Lyrics = "SiConsistantT1Lyrics" { s1*44 s2 s4 + s4 s2.*31 s1*43 } \new Staff = "SiConsistantTStaff" \with { instrumentName = \TInstrumentName - shortInstrumentName = \TShortInstrumentName +% shortInstrumentName = \TShortInstrumentName quotedEventTypes = #'(StreamEvent) } << \new Voice = "SiConsistantTVoice" { \dynamicUp - \SiConsistantSettings + \SiConsistantSettings \TClef - \SiConsistantKey - \SiConsistantTimeSignature + \SiConsistantKey + \SiConsistantTimeSignature \cueText "Tutti" \quoteDuring #"SiConsistantTMusic" {s1*44 s2 s4 } \bar"||" \break \SiConsistantSettingsII s4 | s2.*31 \bar"||" \break \set Staff.instrumentName = \TShortInstrumentName - \set Staff.shortInstrumentName = \TShortInstrumentName + \unset Staff.shortInstrumentName \SiConsistantSettingsIII - s4 s s + s4 s s \cueText "Tenore Tutti" \TClef \quoteDuring #"SiConsistantTMusic" {s4 | s1*42 } \bar"|." } \new Voice = "SiConsistantT2SoloInTStaffVoice" { \dynamicUp - s1*44 | s2 s4 \bar"||" + s1*44 | s2 s4 \bar"||" << { \TClef - \SiConsistantSettingsII - \cueText "Tenore 2 Solo" - \set Staff.instrumentName = "T.2" + \SiConsistantSettingsII +% \cueText "Tenore 2 Solo" +% \set Staff.instrumentName = "T.2" \set Staff.shortInstrumentName = "T.2" - \quoteDuring #"SiConsistantTSoloIIMusic" {s4 s2.*31 s4 s s} - } + \quoteDuring #"SiConsistantTSoloIIMusic" {s4 s2.*31 s4 s s} + } \context Staff = "SiConsistantT1Staff" { \new Voice = "SiConsistantT1Voice" { \startStaff \dynamicUp \TClef - \cueText "Tenore 1 Solo" - \set Staff.instrumentName = "T.1" +% \cueText "Tenore 1 Solo" +% \set Staff.instrumentName = "T.1" \set Staff.shortInstrumentName = "T.1" - \quoteDuring #"SiConsistantTSoloIMusic" {s4 s2.*31 } + \quoteDuring #"SiConsistantTSoloIMusic" {s4 s2.*31 } \SiConsistantSettingsIII - \stopStaff -% \quoteDuring #"SiConsistantTSoloIMusic" {s4 s s} + \stopStaff +% \quoteDuring #"SiConsistantTSoloIMusic" {s4 s s} } } >> diff --git a/Eybler_SiConsistant_HV86_Score_Original.ly b/Eybler_SiConsistant_HV86_Score_Original.ly index 0a13ffb09688b776d7c24921b8b9f888d432eac1..d8f8d837930902495d98957737efc961c038a273 100644 --- a/Eybler_SiConsistant_HV86_Score_Original.ly +++ b/Eybler_SiConsistant_HV86_Score_Original.ly @@ -7,5 +7,8 @@ scoretype = \OriginalScoreTitle scorenumber = \markup{\scoreNumber \OriginalScoreNumber} } +SClef = \clef "soprano" +AClef = \clef "alto" +TClef = \clef "tenor" \createNoCuesScore #"SiConsistant" #'("Tim" "TbeLong" "CorLong" "WdLong" "Str" "Ch" "Organ") diff --git a/Eybler_SiConsistant_HV86_Settings_Instrument.ily b/Eybler_SiConsistant_HV86_Settings_Instrument.ily index 268366739aba0678bcf94454560f9be777f2c362..3354af90b30ed530f2a2465f629f6aae9193f6d7 100644 --- a/Eybler_SiConsistant_HV86_Settings_Instrument.ily +++ b/Eybler_SiConsistant_HV86_Settings_Instrument.ily @@ -1,2 +1,6 @@ \include "orchestrallily/oly_settings_instrument.ily" \include "Eybler_SiConsistant_HV86_Settings.ily" + +\paper { + #(define page-breaking ly:optimal-breaking) +} diff --git a/Makefile b/Makefile index d4a0d17a7c8f826a938ef22c8ad908fce6e684a2..f3a67340adb731631e3f31bf0987321507043cad 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ OUT=out base = Eybler_SiConsistant_HV86 -SRCS = Eybler_SiConsistant_HV86_Settings_Global.ily Eybler_SiConsistant_HV86_Settings.ily Eybler_SiConsistant_HV86_Settings_VocalScore.ily Eybler_SiConsistant_HV86_Settings_ChoralScore.ily Eybler_SiConsistant_HV86_Settings_VocalVoice.ily Eybler_SiConsistant_HV86_Settings_FullScore.ily Eybler_SiConsistant_HV86_Settings_Instrument.ily Eybler_SiConsistant_HV86_Music_SiConsistant.ily $(base)_Settings.ily +SRCS = $(base)_Music_SiConsistant.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 = ObI ObII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va S A T B Continuo VcB scores = Long Full Vocal Choral Original pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \ - $(scores:%%=$(OUT)/$(base)_Score_%.pdf) + $(scores:%=$(OUT)/$(base)_Score_%.pdf) texbase = Eybler_SiConsistant_HV86 @@ -18,7 +18,7 @@ texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \ additionalscores = .PHONY: all clean -all: $(OUT) $(instruments) $(scores) $(additionalscores) tex +all: $(OUT) $(instruments) $(scores) $(additionalscores) tex instruments: $(instruments) scores: $(scores) @@ -26,6 +26,8 @@ scores: $(scores) clean: rm -rf $(OUT) +lily: $(pdfs) $(additionalscores) + $(OUT) : mkdir -p $(OUT) @@ -47,5 +49,5 @@ latex: $(pdfs) $(texpdfs) latexpdf: $(texpdfs) $(OUT)/TeX_%.pdf : TeX_%.tex - TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $< + TEXINPUTS=$(OUT):orchestrallily/:.//: latex --output-directory=$(OUT)/ $< diff --git a/TeX_Eybler_SiConsistant_HV86_Score_Choral.tex b/TeX_Eybler_SiConsistant_HV86_Score_Choral.tex index bf663b180f40c3b1ebc1c5b6c0dcccd0d61f5d7a..edd208d58688248a9ce17df226d5e5c98ab11030 100644 --- a/TeX_Eybler_SiConsistant_HV86_Score_Choral.tex +++ b/TeX_Eybler_SiConsistant_HV86_Score_Choral.tex @@ -1,5 +1,5 @@ \documentclass[a4paper,10pt,naustrian,twoside]{report} -\usepackage{orchestrallily/editionkainhofer} +\usepackage{editionkainhofer} \input{TeX_Eybler_SiConsistant_HV86_Settings.itex} \hypersetup{ @@ -14,11 +14,11 @@ \input{TeX_Eybler_SiConsistant_HV86_Include_Coverpage.itex} \input{TeX_Eybler_SiConsistant_HV86_Include_Preface_Long.itex} + \phantomsection \addcontentsline{toc}{section}{\ChoralScoreType} \includescore{Score_Choral} - \input{TeX_Eybler_SiConsistant_HV86_Include_Backpage.itex} \end{document} diff --git a/TeX_Eybler_SiConsistant_HV86_Score_Full.tex b/TeX_Eybler_SiConsistant_HV86_Score_Full.tex index 1aa7aaf198a502a35b0ddbf68d5b2ef8fd1e254b..5417d91c84df88729b58dcf1ca61135083c0c357 100644 --- a/TeX_Eybler_SiConsistant_HV86_Score_Full.tex +++ b/TeX_Eybler_SiConsistant_HV86_Score_Full.tex @@ -1,5 +1,5 @@ \documentclass[a4paper,10pt,naustrian,twoside]{report} -\usepackage{orchestrallily/editionkainhofer} +\usepackage{editionkainhofer} \input{TeX_Eybler_SiConsistant_HV86_Settings.itex} \hypersetup{ @@ -14,10 +14,12 @@ \input{TeX_Eybler_SiConsistant_HV86_Include_Coverpage.itex} \input{TeX_Eybler_SiConsistant_HV86_Include_Preface_Long.itex} + \phantomsection \addcontentsline{toc}{section}{\FullScoreType} \includescore{Score_Full} + \cleardoublepage \backmatter \appendix diff --git a/TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex b/TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex index 911654ddd6037dd44cb0c493cf7741703b223ca2..021b030d5b4ea3d565138e8099255a39acf4e3b8 100644 --- a/TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex +++ b/TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex @@ -1,5 +1,5 @@ \documentclass[a4paper,10pt,naustrian,twoside]{report} -\usepackage{orchestrallily/editionkainhofer} +\usepackage{editionkainhofer} \input{TeX_Eybler_SiConsistant_HV86_Settings.itex} \hypersetup{ diff --git a/TeX_Eybler_SiConsistant_HV86_Score_Long.tex b/TeX_Eybler_SiConsistant_HV86_Score_Long.tex index 62ff666f43f9c8bd07e9f4bea4917ce4ad67d971..31c71d467951e628a2e5ddd2d1c337e625d1fe12 100644 --- a/TeX_Eybler_SiConsistant_HV86_Score_Long.tex +++ b/TeX_Eybler_SiConsistant_HV86_Score_Long.tex @@ -1,5 +1,5 @@ \documentclass[a4paper,10pt,naustrian,twoside]{report} -\usepackage{orchestrallily/editionkainhofer} +\usepackage{editionkainhofer} \input{TeX_Eybler_SiConsistant_HV86_Settings.itex} \hypersetup{ @@ -14,10 +14,12 @@ \input{TeX_Eybler_SiConsistant_HV86_Include_Coverpage.itex} \input{TeX_Eybler_SiConsistant_HV86_Include_Preface_Long.itex} + \phantomsection \addcontentsline{toc}{section}{\LongScoreType} \includescore{Score_Long} + \cleardoublepage \backmatter \appendix diff --git a/TeX_Eybler_SiConsistant_HV86_Score_Original.tex b/TeX_Eybler_SiConsistant_HV86_Score_Original.tex index d10d0a7bc6dd34841cce088caa30d6fb23001b4f..1ff844ece692da171a3d9abe25a6b494265bf38d 100644 --- a/TeX_Eybler_SiConsistant_HV86_Score_Original.tex +++ b/TeX_Eybler_SiConsistant_HV86_Score_Original.tex @@ -1,5 +1,5 @@ \documentclass[a4paper,10pt,naustrian,twoside]{report} -\usepackage{orchestrallily/editionkainhofer} +\usepackage{editionkainhofer} \input{TeX_Eybler_SiConsistant_HV86_Settings.itex} \hypersetup{ @@ -14,10 +14,12 @@ \input{TeX_Eybler_SiConsistant_HV86_Include_Coverpage.itex} \input{TeX_Eybler_SiConsistant_HV86_Include_Preface_Long.itex} + \phantomsection \addcontentsline{toc}{section}{\OriginalScoreType} \includescore{Score_Original} + \cleardoublepage \backmatter \appendix diff --git a/TeX_Eybler_SiConsistant_HV86_Score_Vocal.tex b/TeX_Eybler_SiConsistant_HV86_Score_Vocal.tex index 21a512a42b36e845f5e3e7681fb0b4884873546c..3cf7fc8ade6337a919add9296eb60d59e902d5ba 100644 --- a/TeX_Eybler_SiConsistant_HV86_Score_Vocal.tex +++ b/TeX_Eybler_SiConsistant_HV86_Score_Vocal.tex @@ -1,5 +1,5 @@ \documentclass[a4paper,10pt,naustrian,twoside]{report} -\usepackage[vocalscore]{orchestrallily/editionkainhofer} +\usepackage[vocalscore]{editionkainhofer} \input{TeX_Eybler_SiConsistant_HV86_Settings.itex} \hypersetup{ @@ -14,11 +14,11 @@ \input{TeX_Eybler_SiConsistant_HV86_Include_Coverpage.itex} \input{TeX_Eybler_SiConsistant_HV86_Include_Preface_Long.itex} + \phantomsection \addcontentsline{toc}{section}{\VocalScoreType} \includescore{Score_Vocal} - \input{TeX_Eybler_SiConsistant_HV86_Include_Backpage.itex} \end{document} diff --git a/out/Eybler_SiConsistant_HV86_Instrument_A.pdf b/out/Eybler_SiConsistant_HV86_Instrument_A.pdf index a34c9dce554efaf4156ec8c8c77fa9c2b41e49ec..0fcbc54fb6b8952f707b4a353dee9ba9d908dbb4 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_A.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_A.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_B.pdf b/out/Eybler_SiConsistant_HV86_Instrument_B.pdf index f3bc8fc3183f6cfc935766ed50fc161dd34c02da..8c10bc5698b8d766579c937d707cc3702bacd0c9 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_B.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_B.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_Continuo.pdf b/out/Eybler_SiConsistant_HV86_Instrument_Continuo.pdf index 5c3fa4ad7f7c57bd5f18fd28e8b9cc85f13fd1d5..76a08a7bfe90cdd57f49dc05f8e716f028f4fedb 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_Continuo.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_Continuo.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_CorI.pdf b/out/Eybler_SiConsistant_HV86_Instrument_CorI.pdf index bde9d0e9d5de1d01f7ffec9ef9c120d29621795b..e45b52a5308183673fb1f178fd797eff7ac894ed 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_CorI.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_CorI.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_CorII.pdf b/out/Eybler_SiConsistant_HV86_Instrument_CorII.pdf index 2cac591c288e52c1e74a9ab0bca220743fd0484d..a085e4ca77c8fe9e3fd0a08f9a53706e6f754cc9 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_CorII.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_CorII.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_FagI.pdf b/out/Eybler_SiConsistant_HV86_Instrument_FagI.pdf index ca1de44329890f862bfcec840c338e63ddc13708..90cfdac3df61681bd3004413919d388500c06a50 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_FagI.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_FagI.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_FagII.pdf b/out/Eybler_SiConsistant_HV86_Instrument_FagII.pdf index a7136fe430aa157d9fab18172851cf338996a643..0dbbdd22880bca68048151914b1701404feaa297 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_FagII.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_FagII.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_ObI.pdf b/out/Eybler_SiConsistant_HV86_Instrument_ObI.pdf index e54af642b3e77ba6017056bbfd85ebe966330a8d..d81d695cfb0a87918f0d722b3b6b251c485a3ddf 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_ObI.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_ObI.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_ObII.pdf b/out/Eybler_SiConsistant_HV86_Instrument_ObII.pdf index c0120059fb1a5f50028b948b03f66ded9bd80ffb..47583b69cbafc1db638f887a01c0e8d2ff24ef5c 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_ObII.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_ObII.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_S.pdf b/out/Eybler_SiConsistant_HV86_Instrument_S.pdf index ab0d95bcf31c629ce1f375252cec57c072048b3d..1e0beeb7913d69e53bdc22bcdc638de7cda96f08 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_S.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_S.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_T.pdf b/out/Eybler_SiConsistant_HV86_Instrument_T.pdf index 7e303942f87c9e2b2f8dc6eee4108e2e6f5f66fe..3d7c66b1247ed16fb3bb0b987f09d8be5fb612cf 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_T.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_T.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_TbeI.pdf b/out/Eybler_SiConsistant_HV86_Instrument_TbeI.pdf index 42a88fd64442a84912fa8f257b315be0ee2d48d7..fc316e0c461c46604c229841d8680b1a8bff9fd2 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_TbeI.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_TbeI.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_TbeII.pdf b/out/Eybler_SiConsistant_HV86_Instrument_TbeII.pdf index c061e2a93ac5ee80554f65b1ade2895e31d443d9..fb40c014ef61daf9313c54533a1ca59cef7c9e88 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_TbeII.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_TbeII.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_Tim.pdf b/out/Eybler_SiConsistant_HV86_Instrument_Tim.pdf index ca5fac43c231a278ff277916d49c424342401f1e..4c50841d1663d12348fa5183221741828de01233 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_Tim.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_Tim.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_VI.pdf b/out/Eybler_SiConsistant_HV86_Instrument_VI.pdf index 8a93498140639b524916f32a85b432ebdb4c35ce..cb1e7e0adedd93d812e06121707ecc1378789179 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_VI.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_VI.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_VII.pdf b/out/Eybler_SiConsistant_HV86_Instrument_VII.pdf index 9fb5343f133347287d9b657950408371fef3b02c..d03f128f1050964ece9e8178eab92a78b7aebb28 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_VII.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_VII.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_Va.pdf b/out/Eybler_SiConsistant_HV86_Instrument_Va.pdf index d5140111467ba6618e83a2479066a304d40de3df..028b3588a750a4f0914feaba816cc14e791237a1 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_Va.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_Va.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Instrument_VcB.pdf b/out/Eybler_SiConsistant_HV86_Instrument_VcB.pdf index 05f023c59c0143641ba768e784c174acadfcf679..87d04f3f110fe966c0d9c9f7091e757298a78bd1 100644 Binary files a/out/Eybler_SiConsistant_HV86_Instrument_VcB.pdf and b/out/Eybler_SiConsistant_HV86_Instrument_VcB.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Score_Choral.midi b/out/Eybler_SiConsistant_HV86_Score_Choral.midi index c7767539c1904d006c51103155c428a4f629845a..1b2d9c19debcedc2f345c82b9d75d165022c3d10 100644 Binary files a/out/Eybler_SiConsistant_HV86_Score_Choral.midi and b/out/Eybler_SiConsistant_HV86_Score_Choral.midi differ diff --git a/out/Eybler_SiConsistant_HV86_Score_Choral.pdf b/out/Eybler_SiConsistant_HV86_Score_Choral.pdf index 2df8ba5de238c0e675c18c3fefa5f67b63001405..2fcc79fe35385ee1c6bee4f5c10e55c5e118f389 100644 Binary files a/out/Eybler_SiConsistant_HV86_Score_Choral.pdf and b/out/Eybler_SiConsistant_HV86_Score_Choral.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Score_Full.midi b/out/Eybler_SiConsistant_HV86_Score_Full.midi index 96be29b2d439b9052260c9d97526bc7783025a52..bbe8d31a577690491dcfbe495b0dd3aa701aa97a 100644 Binary files a/out/Eybler_SiConsistant_HV86_Score_Full.midi and b/out/Eybler_SiConsistant_HV86_Score_Full.midi differ diff --git a/out/Eybler_SiConsistant_HV86_Score_Full.pdf b/out/Eybler_SiConsistant_HV86_Score_Full.pdf index 76e27c52afc2af79183cfa38fb77b3c275c258ec..26cca57fe9aa51be6911d18604c19bca64af5a1f 100644 Binary files a/out/Eybler_SiConsistant_HV86_Score_Full.pdf and b/out/Eybler_SiConsistant_HV86_Score_Full.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Score_Long.midi b/out/Eybler_SiConsistant_HV86_Score_Long.midi index da45c026a6bdf1c65f565459765cef858b0220fb..fad93766e396782fb541b83b72f6a92f3499e200 100644 Binary files a/out/Eybler_SiConsistant_HV86_Score_Long.midi and b/out/Eybler_SiConsistant_HV86_Score_Long.midi differ diff --git a/out/Eybler_SiConsistant_HV86_Score_Long.pdf b/out/Eybler_SiConsistant_HV86_Score_Long.pdf index 5620de1fd20ec5f3aef4d47052332586dd2ea9c1..1319165b4decc9796c5ac0a5b7adb025f55a3bae 100644 Binary files a/out/Eybler_SiConsistant_HV86_Score_Long.pdf and b/out/Eybler_SiConsistant_HV86_Score_Long.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Score_Original.midi b/out/Eybler_SiConsistant_HV86_Score_Original.midi index 13884c1dceef6d8c3f986a015d85323bc5cabefc..a4ca506bfbbdf404bb25fd5a729456e25e0b3d05 100644 Binary files a/out/Eybler_SiConsistant_HV86_Score_Original.midi and b/out/Eybler_SiConsistant_HV86_Score_Original.midi differ diff --git a/out/Eybler_SiConsistant_HV86_Score_Original.pdf b/out/Eybler_SiConsistant_HV86_Score_Original.pdf index c2c8b3f4829cd01af9b0393369e975d538f8ed9c..3832f584f5f5fd379ec15fdb5d3601b8644470d4 100644 Binary files a/out/Eybler_SiConsistant_HV86_Score_Original.pdf and b/out/Eybler_SiConsistant_HV86_Score_Original.pdf differ diff --git a/out/Eybler_SiConsistant_HV86_Score_Vocal.midi b/out/Eybler_SiConsistant_HV86_Score_Vocal.midi index c7767539c1904d006c51103155c428a4f629845a..1b2d9c19debcedc2f345c82b9d75d165022c3d10 100644 Binary files a/out/Eybler_SiConsistant_HV86_Score_Vocal.midi and b/out/Eybler_SiConsistant_HV86_Score_Vocal.midi differ diff --git a/out/Eybler_SiConsistant_HV86_Score_Vocal.pdf b/out/Eybler_SiConsistant_HV86_Score_Vocal.pdf index bbb059aa294ead4be5aa2dd7f0deb915f718ff95..079bcfc699f8c578a4b90da1d2f4d598d40032f1 100644 Binary files a/out/Eybler_SiConsistant_HV86_Score_Vocal.pdf and b/out/Eybler_SiConsistant_HV86_Score_Vocal.pdf differ diff --git a/out/TeX_Eybler_SiConsistant_HV86_Score_Choral.pdf b/out/TeX_Eybler_SiConsistant_HV86_Score_Choral.pdf index d3b7368fc3226b930b64866bebe7a6aa1db22652..1e6a348e0c324b53b592d24096d6bd2396ca73f3 100644 Binary files a/out/TeX_Eybler_SiConsistant_HV86_Score_Choral.pdf and b/out/TeX_Eybler_SiConsistant_HV86_Score_Choral.pdf differ diff --git a/out/TeX_Eybler_SiConsistant_HV86_Score_Full.pdf b/out/TeX_Eybler_SiConsistant_HV86_Score_Full.pdf index adfd505c1f6695f8cbc2ec46b73d85400c48c366..3166f1d4ca2c09914906372a0d80c69408d3da4a 100644 Binary files a/out/TeX_Eybler_SiConsistant_HV86_Score_Full.pdf and b/out/TeX_Eybler_SiConsistant_HV86_Score_Full.pdf differ diff --git a/out/TeX_Eybler_SiConsistant_HV86_Score_Instruments.pdf b/out/TeX_Eybler_SiConsistant_HV86_Score_Instruments.pdf index 96a161adb0d57477e34fc7eba015d51239238f1f..de1fdf35780c0738ecab7c62457515e829e2089b 100644 Binary files a/out/TeX_Eybler_SiConsistant_HV86_Score_Instruments.pdf and b/out/TeX_Eybler_SiConsistant_HV86_Score_Instruments.pdf differ diff --git a/out/TeX_Eybler_SiConsistant_HV86_Score_Long.pdf b/out/TeX_Eybler_SiConsistant_HV86_Score_Long.pdf index 45d088d938660baa5a9640434dcde7f23a1934f0..43b6c875d80cc765b4ead1f0456bc2940d932ea0 100644 Binary files a/out/TeX_Eybler_SiConsistant_HV86_Score_Long.pdf and b/out/TeX_Eybler_SiConsistant_HV86_Score_Long.pdf differ diff --git a/out/TeX_Eybler_SiConsistant_HV86_Score_Original.pdf b/out/TeX_Eybler_SiConsistant_HV86_Score_Original.pdf index 41bf96321765148e609f50bc5f67bda416eaaf9f..dc877fb1db26181199af732aaceb49ce2b2041d4 100644 Binary files a/out/TeX_Eybler_SiConsistant_HV86_Score_Original.pdf and b/out/TeX_Eybler_SiConsistant_HV86_Score_Original.pdf differ diff --git a/out/TeX_Eybler_SiConsistant_HV86_Score_Vocal.pdf b/out/TeX_Eybler_SiConsistant_HV86_Score_Vocal.pdf index bcdc7064915882e59b2d53f7d6b18eab120a2e14..e66302bf5de30d43e31f5be1ffb5e35161b7029b 100644 Binary files a/out/TeX_Eybler_SiConsistant_HV86_Score_Vocal.pdf and b/out/TeX_Eybler_SiConsistant_HV86_Score_Vocal.pdf differ diff --git a/patches/Eybler_SiConsistant_HV86_Instrument_T.ly.patch b/patches/Eybler_SiConsistant_HV86_Instrument_T.ly.patch index 47f122bb00582543223bed5cde46897420628a13..0cdae58afbd75824622cb5d1e84ff33a87d03da4 100644 --- a/patches/Eybler_SiConsistant_HV86_Instrument_T.ly.patch +++ b/patches/Eybler_SiConsistant_HV86_Instrument_T.ly.patch @@ -1,80 +1,67 @@ ---- Eybler_SiConsistant_HV86_Instrument_T.ly.new 2009-10-01 13:56:41.000000000 +0200 -+++ Eybler_SiConsistant_HV86_Instrument_T.ly 2009-10-01 13:53:16.000000000 +0200 -@@ -1,10 +1,94 @@ - \version "2.13.1" - \include "Eybler_SiConsistant_HV86_Settings_VocalVoice.ily" - -+#(undefine SiConsistantTStaff) -+ - \header { - instrument = \TInstrumentName +--- Eybler_SiConsistant_HV86_Instrument_T.ly.new 2009-10-05 19:29:37.000000000 +0200 ++++ Eybler_SiConsistant_HV86_Instrument_T.ly 2009-10-05 19:28:50.000000000 +0200 +@@ -6,5 +6,81 @@ scorenumber = \markup{\scoreNumber \TNumber} } -+\layout { -+ \context { -+ \Staff -+ quotedEventTypes = #'(StreamEvent) -+ } -+} -+ + +SiConsistantTStaff = << +\new Staff = "SiConsistantT1Staff" \with { + instrumentName = "T.1" + shortInstrumentName = "T.1" + quotedEventTypes = #'(StreamEvent) -+} ++} + -+\new Lyrics = "SiConsistantT1Lyrics" { s1*44 s2 s4 -+ s4 s2.*31 ++\new Lyrics = "SiConsistantT1Lyrics" { s1*44 s2 s4 ++ s4 s2.*31 + s1*43 } + +\new Staff = "SiConsistantTStaff" \with { + instrumentName = \TInstrumentName -+ shortInstrumentName = \TShortInstrumentName ++% shortInstrumentName = \TShortInstrumentName + quotedEventTypes = #'(StreamEvent) +} << + \new Voice = "SiConsistantTVoice" { + \dynamicUp -+ \SiConsistantSettings ++ \SiConsistantSettings + \TClef -+ \SiConsistantKey -+ \SiConsistantTimeSignature ++ \SiConsistantKey ++ \SiConsistantTimeSignature + \cueText "Tutti" + \quoteDuring #"SiConsistantTMusic" {s1*44 s2 s4 } + \bar"||" \break + \SiConsistantSettingsII + s4 | s2.*31 \bar"||" \break + \set Staff.instrumentName = \TShortInstrumentName -+ \set Staff.shortInstrumentName = \TShortInstrumentName ++ \unset Staff.shortInstrumentName + \SiConsistantSettingsIII -+ s4 s s ++ s4 s s + \cueText "Tenore Tutti" \TClef + \quoteDuring #"SiConsistantTMusic" {s4 | s1*42 } + \bar"|." + } + \new Voice = "SiConsistantT2SoloInTStaffVoice" { + \dynamicUp -+ s1*44 | s2 s4 \bar"||" ++ s1*44 | s2 s4 \bar"||" + << { + \TClef -+ \SiConsistantSettingsII -+ \cueText "Tenore 2 Solo" -+ \set Staff.instrumentName = "T.2" ++ \SiConsistantSettingsII ++% \cueText "Tenore 2 Solo" ++% \set Staff.instrumentName = "T.2" + \set Staff.shortInstrumentName = "T.2" -+ \quoteDuring #"SiConsistantTSoloIIMusic" {s4 s2.*31 s4 s s} -+ } ++ \quoteDuring #"SiConsistantTSoloIIMusic" {s4 s2.*31 s4 s s} ++ } + \context Staff = "SiConsistantT1Staff" { + \new Voice = "SiConsistantT1Voice" { + \startStaff + \dynamicUp + \TClef -+ \cueText "Tenore 1 Solo" -+ \set Staff.instrumentName = "T.1" ++% \cueText "Tenore 1 Solo" ++% \set Staff.instrumentName = "T.1" + \set Staff.shortInstrumentName = "T.1" -+ \quoteDuring #"SiConsistantTSoloIMusic" {s4 s2.*31 } ++ \quoteDuring #"SiConsistantTSoloIMusic" {s4 s2.*31 } + \SiConsistantSettingsIII -+ \stopStaff -+% \quoteDuring #"SiConsistantTSoloIMusic" {s4 s s} ++ \stopStaff ++% \quoteDuring #"SiConsistantTSoloIMusic" {s4 s s} + } + } + >> @@ -92,6 +79,6 @@ + \override VerticalAxisGroup #'remove-first = ##t + } +} - ++ \createScore #"SiConsistant" #'("T") diff --git a/patches/TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex.patch b/patches/TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex.patch index 16822f0cd2caccd77b02de3853fbb0a377d08d38..283c15255920813512ecdacd4f6455c32e39466d 100644 --- a/patches/TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex.patch +++ b/patches/TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex.patch @@ -1,13 +1,13 @@ ---- TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex.new 2009-10-01 13:56:41.000000000 +0200 -+++ TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex 2009-10-01 13:51:13.000000000 +0200 -@@ -14,85 +14,64 @@ +--- TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex.new 2009-10-05 19:29:38.000000000 +0200 ++++ TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex 2009-10-05 19:29:22.000000000 +0200 +@@ -14,7 +14,35 @@ \input{TeX_Eybler_SiConsistant_HV86_Include_Coverpage.itex} \input{TeX_Eybler_SiConsistant_HV86_Include_Preface_Long.itex} +\phantomsection +\addcontentsline{toc}{section}{\ContinuoName} +\includescore{Instrument_Continuo} - ++ +\phantomsection +\addcontentsline{toc}{section}{\SName} +\includescore{Instrument_S} @@ -21,8 +21,6 @@ +\addcontentsline{toc}{section}{\BName} +\includescore{Instrument_B} -- -- +\phantomsection +\addcontentsline{toc}{section}{\VIName} +\includescore{Instrument_VI} @@ -38,78 +36,38 @@ \phantomsection \addcontentsline{toc}{section}{\ObIName} - \includescore{Instrument_ObI} -- - \phantomsection - \addcontentsline{toc}{section}{\ObIIName} - \includescore{Instrument_ObII} -- - \phantomsection - \addcontentsline{toc}{section}{\FagIName} - \includescore{Instrument_FagI} -- - \phantomsection - \addcontentsline{toc}{section}{\FagIIName} - \includescore{Instrument_FagII} -- - \phantomsection - \addcontentsline{toc}{section}{\CorIName} - \includescore{Instrument_CorI} -- - \phantomsection - \addcontentsline{toc}{section}{\CorIIName} - \includescore{Instrument_CorII} -- - \phantomsection - \addcontentsline{toc}{section}{\TbeIName} - \includescore{Instrument_TbeI} -- - \phantomsection - \addcontentsline{toc}{section}{\TbeIIName} - \includescore{Instrument_TbeII} -- +@@ -43,34 +71,6 @@ \phantomsection \addcontentsline{toc}{section}{\TimName} \includescore{Instrument_Tim} - -\phantomsection -\addcontentsline{toc}{section}{\VIName} -\includescore{Instrument_VI} -- -\phantomsection -\addcontentsline{toc}{section}{\VIIName} -\includescore{Instrument_VII} -- -\phantomsection -\addcontentsline{toc}{section}{\VaName} -\includescore{Instrument_Va} -- -\phantomsection -\addcontentsline{toc}{section}{\SName} -\includescore{Instrument_S} -- -\phantomsection -\addcontentsline{toc}{section}{\AName} -\includescore{Instrument_A} -- -\phantomsection -\addcontentsline{toc}{section}{\TName} -\includescore{Instrument_T} -- -\phantomsection -\addcontentsline{toc}{section}{\BName} -\includescore{Instrument_B} -- -\phantomsection -\addcontentsline{toc}{section}{\ContinuoName} -\includescore{Instrument_Continuo} -- -\phantomsection -\addcontentsline{toc}{section}{\VcBName} -\includescore{Instrument_VcB} - -- -- + \cleardoublepage - \backmatter