M1930: Ranking for Feria privilegiatae II. et III. ordinis

aka Feria major
DivinumOfficium · Oct 4, 2024 · 899012d · 899012d
1 parent f5e625d
commit 899012d
Show file tree

Hide file tree

Showing 75 changed files with 176 additions and 193 deletions.
diff --git a/web/cgi-bin/horas/horascommon.pl b/web/cgi-bin/horas/horascommon.pl
@@ -416,15 +416,16 @@ sub occurrence {
       $commemoratio = 'Sancti/01-06.txt';
       $comrank = 5.6;
     } elsif (($srank[2] < 7 && $sname !~ /01-01/)
-      && $trank[2] >= ($srank[2] >= 5 ? 2.1 : 2)
+      && $trank[2] >= ($srank[2] >= 5 ? 2.1 : 1.5)
       && !($srank[0] =~ /Sangu/i && $trank[0] =~ /Cord/i))
     {    # incl. github #2950
       unshift(@commemoentries, $tname);
       $commemoratio = $tname;
       $comrank = $trank[2];
       $cvespera = $tvesp;
       $officename[2] = "Commemoratio: $trank[0]";
-      $officename[2] =~ s/:/ ad Laudes tantum:/ if $tfile =~ /Pasc5\-[123]/i;    # on Rogations and QT in Sep
+      $officename[2] =~ s/:/ ad Laudes \& Matutinum:/ if $tfile =~ /Pasc5\-[13]/i;    # Rogation Monday and Vigilia Acs
+      $officename[2] =~ s/:/ ad Laudes tantum:/ if $trank[0] =~ /Quattuor.*Sept/;     # QT in Sep
     } elsif (my $transferedC = $commemoentries[0]) {
       $commemoratio = "$transferedC.txt";
       my %tc = %{setupstring('Latin', "$transferedC.txt")};

diff --git a/web/cgi-bin/horas/specmatins.pl b/web/cgi-bin/horas/specmatins.pl
@@ -637,15 +637,6 @@ sub lectio : ScriptFunc {
     setbuild2("Lectiones I Nocturno ex Tempora Nativitatis") if $num == 1;
   }
 
-  # special rule for not having "Ss. Nominis" and missing readings on 01-13 for Monastic
-  # add first nocturn lessons from the actual tempora // as TempraM/Epi1-….txt is still incomplete it leads to issues on 01-13
-  # TODO: get TemporaM folder updated and completed
-  #  if ($nocturn == 1 && (($winner eq 'TemporaM/Nat2-0.txt') || ($winner eq 'SanctiM/01-13.txt'))) {
-  #    $c =
-  #      officestring($lang, $winner =~ /Tempora/ ? sprintf("SanctiM/01-%02d.txt", $day) : "TemporaM/Epi1-$dayofweek.txt");
-  #    $w{"Lectio$num"} = $c->{"LectioM$num"} || $c->{"Lectio$num"};
-  #  }
-
   #Lectio1 tempora: special rule for Octave of Epiphany
   if ($nocturn == 1 && $rule =~ /Lectio1 tempora/i && exists($scriptura{"Lectio1"})) {
     my %scrip = (columnsel($lang)) ? %scriptura : %scriptura2;
@@ -890,11 +881,26 @@ sub lectio : ScriptFunc {
     if ( ($commemoratio =~ /tempora/i && $commemoratio !~ /Nat(29|30|31)/i || $commemoratio =~ /01\-05/)
       && ($homilyflag == 1 || exists($commemoratio{"Lectio$j0"}))
       && $comrank > 1
-      && ($rank > 4 || ($rank >= 3 && $version =~ /Trident/i) || $homilyflag == 1 || exists($winner{Lectio1})))
+      && ($rank > 4 || ($rank >= 3 && $version =~ /Trident/i) || $homilyflag == 1 || exists($commemoratio{Lectio1})))
     {
       %w = (columnsel($lang)) ? %commemoratio : %commemoratio2;
       $wc = $w{"Lectio$j0"};
-      $wc ||= $w{"Lectio1"};
+
+      if ($wc && $version =~ /monastic/i && exists($w{"Responsory$j0"}) || exists($w{"Responsory12C"})) {
+
+        # In M1930, the assigned responsory when a Homily is commemorated only is sometimes different
+        $winner{"Responsory$num"} = $w{"Responsory12C"} || $w{"Responsory$j0"};
+        $winner2{"Responsory$num"} = $w{"Responsory12C"} || $w{"Responsory$j0"};
+      } elsif (!$wc) {
+        $wc = $w{"Lectio1"};
+
+        if ($wc && $version =~ /monastic/i && exists($w{"Responsory1"}) || exists($w{"Responsory12C"})) {
+
+          # In M1930, the assigned responsory when a Homily is commemorated only is sometimes different
+          $winner{"Responsory$num"} = $w{"Responsory12C"} || $w{"Responsory1"};
+          $winner2{"Responsory$num"} = $w{"Responsory12C"} || $w{"Responsory1"};
+        }
+      }
 
       if ($wc) {
         setbuild2("Last lectio Commemoratio ex Tempore #1");

diff --git a/web/www/Tabulae/Kalendaria/M1930.txt b/web/www/Tabulae/Kalendaria/M1930.txt
@@ -45,6 +45,8 @@
 02-23=02-23=S. Petri Damiani=3=Vigilia in Missa tantum
 02-24=02-24=S. Matthiae Apostoli=5=
 02-29=02-23o=Vigilia in Missa tantum
+*March*
+03-12=03-12=S. Gregorii Papae Confessoris et Eccl Doct=3=
 *May*
 05-19=05-19~05-19o=
 *June*

diff --git a/web/www/horas/Latin/SanctiM/03-07.txt b/web/www/horas/Latin/SanctiM/03-07.txt
@@ -1 +1,4 @@
 @Sancti/03-07
+
+[Rule] (rubrica 1963)
+scriptura1960
diff --git a/web/www/horas/Latin/Tempora/093-3.txt b/web/www/horas/Latin/Tempora/093-3.txt
@@ -1,7 +1,7 @@
 [Rank]
 Feria Quarta Quattuor Temporum Septembris;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 196 aut rubrica 1930)
 Feria Quarta Quattuor Temporum Septembris;;Feria major;;4.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/093-5.txt b/web/www/horas/Latin/Tempora/093-5.txt
@@ -1,7 +1,7 @@
 [Rank]
 Feria Sexta Quattuor Temporum Septembris;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 196 aut rubrica 1930)
 Feria Sexta Quattuor Temporum Septembris;;Feria major;;4.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/093-6.txt b/web/www/horas/Latin/Tempora/093-6.txt
@@ -1,7 +1,7 @@
 [Rank]
 Sabbato Quattuor Temporum Septembris;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 196 aut rubrica 1930)
 Sabbato Quattuor Temporum Septembris;;Feria major;;4.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Adv3-3.txt b/web/www/horas/Latin/Tempora/Adv3-3.txt
@@ -1,7 +1,7 @@
 [Rank]
 Feria IV Quattuor Temporum in Adventu;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 196 aut rubrica 1930)
 Feria IV Quattuor Temporum Adventus;;Feria major;;4.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Adv3-5.txt b/web/www/horas/Latin/Tempora/Adv3-5.txt
