chaffjs 0.30.0 → 0.32.0

package/dist/facts/count-labels.d.ts

@@ -0,0 +1,15 @@
+import type { Lexicon, Span } from "../plugin.ts";
+import type { FactValue } from "./fact-values.ts";
+/**
+ * 数えた数で始まる名前（「1箱の重さ」「1人あたりの料金」）。数は名前の一部で、「2箱の重さ」は別の項目。
+ * 年や月や日付で始まる名前（「2026年の売上」）は、数えた数ではないので読まない。数える語と続きの語は言語パッケージの語彙表から取る。
+ */
+export type CountLabelWords = {
+    readonly counters: readonly string[];
+    readonly links: readonly string[];
+};
+/** 二つの lexicon（fact-label-counter、fact-label-count-link）の語。 */
+export declare const countLabelWordsOf: (lexicons: Readonly<Record<string, Lexicon>>) => CountLabelWords;
+/** value が、cell の頭に書いた数えた数で、そのすぐ後ろに続きの語と名前の字があるか。 */
+export declare const isCountLabelHead: (source: string, cell: Span, value: FactValue, words: CountLabelWords) => boolean;
+//# sourceMappingURL=count-labels.d.ts.map

package/dist/facts/count-labels.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"count-labels.d.ts","sourceRoot":"","sources":["../../src/facts/count-labels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAE1G,+DAA+D;AAC/D,eAAO,MAAM,iBAAiB,GAAI,UAAU,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAG,eAG9E,CAAC;AAMH,qDAAqD;AACrD,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,EAAE,MAAM,IAAI,EAAE,OAAO,SAAS,EAAE,OAAO,eAAe,KAAG,OAMvG,CAAC"}

package/dist/facts/count-labels.js

@@ -0,0 +1,19 @@
+import { withoutEdgeMarks } from "./trim-marks.js";
+/** 二つの lexicon（fact-label-counter、fact-label-count-link）の語。 */
+export const countLabelWordsOf = (lexicons) => ({
+    counters: (lexicons["fact-label-counter"] ?? []).map((entry) => entry.pattern),
+    links: (lexicons["fact-label-count-link"] ?? []).map((entry) => entry.pattern),
+});
+const LETTER = /\p{L}/u;
+const normalized = (text) => text.normalize("NFKC");
+/** value が、cell の頭に書いた数えた数で、そのすぐ後ろに続きの語と名前の字があるか。 */
+export const isCountLabelHead = (source, cell, value, words) => {
+    if (value.kind !== "quantity" || withoutEdgeMarks(source.slice(cell.start, value.start)) !== "")
+        return false;
+    if (!words.counters.some((counter) => normalized(counter) === value.unit))
+        return false;
+    const after = source.slice(value.end, cell.end);
+    const link = words.links.find((word) => after.startsWith(word));
+    return link !== undefined && LETTER.test(after.slice(link.length));
+};
+//# sourceMappingURL=count-labels.js.map

package/dist/facts/count-labels.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"count-labels.js","sourceRoot":"","sources":["../../src/facts/count-labels.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAQnD,+DAA+D;AAC/D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAA2C,EAAmB,EAAE,CAAC,CAAC;IAClG,QAAQ,EAAE,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;IAC9E,KAAK,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;CAC/E,CAAC,CAAC;AAEH,MAAM,MAAM,GAAG,QAAQ,CAAC;AAExB,MAAM,UAAU,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAEpE,qDAAqD;AACrD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAE,IAAU,EAAE,KAAgB,EAAE,KAAsB,EAAW,EAAE;IAChH,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,KAAK,CAAC;IAC9G,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACxF,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,OAAO,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AACrE,CAAC,CAAC"}

package/dist/facts/document-terms.d.ts

@@ -0,0 +1,43 @@
+import type { ScopedFact } from "./fact-scope.ts";
+import type { FactConflict } from "./fact-conflicts.ts";
+/**
+ * 文書全体で一つの値を持つ項目（試用期間、probation period）。語彙表の語の名前の値は、節をまたいで比べる。比べるのは、拠り所の値と
+ * 文の値のあいだだけ: 拠り所（表の升か、見出しがその項目の名前の節「第2条（保証期間）」の値）がその項目に一通りの値を書き、別の所の
+ * 文がそれと違う値を書いたとき、文の値を言う。
+ * 名前に条件を書いた値（正社員の試用期間）は名前が語彙表の語と違うので比べない。表どうし、文どうしは、雇用形態ごとに並べた
+ * 節のことがあるので比べない。拠り所が二通りの値を書いていれば、別々のものの値として言わない。
+ */
+export type TermWord = {
+    readonly pattern: string;
+    readonly group: string;
+};
+/** 項目の名前を見出しにした節の範囲と、その見出し。 */
+export type TermHome = {
+    readonly group: string;
+    readonly heading: string;
+    readonly start: number;
+    readonly end: number;
+};
+/** section: 拠り所が表の升でなく、項目の名前を見出しにした節のときの、その見出し。 */
+export type TermConflict = FactConflict & {
+    readonly section?: string;
+};
+/** 書いた名前（表の列の見出し）が語彙表の項目の名前か。 */
+export declare const isTermName: (written: string, words: TermWords) => boolean;
+export type TermSection = {
+    readonly heading: string;
+    readonly start: number;
+    readonly end: number;
+};
+/** 見出しが語彙表の項目の名前そのものの節（第2条（保証期間）、2. Warranty period）。 */
+export declare const termHomes: (sections: readonly TermSection[], words: TermWords) => TermHome[];
+export type TermWords = {
+    readonly terms: readonly TermWord[];
+    readonly determiners: readonly string[];
+};
+/**
+ * 語彙表の項目ごとに、拠り所の値と違う文の値。記録の欄（繰り返す名前）は比べない。冒頭や要約の値は、本文の値と summary-fact-mismatch
+ * が比べるので、本文の値だけを読む。
+ */
+export declare const documentTermConflicts: (facts: readonly ScopedFact[], words: TermWords, homes?: readonly TermHome[]) => TermConflict[];
+//# sourceMappingURL=document-terms.d.ts.map

