Lobe_den_Herrn_meine_Seele: Makefile und weiter Stimmen neu

3 files changed, 182 insertions, 25 deletions

diff --git a/Lobe_den_Herrn_meine_Seele/Lobe_den_Herrn_meine_Seele.ly b/Lobe_den_Herrn_meine_Seele/Lobe_den_Herrn_meine_Seele.ly
index 1a8598c..2f0589d 100644
--- a/Lobe_den_Herrn_meine_Seele/Lobe_den_Herrn_meine_Seele.ly
+++ b/Lobe_den_Herrn_meine_Seele/Lobe_den_Herrn_meine_Seele.ly
@@ -1,32 +1,46 @@
 \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 = ""
 }
 \paper {
   top-margin = 5
+  print-all-headers = ##t
 }
 
 \score {
+  \header {
+    title = "Lobe den Herrn, meine Seele"
+    poet = "Text: nach Psalm 103, Norbert Kissel"
+    composer = "Melodie: Norbert Kissel"
+    arranger = "Satz: Gerhardt Ziegler"
+  }
   <<
     \set Score.skipBars = ##t
     \new ChordNames \harmonien
-    \new Staff
-    { \new Voice = refrain { \global \refrainMelodie }
-      \new Voice = strophe { \strophenMelodie }
-    }
+    \new Staff <<
+      {
+        \new Voice = refrain { \global \voiceOne \refrainMelodie }
+        \new Voice = strophe { \global \voiceOne \strophenMelodie }
+      }
+      \new Voice = alt { \global \voiceTwo \melodieAlt }
+    >>
     \new Lyrics \lyricsto refrain { \textRefrain }
     \new Lyrics \lyricsto strophe { \textI}
     \new Lyrics \lyricsto strophe { \textII}
     \new Lyrics \lyricsto strophe { \textIII}
     \new Lyrics \lyricsto strophe { \textIV}
+    \new Staff <<
+      \new Voice = tenor  { \global \clef "bass" \voiceOne \melodieTenor }
+      \new Voice = bass   { \global \clef "bass" \voiceTwo \melodieBass }
+    >>
   >>
   \layout {
     indent = #0
diff --git a/Lobe_den_Herrn_meine_Seele/Makefile b/Lobe_den_Herrn_meine_Seele/Makefile
new file mode 100644
index 0000000..ef6dedf
--- /dev/null
+++ b/Lobe_den_Herrn_meine_Seele/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/Lobe_den_Herrn_meine_Seele/stimmen.ly b/Lobe_den_Herrn_meine_Seele/stimmen.ly
index 728df53..3c8b446 100644
--- a/Lobe_den_Herrn_meine_Seele/stimmen.ly
+++ b/Lobe_den_Herrn_meine_Seele/stimmen.ly
@@ -1,25 +1,145 @@
 %some settings% vim: ai sw=2 lbr nu et
 
-  \version "2.12"
+\version "2.12"
 
-  global = {
-    \key f \major
-    %\override Staff.TimeSignature #'style = #'()
-    \time 6/8
-    \autoBeamOff
-  }
+global = {
+  \key f \major
+  %\override Staff.TimeSignature #'style = #'()
+  \time 6/8
+  \autoBeamOff
+}
 
 % Die Stimmen
 
-  harmonien = \chordmode {
-    \set majorSevenSymbol = \markup { 7 }
-    \repeat unfold 2 { f2. | g:m | c:7 | b4. f | f2. | g:m | c:7 | b4. f | }
-    a2.:m | e4.:4 e | e2.:7 | a:m | d4.:m g:7 | c f:maj7 | b g:m | c:4 c:7 |
-  }
-  refrainMelodie = \relative c' {
-    c8^\markup"1" f g a g f | g4. d | c8 e f g a b | b4. a | c,8 f g a g f | g4. d | c8 e f g f e | f4. f\fermata |
-    c'^\markup"2" c | c8 b a b4. | c8 g a b c d | d4. c | c c | c8 b a b4. | c8 g a b a g | f4. f\fermata | \bar "||"
-  }
-  strophenMelodie = \relative e' {
-    e8 a h c h a | a4 gis8 gis4. | e8 h' c d c h | h4 a8 a4. | f8 g a h c d | e, f g a h c | d c b b a g | c4. c | \bar "||"
+harmonien = \chordmode {
+  \set majorSevenSymbol = \markup { 7 }
+  \repeat unfold 2 {
+    f2. |
+    g:m |
+    c:7 |
+    b4. f |
+    f2. |
+    g:m |
+    c:7 |
+    b4. f |
   }
+  a2.:m |
+  e4.:4 e |
+  e2.:7 |
+  a:m |
+  d4.:m g:7 |
+  c f:maj7 |
+  b g:m |
+  c:4 c:7 |
+}
+
+refrainMelodie = \relative c' {
+  c8^\markup"1." f g a g f |
+  g4. d |
+  c8 e f g a b |
+  b4. a |
+  c,8 f g a g f |
+  g4. d |
+  c8 e f g f e |
+  f4. f\fermata |
+  c'^\markup"2." c |
+  c8 b a b4. |
+  c8 g a b c d |
+  d4. c |
+  c c |
+  c8 b a b4. |
+  c8 g a b a g |
+  f4. f\fermata | \bar "||"
+}
+
+strophenMelodie = \relative e' {
+  e8 a h c h a |
+  a4 gis8 gis4. |
+  e8 h' c d c h |
+  h4 a8 a4. |
+  f8 g a h c d |
+  e, f g a h c |
+  d c b b a g |
+  c4. c | \bar "||"
+}
+
+melodieAlt = \relative c' {
+  c8 c e f e f |
+  d4. d |
+  c8 c d e f g |
+  f4. f |
+  c8 c e f e f |
+  d4. d |
+  c8 c d e d c |
+  d4. c |
+  f f |
+  d8 d d d4. |
+  e8 e f g a b |
+  f4. f |
+  f f |
+  d8 d d d4. |
+  e8 e f g f e |
+  d4. c | \bar "|."
+  e8 e e e e a |
+  e4 e8 e4. |
+  e8 g a h a gis |
+  e4 e8 e4. |
+  d8 e f f f f |
+  e d e e e e |
+  f e d g f f |
+  f4( d8) e4. | \bar "||"
+}
+
+melodieTenor = \relative a {
+  a8 a b c b a |
+  b4. b |
+  c8 b a g g c |
+  d4. c |
+  a8 a b c b a |
+  b4. b |
+  c8 b a g a b |
+  b4. a |
+  a a |
+  g8 g d g4. |
+  c8 c c c c c |
+  b4. a |
+  a a |
+  b8 g a g4. |
+  b8 b c d c b |
+  b4. b | \bar "|."
+  a8 c d e d c |
+  c4 h8 h4. |
+  e8 d e f e d |
+  d4 c8 c4. |
+  a8 a d d c h |
+  h h h c g a |
+  b c d d c d |
+  c4. b | \bar "||"
+}
+
+melodieBass = \relative f {
+  f8 f f f f f |
+  g4. g, |
+  c8 c c c c c |
+  f4. f |
+  f8 f f f f f |
+  g4. g |
+  c,8 c c c c c |
+  f4. f |
+  f f |
+  g8 g d g4. |
+  c8 c c g e c |
+  f4. f |
+  f, f |
+  g8 g g g4. |
+  c8 c c c c c |
+  f4. f | \bar "|."
+  a8 a a a a a |
+  e4 e8 e4. |
+  e8 e e e e e |
+  a4 a8 a4. |
+  d,8 d d g g g |
+  c, c c f f f |
+  b, b b g a b |
+  c4. c | \bar "||"
+}