@finbheara/domain 0.13.0 → 0.18.0

package/README.md

@@ -271,7 +271,7 @@ Age.fromTitle("Beginner Adults Reel U40").token;        // "adult u40": the adul
 Age.fromTitle("Solo Championship - Adult O40").token;   // "adult o40": adult, and 40 or over
 Age.fromTitle("Adult Championship 18 - 29").token;      // "adult 18-29": adult, and the range
 Age.fromTitle("Adult / Child Reel Under 10").token;     // "u10": no adult dances in it
-Age.fromTitle("Senior Adult Ladies 19 & Over").token;   // "adult o19": "Senior Adult" is adult
+Age.fromTitle("Senior Adult Ladies 19 & Over").token;   // "o19": TIDA's oldest youth championship
 Age.fromTitle("Senior Adult Men 17 & Over").token;     // "o17": it admits under-18s
 Age.fromTitle("Championship (Adult) (A40U)").token;    // "adult u40": a split adult code
 Age.fromTitle("Traditional Set (A40O)").token;         // "adult o40"
@@ -288,10 +288,10 @@ An adult word beside an and-over from 18 or a range from 18 reads both as well:
 `adult 18-29` are adult (`isAdult()`), and their `kind`, interval and birth years are the ones the
 band alone reads on the same ladder, a range floored at 18 where no rung sits below it. So
 `Age.from("adult o40", { year: 2026 })` is born 1985 or earlier, as `o40` is. An and-over under
-18 or a range opening under 18 (`Teen & Adult 13 & Over`) admits youth, and the band stands. A
-title naming the senior word beside it reads the same: `Senior Adult` is the adult band, so
-`Senior Adult Ladies 19 & Over` is `adult o19`. A closing split adult code keeps its split:
-`(A40U)` is `adult u40`, `(A40O)` and `(A40&O)` are `adult o40`.
+18 or a range opening under 18 (`Teen & Adult 13 & Over`) admits youth, and the band stands. TIDA's
+`Senior Adult` beside an and-over is its oldest youth championship, an open championship that
+qualifies for the Worlds, so `Senior Adult Ladies 19 & Over` is `o19`. A closing split
+adult code keeps its split: `(A40U)` is `adult u40`, `(A40O)` and `(A40&O)` are `adult o40`.
 
 `adultBeside(band)` is that reading as one function, the band beside the adult word as one token,
 or `undefined` where the band admits youth. A caller holding a band from another field asks it: a

package/dist/age.js

@@ -4,14 +4,16 @@ import {
 
 var LEAD_ID = /^\s*(?:comp(?:etition)?\.?\s*)?\d+[a-z]*(?:[/-]\d*[a-z]*)*\s*[-:.]?\s*/i;
 var PAREN = /\(([^)]*)\)/g;
