Merge pull request #4186 from FAJ-Munich/master

Fix 1st Nocturn readings for Cæcilia and similiar cases
DivinumOfficium · Nov 23, 2024 · 5b29dac · 5b29dac
2 parents 4593624 + d0461ee
commit 5b29dac
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/web/cgi-bin/horas/horasscripts.pl b/web/cgi-bin/horas/horasscripts.pl
@@ -187,7 +187,7 @@ sub psalm : ScriptFunc {
       || ($psnum == 62 && $version !~ /Monastic/)
       || ($psnum == 115 && $version =~ /Monastic/);
   }
-  
+
   my $bea = $lang eq 'Latin' && $psalmvar || $lang eq 'Latin-Bea';
 
   my @lines = do_read(checkfile($bea ? 'Latin-Bea' : $lang, "Psalterium/Psalmorum/Psalm$psnum.txt"));
@@ -202,7 +202,7 @@ sub psalm : ScriptFunc {
     shift(@lines) =~ /\(?(?<title>.*?) \* (?<source>.*?)\)?\s*$/;
     ($title, $source) = ($+{title}, $+{source});
     if ($v1) { $source =~ s/:\K.*/"$v1-$v2"/e; }
-  } elsif ($bea) {  # special handling for Bea's psalter
+  } elsif ($bea) {    # special handling for Bea's psalter
 
     # remove Title if Psalm section does not start in the beginning
     shift(@lines) if $lines[0] =~ /^\(.*\)\s*$/ && $lines[1] =~ /^\d+\:(\d+)[a-z]?\s/ && $v1 > $1;

diff --git a/web/cgi-bin/horas/specmatins.pl b/web/cgi-bin/horas/specmatins.pl
@@ -746,12 +746,13 @@ sub lectio : ScriptFunc {
   }
 
   #look for commune if sancti and 'ex commune' (for Trident also "vide")
-  if (!$w
+  if (
+      !$w
     && $winner =~ /sancti/i
     && $commune =~ /^C/
-    && $communetype =~ /^ex/i
-    && ($rank > 3 || ($rule =~ /in (\d) Nocturno/i && $1 eq $nocturn)))
-  {
+    && ( ($communetype =~ /^ex/i && $rank > 3)
+      || ($rule =~ /in (\d) Nocturno Lectiones ex/i && $1 eq $nocturn))
+  ) {
     my %com = (columnsel($lang)) ? %commune : %commune2;
     my $lecnum = "Lectio$num";
 

diff --git a/web/www/horas/Latin/Sancti/11-22.txt b/web/www/horas/Latin/Sancti/11-22.txt
@@ -7,7 +7,7 @@ S. Cæciliæ Virginis et Martyris;;Semiduplex;;2.2;;vide C6
 [Rule]
 vide C6;
 9 lectiones
-lectiones in 1 nocturno ex Commune 1 loco
+in 1 nocturno lectiones ex Commune 1 loco
 
 [Ant Vespera]
 Cantántibus órganis, * Cæcília Dómino decantábat, dicens: Fiat cor meum immaculátum, ut non confúndar.;;109
@@ -34,19 +34,12 @@ Crédimus Christum * Fílium Dei verum Deum esse, qui sibi talem elégit fámula
 Nos sciéntes * sanctum nomen ejus, omníno negáre non póssumus.;;96
 Tunc Valeriánus * perréxit, et signo quod accéperat, invénit sanctum Urbánum.;;97
 
-[Lectio1](rubrica 196)
-@Commune/C6:Lectio1
-
 [Responsory1]
 R. Cantántibus órganis, Cæcília virgo in corde suo soli Dómino decantábat, dicens: 
 * Fiat, Dómine, cor meum et corpus meum immaculátum, ut non confúndar.
 V. Biduánis et triduánis jejúniis orans, commendábat Dómino quod timébat.
 R. Fiat, Dómine, cor meum et corpus meum immaculátum, ut non confúndar.
 
-[Lectio2](rubrica 196)
-@Commune/C6:Lectio2
-@Commune/C6:Lectio3
-
 [Responsory2]
 R. O beáta Cæcília, quæ duos fratres convertísti, Almáchium judicem superásti, 
 * Urbanum episcopum in vultu angelico demonstrásti.