Meine_Kraft_ist_in_den_Schwachen_maechtig_ syntaktisch angepasst

3 files changed, 27 insertions, 19 deletions

diff --git a/Meine_Kraft_ist_in_den_Schwachen_maechtig_/Meine_Kraft_ist_in_den_Schwachen_maechtig_.ly b/Meine_Kraft_ist_in_den_Schwachen_maechtig_/Meine_Kraft_ist_in_den_Schwachen_maechtig_.ly
index cf645ed..252e4da 100644
--- a/Meine_Kraft_ist_in_den_Schwachen_maechtig_/Meine_Kraft_ist_in_den_Schwachen_maechtig_.ly
+++ b/Meine_Kraft_ist_in_den_Schwachen_maechtig_/Meine_Kraft_ist_in_den_Schwachen_maechtig_.ly
@@ -36,10 +36,10 @@
         \new Voice = bass         { \global \clef "bass" \voiceTwo \bassMelodie }
       >>
       \new Lyrics = bassRefrain { }
-      \context Lyrics = sopranRefrain \lyricsto sopran \lyricmode { \textPauseFrauen \textRefrain }
-      \context Lyrics = altRefrain \lyricsto alt \lyricmode { \textPauseFrauen \textRefrain }
-      \context Lyrics = tenorRefrain \lyricsto tenor \lyricmode { \textPauseMaenner \textRefrain }
-      \context Lyrics = bassRefrain \lyricsto bass { \textPauseMaenner \textRefrain }
+      \context Lyrics = sopranRefrain \lyricsto sopran \textRefrainFrauen
+      \context Lyrics = altRefrain    \lyricsto alt    \textRefrainFrauen
+      \context Lyrics = tenorRefrain  \lyricsto tenor  \textRefrainMaenner
+      \context Lyrics = bassRefrain   \lyricsto bass   \textRefrainMaenner
     >>
     \new PianoStaff <<
       \new ChordNames \begleitAkkorde
diff --git a/Meine_Kraft_ist_in_den_Schwachen_maechtig_/stimmen.ly b/Meine_Kraft_ist_in_den_Schwachen_maechtig_/stimmen.ly
index bc0888b..ab9329f 100644
--- a/Meine_Kraft_ist_in_den_Schwachen_maechtig_/stimmen.ly
+++ b/Meine_Kraft_ist_in_den_Schwachen_maechtig_/stimmen.ly
@@ -15,7 +15,7 @@
     R1*8 | \bar "|."
     s1*7 | s2. r4 | \bar "||"
     s1*6 | s4 r8 s s2 |
-    s1 | R1 | \time 2/4 R2 | \bar "||"
+    s1 | R1 | r2 \bar "||"
   }
 
   pausenMaenner = {
@@ -23,7 +23,7 @@
     R1*4 |
     s1*3 | s2. r4 | \bar "||"
     s1*6 | s4 r8 s s2 |
-    s1 | R1 | \time 2/4 R2 | \bar "||"
+    s1 | R1 | r2 \bar "||"
   }
 
   oberstimmenMelodie = \relative e'' {
@@ -34,7 +34,7 @@
     a4 g8 fis g2 | r8 e a g g4 fis | r8 h a h 
     g a fis g | e4 a, r16 a h cis d e fis g | a4 g8 fis g2 |
     r8 e a g fis4 r16 e d cis | d8 cis h a h cis d cis~ |
-    cis d e fis~ fis4 a~ | a2 r8 g16 fis e8 d | \time 2/4 a2 | \bar "||"
+    cis d e fis~ fis4 a~ | a2 r8 g16 fis e8 d | a2 \bar "||"
   }
 
   sopranMelodie = \relative d' {
@@ -46,7 +46,7 @@
    h h h8 e, fis g | a4. g8 g4 fis \breathe | h h
    h a8 fis | e4. fis8 fis2 \breathe | h4 h h8 e, fis g |
    a4 cis e d~ | d s8 d h a fis e~ |
-   e4 d8 d~ d2 | s1 | \time 2/4 s2 | \bar "||"
+   e4 d8 d~ d2 | s1 | s2 \bar "||"
   }
 
   altMelodie = \relative es' {
@@ -58,7 +58,7 @@
    g g e e | e8 cis d e e4 d \breathe | g g
    fis e8 d | d4 cis d2 \breathe | g4 g e e |
    e8 g fis e fis4 fis~ | fis s8 fis g fis d cis~ |
