summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-03-06 08:41:13 +0100
committerErich Eckner <git@eckner.net>2020-03-06 08:41:13 +0100
commit2e78d118ac157e38fc02ab34e07b6c644996020a (patch)
treef1b33d42fa73a944f106838f0e54396666ba4ce1
parente1871931894482feab554e9c431a9c242a116da7 (diff)
downloadMusik-2e78d118ac157e38fc02ab34e07b6c644996020a.tar.xz
Wer_kann_segeln: Compilerschalter und Tippfehler
-rw-r--r--Wer_kann_segeln/Wer_kann_segeln.ly29
-rw-r--r--Wer_kann_segeln/texte.ly6
2 files changed, 21 insertions, 14 deletions
diff --git a/Wer_kann_segeln/Wer_kann_segeln.ly b/Wer_kann_segeln/Wer_kann_segeln.ly
index 06a0715..6eb3786 100644
--- a/Wer_kann_segeln/Wer_kann_segeln.ly
+++ b/Wer_kann_segeln/Wer_kann_segeln.ly
@@ -2,8 +2,6 @@
include(stimmen.pre)
include(texte.pre)
-%spezifisch%
-
\pointAndClickOff
\header {
tagline = ""
@@ -13,9 +11,18 @@ include(texte.pre)
print-all-headers = ##t
}
+undefine(`_D')
+undefine(`_S')
+undefine(`_DS')
+ifdef(`STR_1',`define(`_D')')
+ifdef(`STR_2',`define(`_D')')
+ifdef(`STR_1S',`define(`_S')')
+ifdef(`STR_2S',`define(`_S')')
+ifdef(`_D',`ifdef(`_S',`define(`_DS')')')
+
\score {
\header {
- title = "Wer kann segeln - Vem kan segla"
+ title = "ifdef(`_D',`Wer kann segeln') ifdef(`_DS',` - ') ifdef(`_S',`Vem kan segla')"
poet = "Text und Melodie: Norwegen"
composer = "Satz: Gunnar Erikson"
}
@@ -25,18 +32,18 @@ include(texte.pre)
\new Voice = sopran { \global \voiceOne \sopranMelodie }
\new Voice = alt { \global \voiceTwo \altMelodie }
>>
- \new Lyrics \lyricsto alt { \textFrauenDI }
- \new Lyrics \lyricsto alt { \textFrauenNI }
- \new Lyrics \lyricsto alt { \textFrauenDII }
- \new Lyrics \lyricsto alt { \textFrauenNII }
+ ifdef(`STR_1',`\new Lyrics \lyricsto alt { \textFrauenDI }')
+ ifdef(`STR_1S',`\new Lyrics \lyricsto alt { \textFrauenNI }')
+ ifdef(`STR_2',`\new Lyrics \lyricsto alt { \textFrauenDII }')
+ ifdef(`STR_2S',`\new Lyrics \lyricsto alt { \textFrauenNII }')
\new Lyrics = tenorText { }
\new Staff <<
\new Voice = maenner { \clef "bass" \global \oneVoice \maennerMelodie }
>>
- \new Lyrics \lyricsto maenner { \textMaennerDI }
- \new Lyrics \lyricsto maenner { \textMaennerNI }
- \new Lyrics \lyricsto maenner { \textMaennerDII }
- \new Lyrics \lyricsto maenner { \textMaennerNII }
+ ifdef(`STR_1',`\new Lyrics \lyricsto maenner { \textMaennerDI }')
+ ifdef(`STR_1S',`\new Lyrics \lyricsto maenner { \textMaennerNI }')
+ ifdef(`STR_2',`\new Lyrics \lyricsto maenner { \textMaennerDII }')
+ ifdef(`STR_2S',`\new Lyrics \lyricsto maenner { \textMaennerNII }')
>>
\layout {
indent = #0
diff --git a/Wer_kann_segeln/texte.ly b/Wer_kann_segeln/texte.ly
index b604d28..710eb7a 100644
--- a/Wer_kann_segeln/texte.ly
+++ b/Wer_kann_segeln/texte.ly
@@ -11,8 +11,8 @@
}
textFrauenNI = \lyricmode {
- \set stanza = "STR_1."
- Vem kan seg -- la för u -- tan vond? Vem kan ro u -- tan å -- ror?
+ \set stanza = "STR_1S."
+ Vem kan seg -- la för u -- tan vind? Vem kan ro u -- tan å -- ror?
Vem kan skil -- jas från vän -- nen sin u -- tan att fäl -- la tå -- rar?
}
@@ -25,7 +25,7 @@
}
textFrauenNII = \lyricmode {
- \set stanza = "STR_2."
+ \set stanza = "STR_2S."
Jag kan seg -- la för u -- tan vind.
Jak kan ro u -- tan å -- ror.
Men ej skil -- jas från vän -- nen min ut -- tant att fäl -- la tå -- rar.