diff options
| -rwxr-xr-x | Komm_Heilger_Geist/Komm_Heilger_Geist.ly | 22 | ||||
| -rw-r--r-- | Komm_Heilger_Geist/Makefile | 8 | ||||
| -rw-r--r-- | Komm_Heilger_Geist/stimmen.ly | 58 |
3 files changed, 49 insertions, 39 deletions
diff --git a/Komm_Heilger_Geist/Komm_Heilger_Geist.ly b/Komm_Heilger_Geist/Komm_Heilger_Geist.ly index d931e36..d38ad45 100755 --- a/Komm_Heilger_Geist/Komm_Heilger_Geist.ly +++ b/Komm_Heilger_Geist/Komm_Heilger_Geist.ly @@ -24,19 +24,19 @@ \new Staff << \new Voice = "Sopran" \sopranMelodie \new Lyrics \lyricsto "Sopran" \sopranText - >> - \new Staff << - \altMelodie - \new Lyrics = one \lyricsto refrain \textRefrain - \context Lyrics = one \lyricsto verse \textI %STR_1% - \new Lyrics = two \lyricsto verse \textII %STR_2% - \new Lyrics = three \lyricsto verse \textIII %STR_3% + %unterstimme% >> + %unterstimme% \new Staff << + %unterstimme% \altMelodie + %unterstimme% \new Lyrics = one \lyricsto refrain \textRefrain + %STR_1% \context Lyrics = one \lyricsto verse \textI + %STR_2% \new Lyrics = two \lyricsto verse \textII + %STR_3% \new Lyrics = three \lyricsto verse \textIII >> - \new Staff << - \new Voice = "Tenor" { \voiceOne \clef "bass" \tenorMelodie } - \new Voice = "Bass" { \voiceTwo \clef "bass" \bassMelodie } - >> + %unterstimme% \new Staff << + %unterstimme% \new Voice = "Tenor" { \voiceOne \clef "bass" \tenorMelodie } + %unterstimme% \new Voice = "Bass" { \voiceTwo \clef "bass" \bassMelodie } + %unterstimme% >> >> \layout { diff --git a/Komm_Heilger_Geist/Makefile b/Komm_Heilger_Geist/Makefile index 6cd1c47..358c2a7 100644 --- a/Komm_Heilger_Geist/Makefile +++ b/Komm_Heilger_Geist/Makefile @@ -1,5 +1,6 @@ CURDOC=$(shell basename "$(CURDIR)") STROPHEN=[1-3] +UNTERSTIMMEN=1 ifeq ($(FUER),ewe) SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") @@ -8,6 +9,12 @@ else # \#(set-global-staff-size 14) endif +ifeq ($(UNTERSTIMMEN),1) + UNTERSTIMMEN_REGEX=s@%unterstimme%@@ +else + UNTERSTIMMEN_REGEX= +endif + all: $(CURDOC).pdf clean: @@ -20,6 +27,7 @@ Clean: clean sed " \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ s@%spezifisch%@$(SPEZIFISCH)@ ; \ + $(UNTERSTIMMEN_REGEX); \ /%STR_\($(STROPHEN)\)%/{ \ s/%[A-Z_0-9]\+%//; \ p; \ diff --git a/Komm_Heilger_Geist/stimmen.ly b/Komm_Heilger_Geist/stimmen.ly index 5a6dd80..3818c88 100644 --- a/Komm_Heilger_Geist/stimmen.ly +++ b/Komm_Heilger_Geist/stimmen.ly @@ -1,6 +1,7 @@ Praes = { \time 4/4 \key g \minor + \autoBeamOff } sopranMelodie = \relative g' { @@ -12,20 +13,23 @@ sopranMelodie = \relative g' { g4 a8 b c4 b8 a | b4 a g2 | } - \repeat unfold 2 { - g4 d' d d | - c c b8 a g4 | - a b c b8 a | - b4 - } - \alternative { - { - c d2 - } - { - a4 g2 + \context Voice = verse { + \autoBeamOff + \repeat unfold 2 { + g4 d' d d | + c c b8[ a] g4 | + a b c b8[ a] | + b4 } - } \bar "||" + \alternative { + { + c d2 + } + { + a4 g2 + } + } \bar "||" + } } altMelodie = \relative c' { @@ -39,22 +43,20 @@ altMelodie = \relative c' { g4 f d2 | } } - \context Voice = verse { - \repeat unfold 2 { - d4 g g g | - g f d d | - f f f f | - g - } - \alternative { - { - g fis2 - } - { - f4 d2 - } - } \bar "||" + \repeat unfold 2 { + d4 g g g | + g f d d | + f f f f | + g } + \alternative { + { + g fis2 + } + { + f4 d2 + } + } \bar "||" } tenorMelodie = \relative c' { |