diff options
| author | Erich Eckner <git@eckner.net> | 2018-12-22 00:50:14 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-12-22 00:50:14 +0100 |
| commit | 3617627150af3cb5cc909c410bfe737ab8609f85 (patch) | |
| tree | 91a8839849f765b127a0220acc15b39a91e510cb | |
| parent | deb20fdb0222f8b41a4b180b9c7aca62582ad4da (diff) | |
| download | Musik-3617627150af3cb5cc909c410bfe737ab8609f85.tar.xz | |
O_du_froehliche: Extras konfigurierbar
| -rw-r--r-- | O_du_froehliche/Makefile | 18 | ||||
| -rw-r--r-- | O_du_froehliche/O_du_froehliche.ly | 54 |
2 files changed, 44 insertions, 28 deletions
diff --git a/O_du_froehliche/Makefile b/O_du_froehliche/Makefile index 869e498..8b2a34b 100644 --- a/O_du_froehliche/Makefile +++ b/O_du_froehliche/Makefile @@ -7,6 +7,18 @@ else # \#(set-global-staff-size 14) endif +ifeq ($(KLAVIER),1) + KLAVIER_REGEX=s/%Klavier%// +else + KLAVIER_REGEX=/%Klavier%/d; +endif + +ifeq ($(OBERSTIMME),1) + KLAVIER_REGEX=s/%Oberstimme%// +else + KLAVIER_REGEX=/%Oberstimme%/d; +endif + all: $(CURDOC).pdf $(CURDOC).midi clean: @@ -16,7 +28,11 @@ Clean: clean rm -f *.pdf *.midi %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + sed " \ + s@%spezifisch%@$(SPEZIFISCH)@ ; \ + $(OBERSTIMMEN_REGEX) \ + $(KLAVIER_REGEX) \ + " "$<" > "$@" %.pdf %.midi: %.pre *.ly lilypond $< diff --git a/O_du_froehliche/O_du_froehliche.ly b/O_du_froehliche/O_du_froehliche.ly index 39eecff..cca2ba3 100644 --- a/O_du_froehliche/O_du_froehliche.ly +++ b/O_du_froehliche/O_du_froehliche.ly @@ -30,39 +30,39 @@ \new Staff << \set Score.skipBars = ##t - \new ChoirStaff << - \new Voice = oberstimme { \global \autoBeamOn \melodieOberstimme } - >> - \new ChoirStaff << - \new Staff << - \new Voice = fpausen { \global \oneVoice \pausenChor } - \new Voice = sopran { \global \voiceOne \melodieSopran } - \new Voice = alt { \global \voiceTwo \melodieAlt } - >> - \new Lyrics = textOberstimme { } - \new Staff << - \clef "bass" - \new Voice = mpausen { \global \oneVoice \pausenChor } - \new Voice = tenor { \global \voiceOne \melodieTenor } - \new Voice = bass { \global \voiceTwo \melodieBass } - >> - >> + %Oberstimme% \new ChoirStaff << + %Oberstimme% \new Voice = oberstimme { \global \autoBeamOn \melodieOberstimme } + %Oberstimme% >> + %Oberstimme% \new ChoirStaff << + %Oberstimme% \new Staff << + %Oberstimme% \new Voice = fpausen { \global \oneVoice \pausenChor } + %Oberstimme% \new Voice = sopran { \global \voiceOne \melodieSopran } + %Oberstimme% \new Voice = alt { \global \voiceTwo \melodieAlt } + %Oberstimme% >> + %Oberstimme% \new Lyrics = textOberstimme { } + %Oberstimme% \new Staff << + %Oberstimme% \clef "bass" + %Oberstimme% \new Voice = mpausen { \global \oneVoice \pausenChor } + %Oberstimme% \new Voice = tenor { \global \voiceOne \melodieTenor } + %Oberstimme% \new Voice = bass { \global \voiceTwo \melodieBass } + %Oberstimme% >> + %Oberstimme% >> \new ChoirStaff << \new Voice = melodie { \global \melodie } \new Lyrics = textI { } \new Lyrics = textII { } \new Lyrics = textIII { } >> - \new PianoStaff << - \new Staff << - \new Voice = klavierRechts { \global \melodieKlavierRechts } - >> - \new Staff << - \clef "bass" - \new Voice = klavierRechts { \global \melodieKlavierLinks } - >> - >> - \context Lyrics = textOberstimme \lyricsto sopran { \textOberstimme } + %Klavier% \new PianoStaff << + %Klavier% \new Staff << + %Klavier% \new Voice = klavierRechts { \global \melodieKlavierRechts } + %Klavier% >> + %Klavier% \new Staff << + %Klavier% \clef "bass" + %Klavier% \new Voice = klavierRechts { \global \melodieKlavierLinks } + %Klavier% >> + %Klavier% >> + %Oberstimme% \context Lyrics = textOberstimme \lyricsto sopran { \textOberstimme } \context Lyrics = textI \lyricsto melodie { \textI } \context Lyrics = textII \lyricsto melodie { \textII } \context Lyrics = textIII \lyricsto melodie { \textIII } |