@@ -1,7 +1,7 @@
 [Rank]
 Feria VI Quattuor Temporum in Adventu;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 196 aut rubrica 1930)
 Feria VI Quattuor Temporum Adventus;;Feria major;;4.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Adv3-6.txt b/web/www/horas/Latin/Tempora/Adv3-6.txt
@@ -1,7 +1,7 @@
 [Rank]
 Sabbato Quattuor Temporum in Adventu;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 196 aut rubrica 1930)
 Sabbato Quattuor Temporum Adventus;;Feria major;;4.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Pasc5-1.txt b/web/www/horas/Latin/Tempora/Pasc5-1.txt
@@ -1,6 +1,9 @@
 [Rank]
 Feria Secunda in Rogationibus;;Feria major;;2.1
 
+[Rank] (rubrica 1930)
+Feria Secunda in Rogationibus;;Feria major;;4.9
+
 [Rule]
 Una Antiphona
 Laudes Litania

diff --git a/web/www/horas/Latin/Tempora/Pasc5-2.txt b/web/www/horas/Latin/Tempora/Pasc5-2.txt
@@ -1,7 +1,4 @@
 [Rank]
-Feria Tertia in Rogationibus;;Feria;;1.6
-
-[Rank] (rubrica 1960)
 Feria Tertia in Rogationibus;;Feria;;1
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Pasc5-3.txt b/web/www/horas/Latin/Tempora/Pasc5-3.txt
@@ -1,5 +1,5 @@
 [Rank]
-Feria Quarta in Rogationibus in Vigilia Ascensionis;;Feria;;1.6
+Feria Quarta in Rogationibus in Vigilia Ascensionis;;Vigilia;;1.5
 
 [Rank](rubrica 196 aut rubrica innovata)
 In Vigilia Ascensionis;;Feria;;5

diff --git a/web/www/horas/Latin/Tempora/Pasc5-3t.txt b/web/www/horas/Latin/Tempora/Pasc5-3t.txt
@@ -1,8 +1,5 @@
 @Tempora/Pasc5-3
 
-[Rank]
-Feria Quarta in Rogationibus in Vigilia Ascensionis;;Feria;;2
-
 [Responsory1]
 @Tempora/Pasc4-0:Responsory7
 

