4 files changed, 67 insertions, 33 deletions
diff --git a/Allein_Gott_in_der_Hoeh_sei_Ehr/Allein_Gott_in_der_Hoeh_sei_Ehr.ly b/Allein_Gott_in_der_Hoeh_sei_Ehr/Allein_Gott_in_der_Hoeh_sei_Ehr.ly
index 978ed8e..a0f8559 100644
--- a/Allein_Gott_in_der_Hoeh_sei_Ehr/Allein_Gott_in_der_Hoeh_sei_Ehr.ly
+++ b/Allein_Gott_in_der_Hoeh_sei_Ehr/Allein_Gott_in_der_Hoeh_sei_Ehr.ly
@@ -1,8 +1,6 @@
 \include "deutsch.ly"
-#(ly:set-option 'relative-includes #t)
-\include "stimmen.ly"
-\include "texte.ly"
-#(ly:set-option 'relative-includes #f)
+include(stimmen.pre)
+include(texte.pre)
 
 \pointAndClickOff
 
@@ -19,24 +17,45 @@
     title = "Allein Gott in der Höh sei Ehr"
     composer = "Prätorius, Mich."
   }
-  \new ChoirStaff <<
+  \new StaffGroup <<
     \new Staff <<
-      \new Voice = "sopran" { \global \sopranMelodie }
-      ifdef(`STR_1', \new Lyrics \lyricsto "sopran" \textI, )
-      ifdef(`STR_2', \new Lyrics \lyricsto "sopran" \textII, )
+      \new Voice = "sopran" << \global \sopranMelodie >>
+      ifdef(`STR_1', \new Lyrics \lyricsto "sopran" \sopranTextI )
+      ifdef(`STR_2', \new Lyrics \lyricsto "sopran" \sopranTextII )
     >>
     \new Staff <<
-      \new Voice = "alt" { \global \altMelodie }
-      ifdef(`STR_1', \new Lyrics \lyricsto "alt" \textI, )
-      ifdef(`STR_2', \new Lyrics \lyricsto "alt" \textII, )
+      \new Voice = "alt" << \global \altMelodie >>
+      ifdef(`STR_1', \new Lyrics \lyricsto "alt" \altTextI )
+      ifdef(`STR_2', \new Lyrics \lyricsto "alt" \altTextII )
     >>
     \new Staff <<
-      \new Voice = "maenner" { \clef "bass" \global \maennerMelodie }
-      ifdef(`STR_1', \new Lyrics \lyricsto "maenner" \textI, )
-      ifdef(`STR_2', \new Lyrics \lyricsto "maenner" \textII, )
+      \new Voice = "maenner" << \clef "bass" \global \maennerMelodie >>
+      ifdef(`STR_1', \new Lyrics \lyricsto "maenner" \maennerTextI )
+      ifdef(`STR_2', \new Lyrics \lyricsto "maenner" \maennerTextII )
     >>
   >>
   \layout {
     indent = #0
+    \context {
+      \Score
+      %% no bar lines in staves or lyrics
+      \hide BarLine
+    }
+    %% the next two instructions keep the lyrics between the bar lines
+    \context {
+      \Lyrics
+      \consists "Bar_engraver"
+      \consists "Separating_line_group_engraver"
+    }
+    \context {
+      \Voice
+      %% Comment in the below "\remove" command to allow line
+      %% breaking also at those bar lines where a note overlaps
+      %% into the next measure.  The command is commented out in this
+      %% short example score, but especially for large scores, you
+      %% will typically yield better line breaking and thus improve
+      %% overall spacing if you comment in the following command.
+      \remove "Forbid_line_break_engraver"
+    }
   }
 }
diff --git a/Allein_Gott_in_der_Hoeh_sei_Ehr/Makefile b/Allein_Gott_in_der_Hoeh_sei_Ehr/Makefile
index 90faa64..cb66cc7 100644
--- a/Allein_Gott_in_der_Hoeh_sei_Ehr/Makefile
+++ b/Allein_Gott_in_der_Hoeh_sei_Ehr/Makefile
@@ -14,8 +14,9 @@ include ../.meta/*.mk
 %.pre: %.ly
 	cat "$<" > "$@"
 
-%.post: %.pre
+%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly))
 	m4 <"$<" >"$@"
 
-%.pdf: %.post $(patsubst %.ly,%.post, $(shell ls *.ly))
+%.pdf: %.post
 	lilypond $<
+	pkill -SIGHUP -xf "mupdf $@" || true
diff --git a/Allein_Gott_in_der_Hoeh_sei_Ehr/stimmen.ly b/Allein_Gott_in_der_Hoeh_sei_Ehr/stimmen.ly
index e420d75..b965cba 100644
--- a/Allein_Gott_in_der_Hoeh_sei_Ehr/stimmen.ly
+++ b/Allein_Gott_in_der_Hoeh_sei_Ehr/stimmen.ly
@@ -3,6 +3,11 @@ global = {
   \key g \major
   \autoBeamOff
   \partial 2
+  s2 |
+  \repeat unfold 29 { \skip 1. | } \time 4/2
+  \repeat unfold 5 { \skip 1*2 | }
+  \override Staff.BarLine.transparent = ##f
+  \bar "|."
 }
 
 sopranMelodie = \relative g' {
@@ -38,9 +43,9 @@ sopranMelodie = \relative g' {
   h( a1) | \time 4/2
   h1 r2 h |
   fis4( e fis) d e( fis g a |
-  h2) c d2.( c8[ h] |
-  a1~ a) |
-  h~ h | \bar "|."
+  h2) c d2.( c8[ h] | \override NoteHead #'style = #'mensural
+  a\breve) |
+  h\breve | \bar "|."
 }
 
 altMelodie = \relative d' {
@@ -77,8 +82,8 @@ altMelodie = \relative d' {
   g1 r2 g |
   a1 c2 h~ |
   h a1 g2~( |
-  g fis4 e fis1) |
-  g1~ g | \bar "|."
+  g fis4 e fis1) | \override NoteHead #'style = #'mensural
+  g\breve | \bar "|."
 }
 
 maennerMelodie = \relative g, {
@@ -114,7 +119,7 @@ maennerMelodie = \relative g, {
   g d1) | \time 4/2
   g r2 e |
   d1 c2 g~ |
-  g a h2.( c4 |
-  d1~ d) |
-  g,~ g | \bar "|."
+  g a h2.( c4 | \override NoteHead #'style = #'mensural
+  d\breve) |
+  g,\breve | \bar "|."
 }
diff --git a/Allein_Gott_in_der_Hoeh_sei_Ehr/texte.ly b/Allein_Gott_in_der_Hoeh_sei_Ehr/texte.ly
index 7d265fd..b09dd02 100644
--- a/Allein_Gott_in_der_Hoeh_sei_Ehr/texte.ly
+++ b/Allein_Gott_in_der_Hoeh_sei_Ehr/texte.ly
@@ -1,23 +1,32 @@
-textI = \lyricmode {
+define(`textI',`\lyricmode {
   \set stanza = "1."
   Al -- lein Gott in der Höh sei Ehr
   und Dank für sei -- ne Gna -- de,
   da -- rum, dass nun in nim -- mer -- mehr
-  uns rüh -- ren kann kein Scha -- de.
+  uns rüh -- ifelse($1,`maenner',`_') ren kann kein Scha -- de.
   Ein Wohl -- ge -- fal -- len Gott an uns hat;
   nun ist groß Fried ohn Un -- ter -- lass,
-  all Fehd hat nun ein En -- de, ein En -- de,
+  all Fehd hat nun ein En -- de, ifelse($1,`sopran',`ein En -- de,')
   all Fehd hat nun ein En -- de.
-}
+}')
 
-textII = \lyricmode {
+define(`textII',`\lyricmode {
   \set stanza = "2."
-  Wir lo -- ben, preis'n an -- be -- ten dich,
+  Wir lo -- ben, preis''`n an -- be -- ten dich,
   für dei -- ne Ehr wir dan -- ken,
   dass du, Gott Va -- ter e -- wig -- lich,
-  re -- gierst ohn al -- les Wan -- ken.
+  re -- gierst ifelse($1,`maenner',`_') ohn al -- les Wan -- ken.
   Ganz un -- ge -- mes -- sen ist dei -- ne Macht,
   fort gsschieht, was dein Will hat be -- dacht;
-  wohl uns des fei -- nen Her -- ren, des Her -- ren,
+  wohl uns des fei -- nen Her -- ren, ifelse($1,`sopran',`des Her -- ren,')
   wohl uns des fei -- nen Her -- ren.
-}
+}')
+
+sopranTextI = textI(`sopran')
+sopranTextII = textII(`sopran')
+
+altTextI = textI(`alt')
+altTextII = textII(`alt')
+
+maennerTextI = textI(`maenner')
+maennerTextII = textII(`maenner')