strom-research 1.18.0-beta.12 → 1.18.0-beta.13

package/CHANGELOG.cs.md

@@ -7,7 +7,7 @@ Změny každé verze ve zkratce. Úplné poznámky a instalační řádky jsou n
 
 ## 1.18.0
 
-*Připravuje se: bety do 1.18.0-beta.12. Oddíl bude úplný s vydáním.*
+*Připravuje se: bety do 1.18.0-beta.13. Oddíl bude úplný s vydáním.*
 
 - **Fotky z telefonu nastojato.** Fotka otočená podle údaje EXIF se čte tak, jak se má dívat, nastojato; místa na ní
   vyznačená (výřezy, poloviny dvoustrany, uložená část) jsou místa obrázku, jak se ukazuje. Fotka sama zůstává, jak
@@ -21,7 +21,8 @@ Změny každé verze ve zkratce. Úplné poznámky a instalační řádky jsou n
   které jmenuje, i s tím, kdo ze stromu to může být. Nic se nedomýšlí: jméno, které v dokumentu není, vypadne — i
   příjmení, nikdy se nebere od otce ani z jiné rodiny —, co nejde přečíst, je označené; druhý čtenář může číst naslepo.
   Dokument na úředním formuláři, jako rodný list, si své osoby ponechá — dítě i oba rodiče s jejich podílem —, a dokument
-  přečtený dřív je po aktualizaci ukáže, aniž by se četl znovu.
+  přečtený dřív je po aktualizaci ukáže, aniž by se četl znovu. U každé osoby a události je i místo na stránce, kde
+  stojí, takže aplikace Strom ukáže výřez každé z nich.
   Do stromu se z toho nic nezapíše samo. Dokument už přečtený to o sobě řekne, takže se omylem nečte podruhé. Dokument
   čtený znovu se ukazuje pod názvem svého souboru, nikdy pod kódem. Dokument poslaný z aplikace Strom najde agenta
   stejně jako terminál — i nainstalovaného do vlastní složky, přes npm nebo Homebrew — místo hlášení, že agent není

package/CHANGELOG.de.md

@@ -7,7 +7,7 @@ Die Änderungen jeder Version in Kürze. Die vollständigen Hinweise und die Ins
 
 ## 1.18.0
 
