Thank_you_for_the_music: für neues Makefile angepasst

2 files changed, 56 insertions, 150 deletions

diff --git a/Thank_you_for_the_music/Makefile b/Thank_you_for_the_music/Makefile
index 9a5f07f..9dcdc6c 100644
--- a/Thank_you_for_the_music/Makefile
+++ b/Thank_you_for_the_music/Makefile
@@ -1,47 +1,27 @@
 CURDOC=$(shell basename "$(CURDIR)")
-STROPHEN=[^%]
-VARIANTE=1
-
-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
 
 clean:
-	rm -f *.pre
+	rm -f *.pre *.post
 
 Clean: clean
 	rm -f *.pdf *.midi
 
+include ../.meta/*.mk
+
 %.pre: %.ly
-	sed " \
-		s@%spezifisch%@$(SPEZIFISCH)@ ; \
-		s/%STR_\($(STROPHEN)\)%//g; \
-		s/%Variante_$(VARIANTE)%//; \
-		$(KLAVIER_REGEX) \
-		$(MIDI_REGEX) \
-	" "$<" > "$@"
-
-$(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
+	cat "$<" > "$@"
+
+%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly))
+	m4 <"$<" >"$@"
+
+%.pdf: %.post
+	lilypond $<
+
+%.midi: %-nur-midi.post
 	lilypond $<
-	pkill -SIGHUP -xf "mupdf $@" || true
+
+test:
+	echo $(patsubst %.ly,%.post, $(shell ls *.ly))
diff --git a/Thank_you_for_the_music/Thank_you_for_the_music.ly b/Thank_you_for_the_music/Thank_you_for_the_music.ly
index ca028ae..5b2c2ef 100644
--- a/Thank_you_for_the_music/Thank_you_for_the_music.ly
+++ b/Thank_you_for_the_music/Thank_you_for_the_music.ly
@@ -1,10 +1,6 @@
 \include "deutsch.ly"
-#(ly:set-option 'relative-includes #t)
-\include "stimmen.ly"
-\include "texte.ly"
-#(ly:set-option 'relative-includes #f)
-
-%spezifisch%
+include(stimmen.pre)
+include(texte.pre)
 
 \pointAndClickOff
 
@@ -16,117 +12,47 @@
   print-all-headers = ##t
 }
 
-\book {
-  \bookOutputSuffix "Alle"
-  \score {
-    \unfoldRepeats {
-      \global
-      <<
-      \new Voice { \voiceOne \sopranMelodie }
-      \new Voice { \voiceTwo \altMelodie }
-      \new Voice { \voiceThree \tenorMelodie }
-      \new Voice { \voiceFour \bassMelodie }
-      >>
-    }
-    \midi {
-      \context {
-        \Score
-        tempoWholesPerMinute = #(ly:make-moment 50 2)
-      }
-    }
-  }
-}
-
-\book {
-  \bookOutputSuffix "Sopran"
-  \score {
-    \unfoldRepeats {
-      \global
-      \sopranMelodie
-    }
-    \midi {
-      \context {
-        \Score
-        tempoWholesPerMinute = #(ly:make-moment 50 2)
-      }
-    }
-  }
-}
-
-\book {
-  \bookOutputSuffix "Alt"
-  \score {
-    \unfoldRepeats {
-      \global
-      \altMelodie
-    }
-    \midi {
-      \context {
-        \Score
-        tempoWholesPerMinute = #(ly:make-moment 50 2)
-      }
-    }
-  }
-}
-
-\book {
-  \bookOutputSuffix "Tenor"
-  \score {
-    \unfoldRepeats {
-      \global
-      \tenorMelodie
-    }
-    \midi {
-      \context {
-        \Score
-        tempoWholesPerMinute = #(ly:make-moment 50 2)
-      }
-    }
+\score {
+ifdef(`nur-midi',
+  \unfoldRepeats {
+    \global
+    <<
+      ifdef(`nur-Alt'   ,,ifdef(`nur-Tenor',,ifdef(`nur-Bass' ,,\new Voice { ifdef(`nur-Sopran',\oneVoice,\voiceOne)   \sopranMelodie })))
+      ifdef(`nur-Sopran',,ifdef(`nur-Tenor',,ifdef(`nur-Bass' ,,\new Voice { ifdef(`nur-Alt',   \oneVoice,\voiceTwo)   \altMelodie })))
+      ifdef(`nur-Sopran',,ifdef(`nur-Alt'  ,,ifdef(`nur-Bass' ,,\new Voice { ifdef(`nur-Tenor', \oneVoice,\voiceThree) \tenorMelodie })))
+      ifdef(`nur-Sopran',,ifdef(`nur-Alt'  ,,ifdef(`nur-Tenor',,\new Voice { ifdef(`nur-Bass',  \oneVoice,\voiceFour)  \bassMelodie })))
+    >>
   }
-}
-
-\book {
-  \bookOutputSuffix "Bass"
-  \score {
-    \unfoldRepeats {
-      \global
-      \bassMelodie
-    }
-    \midi {
-      \context {
-        \Score
-        tempoWholesPerMinute = #(ly:make-moment 50 2)
-      }
-    }
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 50 2)
+    }
+  },
+  \header {
+    title = "Thank you for the music"
+    poet = "Abba"
   }
-}
-
-\book {
-  \score {
-    \header {
-      title = "Thank you for the music"
-      poet = "Abba"
-    }
-    \new ChoirStaff <<
-      \set Score.skipBars = ##t
-      \new Staff <<
-        \new Voice = "frauen"    { \global \oneVoice \frauenPausen }
-        \new Voice = "sopran"    { \global \voiceOne \sopranMelodie }
-        \new Voice = "alt"       { \global \voiceTwo \altMelodie }
-      >>
-      \new Lyrics = "textEins" {}
-      \new Lyrics = "textZwei" {}
-      \new Staff = "maenner" <<
-        \clef "bass"
-        \new Voice = "frauen"    { \global \oneVoice \maennerPausen }
-        \new Voice = "tenor"     { \global \voiceOne \tenorMelodie }
-        \new Voice = "bass"      { \global \voiceTwo \bassMelodie }
-      >>
-      \context Lyrics = "textEins" \lyricsto "sopran" \textFrauen
-      \context Lyrics = "textZwei" \lyricsto "tenor"  \textMaenner
+  \new ChoirStaff <<
+    \set Score.skipBars = ##t
+    \new Staff <<
+      \new Voice = "frauen"    { \global \oneVoice \frauenPausen }
+      \new Voice = "sopran"    { \global \voiceOne \sopranMelodie }
+      \new Voice = "alt"       { \global \voiceTwo \altMelodie }
     >>
-    \layout {
-      indent = #0
-    }
+    \new Lyrics = "textEins" {}
+    \new Lyrics = "textZwei" {}
+    \new Staff = "maenner" <<
+      \clef "bass"
+      \new Voice = "frauen"    { \global \oneVoice \maennerPausen }
+      \new Voice = "tenor"     { \global \voiceOne \tenorMelodie }
+      \new Voice = "bass"      { \global \voiceTwo \bassMelodie }
+    >>
+    \context Lyrics = "textEins" \lyricsto "sopran" \textFrauen
+    \context Lyrics = "textZwei" \lyricsto "tenor"  \textMaenner
+  >>
+  \layout {
+    indent = #0
   }
+)
 }