@finbheara/domain 0.4.0 → 0.6.2

package/dist/chunks/{place-0ehc2q69.js → place-kk48pfja.js}

@@ -4,6 +4,9 @@ import {
   candidateRelation,
   isDanceTypePrint2
 } from "./place-htxgptyv.js";
+import {
+  validity
+} from "./place-q9kwsmzd.js";
 
 function node(id, name, irish, family, formation, opts = {}) {
   const kind = "round" in formation ? "round" : ("long" in formation) ? "long" : "set";
@@ -169,6 +172,7 @@ function reading(print, folded, candidates, score, match, refusal, misses) {
     score,
     match,
     refusal,
+    ...validity(refusal === "empty", refusal === "empty" ? null : refusal),
     misses: Object.freeze([...misses]),
     ceili: candidates.length === 1 ? candidates[0] : undefined,
     isCeili: () => candidates.length > 0,

package/dist/chunks/place-q9kwsmzd.js

@@ -0,0 +1,11 @@
+function validity(empty, refusal) {
+  const reason = empty ? "empty" : refusal;
+  return {
+    isEmpty: () => empty,
+    isRefused: () => !empty && refusal !== null,
+    isValid: () => reason === null,
+    invalidReason: () => reason
+  };
+}
+
+export { validity };

package/dist/chunks/{place-2ja9yx08.js → place-yndzaae5.js}

@@ -6,13 +6,16 @@ import {
   rhythmOfTime2,
   isDanceTypePrint2
 } from "./place-htxgptyv.js";
+import {
+  validity
+} from "./place-q9kwsmzd.js";
 
 var SET_MIN_SPEED2 = Object.freeze({
   jig: 66,
   hornpipe: 76
 });
 var PLAUSIBLE_SET_TEMPO_MAX2 = 150;
-function node(id, name, irish, time, opts = {}) {
+function node(id, name, irish, time, [stepBars, setBars], opts = {}) {
   return Object.freeze({
     id,
     name,
@@ -21,124 +24,126 @@ function node(id, name, irish, time, opts = {}) {
     irishPrints: Object.freeze(opts.irishPrints ?? []),
     time,
     traditionalSpeed: opts.traditionalSpeed ?? null,
-    maxSpeed: null
+    maxSpeed: null,
+    stepBars,
+    setBars
   });
 }
 var TUNE_NODES2 = Object.freeze([
-  node("blackbird", "The Blackbird", "An Lon Dubh", "2/4", {
+  node("blackbird", "The Blackbird", "An Lon Dubh", "2/4", [15, 30], {
     prints: ["Blackbird", "Blackbird (Traditional)"],
     irishPrints: ["An Londubh"],
     traditionalSpeed: 144
   }),
-  node("lodge-road", "The Lodge Road", "Bóthar an Lóiste", "2/4", {
+  node("lodge-road", "The Lodge Road", "Bóthar an Lóiste", "2/4", [8, 20], {
     irishPrints: ["Bóthar An Lóiste"]
   }),
-  node("downfall-of-paris", "Downfall of Paris", "Titim Phárais", "2/4", {
+  node("downfall-of-paris", "Downfall of Paris", "Titim Phárais", "2/4", [8, 16], {
     prints: ["The Downfall of Paris"],
     irishPrints: ["Titim Paris", "Titim Páras"]
   }),
-  node("planxty-davis", "Planxty Davis", "Plancstaí Dáibhéis", "2/4", {
+  node("planxty-davis", "Planxty Davis", "Plancstaí Dáibhéis", "2/4", [16, 16], {
     irishPrints: ["Plancstaí Daibhéis"]
   }),
-  node("king-of-the-fairies", "King of the Fairies", "Rí na Síog", "2/4", {
+  node("king-of-the-fairies", "King of the Fairies", "Rí na Síog", "2/4", [8, 16], {
     traditionalSpeed: 130
   }),
-  node("rodneys-glory", "Rodney's Glory", "Glóir Rodney", "2/4", {
+  node("rodneys-glory", "Rodney's Glory", "Glóir Rodney", "2/4", [8, 12], {
     irishPrints: ["Glór Rodnaí"]
   }),
-  node("ace-and-deuce-of-pipering", "Ace and Deuce of Pipering", "Aon agus dó na Píobaireachta", "4/4", {
+  node("ace-and-deuce-of-pipering", "Ace and Deuce of Pipering", "Aon agus dó na Píobaireachta", "4/4", [12, 12], {
     prints: ["Ace & Deuce of Pipering"],
     irishPrints: ["Aon agus Dó na Píobaireachta"]
   }),
-  node("kilkenny-races", "Kilkenny Races", "Rásaí Chill Choinnigh", "4/4", {
+  node("kilkenny-races", "Kilkenny Races", "Rásaí Chill Choinnigh", "4/4", [8, 24], {
     prints: ["Killkenny Races"]
   }),
-  node("blue-eyed-rascal", "The Blue-Eyed Rascal", "Cladhaire na Súile Gorma", "4/4", {
+  node("blue-eyed-rascal", "The Blue-Eyed Rascal", "Cladhaire na Súile Gorma", "4/4", [8, 12], {
     prints: ["Blue Eyed Rascal"]
   }),
-  node("madame-bonaparte", "Madame Bonaparte", "Madame Bonaparte", "4/4"),
-  node("bonapartes-retreat", "Bonaparte's Retreat", "Cúlú Bhonaparte", "4/4", {
+  node("madame-bonaparte", "Madame Bonaparte", "Madame Bonaparte", "4/4", [8, 12]),
+  node("bonapartes-retreat", "Bonaparte's Retreat", "Cúlú Bhonaparte", "4/4", [8, 20], {
     irishPrints: ["Cúlú Bonaparte"]
   }),
-  node("piper", "The Piper Through the Meadow Astraying", "An Píobaire sa Mhóinéar ar Strae/Fáin", "4/4", {
+  node("piper", "The Piper Through the Meadow Astraying", "An Píobaire sa Mhóinéar ar Strae/Fáin", "4/4", [8, 12], {
     prints: ["The Piper", "The Piper thro' the Meadow Straying"],
     irishPrints: ["An Píobaire"]
   }),
-  node("four-masters", "The Four Masters", "Na Ceithre Máistrí", "4/4"),
-  node("rambling-rake", "Rambling Rake", "An Réice Fáin", "4/4", {
+  node("four-masters", "The Four Masters", "Na Ceithre Máistrí", "4/4", [8, 12]),
+  node("rambling-rake", "Rambling Rake", "An Réice Fáin", "4/4", [8, 16], {
     prints: ["The Rambling Rake"]
   }),
-  node("garden-of-daisies", "Garden of Daisies", "Gáirdíní na Nóinín", "4/4", {
+  node("garden-of-daisies", "Garden of Daisies", "Gáirdíní na Nóinín", "4/4", [8, 16], {
     irishPrints: ["Gairdín na Nóiníní", "Gáirdíní na Nóiníní"],
     traditionalSpeed: 138
   }),
-  node("roving-pedlar", "The Roving Pedlar", "An Mangaire Fáin", "4/4"),
-  node("hunt", "The Hunt", "An Fiach", "4/4"),
-  node("white-blanket", "White Blanket", "An Súisín Bán", "4/4", {
+  node("roving-pedlar", "The Roving Pedlar", "An Mangaire Fáin", "4/4", [8, 14]),
+  node("hunt", "The Hunt", "An Fiach", "4/4", [8, 12]),
+  node("white-blanket", "White Blanket", "An Súisín Bán", "4/4", [6, 12], {
     prints: ["The White Blanket"]
   }),
-  node("job-of-journeywork", "Job of Journeywork", "An Greas Giúrnála", "4/4", {
+  node("job-of-journeywork", "Job of Journeywork", "An Greas Giúrnála", "4/4", [8, 14], {
     irishPrints: ["Greas Giúrnála"],
     traditionalSpeed: 138
   }),
-  node("youghal-harbour", "Youghal Harbour", "Cuan Eochaille", "4/4"),
-  node("blackthorn-stick", "Blackthorn Stick", "An Maide Droighneáin", "6/8", {
+  node("youghal-harbour", "Youghal Harbour", "Cuan Eochaille", "4/4", [6, 14]),
+  node("blackthorn-stick", "Blackthorn Stick", "An Maide Droighneáin", "6/8", [15, 15], {
     prints: ["The Blackthorn Stick"],
     irishPrints: ["An Maide Droighnéan"]
   }),
-  node("planxty-drury", "Planxty Drury", "Plancstaí Drúirí", "6/8", {
+  node("planxty-drury", "Planxty Drury", "Plancstaí Drúirí", "6/8", [12, 16], {
     prints: ["Planxy Drury"]
   }),
-  node("charlady", "The Charlady", "An Bhean Ghlantacháin", "6/8", {
+  node("charlady", "The Charlady", "An Bhean Ghlantacháin", "6/8", [8, 24], {
     irishPrints: ["Bean an Ghlantacháin"]
   }),
-  node("planxty-hugh-odonnell", "Planxty Hugh O'Donnell", "Plancstaí Aodh Uí Dhomhnaill", "6/8", {
+  node("planxty-hugh-odonnell", "Planxty Hugh O'Donnell", "Plancstaí Aodh Uí Dhomhnaill", "6/8", [16, 16], {
     irishPrints: ["Plancstaí Aodh Ó Domhnaill"]
   }),
-  node("drunken-gauger", "Drunken Gauger", "An Gaueger Meisceach", "6/8", {
+  node("drunken-gauger", "Drunken Gauger", "An Gaueger Meisceach", "6/8", [15, 15], {
     prints: ["The Drunken Gauger", "The Funny Tailor"]
   }),
-  node("rub-the-bag", "Rub the Bag", "Cuimil an Mála", "6/8"),
-  node("fiddler-around-the-fairy-green", "The Fiddler Around the Fairy Green", "An Bheidhleadóir ag an Crann Sí", "6/8", { prints: ["The Fiddler 'Round the Fairy Tree", "The Fiddler Around the Fairy Tree"] }),
-  node("st-patricks-day", "St. Patrick's Day", "Lá Fhéile Phádraig", "6/8", {
+  node("rub-the-bag", "Rub the Bag", "Cuimil an Mála", "6/8", [8, 14]),
+  node("fiddler-around-the-fairy-green", "The Fiddler Around the Fairy Green", "An Bheidhleadóir ag an Crann Sí", "6/8", [8, 12], { prints: ["The Fiddler 'Round the Fairy Tree", "The Fiddler Around the Fairy Tree"] }),
+  node("st-patricks-day", "St. Patrick's Day", "Lá Fhéile Phádraig", "6/8", [8, 14], {
     irishPrints: ["Lá Fhéile Pádraig", "Lá Féile Phádraig"],
     traditionalSpeed: 94
   }),
-  node("humours-of-bandon", "Humours of Bandon", "Pléarácha na Banndon", "6/8", {
+  node("humours-of-bandon", "Humours of Bandon", "Pléarácha na Banndon", "6/8", [8, 16], {
     prints: ["Humour's of Bandon"],
     irishPrints: ["Pléaracha na Bandan"]
   }),
-  node("story-teller", "The Story-Teller", "An Scéalaí", "6/8", {
+  node("story-teller", "The Story-Teller", "An Scéalaí", "6/8", [8, 16], {
     prints: ["The Storyteller"]
   }),
-  node("hurling-boys", "The Hurling Boys", "Na Buachaillí Báire", "6/8", {
+  node("hurling-boys", "The Hurling Boys", "Na Buachaillí Báire", "6/8", [8, 14], {
     prints: ["The Hurling Boy"]
   }),
-  node("sprig-of-shillelagh", "The Sprig of Shillelagh", "An Ghéag Sail Éille", "6/8", {
+  node("sprig-of-shillelagh", "The Sprig of Shillelagh", "An Ghéag Sail Éille", "6/8", [6, 10], {
     prints: ["The Spring of Shillelagh"],
     irishPrints: ["An Geag Síléaladh"]
   }),
-  node("hurry-the-jug", "Hurry the Jug", "Cuir Thart an Crúsca", "6/8"),
-  node("three-sea-captains", "The Three Sea Captains", "An Triúr Chaptaen Mara", "6/8", {
+  node("hurry-the-jug", "Hurry the Jug", "Cuir Thart an Crúsca", "6/8", [8, 16]),
+  node("three-sea-captains", "The Three Sea Captains", "An Triúr Chaptaen Mara", "6/8", [8, 20], {
     prints: ["Three Sea Captains"],
     irishPrints: ["Na Trí Captéin Maraí", "Triúr Captaen Mara"],
     traditionalSpeed: 96
   }),
-  node("jockey-to-the-fair", "Jockey to the Fair", "An Marcach Chuig an Aonach", "6/8", {
+  node("jockey-to-the-fair", "Jockey to the Fair", "An Marcach Chuig an Aonach", "6/8", [8, 14], {
     traditionalSpeed: 90
   }),
-  node("vanishing-lake", "Vanishing Lake", "An Loch Mhadhma", "6/8", {
+  node("vanishing-lake", "Vanishing Lake", "An Loch Mhadhma", "6/8", [14, 18], {
     prints: ["The Vanishing Lake"],
     irishPrints: ["Luch An Mhadhma"]
   }),
-  node("miss-browns-fancy", "Miss Brown's Fancy", "Rogha Iníon De Brún", "6/8"),
-  node("wandering-musician", "The Wandering Musician", "An Ceoltóir Fáin", "6/8", {
+  node("miss-browns-fancy", "Miss Brown's Fancy", "Rogha Iníon De Brún", "6/8", [8, 16]),
+  node("wandering-musician", "The Wandering Musician", "An Ceoltóir Fáin", "6/8", [8, 16], {
     prints: ["Wandering Musicianr"]
   }),
-  node("orange-rogue", "Orange Rogue", "An Rógaire Buí", "6/8", {
+  node("orange-rogue", "Orange Rogue", "An Rógaire Buí", "6/8", [8, 16], {
     prints: ["The Orange Rogue"]
   }),
-  node("is-the-big-man-within", "Is the Big Man Within?", "An bhfuil an Fear Mór Istigh?", "6/8+9/8", {
+  node("is-the-big-man-within", "Is the Big Man Within?", "An bhfuil an Fear Mór Istigh?", "6/8+9/8", [8, 8], {
     irishPrints: ["An ‘Bhfuil an Fear Mór Istigh?"]
   })
 ]);
@@ -164,7 +169,9 @@ function makeTune(n) {
       if (n.traditionalSpeed !== null)
         return n.traditionalSpeed;
       return setting === "traditional" ? null : range;
-    }
+    },
+    stepBars: () => n.stepBars,
+    setBars: () => n.setBars
   });
 }
 var TUNES = Object.freeze(TUNE_NODES2.map(makeTune));
@@ -231,6 +238,7 @@ function reading(print, folded, bpm, candidates, score, match, refusal, misses)
     score,
     match,
     refusal,
+    ...validity(refusal === "empty", refusal === "empty" ? null : refusal),
     misses: Object.freeze([...misses]),
     tune: candidates.length === 1 ? candidates[0] : undefined,
     isTune: () => candidates.length > 0,

package/dist/dance.js

@@ -1,10 +1,13 @@
 import"./chunks/place-htxgptyv.js";
 import {
   ceili2
-} from "./chunks/place-0ehc2q69.js";
+} from "./chunks/place-kk48pfja.js";
 import {
   tune2
-} from "./chunks/place-2ja9yx08.js";
+} from "./chunks/place-yndzaae5.js";
+import {
+  validity
+} from "./chunks/place-q9kwsmzd.js";
 
 function dance(print, round) {
   const setting = round === "traditional-set" ? "traditional" : undefined;
@@ -25,7 +28,11 @@ function dance(print, round) {
   }
   misses.push(...tunes.misses, ...ceilis.misses);
   const candidates = Object.freeze([...tunes.candidates, ...ceilis.candidates]);
+  const empty = tunes.isEmpty() && ceilis.isEmpty();
+  const refused = !empty && !tunes.isValid() && !ceilis.isValid();
+  const reason = !refused ? null : tunes.invalidReason() === "dance-type" || ceilis.invalidReason() === "dance-type" ? "dance-type" : "unmatched";
   return Object.freeze({
+    ...validity(empty, reason),
     print,
     tunes,
     ceilis,

package/dist/place.js

@@ -15,7 +15,7 @@ import {
   placesRelation2,
   probablySamePlace2,
   sameReading2
-} from "./chunks/place-qbp3xfb4.js";
+} from "./chunks/place-h7tvdfyp.js";
 export {
   DEFAULT_PLACE_CAPACITY2 as DEFAULT_PLACE_CAPACITY,
   DEFAULT_PLACE_READER2 as DEFAULT_PLACE_READER,

package/dist/promotion.js

@@ -46,7 +46,7 @@ function samePromotedRow(was, now) {
 }
 var STOOD_FOR = /^(?:'|(?![A-Za-z])\p{L})$/u;
 function questionMarksRead(was, now) {
-  const a = [...collapse(was)];
+  const a = [...collapse(mojibakeRead(was))];
   if (!a.includes("?"))
     return a.join("");
   const b = [...collapse(now)];
@@ -67,6 +67,19 @@ function questionMarksRead(was, now) {
   }
   return out.join("");
 }
+function mojibakeRead(print) {
+  let out = print;
+  const codes = [...out].map((c) => c.codePointAt(0) ?? 0);
+  if (codes.some((c) => c >= 128) && codes.every((c) => c <= 255)) {
+    const bytes = Uint8Array.from(codes);
+    try {
+      const decoded = new TextDecoder("utf-8", { fatal: true }).decode(bytes);
+      if (decoded !== out)
+        out = decoded;
+    } catch {}
+  }
+  return out.replace(/\uFFFD/gu, "?");
+}
 function samePromotedName(was, now) {
   const read = questionMarksRead(was, now);
   if (read === null)
@@ -86,20 +99,27 @@ function samePromotedName(was, now) {
   return glued !== "" && (glued === nameFold(`${given}${surname}`) || glued === nameFold(`${surname}${given}`));
 }
 function samePromotedHeir(was, now) {
-  if (was.name !== "" && was.name === now.name)
+  if (collapse(was.name) !== "" && collapse(was.name) === collapse(now.name))
     return true;
   const school = questionMarksRead(was.school, now.school);
   if (school === null || !samePromotedSchool(school, now.school))
     return false;
+  if (collapse(was.name) === "" && collapse(now.name) !== "")
+    return true;
   return samePromotedName(was.name, now.name);
 }
+function samePromotedPair(was, now) {
+  return samePromotedRow(was, now) || samePromotedHeir(was, now);
+}
 export {
   CHAR_SYNONYM_CLASSES,
   collapse,
   foldCharSynonyms,
+  mojibakeRead,
   questionMarksRead,
   samePromotedHeir,
   samePromotedName,
+  samePromotedPair,
   samePromotedRow,
   samePromotedSchool
 };

package/dist/school.js

@@ -1,11 +1,17 @@
 import {
+  NEVER_NAME,
+  printZones,
+  opensLocation,
   place2,
   isPlaceToken2,
   countryCodeOf2,
   areAllPlaceTokens2,
   placeRelation2,
   sameReading2
-} from "./chunks/place-qbp3xfb4.js";
+} from "./chunks/place-h7tvdfyp.js";
+import {
+  validity
+} from "./chunks/place-q9kwsmzd.js";
 
 import { normalizeApostrophes } from "@finbheara/names/lexicon";
 import { SURNAME_SEPARATOR, lexiconKey, titleCaseNamePart } from "@finbheara/names/normalize";
@@ -867,130 +873,6 @@ function truncatedInstitution(tail) {
   return found;
 }
 
-var QUALIFIER_DELIMITER = /[,;:()[\]/–—-]/;
-var NEVER_PLACE = new Map([
-  ["de", "name particle: `De <Surname>`, and Spanish `de <Place>`"],
-  ["ni", "Irish patronymic particle: `Ní <Surname>`"],
-  ["mo", "Irish possessive: `Mo <Word>`"],
-  ["na", "Irish article: `Rince na <Word>`"],
-  ["in", "Irish preposition: `<Word> In <Word>`; and `Inc` truncated to `In`"],
-  ["co", "Company: `<Surname> & Co.`. Bracketed `(US-CO)` is still Colorado"],
-  ["id", "Irish Dance: `<Surname> School of ID`"],
-  ["sd", "School of Dance: `<Surname> SD`"]
-]);
-var NEVER_NAME = new Map([
-  ["de", "name particle: `De <Surname>`; and Spanish `de <Place>`"],
-  ["ni", "Irish patronymic particle: `Ní <Surname>`"],
-  ["ui", "Irish patronymic particle: `Uí <Surname>`"],
-  ["mo", "Irish possessive: `Mo <Word>`"],
-  ["na", "Irish article: `Rince na <Word>`"],
-  ["an", "Irish article: `<Word> an Rince`"],
-  ["in", "Irish preposition: `<Word> In <Word>`; and `Inc` truncated to `In`"],
-  ["co", "Company: `<Surname> & Co`"],
-  ["id", "Irish Dance: `ID de <Place>` keys the place, as `Irish Dancing de <Place>` does"],
-  ["sd", "School of Dance: `<Surname> SD`"],
-  ["da", "`Dance` truncated: `<Name> Academy of Irish Da` keys the name"]
-]);
-var GENERIC_TLD = "com|net|org|edu|gov|mil|int|info|biz";
-var WEB_SPAN = new RegExp([
-  "[A-Za-z][A-Za-z0-9+.-]*://\\S+",
-  "(?:^|[\\s([])www\\.\\S+",
-  "[^\\s@]+@[^\\s@]+\\.[A-Za-z]{2,}",
-  `(?<![A-Za-z0-9.@-])(?:[A-Za-z0-9][A-Za-z0-9-]*\\.)*[A-Za-z0-9][A-Za-z0-9-]+\\.(?:${GENERIC_TLD})(?![A-Za-z0-9-])`
-].join("|"), "giu");
-function printZones(raw) {
-  const qualifier = new Set;
-  const bracketed = new Set;
-  const qualifierAny = new Set;
-  const runs = [...raw.matchAll(/[A-Za-z0-9]+/g)];
-  const web = [];
-  for (const m of raw.matchAll(WEB_SPAN))
-    web.push([m.index ?? 0, (m.index ?? 0) + m[0].length]);
-  const inside = new Set;
-  const outside = new Set;
-  const trailing = new Set;
-  for (let i = runs.length - 1;i > 0; i--) {
-    const here = runs[i];
-    const prev = runs[i - 1];
-    if (here === undefined || prev === undefined)
-      break;
-    const gap = raw.slice((prev.index ?? 0) + prev[0].length, here.index ?? 0);
-    if (!QUALIFIER_DELIMITER.test(gap))
-      break;
-    if (i - 1 === 0)
-      break;
-    trailing.add(i - 1);
-  }
-  let depth = 0;
-  let cursor = 0;
-  for (let i = 0;i < runs.length; i++) {
-    const run = runs[i];
-    const text = run?.[0];
-    if (run === undefined || text === undefined)
-      continue;
-    const at = run.index ?? cursor;
-    for (const ch of raw.slice(cursor, at)) {
-      if (ch === "(" || ch === "[")
-        depth++;
-      else if ((ch === ")" || ch === "]") && depth > 0)
-        depth--;
-    }
-    cursor = at + text.length;
-    const folded = text.toLowerCase().normalize("NFD").replace(/[̀-ͯ]/g, "");
-    (web.some(([s, e]) => at >= s && at < e) ? inside : outside).add(folded);
-    const before = raw.slice(0, at).trimEnd().slice(-1);
-    const after = raw.slice(cursor).trimStart().slice(0, 1);
-    const atQualifier = i === runs.length - 1 || before !== "" && QUALIFIER_DELIMITER.test(before) || after !== "" && QUALIFIER_DELIMITER.test(after) && trailing.has(i);
-    if (atQualifier)
-      qualifierAny.add(folded);
-    if (folded.length > 2)
-      continue;
-    if (atQualifier)
-      qualifier.add(folded);
-    if (depth > 0)
-      bracketed.add(folded);
-  }
-  const webOnly = new Set([...inside].filter((f) => !outside.has(f)));
-  return { qualifier, bracketed, qualifierAny, web, webOnly, tailCode: tailCode(raw, runs) };
-}
-var GOVERNS_THE_NEXT_WORD = new Set(["de", "mo"]);
-function tailCode(raw, runs) {
-  const last = runs[runs.length - 1];
-  const prev = runs[runs.length - 2];
-  if (last === undefined || prev === undefined)
-    return null;
-  const text = last[0];
-  if (text.length > 2 || text !== text.toUpperCase() || !/^[A-Z]+$/.test(text))
-    return null;
-  const at = last.index ?? 0;
-  const folded = text.toLowerCase();
-  const gap = raw.slice((prev.index ?? 0) + prev[0].length, at);
-  const marked = /[,;:/\\\u2013\u2014]/u.test(gap) || /\s-|-\s/u.test(gap);
-  const bare = GOVERNS_THE_NEXT_WORD.has(folded) && /^\s+$/u.test(gap) && /\p{Ll}/u.test(raw);
-  if (!marked && !bare)
-    return null;
-  const only = runs.filter((r) => r[0].toLowerCase() === folded).length === 1;
-  return { folded, at, only };
-}
-function opensLocation(folded, at, index) {
-  if (index === undefined ? at.webOnly.has(folded) : inWebSpan(at, index))
-    return false;
-  if (folded.length > 2)
-    return true;
-  if (NEVER_PLACE.has(folded))
-    return at.bracketed.has(folded) || isTailCode(folded, at, index);
-  return at.qualifier.has(folded);
-}
-function isTailCode(folded, at, index) {
-  const tail = at.tailCode;
-  if (tail === null || tail.folded !== folded)
-    return false;
-  return index === undefined ? tail.only : index === tail.at;
-}
-function inWebSpan(at, index) {
-  return at.web.some(([start, end]) => index >= start && index < end);
-}
-
 var SCHOOL_FLUFF_WORDS = new Set([
   "academy",
   "irish",
@@ -1162,8 +1044,13 @@ function createSchoolNameReader(options = {}) {
     }
     return s;
   }
+  const SPACING_ACUTE_AFTER_VOWEL = /((?<=\p{L})[AEIOUaeiou]|[AEIUaeiu])[´ˊ](?![sS]\b)/gu;
+  const SPACING_ACUTE = /[´ˊ]/gu;
+  function readSpacingAcute(print) {
+    return print.replace(SPACING_ACUTE_AFTER_VOWEL, "$1́").replace(SPACING_ACUTE, "'");
+  }
   function renderSn1(print) {
-    return normalizeApostrophes(repairMojibake(print).normalize("NFKC")).replace(/\p{Cf}+/gu, "").replace(/\p{Cc}+/gu, " ").replace(/\s+/gu, " ").trim();
+    return normalizeApostrophes(readSpacingAcute(repairMojibake(print)).normalize("NFKC")).replace(/\p{Cf}+/gu, "").replace(/\p{Cc}+/gu, " ").replace(/\s+/gu, " ").trim();
   }
   const COMPOUND_OPENERS = new Set([
     "hyphen",
@@ -1782,7 +1669,7 @@ function createSchoolNameReader(options = {}) {
       institution: b.institution,
       location: b.location,
       refusal: b.refusal,
-      isEmpty: () => b.empty,
+      ...validity(b.empty, b.refusal?.reason ?? null),
       isSchool: () => !b.empty && b.refusal === null,
       surnames: () => b.surnames,
       concerns: b.concerns
@@ -2032,8 +1919,8 @@ function isColumnCutOf(a, b) {
   if (!comparable(a) || !comparable(b))
     return false;
   const cutFrom = (cut, whole) => {
-    const c = foldPrint(cut.sn0);
-    const w = foldPrint(whole.sn0);
+    const c = foldPrint(cut.sn1);
+    const w = foldPrint(whole.sn1);
     if (c.length === 0 || c.length >= w.length || !w.startsWith(c))
       return false;
     if (w[c.length] === " ")

package/dist/tune.js

@@ -8,7 +8,7 @@ import {
   settingAt2,
   tune2,
   tuneRelation2
-} from "./chunks/place-2ja9yx08.js";
+} from "./chunks/place-yndzaae5.js";
 import"./chunks/place-htxgptyv.js";
 export {
   PLAUSIBLE_SET_TEMPO_MAX2 as PLAUSIBLE_SET_TEMPO_MAX,

package/dist/types/age-title.d.ts

@@ -0,0 +1,12 @@
+export declare const TITLE_RANGE_MIN = 3;
+export declare const TITLE_RANGE_MAX = 40;
+export interface AgeTitleSpan {
+    readonly start: number;
+    readonly end: number;
+    readonly text: string;
+}
+export interface AgeTitleToken {
+    readonly token: string;
+    readonly span: AgeTitleSpan | null;
+}
+export declare function ageTitleToken(title: string): AgeTitleToken;

package/dist/types/age-types.d.ts

@@ -9,8 +9,10 @@ export interface BirthYears {
 export interface AgeLadder {
     readonly caps: readonly number[];
     readonly overs: readonly number[];
-    readonly ranges: readonly number[];
+    readonly ranges: readonly AgeSpan[];
+    readonly adult?: boolean;
 }
+export type AgeSpan = readonly [number, number];
 export interface YOBContext {
     readonly year?: number | null;
 }
@@ -21,9 +23,9 @@ export interface AgeContext {
 }
 export type AgeArm = "band" | "yob" | "open" | "empty";
 export type AgeKind = "under" | "over" | "range" | "adult" | "senior" | "yob";
-export type AgeRefusal = "not-a-band" | "backwards-range" | "senior-without-ladder" | "below-youngest-band" | "year-out-of-range";
+export type AgeRefusal = "not-a-band" | "backwards-range" | "overlapping-ranges" | "senior-without-ladder" | "below-youngest-band" | "year-out-of-range";
 export type AgeSource = "sibling-narrowed" | "printed-band" | "printed-range" | "printed-yob" | "open";
-export type AgeClause = "under-floored-on-rung" | "youngest-absorbs" | "over-ceiling-from-next-over" | "over-ceiling-refused-gap" | "and-over-no-ceiling" | "range-overlapping" | "range-inclusive" | "range-floor-on-rung" | "range-floor-widened" | "range-adult-floor";
+export type AgeClause = "under-floored-on-rung" | "youngest-absorbs" | "over-ceiling-from-next-over" | "over-ceiling-refused-gap" | "and-over-no-ceiling" | "range-overlapping" | "range-as-under" | "range-top-meets-over" | "range-adult-floor";
 export type AgeRelation = "same" | "contains" | "overlaps" | "disjoint" | "silent";
 export type AgeRelationReason = "equal" | "a-contains-b" | "b-contains-a" | "partial" | "a-older" | "a-younger" | "a-not-a-band" | "b-not-a-band";
 export interface AgeComparison {

package/dist/types/age.d.ts

@@ -1,6 +1,8 @@
-import type { AgeArm, AgeClause, AgeComparison, AgeContext, AgeInterval, AgeKind, AgeLadder, AgeMisuse, AgeRefusal, AgeRelation, AgeRelationReason, AgeSource, BirthYears, YOBContext, YoungFloorVerdict } from "./age-types.ts";
-import type { Validated } from "./validated.ts";
-export type { AgeArm, AgeClause, AgeComparison, AgeContext, AgeInterval, AgeKind, AgeLadder, AgeMisuse, AgeRefusal, AgeRelation, AgeRelationReason, AgeSource, BirthYears, Validated, YOBContext, YoungFloorVerdict, };
+import { type AgeTitleSpan } from "./age-title.ts";
+import type { AgeArm, AgeClause, AgeComparison, AgeContext, AgeInterval, AgeKind, AgeLadder, AgeMisuse, AgeRefusal, AgeRelation, AgeRelationReason, AgeSource, AgeSpan, BirthYears, YOBContext, YoungFloorVerdict } from "./age-types.ts";
+import { type EmptyReason, type Validated } from "./validated.ts";
+export { type AgeTitleSpan, type AgeTitleToken, TITLE_RANGE_MAX, TITLE_RANGE_MIN, ageTitleToken, } from "./age-title.ts";
+export type { AgeArm, AgeClause, AgeComparison, AgeContext, AgeInterval, AgeKind, AgeLadder, AgeMisuse, AgeRefusal, AgeRelation, AgeRelationReason, AgeSource, AgeSpan, BirthYears, EmptyReason, Validated, YOBContext, YoungFloorVerdict, };
 export declare const YOUNGEST_FLOOR = 0;
 export declare const ADULT_FLOOR = 18;
 export declare const MAJORS_FLOOR_YEARS = 3;
@@ -17,7 +19,7 @@ export declare const MIN_MAJOR_AGE = 4;
 export declare const MIN_FEIS_AGE = 3;
 export declare const YOUNGEST_BAND_TOP = 3;
 export declare const YOB_RANGE: Readonly<{
-    readonly first: 1900;
+    readonly first: 1901;
     readonly last: 2099;
 }>;
 export declare const DANCE_UP_YEARS = 1;
@@ -38,7 +40,6 @@ export interface Age extends Validated<AgeRefusal> {
     readonly clauses: readonly AgeClause[];
     readonly ladder: AgeLadder;
     readonly year: number | null;
-    isEmpty(): boolean;
     isAge(): boolean;
     isExact(): boolean;
     isAndOver(): boolean;
@@ -55,9 +56,16 @@ export declare class AgeMisuseError extends Error {
 }
 declare function fromPrint(print: string, context?: AgeContext): Age;
 declare function fromYOB(from: number | null, to?: number | null, context?: YOBContext): Age;
+export interface AgeInTitle {
+    readonly age: Age;
+    readonly token: string;
+    readonly span: AgeTitleSpan | null;
+}
+declare function fromTitle(title: string, context?: AgeContext): AgeInTitle;
 export declare const Age: Readonly<{
     from: typeof fromPrint;
     fromYOB: typeof fromYOB;
+    fromTitle: typeof fromTitle;
 }>;
 export declare function birthYearsOfInterval(iv: AgeInterval | null, year: number): BirthYears;
 export declare function ageRelation(a: Age, b: Age): AgeComparison;

package/dist/types/ceili.d.ts

@@ -1,4 +1,6 @@
 import { type DanceMatch, type DanceRelation } from "./dance-match.ts";
+import { type Validated } from "./validated.ts";
+export type { EmptyReason, Validated } from "./validated.ts";
 export type CeiliFamily = "eight-hand" | "four-hand" | "handbook";
 export type CeiliFormation = "set" | "long" | "round";
 export interface CeiliNode {
@@ -33,7 +35,7 @@ export interface CeiliContext {
     readonly hands?: number;
 }
 export type CeiliRefusal = "empty" | "dance-type" | "unmatched";
-export interface CeiliReading {
+export interface CeiliReading extends Validated<Exclude<CeiliRefusal, "empty">> {
     readonly [Symbol.toStringTag]: "CeiliReading";
     readonly print: string;
     readonly folded: string;

package/dist/types/dance.d.ts

@@ -1,7 +1,10 @@
 import { type Ceili, type CeiliReading } from "./ceili.ts";
 import { type Tune, type TuneReading } from "./tune.ts";
+import { type Validated } from "./validated.ts";
+export type { EmptyReason, Validated } from "./validated.ts";
 export type DanceRound = "set" | "traditional-set" | "ceili" | "eight-hand" | "four-hand";
-export interface DanceReading {
+export type DanceRefusal = "dance-type" | "unmatched";
+export interface DanceReading extends Validated<DanceRefusal> {
     readonly print: string;
     readonly tunes: TuneReading;
     readonly ceilis: CeiliReading;