Meine_Zeit: mehr Text + Makefile

4 files changed, 185 insertions, 23 deletions

diff --git a/Meine_Zeit/Makefile b/Meine_Zeit/Makefile
new file mode 100644
index 0000000..ef6dedf
--- /dev/null
+++ b/Meine_Zeit/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/Meine_Zeit/Meine_Zeit.ly b/Meine_Zeit/Meine_Zeit.ly
index 75ec916..1c6eb61 100644
--- a/Meine_Zeit/Meine_Zeit.ly
+++ b/Meine_Zeit/Meine_Zeit.ly
@@ -1,23 +1,27 @@
 \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 = "Meine Zeit"
-  poet = "T&M: Peter Strauch"
-  composer = "S: Gordon Schultz / Every Zabel"
 }
 \paper {
   top-margin = 5
+  print-all-headers = ##t
 }
 
 \score {
+  \header {
+    title = "Meine Zeit"
+    poet = "T&M: Peter Strauch"
+    composer = "S: Gordon Schultz / Every Zabel"
+  }
   \new ChoirStaff <<
     \set Score.skipBars = ##t
     \new Staff {
@@ -29,6 +33,7 @@
     }
     \new Lyrics = "textEins" {}
     \new Lyrics = "textZwei" {}
+    \new Lyrics = "textDrei" {}
     \new Staff = "maenner" <<
       \new Voice = "maenner"    {  \global \pausen }
       \new Voice = "tenor"      { \global \clef "bass" \voiceOne \tenorMelodie }
@@ -36,6 +41,7 @@
     >>
     \context Lyrics = "textEins" \lyricsto "bass" \textI
     \context Lyrics = "textZwei" \lyricsto "bass" \textII
+    \context Lyrics = "textDrei" \lyricsto "bass" \textIII
   >>
   \layout {
     indent = #0
diff --git a/Meine_Zeit/stimmen.ly b/Meine_Zeit/stimmen.ly
index 6271970..0473a0c 100644
--- a/Meine_Zeit/stimmen.ly
+++ b/Meine_Zeit/stimmen.ly
@@ -9,37 +9,161 @@
     \autoBeamOff
   }
 
+  punktBoegen = {
+    \set melismaBusyProperties = #'(beamMelismaBusy)
+    \slurDashed
+    \tieDashed
+  }
+
+  strichBoegen = {
+    \set melismaBusyProperties = #'(melismaBusy slurMelismaBusy tieMelismaBusy beamMelismaBusy)
+    \slurSolid
+    \tieSolid
+  }
+
 % Die Stimmen
 
   pausen = \relative c' {
-    s1*15 | s2. r4 | \bar "|."
+    s1*15 |
+    s2. r4 | \bar "|."
   }
 
   sopranMelodie = \relative e' {
-    e2. e4 | e( d8[ c]~ c2) | g'4 g g a | e( d8) c~ c2 | f g4 a | g f e2 | f4 e d c | h1 |
-    e2 e4 e | e d8 c~ c2 | g'4 g g a | e( d8) c~ c2 | f g4 a | g4 f8 e~ e2 | f4 f e d | c2. s4 | \bar "|."
-    e2 e | a a4 a | g d e f | e1 | f4 f f f | g g g d | e1~ | e |
-    e2 e | a a | h4 h a h | c1 | \tieDashed \set melismaBusyProperties = #'() c4~ c c~ c \tieSolid \set melismaBusyProperties = #'(melismaBusy slurMelismaBusy tieMelismaBusy beamMelismaBusy) | h h a a | g1~ g | \bar "||"
+    e2. e4 |
+    e( d8[ c]~ c2) |
+    g'4 g g a |
+    e( d8) c~ c2 |
+    f g4 a |
+    g f e2 |
+    f4 e d c |
+    h1 |
+    e2 e4 e |
+    e d8 c~ c2 |
+    g'4 g g a |
+    e( d8) c~ c2 |
+    f g4 a |
+    g4 f8 e~ e2 |
+    f4 f e d |
+    c2. s4 | \bar "|."
+    e2 e |
+    a \punktBoegen a4~ a \strichBoegen |
+    g d e f |
+    e1 |
+    f4 f f f |
+    g g g d |
+    e1~ |
+    e |
+    e2 e |
+    a a |
+    h4 h a h |
+    c1 |
+    \punktBoegen c4~ c c~ c \strichBoegen |
+    h h a a |
+    g1~ g | \bar "||"
   }
 
   altMelodie = \relative c' {