package/dist/facts/document-terms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"document-terms.d.ts","sourceRoot":"","sources":["../../src/facts/document-terms.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD;;;;;;GAMG;AACH,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAoB5E,+BAA+B;AAC/B,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1H,mDAAmD;AACnD,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG;IAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA0CxE,iCAAiC;AACjC,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,EAAE,OAAO,SAAS,KAAG,OAAwF,CAAC;AAExJ,MAAM,MAAM,WAAW,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAErG,yDAAyD;AACzD,eAAO,MAAM,SAAS,GAAI,UAAU,SAAS,WAAW,EAAE,EAAE,OAAO,SAAS,KAAG,QAAQ,EAInF,CAAC;AAEL,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAEzG;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAI,OAAO,SAAS,UAAU,EAAE,EAAE,OAAO,SAAS,EAAE,QAAO,SAAS,QAAQ,EAAO,KAAG,YAAY,EAWnI,CAAC"}

package/dist/facts/document-terms.js

@@ -0,0 +1,74 @@
+import { comparable, sameValue } from "./fact-values.js";
+const folded = (text) => text.normalize("NFKC").toLowerCase();
+const MAX_DISTINCT = 2;
+const distinctValues = (values) => values.reduce((kept, value) => (kept.some((seen) => sameValue(seen, value)) ? kept : [...kept, value]), []);
+const comparableClasses = (facts) => facts.reduce((classes, fact) => {
+    const home = classes.find((members) => members[0] !== undefined && comparable(members[0].value, fact.value));
+    if (home === undefined)
+        classes.push([fact]);
+    else
+        home.push(fact);
+    return classes;
+}, []);
+/** 同じ範囲で同じ名前の拠り所の値と違う文の値は、同じ範囲の食い違い（scopeConflicts）が言う。 */
+const sameScopeAs = (fact, sources) => sources.some((cell) => cell.scope === fact.scope && cell.key === fact.key);
+const homeOf = (fact, homes) => homes.find((home) => home.start <= fact.value.start && fact.value.start < home.end);
+/** 表の升があれば表だけが拠り所。項目の名前を見出しにした節の文は、表が値を書いていないときの拠り所。 */
+const sourcesOf = (facts, homes) => {
+    const cells = facts.filter((fact) => fact.table === true);
+    return cells.length > 0 ? cells : facts.filter((fact) => homeOf(fact, homes) !== undefined);
+};
+/** 拠り所に表の升があれば表、無ければ最初の拠り所の節の見出し。 */
+const sectionOf = (sources, homes) => {
+    if (sources.some((fact) => fact.table === true))
+        return {};
+    const heading = sources.map((fact) => homeOf(fact, homes)?.heading).find((written) => written !== undefined);
+    return heading === undefined ? {} : { section: heading };
+};
+const conflictsInClass = (facts, homes) => {
+    const sources = sourcesOf(facts, homes);
+    const [source, ...others] = distinctValues(sources.map((fact) => fact.value));
+    if (source === undefined || others.length > 0)
+        return [];
+    if (distinctValues(facts.map((fact) => fact.value)).length !== MAX_DISTINCT)
+        return [];
+    const section = sectionOf(sources, homes);
+    return facts
+        .filter((fact) => !sources.includes(fact) && !sameValue(source, fact.value) && !sameScopeAs(fact, sources))
+        .map((fact) => ({ fact, other: source, ...section }));
+};
+/** 名前の頭の冠詞（the）を落とした形。文の名前は落としてあるが、表の行の見出しは書いたまま。 */
+const withoutDeterminer = (key, determiners) => {
+    const [first, ...rest] = key.split(" ");
+    return rest.length > 0 && determiners.some((word) => folded(word) === first) ? rest.join(" ") : key;
+};
+const groupOfKey = (written, words) => {
+    const key = withoutDeterminer(written, words.determiners);
+    return words.terms.find((word) => folded(word.pattern) === key)?.group;
+};
+const groupOf = (fact, words) => groupOfKey(fact.key, words);
+/** 書いた名前（表の列の見出し）が語彙表の項目の名前か。 */
+export const isTermName = (written, words) => groupOfKey(folded(written).replace(/\s+/gu, " ").trim(), words) !== undefined;
+/** 見出しが語彙表の項目の名前そのものの節（第2条（保証期間）、2. Warranty period）。 */
+export const termHomes = (sections, words) => sections.flatMap((section) => {
+    const group = groupOfKey(folded(section.heading).trim(), words);
+    return group === undefined ? [] : [{ group, heading: section.heading, start: section.start, end: section.end }];
+});
+/**
+ * 語彙表の項目ごとに、拠り所の値と違う文の値。記録の欄（繰り返す名前）は比べない。冒頭や要約の値は、本文の値と summary-fact-mismatch
+ * が比べるので、本文の値だけを読む。
+ */
+export const documentTermConflicts = (facts, words, homes = []) => {
+    const groups = new Map();
+    facts.forEach((fact) => {
+        const group = groupOf(fact, words);
+        if (group === undefined || fact.record || fact.part !== "body")
+            return;
+        groups.set(group, [...(groups.get(group) ?? []), fact]);
+    });
+    return [...groups.entries()].flatMap(([group, members]) => {
+        const own = homes.filter((home) => home.group === group);
+        return comparableClasses(members).flatMap((comparableMembers) => conflictsInClass(comparableMembers, own));
+    });
+};
+//# sourceMappingURL=document-terms.js.map

