Fix spacing, simplify Makefile

Eybler_EcceQuomodo_HVdeest_Music_EcceQuomodo.ily

@@ -3,9 +3,6 @@
 EcceQuomodoKey = \key c \minor
 EcceQuomodoTimeSignature = \time 2/2
 
-setlong = \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16)
-resetlong = \revert Score.SpacingSpanner #'bas-shortest-duration
-
 EcceQuomodoSettings = \notemode {
   \override Staff.NoteHead  #'style = #'baroque
   \set Score.tempoHideNote = ##t
@@ -14,16 +11,15 @@ EcceQuomodoSettings = \notemode {
 
 EcceQuomodoSettingsII = \notemode {
   \bar"||" \barNumberCheck #41
-  \time 2/2 \newSpacingSection
+  \time 2/2
   \tempo "più adagio"
 }
 
-spacervoice = {} %{\new Voice { \voiceFour
-        \override NoteHead  #'transparent = ##t
-        \override Stem  #'transparent = ##t
-        \override Beam  #'transparent = ##t
-        s2 g4
-    }%}
+makeSpace = {
+  \once \override Score.BarLine #'transparent = ##t
+  \once \override Score.BarLine #'X-extent = #'(-0 . 0)
+  \bar "|"
+}
 
 EcceQuomodoSMusic = \relative c' {
   f1~ | % 2
@@ -66,11 +62,8 @@ EcceQuomodoSMusic = \relative c' {
   f | % 39
   e\breve\fermata \break
   \EcceQuomodoSettingsII
-  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16)
-%   \setlong
-  << { g1} { s2\p s\f} \spacervoice>> | % 42
-  << {as!1} {s2\p s\f} \spacervoice >> | % 43
-  \resetlong
+  << { g1} { s2\p \makeSpace s\f} >> | % 42
+  << {as!1} {s2\p \makeSpace s\f} >> | % 43
   as2 g | % 44
   f1~\p | % 45
   f\f | % 46
@@ -82,8 +75,7 @@ EcceQuomodoSMusic = \relative c' {
   e1( | % 52
   f1~ | % 53
   f e) | % 54
-  \once\override Score.NonMusicalPaperColumn #'padding = #10 
-  << {f\breve\fermata} {s2\p s4\f} \spacervoice >>\bar "|."
+  << {f\breve\fermata} {s2\p \makeSpace s4\f} >>\bar "|."
 }
 \addQuote "EcceQuomodoSMusic" { \EcceQuomodoSMusic }
 
@@ -139,9 +131,8 @@ EcceQuomodoAMusic = \relative c' {
   b) | % 38
   c\breve\fermata 
   \EcceQuomodoSettingsII
-  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16)
-  << {e1} {s2\p s\f}  \spacervoice >> | % 42
-  << {f1} {s2\p s\f}  \spacervoice >> | % 43
+  << {e1} {s2\p \makeSpace s\f} >> | % 42
+  << {f1} {s2\p \makeSpace s\f} >> | % 43
   f2 e | % 44
   f1(\p | % 45
   des)\f | % 46
@@ -154,7 +145,7 @@ EcceQuomodoAMusic = \relative c' {
   c~ | % 53
   c~ | % 54
   c | % 55
-  << {c\breve\fermata} {s2\p s4\f}  \spacervoice >>\bar "|."
+  << {c\breve\fermata} {s2\p \makeSpace s4\f} >>\bar "|."
 }
 \addQuote "EcceQuomodoAMusic" { \EcceQuomodoAMusic }
 
@@ -201,9 +192,8 @@ EcceQuomodoTMusic = \relative c' {
   g2 f) | % 39
   g\breve\fermata 
   \EcceQuomodoSettingsII
-  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16)
-  << {c1} {s2\p s\f}  \spacervoice >> | % 42
-  << {c1} {s2\p s\f}  \spacervoice >> | % 43
+  << {c1} {s2\p \makeSpace s\f} >> | % 42
+  << {c1} {s2\p \makeSpace s\f} >> | % 43
   c2 c | % 44
   as1~\p | % 45
   as\f | % 46
@@ -216,7 +206,7 @@ EcceQuomodoTMusic = \relative c' {
   as! | % 53
   g1~ | % 54
   g) | % 55
-  << {a\breve\fermata} {s2\p s4\f}  \spacervoice >>\bar "|."
+  << {a\breve\fermata} {s2\p \makeSpace s4\f} >>\bar "|."
 }
 \addQuote "EcceQuomodoTMusic" { \EcceQuomodoTMusic }
 
@@ -263,9 +253,8 @@ EcceQuomodoBMusic = \relative c {
   des | % 39
   c\breve\fermata 
   \EcceQuomodoSettingsII
-  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16)
-  << {c1} {s2\p s\f}  \spacervoice >> | % 42
-  << {f1} {s2\p s\f}  \spacervoice >> | % 43
+  << {c1} {s2\p \makeSpace s\f} >> | % 42
+  << {f1} {s2\p \makeSpace s\f} >> | % 43
   f2 c | % 44
   des1~\p | % 45
   des\f | % 46
@@ -278,7 +267,7 @@ EcceQuomodoBMusic = \relative c {
   c~ | % 53
   c~ | % 54
   c | % 55
-  << {f,\breve\fermata} {s2\p s4\f}  \spacervoice >>\bar "|."
+  << {f,\breve\fermata} {s2\p \makeSpace s4\f} >>\bar "|."
 }
 \addQuote "EcceQuomodoBMusic" { \EcceQuomodoBMusic }
 

Makefile

-SRCS = Eybler_EcceQuomodo_HVdeest_Music_EcceQuomodo.ily Eybler_EcceQuomodo_HVdeest_Settings.ily
+base = Eybler_EcceQuomodo_HVdeest
+SRCS = $(base)_Music_EcceQuomodo.ily $(base)_Settings.ily
 OUT=out
 
 instruments =
 scores = Choral Klavierauszug Original
 texscores = Choral Klavierauszug
 
-pdfs = $(instruments:%=$(OUT)/Eybler_EcceQuomodo_HVdeest_Instrument_%.pdf) $(scores:%=$(OUT)/Eybler_EcceQuomodo_HVdeest_Score_%.pdf)
-texs = $(scores:%=TeX_Eybler_EcceQuomodo_HVdeest_Score_%.tex)
-texpdfs = $(texscores:%=$(OUT)/TeX_Eybler_EcceQuomodo_HVdeest_Score_%.pdf)
+pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(scores:%=$(OUT)/$(base)_Score_%.pdf)
+texs = $(scores:%=TeX_$(base)_Score_%.tex)
+texpdfs = $(texscores:%=$(OUT)/TeX_$(base)_Score_%.pdf)
 
 
 .PHONY: all clean
@@ -21,8 +22,8 @@ clean:
 $(OUT) : 
 	mkdir -p $(OUT)
 
-$(instruments): % : $(OUT)/Eybler_EcceQuomodo_HVdeest_Instrument_%.pdf $(SRCS)
-$(scores): % : $(OUT)/Eybler_EcceQuomodo_HVdeest_Score_%.pdf $(SRCS)
+$(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
+$(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS)
 
 $(OUT)/%.pdf : %.ly $(SRCS)
 	lilypond -o $(basename $@) $<