Die_beste_Zeit_im_Jahr_ist_mein: Makefile neu, kleine Aufhuebschungen

3 files changed, 55 insertions, 12 deletions

diff --git a/Die_beste_Zeit_im_Jahr_ist_mein/Die_beste_Zeit_im_Jahr_ist_mein.ly b/Die_beste_Zeit_im_Jahr_ist_mein/Die_beste_Zeit_im_Jahr_ist_mein.ly
index edb98ae..90f74da 100644
--- a/Die_beste_Zeit_im_Jahr_ist_mein/Die_beste_Zeit_im_Jahr_ist_mein.ly
+++ b/Die_beste_Zeit_im_Jahr_ist_mein/Die_beste_Zeit_im_Jahr_ist_mein.ly
@@ -1,23 +1,29 @@
 \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 {
-  title = "Die beste Zeit im Jahr ist mein"
-  poet = "Text: Martin Luther (1483 - 1546)"
-  composer = "Melodie und Satz: Arnold Mendelssohn (1855 - 1933)"
   tagline = ""
 }
 \paper {
   top-margin = 5
+  print-all-headers = ##t
 }
 
 \score {
+  \header {
+    title = "Die beste Zeit im Jahr ist mein"
+    poet = "Text: Martin Luther (1483 - 1546)"
+    composer = "Melodie und Satz: Arnold Mendelssohn (1855 - 1933)"
+    tagline = ""
+  }
+
   \new ChoirStaff <<
     \set Score.skipBars = ##t
     \new Lyrics = textSopran       { }
@@ -32,13 +38,17 @@
       \new Voice = tenor    { \global \clef "bass" \voiceOne \melodieTenor }
       \new Voice = bass     { \global \clef "bass" \voiceTwo \melodieBass }
     >>
-    \new Lyrics = textBass        { }
+    \new Lyrics = textBassI        { }
+    \new Lyrics = textBassII       { }
+    \new Lyrics = textBassIII      { }
 
-    \context Lyrics = textSopran \lyricsto sopran   { \textSopran }
-    \context Lyrics = textI      \lyricsto tenor    { \textI }
-    \context Lyrics = textII     \lyricsto tenor    { \textII }
-    \context Lyrics = textIII    \lyricsto tenor    { \textIII }
-    \context Lyrics = textBass   \lyricsto bass     { \textBass }
+    \context Lyrics = textSopran  \lyricsto sopran   { \textSopran }
+    \context Lyrics = textI       \lyricsto tenor    { \textI }
+    \context Lyrics = textII      \lyricsto tenor    { \textII }
+    \context Lyrics = textIII     \lyricsto tenor    { \textIII }
+    \context Lyrics = textBassI   \lyricsto bass     { \textBassI }
+    \context Lyrics = textBassII  \lyricsto bass     { \textBassII }
+    \context Lyrics = textBassIII \lyricsto bass     { \textBassIII }
   >>
   \layout {
     indent = #0
diff --git a/Die_beste_Zeit_im_Jahr_ist_mein/Makefile b/Die_beste_Zeit_im_Jahr_ist_mein/Makefile
new file mode 100644
index 0000000..ef6dedf
--- /dev/null
+++ b/Die_beste_Zeit_im_Jahr_ist_mein/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/Die_beste_Zeit_im_Jahr_ist_mein/texte.ly b/Die_beste_Zeit_im_Jahr_ist_mein/texte.ly
index 72615f8..55e45be 100644
--- a/Die_beste_Zeit_im_Jahr_ist_mein/texte.ly
+++ b/Die_beste_Zeit_im_Jahr_ist_mein/texte.ly
@@ -30,8 +30,18 @@
     der Mu -- si -- ka ein Mei -- ste -- rin. __
   }
 
-  textBass = \lyricmode {
+  textBassI = \lyricmode {
     \repeat unfold 16 { \skip 1 }
     Him -- mel
   }
 
+  textBassII = \lyricmode {
+    \repeat unfold 16 { \skip 1 }
+    mit __
+  }
+
+  textBassIII = \lyricmode {
+    \repeat unfold 16 { \skip 1 }
+    zu __
+  }
+