package/dist/facts/document-terms.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"document-terms.js","sourceRoot":"","sources":["../../src/facts/document-terms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAkB,MAAM,kBAAkB,CAAC;AAazE,MAAM,MAAM,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;AAE9E,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB,MAAM,cAAc,GAAG,CAAC,MAA4B,EAAe,EAAE,CACnE,MAAM,CAAC,MAAM,CAAc,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAE3H,MAAM,iBAAiB,GAAG,CAAC,KAA4B,EAAkB,EAAE,CACzE,KAAK,CAAC,MAAM,CAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7G,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;;QACxC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrB,OAAO,OAAO,CAAC;AACjB,CAAC,EAAE,EAAE,CAAC,CAAC;AAET,2DAA2D;AAC3D,MAAM,WAAW,GAAG,CAAC,IAAgB,EAAE,OAA8B,EAAW,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC;AAQ9J,MAAM,MAAM,GAAG,CAAC,IAAgB,EAAE,KAA0B,EAAwB,EAAE,CACpF,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;AAEtF,wDAAwD;AACxD,MAAM,SAAS,GAAG,CAAC,KAA4B,EAAE,KAA0B,EAAgB,EAAE;IAC3F,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;IAC1D,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;AAC9F,CAAC,CAAC;AAEF,qCAAqC;AACrC,MAAM,SAAS,GAAG,CAAC,OAA8B,EAAE,KAA0B,EAAwB,EAAE;IACrG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAC3D,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;IAC7G,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,KAA4B,EAAE,KAA0B,EAAkB,EAAE;IACpG,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACxC,MAAM,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9E,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IACzD,IAAI,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,KAAK,YAAY;QAAE,OAAO,EAAE,CAAC;IACvF,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC1C,OAAO,KAAK;SACT,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC1G,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,qDAAqD;AACrD,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAE,WAA8B,EAAU,EAAE;IAChF,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACtG,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,KAAgB,EAAsB,EAAE;IAC3E,MAAM,GAAG,GAAG,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IAC1D,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,KAAgB,EAAsB,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAExG,iCAAiC;AACjC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,KAAgB,EAAW,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,KAAK,SAAS,CAAC;AAIxJ,yDAAyD;AACzD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAgC,EAAE,KAAgB,EAAc,EAAE,CAC1F,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;IAC3B,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;IAChE,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAClH,CAAC,CAAC,CAAC;AAIL;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,KAA4B,EAAE,KAAgB,EAAE,QAA6B,EAAE,EAAkB,EAAE;IACvI,MAAM,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAC;IAC/C,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACnC,IAAI,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO;QACvE,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,EAAE;QACxD,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;QACzD,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC,CAAC;IAC7G,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/facts/duration-scale.d.ts

@@ -0,0 +1,11 @@
+import type { DurationUnit } from "../derived/date-arithmetic.ts";
+/**
+ * 期間を、比べられる単位に揃えた大きさ。年は月に直す（1年 と 12か月 は同じ長さ、2年 と 12か月 は違う長さ）。
+ * 月と日、週と日は直さない: 1か月 は 28〜31日で、30日 と同じとは言えない。週と日はそのまま別の単位で、比べない。
+ */
+export type ScaledDuration = {
+    readonly key: string;
+    readonly unit: DurationUnit;
+};
+export declare const scaledDuration: (key: string, unit: DurationUnit) => ScaledDuration;
+//# sourceMappingURL=duration-scale.d.ts.map

package/dist/facts/duration-scale.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"duration-scale.d.ts","sourceRoot":"","sources":["../../src/facts/duration-scale.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AAWnF,eAAO,MAAM,cAAc,GAAI,KAAK,MAAM,EAAE,MAAM,YAAY,KAAG,cAIhE,CAAC"}

package/dist/facts/duration-scale.js

@@ -0,0 +1,14 @@
+const MONTHS_PER_YEAR = 12;
+/** 0.1年 × 12 の浮動小数の端（1.2000000000000002）を落とす桁。 */
+const KEY_DIGITS = 1e6;
+const scaledKey = (key, factor) => {
+    const amount = key.trim() === "" ? Number.NaN : Number(key);
+    return Number.isFinite(amount) ? String(Math.round(amount * factor * KEY_DIGITS) / KEY_DIGITS) : undefined;
+};
+export const scaledDuration = (key, unit) => {
+    if (unit !== "year")
+        return { key, unit };
+    const months = scaledKey(key, MONTHS_PER_YEAR);
+    return months === undefined ? { key, unit } : { key: months, unit: "month" };
+};
+//# sourceMappingURL=duration-scale.js.map

package/dist/facts/duration-scale.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"duration-scale.js","sourceRoot":"","sources":["../../src/facts/duration-scale.ts"],"names":[],"mappings":"AAQA,MAAM,eAAe,GAAG,EAAE,CAAC;AAC3B,kDAAkD;AAClD,MAAM,UAAU,GAAG,GAAG,CAAC;AAEvB,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,MAAc,EAAsB,EAAE;IACpE,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5D,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7G,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,IAAkB,EAAkB,EAAE;IAChF,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IAC1C,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;IAC/C,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AAC/E,CAAC,CAAC"}

