Add iv-c psalm tone, fix up and extend tonus.mk. Add Nativity of

Virgin Mary Matins psalms to the Makefile.
jakubjelinek · Nov 23, 2015 · a0c39c4 · a0c39c4
1 parent 16ae4ff
commit a0c39c4
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 23 deletions.
diff --git a/Conventus/AdventusDominicaII/tonus.mk b/Conventus/AdventusDominicaII/tonus.mk
@@ -12,8 +12,8 @@ TONUS-i-g4 = 2 0 1 2
 TONUS-i-g5 = 2 0 1 1
 TONUS-isoll-D_ = 1 3 1 2
 TONUS-isoll-D2 = 1 3 1 2
-TONUS-isoll-f = 1 3 1 2
 TONUS-isoll-g = 1 3 1 2
+TONUS-isoll-f = 1 3 1 2
 TONUS-ii-D = 1 0 1 1
 TONUS-ii-A = 1 0 1 1
 TONUS-iisoll-D = 1 3 1 1
@@ -26,15 +26,18 @@ TONUS-iii-a3 = 2 0 2 0
 TONUS-iii-b = 2 0 2 0
 TONUS-iii-g = 2 0 2 0
 TONUS-iii-g2 = 2 0 2 0
+TONUS-iiisoll-a = 2 0 2 0
 TONUS-iv-E = 1 2 1 3
 TONUS-iv-E2 = 1 2 1 3
 TONUS-iv-e = 1 2 1 3
 TONUS-iv-d = 1 2 1 3
 TONUS-iv-d2 = 1 2 1 3
+TONUS-iv-A = 1 2 1 3
 TONUS-iv-a = 1 2 1 3
 TONUS-iv-g = 1 2 1 0
-TONUS-iv-E_ = 1 2 1 0
-TONUS-iv-E2_ = 1 2 1 0
+TONUS-iv-c = 1 2 1 0
+TONUS-iv-E_ = 1 2 1 3
+TONUS-iv-E2_ = 1 2 1 3
 TONUS-v-a = 1 0 2 0
 TONUS-v-g = 1 0 2 0
 TONUS-vi-F = 1 1 1 2
@@ -46,6 +49,7 @@ TONUS-vii-d = 2 0 2 0
 TONUS-viisoll-a = 2 0 2 0
 TONUS-viii-G = 1 0 1 2
 TONUS-viii-G2 = 1 0 1 2
+TONUS-viii-g = 1 0 1 2
 TONUS-viii-a = 1 0 1 2
 TONUS-viii-c = 1 0 1 2
 TONUS-viii-C = 1 0 1 2

diff --git a/Conventus/Epiphania/tonus.mk b/Conventus/Epiphania/tonus.mk
@@ -13,6 +13,7 @@ TONUS-i-g5 = 2 0 1 1
 TONUS-isoll-D_ = 1 3 1 2
 TONUS-isoll-D2 = 1 3 1 2
 TONUS-isoll-g = 1 3 1 2
+TONUS-isoll-f = 1 3 1 2
 TONUS-ii-D = 1 0 1 1
 TONUS-ii-A = 1 0 1 1
 TONUS-iisoll-D = 1 3 1 1
@@ -25,15 +26,18 @@ TONUS-iii-a3 = 2 0 2 0
 TONUS-iii-b = 2 0 2 0
 TONUS-iii-g = 2 0 2 0
 TONUS-iii-g2 = 2 0 2 0
+TONUS-iiisoll-a = 2 0 2 0
 TONUS-iv-E = 1 2 1 3
 TONUS-iv-E2 = 1 2 1 3
 TONUS-iv-e = 1 2 1 3
 TONUS-iv-d = 1 2 1 3
 TONUS-iv-d2 = 1 2 1 3
+TONUS-iv-A = 1 2 1 3
 TONUS-iv-a = 1 2 1 3
 TONUS-iv-g = 1 2 1 0
