From 5d4620b6ba89a5a13f79d82cc13f4253c2db394f Mon Sep 17 00:00:00 2001 From: Leopold Fajtak Date: Wed, 27 Nov 2024 17:14:32 +0100 Subject: [PATCH] adapted maher's veni immanuel to new format --- veni_immanuel/assignments.tt | 7 ------- veni_immanuel/de/assignments.tt | 7 +++++++ veni_immanuel/{ => de}/veni_immanuel_de_SATB.ly | 4 ++-- veni_immanuel/{ => de}/veni_immanuel_de_lz.ly | 4 ++-- veni_immanuel/{ => de}/veni_immanuel_hope_lz.ly | 4 ++-- veni_immanuel/maher/assignments.tt | 11 +++++++++++ .../{ => maher}/o_come_o_come_emmanuel_leadsheet.ly | 4 ++-- .../{ => maher}/o_come_o_come_emmanuel_lz.ly | 4 ++-- veni_immanuel/o_come_o_come_emmanuel.tt | 7 ------- 9 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 veni_immanuel/assignments.tt create mode 100644 veni_immanuel/de/assignments.tt rename veni_immanuel/{ => de}/veni_immanuel_de_SATB.ly (57%) rename veni_immanuel/{ => de}/veni_immanuel_de_lz.ly (64%) rename veni_immanuel/{ => de}/veni_immanuel_hope_lz.ly (94%) create mode 100644 veni_immanuel/maher/assignments.tt rename veni_immanuel/{ => maher}/o_come_o_come_emmanuel_leadsheet.ly (71%) rename veni_immanuel/{ => maher}/o_come_o_come_emmanuel_lz.ly (64%) delete mode 100644 veni_immanuel/o_come_o_come_emmanuel.tt diff --git a/veni_immanuel/assignments.tt b/veni_immanuel/assignments.tt deleted file mode 100644 index c7eb119..0000000 --- a/veni_immanuel/assignments.tt +++ /dev/null @@ -1,7 +0,0 @@ -[% - song_title = 'Veni Immanuel'; - scores = { - SATB = 'veni_immanuel_de_SATB.ly' - congregation = 'veni_immanuel_de_lz.ly' - }; --%] diff --git a/veni_immanuel/de/assignments.tt b/veni_immanuel/de/assignments.tt new file mode 100644 index 0000000..6a4b72a --- /dev/null +++ b/veni_immanuel/de/assignments.tt @@ -0,0 +1,7 @@ +[% + song_title = 'Veni Immanuel'; + scores = { + SATB = 'de/veni_immanuel_de_SATB.ly' + congregation = 'de/veni_immanuel_de_lz.ly' + }; +-%] diff --git a/veni_immanuel/veni_immanuel_de_SATB.ly b/veni_immanuel/de/veni_immanuel_de_SATB.ly similarity index 57% rename from veni_immanuel/veni_immanuel_de_SATB.ly rename to veni_immanuel/de/veni_immanuel_de_SATB.ly index 3a78dd0..d2809f9 100644 --- a/veni_immanuel/veni_immanuel_de_SATB.ly +++ b/veni_immanuel/de/veni_immanuel_de_SATB.ly @@ -1,8 +1,8 @@ \version "2.24.3" \language deutsch -\include "../../../lilypond_musician_score_paper.ly" -\include "veni_immanuel_vars.ly" +\include "../../../../lilypond_musician_score_paper.ly" +\include "../veni_immanuel_vars.ly" Song.Meta = { \key d \minor diff --git a/veni_immanuel/veni_immanuel_de_lz.ly b/veni_immanuel/de/veni_immanuel_de_lz.ly similarity index 64% rename from veni_immanuel/veni_immanuel_de_lz.ly rename to veni_immanuel/de/veni_immanuel_de_lz.ly index e053cad..3cf6cbe 100644 --- a/veni_immanuel/veni_immanuel_de_lz.ly +++ b/veni_immanuel/de/veni_immanuel_de_lz.ly @@ -1,8 +1,8 @@ \version "2.24.2" \language deutsch -\include "../../../lilypond_songsheet_paper.ly" -\include "veni_immanuel_vars.ly" +\include "../../../../lilypond_songsheet_paper.ly" +\include "../veni_immanuel_vars.ly" \score{ \Song.DE.MelodyScore diff --git a/veni_immanuel/veni_immanuel_hope_lz.ly b/veni_immanuel/de/veni_immanuel_hope_lz.ly similarity index 94% rename from veni_immanuel/veni_immanuel_hope_lz.ly rename to veni_immanuel/de/veni_immanuel_hope_lz.ly index 379262b..44d5f0c 100644 --- a/veni_immanuel/veni_immanuel_hope_lz.ly +++ b/veni_immanuel/de/veni_immanuel_hope_lz.ly @@ -1,8 +1,8 @@ \version "2.22.4" \language deutsch -\include "../../../lilypond_songsheet_paper.ly" -\include "veni_immanuel_vars.ly" +\include "../../../../lilypond_songsheet_paper.ly" +\include "../veni_immanuel_vars.ly" \score{ << diff --git a/veni_immanuel/maher/assignments.tt b/veni_immanuel/maher/assignments.tt new file mode 100644 index 0000000..dafc042 --- /dev/null +++ b/veni_immanuel/maher/assignments.tt @@ -0,0 +1,11 @@ +[% + title = 'O come, o come Emmanuel' + scores = { + leadsheet = 'maher/o_come_o_come_emmanuel_leadsheet.ly' + congregation = 'maher/o_come_o_come_emmanuel_lz.ly' + }; + credits = { + TM = 'traditionell' + arrangement = 'Matt Maher' + }; +-%] diff --git a/veni_immanuel/o_come_o_come_emmanuel_leadsheet.ly b/veni_immanuel/maher/o_come_o_come_emmanuel_leadsheet.ly similarity index 71% rename from veni_immanuel/o_come_o_come_emmanuel_leadsheet.ly rename to veni_immanuel/maher/o_come_o_come_emmanuel_leadsheet.ly index 69445e5..dd75bab 100644 --- a/veni_immanuel/o_come_o_come_emmanuel_leadsheet.ly +++ b/veni_immanuel/maher/o_come_o_come_emmanuel_leadsheet.ly @@ -3,8 +3,8 @@ %\header{title = "O Come, o come, Emmanuel" %composer = "Matt Maher"} -\include "../../../lilypond_musician_score_paper.ly" -\include "veni_immanuel_vars.ly" +\include "../../../../lilypond_musician_score_paper.ly" +\include "../veni_immanuel_vars.ly" \score{ \Song.EN.Maher.LeadsheetScore diff --git a/veni_immanuel/o_come_o_come_emmanuel_lz.ly b/veni_immanuel/maher/o_come_o_come_emmanuel_lz.ly similarity index 64% rename from veni_immanuel/o_come_o_come_emmanuel_lz.ly rename to veni_immanuel/maher/o_come_o_come_emmanuel_lz.ly index a0dbda5..8ea371f 100644 --- a/veni_immanuel/o_come_o_come_emmanuel_lz.ly +++ b/veni_immanuel/maher/o_come_o_come_emmanuel_lz.ly @@ -1,8 +1,8 @@ \version "2.24.2" \language deutsch -\include "../../../lilypond_songsheet_paper.ly" -\include "veni_immanuel_vars.ly" +\include "../../../../lilypond_songsheet_paper.ly" +\include "../veni_immanuel_vars.ly" \score{ \Song.EN.Maher.MelodyScore diff --git a/veni_immanuel/o_come_o_come_emmanuel.tt b/veni_immanuel/o_come_o_come_emmanuel.tt deleted file mode 100644 index e1ac1b7..0000000 --- a/veni_immanuel/o_come_o_come_emmanuel.tt +++ /dev/null @@ -1,7 +0,0 @@ -\song{[% purpose %]}{O come, o come Emmanuel}{% - [% IF parts != '0' -%] - \lilypondfile{library/freie_lieder/veni_immanuel/o_come_o_come_emmanuel_leadsheet.ly}% - [% ELSE -%] - \lilypondfile{library/freie_lieder/veni_immanuel/o_come_o_come_emmanuel_lz.ly}% - [% END -%] -}