Added seven dolors of Our Lady

Updated vulgate

canticumMap.json

@@ -1 +1 @@
-{"Benedictus":{"ref":"Luc 1: 68-79","map":[0,1,2,3,4,5,6,7,8,9,10,11]},"Magnificat":{"ref":"Luc 1: 46-55","map":[0,1,2,3,4,5,6,7,8,9]},"Nunc dimittis":{"ref":"Luc 2: 29-32","map":[0,1,2,3]},"Canticum Annae":{"ref":"1 Reg 2: 1-10","map":[0,2,3,5,6,8,9,10,13,14]},"Canticum David":{"ref":"1 Par 29: 10-13","map":[0,1,4,6]},"Canticum Ecclesiastici":{"ref":"Eccli 36: 1-16","map":[0,1,3,4,5,6,6,7,7,8,9,10,11,13,14,15]},"Canticum Ezechiae":{"ref":"Is 38: 10-20","map":[0,1,3,5,6,8,10,10,12,13,14]},"Canticum Habacuc":{"ref":"Ha 3: 2-19","map":[0,3,5,6,7,10,11,13,14,16,17,18,20,22,23,26,29,30]},"Canticum Isaiae":{"ref":"Is 45: 15-25","map":[0,1,2,3,5,7,9,11,12,14,15]},"Canticum Jeremiae":{"ref":"Jer 31: 10-14","map":[0,2,3,6,8]},"Canticum Judith":{"ref":"Judith 16: 15-21","map":[0,1,2,4,5,6,7]},"Canticum Moysis":{"ref":"Exod 15: 1-19","map":[0,1,3,3,4,5,5,6,8,10,11,12,12,14,15,16,18,19,20]},"Canticum Moysis (Deut)":{"ref":"Deut 32: 1-18","map":[0,1,2,3,4,5,7,9,11,12,14,16,17,19,21,23,24,26]},"Canticum Tobiae":{"ref":"Tob 13: 1-10","map":[0,1,2,3,5,6,7,8,9,10]}}
+{"Benedictus":{"ref":"Luc 1: 68-79","map":[0,1,2,3,4,5,6,7,8,9,10,11]},"Magnificat":{"ref":"Luc 1: 46-55","map":[0,1,2,3,4,5,6,7,8,9]},"Nunc dimittis":{"ref":"Luc 2: 29-32","map":[0,1,2,3]},"Canticum Annae":{"ref":"1 Reg 2: 1-10","map":[0,2,3,5,6,8,9,10,13,14]},"Canticum David":{"ref":"1 Par 29: 10-13","map":[0,1,4,6]},"Canticum Ecclesiastici":{"ref":"Eccli 36: 1-16","map":[0,1,3,4,5,6,6,7,7,8,9,10,11,13,14,15]},"Canticum Ezechiae":{"ref":"Is 38: 10-20","map":[0,1,3,5,6,8,10,10,12,13,14]},"Canticum Habacuc":{"ref":"Ha 3: 2-19","map":[0,3,5,6,7,10,11,13,14,16,17,18,20,22,23,26,29,30]},"Canticum Isaiae":{"ref":"Is 45: 15-25","map":[0,1,2,3,5,7,9,11,12,14,15]},"Canticum Isaiae (alterum)":{"ref":"Is 53: 1-5","map":[0,1,3,5,7]},"Canticum Jeremiae":{"ref":"Jer 31: 10-14","map":[0,2,3,6,8]},"Canticum Judith":{"ref":"Judith 16: 15-21","map":[0,1,2,4,5,6,7]},"Canticum Moysis":{"ref":"Exod 15: 1-19","map":[0,1,3,3,4,5,5,6,8,10,11,12,12,14,15,16,18,19,20]},"Canticum Moysis (Deut)":{"ref":"Deut 32: 1-18","map":[0,1,2,3,4,5,7,9,11,12,14,16,17,19,21,23,24,26]},"Canticum Tobiae":{"ref":"Tob 13: 1-10","map":[0,1,2,3,5,6,7,8,9,10]}}