-TONUS-iv-E_ = 1 2 1 0
-TONUS-iv-E2_ = 1 2 1 0
+TONUS-iv-c = 1 2 1 0
+TONUS-iv-E_ = 1 2 1 3
+TONUS-iv-E2_ = 1 2 1 3
 TONUS-v-a = 1 0 2 0
 TONUS-v-g = 1 0 2 0
 TONUS-vi-F = 1 1 1 2
@@ -45,9 +49,11 @@ TONUS-vii-d = 2 0 2 0
 TONUS-viisoll-a = 2 0 2 0
 TONUS-viii-G = 1 0 1 2
 TONUS-viii-G2 = 1 0 1 2
+TONUS-viii-g = 1 0 1 2
 TONUS-viii-a = 1 0 1 2
 TONUS-viii-c = 1 0 1 2
+TONUS-viii-C = 1 0 1 2
 TONUS-viiisoll-G = 1 3 1 2
 TONUS-viiisoll-G2 = 1 3 1 2
 TONUS-per = 1 3 1 1
-TONUS-dir = 1 2 1 0
+TONUS-dir = 1 2 0 0
diff --git a/Conventus/FeriaIVPerAnnum/tonus.mk b/Conventus/FeriaIVPerAnnum/tonus.mk
@@ -13,6 +13,7 @@ TONUS-i-g5 = 2 0 1 1
 TONUS-isoll-D_ = 1 3 1 2
 TONUS-isoll-D2 = 1 3 1 2
 TONUS-isoll-g = 1 3 1 2
+TONUS-isoll-f = 1 3 1 2
 TONUS-ii-D = 1 0 1 1
 TONUS-ii-A = 1 0 1 1
 TONUS-iisoll-D = 1 3 1 1
@@ -25,15 +26,18 @@ TONUS-iii-a3 = 2 0 2 0
 TONUS-iii-b = 2 0 2 0
 TONUS-iii-g = 2 0 2 0
 TONUS-iii-g2 = 2 0 2 0
+TONUS-iiisoll-a = 2 0 2 0
 TONUS-iv-E = 1 2 1 3
 TONUS-iv-E2 = 1 2 1 3
 TONUS-iv-e = 1 2 1 3
 TONUS-iv-d = 1 2 1 3
 TONUS-iv-d2 = 1 2 1 3
+TONUS-iv-A = 1 2 1 3
 TONUS-iv-a = 1 2 1 3
 TONUS-iv-g = 1 2 1 0
-TONUS-iv-E_ = 1 2 1 0
-TONUS-iv-E2_ = 1 2 1 0
+TONUS-iv-c = 1 2 1 0
+TONUS-iv-E_ = 1 2 1 3
+TONUS-iv-E2_ = 1 2 1 3
 TONUS-v-a = 1 0 2 0
 TONUS-v-g = 1 0 2 0
 TONUS-vi-F = 1 1 1 2
@@ -45,6 +49,7 @@ TONUS-vii-d = 2 0 2 0
 TONUS-viisoll-a = 2 0 2 0
 TONUS-viii-G = 1 0 1 2
 TONUS-viii-G2 = 1 0 1 2
+TONUS-viii-g = 1 0 1 2
 TONUS-viii-a = 1 0 1 2
 TONUS-viii-c = 1 0 1 2
 TONUS-viii-C = 1 0 1 2

diff --git a/Conventus/InNativitateBMV/Makefile b/Conventus/InNativitateBMV/Makefile
@@ -21,13 +21,22 @@ PSALM_PREPROCESSOR = $(TOOLS_DIR)/psalmpreprocessor.rb
 INITIUM_TOOL = $(TOOLS_DIR)/initiumpsalmi.rb
 PSSKIP = 1
 GENPSCOMB = $(AWK) -f pscomb.awk -v PSSKIP=$(PSSKIP) -v TRFILE=$(word 2,$^) $< > $@