-   cis4 h8 a~ a2 | s1 | \time 2/4 s2 | \bar "||"
+   cis4 h8 a~ a2 | s1 | s2 \bar "||"
   }
   
   tenorMelodie = \relative d {
@@ -69,7 +69,7 @@
    d d g,8 g a h | a4 a a a \breathe | d d
    d cis8 h | g4. a8 a2 \breathe | d4 d g,8 g a h |
    e,4 a cis h~ | h s8 h g a h a~ |
-   a4 g8 fis~ fis2 | s1 | \time 2/4 s2 | \bar "||"
+   a4 g8 fis~ fis2 | s1 | s2 \bar "||"
   }
 
   bassMelodie = \relative d {
@@ -80,7 +80,7 @@
    g fis e d | cis8 a h cis d4 d \breathe | g, g
    g g8 g | a4 a d2 \breathe | g4 fis e d |
    cis8 a h cis h4 h~ | h s8 h e e e a,~ |
-   a4 a8 d~ d2 | s1 | \time 2/4 s2 | \bar "||"
+   a4 a8 d~ d2 | s1 | s2 \bar "||"
   }
 
   klavierLinksMelodie = \relative h'' {
@@ -93,7 +93,7 @@
    <a fis d a>2 <h fis d h> | <a e d>8 h, d e <a e cis a>2 | \bar "||"
    <h g d h> <h g e h> | s1\breathe | <h g d h>2
    <h fis d h> | s1\breathe | <h g d h>2 <h g d h>4. e,8 |
-   s1*2 | s2 d8 a d e | e a e d~ d a d e | \time 2/4 e2 | \bar "||"
+   s1*2 | s2 d8 a d e | e a e d~ d a d e | e2 \bar "||"
   }
 
   klavierLinksOMelodie = \relative fis'' {
@@ -103,7 +103,7 @@
    s1 | a4. g8 <g e>4 <fis d> | s1 |
    <e g,>4. <fis a,>8 <fis a,>2 | s1 |
    a4 cis <cis e> <h d>~ | <h d>2 <g h>4. a8~ |
-   a2 s | s1 | \time 2/4 s2 | \bar "||"
+   a2 s | s1 | s2 \bar "||"
   }
 
   klavierLinksUMelodie = \relative fis'' {
@@ -113,7 +113,7 @@
    s1 | e2 a, | s1 |
    d4 cis d2 | s1 |
    e2 fis~ | fis d4. e8~ |
-   e2 s | s1 | \time 2/4 s2 | \bar "||"
+   e2 s | s1 | s2 \bar "||"
   }
 
   klavierRechtsMelodie = \relative h' {
@@ -124,7 +124,7 @@
    g4 fis' e d | cis8 a h cis d2\breathe | g,1 |
    a2 d\breathe | g,4 fis' e d |
    cis8 a h cis h2~ | h e4. a,8~ |
-   a2 s2 | s1 | \time 2/4 s2 | \bar "||"
+   a2 s2 | s1 | s2 \bar "||"
   }
 
   klavierRechtsOMelodie = \relative a' {
@@ -132,7 +132,7 @@
    r8 fis e d cis2 | r8 e d cis d2 | \clef "bass" s1 | a^\fermata | \bar "|."
    s1*8 | \bar "||"
    s1*5 |
-   s1*2 | s2 d | cis h | \time 2/4 cis | \bar "||"
+   s1*2 | s2 d | cis h | cis \bar "||"
   }
 
   klavierRechtsUMelodie = \relative e' {
@@ -140,7 +140,7 @@
    g'1 | fis2 h, | \clef "bass" s1 | d,_\fermata | \bar "|."
    s1*8 | \bar "||"
    s1*5 |
-   s1*2 | s2 d | d1~ | \time 2/4 d2 | \bar "||"
+   s1*2 | s2 d | d1~ | d2 \bar "||"
   }
 
   begleitAkkorde = \chordmode {
@@ -151,5 +151,5 @@
     d e1:min d g2:maj7 | a:sus4 a |
     g e:min | a d | g
     g:maj7 | a4:sus4 a:maj7 d2 | g e:min |
-    cis a4 h2. e4.:min7 a8~ | a2 d | a g | a |
-  }
\ No newline at end of file
+    cis a4 h2. e4.:min7 a8~ | a2 d | a g | a
+  }
diff --git a/Meine_Kraft_ist_in_den_Schwachen_maechtig_/texte.ly b/Meine_Kraft_ist_in_den_Schwachen_maechtig_/texte.ly
index 49e34a2..7998f7c 100644
--- a/Meine_Kraft_ist_in_den_Schwachen_maechtig_/texte.ly
+++ b/Meine_Kraft_ist_in_den_Schwachen_maechtig_/texte.ly
@@ -39,3 +39,11 @@
     Mei -- ne Kraft ist in den Schwa -- chen mäch -- tig.“
     Die mäch -- ti -- ge Angst wird klein.
   }
+
+  textRefrainFrauen = \lyricmode {
+    \textPauseFrauen \textRefrain
+  }
+
+  textRefrainMaenner = \lyricmode {
+    \textPauseMaenner \textRefrain
+  }