From 8e631868a6fe384d47abc3c918dd441901328916 Mon Sep 17 00:00:00 2001 From: FAJ-Munich <60485740+FAJ-Munich@users.noreply.github.com> Date: Wed, 6 Mar 2024 21:41:55 +0100 Subject: [PATCH] Update specmatins.pl --- web/cgi-bin/horas/specmatins.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/cgi-bin/horas/specmatins.pl b/web/cgi-bin/horas/specmatins.pl index e01cb5ffa8c..11c76f5127c 100644 --- a/web/cgi-bin/horas/specmatins.pl +++ b/web/cgi-bin/horas/specmatins.pl @@ -595,6 +595,7 @@ sub lectio : ScriptFunc { if ($winner =~ /C12/i) { $ltype1960 = 0; } # Officium parvum B.M.V. if ($ltype1960 == 2 && $num == 3) { # 3rd reading in a Sunday office + setbuild2("Lectio 3 diverged to Homily"); $num = 7; # diverge to Gospel / Homily } elsif ( ($ltype1960 == 3 && $num == 3 && $votive !~ /(C9|Defunctorum)/i) # 3rd reading in sanctoral office of 3 readings @@ -1103,6 +1104,9 @@ sub lect1960 { if ($i == 0) { $i = 3; } } my $w = lectio(1, $lang); + if (!$w) { $w = $w{'Lectio1'}; } + if (!$w) { $w = $s{'Lectio1'}; } + if ($w =~ $evan_regexp) { $i = 3; } my @a = split("\n", $benedictio{"Nocturn $i"}); @@ -1122,9 +1126,7 @@ sub lect1960 { if ($rule =~ /Ipsa Virgo Virginum/i || $winner{Rank} =~ /Mari\w*\b\s*Virgin/i) { $a[3] = $a[10]; } if ($rule =~ /Quorum Festum/i && !$divaux) { $a[3] = $a[7]; } if ($rule =~ /Quarum Festum/i && !$divaux) { $a[3] = $a[9]; } - $w = $w{'Lectio1'}; - if (!$w) { $w = $s{'Lectio1'}; } - + if ($w =~ $evan_regexp) { $a[2] = $benedictio{Evangelica}; } else {