-PSALMS = 4 62 66 90 92 99 109 112 118v_vi 118vii_viii 118ix_x 118xi_xii 118xiii_xiv 118xv_xvi 118xvii_xviii 118xix_xx 118xxi_xxii 121 126 133 148 149 150
+PSALMS = 4 8 18 23 44 45 62 66 86 90 92 95 96 97 99 109 112 118v_vi 118vii_viii 118ix_x 118xi_xii 118xiii_xiv 118xv_xvi 118xvii_xviii 118xix_xx 118xxi_xxii 121 126 133 148 149 150
 include tonus.mk
 MODUS-4 = viii-G
+MODUS-8 = iv-A
+MODUS-18 = iv-A
+MODUS-23 = iv-A
+MODUS-44 = vii-c
+MODUS-45 = vii-c
 MODUS-62 = vi-F
 MODUS-66 = dir
+MODUS-86 = vii-c
 MODUS-90 = viii-G
 MODUS-92 = viii-G
+MODUS-95 = iv-c
+MODUS-96 = iv-c
+MODUS-97 = iv-c
 MODUS-99 = vii-c
 MODUS-109 = viii-G
 MODUS-112 = vii-c

diff --git a/Conventus/InNativitateBMV/tonus.mk b/Conventus/InNativitateBMV/tonus.mk
@@ -13,6 +13,7 @@ TONUS-i-g5 = 2 0 1 1
 TONUS-isoll-D_ = 1 3 1 2
 TONUS-isoll-D2 = 1 3 1 2
 TONUS-isoll-g = 1 3 1 2
+TONUS-isoll-f = 1 3 1 2
 TONUS-ii-D = 1 0 1 1
 TONUS-ii-A = 1 0 1 1
 TONUS-iisoll-D = 1 3 1 1
@@ -25,15 +26,18 @@ TONUS-iii-a3 = 2 0 2 0
 TONUS-iii-b = 2 0 2 0
 TONUS-iii-g = 2 0 2 0
 TONUS-iii-g2 = 2 0 2 0
+TONUS-iiisoll-a = 2 0 2 0
 TONUS-iv-E = 1 2 1 3
 TONUS-iv-E2 = 1 2 1 3
 TONUS-iv-e = 1 2 1 3
 TONUS-iv-d = 1 2 1 3
 TONUS-iv-d2 = 1 2 1 3
+TONUS-iv-A = 1 2 1 3
 TONUS-iv-a = 1 2 1 3
 TONUS-iv-g = 1 2 1 0
-TONUS-iv-E_ = 1 2 1 0
-TONUS-iv-E2_ = 1 2 1 0
+TONUS-iv-c = 1 2 1 0
+TONUS-iv-E_ = 1 2 1 3
+TONUS-iv-E2_ = 1 2 1 3
 TONUS-v-a = 1 0 2 0
 TONUS-v-g = 1 0 2 0
 TONUS-vi-F = 1 1 1 2
@@ -45,6 +49,7 @@ TONUS-vii-d = 2 0 2 0
 TONUS-viisoll-a = 2 0 2 0
 TONUS-viii-G = 1 0 1 2
 TONUS-viii-G2 = 1 0 1 2
+TONUS-viii-g = 1 0 1 2
 TONUS-viii-a = 1 0 1 2
 TONUS-viii-c = 1 0 1 2
 TONUS-viii-C = 1 0 1 2

diff --git a/Conventus/Pentecostes/tonus.mk b/Conventus/Pentecostes/tonus.mk
@@ -13,6 +13,7 @@ TONUS-i-g5 = 2 0 1 1
 TONUS-isoll-D_ = 1 3 1 2
 TONUS-isoll-D2 = 1 3 1 2
 TONUS-isoll-g = 1 3 1 2
+TONUS-isoll-f = 1 3 1 2
 TONUS-ii-D = 1 0 1 1
 TONUS-ii-A = 1 0 1 1
 TONUS-iisoll-D = 1 3 1 1
@@ -25,15 +26,18 @@ TONUS-iii-a3 = 2 0 2 0
 TONUS-iii-b = 2 0 2 0
 TONUS-iii-g = 2 0 2 0
 TONUS-iii-g2 = 2 0 2 0