package/dist/facts/duration-values.d.ts

@@ -0,0 +1,15 @@
+import type { DurationUnit } from "../derived/date-arithmetic.ts";
+import type { FactValue } from "./fact-values.ts";
+/**
+ * 期間の値（3 months、3ヶ月間）。木の数量は、英語では数だけ（3 の後ろの months は単位として持つ）、日本語では か月 までで 間 を含まない。
+ * 値を期間の単位の語の終わりまで延ばし、単位を期間の大きさ（month）に揃える（3ヶ月 と 6か月、1 month と 6 months を比べる）。
+ * 年は月に直して比べる（1年 と 12か月）。月と日のように長さの決まらない組は、別の単位のまま。後ろに語が続く期間（3 months ago、30 years old）は、名前付きの値の
+ * 終わり（fact-value-end）で落ちる。
+ */
+export type DurationWord = {
+    readonly pattern: string;
+    readonly unit: DurationUnit;
+};
+/** 期間の単位の付いた数量だけを、単位の語まで含む期間の値にして返す。 */
+export declare const durationValues: (source: string, values: readonly FactValue[], words: readonly DurationWord[]) => FactValue[];
+//# sourceMappingURL=duration-values.d.ts.map

package/dist/facts/duration-values.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"duration-values.d.ts","sourceRoot":"","sources":["../../src/facts/duration-values.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;;;GAKG;AACH,MAAM,MAAM,YAAY,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AA+BrF,wCAAwC;AACxC,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,EAAE,QAAQ,SAAS,SAAS,EAAE,EAAE,OAAO,SAAS,YAAY,EAAE,KAAG,SAAS,EAC1D,CAAC"}

package/dist/facts/duration-values.js

@@ -0,0 +1,29 @@
+import { scaledDuration } from "./duration-scale.js";
+const folded = (text) => text.normalize("NFKC").toLowerCase();
+const UNIT_GAPS = new Set([" ", "\t"]);
+/** 書いた単位の始まり。数のすぐ後ろか、空白一つの後ろ。木の値が単位まで含んでいれば、その単位の頭。 */
+const unitStartOf = (source, value) => {
+    const written = folded(value.unit);
+    if (written === "")
+        return undefined;
+    if (folded(source.slice(value.end - value.unit.length, value.end)) === written)
+        return value.end - value.unit.length;
+    const gap = UNIT_GAPS.has(source.charAt(value.end)) ? 1 : 0;
+    return folded(source.slice(value.end + gap, value.end + gap + value.unit.length)) === written ? value.end + gap : undefined;
+};
+const LATIN_LETTER = /[a-z]/iu;
+/** 単位の頭から書いた、一番長い期間の語（ヶ月 より ヶ月間）。英字の語は語の途中で切らない。 */
+const longestAt = (source, at, words) => words
+    .filter((word) => folded(source.slice(at, at + word.pattern.length)) === folded(word.pattern))
+    .filter((word) => !(LATIN_LETTER.test(word.pattern.slice(-1)) && LATIN_LETTER.test(source.charAt(at + word.pattern.length))))
+    .reduce((longest, word) => (longest === undefined || word.pattern.length > longest.pattern.length ? word : longest), undefined);
+const durationOf = (source, value, words) => {
+    if (value.kind !== "quantity" || !words.some((word) => folded(word.pattern) === folded(value.unit)))
+        return [];
+    const at = unitStartOf(source, value);
+    const word = at === undefined ? undefined : longestAt(source, at, words);
+    return at === undefined || word === undefined ? [] : [{ ...value, end: at + word.pattern.length, ...scaledDuration(value.key, word.unit) }];
+};
+/** 期間の単位の付いた数量だけを、単位の語まで含む期間の値にして返す。 */
+export const durationValues = (source, values, words) => values.flatMap((value) => durationOf(source, value, words));
+//# sourceMappingURL=duration-values.js.map

