Skip to content

Commit 14a041c

Browse files
committed
fix: Fix some issues with ij. in some alleluia GABCs
1 parent d29bb2c commit 14a041c

25 files changed

+29
-26
lines changed

download-gabc.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,11 @@ var path = 'gabc/',
335335
.replace(/\s{2,}/g,' ')
336336
.replace(/<i>\((.*?)\)<\/i>/g, '<i>$1</i>') // these parenthetical italicised notes are rubrics, found in 635 and 1236.gabc
337337
.replace(/\)\s*<i>(?:<v>[()]<\/v>|[^()])+\(\)$/,')') // get rid of things like <i>at Mass only.</i><v>)</v>() that come at the very end. This is only in 30.gabc and 308.gabc
338-
.replace(/\s\*(\([,;:]*\)\s)?[\s{}]*<i>\{?(ij\.|non\s+rep[eé]titur\.?)\}?<\/i>([\s{}]*)\(/gi,' {*}~<i>$2</i>$1(')
338+
.replace(/\bi[{}]?j[{}]?\.[{}]?(?=\W)/, (whole) => !(whole.includes('{') && whole.includes('}')) ? whole : whole.replace(/[{}]/g, ''));
339+
if (ids[i] == 863) console.info(content);
340+
content = content
341+
.replace(/(?:\s+(\([,;:]*\)\s)|\s)\s*\*(\([,;:]*\)\s)?[\s{}]*<i>\{?(ij\.|non\s+rep[eé]titur\.?)\}?<\/i>([\s{}]*)\(/gi, ' {*}~<i>$3</i>$2$1(')
342+
// .replace(/\s\*(\([,;:]*\)\s)?[\s{}]*<i>\{?(ij\.|non\s+rep[eé]titur\.?)\}?<\/i>([\s{}]*)\(/gi,' {*}~<i>$2</i>$1(')
339343
.replace(/<i>(i+j)\.?<\/i>\(:/g,'<i>$1.</i>() (:')
340344
.replace(/\(\s+(?:\)\s*\()?(Z)\)/g, '() (Z)')
341345
.replace(/(\s)(\([`,;:]*\))(\s*)(\{?\*+\}?(?:\s*<i>[^<]*<\/i>)?)(?:(\()|\s+)/g, '$1$4$2\n$5'); /// TODO: this should be removed and fixed in Exsurge (pushing * back to before the last bar)

gabc/10.gabc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ mode: 3;
44
book: Graduale Romanum, 1961, p. 54**;
55
transcriber: Andrew Hinkley;
66
%%
7-
(c4) AL(eef)le(dg)lú(g_i_g_/h!iwjjkki~)ia.(i.) (,) {*}~<i>ij.</i>(jv.i!jwkJ'IH'hg//jjvI'HkvJI'HjhjvIH'ig.) (,) (g.h!iwjg/!ge//g.h!iwjhhg.) (;) (hjI'Gg'g/hgg//f!gwhg/hgge.) (::)
7+
(c4) AL(eef)le(dg)lú(g_i_g_/h!iwjjkki~)ia.(i.) {*}~<i>ij.</i>(,) (jv.i!jwkJ'IH'hg//jjvI'HkvJI'HjhjvIH'ig.) (,) (g.h!iwjg/!ge//g.h!iwjhhg.) (;) (hjI'Gg'g/hgg//f!gwhg/hgge.) (::)
88
<sp>V/</sp>. Quid(edg) bo(hi)num(ijhhg//hji/j!kwlklvKJI.) (,) (kvJHG'kjji) e(jj//jji~)jus(hg) est,(g!hwihhg.) (:)
99
et(edg) quid(hi) pul(ikJH'Gi.,iiivHGh!jhi//jkl)chrum(klKJ'Hi) e(ik//jlkkvJ~I~)jus,(i.) (:)
1010
ni(gkkjjhi)si(i) fru(i)mén(hij~)tum(ii/jh) e(gf)lec(gh)tó(h)rum,(g!iwj!kvJHi.) (;) et(h) vi(hhhg/jggf)num(ghGF.) (,) gér(e)mi(dg)nans(g) *() vír(hjhhg/h!iwjjk)gi(i)nes.(i.) (;) (jv.i!jwkJ'IH'hg//jjvI'HkvJI'HjhjvIH'ig.) (,) (g.h!iwjg/!ge//g.h!iwjhhg.) (;) (hjI'Gg'g/hgg//f!gwhg/hgge.) (::)

gabc/1057.gabc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ book: Graduale Romanum, 1961, p. 402 & The Liber Usualis, 1961, p. 1318;
55
transcriber: Andrew Hinkley;
66
commentary: Cant 4: 7;
77
%%
8-
(c4) AL(d!ff/gf)le(e[ll:1]d)lú(ixfgh!ivHG'gf/gh~)ia.(h.) (,) {*}~<i>ij.</i>(def!gvFE'/!e[ll:1]d.0) (;) (de!fg!hv'1//jg/!gf/!gh/!h//def!gvFE'/!e[ll:1]d.0) (,) (hvGF'ghh//def!gvFE'/!e[ll:1]d.0) (::)
8+
(c4) AL(d!ff/gf)le(e[ll:1]d)lú(ixfgh!ivHG'gf/gh~)ia.(h.) {*}~<i>ij.</i>(,) (def!gvFE'/!e[ll:1]d.0) (;) (de!fg!hv'1//jg/!gf/!gh/!h//def!gvFE'/!e[ll:1]d.0) (,) (hvGF'ghh//def!gvFE'/!e[ll:1]d.0) (::)
99
<sp>V/</sp>. To(d!ew!fv_ED'Cde)ta(d.) pul(fgh)chra(ixhiGF'gwhg/hi) es,(h.) (:)
1010
Ma(ffvEDfg/hfgvFE)rí(d!ewfef)a:(e[ll:1]d..) (:)
1111
et(hg~) má(gj)cu(i)la(jkJH.1) (,) o(hg)ri(hjIG.egff'ffvD'C)gi(dfd)ná(egE'DfvDCde)lis(e./ghdfvED.) *(;) non(d!ff/gf) est(e[ll:1]d) in(ixfgh!ivHG'gf/gh~) te.(h.//def!gvFE'/!e[ll:1]d.0) (;) (de!fg!hv'1//jg/!gf/!gh/!h//def!gvFE'/!e[ll:1]d.0) (,) (hvGF'ghh//def!gvFE'/!e[ll:1]d.0) (::)

gabc/1114.gabc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ book: Graduale Romanum, 1961, p. 623 & The Liber Usualis, 1961, p. 1684;
55
transcriber: Andrew Hinkley;
66
commentary: Matth 1: 18;
77
%%
8-
(c4) AL(c)le(d)lú(ixe[ll:1]d/hi)ia.(h.) (,) {*}~<i>ij.</i>(ghG'Fhv.fgF'EgvF'ED.) (;) (ce!gvgef//deDC.) (,) (c!ff//eg'!hvF'EC'ewfd.1) (::)
8+
(c4) AL(c)le(d)lú(ixe[ll:1]d/hi)ia.(h.) {*}~<i>ij.</i>(,) (ghG'Fhv.fgF'EgvF'ED.) (;) (ce!gvgef//deDC.) (,) (c!ff//eg'!hvF'EC'ewfd.1) (::)
99
<sp>V/</sp>. Vir(dffeggvFE'fd~)go(d.) (,) De(de)i(cd) Gé(ixdh/jjh/iggf)ni(gh)trix,(hv.dh/jjh/iggf/ghh/def!hvGE'fd.) (;) quem(dc~) to(cd!fvvED'ef'g)tus(ghhg.) (,) non(f) ca(fhhghvGFgvFE'D)pit(cd) or(d!ewfef)bis,(e[ll:1]d..) (:)
1010
in(h) tu(h)a(g) se(h) clau(jk/!jkj/!hiH'Gjv//gjjvIH'G)sit(fg~) ví(gddcfghh//f!hghF'ED)sce(cd)ra(d.) *(,) fac(c)tus(d) ho(ixe[ll:1]d/hi)mo.(h.) (,) (ghG'Fhv.fgF'EgvF'ED.) (;) (ce!gvgef//deDC.) (,) (c!ff//eg'!hvF'EC'ewfd.1) (::)

gabc/120.gabc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ mode:8;
44
book:Graduale Romanum, 1961, p. 535 & The Liber Usualis, 1961, p. 1526;
55
transcriber:Andrew Hinkley;
66
%%
7-
(c4) AL(d)le(ggf)lú(hg~)ia.(gv.efd.1) (;) {*}~<i>ij.</i>(df!ghhgjvIHG.) (,) (giihkvJIH'GivHG'Fgh//fefd.) (,) (df!gh/!hgjvIH'hg.) (::)
7+
(c4) AL(d)le(ggf)lú(hg~)ia.(gv.efd.1) {*}~<i>ij.</i>(;) (df!ghhgjvIHG.) (,) (giihkvJIH'GivHG'Fgh//fefd.) (,) (df!gh/!hgjvIH'hg.) (::)
88
<sp>V/</sp>. Sanc(dg~)te(gh) Pau(gvFD'e)le(ev.dec.) (,) A(ghi)pós(ih)to(h/jkJH'GF'g)le,(g.) (;) præ(g)di(e)cá(fe)tor(d) ve(d)ri(ef)tá(g)tis,(g/iihkvJIH'hg.) (:)
99
et(gk) doc(k_[hl:1]g)tor(hf) gén(ghi~)ti(i.h!iw!jvI'HG)um,(g'/hfg.) (;) in(d)ter(ggf~)cé(hg)de(g.) * pro(f) no(de)bis.(ev.dec.) (;) (df!ghhgjvIHG.) (,) (giihkvJIH'GivHG'Fgh//fefd.) (,) (df!gh/!hgjvIH'hg.) (::)

gabc/16.gabc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ mode:1;
44
book:Graduale Romanum, 1961, p. 563 & The Liber Usualis, 1961, p. 1576;
55
transcriber:Andrew Hinkley;
66
%%
7-
(c4) AL(cd~)le(deD'C)lú(e_[ll:1]d/fgee[ll:1]d~)ia.(d.) (;) {*}~<i>ij.</i>(ixdhhg/hiHG'ge/gh//egFE'evD'Cd.) (,) (hf/ghhd/!dggvFD'Cde.) (,) (fhG'ED'efee[ll:1]d.0) (::)
7+
(c4) AL(cd~)le(deD'C)lú(e_[ll:1]d/fgee[ll:1]d~)ia.(d.) {*}~<i>ij.</i>(;) (ixdhhg/hiHG'ge/gh//egFE'evD'Cd.) (,) (hf/ghhd/!dggvFD'Cde.) (,) (fhG'ED'efee[ll:1]d.0) (::)
88
<sp>V/</sp>. Sol(de!fggvFD'ew!fvED'Cd)ve,(d.) (,) ju(hf)bén(ggf~)te(f) De(ghhd.0/[-0.5]gvvFD'Cde.,fhG'ED'ewfee[ll:1]d)o,(d.) (;) ter(c)rá(d)rum,(e) Pe(ef!gvFE'e)tre,(c) ca(d)té(cfE'Cee[ll:1]d/fg)nas:(e[ll:1]d..) (:)
99
qui(cde) fa(gggvFDee//ghG'ED'ew!fvED)cis(de..) (;) ut(egFE'e) pá(d)te(e)ant(eevD'Cde.) (,) cæ(cd)lés(d)ti(deD'C)a(c.) re(e_[ll:1]d/fgee[ll:1]d~)gna(d.) *(;)
1010
be(dh)á(ixhg/hiHG'ge/gh//egFE'evD'Cd.,hf/ghhd/!dggvFD'Cde.,fhG'ED'efee[ll:1]d)tis.(d.) (::)

gabc/216.gabc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ book: Graduale Romanum, 1961, p. 406 & The Liber Usualis, 1961, p. 1327;
55
transcriber: Andrew Hinkley;
66
commentary: Ps 32: 1;
77
%%
8-
(c4) AL(d!ff)le(ef)lú(ghG'Fggh)ia.(hjHG'gf.0) (;) {*}~<i>ij.</i>(ghg'hvGF'fd./ghG'F//g_f/gffe.) (::)
8+
(c4) AL(d!ff)le(ef)lú(ghG'Fggh)ia.(hjHG'gf.0) {*}~<i>ij.</i>(;) (ghg'hvGF'fd./ghG'F//g_f/gffe.) (::)
99
<sp>V/</sp>. Gau(fffg~)dé(ixdg/hg/hi)te(h) jus(hhgh)ti(e.) (,) in(f!gwhg~) Dó(hhg)mi(hgh)no:(fgf'gvd_e_d._) (:)
1010
rec(d!ffd/ffd d!ef!gh)tos(ghg.) (,) de(h_f/gffv//ce'!gv//hgg'g//ggge//fefvED//fgfg)cet(fe..) *(;)
1111
col(e!fwg'!hv)lau(gh~)dá(hvGF)ti(ghg)o.(hjHG'gf.0) (;) (ghg'hvGF'fd./ghG'F//g_f/gffe.) (::)

gabc/252.gabc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ mode: 1;
44
book: Graduale Romanum, 1961, p. 50**;
55
transcriber: Andrew Hinkley;
66
%%
7-
(c4) AL(c)le(d)lú(ixe[ll:1]d/hi)ia.(h.) (,) {*}~<i>ij.</i>(ghG'Fhv.fgF'EgvF'ED.) (;) (ce!gvgef//deDC.) (,) (c!ff//eg'!hvF'EC'ewfd.1) (::)
7+
(c4) AL(c)le(d)lú(ixe[ll:1]d/hi)ia.(h.) {*}~<i>ij.</i>(,) (ghG'Fhv.fgF'EgvF'ED.) (;) (ce!gvgef//deDC.) (,) (c!ff//eg'!hvF'EC'ewfd.1) (::)
88
<sp>V/</sp>. Le(dffeggvFE'fd)va(d.) in(de) cir(cd)cú(ixdh/jjh/iggf)i(gh)tu(hv.dh/jjh/iggf/ghh/def!hvGE'fd.) (;) ó(cd!fvvED'ef'g)cu(f)los(ghhg.) (,) tu(fhhghvGFgvFE'D)os,(e[ll:1]d) et(cd) vi(d!ewfef)de:(e[ll:1]d..) (:)
99
om(h)nes(g) is(h)ti(h) con(g)gre(h)gá(jk/jkjhiH'Gjv//gjjvIH'G)ti(fg) sunt,(gddcfghh//f!hghF'ED'Cd.) *(;) ve(e)né(c)runt(d) ti(ixe[ll:1]d/hi)bi.(h.) (,) (ghG'Fhv.fgF'EgvF'ED.) (;) (ce!gvgef//deDC.) (,) (c!ff//eg'!hvF'EC'ewfd.1) (::)

gabc/254.gabc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ book: Graduale Romanum, 1961, p. 111**;
55
transcriber: Andrew Hinkley;
66
commentary: Ps 18: 7;
77
%%
8-
(c3) AL(ef)le(e[ll:1]d/effe//hvvGE//fvED'C)lú(de~)ia.(e.) (,) {*}~<i>ij.</i>(iv.ef//ef/gf/ge.) (;) (eh/ijIH'FE.fd/!effe.) (,) (ii/jhi./!ee/fde.) (;) (fhg'hvFD.1fhg'/hffe.) () (::)
8+
(c3) AL(ef)le(e[ll:1]d/effe//hvvGE//fvED'C)lú(de~)ia.(e.) {*}~<i>ij.</i>(,) (iv.ef//ef/gf/ge.) (;) (eh/ijIH'FE.fd/!effe.) (,) (ii/jhi./!ee/fde.) (;) (fhg'hvFD.1fhg'/hffe.) () (::)
99
() <sp>V/</sp>. ~A(de) sum(efehvGFE.ijH'GFhi~)mo(i.) cæ(ighvFEfde)lo(e.) (;) e(d)grés(fh)si(hg)o(efED'f!hh/i_e//i!jw!kvJH'hf/hhi.) (,) (efED'fh//ghffefvED'Cde) e(ef/hfg)jus,(fe..) (:)
1010
nec(hi) est(i!jw!kvJH'hf/hhi.) (,) qui(i) se(ikJI'lvK'JH) abs(i_e)cón(fvED'Cde.,df!hhhg)dat(f_e/ijhi./efED.) (;) a(d) ca(fh)ló(hiH'GF'fe)re(e/fde) * e(efe___)jus.(e.) (,) (iv.ef//ef/gf/ge.) (;) (eh/ijIH'FE.fd/!effe.) (,) (ii/jhi./!ee/fde.) (;) (fhg'hvFD.1fhg'/hffe.) (::)

gabc/292.gabc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ book: Graduale Romanum, 1961, p. 5 & The Liber Usualis, 1961, p. 329 & Graduale
55
transcriber: Andrew Hinkley;
66
commentary: Ps 121: 1;
77
%%
8-
(c4) AL(dc~)le(f)lú(ixgfi)ia.(h.) *(,) <i>ij{.}</i>(ixiji'hig.fg/hjhhg.) (,) (fhgev.dec./ef!gvvFD'ewfd.1) (::)
8+
(c4) AL(dc~)le(f)lú(ixgfi)ia.(h.) {*}~<i>ij.</i>(,) (ixiji'hig.fg/hjhhg.) (,) (fhgev.dec./ef!gvvFD'ewfd.1) (::)
99
<sp>V/</sp>. Læ(d)tá(fddc/fg)tus(ixfhg/hi) sum(h.) (,) in(h) his(h) quæ(h) dic(hjH'GF.eg/hgh)ta(fg) sunt(ef~) mi(de!fvED'e)hi:(e[ll:1]d..) (:)
1010
in(cd~) do(df/efd.1cd/fdhvhggf/hjh___)mum(h.) (;) Dó(f_g_d_fv.efd.!fg!hvhg)mi(egff)ni(fe..) *(;)
1111
í(d!fff/ghf)bi(ixgi)mus.(h./iji'hig.fg/hjhhg.) (,) (fhgev.dec./ef!gvvFD'ewfd.1) (::)

0 commit comments

Comments
 (0)