Whitespace; added oly dir to latex include path; etc.

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")
 

Eybler_SiConsistant_HV86_Instrument_T.ly

 \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}
           }
         }
       >>

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")

Eybler_SiConsistant_HV86_Settings_Instrument.ily

 \include "orchestrallily/oly_settings_instrument.ily"
 \include "Eybler_SiConsistant_HV86_Settings.ily"
+
+\paper {
+  #(define page-breaking ly:optimal-breaking)
+}

Makefile

 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)/ $<
 

TeX_Eybler_SiConsistant_HV86_Score_Choral.tex

 \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}

TeX_Eybler_SiConsistant_HV86_Score_Full.tex

 \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

TeX_Eybler_SiConsistant_HV86_Score_Instruments.tex

 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_SiConsistant_HV86_Settings.itex}
 
 \hypersetup{

TeX_Eybler_SiConsistant_HV86_Score_Long.tex

 \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

TeX_Eybler_SiConsistant_HV86_Score_Original.tex

 \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

TeX_Eybler_SiConsistant_HV86_Score_Vocal.tex

 \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}