diff options
Diffstat (limited to 'Kanons')
22 files changed, 176 insertions, 524 deletions
diff --git a/Kanons/Abendstille_ueberall/Makefile b/Kanons/Abendstille_ueberall/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Abendstille_ueberall/Makefile +++ b/Kanons/Abendstille_ueberall/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Bittend_falten_wir_die_Haende/Makefile b/Kanons/Bittend_falten_wir_die_Haende/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Bittend_falten_wir_die_Haende/Makefile +++ b/Kanons/Bittend_falten_wir_die_Haende/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Danket_danket_dem_Herrn/Makefile b/Kanons/Danket_danket_dem_Herrn/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Danket_danket_dem_Herrn/Makefile +++ b/Kanons/Danket_danket_dem_Herrn/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Der_Herrgott_laesst_wachsen_das_taegliche_Brot/Makefile b/Kanons/Der_Herrgott_laesst_wachsen_das_taegliche_Brot/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Der_Herrgott_laesst_wachsen_das_taegliche_Brot/Makefile +++ b/Kanons/Der_Herrgott_laesst_wachsen_das_taegliche_Brot/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Der_selbst_den_Spatzen_gibt_zu_essen/Makefile b/Kanons/Der_selbst_den_Spatzen_gibt_zu_essen/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Der_selbst_den_Spatzen_gibt_zu_essen/Makefile +++ b/Kanons/Der_selbst_den_Spatzen_gibt_zu_essen/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Du_bist_mein_ich_bin_dein/Makefile b/Kanons/Du_bist_mein_ich_bin_dein/Makefile index d77f888..cb66cc7 100644 --- a/Kanons/Du_bist_mein_ich_bin_dein/Makefile +++ b/Kanons/Du_bist_mein_ich_bin_dein/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Er_ist_wie_ein_Baum/Makefile b/Kanons/Er_ist_wie_ein_Baum/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Er_ist_wie_ein_Baum/Makefile +++ b/Kanons/Er_ist_wie_ein_Baum/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Fuer_heute_eine_gute_Nacht/Makefile b/Kanons/Fuer_heute_eine_gute_Nacht/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Fuer_heute_eine_gute_Nacht/Makefile +++ b/Kanons/Fuer_heute_eine_gute_Nacht/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Gelobet_gelobet_sei_der_da_kommt/Makefile b/Kanons/Gelobet_gelobet_sei_der_da_kommt/Makefile index 300cdb2..cb66cc7 100644 --- a/Kanons/Gelobet_gelobet_sei_der_da_kommt/Makefile +++ b/Kanons/Gelobet_gelobet_sei_der_da_kommt/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Gloria_/Makefile b/Kanons/Gloria_/Makefile index d77f888..cb66cc7 100644 --- a/Kanons/Gloria_/Makefile +++ b/Kanons/Gloria_/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Gottes_Wort_ist_wie_Licht_in_der_Nacht/Makefile b/Kanons/Gottes_Wort_ist_wie_Licht_in_der_Nacht/Makefile index 300cdb2..cb66cc7 100644 --- a/Kanons/Gottes_Wort_ist_wie_Licht_in_der_Nacht/Makefile +++ b/Kanons/Gottes_Wort_ist_wie_Licht_in_der_Nacht/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Hoffnung_die_dunkle_Nacht_erhellt/Makefile b/Kanons/Hoffnung_die_dunkle_Nacht_erhellt/Makefile index 300cdb2..cb66cc7 100644 --- a/Kanons/Hoffnung_die_dunkle_Nacht_erhellt/Makefile +++ b/Kanons/Hoffnung_die_dunkle_Nacht_erhellt/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Ich_will_den_Herrn_loben_allezeit/Makefile b/Kanons/Ich_will_den_Herrn_loben_allezeit/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Ich_will_den_Herrn_loben_allezeit/Makefile +++ b/Kanons/Ich_will_den_Herrn_loben_allezeit/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Jahreslosung_2018/Makefile b/Kanons/Jahreslosung_2018/Makefile index 300cdb2..cb66cc7 100644 --- a/Kanons/Jahreslosung_2018/Makefile +++ b/Kanons/Jahreslosung_2018/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Kaffeeklatsch/Makefile b/Kanons/Kaffeeklatsch/Makefile index d77f888..cb66cc7 100644 --- a/Kanons/Kaffeeklatsch/Makefile +++ b/Kanons/Kaffeeklatsch/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Komm_Herr_Jesu_sei_du_unser_Gast/Makefile b/Kanons/Komm_Herr_Jesu_sei_du_unser_Gast/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Komm_Herr_Jesu_sei_du_unser_Gast/Makefile +++ b/Kanons/Komm_Herr_Jesu_sei_du_unser_Gast/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Kommt_das_Essen_ist_bereitet/Makefile b/Kanons/Kommt_das_Essen_ist_bereitet/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Kommt_das_Essen_ist_bereitet/Makefile +++ b/Kanons/Kommt_das_Essen_ist_bereitet/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Lobet_und_preiset/Makefile b/Kanons/Lobet_und_preiset/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Lobet_und_preiset/Makefile +++ b/Kanons/Lobet_und_preiset/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Mache_dich_auf_und_werde_Licht/Makefile b/Kanons/Mache_dich_auf_und_werde_Licht/Makefile index 300cdb2..cb66cc7 100644 --- a/Kanons/Mache_dich_auf_und_werde_Licht/Makefile +++ b/Kanons/Mache_dich_auf_und_werde_Licht/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Segne_Herr_was_deine_Hand/Makefile b/Kanons/Segne_Herr_was_deine_Hand/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Segne_Herr_was_deine_Hand/Makefile +++ b/Kanons/Segne_Herr_was_deine_Hand/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Segne_Vater_diese_Speise/Makefile b/Kanons/Segne_Vater_diese_Speise/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Segne_Vater_diese_Speise/Makefile +++ b/Kanons/Segne_Vater_diese_Speise/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Und_wie_der_kleine_Vogel_singt/Makefile b/Kanons/Und_wie_der_kleine_Vogel_singt/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Und_wie_der_kleine_Vogel_singt/Makefile +++ b/Kanons/Und_wie_der_kleine_Vogel_singt/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true |