-    c2. c4 | c( h8[ a]~ a2) | h4 h e e | e( d8) c~ c2 | c c4 c | c c c2 | a4 a a a | h1 |
-    c2 c4 c | c h8 a~ a2 | h4 h e e | e( d8) c~ c2 | c c4 c | c4 c8 c~ c2 | c4 c c h | c2. s4 | \bar "|."
-    c2 c | f f4 f | d d h h | c1 | a4 a c c | h c d d | d1( | c) |
-    c2 c | f f | e4 e fis gis | a1 | \tieDashed \set melismaBusyProperties = #'() fis4~ fis fis~ fis \tieSolid \set melismaBusyProperties = #'(melismaBusy slurMelismaBusy tieMelismaBusy beamMelismaBusy) | g g fis fis | d2( e | f1) | \bar "||"
+    c2. c4 |
+    c( h8[ a]~ a2) |
+    h4 h e e |
+    e( d8) c~ c2 |
+    c c4 c |
+    c c c2 |
+    a4 a a a |
+    h1 |
+    c2 c4 c |
+    c h8 a~ a2 |
+    h4 h e e |
+    e( d8) c~ c2 |
+    c c4 c |
+    c4 c8 c~ c2 |
+    c4 c c h |
+    c2. s4 | \bar "|."
+    c2 c |
+    f \punktBoegen f4~ f \strichBoegen |
+    d d h h |
+    c1 |
+    a4 a c c |
+    h c d d |
+    d1( |
+    c) |
+    c2 c |
+    f f |
+    e4 e fis gis |
+    a1 |
+    \punktBoegen fis4~ fis fis~ fis \strichBoegen |
+    g g fis fis |
+    d2( e |
+    f1) | \bar "||"
   }
 
   tenorMelodie = \relative g {
-    g2. g4 | a1 | h4 h h h | c( h8) a~ a2 | a g4 f | e g a2 | d,4 e f f | g1 |
-    g2 g4 g | a a8 a~ a2 | h4 h h h | c( h8) a~ a2 | a g4 f | e4 g8 a~ a2 | a4 a g f | e2. s4 | \bar "|."
-    a2 a | c c4 c | h h g g | g1 | f4 f a a | g g g g | g1~ | g |
-    a2 a | c c | d4 d d d | e1 | \tieDashed \set melismaBusyProperties = #'() d4~ d d~ d \tieSolid \set melismaBusyProperties = #'(melismaBusy slurMelismaBusy tieMelismaBusy beamMelismaBusy) | d d c c | h2( c | d1) | \bar "||"
+    g2. g4 |
+    a1 |
+    h4 h h h |
+    c( h8) a~ a2 |
+    a g4 f |
+    e g a2 |
+    d,4 e f f |
+    g1 |
+    g2 g4 g |
+    a a8 a~ a2 |
+    h4 h h h |
+    c( h8) a~ a2 |
+    a g4 f |
+    e4 g8 a~ a2 |
+    a4 a g f |
+    e2. s4 | \bar "|."
+    a2 a |
+    c \punktBoegen c4~ c \strichBoegen |
+    h h g g |
+    g1 |
+    f4 f a a |
+    g g g g |
+    g1~ |
+    g |
+    a2 a |
+    c c |
+    d4 d d d |
+    e1 |
+    \punktBoegen d4~ d d~ d \strichBoegen |
+    d d c c |
+    h2( c |
+    d1) | \bar "||"
   }
 
   bassMelodie = \relative c {
-    c2. h4 | a1 | e'4 e e e | a,4. a8~ a2 | f' e4 f | c c a2 | d4 d d d | g,1 |
-    c2 c4 h | a a8 a~ a2 | e'4 e e e | a,4. a8~ a2 | f' e4 f | c4 c8 a~ a2 | d4 d g, g | c2. s4 | \bar "|."
-    a'2 a4( g) | f2 f4 f | g g g g | c,1 | d4 d d d | g, a h h | c1~ | c |
-    a'2 a4( g) | f2 f | e4 e e e | a1 | \tieDashed \set melismaBusyProperties = #'() d,4~ d d~ d \tieSolid \set melismaBusyProperties = #'(melismaBusy slurMelismaBusy tieMelismaBusy beamMelismaBusy) | d d d d | g1~ | g | \bar "||"
+    c2. h4 |
+    a1 |
+    e'4 e e e |
+    a,4. a8~ a2 |
+    f' e4 f |
+    c c a2 |
+    d4 d d d |
+    g,1 |
+    c2 c4 h |
+    a a8 a~ a2 |
+    e'4 e e e |
+    a,4. a8~ a2 |
+    f' e4 f |
+    c4 c8 a~ a2 |
+    d4 d g, g |
+    c2. s4 | \bar "|."
+    a'2 a4( g) |
+    f2 \punktBoegen f4~ f \strichBoegen |
+    g g g g |
+    c,1 |
+    d4 d d d |
+    g, a h h |
+    c1~ |
+    c |
+    a'2 a4( g) |
+    f2 f |
+    e4 e e e |
+    a1 |
+    \punktBoegen d,4~ d d~ d \strichBoegen |
+    d d d d |
+    g1~ |
+    g | \bar "||"
   }
 
diff --git a/Meine_Zeit/texte.ly b/Meine_Zeit/texte.ly
index 02a9bfc..fae613f 100644
--- a/Meine_Zeit/texte.ly
+++ b/Meine_Zeit/texte.ly
@@ -12,11 +12,20 @@
     \set stanza = "1."

     Sor -- gen quä -- len und wer -- den mir zu groß.

     Mut -- los frag ich: Was wir mor -- gen sein?

-    Doch du liebst mich, du lässt mich nicht los. Va -- _ ter, _ du wirst bei mir sein.

+    Doch du liebst mich, du lässt mich nicht los.

+    Va -- _ ter, _ du wirst bei mir sein.

   }

   textII = \lyricmode {

     \repeat unfold 43 { \skip 1 }

     \set stanza = "2."

+    Hast und Ei -- le, _ Zeit -- not und Be -- trieb

+    neh -- men mich ge -- fan -- gen, ja -- gen mich.

+    Herr, ich ru -- fe: Komm und mach mich frei!

+    Füh -- _ re _ du mich Schritt für Schritt.

+  }

+  textIII = \lyricmode {

+    \repeat unfold 43 { \skip 1 }

+    \set stanza = "3."

     Es gibt Ta -- ge, die blei -- ben oh -- ne Sinn,

     Hilf -- los seh ich, wie die Zeit ver -- rinnt.

     Stun -- den, Ta -- ge, Jah -- re ge -- hen hin