package/dist/facts/duration-values.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"duration-values.js","sourceRoot":"","sources":["../../src/facts/duration-values.ts"],"names":[],"mappings":"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"}

package/dist/facts/fact-values.d.ts

@@ -1,18 +1,26 @@
 import type { Span, StructureNode } from "../plugin.ts";
+import { type RateBasis } from "./rate-values.ts";
 /**
  * 値として読むもの。木の数量と日付（`chaff compare` と同じ読み）と、品詞の読める言語では固有名詞。
  * key は値の正体で、書き方が違っても同じ値なら同じ（3,000円と3000円、10月5日と10/5）。
  */
 export type ValueKind = "quantity" | "date" | "name";
+/**
+ * bound: upper なら key は上の端（満70歳まで、20 to 70 の 70）。lower は範囲の下の端（満20歳〜満70歳 の 20）。
+ * basis: 率に書いた基準（period:year、kind:fixed）。両方に書いた同じ種類の基準が違えば、別の量として比べない。
+ */
 export type FactValue = Span & {
     readonly kind: ValueKind;
     readonly key: string;
     readonly unit: string;
+    readonly bound?: "upper";
+    readonly lower?: string;
+    readonly basis?: RateBasis;
 };
 /** 木の数量と日付、それと重ならない固有名詞と、単位を書かない数。文書の中の順に並べる。 */
 export declare const factValues: (tree: StructureNode, source: string, names: readonly Span[]) => FactValue[];
 /** 同じ種類の値で、比べられるもの。数量は同じ単位どうし（単位の違いは別の rule が見る）。 */
 export declare const comparable: (left: FactValue, right: FactValue) => boolean;
-/** 比べられる二つの値が同じか。月日だけの日付は、年まで書いた日付の月日と同じなら同じ。 */
+/** 比べられる二つの値が同じか。範囲どうしは下の端も比べる。月日だけの日付は、年まで書いた日付の月日と同じなら同じ。 */
 export declare const sameValue: (left: FactValue, right: FactValue) => boolean;
 //# sourceMappingURL=fact-values.d.ts.map

