summaryrefslogtreecommitdiff
path: root/scripts/genlect.go
diff options
context:
space:
mode:
authorLukasz Kasprzak <lukas@labunix.xyz>2026-07-27 16:17:18 +0200
committerLukasz Kasprzak <lukas@labunix.xyz>2026-07-27 16:17:18 +0200
commita1e041dfbe55194c7fea0636d38cff33ee28315d (patch)
tree1138c5cbf5ca008dc3da11e93634c1017c63eeef /scripts/genlect.go
parentde102e446a715883c74e6295ff223e37e397f5ed (diff)
downloadlectio-a1e041dfbe55194c7fea0636d38cff33ee28315d.tar.gz
lectio-a1e041dfbe55194c7fea0636d38cff33ee28315d.zip
feat(ef): complete offline EF readings — proper ferias, deuterocanon, Latin fallback
Finish the Extraordinary Form (1962) offline Mass readings so every day of the year resolves in both English and Polish. Temporal engine (temporal_ef.go): - Unique ferial slugs "ef-<season>-<week>-<weekday>" so penitential-season weekdays (Lent, Advent, Passiontide, Easter octave) can key their own proper Masses; green-season ferias have no entry and fall back to the preceding Sunday (the 1962 rule). - Special "ef-lent-after-ashes-<weekday>" case for the days between Ash Wednesday and Lent I, which have their own propers. Lectionary (tridentine-lectionary.ini, 55 -> 143 entries) via genlect.go: - Generator now fetches proper-season weekdays and stores a feria only when its Mass differs from the preceding Sunday's. - cleanCite() normalises two missalemeum data glitches: a stray comma between book and chapter ("4 Kings, 5:1" -> "4 Kings 5:1") and a period-as-separator ("John 20. 19-31" -> "John 20:19-31"), both guarded so legitimate multi-chapter citations are untouched. Citations & corpora: - books.ini: Douay abbreviations in the [en] dialect (Ex, Ezech, Jonas, and 3/4 Kings -> canonical 1/2 Kings), so the EF Lenten epistles resolve while the display keeps modern sigla. - drb.tsv: +205 rows backfilling the deuterocanonical Daniel 13-14 (Susanna, Bel) and Esther 11-16 (Greek additions) from get.bible douayrheims, which the base corpus omitted; scripts/gen-deutero.py documents the fetch. Rendering (liturgy.go): - readingLine() falls back to the Latin Vulgate (complete) when the vernacular corpus lacks a passage, with a clear note. Covers the Polish Wujek deuterocanon gap (no clean public-domain source exists) and any future vernacular gap; faithful to the EF as a Latin rite. Result: 730/730 days resolve for both EN (native) and PL (native + Latin fallback for 3 deuterocanon days). Version 0.32.0 -> 0.33.0.
Diffstat (limited to 'scripts/genlect.go')
-rw-r--r--scripts/genlect.go58
1 files changed, 48 insertions, 10 deletions
diff --git a/scripts/genlect.go b/scripts/genlect.go
index eec21b6..85ff1c2 100644
--- a/scripts/genlect.go
+++ b/scripts/genlect.go
@@ -3,7 +3,9 @@
// genlect generates the EF temporal Sunday lectionary from missalemeum
// (Divinum Officium data), keyed by lectio's computed temporal-day slug.
// One-time; requires network. Run from the repo root:
-// go run scripts/genlect.go
+//
+// go run scripts/genlect.go
+//
// Writes internal/caldata/tridentine-lectionary.ini.
package main
@@ -23,6 +25,26 @@ import (
var citeRe = regexp.MustCompile(`\*([^*]+)\*`)
+// bookCommaRe strips a stray comma between the book name and the first
+// chapter ("4 Kings, 5:1-15" -> "4 Kings 5:1-15"), a missalemeum data glitch.
+// The [^:] guard means it only fires before any chapter:verse, so legitimate
+// multi-chapter commas ("Gen 1:1, 2:3") are left intact.
+var bookCommaRe = regexp.MustCompile(`^([^:]*?),\s+(\d+:)`)
+
+// chapDotRe rewrites a European-style "chapter. verse" separator to a colon
+// ("John 20. 19-31" -> "John 20:19-31"), another missalemeum data glitch. It is
+// applied only when the citation carries no colon at all, so disjoint verse
+// groups in a normal citation ("Ps 62:2. 3-4") are never touched.
+var chapDotRe = regexp.MustCompile(`(\d+)\.\s+(\d)`)
+
+func cleanCite(s string) string {
+ s = bookCommaRe.ReplaceAllString(strings.TrimSpace(s), "$1 $2")
+ if !strings.Contains(s, ":") {
+ s = chapDotRe.ReplaceAllString(s, "$1:$2")
+ }
+ return s
+}
+
func fetchCitations(date string) (epistle, gospel string) {
resp, err := http.Get("https://www.missalemeum.com/en/api/v5/proper/" + date)
if err != nil {
@@ -48,9 +70,9 @@ func fetchCitations(date string) (epistle, gospel string) {
}
switch s.ID {
case "Lectio":
- epistle = strings.TrimSpace(m[1])
+ epistle = cleanCite(m[1])
case "Evangelium":
- gospel = strings.TrimSpace(m[1])
+ gospel = cleanCite(m[1])
}
}
return
@@ -64,24 +86,40 @@ func main() {
start := time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC)
end := time.Date(2028, 12, 31, 0, 0, 0, 0, time.UTC)
+ seen := map[string]bool{}
+ // Seasons whose weekdays may have PROPER Masses (else a ferial repeats the
+ // preceding Sunday and is resolved by the CLI fallback, so we skip it).
+ properFerial := map[calendar.Season]bool{
+ calendar.Advent: true, calendar.Lent: true,
+ calendar.Passiontide: true, calendar.Easter_: true,
+ }
for d := start; !d.After(end); d = d.AddDate(0, 0, 1) {
- if d.Weekday() != time.Sunday {
- continue
- }
day := calendar.Compute(d, sel, layers)
- if day.Observed.Layer != "temporal" { // a feast won that Sunday -> its own propers
+ if day.Observed.Layer != "temporal" { // a feast won -> its own propers
continue
}
slug := day.Observed.Slug
- if _, ok := lect[slug]; ok {
- continue // one instance per slug
+ isSunday := d.Weekday() == time.Sunday
+ if !isSunday && !properFerial[day.Season] {
+ continue // green-season feria -> repeats the Sunday
+ }
+ if seen[slug] {
+ continue
}
ep, gos := fetchCitations(d.Format("2006-01-02"))
if ep == "" && gos == "" {
continue
}
+ seen[slug] = true
+ if !isSunday {
+ // store only if the reading differs from the preceding Sunday's Mass
+ sun := d.AddDate(0, 0, -int(d.Weekday()))
+ if r, ok := lect[calendar.Compute(sun, sel, layers).Observed.Slug]; ok && r[0] == ep && r[1] == gos {
+ continue // a repeat -> the CLI fallback handles it
+ }
+ }
lect[slug] = [2]string{ep, gos}
- fmt.Fprintf(os.Stderr, "%s %-34s ep=%-22s go=%s\n", d.Format("2006-01-02"), slug, ep, gos)
+ fmt.Fprintf(os.Stderr, "%s %-38s ep=%-22s go=%s\n", d.Format("2006-01-02"), slug, ep, gos)
}
slugs := make([]string, 0, len(lect))