Selig_seid_ihr: Formatanpassung(en)

4 files changed, 227 insertions, 68 deletions

diff --git a/Selig_seid_ihr/Makefile b/Selig_seid_ihr/Makefile
new file mode 100644
index 0000000..ef6dedf
--- /dev/null
+++ b/Selig_seid_ihr/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/Selig_seid_ihr/Selig_seid_ihr.ly b/Selig_seid_ihr/Selig_seid_ihr.ly
index 21968c5..acefdcb 100755
--- a/Selig_seid_ihr/Selig_seid_ihr.ly
+++ b/Selig_seid_ihr/Selig_seid_ihr.ly
@@ -1,74 +1,40 @@
 \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) (* 100 mm))) paper-alist))
-#(set-default-paper-size "kindle")
+%spezifisch%
 
 \pointAndClickOff
 
-Praes = {
-  \time 4/4
-  \key f \major
-}
-
-SopranA = \relative a' {
-  \repeat unfold 2 { a2 g4 a | f1 | } \alternative {{ d4 f f g | a1 | } { d,4 f f e | f1 | }}
-}
-SopranB = \relative g' {
-  \repeat unfold 2 { g2 a4 b | a1 | } \alternative {{ b4 c d b | g1 | } { b4 a g f | g1 | }}
-}
-
-AltA = \relative f' {
-  \repeat unfold 2 { f2 e4 e | d1 | } \alternative {{ d4 d d e | f1 | } { d4 a c c | c1 | }}
-}
-AltB = \relative e' {
-  \repeat unfold 2 { e2 f4 g | f1 | } \alternative {{ f4 f f f | e1 | } { f4 f d d | e1 | }}
-}
-
-TenorA = \relative c' {
-  \repeat unfold 2 { c2 c4 a | a1 | } \alternative {{ b4 a c c | c1 | } { b4 f g g | a1 | }}
-}
-TenorB = \relative c' {
-  \repeat unfold 2 { c2 c4 c | c1 | } \alternative {{ d4 c b d | c1 | } { d4 c b a | c1 | }}
-}
-
-BassA = \relative f {
-  \repeat unfold 2 { f2 c4 cis | d1 | b4 d c c | f1 | }
-}
-BassB = \relative c {
-  \repeat unfold 2 { c2 c4 c | f1 | } \alternative {{ b4 a g b | c1 | } { g,4 a b d | c1 | }}
-}
-
-\new ChoirStaff <<
-\new Staff <<
-   { \Praes \new Voice = "Sopran" { \voiceOne
-     \repeat unfold 2 { \SopranA \bar "||" }
-     \SopranB \bar "||"
-     \SopranA \bar "|."
-   }}
-   { \Praes \new Voice = "Alt" { \voiceTwo
-     \repeat unfold 2 { \AltA \bar "||" }
-     \AltB \bar "||"
-     \AltA \bar "|." }}
+\header {
+  tagline = ""
+}
+\paper {
+  top-margin = 5
+  print-all-headers = ##t
+}
+
+\score {
+  \header {
+    title = "Selig seid ihr"
+  }
+  \new ChoirStaff <<
+    \new Staff <<
+      \new Voice = "Sopran" { \voiceOne \sopranMelodie }
+      \new Voice = "Alt"    { \voiceTwo \altMelodie }
+    >>
+    \new Staff <<
+      \clef "bass"
+      \new Voice = "Tenor" { \voiceOne \tenorMelodie }
+      \new Voice = "Bass"  { \voiceTwo \bassMelodie }
+      \new Lyrics \lyricsto "Bass" { \textI }
+      \new Lyrics \lyricsto "Bass" { \textII }
+      \new Lyrics \lyricsto "Bass" { \textIV }
+    >>
   >>
-\new Staff <<
-   { \Praes \new Voice = "Tenor" { \clef "bass" \voiceOne
-     \repeat unfold 2 { \TenorA \bar "||" }
-     \TenorB \bar "||"
-     \TenorA \bar "|."
-   }}
-   { \Praes \new Voice = "Bass" { \clef "bass" \voiceTwo
-     \repeat unfold 2 { \BassA \bar "||" }
-     \BassB \bar "||"
-     \BassA \bar "|." }}
-   \new Lyrics \lyricsto "Bass" {
-     \set stanza = #"1. " Se -- lig seid ihr, wenn ihr ein -- fach lebt.
-     Se -- lig seid ihr, wenn ihr Las -- ten tragt.
-     \set stanza = #"2. " Se -- lig seid ihr, wenn ihr lie -- ben lernt.
-     Se -- lig seid ihr, wenn ihr Gü -- te wagt.
-     \set stanza = #"3. " Se -- lig seid ihr, wenn ihr Lei -- den merkt.
-     Se -- lig seid ihr, wenn ihr ehr -- lich bleibt.
-     \set stanza = #"4. " Se -- lig seid ihr, wenn ihr Frie -- den macht.
-     Se -- lig seid ihr, wenn ihr Un -- recht spürt.
-     }
-  >>
->>
+  \layout {
+    indent = #0
+  }
+}
diff --git a/Selig_seid_ihr/stimmen.ly b/Selig_seid_ihr/stimmen.ly
new file mode 100755
index 0000000..2be4a2d
--- /dev/null
+++ b/Selig_seid_ihr/stimmen.ly
@@ -0,0 +1,153 @@
+
+global = {
+  \time 4/4
+  \key f \major
+}
+
+SopranA = \relative a' {
+  \repeat unfold 2 {
+    a2 g4 a |
+    f1 |
+  }
+  \alternative {
+    {
+      d4 f f g |
+      a1 |
+    }
+    {
+      d,4 f f e |
+      f1 |
+    }
+  }
+}
+SopranB = \relative g' {
+  \repeat unfold 2 {
+    g2 a4 b |
+    a1 |
+  }
+  \alternative {
+    {
+      b4 c d b |
+      g1 |
+    }
+    {
+      b4 a g f |
+      g1 |
+    }
+  }
+}
+
+AltA = \relative f' {
+  \repeat unfold 2 {
+    f2 e4 e |
+    d1 |
+  }
+  \alternative {
+    {
+      d4 d d e |
+      f1 |
+    }
+    {
+      d4 a c c |
+      c1 |
+    }
+  }
+}
+AltB = \relative e' {
+  \repeat unfold 2 {
+    e2 f4 g |
+    f1 |
+  }
+  \alternative {
+    {
+      f4 f f f |
+      e1 |
+    }
+    {
+      f4 f d d |
+      e1 |
+    }
+  }
+}
+
+TenorA = \relative c' {
+  \repeat unfold 2 {
+    c2 c4 a |
+    a1 |
+  }
+  \alternative {
+    {
+      b4 a c c |
+      c1 |
+    }
+    {
+      b4 f g g |
+      a1 |
+    }
+  }
+}
+TenorB = \relative c' {
+  \repeat unfold 2 {
+    c2 c4 c |
+    c1 |
+  }
+  \alternative {
+    {
+      d4 c b d |
+      c1 |
+    }
+    {
+      d4 c b a |
+      c1 |
+    }
+  }
+}
+
+BassA = \relative f {
+  \repeat unfold 2 {
+    f2 c4 cis |
+    d1 |
+    b4 d c c |
+    f1 |
+  }
+}
+BassB = \relative c {
+  \repeat unfold 2 {
+    c2 c4 c |
+    f1 |
+  }
+  \alternative {
+    {
+      b4 a g b |
+      c1 |
+    }
+    {
+      g,4 a b d |
+      c1 |
+    }
+  }
+}
+
+sopranMelodie = {
+  \global
+  \SopranA \bar "|."
+  \SopranB \bar "||"
+}
+
+altMelodie = {
+  \global
+  \AltA \bar "|."
+  \AltB \bar "||"
+}
+
+tenorMelodie = {
+  \global
+  \TenorA \bar "|."
+  \TenorB \bar "||"
+}
+
+bassMelodie = {
+  \global
+  \BassA \bar "|."
+  \BassB \bar "||"
+}
diff --git a/Selig_seid_ihr/texte.ly b/Selig_seid_ihr/texte.ly
new file mode 100755
index 0000000..e787f69
--- /dev/null
+++ b/Selig_seid_ihr/texte.ly
@@ -0,0 +1,17 @@
+
+textI = \lyricmode {
+  \set stanza = #"1. " Se -- lig seid ihr, wenn ihr ein -- fach lebt.
+  Se -- lig seid ihr, wenn ihr Las -- ten tragt.
+}
+
+textII = \lyricmode {
+  \set stanza = #"2. " Se -- lig seid ihr, wenn ihr lie -- ben lernt.
+  Se -- lig seid ihr, wenn ihr Gü -- te wagt.
+  \set stanza = #"3. " Se -- lig seid ihr, wenn ihr Lei -- den merkt.
+  Se -- lig seid ihr, wenn ihr ehr -- lich bleibt.
+}
+
+textIV = \lyricmode {
+  \set stanza = #"4. " Se -- lig seid ihr, wenn ihr Frie -- den macht.
+  Se -- lig seid ihr, wenn ihr Un -- recht spürt.
+}