package/dist/facts/fact-values.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fact-values.d.ts","sourceRoot":"","sources":["../../src/facts/fact-values.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAIxD;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC;AAErD,MAAM,MAAM,SAAS,GAAG,IAAI,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AA4CzG,iDAAiD;AACjD,eAAO,MAAM,UAAU,GAAI,MAAM,aAAa,EAAE,QAAQ,MAAM,EAAE,OAAO,SAAS,IAAI,EAAE,KAAG,SAAS,EAQjG,CAAC;AAkCF,qDAAqD;AACrD,eAAO,MAAM,UAAU,GAAI,MAAM,SAAS,EAAE,OAAO,SAAS,KAAG,OAI9D,CAAC;AAEF,iDAAiD;AACjD,eAAO,MAAM,SAAS,GAAI,MAAM,SAAS,EAAE,OAAO,SAAS,KAAG,OAI7D,CAAC"}
+{"version":3,"file":"fact-values.d.ts","sourceRoot":"","sources":["../../src/facts/fact-values.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAO,EAAc,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE9D;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC;AAErD;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,IAAI,GAAG;IAC7B,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC;CAC5B,CAAC;AAyDF,iDAAiD;AACjD,eAAO,MAAM,UAAU,GAAI,MAAM,aAAa,EAAE,QAAQ,MAAM,EAAE,OAAO,SAAS,IAAI,EAAE,KAAG,SAAS,EAQjG,CAAC;AAsCF,qDAAqD;AACrD,eAAO,MAAM,UAAU,GAAI,MAAM,SAAS,EAAE,OAAO,SAAS,KAAG,OAI9D,CAAC;AAEF,+DAA+D;AAC/D,eAAO,MAAM,SAAS,GAAI,MAAM,SAAS,EAAE,OAAO,SAAS,KAAG,OAI7D,CAAC"}

package/dist/facts/fact-values.js

@@ -1,5 +1,6 @@
 import { inDocumentOrder } from "../structure/issues.js";
 import { overlapsAny, spanIndex } from "../compare/spans.js";
+import { basesAgree } from "./rate-values.js";
 const attr = (node, name) => String(node.attrs[name] ?? "");
 /** 数の前に書いた単位（$300、$ 300）があれば、その始まり。木の数量は数から始まる。 */
 const startWithUnitBefore = (source, start, unit) => {
@@ -29,12 +30,22 @@ const nodeValue = (node, source) => {
 };
 /**
  * 単位を書かない数（「Seats: 40」）。前後が字や数や時刻の : でないもの。1.2.3 のような版の番号は数にしない。
- * 単位の無い数は、単位の無い数とだけ比べる。
+ * 単位の無い数は、単位の無い数とだけ比べる。後ろのコンマは、空白と語が続くとき（2, as declared）だけ数の終わり。数が続けば
+ * 並べた数（2, 3 or 4）、一語の後ろに数が続けば別の値（3, or 4）で、空白が無ければ桁の区切りの書き損じかもしれない。
  */
-const BARE_NUMBER = /(?<![\p{L}\p{N}.,:/-])[0-9０-９]+(?:[,，][0-9０-９]{3})*(?:[.．][0-9０-９]+)?(?![\p{L}\p{N}%:/,，-]|[.．][0-9０-９])/gu;
+const BARE_NUMBER = /(?<![\p{L}\p{N}.,:/-])[0-9０-９]+(?:[,，][0-9０-９]{3})*(?:[.．][0-9０-９]+)?(?![\p{L}\p{N}%:/-]|[.．][0-9０-９])/gu;
+const COMMA = /^[,，]$/u;
+const CLAUSE_AFTER_COMMA = /[,，]\s+\p{L}/uy;
+const VALUE_AFTER_COMMA_WORD = /[,，]\s+\p{L}+\s+[0-9０-９]/uy;
+const matchesAt = (pattern, source, offset) => {
+    pattern.lastIndex = offset;
+    return pattern.test(source);
+};
+/** 数の後ろのコンマが、文の続き（, as declared）の頭か。コンマが無ければ終わり。 */
+const endsBeforeComma = (source, end) => !COMMA.test(source.charAt(end)) || (matchesAt(CLAUSE_AFTER_COMMA, source, end) && !matchesAt(VALUE_AFTER_COMMA_WORD, source, end));
 const bareValues = (source, taken) => [...source.matchAll(BARE_NUMBER)].flatMap((match) => {
     const span = { start: match.index, end: match.index + match[0].length };
-    if (overlapsAny(taken, span))
+    if (!endsBeforeComma(source, span.end) || overlapsAny(taken, span))
         return [];
     const key = String(Number(match[0].normalize("NFKC").replace(/,/gu, "")));
     return [{ ...span, kind: "quantity", key, unit: "" }];
@@ -80,18 +91,20 @@ const comparableDates = (left, right) => {
     const pair = narrowed(right, left, a);
     return pair === undefined ? undefined : [pair[1], pair[0]];
 };
+/** 範囲は、上の端を言う値（上限か範囲）とだけ比べる。範囲の中のどれかの数（一人の年齢）とは比べない。 */
+const comparableBounds = (left, right) => (left.lower === undefined || right.bound === "upper") && (right.lower === undefined || left.bound === "upper");
 /** 同じ種類の値で、比べられるもの。数量は同じ単位どうし（単位の違いは別の rule が見る）。 */
 export const comparable = (left, right) => {
     if (left.kind !== right.kind)
         return false;
     if (left.kind === "quantity")
-        return left.unit === right.unit;
+        return left.unit === right.unit && comparableBounds(left, right) && basesAgree(left.basis, right.basis);
     return left.kind !== "date" || comparableDates(left.key, right.key) !== undefined;
 };
-/** 比べられる二つの値が同じか。月日だけの日付は、年まで書いた日付の月日と同じなら同じ。 */
+/** 比べられる二つの値が同じか。範囲どうしは下の端も比べる。月日だけの日付は、年まで書いた日付の月日と同じなら同じ。 */
 export const sameValue = (left, right) => {
     if (left.kind !== "date")
-        return left.key === right.key;
+        return left.key === right.key && (left.lower === undefined || right.lower === undefined || left.lower === right.lower);
     const pair = comparableDates(left.key, right.key);
     return pair !== undefined && pair[0] === pair[1];
 };

package/dist/facts/fact-values.js.map

@@ -1 +1 @@
-{"version":3,"file":"fact-values.js","sourceRoot":"","sources":["../../src/facts/fact-values.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fact-values.js","sourceRoot":"","sources":["../../src/facts/fact-values.ts"],"names":[],"mappings":"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"}

package/dist/facts/item-amounts.d.ts

@@ -0,0 +1,18 @@
+import { type Measured } from "./measures.ts";
+/**
+ * 表に量を書いた品物（材料の表の「しょうゆ｜大さじ1」）を、本文で違う単位の量と一緒に書いた所（しょうゆ30ml、30 ml of soy sauce）。
+ * 表の量は、行の最初の量（人数ごとの列があれば、手順が従う最初の列）。本文の量が表の量より多いときだけ言う。本文の名前は、量のすぐ前（空白一つまで）か、つなぐ語（の、of）と
+ * 冠詞（the）を挟んで量の後ろ。名前は語の切れ目で始まり終わる（「濃口しょうゆ」の しょうゆ は切れ目で始まるが、「強力粉」の 力粉 は始まらない）。
+ */
+export type ItemConflict = {
+    readonly name: string;
+    readonly measured: Measured;
+    readonly other: Measured;
+};
+export type ItemWords = {
+    readonly links: readonly string[];
+    readonly determiners: readonly string[];
+};
+/** 本文の量のうち、表の同じ品物の量と単位が違い、換算すると合わないもの。 */
+export declare const itemConflicts: (source: string, measured: readonly Measured[], words: ItemWords) => ItemConflict[];
+//# sourceMappingURL=item-amounts.d.ts.map

package/dist/facts/item-amounts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"item-amounts.d.ts","sourceRoot":"","sources":["../../src/facts/item-amounts.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAKrE;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE5G,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AA4DvG,0CAA0C;AAC1C,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,EAAE,UAAU,SAAS,QAAQ,EAAE,EAAE,OAAO,SAAS,KAAG,YAAY,EAmB3G,CAAC"}

package/dist/facts/item-amounts.js

@@ -0,0 +1,67 @@
+import { linesOf } from "../structure/lines.js";
+import { sameMeasure, sameUnit } from "./measures.js";
+import { cellsOf, tablesOf } from "./table-facts.js";
+import { withoutEdgeMarks } from "./trim-marks.js";
+import { toleranceOf } from "./unit-tolerance.js";
+const LETTER = /\p{L}/u;
+const SCRIPTS = [/\p{Script=Hiragana}/u, /[\p{Script=Katakana}ー]/u, /\p{Script=Han}/u, /\p{Script=Latin}/u];
+const NAME_WINDOW = 80;
+const keyOf = (text) => text.normalize("NFKC").toLowerCase();
+const scriptOf = (char) => SCRIPTS.findIndex((script) => script.test(char));
+/** 二つの字の間が語の切れ目か。字でない側があるか、字の種類（仮名、漢字、英字）が変わる所。英字どうしは続いている。 */
+const isBoundary = (left, right) => left === "" || right === "" || !LETTER.test(left) || !LETTER.test(right) || scriptOf(left) !== scriptOf(right);
+const cellValue = (cell, source, measured) => measured.find((value) => value.start >= cell.start && value.end <= cell.end && source.slice(value.start, value.end) === withoutEdgeMarks(cell.text));
+/** 表の行の見出しと、その行の最初の量。同じ名前の行が二つあれば最初の行。 */
+const tableAmounts = (source, rows, measured) => {
+    const amounts = rows.flatMap((row) => {
+        const [first, ...rest] = cellsOf(row);
+        const name = first === undefined ? "" : withoutEdgeMarks(first.text);
+        const value = rest.map((cell) => cellValue(cell, source, measured)).find((found) => found !== undefined);
+        if (first === undefined || value === undefined || !LETTER.test(name) || cellValue(first, source, measured) !== undefined)
+            return [];
+        return [{ name, key: keyOf(name), measured: value }];
+    });
+    return amounts.filter((amount, index) => amounts.findIndex((other) => other.key === amount.key) === index);
+};
+/** 量のすぐ前に名前があるか（しょうゆ大さじ1、soy sauce 30 ml）。 */
+const namedBefore = (source, value, key) => {
+    const end = source.charAt(value.start - 1) === " " ? value.start - 1 : value.start;
+    const head = keyOf(source.slice(Math.max(0, end - NAME_WINDOW), end));
+    return head.endsWith(key) && isBoundary(head.charAt(head.length - key.length - 1), key.charAt(0));
+};
+const skipSpace = (text) => (text.startsWith(" ") ? text.slice(1) : text);
+/** 頭の語を一つ落とす。英字の語は、後ろに空白が要る（of は offer の頭ではない）。 */
+const dropWord = (text, words) => {
+    const word = words.map(keyOf).find((candidate) => text.startsWith(candidate) && isBoundary(candidate.slice(-1), text.charAt(candidate.length)));
+    return word === undefined ? undefined : skipSpace(text.slice(word.length));
+};
+/** つなぐ語を挟んで、量の後ろに名前があるか（30mlのしょうゆ、30 ml of the soy sauce）。 */
+const namedAfter = (source, value, key, words) => {
+    const linked = dropWord(skipSpace(keyOf(source.slice(value.end, value.end + NAME_WINDOW))), words.links);
+    if (linked === undefined)
+        return false;
+    const rest = dropWord(linked, words.determiners) ?? linked;
+    return rest.startsWith(key) && isBoundary(key.slice(-1), rest.charAt(key.length));
+};
+/** 本文の量が、表の量をどう換算しても超えるか。表より少ない量は、その一部を使う所（牛乳の半分を先に）かもしれない。 */
+const exceeds = (value, listed) => value.factors.every((a) => listed.factors.every((b) => (value.amount - value.zero) * a > (listed.amount - listed.zero) * b));
+const inTable = (value, rows) => rows.some((row) => value.start >= row.start && value.end <= row.start + row.text.length);
+/** 本文の量のうち、表の同じ品物の量と単位が違い、換算すると合わないもの。 */
+export const itemConflicts = (source, measured, words) => {
+    const rows = tablesOf(linesOf(source)).flatMap((table) => [table.header, ...table.rows]);
+    const amounts = tableAmounts(source, rows, measured);
+    if (amounts.length === 0)
+        return [];
+    return measured
+        .filter((value) => !inTable(value, rows))
+        .flatMap((value) => {
+        const item = amounts.find(({ key, measured: listed }) => listed.dimension === value.dimension && (namedBefore(source, value, key) || namedAfter(source, value, key, words)));
+        if (item === undefined ||
+            sameUnit(item.measured, value) ||
+            sameMeasure(item.measured, value, toleranceOf(value.dimension)) ||
+            !exceeds(value, item.measured))
+            return [];
+        return [{ name: item.name, measured: value, other: item.measured }];
+    });
+};
+//# sourceMappingURL=item-amounts.js.map

package/dist/facts/item-amounts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"item-amounts.js","sourceRoot":"","sources":["../../src/facts/item-amounts.ts"],"names":[],"mappings":"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"}

package/dist/facts/labelled-facts.d.ts

@@ -1,4 +1,6 @@
 import type { FactValue } from "./fact-values.ts";
+import { type QualifierWords } from "./qualified-labels.ts";
+import { type RateWords } from "./rate-values.ts";
 /**
  * 名前の付いた値（「締切：10月5日」「参加費は3,000円です」"Fee: $300" "The deadline is May 3."）と、
  * 属性の言い回しに続く値（"headquartered in Austin"、「東京に本社を置く」）。
@@ -22,11 +24,27 @@ export type FactWords = {
     /** 名前の前に置かれる決定の前置き（協議の結果、, it was decided that）。読点を含んでも条件ではないので、外してから名前を読む。 */
     readonly leads: readonly string[];
     readonly attributes: readonly AttributePhrase[];
+    /** 率のまわりの、値を変えない語（年、per year、（固定金利））。 */
+    readonly rates?: RateWords;
+    /** 区切りと値のあいだに置ける目安の語（約、about）。あれば値を目安として読む。無ければ、区切りのすぐ後ろの値だけ。 */
+    readonly valueLeads?: readonly string[];
+    /** 名前に条件を付ける型（（*）、*の、for *）。条件の付いた名前は、名前と条件をそれぞれ一つの名前の長さで測る。 */
+    readonly qualifiers?: QualifierWords;
+    /** 計器の読みを言う動詞（read, shows）、計器の名前（odometer, meter）、読みのあとに置ける時の節の頭（when）。 */
+    readonly readings?: ReadingWords;
 };
+export type ReadingWords = {
+    readonly verbs: readonly string[];
+    readonly gauges: readonly string[];
+    readonly clauses: readonly string[];
+};
+/** approximate: 値の前に目安の語（約、about）があった。table: 表の升の値。 */
 export type Fact = {
     readonly label: string;
     readonly key: string;
     readonly value: FactValue;
+    readonly approximate?: boolean;
+    readonly table?: boolean;
 };
 /** 文に書いた名前付きの値。値ごとに、属性の言い回しか、区切りの前の名前を探す。 */
 export declare const labelledFacts: (source: string, values: readonly FactValue[], words: FactWords) => Fact[];

package/dist/facts/labelled-facts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"labelled-facts.d.ts","sourceRoot":"","sources":["../../src/facts/labelled-facts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAA;CAAE,CAAC;AAElG,MAAM,MAAM,SAAS,GAAG;IACtB,4CAA4C;IAC5C,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,qDAAqD;IACrD,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,4BAA4B;IAC5B,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,uBAAuB;IACvB,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,+EAA+E;IAC/E,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,SAAS,eAAe,EAAE,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AA4G/F,6CAA6C;AAC7C,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,EAAE,QAAQ,SAAS,SAAS,EAAE,EAAE,OAAO,SAAS,KAAG,IAAI,EAO/F,CAAC"}
+{"version":3,"file":"labelled-facts.d.ts","sourceRoot":"","sources":["../../src/facts/labelled-facts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAoB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAA+D,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE/G;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAA;CAAE,CAAC;AAElG,MAAM,MAAM,SAAS,GAAG;IACtB,4CAA4C;IAC5C,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,qDAAqD;IACrD,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,4BAA4B;IAC5B,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,uBAAuB;IACvB,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,+EAA+E;IAC/E,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,SAAS,eAAe,EAAE,CAAC;IAChD,yCAAyC;IACzC,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC;IAC3B,iEAAiE;IACjE,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,gEAAgE;IAChE,QAAQ,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC;IACrC,2EAA2E;IAC3E,QAAQ,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAE1I,uDAAuD;AACvD,MAAM,MAAM,IAAI,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AA8KzJ,6CAA6C;AAC7C,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,EAAE,QAAQ,SAAS,SAAS,EAAE,EAAE,OAAO,SAAS,KAAG,IAAI,EAO/F,CAAC"}