+TONUS-iiisoll-a = 2 0 2 0
 TONUS-iv-E = 1 2 1 3
 TONUS-iv-E2 = 1 2 1 3
 TONUS-iv-e = 1 2 1 3
 TONUS-iv-d = 1 2 1 3
 TONUS-iv-d2 = 1 2 1 3
+TONUS-iv-A = 1 2 1 3
 TONUS-iv-a = 1 2 1 3
 TONUS-iv-g = 1 2 1 0
-TONUS-iv-E_ = 1 2 1 0
-TONUS-iv-E2_ = 1 2 1 0
+TONUS-iv-c = 1 2 1 0
+TONUS-iv-E_ = 1 2 1 3
+TONUS-iv-E2_ = 1 2 1 3
 TONUS-v-a = 1 0 2 0
 TONUS-v-g = 1 0 2 0
 TONUS-vi-F = 1 1 1 2
@@ -45,6 +49,7 @@ TONUS-vii-d = 2 0 2 0
 TONUS-viisoll-a = 2 0 2 0
 TONUS-viii-G = 1 0 1 2
 TONUS-viii-G2 = 1 0 1 2
+TONUS-viii-g = 1 0 1 2
 TONUS-viii-a = 1 0 1 2
 TONUS-viii-c = 1 0 1 2
 TONUS-viii-C = 1 0 1 2

diff --git a/Metropolitana/AdventusDominicaII/tonus.mk b/Metropolitana/AdventusDominicaII/tonus.mk
@@ -32,10 +32,12 @@ TONUS-iv-E2 = 1 2 1 3
 TONUS-iv-e = 1 2 1 3
 TONUS-iv-d = 1 2 1 3
 TONUS-iv-d2 = 1 2 1 3
+TONUS-iv-A = 1 2 1 3
 TONUS-iv-a = 1 2 1 3
 TONUS-iv-g = 1 2 1 0
-TONUS-iv-E_ = 1 2 1 0
-TONUS-iv-E2_ = 1 2 1 0
+TONUS-iv-c = 1 2 1 0
+TONUS-iv-E_ = 1 2 1 3
+TONUS-iv-E2_ = 1 2 1 3
 TONUS-v-a = 1 0 2 0
 TONUS-v-g = 1 0 2 0
 TONUS-vi-F = 1 1 1 2

diff --git a/Metropolitana/AlphaEtOmega/tonus.mk b/Metropolitana/AlphaEtOmega/tonus.mk
@@ -13,6 +13,7 @@ TONUS-i-g5 = 2 0 1 1
 TONUS-isoll-D_ = 1 3 1 2
 TONUS-isoll-D2 = 1 3 1 2
 TONUS-isoll-g = 1 3 1 2
+TONUS-isoll-f = 1 3 1 2
 TONUS-ii-D = 1 0 1 1
 TONUS-ii-A = 1 0 1 1
 TONUS-iisoll-D = 1 3 1 1
@@ -31,10 +32,12 @@ TONUS-iv-E2 = 1 2 1 3
 TONUS-iv-e = 1 2 1 3
 TONUS-iv-d = 1 2 1 3
 TONUS-iv-d2 = 1 2 1 3
+TONUS-iv-A = 1 2 1 3
 TONUS-iv-a = 1 2 1 3
 TONUS-iv-g = 1 2 1 0
-TONUS-iv-E_ = 1 2 1 0
-TONUS-iv-E2_ = 1 2 1 0
+TONUS-iv-c = 1 2 1 0
+TONUS-iv-E_ = 1 2 1 3
+TONUS-iv-E2_ = 1 2 1 3
 TONUS-v-a = 1 0 2 0
 TONUS-v-g = 1 0 2 0
 TONUS-vi-F = 1 1 1 2