-*In Vorbereitung: die Betas bis 1.18.0-beta.12. Der Abschnitt ist mit dem Release vollständig.*
+*In Vorbereitung: die Betas bis 1.18.0-beta.13. Der Abschnitt ist mit dem Release vollständig.*
 
 - **Handyfotos aufrecht.** Ein Foto, das nach seiner EXIF-Ausrichtung gedreht ist, wird gelesen, wie es gesehen
   werden soll, aufrecht; die darauf markierten Stellen (Ausschnitte, die Hälften einer Doppelseite, ein gespeicherter
@@ -23,6 +23,8 @@ Die Änderungen jeder Version in Kürze. Die vollständigen Hinweise und die Ins
   vom Vater oder aus einer anderen Familie genommen —, Unleserliches wird markiert; ein zweiter Leser kann blind lesen.
   Ein Dokument auf einem amtlichen Formular, etwa eine Geburtsurkunde, behält seine Personen — das Kind und beide
   Eltern mit ihrem Anteil —, und ein früher gelesenes Dokument zeigt sie nach dem Update, ohne erneut gelesen zu werden.
+  Jede Person und jedes Ereignis kommt mit der Stelle auf der Seite, an der es steht, so zeigt die Strom-App von jedem
+  einen eigenen Ausschnitt.
   In den Stammbaum gelangt nichts von selbst. Ein schon gelesenes Dokument sagt es, so wird es nicht versehentlich ein
   zweites Mal gelesen. Ein erneut gelesenes Dokument wird unter dem Namen seiner Datei gezeigt, nie unter einem Code.
   Ein aus der Strom-App gesendetes Dokument findet den Agenten wie das Terminal — auch einen in einem eigenen Ordner,

package/CHANGELOG.md

@@ -7,7 +7,7 @@ The changes of each version in short. The full notes and the install lines are o
 
 ## 1.18.0
 
-*In preparation: the betas up to 1.18.0-beta.12. The section is complete with the release.*
+*In preparation: the betas up to 1.18.0-beta.13. The section is complete with the release.*
 
 - **Phone photos upright.** A photo turned by its EXIF orientation is read as it is meant to be seen, upright; the
   places marked on it (excerpts, the halves of a spread, a cut-out part) are of the picture as it is shown. The
@@ -22,7 +22,8 @@ The changes of each version in short. The full notes and the install lines are o
   name the document does not have is left out — a surname too, never taken from a father or another family —, what
   cannot be read is marked; a second reader can read it blind. A
   document on a printed form, as a birth certificate, keeps its people — the child and both parents with their part in
-  it —, and a document read before shows them after the update with nothing read again. Nothing of it enters the tree by itself. A document read
+  it —, and a document read before shows them after the update with nothing read again. Each person and event it names
+  comes with the place on the page where it stands, so the Strom app shows each its own excerpt. Nothing of it enters the tree by itself. A document read
   already says so, so it is not read a second time by mistake. A document read again is shown under the name of its
   file, never a code. A document sent from the Strom app finds the agent as the terminal does — one installed in a
   folder of its own, by npm or Homebrew too — instead of saying no agent is set up. Every agent the research works with

package/dist/core/document.js

@@ -110,13 +110,15 @@ term: <a word or abbreviation as written> = <what it means, in ${into}> (term |
   — one line each, for the old words, formulas, abbreviations, occupations, and on a gravestone its symbols
 `}person: <ref> | <role> | ${blind ? "" : `<the role in ${into}> | `}written=<the name exactly as it stands in the transcript> | given=<the given
   name in today's form> | surname=<the surname in today's form> | sex=M|F|U | age=<as written> | occupation=<…> |
-  residence=<…> — one line each person named; ref p1, p2, … in this entry; role: ${ROLES.join(", ")};
+  residence=<…> | region=x,y,w,h — one line each person named; ref p1, p2, … in this entry; role: ${ROLES.join(", ")};
   given and surname only turn the written name into today's form ("Joannes" → "Jan"): never a name the transcript
   does not have — no surname the entry does not write by the person (a child's is not taken from its father's);
   on a form (a certificate) whose fields hold a name apart, written= the words of its fields as written there;
-  a name you could not read stays out; leave out what the entry does not say
+  a name you could not read stays out; leave out what the entry does not say; region: where the person's name
+  stands — its line, or its field on a form — as the entry's region, of the page's whole view (tight, not the entry)
 event: <BIRT | BAPM | MARR | DEAT | BURI | RESI | EVEN> | date=<as on the record, in numbers: 3.4.1846, or a year> |
-  place=<the place as written> | persons=<ref>:<principal|father|mother|godparent|witness|groom|bride|deceased|other>,…
+  place=<the place as written> | persons=<ref>:<principal|father|mother|godparent|witness|groom|bride|deceased|other>,… |
+  region=x,y,w,h — where its date (and place) stand, as a person's region
 relation: parent <ref of the parent> <ref of the child>  — or —  spouse <ref> <ref>
 ${blind
         ? ""
@@ -260,12 +262,18 @@ export function parseDocReport(text) {
             const ref = /^p\d+$/iu.test(parts[0].trim()) ? parts.shift().trim().toLowerCase() : `p${entry.persons.length + 1}`;
             const role = parts[0] && !parts[0].includes("=") ? parts.shift().trim().toLowerCase() : "other";
             const roleText = parts[0] && !parts[0].includes("=") ? parts.shift().trim() : undefined;
-            entry.persons.push({ ref, role, ...(roleText ? { roleText } : {}), fields: pairs(parts) });
+            const fields = pairs(parts);
+            const region = parseRegion(fields.region);
+            delete fields.region;
+            entry.persons.push({ ref, role, ...(roleText ? { roleText } : {}), ...(region ? { region } : {}), fields });
         }
         for (const e of fields.get("event") ?? []) {
             const parts = e.split(/\s*\|\s*/u);
             const type = parts[0] && !parts[0].includes("=") ? parts.shift().trim() : "EVEN";
-            entry.events.push({ type, fields: pairs(parts) });
+            const fields = pairs(parts);
+            const region = parseRegion(fields.region);
+            delete fields.region;
+            entry.events.push({ type, ...(region ? { region } : {}), fields });
         }
         for (const r of fields.get("relation") ?? []) {
             const w = r.split(/[\s,]+/u).filter(Boolean);
@@ -574,6 +582,9 @@ export function checkEntry(raw, id, blind = false, form = false) {
         }
         if (uncertain.size)
             person.uncertain = [...uncertain];
+        const region = partOf(p.region, raw.region);
+        if (region)
+            person.region = region;
         persons.push(person);
     }
     const refs = new Set(persons.map((p) => p.ref));
@@ -603,6 +614,9 @@ export function checkEntry(raw, id, blind = false, form = false) {
         }
         if (uncertain.size)
             ev.uncertain = [...uncertain];
+        const region = partOf(e.region, raw.region);
+        if (region)
+            ev.region = region;
         events.push(ev);
     }
     const relations = [];
@@ -623,6 +637,24 @@ export function checkEntry(raw, id, blind = false, form = false) {
         entry.glossary = raw.terms;
     return { entry, checks };
 }
+/** A name's or a date's line is no more than a quarter of the page. */
+const PART_AREA = 0.25;
+/** How far a part may lie out of its entry's region (a reader's regions are rough). */
+const PART_SLACK = 0.05;
+/**
+ * A person's or an event's region as a reader gave it, where it can be one: a part of the page no bigger than a
+ * quarter of it, that lies (roughly) in its entry's region; else none — the app shows the entry's region then.
+ */
+function partOf(r, entry) {
+    if (!r || r[2] * r[3] > PART_AREA)
+        return undefined;
+    if (!entry)
+        return r;
+    const [x, y, w, h] = [entry[0] - PART_SLACK, entry[1] - PART_SLACK, entry[2] + 2 * PART_SLACK, entry[3] + 2 * PART_SLACK];
+    const across = Math.min(r[0] + r[2], x + w) - Math.max(r[0], x);
+    const down = Math.min(r[1] + r[3], y + h) - Math.max(r[1], y);
+    return across > 0 && down > 0 ? r : undefined;
+}
 // ── two readers ───────────────────────────────────────────────────────────────────────────────────────────────────
 /** The hunks where two transcripts differ, word by word (their keys; the marks [?] are no difference). */
 export function wordDiff(a, b) {
@@ -720,6 +752,7 @@ export function compareReadings(first, blind) {
         used.set(e.page, k + 1);
         const b = other.get(e.page)?.[k];
         const variants = [];
+        const regions = new Map();
         if (!b)
             variants.push({ field: "entry", at: e.id, other: "" });
         else {
@@ -737,6 +770,9 @@ export function compareReadings(first, blind) {
                 for (const f of ["given", "surname"])
                     if (!same(p[f], q[f]))
                         variants.push({ field: `${p.ref}.${f}`, at: p[f] ?? "", other: q[f] ?? "" });
+                // where the name stands: the first reader's, else the blind one's of the same person
+                if (!p.region && q.region)
+                    regions.set(p, q.region);
             };
             const alone = [];
             for (const p of e.persons) {
@@ -775,6 +811,8 @@ export function compareReadings(first, blind) {
                     variants.push({ field: ev.type, at: ev.date?.text ?? ev.type, other: "" });
                     continue;
                 }
+                if (!ev.region && q.region)
+                    regions.set(ev, q.region);
                 if ((ev.date?.gedcom ?? ev.date?.text) !== (q.date?.gedcom ?? q.date?.text) && !same(ev.date?.text, q.date?.text))
                     variants.push({ field: `${ev.type}.date`, at: ev.date?.text ?? "", other: q.date?.text ?? "" });
                 if (!same(ev.place?.text, q.place?.text))
@@ -784,7 +822,8 @@ export function compareReadings(first, blind) {
         const agree = variants.length ? "differ" : "same";
         if (variants.length)
             all = false;
-        return { ...e, agree, ...(variants.length ? { variants } : {}) };
+        const placed = (x) => (regions.has(x) ? { ...x, region: regions.get(x) } : x);
+        return { ...e, persons: e.persons.map(placed), events: e.events.map(placed), agree, ...(variants.length ? { variants } : {}) };
     });
     // entries only the blind reader has
     for (const [page, list] of other)
@@ -1045,8 +1084,14 @@ export function buildResult(tree, s) {
                     checks.push(...c.checks);
                 // a region of a part asked (--region): of the whole page
                 const page = s.pages.find((p) => p.n === e.page);
-                if (c.entry.region && page?.region)
-                    c.entry.region = within(page.region, c.entry.region);
+                if (page?.region) {
+                    const part = page.region;
+                    if (c.entry.region)
+                        c.entry.region = within(part, c.entry.region);
+                    for (const x of [...c.entry.persons, ...c.entry.events])
+                        if (x.region)
+                            x.region = within(part, x.region);
+                }
                 out.push(c.entry);
             }
         });

package/dist/core/tree.js

@@ -27,7 +27,7 @@ import { lastBackup } from "./backup.js";
 export const TREE_FILE = "strom.json";
 // between releases the candidate being made (a bridge run from the sources says what it is: the Strom app goes by it);
 // at a release the release's own (package.json)
-export const VERSION = "1.18.0-beta.12";
+export const VERSION = "1.18.0-beta.13";
 const GITIGNORE = `# Strom Research — local state and large files are not versioned
 .strom/
 /media/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strom-research",
-  "version": "1.18.0-beta.12",
+  "version": "1.18.0-beta.13",
   "description": "Genealogical research toolkit for AI coding agents",
   "type": "module",
   "bin": {