Geh_unter_der_Gnade: makefile new

3 files changed, 181 insertions, 31 deletions

diff --git a/Geh_unter_der_Gnade/Geh_unter_der_Gnade.ly b/Geh_unter_der_Gnade/Geh_unter_der_Gnade.ly
index c386aa2..8201e63 100644
--- a/Geh_unter_der_Gnade/Geh_unter_der_Gnade.ly
+++ b/Geh_unter_der_Gnade/Geh_unter_der_Gnade.ly
@@ -1,9 +1,12 @@
 \include "deutsch.ly"
+#(ly:set-option 'relative-includes #t)
 \include "stimmen.ly"
 \include "texte.ly"
+#(ly:set-option 'relative-includes #f)
 
-#(set! paper-alist (cons '("kindle" . (cons (* 210 mm) (* 130 mm))) paper-alist))
-#(set-default-paper-size "kindle")
+%spezifisch%
+
+\version "2.19.80"
 
 \pointAndClickOff
 
@@ -12,19 +15,21 @@
 }
 \paper {
   top-margin = 5
+  print-all-headers = ##t
 }
 
 \score {
+  \header {
+    title = "Geh unter der Gnade"
+  }
   \new ChoirStaff <<
     \set Score.skipBars = ##t
     \new Lyrics = "textSopran" {}
-    \new Staff {
-      <<
-        \pausenFrauen
-        \new Voice = "sopran"    { \global \voiceOne \sopranMelodie }
-	\new Voice = "alt"       { \global \voiceTwo \altMelodie }
-      >>
-    }
+    \new Staff <<
+      \pausenFrauen
+      \new Voice = "sopran"    { \global \voiceOne \sopranMelodie }
+      \new Voice = "alt"       { \global \voiceTwo \altMelodie }
+    >>
     \new Lyrics = "textEins" {}
     \new Lyrics = "textZwei" {}
     \new Lyrics = "textDrei" {}
diff --git a/Geh_unter_der_Gnade/Makefile b/Geh_unter_der_Gnade/Makefile
new file mode 100644
index 0000000..5b3af49
--- /dev/null
+++ b/Geh_unter_der_Gnade/Makefile
@@ -0,0 +1,31 @@
+CURDOC=$(shell basename "$(CURDIR)")
+
+ifeq ($(FUER),ewe)
+  SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\")
+else
+  SPEZIFISCH=
+  # \#(set-global-staff-size 14)
+endif
+
+ifeq ($(MIDI),1)
+  MIDI_REGEX=
+else
+  MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }
+endif
+
+all: $(CURDOC).pdf
+
+clean:
+	rm -f *.pre
+
+Clean: clean
+	rm -f *.pdf *.midi
+
+%.pre: %.ly
+	sed " \
+		s@%spezifisch%@$(SPEZIFISCH)@ ; \
+		$(MIDI_REGEX) \
+	" "$<" > "$@"
+
+%.pdf: %.pre *.ly
+	lilypond $<
diff --git a/Geh_unter_der_Gnade/stimmen.ly b/Geh_unter_der_Gnade/stimmen.ly
index 71930c5..941de3b 100644
--- a/Geh_unter_der_Gnade/stimmen.ly
+++ b/Geh_unter_der_Gnade/stimmen.ly
@@ -12,42 +12,156 @@
 % Die Stimmen
 
   pausenFrauen = {
-    s2 r8 s4. | s2. r4 | s2 r8 s4. | s1 | s2 r8 s4. | s1*2 | s2. r4 |
-    s2 r8 s4. | s2. r4 | s2 r8 s4. | s1 | s2 r8 s4. | s1*2 | s2. r4 | \bar "|."
-    r4 s2. | s1 | r4 s2. | s1 | r4 s2. | s1 | r4 s2. | s1 | \bar "||"
+    s2 r8 s4. |
+    s2. r4 |
+    s2 r8 s4. |
+    s1 |
+    s2 r8 s4. |
+    s1*2 |
+    s2. r4 |
+    s2 r8 s4. |
+    s2. r4 |
+    s2 r8 s4. |
+    s1 |
+    s2 r8 s4. |
+    s1*2 |
+    s2. r4 | \bar "|."
+    r4 s2. |
+    s1 |
+    r4 s2. |
+    s1 |
+    r4 s2. |
+    s1 |
+    r4 s2. |
+    s1 | \bar "||"
   }
 
   pausenMaenner = {
-    s2 r8 s4. | s2. r4 | s2 r8 s4. | s1*4 | s2. r4 |
-    s2 r8 s4. | s2. r4 | s2 r8 s4. | s1*4 | s2. r4 | \bar "|."
-    r4 s2. | s1 | r4 s2. | s1 | r4 s2. | s1 | r4 s2. | s1 | \bar "||"
+    s2 r8 s4. |
+    s2. r4 |
+    s2 r8 s4. |
+    s1*4 |
+    s2. r4 |
+    s2 r8 s4. |
+    s2. r4 |
+    s2 r8 s4. |
+    s1*4 |
+    s2. r4 | \bar "|."
+    r4 s2. |
+    s1 |
+    r4 s2. |
+    s1 |
+    r4 s2. |
+    s1 |
+    r4 s2. |
+    s1 | \bar "||"
   }
 
   sopranMelodie = \relative cis' {
