Ehre_sei_Gott_in_der_Hoehe: "Wie soll ich dich empfangen" nun per make-Schalter aktivierbar

4 files changed, 95 insertions, 86 deletions

diff --git a/Ehre_sei_Gott_in_der_Hoehe/Ehre_sei_Gott_in_der_Hoehe.ly b/Ehre_sei_Gott_in_der_Hoehe/Ehre_sei_Gott_in_der_Hoehe.ly
index 107dab3..4a974a0 100644
--- a/Ehre_sei_Gott_in_der_Hoehe/Ehre_sei_Gott_in_der_Hoehe.ly
+++ b/Ehre_sei_Gott_in_der_Hoehe/Ehre_sei_Gott_in_der_Hoehe.ly
@@ -1,7 +1,7 @@
 \include "deutsch.ly"
 #(ly:set-option 'relative-includes #t)
-\include "stimmen.ly"
-\include "texte.ly"
+\include "stimmen.pre"
+\include "texte.pre"
 #(ly:set-option 'relative-includes #f)
 
 %spezifisch%
diff --git a/Ehre_sei_Gott_in_der_Hoehe/Makefile b/Ehre_sei_Gott_in_der_Hoehe/Makefile
index ef6dedf..0904383 100644
--- a/Ehre_sei_Gott_in_der_Hoehe/Makefile
+++ b/Ehre_sei_Gott_in_der_Hoehe/Makefile
@@ -7,6 +7,12 @@ else
   # \#(set-global-staff-size 14)
 endif
 
+ifeq ($(MIT_CHORAL),1)
+  WSIDE=s/^%Wside%//
+else
+  WSIDE=/^%Wside%/d
+endif
+
 all: $(CURDOC).pdf
 
 clean:
@@ -16,8 +22,11 @@ Clean: clean
 	rm -f *.pdf *.midi
 
 %.pre: %.ly
-	sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@"
+	sed " \
+		s@%spezifisch%@$(SPEZIFISCH)@; \
+		$(WSIDE) \
+	" "$<" > "$@"
 
-%.pdf: %.pre *.ly
+%.pdf: %.pre stimmen.pre texte.pre
 	lilypond $<
 
diff --git a/Ehre_sei_Gott_in_der_Hoehe/stimmen.ly b/Ehre_sei_Gott_in_der_Hoehe/stimmen.ly
index 7113d68..947973e 100644
--- a/Ehre_sei_Gott_in_der_Hoehe/stimmen.ly
+++ b/Ehre_sei_Gott_in_der_Hoehe/stimmen.ly
@@ -30,16 +30,16 @@
     s2 r4 s |
     s1*7 |
     s2 r | \bar "||"
-%    \time 4/2 \partial 2
-%    \repeat volta 2 {
-%      s2 |
-%      s1*7 r2
-%    }
-%    s2 |
-%    s1*6 |
-%    s1 r2 s |
-%    s1*6 |
-%    s1 r2 \bar "||"
+%Wside%    \time 4/2 \partial 2
+%Wside%    \repeat volta 2 {
+%Wside%      s2 |
+%Wside%      s1*7 r2
+%Wside%    }
+%Wside%    s2 |
+%Wside%    s1*6 |
+%Wside%    s1 r2 s |
+%Wside%    s1*6 |
+%Wside%    s1 r2 \bar "||"
   }
 
   melodieSopran = \relative c'' {
@@ -85,23 +85,23 @@
     g2( c,4) f |
     e2( d) |
     c s | \bar "||"
-%    \time 4/2 \partial 2
-%    \repeat volta 2 {
-%      c, |
-%      g' g a h |
-%      c1 c2^\fermata e |
-%      d c c h |
-%      c1^\fermata s2
-%    }
-%    c4( d) |
-%    e2 e d c |
-%    h( a) g^\fermata h |
-%    c h a a |
-%    g1^\fermata s2 g4( f) |
-%    e( f) g2 a g |
-%    g2.( f4) e2^\fermata g |
-%    f e d d |
-%    c1^\fermata s2 \bar "||"
+%Wside%    \time 4/2 \partial 2
+%Wside%    \repeat volta 2 {
+%Wside%      c, |
+%Wside%      g' g a h |
+%Wside%      c1 c2^\fermata e |
+%Wside%      d c c h |
+%Wside%      c1^\fermata s2
+%Wside%    }
+%Wside%    c4( d) |
+%Wside%    e2 e d c |
+%Wside%    h( a) g^\fermata h |
+%Wside%    c h a a |
+%Wside%    g1^\fermata s2 g4( f) |
+%Wside%    e( f) g2 a g |
+%Wside%    g2.( f4) e2^\fermata g |
+%Wside%    f e d d |
+%Wside%    c1^\fermata s2 \bar "||"
   }
 
   melodieAlt = \relative e' {
@@ -149,23 +149,23 @@
     g2( e4) a |
     g2.( f4) |
     e2 s | \bar "||"
