diff options
| author | Erich Eckner <git@eckner.net> | 2018-04-14 17:47:04 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-04-14 17:47:04 +0200 |
| commit | a1d0ffe1269424150867ed91beedd622fb36e1aa (patch) | |
| tree | d318a0bc5f9f9f2ba84f653e8b206df34fcf2a1e /Kyrie | |
| parent | 7fbec56a94805180685051fdefcaa6ad3e8be3b9 (diff) | |
| download | Musik-a1d0ffe1269424150867ed91beedd622fb36e1aa.tar.xz | |
Kyrie: Klavierbegleitung nun optional
Diffstat (limited to 'Kyrie')
| -rw-r--r-- | Kyrie/Kyrie.ly | 16 | ||||
| -rw-r--r-- | Kyrie/Makefile | 9 |
2 files changed, 16 insertions, 9 deletions
diff --git a/Kyrie/Kyrie.ly b/Kyrie/Kyrie.ly index 0ea2eab..6abf312 100644 --- a/Kyrie/Kyrie.ly +++ b/Kyrie/Kyrie.ly @@ -47,13 +47,13 @@ \new Voice = bass { \global \clef "bass" \voiceTwo \bassMelodie } >> >> - \new PianoStaff << - \new Staff << - \new Voice { \global \autoBeamOn \klavierRechts } - >> - \new Staff << - \new Voice { \global \clef "bass" \autoBeamOn \klavierLinks } - >> - >> + \new PianoStaff << %Klavier% + \new Staff << %Klavier% + \new Voice { \global \autoBeamOn \klavierRechts } %Klavier% + >> %Klavier% + \new Staff << %Klavier% + \new Voice { \global \clef "bass" \autoBeamOn \klavierLinks } %Klavier% + >> %Klavier% + >> %Klavier% >> } diff --git a/Kyrie/Makefile b/Kyrie/Makefile index 5b3af49..8cdc1e0 100644 --- a/Kyrie/Makefile +++ b/Kyrie/Makefile @@ -10,7 +10,13 @@ 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; } + 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 @@ -24,6 +30,7 @@ Clean: clean %.pre: %.ly sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + $(KLAVIER_REGEX) \ $(MIDI_REGEX) \ " "$<" > "$@" |