-    cis2 s8 cis d e | e4 fis2 s4 | gis2 s8 gis a h | a4 e2.\breathe | a2 s8 a h cis | h4( a) fis2 | r4 e8 e e e e4 | e2. s4 |
-    cis2 s8 cis d e | e4 fis2 s4 | gis2 s8 gis a h | a4 e2.\breathe | a2 s8 a h cis | d4( cis h) a | r h8 h h4 h8 a | a2. s4 | \bar "|."
-    s fis8 fis fis4 a | gis fis e d | s cis8 cis e4 cis | h a cis2 |
-    s4 d8 d fis4 d | cis h d fis | s gis8 gis fis4 fis | e e d2\breathe | \bar "||"
+    cis2 s8 cis d e |
+    e4 fis2 s4 |
+    gis2 s8 gis a h |
+    a4 e2.\breathe |
+    a2 s8 a h cis |
+    h4( a) fis2 |
+    r4 e8 e e e e4 |
+    e2. s4 |
+    cis2 s8 cis d e |
+    e4 fis2 s4 |
+    gis2 s8 gis a h |
+    a4 e2.\breathe |
+    a2 s8 a h cis |
+    d4( cis h) a |
+    r h8 h h4 h8 a |
+    a2. s4 | \bar "|."
+    s fis8 fis fis4 a |
+    gis fis e d |
+    s cis8 cis e4 cis |
+    h a cis2 |
+    s4 d8 d fis4 d |
+    cis h d fis |
+    s gis8 gis fis4 fis |
+    e e d2\breathe | \bar "||"
   }
 
   altMelodie = \relative a {
-    a2 s8 a a a | a4 d2 s4 | e2 s8 e e e | e2 d | e s8 e e e | fis2 d | h h8 h h4 | h( cis d) s |
-    a2 s8 a a a | a4 d2 s4 | e2 s8 e e e | e2 d | e s8 e e e | fis2 fis | e4 e e d8 d | cis2. s4 | \bar "|."
-    s cis8 cis cis4 cis | e d cis h | s cis8 cis cis4 cis | h a cis2 |
-    s4 d8 d d4 a | a a a d | s e8 e d4 d | cis cis h2 | \bar "||"
+    a2 s8 a a a |
+    a4 d2 s4 |
+    e2 s8 e e e |
+    e2 d |
+    e s8 e e e |
+    fis2 d |
+    h h8 h h4 |
+    h( cis d) s |
+    a2 s8 a a a |
+    a4 d2 s4 |
+    e2 s8 e e e |
+    e2 d |
+    e s8 e e e |
+    fis2 fis |
+    e4 e e d8 d |
+    cis2. s4 | \bar "|."
+    s cis8 cis cis4 cis |
+    e d cis h |
+    s cis8 cis cis4 cis |
+    h a cis2 |
+    s4 d8 d d4 a |
+    a a a d |
+    s e8 e d4 d |
+    cis cis h2 | \bar "||"
   }
 
   tenorMelodie = \relative e {
-    e2 s8 e e e | g4 a2 s4 | h2 s8 h a gis | a2 gis\breathe | cis r8 cis a a | d2 h4( a) | a2 a8 a fis4 | g2. s4 |
-    e2 s8 e e e | g4 a2 s4 | h2 s8 h a gis | a2 gis\breathe | cis r8 cis a a | a2 h4( cis) | d d cis h8 h | a2. s4 | \bar "|."
-    s a8 a gis4 a | h a a gis | s a8 a a4 a | a a a2 |
-    s4 a8 a a4 fis | fis fis fis a | s h8 h a4 a | gis gis fis2\breathe | \bar "||"
+    e2 s8 e e e |
+    g4 a2 s4 |
+    h2 s8 h a gis |
+    a2 gis\breathe |
+    cis r8 cis a a |
+    d2 h4( a) |
+    a2 a8 a fis4 |
+    gis2. s4 |
+    e2 s8 e e e |
+    g4 a2 s4 |
+    h2 s8 h a gis |
+    a2 gis\breathe |
+    cis r8 cis a a |
+    a2 h4( cis) |
+    d d cis h8 h |
+    a2. s4 | \bar "|."
+    s a8 a gis4 a |
+    h a a gis |
+    s a8 a a4 a |
+    a a a2 |
+    s4 a8 a a4 fis |
+    fis fis fis a |
+    s h8 h a4 a |
+    gis gis fis2\breathe | \bar "||"
   }
 
   bassMelodie = \relative a, {
-    a2 s8 a h cis | d4 d2 s4 | d2 s8 d d d | cis2 h | a4( gis') fis e8 e | d2 d | e e8 e e4 | e2. s4 |
-    a,2 s8 a h cis | d4 d2 s4 | d2 s8 d d d | cis2 h | a4( gis') fis e8 e | d2 d | e4 e e e8 e | a,2. s4 | \bar "|."
-    s fis'8 fis fis4 fis | e e fis gis | \tag #'note fis \tag #'pause s a8 a a4 gis | fis fis fis2 |
-    s4 fis8 fis e4 e | d d h h | s e8 e e4 e | e e e2\breathe | \bar "||"
+    a2 s8 a h cis |
+    d4 d2 s4 |
+    d2 s8 d d d |
+    cis2 h |
+    a4( gis') fis e8 e |
+    d2 d |
+    e e8 e e4 |
+    e2. s4 |
+    a,2 s8 a h cis |
+    d4 d2 s4 |
+    d2 s8 d d d |
+    cis2 h |
+    a4( gis') fis e8 e |
+    d2 d |
+    e4 e e e8 e |
+    a,2. s4 | \bar "|."
+    s fis'8 fis fis4 fis |
+    e e fis gis |
+    \tag #'note fis \tag #'pause s a8 a a4 gis |
+    fis fis fis2 |
+    s4 fis8 fis e4 e |
+    d d h h |
+    s e8 e e4 e |
+    e e e2\breathe | \bar "||"
   }