From 2bfd1d5afdab932145b43862a7c403f681f85d8d Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 11 Dec 2015 09:02:03 +0100
Subject: Taktwechsel in Weihnachtsmotette verbessert

---
 Weihnachtsmotette/stimmen.ly | 74 ++++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/Weihnachtsmotette/stimmen.ly b/Weihnachtsmotette/stimmen.ly
index d661ce9..c2e44a9 100644
--- a/Weihnachtsmotette/stimmen.ly
+++ b/Weihnachtsmotette/stimmen.ly
@@ -11,6 +11,14 @@
 
 % Die Stimmen
 
+  ersterTaktwechsel = {
+    \time 4/4 \set Timing.measurePosition = #(ly:make-moment 3/4)
+  }
+
+  zweiterTaktwechsel = {
+    \time 4/2 \set Timing.measurePosition = #(ly:make-moment 3/2)
+  }
+
   klavierRechts = \relative c'' { \autoBeamOn
     <<
       \new Voice { \voiceOne
@@ -145,8 +153,8 @@
     >> \oneVoice
     <f a>2. |
     <e g>_\> |
-    f)^\fermata_\! | \bar "||"
-    \time 4/4 \partial 4
+    f)^\fermata_\! \bar "||"
+    \ersterTaktwechsel
     r4 |
     <c f>2_\p( <d a'> |
     <<
@@ -171,8 +179,8 @@
     >> \oneVoice
     <e c'>2 <d h'>4) r | \bar "||"
     \key c \major
-    R1*44 | \bar "|."
-    \time 4/2 \partial 2
+    R1*44 \bar "|."
+    \zweiterTaktwechsel
     \repeat volta 2 {
       r2 |
       R1*6 |
@@ -268,8 +276,8 @@
     <b b,>2( <b d>4 |
     c2. |
     <b c,> |
-    <f a>^\fermata) | \bar "||"
-    \time 4/4 \partial 4
+    <f a>^\fermata) \bar "||"
+    \ersterTaktwechsel
     r4 |
     <f a>2( <d f> |
     <<
@@ -296,8 +304,8 @@
     >> \oneVoice
     r | \bar "||"
     \key c \major
-    R1*44 | \bar "|."
-    \time 4/2 \partial 2
+    R1*44 \bar "|."
+    \zweiterTaktwechsel
     \repeat volta 2 {
       r2 |
       R1*6 |
@@ -330,7 +338,7 @@
     s2.*7 |
     s4 r s |
     s2.*11 \bar "||"
-    \time 4/4 \partial 4
+    \ersterTaktwechsel
     s4 |
     s1*3 |
     s2 r4 s |
@@ -354,7 +362,7 @@
     s2 r4 s |
     s1*7 |
     s2 r \bar "|."
-    \time 4/2 \partial 2
+    \zweiterTaktwechsel
     \repeat volta 2 {
       s2 |
       s1*7 r2
@@ -369,7 +377,7 @@
     R1*14 | \bar "||"
     \time 3/4
     R2.*23 \bar "||"
-    \time 4/4 \partial 4
+    \ersterTaktwechsel
     r4 |
     R1*9 | \bar "||"
     s2. r4 |
@@ -390,7 +398,7 @@
     s2 r4 s |
     s1*7 |
     s2 r \bar "|."
-    \time 4/2 \partial 2
+    \zweiterTaktwechsel
     \repeat volta 2 {
       s2 |
       s1*7 r2
@@ -445,8 +453,8 @@
     d8[ e] f[ d]^\< b[ g] |
     a2( c4~) |
     c8[^\! h d c b g] |
-    f2.^\fermata | \bar "||"
-    \time 4/4 \partial 4
+    f2.^\fermata \bar "||"
+    \ersterTaktwechsel
     f4^\p |
     f f8 f a4-> a8 a |
     c4 c8c f4-> c8 c |
@@ -500,8 +508,8 @@
     d2 e4 f |
     g2( c,4) f |
     e2( d) |
-    c s | \bar "|."
-    \time 4/2 \partial 2
+    c s \bar "|."
+    \zweiterTaktwechsel
     \repeat volta 2 {
       c,2 |
       g' g a h |
@@ -564,8 +572,8 @@
     b4 b f |
     f2.( |
     e) |
-    f | \bar "||"
-    \time 4/4 \partial 4
+    f \bar "||"
+    \ersterTaktwechsel
     f4 |
     f f8 f f4 f8 f |
     e4 e8 e f4 f8 f |
@@ -619,8 +627,8 @@
     g2 g4 a |
     g2( e4) a |
     g2.( f4) |
-    e2 s | \bar "|."
-    \time 4/2 \partial 2
+    e2 s \bar "|."
+    \zweiterTaktwechsel
     \repeat volta 2 {
       c2 |
       d e f f |
@@ -685,8 +693,8 @@
     b8[ c] d4 d8[^\< b] |
     c2( a4 |
     g2^\> c4) |
-    f2.^\fermata^\! | \bar "||"
-    \time 4/4 \partial 4
+    f2.^\fermata^\! \bar "||"
+    \ersterTaktwechsel
     f4^\p |
     f f8 f d4-> d8 d |
     c4 c8 b a4-> a8 a |
@@ -698,8 +706,8 @@
     f2 f |
     e^\> g4^\! r | \bar "||"
     \key c \major
-    R1*44 | \bar "|."
-    \time 4/2 \partial 2
+    R1*44 \bar "|."
+    \zweiterTaktwechsel
     \repeat volta 2 {
       r2 |
       R1*6 |
@@ -715,9 +723,8 @@
     \key f \major
     s1*14 | \bar "||"
     \time 3/4
-    s2.*23 |
-    \bar "||"
-    \time 4/4 \partial 4
+    s2.*23 \bar "||"
+    \ersterTaktwechsel
     s4 |
     s1*9 | \bar "||"
     \key c \major
@@ -764,8 +771,8 @@
     h2 c4 c |
     c2. c4 |
     c2( h) |
-    c s | \bar "|."
-    \time 4/2 \partial 2
+    c s \bar "|."
+    \zweiterTaktwechsel
     \repeat volta 2 {
       e, |
       g c c d |
@@ -789,9 +796,8 @@
     \key f \major
     s1*14 | \bar "||"
     \time 3/4
-    s2.*23 |
-    \bar "||"
-    \time 4/4 \partial 4
+    s2.*23 \bar "||"
+    \ersterTaktwechsel
     s4 |
     s1*9 | \bar "||"
     c2 c4 s |
@@ -837,8 +843,8 @@
     g2 c4 f, |
     e2( a4) f |
     g2( g,) |
-    c s | \bar "|."
-    \time 4/2 \partial 2
+    c s \bar "|."
+    \zweiterTaktwechsel
     \repeat volta 2 {
       c |
       h c f d |
-- 
cgit v1.2.3-54-g00ecf