summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-12-04 22:28:23 +0100
committerErich Eckner <git@eckner.net>2018-12-04 22:28:23 +0100
commitca1aa31d4b118b48a9dc658b96e16488b9ae1b57 (patch)
treeaf6c101d6647b3efa17a92803520d682d068da86
parentee0f4337de2cd1efc59e67f6d792084272acc737 (diff)
downloadMusik-ca1aa31d4b118b48a9dc658b96e16488b9ae1b57.tar.xz
Froehlich_soll_mein_Herze_springen__: satz.ly abgespalten
-rw-r--r--Froehlich_soll_mein_Herze_springen__/Froehlich_soll_mein_Herze_springen__.ly31
-rw-r--r--Froehlich_soll_mein_Herze_springen__/Makefile9
-rw-r--r--Froehlich_soll_mein_Herze_springen__/satz.ly28
3 files changed, 39 insertions, 29 deletions
diff --git a/Froehlich_soll_mein_Herze_springen__/Froehlich_soll_mein_Herze_springen__.ly b/Froehlich_soll_mein_Herze_springen__/Froehlich_soll_mein_Herze_springen__.ly
index bd28680..0d8cf7e 100644
--- a/Froehlich_soll_mein_Herze_springen__/Froehlich_soll_mein_Herze_springen__.ly
+++ b/Froehlich_soll_mein_Herze_springen__/Froehlich_soll_mein_Herze_springen__.ly
@@ -18,31 +18,6 @@
print-all-headers = ##t
}
-\score {
- \header {
- title = "Fröhlich soll mein Herze springen"
- poet = "Paul Gerhardt (1607-1676)"
- composer = "Melodie: Johann Crüger: 1656"
- }
- \new ChoirStaff \transpose f e <<
- \set Score.skipBars = ##t
- \new Staff
- <<
- \new Voice = "sopran" { \globalI \voiceOne \sopranMelodie }
- \new Voice = "alt" { \globalI \voiceTwo \altMelodie }
- >>
- \new Lyrics = "textEins" {}
- \new Lyrics = "textZwei" {}
- \new Lyrics = "textDrei" {}
- \new Staff = "maenner" <<
- \new Voice = "tenor" { \globalI \clef "bass" \voiceOne \tenorMelodie }
- \new Voice = "bass" { \globalI \clef "bass" \voiceTwo \bassMelodie }
- >>
- \context Lyrics = "textEins" \lyricsto "bass" \textI
- \context Lyrics = "textZwei" \lyricsto "bass" \textII
- \context Lyrics = "textDrei" \lyricsto "bass" \textIII
- >>
- \layout {
- indent = #0
- }
-}
+#(ly:set-option 'relative-includes #t)
+\include "satz.pre"
+#(ly:set-option 'relative-includes #f)
diff --git a/Froehlich_soll_mein_Herze_springen__/Makefile b/Froehlich_soll_mein_Herze_springen__/Makefile
index 8cdc1e0..8712c21 100644
--- a/Froehlich_soll_mein_Herze_springen__/Makefile
+++ b/Froehlich_soll_mein_Herze_springen__/Makefile
@@ -1,4 +1,5 @@
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\")
@@ -30,9 +31,15 @@ Clean: clean
%.pre: %.ly
sed " \
s@%spezifisch%@$(SPEZIFISCH)@ ; \
+ /%STR_\($(STROPHEN)\)%/{ \
+ s/%[A-Z_0-9]\+%//; \
+ p; \
+ d; \
+ }; \
+ /%[A-Z_0-9]\+%/d; \
$(KLAVIER_REGEX) \
$(MIDI_REGEX) \
" "$<" > "$@"
-%.pdf: %.pre *.ly
+%.pdf: %.pre satz.pre stimmen.ly texte.ly
lilypond $<
diff --git a/Froehlich_soll_mein_Herze_springen__/satz.ly b/Froehlich_soll_mein_Herze_springen__/satz.ly
new file mode 100644
index 0000000..569f96e
--- /dev/null
+++ b/Froehlich_soll_mein_Herze_springen__/satz.ly
@@ -0,0 +1,28 @@
+\score {
+ \header {
+ title = "Fröhlich soll mein Herze springen"
+ poet = "Paul Gerhardt (1607-1676)"
+ composer = "Melodie: Johann Crüger: 1656"
+ }
+ \new ChoirStaff \transpose f e <<
+ \set Score.skipBars = ##t
+ \new Staff
+ <<
+ \new Voice = "sopran" { \globalI \voiceOne \sopranMelodie }
+ \new Voice = "alt" { \globalI \voiceTwo \altMelodie }
+ >>
+ \new Lyrics = "textEins" {}
+ \new Lyrics = "textZwei" {}
+ \new Lyrics = "textDrei" {}
+ \new Staff = "maenner" <<
+ \new Voice = "tenor" { \globalI \clef "bass" \voiceOne \tenorMelodie }
+ \new Voice = "bass" { \globalI \clef "bass" \voiceTwo \bassMelodie }
+ >>
+ \context Lyrics = "textEins" \lyricsto "bass" \textI
+ \context Lyrics = "textZwei" \lyricsto "bass" \textII
+ \context Lyrics = "textDrei" \lyricsto "bass" \textIII
+ >>
+ \layout {
+ indent = #0
+ }
+}