process-vulgate.js

@@ -7,7 +7,7 @@ var fs = require("fs"),
     vulgateLine = 0;
 
 var normalize = word => 
-  word.replace(/^[áéóíú]/, match => (({"á":"a","é":"e","í":"i","ó":"o","ú":"u"})[match])).replace(/ë/,'e').
+  (word||'').replace(/^[áéóíú]/, match => (({"á":"a","é":"e","í":"i","ó":"o","ú":"u"})[match])).replace(/ë/,'e').
     replace(/^([eé])xs/,'$1x').replace(/^([aá])ss/,'$1s').replace(/p([uú])lcr/,'p$1lchr').replace(/^her([ée])dit/,'hær$1dit').
     replace(/^n([eé])pht([áa])li/,'n$1phth$2li').replace(/^d([íi])sr([iíuú])p/,'d$1r$2p');
 
@@ -34,6 +34,7 @@ var cantica = {
   "Canticum Ezechiae": "Is 38: 10-20",
   "Canticum Habacuc": "Ha 3: 2-19",
   "Canticum Isaiae": "Is 45: 15-25",
+  "Canticum Isaiae (alterum)": "Is 53: 1-5",
   "Canticum Jeremiae": "Jer 31: 10-14",
   "Canticum Judith": "Judith 16: 15-21",
   "Canticum Moysis": "Exod 15: 1-19",
@@ -115,7 +116,6 @@ for(var psalm=1; psalm <= 150 + Object.keys(cantica).length; ++psalm) {
     vulgatePsalms = vulgatePsalms.replace(new RegExp(`(\\n${verseRef.chapter}\t${verseRef.endVerse}\t[^\\n]*)[^@]*`),'$1');
     vulgatePsalms = vulgatePsalms.replace(regexNonWord,' ').toLowerCase().split('\n');
     console.info(psalmFileName);
-    debugger;
   } else {
     verseRef.chapter = psalm;
     verseRef.verse = 1;
@@ -136,13 +136,14 @@ for(var psalm=1; psalm <= 150 + Object.keys(cantica).length; ++psalm) {
         if(normalize(liber[li]) == normalize(vulgate[vi])) {
           li++;
           if(typeof matched != 'number') matched = liberI;
-        } else if((typeof matched=='number' || liberI > 0 || li > 0) && vulgate.length > vi + 1 && normalize(liber[li]) == normalize(vulgate[vi+1])) {
+        } else if((typeof matched=='number' || liberI > 0 || li > 0 || normalize(liber[li+1]) == normalize(vulgate[vi+2])) && vulgate.length > vi + 1 && normalize(liber[li]) == normalize(vulgate[vi+1])) {
           console.warn(`\n${psalmFileName} : ${verse}: missing word: ${vulgate[vi]}, \n${liber.join(' ')}\n${vulgate.join(' ')}`);
-        } else if((typeof matched=='number' || liberI > 0 || li > 0) && liber.length > li + 1 && normalize(liber[li+1]) == normalize(vulgate[vi])) {
+        } else if((typeof matched=='number' || liberI > 0 || li > 0 || normalize(liber[li+2]) == normalize(vulgate[vi+1])) && liber.length > li + 1 && normalize(liber[li+1]) == normalize(vulgate[vi])) {
           console.warn(`\n${psalmFileName} : ${verse}: missing word in vulgate: ${liber[li]}, \n${liber.join(' ')}\n${vulgate.join(' ')}`);
           ++li;
           continue;
-        } else if((typeof matched=='number' || liberI > 0 || li > 0) && vulgate.length > vi + 1 && liber.length > li + 1 && normalize(liber[li+1]) == normalize(vulgate[vi+1])) {
+        } else if((typeof matched=='number' || liberI > 0 || li > 0 || normalize(liber[li+2]) === normalize(vulgate[vi+2]) || normalize(liber[li+3]) === normalize(vulgate[vi+3])) &&
+            vulgate.length > vi + 1 && liber.length > li + 1 && normalize(liber[li+1]) == normalize(vulgate[vi+1])) {
           console.warn(`\n${psalmFileName} : ${verse}: different words: ${liber[li]} and ${vulgate[vi]}, \n${liber.join(' ')}\n${vulgate.join(' ')}`);
           li++;
         } else if(!liber[li] && normalize(vulgate[vi]) == 'allelúia') {

propers.js

@@ -713,9 +713,10 @@ $(function(){
     return $newGraduale;
   }
   var updateDay = function(gregorianBooksPage) {
+    var ref = proprium[selDay] && proprium[selDay].ref || selDay;
     var match = /^Pent(Epi\d)$/.exec(selDay);
     var lecDay = match? match[1] : selDay;
-    var readings = lectiones[lecDay];
+    var readings = lectiones[lecDay] || lectiones[ref];
     if(!readings && /s$/i.test(lecDay)) {
       readings = lectiones[lecDay.slice(0,-1)];
       if(readings.length <= 2) {
@@ -724,12 +725,15 @@ $(function(){
         readings = [readings[0]].concat(readings.slice(-2));
       }
     }
-    var ref = proprium[selDay] && proprium[selDay].ref || selDay;
     selPropers = proprium[selDay + selTempus] || proprium[ref + selTempus];
     if(!selPropers && proprium[ref]) {
       selPropers = proprium[ref];
       if(selTempus && (selDay != ref)) {
         selPropers = $.extend(true,{},selPropers);
+        if(ref != selDay) {
+          $.extend(true, selPropers, proprium[selDay]);
+          delete selPropers.ref;
+        }
         var regex;
         if(selTempus == 'Quad') {
           delete selPropers.alID;

propersdata.js

@@ -65,6 +65,7 @@ var sundayKeys = [
     {key:"Quad5w",title:"  Feria IV post Dominicam I Passionis",en:"  Wednesday in Passion Week"},
     {key:"Quad5h",title:"  Feria V post Dominicam I Passionis",en:"  Thursday in Passion Week"},
     {key:"Quad5f",title:"  Feria VI post Dominicam I Passionis",en:"  Friday in Passion Week"},
+    {key:"Quad5f_sd",title:"  Feria VI: Septem Dolorum beatæ Mariæ Virginis",en:"  Friday: The Sever Sorrows of the Blessed Virgin Mary"},
     {key:"Quad5s",title:"  Sabbato post Dominicam I Passionis",en:"  Saturday in Passion Week"},
     {key:"Quad6",title:"Dominica in Palmis",en:"Palm Sunday"},
     {key:"Quad6_v",title:"Dominica in Palmis (ante 1955)",en:"Palm Sunday (pre 1955)"},
@@ -3417,6 +3418,10 @@ var proprium = {
         "inVerses": "Ps 30: 3, 11",
         "coVerses": "Ps 26: 1, 2-3, 9-10, 13-14"
     },
+    "Quad5f_sd": {
+      "ref": "Sep15",
+      "trID": 1156
+    },
     "Quad5s": {
         "inID": 267,
         "grID": 819,
@@ -5625,7 +5630,8 @@ var proprium = {
         "inID": 149,
         "ofID": 787,
         "seqID": 681,
-        "gbid": "seven_dolours_bvm"
+        "gbid": "seven_dolours_bvm",
+        "coVerses": "Is 53: 1, 2-5"
     },
     "Sep17": {
         "coID": 1008,

psalms/Canticum Isaiae (alterum)

@@ -0,0 +1,9 @@
+Dómine, quis crédidit audítui nostro? * et bráchium Dómini cui revelátum est?
+Et ascéndet sicut virgúltum coram eo, * et sicut radix de terra sitiénti.
+Non est spécies ei, neque decor, * et vídimus eum, et non erat aspéctus, et desiderávimus eum:
+Despéctum, et novíssimum virórum, * virum dolórum, et sciéntem infirmitátem.
+Et quasi abscónditus vultus ejus, et despéctus, * unde nec reputávimus eum.
+Vere languóres nostros ipse tulit, * et dolóres nostros ipse portávit.
+Et nos putávimus eum quasi leprósum, * et percússum a Deo, et humiliátum.
+Ipse autem vulnerátus est propter iniquitátes nostras, * attrítus est propter scélera nostra.
+Disciplína pacis nostræ super eum, * et livóre ejus sanáti sumus.

vulgate/Psalmi

@@ -1167,7 +1167,7 @@
 73	7	Incendérunt igni sanctuárium tuum; in terra polluérunt tabernáculum nóminis tui.
 73	8	Dixérunt in corde suo cognátio eórum simul: Quiéscere faciámus omnes dies festos Dei a terra.
 73	9	Signa nostra non vídimus; jam non est prophéta; et nos non cognóscet ámplius.
-73	10	Usquequo, Deus, improperábit inimícus? írritat adversárius nomen tuum in finem?
+73	10	Usquequo, Deus, improperábit inimícus? irrítat adversárius nomen tuum in finem?
 73	11	Ut quid avértis manum tuam, et déxteram tuam de médio sinu tuo in finem?
 73	12	Deus autem rex noster ante sǽcula: operátus est salútem in médio terræ.
 73	13	Tu confirmásti in virtúte tua mare; contribulásti cápita dracónum in aquis.
@@ -1487,7 +1487,7 @@
 88	40	Evertísti testaméntum servi tui; profanásti in terra sanctuárium ejus.
 88	41	Destruxísti omnes sepes ejus; posuísti firmaméntum ejus formídinem.
 88	42	Diripuérunt eum omnes transeúntes viam; factus est oppróbrium vicínis suis.
-88	43	Exaltásti déxteram depriméntium eum; lætificísti omnes inimícos ejus.
+88	43	Exaltásti déxteram depriméntium eum; lætificásti omnes inimícos ejus.
 88	44	Avertísti adjutórium gládii ejus, et non es auxiliátus ei in bello.
 88	45	Destruxísti eum ab emundatióne, et sedem ejus in terram collisísti.
 88	46	Minorásti dies témporis ejus; perfudísti eum confusióne.

vulgate/Regum 3

@@ -596,7 +596,7 @@
 16	30	Et fecit Achab fílius Amri malum in conspéctu Dómini super omnes qui fuérunt ante eum.
 16	31	Nec suffécit ei ut ambuláret in peccátis Jeróboam fílii Nabat: ínsuper duxit uxórem Jézabel fíliam Ethbaal regis Sidoniórum. Et ábiit, et servívit Baal, et adorávit eum.
 16	32	Et pósuit aram Baal in templo Baal, quod ædificáverat in Samaría,
-16	33	et plantávit lucum: et áddidit Achab in ópere suo, írritans Dóminum Deum Israel super omnes reges Israel qui fuérunt ante eum.
+16	33	et plantávit lucum: et áddidit Achab in ópere suo, irrítans Dóminum Deum Israel super omnes reges Israel qui fuérunt ante eum.
 16	34	In diébus ejus ædificávit Hiel de Bethel Jéricho: in Abíram primitívo suo fundávit eam, et in Segub novíssimo suo pósuit portas ejus, juxta verbum Dómini quod locútus fúerat in manu Jósue fílii Nun.
 17	1	Et dixit Elías Thesbítes de habitatóribus Gálaad ad Achab: Vivit Dóminus Deus Israel, in cujus conspéctu sto, si erit annis his ros et plúvia, nisi juxta oris mei verba.
 17	2	Et factum est verbum Dómini ad eum, dicens: