Brunnquell_aller_Gueter: diverse Ergänzungen

3 files changed, 27 insertions, 23 deletions

diff --git a/Brunnquell_aller_Gueter/Brunnquell_aller_Gueter.ly b/Brunnquell_aller_Gueter/Brunnquell_aller_Gueter.ly
index b415c1b..68ede90 100755
--- a/Brunnquell_aller_Gueter/Brunnquell_aller_Gueter.ly
+++ b/Brunnquell_aller_Gueter/Brunnquell_aller_Gueter.ly
@@ -19,11 +19,13 @@
 \score {
   \header {
     title = "Brunnquell aller Güter"
+    poet = "Satz: Johann Sebastian Bach"
+    composer = "Joh. Franck 1618-1677"
   }
   \new ChoirStaff <<
     \new Staff <<
-      \new Voice = "Sopran" { \global \voiceOne \sopranMelodie }
-      \new Voice = "Alt"    { \global \voiceTwo \altMelodie }
+      \new Voice = "Sopran" \transpose c %TRANSPOSE% { \global \voiceOne \sopranMelodie }
+      \new Voice = "Alt"    \transpose c %TRANSPOSE% { \global \voiceTwo \altMelodie }
     >>
     \new Lyrics \lyricsto "Sopran" \textIa
     \new Lyrics \lyricsto "Sopran" \textIb
@@ -33,8 +35,8 @@
     \new Lyrics \lyricsto "Sopran" \textIIIb
     \new Staff <<
       \clef "bass"
-      \new Voice = "Tenor"  { \global \voiceOne \tenorMelodie }
-      \new Voice = "Bass"   { \global \voiceTwo \bassMelodie }
+      \new Voice = "Tenor"  \transpose c %TRANSPOSE% { \global \voiceOne \tenorMelodie }
+      \new Voice = "Bass"   \transpose c %TRANSPOSE% { \global \voiceTwo \bassMelodie }
     >>
   >>
 }
diff --git a/Brunnquell_aller_Gueter/Makefile b/Brunnquell_aller_Gueter/Makefile
index 38c18d6..98e26ea 100644
--- a/Brunnquell_aller_Gueter/Makefile
+++ b/Brunnquell_aller_Gueter/Makefile
@@ -1,4 +1,5 @@
 CURDOC=$(shell basename "$(CURDIR)")
+TRANSPOSE=c
 
 ifeq ($(FUER),ewe)
   SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\")
@@ -33,6 +34,7 @@ Clean: clean
 		s@%spezifisch%@$(SPEZIFISCH)@ ; \
 		$(KLAVIER_REGEX) \
 		$(MIDI_REGEX) \
+		s@%TRANSPOSE%@$(TRANSPOSE)@g; \
 	" "$<" > "$@"
 
 %.pdf: %.pre *.ly
diff --git a/Brunnquell_aller_Gueter/stimmen.ly b/Brunnquell_aller_Gueter/stimmen.ly
index 67658fe..cab1678 100755
--- a/Brunnquell_aller_Gueter/stimmen.ly
+++ b/Brunnquell_aller_Gueter/stimmen.ly
@@ -8,62 +8,62 @@ sopranMelodie = \relative c' {
   \repeat volta 2 {
     f4 g as b |
     g2 f |
-    as4 b c des8( c) |
+    as4 b c des8[ c] |
     b2 as |
-    g4 f f8( g) e4 |
+    g4 f f8[ g] e4 |
     f1 |
   }
-  c'8( b) c( des) es4 c |
+  c'8[ b] c[ des] es4 c |
   des c b2 |
-  as b8( c) des( b) |
-  c4 f, b as8( g) |
+  as b8[ c] des[ b] |
+  c4 f, b as8[ g] |
   g2 f | \bar "|."
 }
 
 altMelodie = \relative c' {
   \repeat volta 2 {
-    c4 g' g8( f) f4 |
+    c4 g' g8[ f] f4 |
     f( e) c2 |
     f4 g as as |
     as( g) es2 |
-    des4 b8( des) c4 c |
+    des4 b8[ des] c4 c |
     c1 |
   }
   f4 f g as |
-  as8( g) as4 as( g) |
+  as8[ g] as4 as( g) |
   es2 es4 g |
-  as f f8( g) f4 |
+  as f f8[ g] f4 |
   f( e) c2 | \bar "|."
 }
 
 tenorMelodie = \relative c' {
   \repeat volta 2 {
     as4 c c b |
-    des( c8 b) as2 |
-    c4 es es des8( es) |
-    f4( es8 des) c2 |
+    des( c8[ b]) as2 |
+    c4 es es des8[ es] |
+    f4( es8[ des]) c2 |
     b4 b as g |
     as1 |
   }
   as4 as es' f |
   des es es4.( des8) |
   c2 es4 es |
-  es des8( es) f( c) c4 |
-  des( c8 b) as2 | \bar "|."
+  es des8[ es] f[ c] c4 |
+  des( c8[ b]) as2 | \bar "|."
 }
 
 bassMelodie = \relative c {
   \repeat volta 2 {
     f4 e f des |
     b( c) f2 |
-    f4 es as8( g) f( es) |
+    f4 es as8[ g] f[ es] |
     des4( es) as,2 |
-    b8( c) des( b) c4 c4 |
+    b8[ c] des[ b] c4 c4 |
     f1 |
   }
-  f4 es8( des) c4 f |
-  b, c8( des) es2 |
+  f4 es8[ des] c4 f |
+  b, c8[ des] es2 |
   as g4 es |
-  as des,8( c) d( e) f4 |
+  as des,8[ c] d[ e] f4 |
   b,( c) f2 | \bar "|."
 }