Merge pull request #20 from FAJ-Munich/cist-dev2

Follow up to last PR

web/cgi-bin/DivinumOfficium/SetupString.pl

@@ -24,6 +24,7 @@
   'die' => \&get_dayname_for_condition,
   feria => sub { our $dayofweek + 1 },
   commune => sub { our $commune },
+  votiva => sub { our $votive },
   officio => sub { $dayname[1]; },
 );
 my %predicates = (
@@ -222,7 +223,12 @@ ($)
 
   # aut binds tighter than et
 AUTEM: for (split /\baut\b/, $condition) {
-    for (split /\bet\b/) {
+    my $negation = 0;    # the first condition always has to be true
+
+    for (split /\b(et|nisi)\b/) {
+      $negation = 1 if /nisi/;    # everthing after 'nisi' has to be false until the next 'aut'
+      next if /et|nisi/;          # don't evaluate the captured seperator
+
       s/^\s*(.*?)\s*$/$1/;
 
       # Normalise whitespace.
@@ -247,8 +253,10 @@ ($)
       my $predicate_text = $predicate;
       $predicate = $predicates{lc($predicate)} || sub { shift =~ /$predicate_text/i };
       $subject = $subjects{lc($subject)};
-      next AUTEM unless $subject && &$predicate(&$subject());
+
+      next AUTEM unless $subject && (&$predicate(&$subject()) xor $negation);
     }
+
     return ($vero = 1);
   }
   return ($vero = 0);

web/cgi-bin/horas/horas.pl

@@ -725,9 +725,11 @@ (\$$)
 # Performs necessary adjustments to a short responsory.
 sub postprocess_short_resp(\@$) {
   my ($capit, $lang) = @_;
+  our (@dayname, $votive);
+
   s/&Gloria1?/&Gloria1/ for (@$capit);
 
-  if ($dayname[0] =~ /Pasc/i) {
+  if (alleluia_required($dayname[0], $votive)) {
     my $rlines = 0;
 
     for (@$capit) {

web/cgi-bin/horas/horascommon.pl

@@ -924,17 +924,20 @@ sub concurrence {
 
     #  before DA, more Semiduplex and Duplex where treated as "A capitulo"
     # In Cisterciense, even MM. maj is A capitulo in concurrence with Dom. I. classis
+    # In Altovadensis, even MM. min is A capitulo in concurrence with any Sunday
     my $flrank =
-        ($version =~ /cist/i && $cwinner{Rank} =~ /Dominica/i && $tomorrowname[0] =~ /Adv1|Quad[156]/)
-      ? ($rank < 4.9 ? 2 : $rank)
+        ($version =~ /cist/i && $cwinner{Rank} =~ /Dominica/i)
+      ? ($rank < ($tomorrowname[0] =~ /Adv1|Quad[156]/ ? 4.9 : $version =~ /altovadensis/i ? 3.9 : 2.9) ? 2 : $rank)
       : $version =~ /trident/i ? (
           ($rank < 2.9 && !($rank == 2.1 && $winner{Rank} !~ /infra Octavam/i)) ? 2
-        : ($rank >= 3 && $rank < 4.9 && $rank != 4 && $rank != 3.2) ? 3
+        : ($rank >= 3 && $rank < 4.9 && $rank != 4 && $rank != 3.9 && $rank != 3.2) ? 3
         : $rank
       )
       : $rank;
     my $flcrank =
-      $version =~ /trident/i
+      $version =~ /cist/i && $cwinner{Rank} =~ /Dominica/i
+      ? 2
+      : $version =~ /trident/i
       ? ($crank < 2.91 ? 2 : ($cwinner{Rank} =~ /Dominica/i ? 2.99 : ($crank < 4.9 && $crank != 4) ? 3 : $crank))
       : ($version =~ /divino/i && $cwinner{Rank} =~ /Dominica/i) ? 4.9
       : $crank;
@@ -1597,16 +1600,8 @@ sub precedence {
         || ($month == 2 && $day < 3))
       {
         $vtv = 'C12N';
-      } elsif ($dayname[0] =~ /adv/i) {
+      } elsif ($dayname[0] =~ /adv/i || $winner =~ /03-25/) {
         $vtv = 'C12A';
-      } elsif ($dayname[0] =~ /Pasc/i) {
-        $vtv = 'C12P';
-      } elsif (
-        $month == 3
-        && (($day == 24 && $hora =~ /(Vespera|Completorium)/i)
-          || $day == 25)
-      ) {
-        $vtv = 'C12';
       } elsif ($dayname[0] =~ /(Quadp|Quad)/i) {
         $vtv = 'C12Q';
       }
@@ -1836,8 +1831,9 @@ sub nooctnat {
 # Latin spelling variety in versions
 sub spell_var {
   my $t = shift;
+  our $version;
 
-  if (our $version =~ /196/) {
+  if ($version =~ /196/) {
 
     # substitute i for j
     # but not in html tags!
@@ -1853,6 +1849,7 @@ sub spell_var {
   } else {
     $t =~ s/Génetrix/Génitrix/g;
     $t =~ s/\bco(t[ií]d[ií])/quo$1/g;
+    $t =~ s/(allelú)ja/$1ia/gi if $version =~ /cist/i;
   }
   return $t;
 }

web/cgi-bin/horas/specials/orationes.pl

@@ -161,7 +161,8 @@ sub oratio {
         )
       {    # OP ferial office
         if ($horamajor && $version !~ /Ordo Praedicatorum/) {
-          push(@s, '$Kyrie', '$Pater noster Et', "_");
+          push(@s, '$Kyrie');
+          push(@s, '$Pater noster Et', "_") unless $winner =~ /C12/;
         } else {
           push(@s, '$Kyrie', '$pater secreto', "_");
         }

web/cgi-bin/horas/specials/psalmi.pl

@@ -16,7 +16,7 @@ sub psalmi {
 
     if ($hora =~ /^(?:Laudes|Vespera)$/i) {
       $psalmi = psalmi_major($lang);
-      $duplexf ||= $duplex > 2;
+      $duplexf ||= $duplex > 2 && $winner !~ /C12/;
     } else {
       $psalmi = psalmi_minor($lang);
     }
@@ -143,7 +143,7 @@ sub psalmi_minor {
     if ($name eq 'Adv') {
       $name = $dayname[0];
 
-      if ($day > 16 && $day < 24 && $dayofweek) {
+      if ($day > 16 && $day < 24 && $dayofweek && $version !~ /cist/i) {
         my $i = $dayofweek + 1;
 
         if ($dayofweek == 6 && $version =~ /trident|monastic.*divino/i) {    # take ants from feria occuring Dec 21st

web/cgi-bin/horas/specmatins.pl

@@ -147,7 +147,7 @@ sub nocturn {
   push(@s, '!' . translate('Nocturn', $lang) . ' ' . ('I' x $num) . '.');
 
   my @psalmi_n = map { $psalmi->[$select[$_]] } 0 .. @select - 3;
-  my $duplexf = $version =~ /196/ || ($duplex > 2 && $rule !~ /Matins simplex/);
+  my $duplexf = $version =~ /196/ || ($duplex > 2 && $rule !~ /Matins simplex/ && $winner !~ /C12/);
   antetpsalm(\@psalmi_n, $duplexf, $lang);
 
   # versus can be text or reference (number)
@@ -209,7 +209,7 @@ sub psalmi_matutinum {
     $prefix .= ' ' . translate('et Psalmi', $lang);
   }
 
-  if ($dayname[0] =~ /Pasc[1-6]/i && $votive !~ /C9/) {
+  if ($dayname[0] =~ /Pasc[1-6]/i && $votive !~ /C9|C12/) {
     @psalmi = ant_matutinum_paschal(\@psalmi, $lang, length($w));
   }
 
@@ -298,7 +298,7 @@ sub psalmi_matutinum {
   # we've already returned.
   my @spec;
 
-  if ($dayname[0] =~ /Pasc[1-6]/i && $version !~ /Trident/i) {    #??? ex
+  if ($dayname[0] =~ /Pasc[1-6]/i && $version !~ /Trident/i && $votive !~ /C9|C12/) {    #??? ex
     if ($version =~ /196/ && $name eq 'Asc') {
       my %r = %{setupstring($lang, 'Tempora/Pasc5-4.txt')};
 
@@ -309,8 +309,10 @@ sub psalmi_matutinum {
       push(@spec, split("\n", $r{'Nocturn 2 Versum'}));
       push(@spec, '') for 1 .. 3;
       push(@spec, split("\n", $r{'Nocturn 3 Versum'}));
+      setbuild("Pasc5-4", 'Versus ex Festo', 'subst');
     } else {
       @spec = split("\n", $psalmi{"Pasch Ant Dominica"});
+      setbuild("Psalmi matutinum", 'Versus ex Pasch Ant Dominica', 'subst');
     }
     foreach my $i (3, 4, 8, 9, 13, 14) { $psalmi[$i] = $spec[$i]; }
 
@@ -679,7 +681,7 @@ sub lectio : ScriptFunc {
   }
 
   #** handle initia table (Str$ver$year)
-  if ($nocturn == 1 && $version !~ /monastic/i) {
+  if ($nocturn == 1 && $version !~ /monastic/i && $winner !~ /C12/) {
     my $file = initiarule($month, $day, $year);
     if ($file) { %w = resolveitable(\%w, $file, $lang); }
   }

web/www/Tabulae/Transfer/a.txt

@@ -25,4 +25,4 @@
 12-05=12-03~12-05;;1906
 12-24=12-24s;;1888 1906 DA 1960 Newcal M1963
 12-24=12-24so;;1570
-12-31=Tempora/Nat1-0;;1570 1888 1906 1960 DA Newcal M1963 M1617 M1930
+12-31=Tempora/Nat1-0;;1570 1888 1906 1960 DA Newcal M1963 M1617 M1930 CAV

web/www/Tabulae/Transfer/b.txt

@@ -1,6 +1,7 @@
 #= sunday letter: b, general rule
-01-02=Tempora/Nat2-0;;DA Newcal 1960 M1930 CAV
+01-02=Tempora/Nat2-0;;DA Newcal 1960 M1930
 01-02=Tempora/Nat2-0r;;M1963
+01-02=Tempora/Nat2-0~Tempora/Nat2-0r;;CAV
 01-10=01-09;;1570 1888 1906 M1617
 01-10=01-09~01-15;;M1930 C1951 CAV
 01-11=01-10~01-11cc;;1570 1888 1906 M1617 C1951 CAV

web/www/Tabulae/Transfer/c.txt

@@ -1,6 +1,7 @@
 #= sunday letter: c, general rule
-01-03=Tempora/Nat2-0;;1960 DA Newcal M1930 CAV
+01-03=Tempora/Nat2-0;;1960 DA Newcal M1930
 01-03=Tempora/Nat2-0r;;M1963
+01-03=Tempora/Nat2-0~Tempora/Nat2-0r;;CAV
 01-10=01-15;;M1930 C1951 CAV
 01-11=01-10~01-11cc;;1570 1888 1906 M1617 C1951 CAV
 01-11=01-10;;M1930

web/www/Tabulae/Transfer/d.txt

@@ -1,6 +1,7 @@
 #= sunday letter: d, general rule
-01-04=Tempora/Nat2-0;;DA Newcal 1960 M1930 CAV
+01-04=Tempora/Nat2-0;;DA Newcal 1960 M1930
 01-04=Tempora/Nat2-0r;;M1963
+01-04=Tempora/Nat2-0~Tempora/Nat2-0r;;CAV
 01-11=01-11cc;;1570 1888 1906 M1617 C1951 CAV
 01-12=01-11;;1570 1888 1906 M1617 M1930 C1951 CAV
 01-18=01-00~01-18r;;1888 1906 C1951

web/www/Tabulae/Transfer/f.txt

@@ -25,5 +25,5 @@
 12-09=12-08o;;1570 M1617
 12-09=12-08;;Newcal
 12-09=12-09-da;;DA
-12-29=Tempora/Nat1-0a;;1570 1888 1906 1960 DA Newcal M1963 M1617 M1930
+12-29=Tempora/Nat1-0a;;1570 1888 1906 1960 DA Newcal M1963 M1617 M1930 CAV
 12-30=12-29o;;1570 1888 M1617

web/www/horas/Bohemice/Psalterium/Common/Prayers.txt

@@ -120,6 +120,18 @@ R. Bohu díky.
 V. Duše věrných zemřelých pro milosrdenství Boží ať odpočívají v pokoji.
 R. Amen.
 
+[Amen]
+R. Amen.
+
+[Per Christum]
+Skrze Krista, našeho Pána.
+
+[Per eumdem Christum]
+Skrze téhož Krista, našeho Pána.
+
+[Qui tecum in]
+Který s tebou žije a kraluje po všechny věky věkův.
+
 [Per Dominum]
 r. Skrze našeho Pána Ježíše Krista, tvého Syna, jenž s tebou žije a kraluje v jednotě Ducha Svatého Bůh, po všecky věky věkův.
 R. Amen.
@@ -267,12 +279,6 @@ Alleluja, alleluja.
 V. Od brány pekelné.
 R. Vysvoboď Pane jejich duše.
 
-[Amen]
-R. Amen.
-
-[Per Christum]
-Skrze Krista, našeho Pána.
-
 [Oratio Visita_]
 v. Navštiv, Pane, prosíme tě, tento příbytek, a veškeré úklady nepřítele od něj daleko odežeň; Tvoji svatí Andělé nechť se v něm zabydlí, aby nás v míru zachovali; a tvé požehnání ať s nám zůstává navždy.
 

web/www/horas/Bohemice/Psalterium/Mariaant.txt

@@ -62,7 +62,6 @@ v. Zdrávas, Královno, matko milosrdenství;
 K tobě voláme, vyhnaní synové Evy. 
 K tobě vzdycháme, lkajíce a plačíce 
 v tomto slzavém údolí.
-_ 
 A proto, orodovnice naše, 
 obrať k nám své milosrdné oči. 
 A Ježíše, požehnaní plod života svého, 

web/www/horas/Dansk/Psalterium/Common/Prayers.txt

@@ -86,6 +86,9 @@ R. Gud ske tak og lov.
 V. Må de troendes sjæle, ved Guds nåde, hvile i fred.
 R. Amen.
 
+[Qui tecum in]
+Han, som lever og råder fra evighed til evighed.
+
 [Per Dominum]
 r. Ved vor Herre Jesus Kristus, din Søn, som lever og råder med dig i Helligåndens enhed, Gud, fra evighed til evighed.
 R. Amen.

web/www/horas/Deutsch/Psalterium/Common/Prayers.txt

@@ -96,6 +96,15 @@ R. Dank sei Gott.
 V. Die Seelen der Gläubigen mögen durch die Barmherzigkeit Gottes ruhen in Frieden.
 R. Amen.
 
+[Per Christum]
+Im Hinblick auf Christus, unsern Herrn.
+
+[Per eumdem Christum]
+Im Hinblick auf denselben Christus, unsern Herrn.
+
+[Qui tecum in]
+Der mit dir lebt und herrscht von Ewigkeit zu Ewigkeit.
+
 [Per Dominum]
 r. Durch unseren Herrn Jesus Christus, deinen Sohn, der mit dir lebt und herrscht in der Einheit des Heiligen Geistes, Gott, von Ewigkeit zu Ewigkeit.
 R. Amen.
@@ -215,9 +224,6 @@ Alleluja, alleluja.
 V. Von den Pforten des Fegfeuers.
 R. Errette, o Herr, ihre Seelen.
 
-[Per Christum]
-Im Hinblick auf Christus, unsern Herrn.
-
 [Oratio Visita_]
 v. Nimm, wir bitten dich, o Herr, Wohnung in diesem Gemach und alle Nachstellungen des Feindes scheuche weit von ihm weg; deine heiligen Engel mögen in ihm Wohnung nehmen, die uns im Frieden beschützen, und dein Segen walte stets über uns.
 

web/www/horas/English/CommuneM/C11.txt

@@ -7,9 +7,9 @@ R. The Lord is with thee.
 R. Hail Mary full of grace, * the Lord is with thee.
 
 [AntMatutinumM]
-Your lips, my spouse, are as a dropping honeycomb, honey and milk are under your tongue; and the smell of your garments, as the smell of frankincense.;;47
-The fountain of gardens: the well of living waters, which run with a strong stream from Libanus.;;84
-I went down into the garden of nuts, to see the fruits of the valleys, and to look if the vineyard had flourished, and the pomegranates budded.;;98
+Your lips, * my spouse, are as a dropping honeycomb, honey and milk are under your tongue; and the smell of your garments, as the smell of frankincense.;;47
+The fountain of gardens: * the well of living waters, which run with a strong stream from Libanus.;;84
+I went down * into the garden of nuts, to see the fruits of the valleys, and to look if the vineyard had flourished, and the pomegranates budded.;;98
 
 [Lectio7]
 @Commune/C11:Lectio6:s/Hail, .*//s

web/www/horas/English/Psalterium/Common/Prayers.txt

@@ -98,6 +98,15 @@ R. Thanks be to God.
 V. May the souls of the faithful, through the mercy of God, rest in peace.
 R. Amen.
 
+[Per Christum]
+Through Christ our Lord.
+
+[Per eumdem Christum]
+Through the same Christ our Lord.
+
+[Qui tecum in]
+Who with thee liveth and reigneth, world without end.
+
 [Per Dominum]
 r. Through Jesus Christ, thy Son our Lord, Who liveth and reigneth with thee, in the unity of the Holy Ghost, God, world without end.
 R. Amen.
@@ -219,9 +228,6 @@ Alleluia, alleluia.
 V. From the gates of hell.
 R. Deliver their souls, O Lord!
 
-[Per Christum]
-Through Christ our Lord.
-
 [Oratio Visita_]
 v. Visit, we beseech thee, O Lord, this dwelling, and drive far from it the snares of the enemy; let thy holy angels dwell herein to preserve us in peace, and let thy blessing be always upon us.
 

web/www/horas/English/Sancti/01-06.txt

@@ -56,7 +56,7 @@ Sing praises to our God, sing praises * sing praises unto our King, sing ye prai
 Let all the earth worship thee, and sing unto thee * let them sing praises to thy name, O Lord.;;65
 The kings of Tarshish and the isles shall bring presents * unto the Lord the King.;;71
 All nations whom Thou hast made shall come * and worship before thee, O Lord.;;85
-This man was born in her, * and the @SanctiM/01-06:AntMatutinumM:2
+@SanctiM/01-06:AntMatutinumM:2
 (sed die Epiphaniæ dicitur)
 O come, let us worship Him: * for He is the Lord our God.;;94
 O worship the Lord, * alleluia, in His holy temple, alleluia.;;95

web/www/horas/Espanol/Psalterium/Common/Prayers.txt

@@ -93,6 +93,18 @@ R. Demos gracias a Dios.
 V. Las almas de los fieles, por la misericordia de Dios, descansen en paz. 
 R. Amén.
 
+[Amen]
+R. Amén.
+
+[Per Christum]
+Por Jesucristo nuestro Señor.
+
+[Per eumdem Christum]
+Por el mismo Jesucristo nuestro Señor.
+
+[Qui tecum in]
+Que vive y reina por todos los siglos de los siglos.
+
 [Per Dominum]
 r. Por nuestro Señor Jesucristo, tu Hijo, que vive y reina contigo en la unidad del Espíritu Santo, Dios, por todos los siglos de los siglos. 
 R. Amén.
@@ -216,12 +228,6 @@ Aleluya, aleluya.
 V. De las puertas del infierno.
 R. Libra, Señor, sus almas.
 
-[Amen]
-R. Amén.
-
-[Per Christum]
-Por el mismo Jesucristo nuestro Señor.
-
 [Oratio Visita_]
 v. Visita, Señor, esta habitación: aleja de ella las insidias del enemigo; que tus ángeles santos habiten en ella y nos guarden en paz.
 

web/www/horas/Espanol/Sancti/01-06.txt

@@ -80,7 +80,6 @@ Cristo se nos ha aparecido. * Venid a adoradle.
 Hijos de Dios, * aclamad al Señor, postraos ante el Señor en el atrio sagrado.;;28
 Un río de aguas abundantes * regocija, aleluya, la ciudad de Dios, aleluya.;;45
 Cantad a nuestro Dios, cantad; cantad a nuestro Rey, cantadle sabiamente.;;46
-
 Toda la tierra te adore * y te cante; cante salmos a tu nombre, Señor.;;65
 Los Reyes de Tarsis * y de las islas presentarán ofrendas al Rey, su Señor.;;71
 Todas las naciones * que has creado vendrán y se postrarán ante ti, Señor.;;85