-%    \time 4/2 \partial 2
-%    \repeat volta 2 {
-%      c |
-%      d e f f |
-%      e( f) e g |
-%      g e f d |
-%      e1 s2
-%    }
-%    e4( f) |
-%    g2 g g g |
-%    g( fis) e e |
-%    e4( fis) g2 e d4( c) |
-%    h1 s2 d |
-%    c4( d) e2 f e |
-%    d1 c2 c |
-%    c c d4( c) h2 |
-%    c1 s2 \bar "||"
+%Wside%    \time 4/2 \partial 2
+%Wside%    \repeat volta 2 {
+%Wside%      c |
+%Wside%      d e f f |
+%Wside%      e( f) e g |
+%Wside%      g e f d |
+%Wside%      e1 s2
+%Wside%    }
+%Wside%    e4( f) |
+%Wside%    g2 g g g |
+%Wside%    g( fis) e e |
+%Wside%    e4( fis) g2 e d4( c) |
+%Wside%    h1 s2 d |
+%Wside%    c4( d) e2 f e |
+%Wside%    d1 c2 c |
+%Wside%    c c d4( c) h2 |
+%Wside%    c1 s2 \bar "||"
   }
 
   melodieTenor = \relative g {
@@ -212,23 +212,23 @@
     c2. c4 |
     c2( h) |
     c s | \bar "||"
-%    \time 4/2 \partial 2
-%    \repeat volta 2 {
-%      e, |
-%      g c c d |
-%      g,( a) g c |
-%      h c a g |
-%      g1 s2
-%    }
-%    g |
-%    c c d e |
-%    d2.( c4) h2 g |
-%    c d a4( g) fis2 |
-%    g1 s2 g |
-%    g c c c |
-%    g( h) c c |
-%    a g a g4( f) |
-%    e1 s2 \bar "||"
+%Wside%    \time 4/2 \partial 2
+%Wside%    \repeat volta 2 {
+%Wside%      e, |
+%Wside%      g c c d |
+%Wside%      g,( a) g c |
+%Wside%      h c a g |
+%Wside%      g1 s2
+%Wside%    }
+%Wside%    g |
+%Wside%    c c d e |
+%Wside%    d2.( c4) h2 g |
+%Wside%    c d a4( g) fis2 |
+%Wside%    g1 s2 g |
+%Wside%    g c c c |
+%Wside%    g( h) c c |
+%Wside%    a g a g4( f) |
+%Wside%    e1 s2 \bar "||"
   }
 
   melodieBass = \relative c {
@@ -276,22 +276,22 @@
     e2( a4) f |
     g2( g,) |
     c s | \bar "||"
-%    \time 4/2 \partial 2
-%    \repeat volta 2 {
-%      c2 |
-%      h c f d |
-%      c1 c2_\fermata c |
-%      g' a f g |
-%      c,1_\fermata s2
-%    }
-%    c |
-%    c c h c |
-%    d1 e2_\fermata e |
-%    a, h c d |
-%    g,1_\fermata s2 h |
-%    c c f c |
-%    h( g) a_\fermata e' |
-%    f c f g |
-%    c,1_\fermata s2 \bar "||"
+%Wside%    \time 4/2 \partial 2
+%Wside%    \repeat volta 2 {
+%Wside%      c2 |
+%Wside%      h c f d |
+%Wside%      c1 c2_\fermata c |
+%Wside%      g' a f g |
+%Wside%      c,1_\fermata s2
+%Wside%    }
+%Wside%    c |
+%Wside%    c c h c |
+%Wside%    d1 e2_\fermata e |
+%Wside%    a, h c d |
+%Wside%    g,1_\fermata s2 h |
+%Wside%    c c f c |
+%Wside%    h( g) a_\fermata e' |
+%Wside%    f c f g |
+%Wside%    c,1_\fermata s2 \bar "||"
   }
 
diff --git a/Ehre_sei_Gott_in_der_Hoehe/texte.ly b/Ehre_sei_Gott_in_der_Hoehe/texte.ly
index 1b89d01..40a912e 100644
--- a/Ehre_sei_Gott_in_der_Hoehe/texte.ly
+++ b/Ehre_sei_Gott_in_der_Hoehe/texte.ly
@@ -16,14 +16,14 @@
     und Frie -- de auf Er -- den, und den Men -- schen ein Wohl -- ge -- fal -- len.
     Eh -- re, Eh -- re, Eh -- re sei Gott in der Hö -- he und Frie -- de auf Er -- den und den Men -- schen ein Wohl -- ge -- fal -- len,
     und den Men -- schen ein Wohl -- ge -- fal -- len.
-%    Wie soll ich dich em -- pfan -- gen und wie be -- gegn ich dir,
-%    O __ Je -- su, Je -- su, set -- ze mir selbst die Fa -- ckel bei,
-%    da -- mit, was dich er -- göt -- ze, mir kund und wis -- send sei.
+%Wside%    Wie soll ich dich em -- pfan -- gen und wie be -- gegn ich dir,
+%Wside%    O __ Je -- su, Je -- su, set -- ze mir selbst die Fa -- ckel bei,
+%Wside%    da -- mit, was dich er -- göt -- ze, mir kund und wis -- send sei.
   }
 
   textAltB = \lyricmode {
     \repeat unfold 95 { \skip 1 }
-%   o al -- ler Welt Ver -- lan -- gen, o mei -- ner See -- len Zier?
+%Wside%    o al -- ler Welt Ver -- lan -- gen, o mei -- ner See -- len Zier?
   }
 
   textTenor = \lyricmode {