diff --git a/web/www/horas/Latin/Tempora/Quad2-1.txt b/web/www/horas/Latin/Tempora/Quad2-1.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Secunda infra Hebdomadam II in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Secunda infra Hebdomadam II in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Secunda infra Hebdomadam II in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad2-2.txt b/web/www/horas/Latin/Tempora/Quad2-2.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Tertia infra Hebdomadam II in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Tertia infra Hebdomadam II in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Tertia infra Hebdomadam II in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad2-3.txt b/web/www/horas/Latin/Tempora/Quad2-3.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Quarta infra Hebdomadam II in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Quarta infra Hebdomadam II in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Quarta infra Hebdomadam II in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad2-4.txt b/web/www/horas/Latin/Tempora/Quad2-4.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Quinta infra Hebdomadam II in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Quinta infra Hebdomadam II in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Quinta infra Hebdomadam II in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad2-5.txt b/web/www/horas/Latin/Tempora/Quad2-5.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Sexta infra Hebdomadam II in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Sexta infra Hebdomadam II in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Sexta infra Hebdomadam II in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad2-6.txt b/web/www/horas/Latin/Tempora/Quad2-6.txt
@@ -1,7 +1,10 @@
 [Rank]
 Sabbato infra Hebdomadam II in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Sabbato infra Hebdomadam II in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Sabbato infra Hebdomadam II in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad3-1.txt b/web/www/horas/Latin/Tempora/Quad3-1.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Secunda infra Hebdomadam III in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Secunda infra Hebdomadam III in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Secunda infra Hebdomadam III in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad3-2.txt b/web/www/horas/Latin/Tempora/Quad3-2.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Tertia infra Hebdomadam III in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Tertia infra Hebdomadam III in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Tertia infra Hebdomadam III in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad3-3.txt b/web/www/horas/Latin/Tempora/Quad3-3.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Quarta infra Hebdomadam III in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Quarta infra Hebdomadam III in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Quarta infra Hebdomadam III in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad3-4.txt b/web/www/horas/Latin/Tempora/Quad3-4.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Quinta infra Hebdomadam III in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Quinta infra Hebdomadam III in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Quinta infra Hebdomadam III in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad3-5.txt b/web/www/horas/Latin/Tempora/Quad3-5.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Sexta infra Hebdomadam III in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Sexta infra Hebdomadam III in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Sexta infra Hebdomadam III in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad3-6.txt b/web/www/horas/Latin/Tempora/Quad3-6.txt
@@ -1,7 +1,10 @@
 [Rank]
 Sabbato infra Hebdomadam III in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Sabbato infra Hebdomadam III in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Sabbato infra Hebdomadam III in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad4-1.txt b/web/www/horas/Latin/Tempora/Quad4-1.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Secunda infra Hebdomadam IV in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Secunda infra Hebdomadam IV in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Secunda infra Hebdomadam IV in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad4-2.txt b/web/www/horas/Latin/Tempora/Quad4-2.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Tertia infra Hebdomadam IV in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Tertia infra Hebdomadam IV in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Tertia infra Hebdomadam IV in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad4-3.txt b/web/www/horas/Latin/Tempora/Quad4-3.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Quarta infra Hebdomadam IV in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Quarta infra Hebdomadam IV in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Quarta infra Hebdomadam IV in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad4-4.txt b/web/www/horas/Latin/Tempora/Quad4-4.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Quinta infra Hebdomadam IV in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Quinta infra Hebdomadam IV in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Quinta infra Hebdomadam IV in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad4-5.txt b/web/www/horas/Latin/Tempora/Quad4-5.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Sexta infra Hebdomadam IV in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Sexta infra Hebdomadam IV in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Sexta infra Hebdomadam IV in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad4-6.txt b/web/www/horas/Latin/Tempora/Quad4-6.txt
@@ -1,7 +1,10 @@
 [Rank]
 Sabbato infra Hebdomadam IV in Quadragesima;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Sabbato infra Hebdomadam IV in Quadragesima;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Sabbato infra Hebdomadam IV in Quadragesima;;Feria major;;3.9
 
 [Rule]

diff --git a/web/www/horas/Latin/Tempora/Quad5-1.txt b/web/www/horas/Latin/Tempora/Quad5-1.txt
@@ -1,7 +1,10 @@
 [Rank]
 Feria Secunda infra Hebdomadam Passionis;;Feria major;;2.1
 
-[Rank] (rubrica 1960)
+[Rank] (rubrica 1930)
+Feria Secunda infra Hebdomadam Passionis;;Feria major;;4.9
+
+[Rank] (rubrica 196)
 Feria Secunda infra Hebdomadam Passionis;;Feria major;;3.9
 
 [Rule]