diff --git a/canticumMap.json b/canticumMap.json index 6cea8e95..242c5e71 100644 --- a/canticumMap.json +++ b/canticumMap.json @@ -51,5 +51,10 @@ "ref": "Is 35: 1-7", "text": "Lætábitur desérta et ínvia: * et exsultábit solitúdo, et florébit quasi lílium.\nGlória Líbani data est ei, * decor Carméli, et Saron.\nIpsi vidébunt glóriam Dómini, * et decórem Dei nostri.\nConfortáte manus dissolútas, * et génua debília roboráte.\nTunc aperiéntur óculi cæcórum, * et aures surdórum patébunt.\nTunc sáliet sicut cervus claudus, * et apérta erit lingua mutórum.\nQuia scissæ sunt in desérto aquæ, et torréntes in solitúdine.\nEt quæ erat árida, erit in stagnum, * et sítiens in fontes aquárum.", "map": [0, 1, 3, 3, 4, 5, 6] + }, + "Canticum Danielis": { + "ref": "Dan 3: 57, 60-65, 83-87", + "text": "Benedícite, ómnia ópera Dómini Dómino: * laudáte et superexaltáte eum in sǽcula.\nBenedícite, aquæ omnes, quæ super cælos sunt, Dómino: * benedícite, omnes virtútes Dómini Dómino.\nBenedícite, sol et luna, Dómino: * benedícite, stellæ cæli, Dómino.\nBenedícite, omnis imber et ros, Dómino: * benedícite, omnes spíritus Dei, Dómino.\nBenedícat Israël Dóminum: * laudet et superexáltet eum in sǽcula.\nBenedícite, sacerdótes Dómini Dómino: * benedícite, servi Dómini, Dómino.\nBenedícite, spíritus et ánimæ justórum, Dómino: * benedícite, sancti et húmiles corde, Dómino.\nBenedicámus Patrem et Fílium cum Sancto Spíritu: * laudémus et superexaltémus eum in sǽcula.", + "map": [0, 0, 0, 1, 1, 2, 2, 3, 3, 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 4, 5, 5, 6, 7] } } diff --git a/propers.js b/propers.js index bd02015b..d25e5c97 100644 --- a/propers.js +++ b/propers.js @@ -3383,7 +3383,7 @@ $(function(){ state.startOfVerse = '('+lastNote+'+) '; state.endOfVerse = '(::) Ant.() ('+firstNote+'+Z)'; state.activeGabc = getPsalmToneForPart(versePart, tone); - if(!selPropers || selPropers.gloriaPatri !== false) { + if(!selPropers || (selPropers.gloriaPatri !== false && (!showingDefault || selPropers[part.slice(0,2)+'VersesGloriaPatri'] !== false))) { state.activeGabc += state.startOfVerse + 'V/ ' + psalmToneIntroitGloriaPatri(tone.mediant,tone.termination,amenTones,tone.clef) + state.endOfVerse.slice(4); } state.responsoryCallbacks = []; diff --git a/propersdata.js b/propersdata.js index 1182e7da..07752a3f 100644 --- a/propersdata.js +++ b/propersdata.js @@ -5327,7 +5327,8 @@ var proprium = { "gbid": "st_gabriel", "inVerses": "Ps 102: 21-22", "ofVerses": "Ps 137: 1, 2", - "coVerses": "Dan 3: 57, 60-65, 83-87" + "coVerses": "Dan 3: 57, 60-65, 83-87", + "coVersesGloriaPatri": false }, "Mar25": { "coID": 1144, @@ -5882,7 +5883,8 @@ var proprium = { "ofID": 1270, "gbid": "guardian_angels", "inVerses": "Ps 102: 21-22", - "coVerses": "Dan 3: 57, 60-65, 83-87" + "coVerses": "Dan 3: 57, 60-65, 83-87", + "coVersesGloriaPatri": false }, "Oct20": { "coID": 1003, @@ -5911,7 +5913,8 @@ var proprium = { "gbid": "st_raphael", "inVerses": "Ps 102: 21-22", "ofVerses": "Ps 137: 1, 2", - "coVerses": "Dan 3: 57, 60-65, 83-87" + "coVerses": "Dan 3: 57, 60-65, 83-87", + "coVersesGloriaPatri": false }, "Oct27": { "inID": 261, @@ -6046,7 +6049,8 @@ var proprium = { "gbid": "st_michael", "inVerses": "Ps 102: 21-22", "ofVerses": "Ps 137: 1, 2", - "coVerses": "Dan 3: 57, 60-65, 83-87" + "coVerses": "Dan 3: 57, 60-65, 83-87", + "coVersesGloriaPatri": false }, "Sep3": { "coID": 90, diff --git a/verseRef.js b/verseRef.js index 2dc4fbdc..b7cbc551 100644 --- a/verseRef.js +++ b/verseRef.js @@ -108,7 +108,7 @@ Ref.prototype.getLinesFromLiber = function() { return []; })); } - if (text) return produceResult(text); + if (text) return $.when(produceResult(text)); return $.get(urlRoot+"psalms/"+psalm).pipe(produceResult); } function refArrayString(array) {