diff --git a/Metropolitana/PerAnnum/Dominica15/tonus.mk b/Metropolitana/PerAnnum/Dominica15/tonus.mk
@@ -32,10 +32,12 @@ TONUS-iv-E2 = 1 2 1 3
 TONUS-iv-e = 1 2 1 3
 TONUS-iv-d = 1 2 1 3
 TONUS-iv-d2 = 1 2 1 3
+TONUS-iv-A = 1 2 1 3
 TONUS-iv-a = 1 2 1 3
 TONUS-iv-g = 1 2 1 0
-TONUS-iv-E_ = 1 2 1 0
-TONUS-iv-E2_ = 1 2 1 0
+TONUS-iv-c = 1 2 1 0
+TONUS-iv-E_ = 1 2 1 3
+TONUS-iv-E2_ = 1 2 1 3
 TONUS-v-a = 1 0 2 0
 TONUS-v-g = 1 0 2 0
 TONUS-vi-F = 1 1 1 2

diff --git a/Metropolitana/S.Benedicti/tonus.mk b/Metropolitana/S.Benedicti/tonus.mk
@@ -32,10 +32,12 @@ TONUS-iv-E2 = 1 2 1 3
 TONUS-iv-e = 1 2 1 3
 TONUS-iv-d = 1 2 1 3
 TONUS-iv-d2 = 1 2 1 3
+TONUS-iv-A = 1 2 1 3
 TONUS-iv-a = 1 2 1 3
 TONUS-iv-g = 1 2 1 0
-TONUS-iv-E_ = 1 2 1 0
-TONUS-iv-E2_ = 1 2 1 0
+TONUS-iv-c = 1 2 1 0
+TONUS-iv-E_ = 1 2 1 3
+TONUS-iv-E2_ = 1 2 1 3
 TONUS-v-a = 1 0 2 0
 TONUS-v-g = 1 0 2 0
 TONUS-vi-F = 1 1 1 2

diff --git a/ParochiaSangallensis/DominicaInPalmis/tonus.mk b/ParochiaSangallensis/DominicaInPalmis/tonus.mk
@@ -13,6 +13,7 @@ TONUS-i-g5 = 2 0 1 1
 TONUS-isoll-D_ = 1 3 1 2
 TONUS-isoll-D2 = 1 3 1 2
 TONUS-isoll-g = 1 3 1 2
+TONUS-isoll-f = 1 3 1 2
 TONUS-ii-D = 1 0 1 1
 TONUS-ii-A = 1 0 1 1
 TONUS-iisoll-D = 1 3 1 1
@@ -25,15 +26,18 @@ TONUS-iii-a3 = 2 0 2 0
 TONUS-iii-b = 2 0 2 0
 TONUS-iii-g = 2 0 2 0
 TONUS-iii-g2 = 2 0 2 0
+TONUS-iiisoll-a = 2 0 2 0
 TONUS-iv-E = 1 2 1 3
 TONUS-iv-E2 = 1 2 1 3
 TONUS-iv-e = 1 2 1 3
 TONUS-iv-d = 1 2 1 3
 TONUS-iv-d2 = 1 2 1 3
+TONUS-iv-A = 1 2 1 3
 TONUS-iv-a = 1 2 1 3
 TONUS-iv-g = 1 2 1 0
-TONUS-iv-E_ = 1 2 1 0
-TONUS-iv-E2_ = 1 2 1 0
+TONUS-iv-c = 1 2 1 0
+TONUS-iv-E_ = 1 2 1 3
+TONUS-iv-E2_ = 1 2 1 3
 TONUS-v-a = 1 0 2 0
 TONUS-v-g = 1 0 2 0
 TONUS-vi-F = 1 1 1 2

diff --git a/tonipsalmorum/arom12/iv-c-auto.gabc b/tonipsalmorum/arom12/iv-c-auto.gabc
@@ -0,0 +1,8 @@
+initial-style: 0;
+%%
+
+(c3)
+(i) (hi)
+(i) (ir1) (hr) (h.) (,)
+(i) (h) (i) (jr1) (ir) (i.) (:)
+(i) (ir1) (hr) (h.) (::)