diff options
38 files changed, 719 insertions, 269 deletions
diff --git a/Aennchen_von_Tharau/Makefile b/Aennchen_von_Tharau/Makefile index d77f888..9a5f07f 100644 --- a/Aennchen_von_Tharau/Makefile +++ b/Aennchen_von_Tharau/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Aennchen_von_Tharau_/Makefile b/Aennchen_von_Tharau_/Makefile index d77f888..9a5f07f 100644 --- a/Aennchen_von_Tharau_/Makefile +++ b/Aennchen_von_Tharau_/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Brunnquell_aller_Gueter/Makefile b/Brunnquell_aller_Gueter/Makefile index b888508..0b6245d 100644 --- a/Brunnquell_aller_Gueter/Makefile +++ b/Brunnquell_aller_Gueter/Makefile @@ -36,7 +36,7 @@ Clean: clean $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%VARIANTE_$(VARIANTE)%@@g; \ + s@%Variante_$(VARIANTE)%@@g; \ " "$<" > "$@" %.pdf: %.pre stimmen.pre texte.ly diff --git a/Brunnquell_aller_Gueter/stimmen.ly b/Brunnquell_aller_Gueter/stimmen.ly index 6457b88..a3aff0b 100755 --- a/Brunnquell_aller_Gueter/stimmen.ly +++ b/Brunnquell_aller_Gueter/stimmen.ly @@ -24,12 +24,12 @@ altMelodie = \relative c' { \repeat volta 2 { c4 g' g8[ f] f4 | f( e) - %VARIANTE_1% c2 | - %VARIANTE_2% f2 | + %Variante_1% c2 | + %Variante_2% f2 | f4 g as as | as( g) - %VARIANTE_1% es2 | des4 - %VARIANTE_2% as2 | des,4 + %Variante_1% es2 | des4 + %Variante_2% as2 | des,4 b8[ des] c4 c | c1 | } @@ -44,28 +44,28 @@ tenorMelodie = \relative c' { \repeat volta 2 { as4 c c b | des( - %VARIANTE_1% c8[ b]) - %VARIANTE_2% c) + %Variante_1% c8[ b]) + %Variante_2% c) as2 | c4 es es des8[ es] | f4( - %VARIANTE_1% es8[ des]) - %VARIANTE_2% es) + %Variante_1% es8[ des]) + %Variante_2% es) c2 | b4 b as g | as1 | } as4 as es' - %VARIANTE_1% f | - %VARIANTE_2% es | + %Variante_1% f | + %Variante_2% es | des es - %VARIANTE_1% es4.( des8) | - %VARIANTE_2% es2 | + %Variante_1% es4.( des8) | + %Variante_2% es2 | c2 es4 es | es des8[ es] f[ c] c4 | des( - %VARIANTE_1% c8[ b]) - %VARIANTE_2% c) + %Variante_1% c8[ b]) + %Variante_2% c) as2 | \bar "|." } @@ -73,21 +73,21 @@ bassMelodie = \relative c { \repeat volta 2 { f4 e f des | b( c) - %VARIANTE_1% f2 | f4 - %VARIANTE_2% f,2 | f'4 + %Variante_1% f2 | f4 + %Variante_2% f,2 | f'4 es as8[ g] f[ es] | des4( es) as,2 | b8[ c] des[ b] c4 c4 | - %VARIANTE_1% f1 | - %VARIANTE_2% f,1 | + %Variante_1% f1 | + %Variante_2% f,1 | } - %VARIANTE_1% f4 - %VARIANTE_2% f'4 + %Variante_1% f4 + %Variante_2% f'4 es8[ des] c4 f | b, c8[ des] es2 | as g4 es | as des,8[ c] d[ e] f4 | b,( c) - %VARIANTE_1% f2 | \bar "|." - %VARIANTE_2% f,2 | \bar "|." + %Variante_1% f2 | \bar "|." + %Variante_2% f,2 | \bar "|." } diff --git a/Denn_er_hat_seinen_Engeln_/Makefile b/Denn_er_hat_seinen_Engeln_/Makefile index d77f888..9a5f07f 100644 --- a/Denn_er_hat_seinen_Engeln_/Makefile +++ b/Denn_er_hat_seinen_Engeln_/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Die_Himmel_ruehmen/Makefile b/Die_Himmel_ruehmen/Makefile index b888508..0b6245d 100644 --- a/Die_Himmel_ruehmen/Makefile +++ b/Die_Himmel_ruehmen/Makefile @@ -36,7 +36,7 @@ Clean: clean $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%VARIANTE_$(VARIANTE)%@@g; \ + s@%Variante_$(VARIANTE)%@@g; \ " "$<" > "$@" %.pdf: %.pre stimmen.pre texte.ly diff --git a/Du_bist_der_Ehrenkoenig/Makefile b/Du_bist_der_Ehrenkoenig/Makefile index d77f888..9a5f07f 100644 --- a/Du_bist_der_Ehrenkoenig/Makefile +++ b/Du_bist_der_Ehrenkoenig/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Du_bists_dem_Ruhm_und_Ehre_gebuehret/Makefile b/Du_bists_dem_Ruhm_und_Ehre_gebuehret/Makefile index b888508..0b6245d 100644 --- a/Du_bists_dem_Ruhm_und_Ehre_gebuehret/Makefile +++ b/Du_bists_dem_Ruhm_und_Ehre_gebuehret/Makefile @@ -36,7 +36,7 @@ Clean: clean $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%VARIANTE_$(VARIANTE)%@@g; \ + s@%Variante_$(VARIANTE)%@@g; \ " "$<" > "$@" %.pdf: %.pre stimmen.pre texte.ly diff --git a/Exsultate_Deo/Makefile b/Exsultate_Deo/Makefile index b888508..0b6245d 100644 --- a/Exsultate_Deo/Makefile +++ b/Exsultate_Deo/Makefile @@ -36,7 +36,7 @@ Clean: clean $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%VARIANTE_$(VARIANTE)%@@g; \ + s@%Variante_$(VARIANTE)%@@g; \ " "$<" > "$@" %.pdf: %.pre stimmen.pre texte.ly diff --git a/Froehlichkeit_und_leichtes_Leben/Makefile b/Froehlichkeit_und_leichtes_Leben/Makefile index d77f888..9a5f07f 100644 --- a/Froehlichkeit_und_leichtes_Leben/Makefile +++ b/Froehlichkeit_und_leichtes_Leben/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Geh_unter_der_Gnade/Makefile b/Geh_unter_der_Gnade/Makefile index d77f888..9a5f07f 100644 --- a/Geh_unter_der_Gnade/Makefile +++ b/Geh_unter_der_Gnade/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Gott_der_seine_Kinder_liebt/Makefile b/Gott_der_seine_Kinder_liebt/Makefile index d77f888..9a5f07f 100644 --- a/Gott_der_seine_Kinder_liebt/Makefile +++ b/Gott_der_seine_Kinder_liebt/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Gott_hat_mir_laengst_einen_Engel_gesandt/Makefile b/Gott_hat_mir_laengst_einen_Engel_gesandt/Makefile index d77f888..9a5f07f 100644 --- a/Gott_hat_mir_laengst_einen_Engel_gesandt/Makefile +++ b/Gott_hat_mir_laengst_einen_Engel_gesandt/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Gott_ist_treu/Makefile b/Gott_ist_treu/Makefile index d77f888..9a5f07f 100644 --- a/Gott_ist_treu/Makefile +++ b/Gott_ist_treu/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Hear_my_prayer/Makefile b/Hear_my_prayer/Makefile index d77f888..9a5f07f 100644 --- a/Hear_my_prayer/Makefile +++ b/Hear_my_prayer/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Hoere_nun_Herr_die_Bitten/Makefile b/Hoere_nun_Herr_die_Bitten/Makefile index d77f888..9a5f07f 100644 --- a/Hoere_nun_Herr_die_Bitten/Makefile +++ b/Hoere_nun_Herr_die_Bitten/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Horch_die_Wellen_tragen/Makefile b/Horch_die_Wellen_tragen/Makefile index d77f888..9a5f07f 100644 --- a/Horch_die_Wellen_tragen/Makefile +++ b/Horch_die_Wellen_tragen/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_freue_mich_im_Herrn/Makefile b/Ich_freue_mich_im_Herrn/Makefile index d77f888..9a5f07f 100644 --- a/Ich_freue_mich_im_Herrn/Makefile +++ b/Ich_freue_mich_im_Herrn/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_glaub_an_einen_Gott_der_singt/Makefile b/Ich_glaub_an_einen_Gott_der_singt/Makefile index d77f888..9a5f07f 100644 --- a/Ich_glaub_an_einen_Gott_der_singt/Makefile +++ b/Ich_glaub_an_einen_Gott_der_singt/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_sing_dir_mein_Lied/Makefile b/Ich_sing_dir_mein_Lied/Makefile index d77f888..9a5f07f 100644 --- a/Ich_sing_dir_mein_Lied/Makefile +++ b/Ich_sing_dir_mein_Lied/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ihr_Freunde_lasst_euch_sagen/Makefile b/Ihr_Freunde_lasst_euch_sagen/Makefile index d77f888..9a5f07f 100644 --- a/Ihr_Freunde_lasst_euch_sagen/Makefile +++ b/Ihr_Freunde_lasst_euch_sagen/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Immer_wieder_kommt_ein_neuer_Fruehling/Makefile b/Immer_wieder_kommt_ein_neuer_Fruehling/Makefile index d77f888..9a5f07f 100644 --- a/Immer_wieder_kommt_ein_neuer_Fruehling/Makefile +++ b/Immer_wieder_kommt_ein_neuer_Fruehling/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Korn_dass_in_die_Erde/Makefile b/Korn_dass_in_die_Erde/Makefile index d77f888..9a5f07f 100644 --- a/Korn_dass_in_die_Erde/Makefile +++ b/Korn_dass_in_die_Erde/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ronja_Raeubertochter/Makefile b/Ronja_Raeubertochter/Makefile index d77f888..9a5f07f 100644 --- a/Ronja_Raeubertochter/Makefile +++ b/Ronja_Raeubertochter/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Saalburg_du_Perle_am_schoenen_Saalestrand/Makefile b/Saalburg_du_Perle_am_schoenen_Saalestrand/Makefile index d77f888..9a5f07f 100644 --- a/Saalburg_du_Perle_am_schoenen_Saalestrand/Makefile +++ b/Saalburg_du_Perle_am_schoenen_Saalestrand/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Schalom/Makefile b/Schalom/Makefile index d77f888..9a5f07f 100644 --- a/Schalom/Makefile +++ b/Schalom/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Stups_der_kleine_Osterhase/Makefile b/Stups_der_kleine_Osterhase/Makefile index d77f888..9a5f07f 100644 --- a/Stups_der_kleine_Osterhase/Makefile +++ b/Stups_der_kleine_Osterhase/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Thank_you_for_the_music/Makefile b/Thank_you_for_the_music/Makefile index d77f888..9a5f07f 100644 --- a/Thank_you_for_the_music/Makefile +++ b/Thank_you_for_the_music/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ueber_dir_wach_ein_Engel/Makefile b/Ueber_dir_wach_ein_Engel/Makefile index d77f888..9a5f07f 100644 --- a/Ueber_dir_wach_ein_Engel/Makefile +++ b/Ueber_dir_wach_ein_Engel/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Verleih_uns_Frieden/Makefile b/Verleih_uns_Frieden/Makefile index d77f888..9a5f07f 100644 --- a/Verleih_uns_Frieden/Makefile +++ b/Verleih_uns_Frieden/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Verleih_uns_Frieden__/Makefile b/Verleih_uns_Frieden__/Makefile index d77f888..9a5f07f 100644 --- a/Verleih_uns_Frieden__/Makefile +++ b/Verleih_uns_Frieden__/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Vertraut_den_neuen_Wegen/Makefile b/Vertraut_den_neuen_Wegen/Makefile index d77f888..9a5f07f 100644 --- a/Vertraut_den_neuen_Wegen/Makefile +++ b/Vertraut_den_neuen_Wegen/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wachet_auf_ruft_uns_die_Stimme/Makefile b/Wachet_auf_ruft_uns_die_Stimme/Makefile index 0244c42..511d4c6 100644 --- a/Wachet_auf_ruft_uns_die_Stimme/Makefile +++ b/Wachet_auf_ruft_uns_die_Stimme/Makefile @@ -44,7 +44,7 @@ Clean: clean $(MIDI_REGEX) \ $(FERMATEN_REGEX) \ s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%VARIANTE_$(VARIANTE)%@@g; \ + s@%Variante_$(VARIANTE)%@@g; \ " "$<" > "$@" %.pdf: %.pre stimmen.pre texte.ly diff --git a/Was_noch_frisch_und_jung_an_Jahren/Makefile b/Was_noch_frisch_und_jung_an_Jahren/Makefile index d77f888..9a5f07f 100644 --- a/Was_noch_frisch_und_jung_an_Jahren/Makefile +++ b/Was_noch_frisch_und_jung_an_Jahren/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wie_lieb_sind_mir_deine_Wohnungen/Makefile b/Wie_lieb_sind_mir_deine_Wohnungen/Makefile index b888508..0b6245d 100644 --- a/Wie_lieb_sind_mir_deine_Wohnungen/Makefile +++ b/Wie_lieb_sind_mir_deine_Wohnungen/Makefile @@ -36,7 +36,7 @@ Clean: clean $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%VARIANTE_$(VARIANTE)%@@g; \ + s@%Variante_$(VARIANTE)%@@g; \ " "$<" > "$@" %.pdf: %.pre stimmen.pre texte.ly diff --git a/Wir_wuenschen_Gottes_Segen/Makefile b/Wir_wuenschen_Gottes_Segen/Makefile index b888508..0b6245d 100644 --- a/Wir_wuenschen_Gottes_Segen/Makefile +++ b/Wir_wuenschen_Gottes_Segen/Makefile @@ -36,7 +36,7 @@ Clean: clean $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%VARIANTE_$(VARIANTE)%@@g; \ + s@%Variante_$(VARIANTE)%@@g; \ " "$<" > "$@" %.pdf: %.pre stimmen.pre texte.ly diff --git a/Wir_wuenschen_dass_jedes_Kind_auf_der_Welt_lachen_kann/Makefile b/Wir_wuenschen_dass_jedes_Kind_auf_der_Welt_lachen_kann/Makefile index d77f888..9a5f07f 100644 --- a/Wir_wuenschen_dass_jedes_Kind_auf_der_Welt_lachen_kann/Makefile +++ b/Wir_wuenschen_dass_jedes_Kind_auf_der_Welt_lachen_kann/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Yesterday/Makefile b/Yesterday/Makefile index d77f888..9a5f07f 100644 --- a/Yesterday/Makefile +++ b/Yesterday/Makefile @@ -1,16 +1,17 @@ CURDOC=$(shell basename "$(CURDIR)") +STROPHEN=[^%] +VARIANTE=1 -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +ifeq ($(MIDI),1) + MIDI_REGEX= else - SPEZIFISCH= - # \#(set-global-staff-size 14) + MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; endif -ifeq ($(MIDI),1) - MIDI_REGEX= +ifeq ($(KLAVIER),1) + KLAVIER_REGEX= else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } + KLAVIER_REGEX=/%Klavier%/d; endif all: $(CURDOC).pdf @@ -25,8 +26,22 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + s/%STR_\($(STROPHEN)\)%//g; \ + s/%Variante_$(VARIANTE)%//; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" -%.pdf: %.pre *.ly +$(CURDOC).meta: $(CURDOC)-plain.meta + cat "$<" >"$@" + +$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre + sed " \ + 1 i define(input,$(CURDOC).pre) \ + " "$<" \ + | m4 \ + >"$@" + +%.pdf: %.meta stimmen.pre texte.pre lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true |