diff options
| -rw-r--r-- | Es_ist_ein_Ros_entsprungen/Es_ist_ein_Ros_entsprungen.ly | 2 | ||||
| -rw-r--r-- | Es_ist_ein_Ros_entsprungen/Makefile | 4 | ||||
| -rw-r--r-- | Es_ist_ein_Ros_entsprungen/stimmen.ly | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Es_ist_ein_Ros_entsprungen/Es_ist_ein_Ros_entsprungen.ly b/Es_ist_ein_Ros_entsprungen/Es_ist_ein_Ros_entsprungen.ly index 5e0267e..8cc14f9 100644 --- a/Es_ist_ein_Ros_entsprungen/Es_ist_ein_Ros_entsprungen.ly +++ b/Es_ist_ein_Ros_entsprungen/Es_ist_ein_Ros_entsprungen.ly @@ -1,7 +1,7 @@ \include "deutsch.ly" #(ly:set-option 'relative-includes #t) \include "artikulation.ly" -\include "stimmen.ly" +\include "stimmen.pre" \include "texte.ly" #(ly:set-option 'relative-includes #f) diff --git a/Es_ist_ein_Ros_entsprungen/Makefile b/Es_ist_ein_Ros_entsprungen/Makefile index 7d9d1d1..1cd8307 100644 --- a/Es_ist_ein_Ros_entsprungen/Makefile +++ b/Es_ist_ein_Ros_entsprungen/Makefile @@ -1,5 +1,6 @@ CURDOC=$(shell basename "$(CURDIR)") STROPHEN=[1-4] +VARIANTE=1 ifeq ($(FUER),ewe) SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") @@ -37,10 +38,11 @@ Clean: clean p; \ d; \ }; \ + s/%Variante_$(VARIANTE)%//; \ /%[A-Z_0-9]\+%/d ; \ $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre satz.pre *.ly +%.pdf: %.pre satz.pre stimmen.pre *.ly lilypond $< diff --git a/Es_ist_ein_Ros_entsprungen/stimmen.ly b/Es_ist_ein_Ros_entsprungen/stimmen.ly index f9d0af0..33b50fb 100644 --- a/Es_ist_ein_Ros_entsprungen/stimmen.ly +++ b/Es_ist_ein_Ros_entsprungen/stimmen.ly @@ -50,8 +50,12 @@ altMelodie = \relative a' { a2 | a4 f f f | e2 d | - d c4 c | - d4.( a8 c4) c | + d + %Variante_1% c4 c | + %Variante_1% d4.( a8 + %Variante_2% c | + %Variante_2% d4. a8( + c4) c | c2 } s4 f | |