diff options
| author | Erich Eckner <git@eckner.net> | 2018-06-14 23:22:03 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-06-14 23:22:03 +0200 |
| commit | d0c56f98a1ae289ebd94074ae62cc832855a5682 (patch) | |
| tree | 1e242d5d84e1db0adf765cc56aa7f741eea88d9b | |
| parent | 931ec2f6152d60366e393004ee5736869d957a8b (diff) | |
| download | Musik-d0c56f98a1ae289ebd94074ae62cc832855a5682.tar.xz | |
In_dieser_lieben_Sommerzeit: zwei Zeilen statt 3, weniger Text, Sprachen optional
| -rw-r--r-- | In_dieser_lieben_Sommerzeit/In_dieser_lieben_Sommerzeit.ly | 20 | ||||
| -rw-r--r-- | In_dieser_lieben_Sommerzeit/Makefile | 12 |
2 files changed, 14 insertions, 18 deletions
diff --git a/In_dieser_lieben_Sommerzeit/In_dieser_lieben_Sommerzeit.ly b/In_dieser_lieben_Sommerzeit/In_dieser_lieben_Sommerzeit.ly index 7b4ce91..41caa06 100644 --- a/In_dieser_lieben_Sommerzeit/In_dieser_lieben_Sommerzeit.ly +++ b/In_dieser_lieben_Sommerzeit/In_dieser_lieben_Sommerzeit.ly @@ -27,7 +27,8 @@ \new ChoirStaff << \set Score.skipBars = ##t \new Staff << - \new Voice = sopran { \global \oneVoice << \melodieSopran \artikulation >> } + \new Voice = sopran { \global \voiceOne << \melodieSopran \artikulation >> } + \new Voice = alt { \global \voiceTwo << \melodieAlt >> } >> \new Lyrics \lyricsto sopran { \textDI } \new Lyrics \lyricsto sopran { \textDII } @@ -36,26 +37,11 @@ \new Lyrics \lyricsto sopran { \textSII } \new Lyrics \lyricsto sopran { \textSIII } \new Staff << - \new Voice = alt { \global \oneVoice << \melodieAlt \artikulation >> } - >> - \new Lyrics \lyricsto alt { \textDI } - \new Lyrics \lyricsto alt { \textDII } - \new Lyrics \lyricsto alt { \textDIII } - \new Lyrics \lyricsto alt { \textSI } - \new Lyrics \lyricsto alt { \textSII } - \new Lyrics \lyricsto alt { \textSIII } - \new Staff << \new Voice = tenor { \clef "bass" \global \voiceOne << \melodieTenor \artikulation >> } \new Voice = bass { \clef "bass" \global \voiceTwo \melodieBass } >> - \new Lyrics \lyricsto tenor { \textDI } - \new Lyrics \lyricsto tenor { \textDII } - \new Lyrics \lyricsto tenor { \textDIII } - \new Lyrics \lyricsto tenor { \textSI } - \new Lyrics \lyricsto tenor { \textSII } - \new Lyrics \lyricsto tenor { \textSIII } >> \layout { -% indent = #0 + indent = #0 } } diff --git a/In_dieser_lieben_Sommerzeit/Makefile b/In_dieser_lieben_Sommerzeit/Makefile index ef6dedf..2e247ed 100644 --- a/In_dieser_lieben_Sommerzeit/Makefile +++ b/In_dieser_lieben_Sommerzeit/Makefile @@ -7,6 +7,16 @@ else # \#(set-global-staff-size 14) endif +ifeq ($(SPRACHE),se) + SPRACHEN_REGEX=/textD/d +else + ifeq ($(SPRACHE),alle) + SPRACHEN_REGEX= + else + SPRACHEN_REGEX=/textS/d + endif +endif + all: $(CURDOC).pdf clean: @@ -16,7 +26,7 @@ Clean: clean rm -f *.pdf *.midi %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + sed "s@%spezifisch%@$(SPEZIFISCH)@;$(SPRACHEN_REGEX)" "$<" > "$@" %.pdf: %.pre *.ly lilypond $< |