Alle_Tage_Alle_Naechte: Korrektur und Umbenennung

5 files changed, 183 insertions, 44 deletions

diff --git a/All_Night,_All_Day/stimmen.ly b/All_Night,_All_Day/stimmen.ly
deleted file mode 100644
index 3f61384..0000000
--- a/All_Night,_All_Day/stimmen.ly
+++ /dev/null
@@ -1,41 +0,0 @@
-%some settings% vim: ai sw=2 lbr nu et
-
-  \version "2.12"
-
-  global = {
-    \key a \major
-    %\override Staff.TimeSignature #'style = #'()
-    \time 2/4
-    \autoBeamOff
-  }
-
-% Die Stimmen
-
-  sopranMelodie = \relative c' {
-    e2 | a | cis | a | fis4 a | a8 fis a fis | a a4. | fis8( e4.) |
-    e2 | a | cis | a | e'4 cis | cis8. a16 h8 gis | a2~ | a | \bar "||"
-    e2 | a | cis | a | fis4 a | a8 fis a fis | a a4. | fis8( e4.) |
-    e2 | a | cis | a | e'4 cis | cis8. a16 h8 gis | a2~ | a | \bar "||"
-  }
-
-  altMelodie = \relative c' {
-    cis2 | cis | e | cis | d4 fis | fis8 d fis d | fis fis4. | d2 |
-    cis | e4( fis) | fis2 | e | fis | fis | e4 d | cis2 | \bar "||"
-    cis2 | cis | e | cis | d4 fis | fis8 d fis d | fis fis4. | d2 |
-    cis | e4( fis) | fis2 | e | fis | fis | e4 d | cis2 | \bar "||"
-  }
-  
-  tenorMelodie = \relative c {
-    r4 e | fis( e) | r e | fis( e) | r a | h( cis) | h( a) | gis a8[( h]) |
-    a2 | cis | a4( h) | h( a) | a2 | cis4( d) | g, f | e2 | \bar "||"
-    r4 e | fis( e) | r e | fis( e) | r a | h( cis) | h( a) | gis a8[( h]) |
-    a2 | cis | a4( h) | h( a) | a2 | cis4( d) | g, f | e2 | \bar "||"
-  }
-
-  bassMelodie = \relative c {
-    a2 | a | a | a | d | d | d | e4 fis8[( gis]) |
-    a4( gis) | fis( e) | d2 | cis | d | e | c4 b | a2 | \bar "||"
-    cis2 | fis | cis4 cis | fis( e) | d2 | d | d | e4 fis8[( gis]) |
-    a4 gis | fis e | cis cis | h( cis) | d2 | e | c4 c | b2 | \bar "|."
-  }
-
diff --git a/All_Night,_All_Day/All_Night,_All_Day.ly b/Alle_Tage_alle_Naechte/Alle_Tage_alle_Naechte.ly
index 4bc4c68..37687da 100644
--- a/All_Night,_All_Day/All_Night,_All_Day.ly
+++ b/Alle_Tage_alle_Naechte/Alle_Tage_alle_Naechte.ly
@@ -1,21 +1,25 @@
 \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%
 
 \pointAndClickOff
 
 \header {
   tagline = ""
-  title = "All Night, All Day"
 }
 \paper {
   top-margin = 5
+  print-all-headers = ##t
 }
 
 \score {
+  \header {
+    title = "All Night, All Day"
+  }
   \new ChoirStaff <<
     \set Score.skipBars = ##t
     \new Staff {
diff --git a/Alle_Tage_alle_Naechte/Makefile b/Alle_Tage_alle_Naechte/Makefile
new file mode 100644
index 0000000..ef6dedf
--- /dev/null
+++ b/Alle_Tage_alle_Naechte/Makefile
@@ -0,0 +1,23 @@
+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
+
+all: $(CURDOC).pdf
+
+clean:
+	rm -f *.pre
+
+Clean: clean
+	rm -f *.pdf *.midi
+
+%.pre: %.ly
+	sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@"
+
+%.pdf: %.pre *.ly
+	lilypond $<
+
diff --git a/Alle_Tage_alle_Naechte/stimmen.ly b/Alle_Tage_alle_Naechte/stimmen.ly
new file mode 100644
index 0000000..407aae6
--- /dev/null
+++ b/Alle_Tage_alle_Naechte/stimmen.ly
@@ -0,0 +1,153 @@
+%some settings% vim: ai sw=2 lbr nu et
+
+  \version "2.12"
+
+  global = {
+    \key a \major
+    %\override Staff.TimeSignature #'style = #'()
+    \time 2/4
+    \autoBeamOff
+  }
+
+% Die Stimmen
+
+  sopranMelodie = \relative c' {
+    e2 |
+    a |
+    cis |
+    a |
+    fis4 a |
+    a8 fis a fis |
+    a a4. |
+    fis8( e4.) |
+    e2 |
+    a |
+    cis |
+    a |
+    e'4 cis |
+    cis8. a16 h8 gis |
+    a2~ |
+    a | \bar "||"
+    e4 fis |
+    a h |
+    cis8[( h]) cis4 |
+    a2 |
+    fis4 a |
+    a8 fis a fis |
+    a a4. |
+    fis8( e4.) |
+    e4 fis |
+    a h |
+    cis8[( h]) cis4 |
+    a2 |
+    e'4 cis |
+    cis8. a16 h8 gis |
+    a2~ |
+    a | \bar "||"
+  }
+
+  altMelodie = \relative c' {
+    cis2 |
+    cis |
+    e |
+    cis |
+    d4 fis |
+    fis8 d fis d |
+    fis fis4. |
+    d2 |
+    cis |
+    e4( fis) |
+    fis2 |
+    e |
+    fis |
+    fis |
+    e4 d |
+    cis2 | \bar "||"
+    cis2 |
+    cis |
+    e4 e |
+    cis2 |
+    d4 fis |
+    fis8 d fis d |
+    fis fis4. |
+    d2 |
+    cis |
+    e4( fis) |
+    fis fis |
+    e2 |
+    fis |
+    fis |
+    e4 d |
+    cis2 | \bar "||"
+  }
+  
+  tenorMelodie = \relative c {
+    r4 e |
+    fis( e) |
+    r e |
+    fis( e) |
+    r a |
+    h( cis) |
+    h( a) |
+    gis a8[( h]) |
+    a2 |
+    cis |
+    a4( h) |
+    h( a) |
+    a2 |
+    cis4( d) |
+    g, f |
+    e2 | \bar "||"
+    gis |
+    cis |
+    gis4 gis |
+    cis2 |
+    r4 a |
+    h( cis) |
+    h( a) |
+    gis a8[( h]) |
+    a2 |
+    cis |
+    h4 h |
+    a2 |
+    a |
+    cis4( d) |
+    g g |
+    f2 | \bar "||"
+  }
+
+  bassMelodie = \relative c {
+    a2 |
+    a |
+    a |
+    a |
+    d |
+    d |
+    d |
+    e4 fis8[( gis]) |
+    a4( gis) |
+    fis( e) |
+    d2 |
+    cis |
+    d |
+    e |
+    c4 b |
+    a2 | \bar "||"
+    cis2 |
+    fis |
+    cis4 cis |
+    fis( e) |
+    d2 |
+    d |
+    d |
+    e4 fis8[( gis]) |
+    a4 gis |
+    fis e |
+    cis cis |
+    h( cis) |
+    d2 |
+    e |
+    c4 c |
+    b2 | \bar "|."
+  }
+
diff --git a/All_Night,_All_Day/texte.ly b/Alle_Tage_alle_Naechte/texte.ly
index 525fc6e..525fc6e 100644
--- a/All_Night,_All_Day/texte.ly
+++ b/Alle_Tage_alle_Naechte/texte.ly