From 425b91537af163514c7b484916de1b7b668704a7 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 14 Feb 2023 20:14:58 +0100 Subject: Schalter auf m4/Makefile umgebaut --- Auf_meinen_lieben_Gott/Auf_meinen_lieben_Gott.ly | 34 +++++++------ Brunnquell_aller_Gueter/stimmen.ly | 33 +++++-------- .../Der_Morgenstern_ist_aufgedrungen.ly | 24 ++++----- Der_Morgenstern_ist_aufgedrungen/texte.ly | 6 +-- Es_ist_ein_Ros_entsprungen/stimmen.ly | 11 +++-- Es_ist_ein_Ros_entsprungen/texte.ly | 6 +-- .../Halte_deine_Traeume_fest.ly | 12 ++--- Lobe_den_Herren_/Lobe_den_Herren_.ly | 16 +++--- O_du_froehliche/O_du_froehliche.ly | 57 ++++++++++++---------- 9 files changed, 99 insertions(+), 100 deletions(-) diff --git a/Auf_meinen_lieben_Gott/Auf_meinen_lieben_Gott.ly b/Auf_meinen_lieben_Gott/Auf_meinen_lieben_Gott.ly index 3b3f662..0e616e4 100644 --- a/Auf_meinen_lieben_Gott/Auf_meinen_lieben_Gott.ly +++ b/Auf_meinen_lieben_Gott/Auf_meinen_lieben_Gott.ly @@ -23,13 +23,15 @@ include(texte.pre) } \new ChoirStaff << \set Score.skipBars = ##t - %Oberstimme% \new Staff \with { - %Oberstimme% fontSize = #-3 - %Oberstimme% \override StaffSymbol.staff-space = #(magstep -3) - %Oberstimme% \override StaffSymbol.thickness = #(magstep -3) - %Oberstimme% } << - %Oberstimme% \new Voice = oberstimme { \global \oneVoice \oberstimmeMelodie } - %Oberstimme% >> + ifdef(`Oberstimme',` + \new Staff \with { + fontSize = #-3 + \override StaffSymbol.staff-space = #(magstep -3) + \override StaffSymbol.thickness = #(magstep -3) + } << + \new Voice = oberstimme { \global \oneVoice \oberstimmeMelodie } + >> + ') \new Staff << \new Voice = frauen { \global \oneVoice \pausen } \new Voice = sopran { \global \voiceOne \sopranMelodie } @@ -46,14 +48,16 @@ include(texte.pre) \new Voice = tenor { \global \voiceOne \tenorMelodie } \new Voice = bass { \global \voiceTwo \bassMelodie } >> - %Unterstimme% \new Staff \with { - %Unterstimme% fontSize = #-3 - %Unterstimme% \override StaffSymbol.staff-space = #(magstep -3) - %Unterstimme% \override StaffSymbol.thickness = #(magstep -3) - %Unterstimme% } << - %Unterstimme% \clef "bass" - %Unterstimme% \new Voice = unterstimme { \global \oneVoice \unterstimmeMelodie } - %Unterstimme% >> + ifdef(`Unterstimme',` + \new Staff \with { + fontSize = #-3 + \override StaffSymbol.staff-space = #(magstep -3) + \override StaffSymbol.thickness = #(magstep -3) + } << + \clef "bass" + \new Voice = unterstimme { \global \oneVoice \unterstimmeMelodie } + >> + ') >> \layout { indent = #0 diff --git a/Brunnquell_aller_Gueter/stimmen.ly b/Brunnquell_aller_Gueter/stimmen.ly index a3aff0b..456d22e 100644 --- a/Brunnquell_aller_Gueter/stimmen.ly +++ b/Brunnquell_aller_Gueter/stimmen.ly @@ -24,12 +24,10 @@ altMelodie = \relative c' { \repeat volta 2 { c4 g' g8[ f] f4 | f( e) - %Variante_1% c2 | - %Variante_2% f2 | + ifdef(`Variante_1',`c2',`f2') | f4 g as as | as( g) - %Variante_1% es2 | des4 - %Variante_2% as2 | des,4 + ifdef(`Variante_1',`es2 | des4',`as2 | des,4') b8[ des] c4 c | c1 | } @@ -44,28 +42,23 @@ tenorMelodie = \relative c' { \repeat volta 2 { as4 c c b | des( - %Variante_1% c8[ b]) - %Variante_2% c) + ifdef(`Variante_1',`c8[ b])',`c)') as2 | c4 es es des8[ es] | f4( - %Variante_1% es8[ des]) - %Variante_2% es) + ifdef(`Variante_1',`es8[ des])',`es)') c2 | b4 b as g | as1 | } as4 as es' - %Variante_1% f | - %Variante_2% es | + ifdef(`Variante_1',`f',`es') | des es - %Variante_1% es4.( des8) | - %Variante_2% es2 | + ifdef(`Variante_1',`es4.( des8)',`es2') | c2 es4 es | es des8[ es] f[ c] c4 | des( - %Variante_1% c8[ b]) - %Variante_2% c) + ifdef(`Variante_1',`c8[ b])',`c)') as2 | \bar "|." } @@ -73,21 +66,17 @@ bassMelodie = \relative c { \repeat volta 2 { f4 e f des | b( c) - %Variante_1% f2 | f4 - %Variante_2% f,2 | f'4 + ifdef(`Variante_1',`f2 | f4',`f,2 | f''`4') es as8[ g] f[ es] | des4( es) as,2 | b8[ c] des[ b] c4 c4 | - %Variante_1% f1 | - %Variante_2% f,1 | + ifdef(`Variante_1',`f1',`f,1') | } - %Variante_1% f4 - %Variante_2% f'4 + ifdef(`Variante_1',`f4',`f''`4') es8[ des] c4 f | b, c8[ des] es2 | as g4 es | as des,8[ c] d[ e] f4 | b,( c) - %Variante_1% f2 | \bar "|." - %Variante_2% f,2 | \bar "|." + ifdef(`Variante_1',`f2',`f,2') | \bar "|." } diff --git a/Der_Morgenstern_ist_aufgedrungen/Der_Morgenstern_ist_aufgedrungen.ly b/Der_Morgenstern_ist_aufgedrungen/Der_Morgenstern_ist_aufgedrungen.ly index bdd919d..5eff868 100644 --- a/Der_Morgenstern_ist_aufgedrungen/Der_Morgenstern_ist_aufgedrungen.ly +++ b/Der_Morgenstern_ist_aufgedrungen/Der_Morgenstern_ist_aufgedrungen.ly @@ -54,18 +54,18 @@ include(texte.pre) \new Lyrics = textBassII { } \new Lyrics = textBassIV { } - %SOPRAN% \context Lyrics = textSopranI \lyricsto sopran { \textI } - %SOPRAN% \context Lyrics = textSopranII \lyricsto sopran { \textII } - %SOPRAN% \context Lyrics = textSopranIV \lyricsto sopran { \textIV } -%% %ALT% \context Lyrics = textAltI \lyricsto alt { \textI } - %ALT% \context Lyrics = textAltII \lyricsto alt { \textII } - %ALT% \context Lyrics = textAltIV \lyricsto alt { \textIV } -%% %TENOR% \context Lyrics = textTenorI \lyricsto tenor { \textI } - %TENOR% \context Lyrics = textTenorII \lyricsto tenor { \textII } - %TENOR% \context Lyrics = textTenorIV \lyricsto tenor { \textIV } -%% %BASS% \context Lyrics = textBassI \lyricsto bass { \textI } - %BASS% \context Lyrics = textBassII \lyricsto bass { \textII } - %BASS% \context Lyrics = textBassIV \lyricsto bass { \textIV } + ifdef(`STR_1',`\context Lyrics = textSopranI \lyricsto sopran { \textI }') + ifdef(`STR_2',`\context Lyrics = textSopranII \lyricsto sopran { \textII }') + ifdef(`STR_4',`\context Lyrics = textSopranIV \lyricsto sopran { \textIV }') + ifdef(`STR_1',`\context Lyrics = textAltI \lyricsto alt { \textI }') + ifdef(`STR_2',`\context Lyrics = textAltII \lyricsto alt { \textII }') + ifdef(`STR_4',`\context Lyrics = textAltIV \lyricsto alt { \textIV }') + ifdef(`STR_1',`\context Lyrics = textTenorI \lyricsto tenor { \textI }') + ifdef(`STR_2',`\context Lyrics = textTenorII \lyricsto tenor { \textII }') + ifdef(`STR_4',`\context Lyrics = textTenorIV \lyricsto tenor { \textIV }') + ifdef(`STR_1',`\context Lyrics = textBassI \lyricsto bass { \textI }') + ifdef(`STR_2',`\context Lyrics = textBassII \lyricsto bass { \textII }') + ifdef(`STR_4',`\context Lyrics = textBassIV \lyricsto bass { \textIV }') >> \layout { indent = #0 diff --git a/Der_Morgenstern_ist_aufgedrungen/texte.ly b/Der_Morgenstern_ist_aufgedrungen/texte.ly index 0c7ed12..34f89cb 100644 --- a/Der_Morgenstern_ist_aufgedrungen/texte.ly +++ b/Der_Morgenstern_ist_aufgedrungen/texte.ly @@ -5,7 +5,7 @@ % Die Textaufteilungen textI = \lyricmode { - \set stanza = "1. Frauen" + \set stanza = "STR_1" Der Mor -- gen -- stern ist auf -- ge -- drun -- gen, er leucht da -- her zu die -- ser Stun -- de hoch ü -- ber Berg und tie -- fe Tal, @@ -13,7 +13,7 @@ } textII = \lyricmode { - \set stanza = "STR_2." + \set stanza = "STR_2" „Wacht auf“, ruft uns der Wäch -- ter Stim -- me vor Freu -- den auf der ho -- hen Zin -- ne: „Wacht auf zu die -- ser Freu -- den -- zeit! @@ -21,7 +21,7 @@ } textIV = \lyricmode { - \set stanza = "STR_4." + \set stanza = "STR_4" O heil -- ger Mor -- gen -- stern, wir prei -- sen dich heu -- te hoch mit fro -- hen Wei -- sen; du leuch -- test vie -- len nah und fern, diff --git a/Es_ist_ein_Ros_entsprungen/stimmen.ly b/Es_ist_ein_Ros_entsprungen/stimmen.ly index ff462b5..914c0aa 100644 --- a/Es_ist_ein_Ros_entsprungen/stimmen.ly +++ b/Es_ist_ein_Ros_entsprungen/stimmen.ly @@ -51,10 +51,13 @@ altMelodie = \relative a' { a4 f f f | e2 d | d - %Variante_1% c4 c | - %Variante_1% d4.( a8 c4) c | - %Variante_2% c | - %Variante_2% d4. a8 c2 | + ifdef(`Variante_1',` + c4 c | + d4.( a8 c4) c | + ',` + c | + d4. a8 c2 | + ') c2 } s4 f | diff --git a/Es_ist_ein_Ros_entsprungen/texte.ly b/Es_ist_ein_Ros_entsprungen/texte.ly index a1c2340..9e7fd62 100644 --- a/Es_ist_ein_Ros_entsprungen/texte.ly +++ b/Es_ist_ein_Ros_entsprungen/texte.ly @@ -18,13 +18,11 @@ textIa = \lyricmode { textII = \lyricmode { \set stanza = \markup { \dynamic p "2." } Das - %Variante_1% Blüm - %Variante_2% Rös + ifdef(`Variante_1',`Blüm',`Rös') -- lein, das ich mei -- ne, da -- von Je -- sa -- ja sagt, aus Got -- tes ew -- gem Rat hat sie ein Kind ge -- bo -- ren, - %Variante_1% wel -- ches uns se -- lig macht. - %Variante_2% wohl zu der hal -- ben Nacht. + ifdef(`wel -- ches uns se -- lig macht.',`wohl zu der hal -- ben Nacht.') } textIIa = \lyricmode { diff --git a/Halte_deine_Traeume_fest/Halte_deine_Traeume_fest.ly b/Halte_deine_Traeume_fest/Halte_deine_Traeume_fest.ly index b365b42..70d5106 100644 --- a/Halte_deine_Traeume_fest/Halte_deine_Traeume_fest.ly +++ b/Halte_deine_Traeume_fest/Halte_deine_Traeume_fest.ly @@ -29,12 +29,12 @@ include(texte.pre) \new Staff << \new Voice = melodie \transpose c transponiert { \global \oneVoice \melodie } >> - %STR_1D% \new Lyrics \lyricsto melodie { \textDI } - %STR_1E% \new Lyrics \lyricsto melodie { \textEI } - %STR_2D% \new Lyrics \lyricsto melodie { \textDII } - %STR_2E% \new Lyrics \lyricsto melodie { \textEII } - %STR_3D% \new Lyrics \lyricsto melodie { \textDIII } - %STR_3E% \new Lyrics \lyricsto melodie { \textEIII } + ifdef(`STR_1D',`\new Lyrics \lyricsto melodie { \textDI }') + ifdef(`STR_1E',`\new Lyrics \lyricsto melodie { \textEI }') + ifdef(`STR_2D',`\new Lyrics \lyricsto melodie { \textDII }') + ifdef(`STR_2E',`\new Lyrics \lyricsto melodie { \textEII }') + ifdef(`STR_3D',`\new Lyrics \lyricsto melodie { \textDIII }') + ifdef(`STR_3E',`\new Lyrics \lyricsto melodie { \textEIII }') >> \layout { indent = #0 diff --git a/Lobe_den_Herren_/Lobe_den_Herren_.ly b/Lobe_den_Herren_/Lobe_den_Herren_.ly index 1d1aef0..5a8435a 100644 --- a/Lobe_den_Herren_/Lobe_den_Herren_.ly +++ b/Lobe_den_Herren_/Lobe_den_Herren_.ly @@ -24,13 +24,15 @@ include(texte.pre) } \new ChoirStaff << \set Score.skipBars = ##t - %Oberstimme% \new Staff \with { - %Oberstimme% fontSize = #-3 - %Oberstimme% \override StaffSymbol.staff-space = #(magstep -3) - %Oberstimme% \override StaffSymbol.thickness = #(magstep -3) - %Oberstimme% } << - %Oberstimme% \new Voice = oberstimme \transpose c transponiert { \global \oneVoice \trombaIMelodie } - %Oberstimme% >> + ifdef(`Oberstimme',` + \new Staff \with { + fontSize = #-3 + \override StaffSymbol.staff-space = #(magstep -3) + \override StaffSymbol.thickness = #(magstep -3) + } << + \new Voice = oberstimme \transpose c transponiert { \global \oneVoice \trombaIMelodie } + >> + ') \new Staff << \new Voice = sopran \transpose c transponiert { \global \voiceOne \sopranMelodie } \new Voice = alt \transpose c transponiert { \global \voiceTwo \altMelodie } diff --git a/O_du_froehliche/O_du_froehliche.ly b/O_du_froehliche/O_du_froehliche.ly index 1be16a5..126268a 100644 --- a/O_du_froehliche/O_du_froehliche.ly +++ b/O_du_froehliche/O_du_froehliche.ly @@ -28,39 +28,42 @@ include(texte.pre) \new Staff << \set Score.skipBars = ##t - %Oberstimme% \new ChoirStaff << - %Oberstimme% \new Voice = oberstimme { \global \autoBeamOn \melodieOberstimme } - %Oberstimme% >> - %Oberstimme% \new ChoirStaff << - %Oberstimme% \new Staff << - %Oberstimme% \new Voice = fpausen { \global \oneVoice \pausenChor } - %Oberstimme% \new Voice = sopran { \global \voiceOne \melodieSopran } - %Oberstimme% \new Voice = alt { \global \voiceTwo \melodieAlt } - %Oberstimme% >> - %Oberstimme% \new Lyrics = textOberstimme { } - %Oberstimme% \new Staff << - %Oberstimme% \clef "bass" - %Oberstimme% \new Voice = mpausen { \global \oneVoice \pausenChor } - %Oberstimme% \new Voice = tenor { \global \voiceOne \melodieTenor } - %Oberstimme% \new Voice = bass { \global \voiceTwo \melodieBass } - %Oberstimme% >> - %Oberstimme% >> + ifdef(`Oberstimme',` + \new ChoirStaff << + \new Voice = oberstimme { \global \autoBeamOn \melodieOberstimme } + >> + \new ChoirStaff << + \new Staff << + \new Voice = fpausen { \global \oneVoice \pausenChor } + \new Voice = sopran { \global \voiceOne \melodieSopran } + \new Voice = alt { \global \voiceTwo \melodieAlt } + >> + \new Lyrics = textOberstimme { } + \new Staff << + \clef "bass" + \new Voice = mpausen { \global \oneVoice \pausenChor } + \new Voice = tenor { \global \voiceOne \melodieTenor } + \new Voice = bass { \global \voiceTwo \melodieBass } + >> + >> \new ChoirStaff << \new Voice = melodie { \global \melodie } \new Lyrics = textI { } \new Lyrics = textII { } \new Lyrics = textIII { } >> - %Klavier% \new PianoStaff << - %Klavier% \new Staff << - %Klavier% \new Voice = klavierRechts { \global \melodieKlavierRechts } - %Klavier% >> - %Klavier% \new Staff << - %Klavier% \clef "bass" - %Klavier% \new Voice = klavierRechts { \global \melodieKlavierLinks } - %Klavier% >> - %Klavier% >> - %Oberstimme% \context Lyrics = textOberstimme \lyricsto sopran { \textOberstimme } + ifdef(`Klavier',` + \new PianoStaff << + \new Staff << + \new Voice = klavierRechts { \global \melodieKlavierRechts } + >> + \new Staff << + \clef "bass" + \new Voice = klavierRechts { \global \melodieKlavierLinks } + >> + >> + \context Lyrics = textOberstimme \lyricsto sopran { \textOberstimme } + ') \context Lyrics = textI \lyricsto melodie { \textI } \context Lyrics = textII \lyricsto melodie { \textII } \context Lyrics = textIII \lyricsto melodie { \textIII } -- cgit v1.2.3-54-g00ecf