-var AND_OVER = /(?<![a-z0-9])(\d{1,2})\s*(?:years?\s*)?(?:&|\+|\band\b)\s*(?:over|older|up|o)(?![a-z])/i;
-var OVER_WORD = /(?:\bover\s*|\bos\s+cionn\s*|(?<![a-z0-9])o\.?\s*)(\d{1,2})(?![a-z0-9])/i;
+var AND_OVER = /(?<![0-9])(?<![0-9][a-z]*)(?<!(?:^|[^a-z0-9])[a-z])(\d{1,2})\s*(?:years?\s*)?(?:&|\+|\band\b)\s*(?:over|older|up|o)(?![a-z])/i;
+var OVER_WORD = /(?:\bover\s*|\bos\s+cionn\s*|(?<![a-z0-9])o[./]?\s*)(\d{1,2})(?![a-z0-9])/i;
 var OVER_GLUED = /(?<![a-z0-9])(\d{1,2})\s*o(?![a-z'’])/i;
 var OVER_PLUS = /(?<![a-z0-9])(\d{1,2})\s*\+/;
-var UNDER = /(?:\bunder\s*|\bfaoi\s*|(?<![a-z0-9])u\.?\s*)(\d{1,2})(?![a-z0-9])/i;
+var UNDER = /(?:\bunder\s*(?:age\s*)?|\bfaoi\s*|(?<![a-z0-9])u\.?\s*)(\d{1,2})(?![0-9])(?![a-z][a-z0-9])/i;
 var AND_UNDER = /(?<![a-z0-9])(\d{1,2})\s*(?:years?\s*)?(?:&|\/|\band\b)\s*u(?:nder)?(?![a-z])(?!\s*\d)/i;
 var AND_UNDER_RANGE = /(?<![a-z0-9])(\d{1,2})\s*(?:&|\band\b)\s*under\s*(\d{1,2})(?![a-z0-9])/i;
 var AND_RANGE = /(?<![a-z0-9])(?<!\b(?:under|und|over|faoi|cionn|u|o)\.?\s*)(?<!\d\s*,\s*)(?<!\(\s*)(\d{1,2})\s*(?:&|\band\b)\s*(\d{1,2})(?![a-z0-9])(?!\s*-?\s*hand)(?!\s*(?:&|\+|\/|,|\)|\band\b|\bor\b))/i;
+var SLASH_RANGE = /(?<![a-z0-9/])(\d{1,2})\s*\/\s*(\d{1,2})(?=\s*(?:years?|yrs?|boys?|girls?|ladies|men)\b)/i;
+var AGE_N = /(?<!\b(?:under|over)\s*)\bage\s*(\d{1,2})(?![a-z0-9])(?!\s*-?\s*hand)/i;
 var YEARS = /(?<![a-z0-9])(?<!\d\s*(?:&|\/|\band\b|[-\u0096–—]|\bto\b)\s*)(\d{1,2})\s*(?:years?|yrs?)(?![a-z0-9])(?!\s*(?:&|\+|\/|\band\b|\bor\b|old))/i;
 var RANGE_DASH = String.raw`(?:\u00c2?[-\u0096–—]|\bto\b)`;
 var RANGE = new RegExp(String.raw`(?<![0-9])(?<![0-9][a-z]*)(?<!(?:^|[^a-z0-9])[a-z])(?:u\s*)?(\d{1,2})\s*${RANGE_DASH}\s*(\d{1,2})(?![a-z0-9])`, "i");
@@ -28,6 +30,8 @@ function at(title, offset, start, end, token) {
   return { token, span: { start: a, end: b, text: title.slice(a, b) } };
 }
 function inFence(a, b) {
+  if (a.startsWith("0") || b.startsWith("0"))
+    return false;
   const lo = Number(a);
   const hi = Number(b);
   return lo >= TITLE_RANGE_MIN && hi <= TITLE_RANGE_MAX && lo < hi;
@@ -44,6 +48,9 @@ function readAnchored(title, s, offset, aside = false) {
   const j = aside ? null : AND_RANGE.exec(s);
   if (j?.[1] !== undefined && j[2] !== undefined && inFence(j[1], j[2]))
     return at(title, offset, j.index, j.index + j[0].length, `${Number(j[1])}-${Number(j[2])}`);
+  const sl = aside ? null : SLASH_RANGE.exec(s);
+  if (sl?.[1] !== undefined && sl[2] !== undefined && inFence(sl[1], sl[2]) && Number(sl[2]) === Number(sl[1]) + 1)
+    return at(title, offset, sl.index, sl.index + sl[0].length, `${Number(sl[1])}-${Number(sl[2])}`);
   const l = LEAD_RANGE.exec(s);
   if (l?.[1] !== undefined && l[2] !== undefined && inFence(l[1], l[2])) {
     const lead = l[0].length - l[0].trimStart().length;
@@ -60,7 +67,7 @@ function readAnchored(title, s, offset, aside = false) {
   const m = UNDER.exec(s);
   if (m?.[1] !== undefined)
     return at(title, offset, m.index, m.index + m[0].length, `u${Number(m[1])}`);
-  const y = YEARS.exec(s);
+  const y = YEARS.exec(s) ?? AGE_N.exec(s);
   if (y?.[1] !== undefined)
     return at(title, offset, y.index, y.index + y[0].length, `u${Number(y[1]) + 1}`);
   const p = OVER_PLUS.exec(s);
@@ -111,6 +118,7 @@ function ageTitleToken(title) {
   return adultAside !== null && (words.token === "" || words.token === "adult") ? adultAside : adultOverUnder(title, s, lead, words);
 }
 var ADULT_UNDER_MIN = 18;
+var SENIOR_ADULT_OVER = /\bsenior\s+adult\b/i;
 function adultBeside(band) {
   const b = band.trim().toLowerCase();
   if (b === "")
@@ -132,6 +140,8 @@ function adultOverUnder(title, s, lead, t) {
   const a = ADULT.exec(s);
   if (a === null)
     return t;
+  if (/^o\d+$/.test(t.token) && SENIOR_ADULT_OVER.test(s))
+    return t;
   const token = adultBeside(t.token);
   if (token === undefined || token === t.token)
     return t;

package/dist/chunks/{place-17e26rga.js → place-2hdp50r3.js}

@@ -95,7 +95,7 @@ var PLACE_NODES = [
     name: "Cúige Chonnacht / Connacht",
     geo: "IRL",
     admin: "world",
-    prints: ["chonnacht", "connacht", "connaght", "connaught", "cuige chonnacht"],
+    prints: ["chonnacht", "connacht", "connaght", "connaught", "cuige chonnacht", "cuige connacht"],
     codes: ["CONNACHT"],
     oireachtas: "CONNACHT"
   },
@@ -381,7 +381,7 @@ var PLACE_NODES = [
     name: "Cúige Uladh / Ulster",
     geo: "IRL",
     admin: "world",
-    prints: ["cuige uladh", "cuige uldah", "uladh", "ulster"],
+    prints: ["cuige uladh", "cuige uldah", "cuige ulster", "uladh", "ulster"],
     codes: ["ULSTER"],
     oireachtas: "ULSTER"
   },
@@ -3575,6 +3575,276 @@ var PLACE_NODES = [
     prints: ["warwickshire"],
     codes: ["GB-WAR", "GBR-WAR"]
   },
+  {
+    id: "GBR-BDF",
+    kind: "subdivision",
+    name: "Bedfordshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["bedfordshire"],
+    codes: ["GB-BDF", "GBR-BDF"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-BKM",
+    kind: "subdivision",
+    name: "Buckinghamshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["buckinghamshire"],
+    codes: ["GB-BKM", "GBR-BKM"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-BRK",
+    kind: "subdivision",
+    name: "Berkshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["berkshire"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-CAM",
+    kind: "subdivision",
+    name: "Cambridgeshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["cambridgeshire"],
+    codes: ["GB-CAM", "GBR-CAM"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-DUR",
+    kind: "subdivision",
+    name: "County Durham",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["co durham", "county durham", "durham"],
+    codes: ["GB-DUR", "GBR-DUR"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-ERY",
+    kind: "subdivision",
+    name: "East Riding of Yorkshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["east riding", "east riding of yorkshire", "east riding yorkshire"],
+    codes: ["GB-ERY", "GBR-ERY"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-ESX",
+    kind: "subdivision",
+    name: "East Sussex",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["east sussex"],
+    codes: ["GB-ESX", "GBR-ESX"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-GTL",
+    kind: "subdivision",
+    name: "Greater London",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["greater london"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-GTM",
+    kind: "subdivision",
+    name: "Greater Manchester",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["greater manchester"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-HAM",
+    kind: "subdivision",
+    name: "Hampshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["hampshire"],
+    codes: ["GB-HAM", "GBR-HAM"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-IOW",
+    kind: "subdivision",
+    name: "Isle of Wight",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["isle of wight"],
+    codes: ["GB-IOW", "GBR-IOW"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-KEN",
+    kind: "subdivision",
+    name: "Kent",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["kent"],
+    codes: ["GB-KEN", "GBR-KEN"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-LIN",
+    kind: "subdivision",
+    name: "Lincolnshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["lincolnshire"],
+    codes: ["GB-LIN", "GBR-LIN"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-NBL",
+    kind: "subdivision",
+    name: "Northumberland",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["northumberland"],
+    codes: ["GB-NBL", "GBR-NBL"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-NTH",
+    kind: "subdivision",
+    name: "Northamptonshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["northamptonshire", "northants"],
+    codes: ["GB-NTH", "GBR-NTH"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-NTT",
+    kind: "subdivision",
+    name: "Nottinghamshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["nottinghamshire"],
+    codes: ["GB-NTT", "GBR-NTT"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-NYK",
+    kind: "subdivision",
+    name: "North Yorkshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["n yorkshire", "north yorkshire"],
+    codes: ["GB-NYK", "GBR-NYK"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-OXF",
+    kind: "subdivision",
+    name: "Oxfordshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["oxfordshire"],
+    codes: ["GB-OXF", "GBR-OXF"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-RUT",
+    kind: "subdivision",
+    name: "Rutland",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["rutland"],
+    codes: ["GB-RUT", "GBR-RUT"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-SOM",
+    kind: "subdivision",
+    name: "Somerset",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["somerset"],
+    codes: ["GB-SOM", "GBR-SOM"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-SYK",
+    kind: "subdivision",
+    name: "South Yorkshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["s yorkshire", "south yorks", "south yorkshire"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-TWR",
+    kind: "subdivision",
+    name: "Tyne and Wear",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["tyne and wear", "tyne wear"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-WIL",
+    kind: "subdivision",
+    name: "Wiltshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["wiltshire"],
+    codes: ["GB-WIL", "GBR-WIL"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-WMD",
+    kind: "subdivision",
+    name: "West Midlands",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["w midlands", "west midlands"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-WOR",
+    kind: "subdivision",
+    name: "Worcestershire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["worcestershire"],
+    codes: ["GB-WOR", "GBR-WOR"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-WSX",
+    kind: "subdivision",
+    name: "West Sussex",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["west sussex"],
+    codes: ["GB-WSX", "GBR-WSX"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-WYK",
+    kind: "subdivision",
+    name: "West Yorkshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["w yorkshire", "west yorkshire"],
+    codes: [],
+    listedCutsOnly: true
+  },
   {
     id: "GBR-NIR",
     kind: "subdivision",
@@ -6943,9 +7213,11 @@ function createPlaceReader2(options = {}) {
       ancestorsOf.set(n.id, out);
     }
     const phrases = [...byPrint.keys()].filter((k) => k.includes(" ")).sort((a, b) => b.length - a.length);
+    const printsSorted = [...byPrint.keys()].map((k, i) => [k, i]).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
     return {
       byId,
       byPrint,
+      printsSorted,
       byCode,
       byTruncation,
       byCountryCode,
@@ -7190,13 +7462,32 @@ function createPlaceReader2(options = {}) {
   function completions(folded) {
     if (folded.length < MIN_STEM)
       return [];
+    const i = idx();
+    const sorted = i.printsSorted;
+    let lo = 0;
+    let hi = sorted.length;
+    while (lo < hi) {
+      const mid = lo + hi >>> 1;
+      if (sorted[mid][0] < folded)
+        lo = mid + 1;
+      else
+        hi = mid;
+    }
+    const run = [];
+    for (let k = lo;k < sorted.length; k++) {
+      const at = sorted[k];
+      if (!at[0].startsWith(folded))
+        break;
+      run.push(at);
+    }
+    run.sort((a, b) => a[1] - b[1]);
     const out = [];
-    for (const [key, found] of idx().byPrint) {
-      if (key.length <= folded.length || !key.startsWith(folded))
+    for (const [key] of run) {
+      if (key.length <= folded.length)
         continue;
       if (key[folded.length] === " ")
         continue;
-      for (const n of found)
+      for (const n of i.byPrint.get(key))
         if (n.kind !== "body" && n.listedCutsOnly !== true)
           out.push({ node: n, length: key.length });
     }
@@ -7288,6 +7579,10 @@ function createPlaceReader2(options = {}) {
       return false;
     if (a.kind === b.kind)
       return true;
+    const sub = a.kind === "subdivision" ? a : b.kind === "subdivision" ? b : undefined;
+    const town = a.kind === "city" ? a : b.kind === "city" ? b : undefined;
+    if (sub !== undefined && town !== undefined && town.geo !== null && town.geo === sub.geo)
+      return true;
     const ca = countryOf(a);
     const cb = countryOf(b);
     return ca === undefined || cb === undefined || ca.id !== cb.id;
@@ -7322,7 +7617,9 @@ function createPlaceReader2(options = {}) {
             break;
           }
       if (!plural) {
-        const spent = members.filter((m) => m.kind === "country" && members.some((o) => o.id !== m.id && isAncestor(m, o)));
+        const tail = reads[reads.length - 1]?.heads ?? [];
+        const closes = (m) => m.kind === "subdivision" && tail.length === 1 && tail[0]?.id === m.id && members.length > 2 && members.every((o) => onTheMap(m, o));
+        const spent = members.filter((m) => m.kind === "country" && members.some((o) => o.id !== m.id && isAncestor(m, o)) || closes(m));
         const inner = members.filter((m) => !spent.includes(m));
         let apart = inner.length > 1 && spent.length > 0;
         for (let a = 0;a < inner.length && apart; a++)
@@ -7494,6 +7791,19 @@ function createPlaceReader2(options = {}) {
     });
     return abroad ? right : undefined;
   }
+  function townInCounty(left, right) {
+    if (left.length === 0 || right.length === 0)
+      return;
+    if (!left.every((l) => l.kind === "city") || !right.every((r) => r.kind === "subdivision"))
+      return;
+    if (left.some((l) => right.some((r) => relates(l, r))))
+      return;
+    const kept = left.filter((l) => {
+      const parent = l.geo === null ? undefined : idx().byId.get(l.geo);
+      return parent !== undefined && right.some((r) => r.id !== parent.id && onTheMap(parent, r));
+    });
+    return kept.length === 0 ? undefined : kept;
+  }
   function read(print, declared = false, smushed = true) {
     const core = unbracket(repair(print));
     if (fold(core) === "")
@@ -7556,13 +7866,14 @@ function createPlaceReader2(options = {}) {
           };
       }
       const qualified = (k) => k === "comma" || k === "space";
+      const listed = (k) => k === "amp" || k === "and" || k === "slash";
       const settled = reads.map((r, n) => {
         const prev = reads[n - 1];
         if (prev === undefined || !qualified(before[n]) || r.truncated)
           return;
         if (n - 1 > 0 && (qualified(before[n - 1]) || !qualified(before[n - 2])))
           return;
-        return qualifierAlone(prev.heads, r.heads);
+        return qualifierAlone(prev.heads, r.heads) ?? (prev.truncated || before[n] !== "comma" || listed(before[n + 1]) ? undefined : townInCounty(prev.heads, r.heads));
       });
       settled.forEach((heads, n) => {
         if (heads === undefined)
@@ -7820,8 +8131,41 @@ function createPlaceReader2(options = {}) {
     const base = hit ?? built(print, declared, key);
     if (hit !== undefined)
       hits++;
+    if (declared && typeof ctx === "object" && base.arm === "unread" && base.refusal === null) {
+      const q = unheldQualifier(print, ctx);
+      if (q !== undefined)
+        return q.refine(ctx);
+    }
     return ctx === undefined ? base : base.refine(ctx);
   }
+  function unheldQualifier(print, ctx) {
+    const within = [ctx.country, ctx.near].filter((w) => w !== undefined && w.trim() !== "").flatMap((w) => headsOf(w));
+    if (within.length === 0)
+      return;
+    const core = unbracket(repair(print));
+    const pieces = core.split(SEP);
+    for (let k = 0;k < pieces.length; k += 2)
+      if (pieces[k] === "")
+        return;
+    let at = -1;
+    for (let k = pieces.length - 2;k >= 1 && at === -1; k -= 2)
+      if (kindOf(pieces[k]) === "comma")
+        at = k;
+    if (at === -1)
+      return;
+    const tail = read(pieces.slice(at + 1).join(""), true);
+    if (tail.heads.length > 0 || tail.refusal !== null)
+      return;
+    const town = read(pieces.slice(0, at).join(""), true);
+    if (town.refusal !== null || town.truncated || town.members !== undefined)
+      return;
+    if (town.heads.length === 0 || !town.heads.every((n) => n.kind === "city"))
+      return;
+    const kept = town.heads.filter((h) => within.some((w) => isAncestor(w, h)));
+    if (kept.length === 0)
+      return;
+    return build(print, chainsFor(kept), { ...town, heads: kept }, []);
+  }
   function heading(print, ctx) {
     const held = idx().byHeading.get(fold(repair(print)));
     if (held === undefined)

package/dist/person.js

@@ -106,8 +106,8 @@ class RoleRefusedName {
     return true;
   }
 }
-function roleName(role, print, order) {
-  const read = personName(print, order);
+function roleName(role, print, order, factory) {
+  const read = factory === undefined ? personName(print, order) : factory.parse(print, order);
   const sentinel = MATCHERS[role](print);
   return sentinel === undefined ? read : new RoleRefusedName(read, role, sentinel);
 }
@@ -116,7 +116,7 @@ function rolePrintsNoName(role, print) {
 }
 var dancerPrintsNoName = (print) => rolePrintsNoName("dancer", print);
 var seatName = (print) => roleName("adjudicator", print, "given-first");
-var dancerName = (print, order) => roleName("dancer", print, order);
+var dancerName = (print, order, factory) => roleName("dancer", print, order, factory);
 var teacherName = (print, order) => roleName("teacher", print, order);
 export {
   ADJUDICATOR_SENTINELS,

package/dist/place.js

@@ -17,7 +17,7 @@ import {
   placesRelation2,
   probablySamePlace2,
   sameReading2
-} from "./chunks/place-17e26rga.js";
+} from "./chunks/place-2hdp50r3.js";
 import"./chunks/place-tcgfvemw.js";
 export {
   DEFAULT_PLACE_CAPACITY2 as DEFAULT_PLACE_CAPACITY,

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(mojibakeRead(was))];
+  const a = [...collapse(cp437Read(mojibakeRead(was), now))];
   if (!a.includes("?"))
     return a.join("");
   const b = [...collapse(now)];
@@ -67,6 +67,47 @@ function questionMarksRead(was, now) {
   }
   return out.join("");
 }
+var CP437_LETTERS = new Map([
+  [128, "Ç"],
+  [129, "ü"],
+  [130, "é"],
+  [131, "â"],
+  [132, "ä"],
+  [133, "à"],
+  [134, "å"],
+  [135, "ç"],
+  [136, "ê"],
+  [137, "ë"],
+  [138, "è"],
+  [139, "ï"],
+  [140, "î"],
+  [141, "ì"],
+  [142, "Ä"],
+  [143, "Å"],
+  [144, "É"],
+  [145, "æ"],
+  [147, "ô"],
+  [148, "ö"],
+  [149, "ò"],
+  [150, "û"],
+  [151, "ù"],
+  [152, "ÿ"],
+  [153, "Ö"],
+  [154, "Ü"],
+  [160, "á"],
+  [161, "í"],
+  [162, "ó"],
+  [163, "ú"],
+  [164, "ñ"],
+  [165, "Ñ"]
+].map(([byte, letter]) => [String.fromCodePoint(byte), letter]));
+function cp437Read(was, now) {
+  const a = [...was];
+  const b = [...now];
+  if (a.length !== b.length)
+    return was;
+  return a.map((x, i) => CP437_LETTERS.get(x) === b[i] ? b[i] : x).join("");
+}
 function mojibakeRead(print) {
   let out = print;
   const codes = [...out].map((c) => c.codePointAt(0) ?? 0);
@@ -81,6 +122,12 @@ function mojibakeRead(print) {
   return out.replace(/\uFFFD/gu, "?");
 }
 function samePromotedName(was, now) {
+  if (samePromotedNameRead(was, now))
+    return true;
+  const soft = was.replace(/\u00c3\u00ad/gu, "?").replace(/\u00ad/gu, "-");
+  return soft !== was && samePromotedNameRead(soft, now);
+}
+function samePromotedNameRead(was, now) {
   const read = questionMarksRead(was, now);
   if (read === null)
     return false;

package/dist/school.js

@@ -12,7 +12,7 @@ import {
   areAllPlaceTokens2,
   placeRelation2,
   sameReading2
-} from "./chunks/place-17e26rga.js";
+} from "./chunks/place-2hdp50r3.js";
 import {
   validity
 } from "./chunks/place-q9kwsmzd.js";
@@ -1142,8 +1142,9 @@ function createSchoolNameReader(options = {}) {
   function readSpacingAcute(print) {
     return print.replace(SPACING_ACUTE_AFTER_VOWEL, "$1́").replace(SPACING_ACUTE, "'");
   }
+  const INJECTED_LINK = /(?<=^|[\s([])(?:https?:\/\/|www\.)[^\s)\]]+/giu;
   function renderSn1(print) {
-    return normalizeApostrophes2(readSpacingAcute(repairMojibake(print)).normalize("NFKC")).replace(/\p{Cf}+/gu, "").replace(/\p{Cc}+/gu, " ").replace(/\s+/gu, " ").trim();
+    return normalizeApostrophes2(readSpacingAcute(repairMojibake(print)).normalize("NFKC")).replace(/\p{Cf}+/gu, "").replace(/\p{Cc}+/gu, " ").replace(INJECTED_LINK, " ").replace(/\s+/gu, " ").trim();
   }
   const COMPOUND_OPENERS = new Set([
     "hyphen",

package/dist/types/person.d.ts

@@ -1,4 +1,4 @@
-import { type ParseOrder, type PersonName } from "@finbheara/names/normalize";
+import { type ParseOrder, type PersonName, type PersonNameFactory } from "@finbheara/names/normalize";
 import { type RowSentinel } from "./row-sentinels.ts";
 export { SHARED_ROW_SENTINELS, sentinelIn } from "./row-sentinels.ts";
 export type { RowSentinel } from "./row-sentinels.ts";
@@ -8,9 +8,9 @@ export declare const DANCER_SENTINELS: readonly RowSentinel[];
 export declare const TEACHER_SENTINELS: readonly RowSentinel[];
 export declare const ROLE_SENTINELS: Readonly<Record<PersonRole, readonly RowSentinel[]>>;
 export declare function roleSentinelOf(role: PersonRole, print: string): RowSentinel | undefined;
-export declare function roleName(role: PersonRole, print: string, order?: ParseOrder): PersonName;
+export declare function roleName(role: PersonRole, print: string, order?: ParseOrder, factory?: Pick<PersonNameFactory, "parse">): PersonName;
 export declare function rolePrintsNoName(role: PersonRole, print: string): boolean;
 export declare const dancerPrintsNoName: (print: string) => boolean;
 export declare const seatName: (print: string) => PersonName;
-export declare const dancerName: (print: string, order?: ParseOrder) => PersonName;
+export declare const dancerName: (print: string, order?: ParseOrder, factory?: Pick<PersonNameFactory, "parse">) => PersonName;
 export declare const teacherName: (print: string, order?: ParseOrder) => PersonName;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/domain",
-	"version": "0.13.0",
+	"version": "0.18.0",
 	"description": "Places, CLRG regions, school names, ages, dances and a person's print in its role, as they are printed: read, compared and told apart",
 	"keywords": [
 		"places",