33 files changed, 21 insertions, 280 deletions
diff --git a/Pop_Messe/Makefile b/Pop_Messe/Makefile
index 32730bd..42b6ec3 100644
--- a/Pop_Messe/Makefile
+++ b/Pop_Messe/Makefile
@@ -1,7 +1,5 @@
 CURDOC=$(shell basename "$(CURDIR)")
 
-SUBDIRS := $(subst /.,/,$(wildcard */.))
-
 ifeq ($(FUER),ewe)
   SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\")
 else
@@ -23,8 +21,5 @@ Clean: clean
 %.pre: %.ly
 	sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@"
 
-%.pdf: %.pre $(SUBDIRS)
+%.pdf: %.pre parts/*.ly
 	lilypond $<
-
-$(SUBDIRS):
-	$(MAKE) -C $@ $(subst /,.pre,$@)
diff --git a/Pop_Messe/Makefile.template b/Pop_Messe/Makefile.template
deleted file mode 100644
index 8df2663..0000000
--- a/Pop_Messe/Makefile.template
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
-.PHONY: all clean Clean
-
-all: $(CURDOC).pdf
-
-clean:
-	rm -f *.pre
-
-Clean: clean
-	rm -f *.pdf *.midi
-
-%.pre: %.ly
-	sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@"
-
-%.pdf: %.pre
-	echo lilypond $<
diff --git a/Pop_Messe/Pop_Messe.ly b/Pop_Messe/Pop_Messe.ly
index 91c3c4b..7918655 100644
--- a/Pop_Messe/Pop_Messe.ly
+++ b/Pop_Messe/Pop_Messe.ly
@@ -1,20 +1,20 @@
 \include "deutsch.ly"
 #(ly:set-option 'relative-includes #t)
-\include "kyrie/artikulation.ly"
-\include "kyrie/stimmen.ly"
-\include "kyrie/texte.ly"
-\include "gloria/artikulation.ly"
-\include "gloria/stimmen.ly"
-\include "gloria/texte.ly"
-\include "sanctus/artikulation.ly"
-\include "sanctus/stimmen.ly"
-\include "sanctus/texte.ly"
-\include "benedictus/artikulation.ly"
-\include "benedictus/stimmen.ly"
-\include "benedictus/texte.ly"
-\include "agnus_dei/artikulation.ly"
-\include "agnus_dei/stimmen.ly"
-\include "agnus_dei/texte.ly"
+\include "parts/artikulation_kyrie.ly"
+\include "parts/stimmen_kyrie.ly"
+\include "parts/texte_kyrie.ly"
+\include "parts/artikulation_gloria.ly"
+\include "parts/stimmen_gloria.ly"
+\include "parts/texte_gloria.ly"
+\include "parts/artikulation_sanctus.ly"
+\include "parts/stimmen_sanctus.ly"
+\include "parts/texte_sanctus.ly"
+\include "parts/artikulation_benedictus.ly"
+\include "parts/stimmen_benedictus.ly"
+\include "parts/texte_benedictus.ly"
+\include "parts/artikulation_agnus_dei.ly"
+\include "parts/stimmen_agnus_dei.ly"
+\include "parts/texte_agnus_dei.ly"
 #(ly:set-option 'relative-includes #f)
 
 %spezifisch%
@@ -31,9 +31,9 @@
 \pointAndClickOff
 
 #(ly:set-option 'relative-includes #t)
-\include "kyrie/kyrie.pre"
-\include "gloria/gloria.pre"
-\include "sanctus/sanctus.pre"
-\include "benedictus/benedictus.pre"
-\include "agnus_dei/agnus_dei.pre"
+\include "parts/kyrie.ly"
+\include "parts/gloria.ly"
+\include "parts/sanctus.ly"
+\include "parts/benedictus.ly"
+\include "parts/agnus_dei.ly"
 #(ly:set-option 'relative-includes #f)
diff --git a/Pop_Messe/agnus_dei/Makefile b/Pop_Messe/agnus_dei/Makefile
deleted file mode 100644
index 8df2663..0000000
--- a/Pop_Messe/agnus_dei/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
-.PHONY: all clean Clean
-
-all: $(CURDOC).pdf
-
-clean:
-	rm -f *.pre
-
-Clean: clean
-	rm -f *.pdf *.midi
-
-%.pre: %.ly
-	sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@"
-
-%.pdf: %.pre
-	echo lilypond $<
diff --git a/Pop_Messe/benedictus/Makefile b/Pop_Messe/benedictus/Makefile
deleted file mode 100644
index 8df2663..0000000
--- a/Pop_Messe/benedictus/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
-.PHONY: all clean Clean
-
-all: $(CURDOC).pdf
-
-clean:
-	rm -f *.pre
-
-Clean: clean
-	rm -f *.pdf *.midi
-
-%.pre: %.ly
-	sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@"
-
-%.pdf: %.pre
-	echo lilypond $<
diff --git a/Pop_Messe/gloria/Makefile b/Pop_Messe/gloria/Makefile
deleted file mode 100644
index 8df2663..0000000
--- a/Pop_Messe/gloria/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
-.PHONY: all clean Clean
-
-all: $(CURDOC).pdf
-
-clean:
-	rm -f *.pre
-
-Clean: clean
-	rm -f *.pdf *.midi
-
-%.pre: %.ly
-	sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@"
-
-%.pdf: %.pre
-	echo lilypond $<
diff --git a/Pop_Messe/helferlein b/Pop_Messe/helferlein
deleted file mode 100755
index 53b10ca..0000000
--- a/Pop_Messe/helferlein
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-declare -A teile
-teile["kyrie"]="Kyrie"
-teile["gloria"]="Gloria"
-teile["sanctus"]="Sanctus"
-teile["benedictus"]="Benedictus"
-teile["agnus_dei"]="AgnusDei"
-
-for s in ${!teile[@]}
-do
-  rm -rf "${s}"
-  mkdir "${s}"
-  for t in artikulation stimmen texte
-  do
-    sed "s|%%s|$s|g;s|%%S|${teile[${s}]}|g" template_${t}.ly > ${s}/${t}.ly
-  done
-  sed "s|%%s|$s|g;s|%%S|${teile[${s}]}|g" template.ly > ${s}/${s}.ly
-  cp Makefile.template ${s}/Makefile
-done
diff --git a/Pop_Messe/kyrie/Makefile b/Pop_Messe/kyrie/Makefile
deleted file mode 100644
index 8df2663..0000000
--- a/Pop_Messe/kyrie/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
-.PHONY: all clean Clean
-
-all: $(CURDOC).pdf
-
-clean:
-	rm -f *.pre
-
-Clean: clean
-	rm -f *.pdf *.midi
-
-%.pre: %.ly
-	sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@"
-
-%.pdf: %.pre
-	echo lilypond $<
diff --git a/Pop_Messe/agnus_dei/agnus_dei.ly b/Pop_Messe/parts/agnus_dei.ly
index 711c13d..711c13d 100644
--- a/Pop_Messe/agnus_dei/agnus_dei.ly
+++ b/Pop_Messe/parts/agnus_dei.ly
diff --git a/Pop_Messe/agnus_dei/artikulation.ly b/Pop_Messe/parts/artikulation_agnus_dei.ly
index 46248e7..46248e7 100644
--- a/Pop_Messe/agnus_dei/artikulation.ly
+++ b/Pop_Messe/parts/artikulation_agnus_dei.ly
diff --git a/Pop_Messe/benedictus/artikulation.ly b/Pop_Messe/parts/artikulation_benedictus.ly
index e705d17..e705d17 100644
--- a/Pop_Messe/benedictus/artikulation.ly
+++ b/Pop_Messe/parts/artikulation_benedictus.ly
diff --git a/Pop_Messe/gloria/artikulation.ly b/Pop_Messe/parts/artikulation_gloria.ly
index f03eae9..f03eae9 100644
--- a/Pop_Messe/gloria/artikulation.ly
+++ b/Pop_Messe/parts/artikulation_gloria.ly
diff --git a/Pop_Messe/kyrie/artikulation.ly b/Pop_Messe/parts/artikulation_kyrie.ly
index 435e09d..435e09d 100644
--- a/Pop_Messe/kyrie/artikulation.ly
+++ b/Pop_Messe/parts/artikulation_kyrie.ly
diff --git a/Pop_Messe/sanctus/artikulation.ly b/Pop_Messe/parts/artikulation_sanctus.ly
index c99b914..c99b914 100644
--- a/Pop_Messe/sanctus/artikulation.ly
+++ b/Pop_Messe/parts/artikulation_sanctus.ly
diff --git a/Pop_Messe/benedictus/benedictus.ly b/Pop_Messe/parts/benedictus.ly
index 0998944..0998944 100644
--- a/Pop_Messe/benedictus/benedictus.ly
+++ b/Pop_Messe/parts/benedictus.ly
diff --git a/Pop_Messe/gloria/gloria.ly b/Pop_Messe/parts/gloria.ly
index 2f79c83..2f79c83 100644
--- a/Pop_Messe/gloria/gloria.ly
+++ b/Pop_Messe/parts/gloria.ly
diff --git a/Pop_Messe/kyrie/kyrie.ly b/Pop_Messe/parts/kyrie.ly
index 6a89d6b..6a89d6b 100644
--- a/Pop_Messe/kyrie/kyrie.ly
+++ b/Pop_Messe/parts/kyrie.ly
diff --git a/Pop_Messe/sanctus/sanctus.ly b/Pop_Messe/parts/sanctus.ly
index 2d32690..2d32690 100644
--- a/Pop_Messe/sanctus/sanctus.ly
+++ b/Pop_Messe/parts/sanctus.ly
diff --git a/Pop_Messe/agnus_dei/stimmen.ly b/Pop_Messe/parts/stimmen_agnus_dei.ly
index f557743..f557743 100644
--- a/Pop_Messe/agnus_dei/stimmen.ly
+++ b/Pop_Messe/parts/stimmen_agnus_dei.ly
diff --git a/Pop_Messe/benedictus/stimmen.ly b/Pop_Messe/parts/stimmen_benedictus.ly
index fccb6d3..fccb6d3 100644
--- a/Pop_Messe/benedictus/stimmen.ly
+++ b/Pop_Messe/parts/stimmen_benedictus.ly
diff --git a/Pop_Messe/gloria/stimmen.ly b/Pop_Messe/parts/stimmen_gloria.ly
index 70440d6..70440d6 100644
--- a/Pop_Messe/gloria/stimmen.ly
+++ b/Pop_Messe/parts/stimmen_gloria.ly
diff --git a/Pop_Messe/kyrie/stimmen.ly b/Pop_Messe/parts/stimmen_kyrie.ly
index 8fae6a5..8fae6a5 100644
--- a/Pop_Messe/kyrie/stimmen.ly
+++ b/Pop_Messe/parts/stimmen_kyrie.ly
diff --git a/Pop_Messe/sanctus/stimmen.ly b/Pop_Messe/parts/stimmen_sanctus.ly
index ae364ec..ae364ec 100644
--- a/Pop_Messe/sanctus/stimmen.ly
+++ b/Pop_Messe/parts/stimmen_sanctus.ly
diff --git a/Pop_Messe/agnus_dei/texte.ly b/Pop_Messe/parts/texte_agnus_dei.ly
index bb42f5d..bb42f5d 100644
--- a/Pop_Messe/agnus_dei/texte.ly
+++ b/Pop_Messe/parts/texte_agnus_dei.ly
diff --git a/Pop_Messe/benedictus/texte.ly b/Pop_Messe/parts/texte_benedictus.ly
index b458e19..b458e19 100644
--- a/Pop_Messe/benedictus/texte.ly
+++ b/Pop_Messe/parts/texte_benedictus.ly
diff --git a/Pop_Messe/gloria/texte.ly b/Pop_Messe/parts/texte_gloria.ly
index a51dd3d..a51dd3d 100644
--- a/Pop_Messe/gloria/texte.ly
+++ b/Pop_Messe/parts/texte_gloria.ly
diff --git a/Pop_Messe/kyrie/texte.ly b/Pop_Messe/parts/texte_kyrie.ly
index d0eee14..d0eee14 100644
--- a/Pop_Messe/kyrie/texte.ly
+++ b/Pop_Messe/parts/texte_kyrie.ly
diff --git a/Pop_Messe/sanctus/texte.ly b/Pop_Messe/parts/texte_sanctus.ly
index 4587192..4587192 100644
--- a/Pop_Messe/sanctus/texte.ly
+++ b/Pop_Messe/parts/texte_sanctus.ly
diff --git a/Pop_Messe/sanctus/Makefile b/Pop_Messe/sanctus/Makefile
deleted file mode 100644
index 8df2663..0000000
--- a/Pop_Messe/sanctus/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
-.PHONY: all clean Clean
-
-all: $(CURDOC).pdf
-
-clean:
-	rm -f *.pre
-
-Clean: clean
-	rm -f *.pdf *.midi
-
-%.pre: %.ly
-	sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@"
-
-%.pdf: %.pre
-	echo lilypond $<
diff --git a/Pop_Messe/template.ly b/Pop_Messe/template.ly
deleted file mode 100644
index 76a6e33..0000000
--- a/Pop_Messe/template.ly
+++ /dev/null
@@ -1,48 +0,0 @@
-\include "deutsch.ly"
-#(ly:set-option 'relative-includes #t)
-\include "artikulation.ly"
-\include "stimmen.ly"
-\include "texte.ly"
-#(ly:set-option 'relative-includes #f)
-
-\header {
-  tagline = ""
-}
-\paper {
-  top-margin = 5
-  print-all-headers = ##t
-}
-
-\pointAndClickOff
-
-\score {
-  \header {
-    title = "%%S"
-  }
-  \new ChoirStaff <<
-    \set Score.skipBars = ##t
-    \new Staff <<
-      \new Voice = sopran   { \global%%S << \melodieSopran%%S \artikulation%%S >> }
-    >>
-    \new Lyrics \lyricsto sopran { \textSopran%%S }
-    \new Staff <<
-      \new Voice = alt      { \global%%S << \melodieAlt%%S \artikulation%%S >> }
-    >>
-    \new Lyrics \lyricsto alt { \textAlt%%S }
-    \new Staff <<
-      \new Voice = tenor   { \clef "G_8" \global%%S << \melodieTenor%%S \artikulation%%S >> }
-    >>
-    \new Lyrics \lyricsto tenor { \textTenor%%S }
-    \new Staff <<
-      \new Voice = bass    { \clef "bass" \global%%S << \melodieBass%%S \artikulation%%S >> }
-    >>
-    \new Lyrics \lyricsto bass { \textBass%%S }
-  >>
-  \layout {
-%    indent = #0
-    \context {
-      \Staff
-      \RemoveEmptyStaves
-    }
-  }
-}
diff --git a/Pop_Messe/template_artikulation.ly b/Pop_Messe/template_artikulation.ly
deleted file mode 100644
index 9d0e776..0000000
--- a/Pop_Messe/template_artikulation.ly
+++ /dev/null
@@ -1,3 +0,0 @@
-
-artikulation%%S = {
-}
diff --git a/Pop_Messe/template_stimmen.ly b/Pop_Messe/template_stimmen.ly
deleted file mode 100644
index a948f53..0000000
--- a/Pop_Messe/template_stimmen.ly
+++ /dev/null
@@ -1,24 +0,0 @@
-%some settings% vim: ai sw=2 lbr nu et
-
-  \version "2.18"
-
-  global%%S = {
-    \key a \major
-    %\override Staff.TimeSignature #'style = #'()
-    \time 4/4
-    \autoBeamOff
-  }
-
-% Die Stimmen
-
-  melodieSopran%%S = \relative cis'' {
-  }
-
-  melodieAlt%%S = \relative a' {
-  }
-
-  melodieTenor%%S = \relative cis' {
-  }
-
-  melodieBass%%S = \relative cis' {
-  }
diff --git a/Pop_Messe/template_texte.ly b/Pop_Messe/template_texte.ly
deleted file mode 100644
index f567d3a..0000000
--- a/Pop_Messe/template_texte.ly
+++ /dev/null
@@ -1,15 +0,0 @@
-%some settings% vim: ai sw=2 lbr nu et
-
-% Abkürzungen
-
-  textSopran%%S = \lyricmode {
-  }
-
-  textAlt%%S = \lyricmode {
-  }
-
-  textTenor%%S = \lyricmode {
-  }
-
-  textBass%%S = \lyricmode {
-  }