Ferial Matins also in Feria major

FAJ-Munich · Feb 16, 2024 · a3c38fd · a3c38fd
1 parent 1691666
commit a3c38fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/web/cgi-bin/horas/monastic.pl b/web/cgi-bin/horas/monastic.pl
@@ -126,7 +126,7 @@ sub psalmi_matutinum_monastic {
     for ($i = 0; $i < 3; $i++) { $psalmi[$i + 16] = $c[$i]; }
   }
 
-  if ((($rank > 4.9 || $votive =~ /C8/) || ((($rank >= 4 && $version =~ /divino/i) || ($rank >= 2 && $version =~ /trident/i)) && $dayname[1] !~ /infra octavam/i)) && !($dayname[0] =~ /Pasc0/ && $dayofweek > 2) && !($dayname[1] =~ /infra.*Nativitatis/i && $dayofweek && $version !~ /196/)) {
+  if ((($rank > 4.9 || $votive =~ /C8/) || ((($rank >= 4 && $version =~ /divino/i) || ($rank >= 2 && $version =~ /trident/i)) && $dayname[1] !~ /feria|sabbato|infra octavam/i)) && !($dayname[0] =~ /Pasc0/ && $dayofweek > 2) && !($dayname[1] =~ /infra.*Nativitatis/i && $dayofweek && $version !~ /196/)) {
     #** get proper Ant Matutinum for II. and I. class feasts unless it's Wednesday thru Saturday of the Easter Octave
 		my ($w, $c) = getproprium('Ant Matutinum', $lang, $version !~ /196/, 1);  # for Trid. und Divino also look in Commune
     if ($w) {
@@ -165,7 +165,7 @@ sub psalmi_matutinum_monastic {
   my %w = (columnsel($lang)) ? %winner : %winner2;
   nocturn(1, $lang, \@psalmi, (0..7));
 
-  if ($rule =~ /12 lectiones/ || ((($rank >= 4 && $version =~ /divino/i) || ($rank >= 2 && $version =~ /trident/i)) && $dayname[1] !~ /infra octavam/i)) {
+  if ($rule =~ /12 lectiones/ || ((($rank >= 4 && $version =~ /divino/i) || ($rank >= 2 && $version =~ /trident/i)) && $dayname[1] !~ /feria|sabbato|infra octavam/i)) {
     lectiones(1, $lang);    # first Nocturn of 4 lessons (
   } elsif ($dayname[0] =~ /(Pasc[1-6]|Pent)/i && $month < 11 && $winner{Rank} !~ /vigil|quattuor|infra octavam/i) {
       # at least before 1960 (Breviarum Monasticum 1930), the change from "summer" to "winter" matins was tied to the 1st Sunday of November
@@ -189,7 +189,7 @@ sub psalmi_matutinum_monastic {
   nocturn(2, $lang, \@psalmi, (8..15));
 
   # In case of Matins of 3 nocturns with 12 lessons:
-  if ($winner{Rule} =~ /12 lectiones/ || ((($rank >= 4 && $version =~ /divino/i) || ($rank >= 2 && $version =~ /trident/i)) && $dayname[1] !~ /infra octavam/i)) {
+  if ($winner{Rule} =~ /12 lectiones/ || ((($rank >= 4 && $version =~ /divino/i) || ($rank >= 2 && $version =~ /trident/i)) && $dayname[1] !~ /feria|sabbato|infra octavam/i)) {
     lectiones(2, $lang);                                # lessons 5 – 8
     # push(@s, "\n", '!Nocturn III.', '_');
 

diff --git a/web/cgi-bin/horas/specmatins.pl b/web/cgi-bin/horas/specmatins.pl
@@ -164,7 +164,7 @@ sub nocturn {
 	}
 	if ($monasticf) {
 		antetpsalm_mm('', -2, \$lastant, $lang);    #draw out antiphon if any
-		return if ($num == 2 && $winner{Rule} !~ /12 lectiones/);
+		return if ($num == 2 && ($winner{Rule} !~ /12 lectiones/ || ((($rank >= 4 && $version =~ /divino/i) || ($rank >= 2 && $version =~ /trident/i)) && $dayname[1] !~ /feria|sabbato|infra octavam/i)));
 	}
 	my (@vs) = ($select[-1] =~ /^\d+$/ ? (@{$psalmi}[$select[-2]], @{$psalmi}[$select[-1]]) : ($select[-2], $select[-1]));
 	process_inline_alleluias($vs[0]);