From 781598ce0b11558e7972f8e403c4a72fcc1358ec Mon Sep 17 00:00:00 2001 From: mbab Date: Fri, 13 Sep 2024 17:03:57 +0200 Subject: [PATCH] code: refactor Canticles from Evang. with data update in Ordinarium/, C12* & Pasc0-0 --- web/cgi-bin/horas/horas.pl | 157 ++++++++---------- web/cgi-bin/horas/psalmi.pl | 1 + web/cgi-bin/horas/specials.pl | 10 +- web/www/horas/Deutsch/Tempora/Pasc0-0.txt | 4 +- web/www/horas/English/Commune/C12.txt | 9 +- web/www/horas/English/Commune/C12P.txt | 50 +----- .../horas/English/Psalterium/Translate.txt | 2 +- web/www/horas/English/Tempora/Pasc0-0.txt | 4 +- web/www/horas/Espanol/Commune/C12.txt | 9 +- .../horas/Espanol/Psalterium/Translate.txt | 2 +- web/www/horas/Espanol/Tempora/Pasc0-0.txt | 4 +- .../horas/Francais/Psalterium/Translate.txt | 2 +- web/www/horas/Francais/Tempora/Pasc0-0.txt | 4 +- web/www/horas/Italiano/Commune/C12.txt | 9 +- .../horas/Italiano/Psalterium/Translate.txt | 2 +- web/www/horas/Italiano/Tempora/Pasc0-0.txt | 5 +- web/www/horas/Latin/Commune/C12.txt | 9 +- web/www/horas/Latin/Commune/C12A.txt | 2 +- web/www/horas/Latin/Commune/C12N.txt | 2 +- web/www/horas/Latin/Commune/C12P.txt | 50 +----- web/www/horas/Latin/Tempora/Pasc0-0.txt | 4 +- web/www/horas/Magyar/Commune/C12.txt | 9 +- web/www/horas/Magyar/Psalterium/Translate.txt | 6 +- web/www/horas/Magyar/Tempora/Pasc0-0.txt | 4 +- web/www/horas/Ordinarium/Completorium.txt | 2 +- web/www/horas/Ordinarium/Laudes.txt | 3 - web/www/horas/Ordinarium/Vespera.txt | 3 - web/www/horas/Polski/Commune/C12.txt | 9 +- web/www/horas/Polski/Psalterium/Translate.txt | 9 - web/www/horas/Polski/Tempora/Pasc0-0.txt | 4 +- .../horas/Portugues/Psalterium/Translate.txt | 2 +- 31 files changed, 114 insertions(+), 278 deletions(-) diff --git a/web/cgi-bin/horas/horas.pl b/web/cgi-bin/horas/horas.pl index faf8ae7ebdf..0cdd16e97f9 100644 --- a/web/cgi-bin/horas/horas.pl +++ b/web/cgi-bin/horas/horas.pl @@ -512,7 +512,7 @@ sub psalm : ScriptFunc { $prepend_dagger = 0; } - if ($first && $rest && $rest !~ /^\s*$/) { + if ($first && $rest && $rest !~ /^\s*$/ && $num != 232) { $rest = getantcross($rest, $antline); # Put dagger at start of second line if it would otherwise @@ -801,114 +801,89 @@ sub get_link_name { return $name; } -#*** ant_Benedictus($num, $lang) -# returns the antiphona $num=1 = for beginning =2 for end -sub ant_Benedictus : ScriptFunc { - - my $num = shift; - my $lang = shift; - our ($version, $winner); - our ($month, $day); - our $duplex; - - my ($ant) = getantvers('Ant', 2, $lang); - - if ($month == 12 && ($day == 21 || $day == 23) && $winner =~ /tempora/i) { - my %specials = %{setupstring($lang, "Psalterium/Major Special.txt")}; - $ant = $specials{"Adv Ant $day" . "L"}; - } - my @ant_parts = split('\*', $ant); - if ($num == 1 && $duplex < 3 && $version !~ /196/) { return "Ant. $ant_parts[0]"; } - - if ($num == 1) { - return "Ant. $ant"; - } else { - $ant =~ s/\s*\*\s*/ /; - return "Ant. {::}$ant"; - } -} - -#*** ant_Magnificat($num, $lang) -# returns the antiphon for $num=1 the beginning, or =2 for the end -sub ant_Magnificat : ScriptFunc { - - my $num = shift; #1=before, 2=after +#*** ant_special($lang) +# return special ant. for canticum major hours & duplexflag; +sub ant123_special { my $lang = shift; - our ($version, $winner); - our ($month, $day); - our $duplex; - our $rank; - our $vespera; - - my $v = ($version =~ 1960 && $winner =~ /Sancti/i && $rank < 5) ? 3 : $vespera; - my ($ant) = getantvers('Ant', $v, $lang); + my $ant, $duplexf; - # Special processing for Common of Supreme Pontiffs. Confessor-Popes - # have a common Magnificat antiphon at second Vespers. - my $popeclass = ''; + if ($month == 12 && ($day > 16 && $day < 24) && $winner =~ /tempora/i) { + my %specials = %{setupstring($lang, 'Psalterium/Major Special.txt')}; - if ( $version !~ /Trident/i - && $v == 3 - && ((undef, $popeclass, undef) = papal_rule($winner{Rule})) - && $popeclass =~ /C/i) - { - $ant = papal_antiphon_dum_esset($lang); - setbuild2("subst: Special Magnificat Ant. Dum esset"); - } + if ($hora eq 'Laudes' && ($day == 21 || $day == 23)) { + $ant = $specials{"Adv Ant $day" . 'L'}; + } elsif ($hora eq 'Vespera') { + $ant = $specials{"Adv Ant $day"}; + $duplexf = 1; + } + } elsif ($winner =~ /^Sancti/ && $version !~ /Trident/ && $vespera == 3) { - if ($month == 12 && ($day > 16 && $day < 24) && $winner =~ /tempora/i) { - my %specials = %{setupstring($lang, "Psalterium/Major Special.txt")}; - $ant = $specials{"Adv Ant $day"}; - $num = 2; - } - my @ant_parts = split('\*', $ant); - if ($num == 1 && $duplex < 3 && $version !~ /196/) { return "Ant. $ant_parts[0]"; } + # Special processing for Common of Supreme Pontiffs. Confessor-Popes + # have a common Magnificat antiphon at second Vespers. + my $popeclass; - if ($num == 1) { - return "Ant. $ant"; - } else { - $ant =~ s/\s*\*\s*/ /; - return "Ant. {::}$ant"; + if (((undef, $popeclass, undef) = papal_rule($winner{Rule})) + && $popeclass =~ /C/i) + { + $ant = papal_antiphon_dum_esset($lang); + setbuild2('subst: Special Magnificat Ant. Dum esset'); + } } + ($ant, $duplexf); } #*** canticum($psnum, $lang) # returns the formatted text of Benedictus, Magnifificat or Nunc dimittis ($num=1-3) -sub canticum : ScriptFunc { - my $psnum = shift; - my $lang = shift; - $psnum += 230; - psalm($psnum, $lang); -} +# with antiphones +sub canticum { -sub Nunc_dimittis { + my $item = shift; my $lang = shift; + + our ($hora, $vespera); + my $num = + $hora eq 'Laudes' ? 2 + : $hora eq 'Completorium' ? 4 + : 3; + my $ant, $ant2; - my ($w, $c) = getproprium("Ant 4$vespera", $lang, 1); + my $duplexf = $version =~ /196/; - if ($w) { - setbuild1($ite, 'special'); - ($ant, $ant2) = split("\n", $w); - } else { - my %a = %{setupstring($lang, "Psalterium/Minor Special.txt")}; - my $name; - $name = gettempora('Nunc dimittis') if $version =~ /^Ordo Praedicatorum/; - $ant = $a{"Ant 4$name"}; - - if ($version =~ /^Ordo Praedicatorum/ && $name eq ' Quad3') { - ($ant, $ant2) = split("\n", $ant); - $ant2 = "$ant\n$ant2"; + if ($hora eq 'Completorium') { + push(@s, '#' . translate(substr($item, 1), $lang)); + my ($w, $c) = getproprium("Ant 4$vespera", $lang, 1); + + if ($w) { + setbuild1($ite, 'special'); + ($ant, $ant2) = split("\n", $w); + } else { + my %a = %{setupstring($lang, 'Psalterium/Minor Special.txt')}; + my $name; + $name = gettempora('Nunc dimittis') if $version =~ /^Ordo Praedicatorum/; + $ant = $a{"Ant 4$name"}; + + if ($version =~ /^Ordo Praedicatorum/ && $name eq ' Quad3') { + ($ant, $ant2) = split("\n", $ant); + $ant2 = "$ant\n$ant2"; + } } - } + } else { + $comment = ($winner =~ /sancti/i) ? 3 : 2; + setcomment($item, 'Source', $comment, $lang, translate('Antiphona', $lang)); - if (alleluia_required($dayname[0], $votive)) { - ensure_single_alleluia(\$ant, $lang); - } + $duplexf ||= $duplex > 2; + my $key = $num == 3 ? $vespera : $num; + my $df; + ($ant, $df) = ant123_special($lang); - my @psalmi = ("$ant;;233"); - my $duplexf = $version =~ /196/; - push(@s, translate('#Canticum Nunc dimittis', $lang)); + unless ($ant) { + ($ant, $c) = getantvers('Ant', $key, $lang); + } else { + $duplexf ||= $df; + } + } + my @psalmi = ("$ant;;" . (229 + $num)); antetpsalm(\@psalmi, $duplexf, $lang); $s[-1] = "Ant. $ant2" if $ant2; } diff --git a/web/cgi-bin/horas/psalmi.pl b/web/cgi-bin/horas/psalmi.pl index 13654986c3b..88857e0cfc3 100644 --- a/web/cgi-bin/horas/psalmi.pl +++ b/web/cgi-bin/horas/psalmi.pl @@ -497,6 +497,7 @@ sub antetpsalm { if ($ant) { if ($lastant) { pop(@s); push(@s, "Ant. $lastant", "\n"); } + $ant =~ s/~?\n/ /g; postprocess_ant($ant, $lang); my $antp = $ant; diff --git a/web/cgi-bin/horas/specials.pl b/web/cgi-bin/horas/specials.pl index 1305e5fb452..f28dad568a2 100644 --- a/web/cgi-bin/horas/specials.pl +++ b/web/cgi-bin/horas/specials.pl @@ -341,14 +341,8 @@ sub specials { next; } - if ($item =~ /(benedictus|magnificat)/i) { - $comment = ($winner =~ /sancti/i) ? 3 : 2; - setcomment($label, 'Source', $comment, $lang, translate('Antiphona', $lang)); - next; - } - - if ($item =~ /Nunc Dimittis/i) { - Nunc_dimittis($lang); + if ($item =~ /Canticum/i) { + canticum($item, $lang); next; } diff --git a/web/www/horas/Deutsch/Tempora/Pasc0-0.txt b/web/www/horas/Deutsch/Tempora/Pasc0-0.txt index 9f95d4cd988..e611e0afa46 100644 --- a/web/www/horas/Deutsch/Tempora/Pasc0-0.txt +++ b/web/www/horas/Deutsch/Tempora/Pasc0-0.txt @@ -86,9 +86,7 @@ Ant. Alleluja, Alleluja, Alleluja. Ant. Alleluja, Alleluja, Alleluja. _ Ant. Nach dem Sabbat aber, als der Morgen am ersten Tag der Woche anbrach, kam Maria Magdalena und die andere Maria, das Grab zu sehen, alleluja. -&canticum(2) -&Gloria -{::} +&psalm(232) Ant. Nach dem Sabbat aber, als der Morgen am ersten Tag der Woche anbrach, kam Maria Magdalena und die andere Maria, das Grab zu sehen, alleluja. &Dominus_vobiscum diff --git a/web/www/horas/English/Commune/C12.txt b/web/www/horas/English/Commune/C12.txt index 06fc97b8cb5..8c513f9d109 100644 --- a/web/www/horas/English/Commune/C12.txt +++ b/web/www/horas/English/Commune/C12.txt @@ -43,7 +43,7 @@ $Oremus #Incipit _ $Ave Maria -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) V. Turn us then, +++ O God, our saviour: R. And let thy anger cease from us. $Deus in adjutorium @@ -66,10 +66,9 @@ _ V. Pray for us, O holy Mother of God. R. That we may be made worthy of the promises of Christ. -#Canticum Nunc dimittis +#Canticum: Nunc dimittis Ant. We take refuge * under thy protection, O holy Mother of God! Despise not our supplications in our need, but deliver us always from all dangers, O Virgin, glorious and blessed! -&canticum(3) -&Gloria +&psalm(233) Ant. We take refuge * under thy protection, O holy Mother of God! Despise not our supplications in our need, but deliver us always from all dangers, O Virgin, glorious and blessed! @:Pre oratio @@ -89,7 +88,7 @@ R. Amen. $Pater noster $Ave Maria $Credo -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) [Ant Matutinum] @Commune/C11::s/V\. .*/V. Grace is poured into thy lips./g s/R\. .*/R. Therefore God hath blessed thee for ever./g diff --git a/web/www/horas/English/Commune/C12P.txt b/web/www/horas/English/Commune/C12P.txt index d845d5a6df8..a68825d9870 100644 --- a/web/www/horas/English/Commune/C12P.txt +++ b/web/www/horas/English/Commune/C12P.txt @@ -17,52 +17,4 @@ Antiphonas Horas Feria Te Deum [Special Completorium] -#Incipit -_ -$Ave Maria -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) -V. Turn us then, +++ O God, our saviour: -R. And let thy anger cease from us. -$Deus in adjutorium -&Alleluia - -#Psalmi -&psalm(128) - -&psalm(129) - -&psalm(130) - -@:Hymnus minor - -#Capitulum -!Sir 24:24 -v. I am mother of fair love, and fear, and knowledge, and holy hope. -$Deo gratias -_ -V. Pray for us, O holy Mother of God. -R. That we may be made worthy of the promises of Christ. - -#Canticum Nunc dimittis -Ant. O Queen of heaven * rejoice! alleluia: for He whom thou didst merit to bear, alleluia, hath arisen as he said, alleluia; pray for us to God, alleluia. -&canticum(3) -Ant. O Queen of heaven * rejoice! alleluia: for He whom thou didst merit to bear, alleluia, hath arisen as he said, alleluia; pray for us to God, alleluia. - -@:Pre oratio -v. O Lord, we pray thee, that the glorious intercession of Mary, blessed, and glorious, and everlastingly Virgin, may shield us and bring us on toward eternal life. -$Per Dominum - -#Conclusio -&Dominus_vobiscum -&Benedicamus_Domino -Benedictio. The almighty and merciful Lord, + the Father, the Son and the Holy Spirit, bless us and keep us. -R. Amen. - -&antiphona_finalis -V. May the divine assistance + remain with us always. -R. Amen. - -$Pater noster -$Ave Maria -$Credo -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica) +@Commune/C12::s/Ant. .*/Ant. O Queen of heaven, * rejoice! alleluia: For He whom thou didst merit to bear, alleluia, Hath arisen as he said, alleluia. Pray for us to God, alleluia./gm diff --git a/web/www/horas/English/Psalterium/Translate.txt b/web/www/horas/English/Psalterium/Translate.txt index 57f72dc5f25..21cd27af63e 100644 --- a/web/www/horas/English/Psalterium/Translate.txt +++ b/web/www/horas/English/Psalterium/Translate.txt @@ -34,7 +34,7 @@ [#Canticum: Magnificat] #Canticle: Magnificat -[#Canticum Nunc dimittis] +[#Canticum: Nunc dimittis] #Canticle: Nunc dimittis [#Preces Dominicales] diff --git a/web/www/horas/English/Tempora/Pasc0-0.txt b/web/www/horas/English/Tempora/Pasc0-0.txt index aa5535a67c6..2aa747a4f63 100644 --- a/web/www/horas/English/Tempora/Pasc0-0.txt +++ b/web/www/horas/English/Tempora/Pasc0-0.txt @@ -90,9 +90,7 @@ Ant. Alleluia, alleluia, alleluia. Ant. Alleluia, alleluia, alleluia. _ Ant. And in the end of the sabbath, when it began to dawn towards the first day of the week, came Mary Magdalen and the other Mary, to see the sepulchre, alleluia. -&canticum(2) -&Gloria -{::} +&psalm(232) Ant. And in the end of the sabbath, when it began to dawn towards the first day of the week, came Mary Magdalen and the other Mary, to see the sepulchre, alleluia. &Dominus_vobiscum diff --git a/web/www/horas/Espanol/Commune/C12.txt b/web/www/horas/Espanol/Commune/C12.txt index e3eb5433eda..5885ae28775 100644 --- a/web/www/horas/Espanol/Commune/C12.txt +++ b/web/www/horas/Espanol/Commune/C12.txt @@ -32,7 +32,7 @@ $Oremus #Incipit _ $Ave Maria -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) V. Conviértenos, +++ oh Dios, Salvador nuestro. R. Cesa en tu rencor contra nosotros. $Deus in adjutorium @@ -55,10 +55,9 @@ _ V. Ruega por nosotros, santa Madre de Dios. R. Para que seamos dignos de las promesas de Cristo. -#Canticum Nunc dimittis +#Canticum: Nunc dimittis Ant. Bajo tu amparo * nos ponemos, santa Madre de Dios: no desprecies las súplicas que te dirigimos en nuestras necesidades; más líbranos siempre de todo peligro, Virgen gloriosa y bendita. -&canticum(3) -&Gloria +&psalm(233) Ant. Bajo tu amparo * nos ponemos, santa Madre de Dios: no desprecies las súplicas que te dirigimos en nuestras necesidades; más líbranos siempre de todo peligro, Virgen gloriosa y bendita. @:Pre oratio @@ -78,7 +77,7 @@ R. Amén. $Pater noster $Ave Maria $Credo -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) [Ant Matutinum] @Commune/C11::s/V\. .*/V. Derramada está la gracia en tus labios./g s/R\. .*/R. Por ello el Señor te bendecirá para siempre./g diff --git a/web/www/horas/Espanol/Psalterium/Translate.txt b/web/www/horas/Espanol/Psalterium/Translate.txt index 48ae7e4fe05..8bfe832faab 100644 --- a/web/www/horas/Espanol/Psalterium/Translate.txt +++ b/web/www/horas/Espanol/Psalterium/Translate.txt @@ -22,7 +22,7 @@ [#Canticum] #Cántico -[#Canticum Nunc dimittis] +[#Canticum: Nunc dimittis] #Cántico Nunc dimittis [#Preces Dominicales] diff --git a/web/www/horas/Espanol/Tempora/Pasc0-0.txt b/web/www/horas/Espanol/Tempora/Pasc0-0.txt index 2aa8fc0aadc..8988346b2db 100644 --- a/web/www/horas/Espanol/Tempora/Pasc0-0.txt +++ b/web/www/horas/Espanol/Tempora/Pasc0-0.txt @@ -93,9 +93,7 @@ Ant. Aleluya, aleluya, aleluya. Ant. Aleluya, aleluya, aleluya. _ Ant. Pasado el sábado, al alborear el primer día de la semana, fueron María la Magdalena y la otra María a ver el sepulcro, aleluya. -&canticum(2) -&Gloria -{::} +&psalm(232) Ant. Pasado el sábado, al alborear el primer día de la semana, fueron María la Magdalena y la otra María a ver el sepulcro, aleluya. &Dominus_vobiscum diff --git a/web/www/horas/Francais/Psalterium/Translate.txt b/web/www/horas/Francais/Psalterium/Translate.txt index 009e650c35e..87ea8e79c22 100755 --- a/web/www/horas/Francais/Psalterium/Translate.txt +++ b/web/www/horas/Francais/Psalterium/Translate.txt @@ -28,7 +28,7 @@ [#Canticum: Magnificat] #Cantique : Magnificat -[#Canticum Nunc dimittis] +[#Canticum: Nunc dimittis] #Cantique : Nunc dimittis [#Preces Dominicales] diff --git a/web/www/horas/Francais/Tempora/Pasc0-0.txt b/web/www/horas/Francais/Tempora/Pasc0-0.txt index 59f2f1a9308..58cf5e275ad 100644 --- a/web/www/horas/Francais/Tempora/Pasc0-0.txt +++ b/web/www/horas/Francais/Tempora/Pasc0-0.txt @@ -93,9 +93,7 @@ Ant. alléluia, alléluia, alléluia. Ant. alléluia, alléluia, alléluia. _ Ant. Après le sabbat, * à l'aube du premier jour de la semaine, Marie Madeleine et l'autre Marie allèrent voir le sépulcre, allelúia. -&canticum(2) -&Gloria -{::} +&psalm(232) Ant. Après le sabbat, * à l'aube du premier jour de la semaine, Marie Madeleine et l'autre Marie allèrent voir le sépulcre, allelúia. &Dominus_vobiscum diff --git a/web/www/horas/Italiano/Commune/C12.txt b/web/www/horas/Italiano/Commune/C12.txt index ea29418926a..07eabaa2eab 100644 --- a/web/www/horas/Italiano/Commune/C12.txt +++ b/web/www/horas/Italiano/Commune/C12.txt @@ -21,7 +21,7 @@ $Oremus #Incipit _ $Ave Maria -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) V. Convertici, +++ o Dio, nostro salvatore. R. E allontana da noi la tua ira. $Deus in adjutorium @@ -44,10 +44,9 @@ _ V. Prega per noi, o Santa Madre di Dio. R. Affinché siam fatti degni delle promesse di Cristo. -#Canticum Nunc dimittis +#Canticum: Nunc dimittis Ant. Sotto la tua protezione * cerchiamo rifugio, Santa Madre di Dio: non disprezzare le suppliche di noi che siamo nella prova, ma liberaci da ogni pericolo, o Vergine gloriosa e benedetta. -&canticum(3) -&Gloria +&psalm(233) Ant. Sotto la tua protezione * cerchiamo rifugio, Santa Madre di Dio: non disprezzare le suppliche di noi che siamo nella prova, ma liberaci da ogni pericolo, o Vergine gloriosa e benedetta. @:Pre oratio @@ -67,7 +66,7 @@ R. Amen. $Pater noster $Ave Maria $Credo -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) [Ant Matutinum] @Commune/C11::s/V\. .*/V. La grazia è cosparsa sulle tue labbra./g s/R\. .*/R. Perciò Iddio ti ha benedetta in eterno./g diff --git a/web/www/horas/Italiano/Psalterium/Translate.txt b/web/www/horas/Italiano/Psalterium/Translate.txt index 1549376a707..efcb8bf7572 100644 --- a/web/www/horas/Italiano/Psalterium/Translate.txt +++ b/web/www/horas/Italiano/Psalterium/Translate.txt @@ -34,7 +34,7 @@ [#Canticum: Magnificat] #Cantico Magnificat -[#Canticum Nunc dimittis] +[#Canticum: Nunc dimittis] #Cantico Nunc dimittis [#Preces Dominicales] diff --git a/web/www/horas/Italiano/Tempora/Pasc0-0.txt b/web/www/horas/Italiano/Tempora/Pasc0-0.txt index a9ccf5b4d18..022764f9f27 100644 --- a/web/www/horas/Italiano/Tempora/Pasc0-0.txt +++ b/web/www/horas/Italiano/Tempora/Pasc0-0.txt @@ -94,12 +94,9 @@ Ant. Allelúja, Allelúja, Allelúja. Ant. Allelúja, Allelúja, Allelúja. _ Ant. La notte del sabato, * all'alba del primo giorno della settimana, andò Maria Maddalena e l'altra Maria a visitare il sepolcro, alleluia. -&canticum(2) -&Gloria -{::} +&psalm(232) Ant. La notte del sabato, * all'alba del primo giorno della settimana, andò Maria Maddalena e l'altra Maria a visitare il sepolcro, alleluia. - &Dominus_vobiscum v. Preghiamo. v. Infondi in noi, o Signore, lo spirito della tua carità: e come ci hai nutriti coi sacramenti pasquali, così rendici colla tua bontà concordi. diff --git a/web/www/horas/Latin/Commune/C12.txt b/web/www/horas/Latin/Commune/C12.txt index 99239e20d97..8756b22a4ab 100644 --- a/web/www/horas/Latin/Commune/C12.txt +++ b/web/www/horas/Latin/Commune/C12.txt @@ -52,7 +52,7 @@ $Oremus #Incipit _ $Ave Maria -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) V. Convérte nos +++ Deus, salutáris noster. R. Et avérte iram tuam a nobis. $Deus in adjutorium @@ -75,10 +75,9 @@ _ V. Ora pro nobis sancta Dei Génetrix. R. Ut digni efficiámur promissiónibus Christi. -#Canticum Nunc dimittis +#Canticum: Nunc dimittis Ant. Sub tuum præsídium * confúgimus, sancta Dei Génetrix: nostras deprecatiónes ne despícias in necessitátibus, sed a perículis cunctis libera nos semper, Virgo gloriósa et benedícta. -&canticum(3) -&Gloria +&psalm(233) Ant. Sub tuum præsídium * confúgimus, sancta Dei Génetrix: nostras deprecatiónes ne despícias in necessitátibus, sed a perículis cunctis libera nos semper, Virgo gloriósa et benedícta. @:Pre oratio @@ -98,7 +97,7 @@ R. Amen. $Pater noster $Ave Maria $Credo -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) [Invit] @Commune/C10 diff --git a/web/www/horas/Latin/Commune/C12A.txt b/web/www/horas/Latin/Commune/C12A.txt index b430ddc7786..314ad232b90 100644 --- a/web/www/horas/Latin/Commune/C12A.txt +++ b/web/www/horas/Latin/Commune/C12A.txt @@ -44,7 +44,7 @@ $Qui tecum _ @Psalterium/Mariaant:Advent:s/.*V./V./s s/v. .*//s -#Canticum Nunc dimittis +#Canticum: Nunc dimittis @Tempora/Adv1-0:Ant 2:s/^/Ant. / &psalm(233) @Tempora/Adv1-0:Ant 2:s/^/Ant. / diff --git a/web/www/horas/Latin/Commune/C12N.txt b/web/www/horas/Latin/Commune/C12N.txt index 913412f59c6..2a80d5ebe15 100644 --- a/web/www/horas/Latin/Commune/C12N.txt +++ b/web/www/horas/Latin/Commune/C12N.txt @@ -23,7 +23,7 @@ Officium parvum Beatae Mariae Virginis Tempora Nativitatis;;Simplex;;1 (sed rubrica 1955 aut rubrica 1960 omittitur) [Special Completorium] -@Commune/C12::s/(#Canticum Nunc dimittis.).*/$1/s +@Commune/C12::s/(#Canticum: Nunc dimittis.).*/$1/s @Sancti/01-01:Ant 3:s/^/Ant. / &psalm(233) @Sancti/01-01:Ant 3:s/^/Ant. / diff --git a/web/www/horas/Latin/Commune/C12P.txt b/web/www/horas/Latin/Commune/C12P.txt index 8ef6a99fb00..cceb0caa37a 100644 --- a/web/www/horas/Latin/Commune/C12P.txt +++ b/web/www/horas/Latin/Commune/C12P.txt @@ -20,55 +20,7 @@ Feria Te Deum @Commune/C10p:Ant 1 [Special Completorium] -#Incipit -_ -$Ave Maria -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) -V. Convérte nos +++ Deus, salutáris noster. -R. Et avérte iram tuam a nobis. -$Deus in adjutorium -&Alleluia - -#Psalmi -&psalm(128) - -&psalm(129) - -&psalm(130) - -@:Hymnus minor - -#Capitulum -!Sir 24:24 -v. Ego mater pulchræ dilectiónis, et timóris, et agnitiónis, et sanctæ spei. -$Deo gratias -_ -V. Ora pro nobis sancta Dei Génetrix. -R. Ut digni efficiámur promissiónibus Christi. - -#Canticum Nunc dimittis -Ant. Regína cæli, * lætáre, allelúja; quia quem meruísti portáre, allelúja; resurréxit, sicut dixit, allelúja: ora pro nobis Deum, allelúja. -&canticum(3) -Ant. Regína cæli, * lætáre, allelúja; quia quem meruísti portáre, allelúja; resurréxit, sicut dixit, allelúja: ora pro nobis Deum, allelúja. - -@:Pre oratio -v. Beátæ et gloriósæ semper Vírginis Maríæ, quǽsumus, Dómine, intercéssio gloriósa nos prótegat, et ad vitam perdúcat ætérnam. -$Per Dominum - -#Conclusio -&Dominus_vobiscum -&Benedicamus_Domino -Benedictio. Benedícat et custódiat nos omnípotens et miséricors Dóminus, + Pater, et Fílius, et Spíritus Sanctus. -R. Amen. - -&antiphona_finalis -V. Divínum auxílium + máneat semper nobíscum. -R. Amen. - -$Pater noster -$Ave Maria -$Credo -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +@Commune/C12::s/Ant. .*/Ant. Regína cæli, * lætáre, allelúja; quia quem meruísti portáre, allelúja; resurréxit, sicut dixit, allelúja: ora pro nobis Deum, allelúja./gm [Ant 2] @:Ant 1 diff --git a/web/www/horas/Latin/Tempora/Pasc0-0.txt b/web/www/horas/Latin/Tempora/Pasc0-0.txt index 777aceb1c93..6efbf730de3 100644 --- a/web/www/horas/Latin/Tempora/Pasc0-0.txt +++ b/web/www/horas/Latin/Tempora/Pasc0-0.txt @@ -93,9 +93,7 @@ Ant. Allelúja, Allelúja, Allelúja. Ant. Allelúja, Allelúja, Allelúja. _ Ant. Véspere autem sábbati quæ lucéscit in prima sábbati, venit María Magdaléne et áltera María vidére sepúlcrum, allelúja. -&canticum(2) -&Gloria -{::} +&psalm(232) Ant. Véspere autem sábbati quæ lucéscit in prima sábbati, venit María Magdaléne et áltera María vidére sepúlcrum, allelúja. &Dominus_vobiscum diff --git a/web/www/horas/Magyar/Commune/C12.txt b/web/www/horas/Magyar/Commune/C12.txt index f6b44dd59a0..d2b89a9d9f0 100644 --- a/web/www/horas/Magyar/Commune/C12.txt +++ b/web/www/horas/Magyar/Commune/C12.txt @@ -25,7 +25,7 @@ $Oremus #Incipit _ $Ave Maria -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) V. Téríts meg minket, +++ Isten, te vagy az üdvösségünk. R. És fordítsd el haragodat rólunk. $Deus in adjutorium @@ -48,10 +48,9 @@ _ V. Imádkozzál érettünk Istennek szent anyja R. Hogy métók lehessünk a Krisztus igéreteire -#Canticum Nunc dimittis +#Canticum: Nunc dimittis Ant. Oltalmad alá futunk * Istennek szent Szülője, könyörgésünket meg ne vesd szükségünk idején. Hanem oltalmazz meg minket minden veszedelemtől, ó dicsőséges és áldott Szűz. -&canticum(3) -&Gloria +&psalm(233) Ant. Oltalmad alá futunk, * Istennek szent Szülője, könyörgésünket meg ne vesd szükségünk idején. Hanem oltalmazz meg minket minden veszedelemtől, ó dicsőséges és áldott Szűz. @:Pre oratio @@ -69,7 +68,7 @@ R. Amen. $Pater noster $Ave Maria $Credo -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) [Ant Matutinum] @Commune/C11::s/V\. .*/V. Kegyelem van az ajkaidon./g s/R\. .*/R. Isten ezért megáldott mindörökre./g diff --git a/web/www/horas/Magyar/Psalterium/Translate.txt b/web/www/horas/Magyar/Psalterium/Translate.txt index f1ee1007850..73b7a4c0806 100644 --- a/web/www/horas/Magyar/Psalterium/Translate.txt +++ b/web/www/horas/Magyar/Psalterium/Translate.txt @@ -22,13 +22,13 @@ [#Canticum] #Kantikum -[#Canticum Benedictus] +[#Canticum: Benedictus] #Benedictus kantikum -[#Canticum Magnificat] +[#Canticum: Magnificat] #Magnificat kantikum -[#Canticum Nunc dimittis] +[#Canticum: Nunc dimittis] #Nunc dimittis kantikum [#Preces Dominicales] diff --git a/web/www/horas/Magyar/Tempora/Pasc0-0.txt b/web/www/horas/Magyar/Tempora/Pasc0-0.txt index 5e634f21334..e84d5aa5565 100644 --- a/web/www/horas/Magyar/Tempora/Pasc0-0.txt +++ b/web/www/horas/Magyar/Tempora/Pasc0-0.txt @@ -66,9 +66,7 @@ Ant. Alleluja, alleluja, alleluja. Ant. Alleluja, alleluja, alleluja. _ Ant. Szombat elmúltával, a hét első napjának hajnalán a magdalai Mária és a másik Mária elment, hogy megnézze a sírt, alleluja. -&canticum(2) -&Gloria -{::} +&psalm(232) Ant. Szombat elmúltával, a hét első napjának hajnalán a magdalai Mária és a másik Mária elment, hogy megnézze a sírt, alleluja. &Dominus_vobiscum diff --git a/web/www/horas/Ordinarium/Completorium.txt b/web/www/horas/Ordinarium/Completorium.txt index e401abdfdaf..06145c90356 100644 --- a/web/www/horas/Ordinarium/Completorium.txt +++ b/web/www/horas/Ordinarium/Completorium.txt @@ -28,7 +28,7 @@ $Deus in adjutorium (rubrica Ordo Praedicatorum dicitur) #Hymnus -#Nunc Dimittis +#Canticum: Nunc dimittis (sed rubrica Monastica omittitur) #Preces Dominicales diff --git a/web/www/horas/Ordinarium/Laudes.txt b/web/www/horas/Ordinarium/Laudes.txt index 50a663e2ae2..7dbd95364ef 100644 --- a/web/www/horas/Ordinarium/Laudes.txt +++ b/web/www/horas/Ordinarium/Laudes.txt @@ -19,9 +19,6 @@ $Deus in adjutorium #Capitulum Responsorium Hymnus Versus #Canticum: Benedictus -&ant_Benedictus(1) -&canticum(1) -&ant_Benedictus(2) #Preces Feriales (sed rubrica Monastica aut rubrica 1962 omittitur) diff --git a/web/www/horas/Ordinarium/Vespera.txt b/web/www/horas/Ordinarium/Vespera.txt index 4a2bea38d0f..f0071caac9b 100644 --- a/web/www/horas/Ordinarium/Vespera.txt +++ b/web/www/horas/Ordinarium/Vespera.txt @@ -14,9 +14,6 @@ $Deus in adjutorium #Capitulum Responsorium Hymnus Versus #Canticum: Magnificat -&ant_Magnificat(1) -&canticum(2) -&ant_Magnificat(2) #Preces Feriales (sed rubrica Monastica aut rubrica 1962 omittitur) diff --git a/web/www/horas/Polski/Commune/C12.txt b/web/www/horas/Polski/Commune/C12.txt index 8f22127e2f4..86eb85041d7 100644 --- a/web/www/horas/Polski/Commune/C12.txt +++ b/web/www/horas/Polski/Commune/C12.txt @@ -32,7 +32,7 @@ $Oremus #Incipit _ $Ave Maria -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) V. Nawróć nas +++ Boże, nasz zbawco. R. I odwróć swój gniew od nas. $Deus in adjutorium @@ -55,10 +55,9 @@ _ V. Módl się za nami święta Boża Rodzicielko. R. Abyśmy się stali godnymi obietnic Chrystusowych -#Canticum Nunc dimittis +#Canticum: Nunc dimittis Ant. Pod Twoją obronę * uciekamy się, święta Boża Rodzicielko: naszymi prośbami racz nie gardzić w potrzebach naszych, ale od wszelakich złych przygód racz nas zawsze wybawiać, Panno chwalebna i błogosławiona. -&canticum(3) -&Gloria +&psalm(233) Ant. Pod Twoją obronę * uciekamy się, święta Boża Rodzicielko: naszymi prośbami racz nie gardzić w potrzebach naszych, ale od wszelakich złych przygód racz nas zawsze wybawiać, Panno chwalebna i błogosławiona. @:Pre oratio @@ -78,7 +77,7 @@ R. Amen. $Pater noster $Ave Maria $Credo -(sed rubrica 1955 aut rubrica 1960 aut rubrica monastica omittitur) +(sed rubrica 1955 aut rubrica 196 omittitur) [Ant Matutinum] @Commune/C11::s/V\. .*/V. Rozlała się wdzięczność po wargach twoich./g s/R\. .*/R. Dlatego cię błogosławił Bóg na wieki./g diff --git a/web/www/horas/Polski/Psalterium/Translate.txt b/web/www/horas/Polski/Psalterium/Translate.txt index 9876055d638..9e1c04fc450 100644 --- a/web/www/horas/Polski/Psalterium/Translate.txt +++ b/web/www/horas/Polski/Psalterium/Translate.txt @@ -37,15 +37,6 @@ [#Canticum: Magnificat] #Kantyk: Magnificat -[#Canticum Nunc dimittis] -#Kantyk Nunc dimittis - -[#Canticum Benedictus] -#Kantyk Benedictus - -[#Canticum Magnificat] -#Kantyk Magnificat - [#Preces Dominicales] #Prośby niedzielne diff --git a/web/www/horas/Polski/Tempora/Pasc0-0.txt b/web/www/horas/Polski/Tempora/Pasc0-0.txt index ad1f90909b1..30671ead120 100644 --- a/web/www/horas/Polski/Tempora/Pasc0-0.txt +++ b/web/www/horas/Polski/Tempora/Pasc0-0.txt @@ -85,9 +85,7 @@ Ant. Alleluja, Alleluja, Alleluja. Ant. Alleluja, Alleluja, Alleluja. _ Ant. A w wieczór sobotni, który zaświta na dzień pierwszy szabbatu, przyszła Marya Magdalena i druga Marya oglądać grób, alleluja. -&canticum(2) -&Gloria -{::} +&psalm(232) Ant. A w wieczór sobotni, który zaświta na dzień pierwszy szabbatu, przyszła Marya Magdalena i druga Marya oglądać grób, alleluja. &Dominus_vobiscum diff --git a/web/www/horas/Portugues/Psalterium/Translate.txt b/web/www/horas/Portugues/Psalterium/Translate.txt index bb867019925..cd0245d4d62 100644 --- a/web/www/horas/Portugues/Psalterium/Translate.txt +++ b/web/www/horas/Portugues/Psalterium/Translate.txt @@ -28,7 +28,7 @@ [#Canticum] #Cãntico -[#Canticum Nunc dimittis] +[#Canticum: Nunc dimittis] #Cãntico de Simeão [#Preces Dominicales]