chaffjs 0.27.0 → 0.28.0

package/dist/structure/change-rate.js

@@ -7,11 +7,24 @@ const MARK_GAP = 3;
  * away, the rate is of something else in the sentence (「100店から120店に増え、売上は15%増えた」).
  */
 const BASE_REACH = 12;
+/**
+ * The two values written together, the earlier then the later or the other way round (「昨年の100万円から今年は150万円」
+ * "from $1.0 million last year to $1.5 million"): how far apart they may stand, and how far after them the rate may
+ * (「150万円になり、前年比20%」", an increase of 20%"). Measured with a Latin word counting as one character.
+ */
+const PAIR_GAP = 16;
+const PAIR_REACH = 16;
+/** How far a year may stand from the value it dates (「2025年の100万円」"$1.0 million in 2025"), a word counting as one. */
+const PERIOD_GAP = 8;
+const LATIN_WORD = /[A-Za-z]+/gu;
 const PERCENT = 100;
 const HALF = 0.5;
 const DECIMAL_BASE = 10;
 const within = (outer, inner) => inner.start >= outer.start && inner.end <= outer.end;
 const distance = (left, right) => Math.max(left.start - right.end, right.start - left.end, 0);
+const gapBetween = (left, right) => ({ start: left.end, end: right.start });
+/** The length of a gap, a Latin word counting as one character: "an increase of" is as short as 「前年比」. */
+export const gapLength = (source, gap) => source.slice(gap.start, gap.end).replaceAll(LATIN_WORD, "w").length;
 const markOf = (figure, marks) => marks.find((mark) => {
     const gap = mark.position === "after" ? mark.start - figure.end : figure.start - mark.end;
     return gap >= 0 && gap <= MARK_GAP;
@@ -43,29 +56,116 @@ const rateRange = (base, current) => {
         return undefined;
     return [(currentLow / baseHigh - 1) * PERCENT, (currentHigh / baseLow - 1) * PERCENT];
 };
-const issueIn = (text, sentence) => {
-    const rates = text.rates.filter((rate) => within(sentence, rate));
-    const figures = text.figures.filter((figure) => within(sentence, figure));
-    const [rate] = rates;
-    if (rates.length !== 1 || rate === undefined)
-        return [];
-    const sign = signNear(rate, text.directions.filter((direction) => within(sentence, direction)));
-    const bases = figures.filter((figure) => isBaseFor(figure, rate, text.marks));
+/** A word between the two that starts another subject or clause (「100万円から150万円に増え、利益は20%」). */
+const brokenBetween = (text, one, other) => {
+    const gap = one.end <= other.start ? gapBetween(one, other) : gapBetween(other, one);
+    return text.breaks.some((word) => within(gap, word));
+};
+/** The earlier value marked beside the rate, and the one value in its unit before the rate or marked as reached. */
+const besideRate = (text) => {
+    const bases = text.figures.filter((figure) => isBaseFor(figure, text.rate, text.marks) && !brokenBetween(text, figure, text.rate));
     const [base] = bases;
-    if (sign === undefined || bases.length !== 1 || base === undefined)
-        return [];
-    const currents = figures.filter((figure) => figure !== base && figure.unit === base.unit && isCurrentFor(figure, rate, text.targets));
+    if (bases.length !== 1 || base === undefined)
+        return undefined;
+    const currents = text.figures.filter((figure) => figure !== base && figure.unit === base.unit && isCurrentFor(figure, text.rate, text.targets));
     const [current] = currents;
-    const range = currents.length === 1 && current !== undefined ? rateRange(base, current) : undefined;
-    if (range === undefined || current === undefined)
+    return currents.length === 1 && current !== undefined ? { base, current } : undefined;
+};
+const yearsBeside = (text, figure, side, bound) => text.periods.filter((period) => {
+    const [left, right] = side === "before" ? [period, figure] : [figure, period];
+    return left.end <= right.start && within(bound, period) && gapLength(text.source, gapBetween(left, right)) <= PERIOD_GAP;
+});
+/**
+ * Of two values each dated by a year, the earlier year's. The years stand on the same side of both values: before them
+ * (「2025年は100万円、2026年は150万円」) or after them ("$1.0 million in 2025 and $1.5 million in 2026").
+ */
+const datedEarlier = (text, first, second) => {
+    const middle = gapBetween(first, second);
+    const sides = [
+        [yearsBeside(text, first, "before", { start: 0, end: first.start }), yearsBeside(text, second, "before", middle)],
+        [yearsBeside(text, first, "after", middle), yearsBeside(text, second, "after", { start: second.end, end: text.source.length })],
+    ].filter(([early, late]) => early?.length === 1 && late?.length === 1);
+    const [[early, late] = []] = sides;
+    const [firstYear, secondYear] = [early?.[0]?.year, late?.[0]?.year];
+    if (sides.length !== 1 || firstYear === undefined || secondYear === undefined || firstYear === secondYear)
+        return undefined;
+    return firstYear < secondYear ? first : second;
+};
+/** Which of two values written together is the earlier: the one marked (「から」, "from", 「前年の」), else the one dated earlier. */
+const pairOf = (text, first, second) => {
+    const marked = [first, second].filter((figure) => markOf(figure, text.marks) !== undefined);
+    if (marked.length > 1)
+        return undefined;
+    const base = marked[0] ?? datedEarlier(text, first, second);
+    if (base === undefined)
+        return undefined;
+    return { base, current: base === first ? second : first };
+};
+/** Nothing between the later value and the rate that makes the rate another one's: a value, another subject, another base. */
+const leadsTo = (text, second) => {
+    const gap = gapBetween(second, text.rate);
+    if (gap.start > gap.end || gapLength(text.source, gap) > PAIR_REACH)
+        return false;
+    return ![...text.figures, ...text.breaks, ...text.marks].some((span) => within(gap, span));
+};
+/** Two values of one subject written close, with no rate between them (「売上は100万円、費用は150万円」 is two subjects). */
+const standTogether = (text, first, second) => {
+    const gap = gapBetween(first, second);
+    const inGap = (span) => within(gap, span);
+    if (gapLength(text.source, gap) > PAIR_GAP || text.rates.some(inGap))
+        return false;
+    return !text.breaks.some((word) => !word.beforeRateOnly && inGap(word));
+};
+/** The two values written together right before the rate (「昨年の100万円から今年は150万円になり、前年比20%の増加」). */
+const beforeRate = (text) => {
+    const pairs = text.figures.flatMap((first, index) => {
+        const second = text.figures.slice(index + 1).find((figure) => figure.unit === first.unit);
+        const pair = second !== undefined && standTogether(text, first, second) && leadsTo(text, second) ? pairOf(text, first, second) : undefined;
+        return pair === undefined ? [] : [pair];
+    });
+    const [pair] = pairs;
+    return pairs.length === 1 ? pair : undefined;
+};
+/**
+ * The sentence's one rate with a word of direction beside it, a word counting for the rate it stands nearest. A percentage
+ * without one (「20%の増加、利益率は10%」) is about something else.
+ */
+const readingIn = (text, sentence) => {
+    const inSentence = (span) => within(sentence, span);
+    const directions = text.directions.filter(inSentence);
+    const rates = text.rates.filter(inSentence);
+    const nearestTo = (rate, direction) => rates.every((other) => distance(direction, rate) <= distance(direction, other));
+    const signed = rates.flatMap((rate) => {
+        const sign = signNear(rate, directions.filter((direction) => nearestTo(rate, direction)));
+        return sign === undefined ? [] : [{ rate, sign }];
+    });
+    const [only] = signed;
+    if (signed.length !== 1 || only === undefined)
+        return undefined;
+    const parts = {
+        figures: text.figures.filter(inSentence).toSorted((left, right) => left.start - right.start),
+        periods: text.periods.filter(inSentence),
+        breaks: text.breaks.filter(inSentence),
+    };
+    return { ...text, ...parts, ...only, rates };
+};
+const issueIn = (text, sentence) => {
+    const reading = readingIn(text, sentence);
+    const pair = reading === undefined ? undefined : (besideRate(reading) ?? beforeRate(reading));
+    const range = pair === undefined ? undefined : rateRange(pair.base, pair.current);
+    if (reading === undefined || pair === undefined || range === undefined)
         return [];
+    const { rate, sign } = reading;
     const written = sign * rate.value;
     const slack = HALF * DECIMAL_BASE ** -rate.decimals;
     if (written >= range[0] - slack && written <= range[1] + slack)
         return [];
-    const computed = Math.abs((current.value / base.value - 1) * PERCENT).toFixed(rate.decimals);
+    const computed = Math.abs((pair.current.value / pair.base.value - 1) * PERCENT).toFixed(rate.decimals);
     return [{ offset: rate.start, values: { rate: String(rate.value), computed } }];
 };
-/** Each sentence with one rate of change, one direction, one marked earlier value and one other value in its unit, that disagree. */
+/**
+ * Each sentence with one rate of change and its direction, and the two values it is computed from, that disagree: the
+ * earlier value marked beside the rate, or the two values written together right before it.
+ */
 export const changeRateMismatches = (text) => text.sentences.flatMap((sentence) => issueIn(text, sentence));
 //# sourceMappingURL=change-rate.js.map

package/dist/structure/change-rate.js.map

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

package/dist/structure/subject-change.d.ts

@@ -0,0 +1,8 @@
+import type { Token } from "../plugin.ts";
+/**
+ * The joining word at index is followed by a noun the sentence has not used before it: "and costs were", "and costs $1,500"
+ * after "Revenue was $1,000", where "and revenue was" after "ACME's revenue was $1,000" names the same thing again. A
+ * sentence with no noun before the joining word gives nothing to compare with.
+ */
+export declare const startsOtherSubject: (tokens: readonly Token[], index: number) => boolean;
+//# sourceMappingURL=subject-change.d.ts.map

package/dist/structure/subject-change.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subject-change.d.ts","sourceRoot":"","sources":["../../src/structure/subject-change.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAsB1C;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,QAAQ,SAAS,KAAK,EAAE,EAAE,OAAO,MAAM,KAAG,OAO5E,CAAC"}

package/dist/structure/subject-change.js

@@ -0,0 +1,31 @@
+// Whether a joining word ("and") starts a clause about another subject: "Revenue was $1,000 in 2025 and costs were $1,500
+// in 2026" joins two subjects, "… in 2025 and $1,500 in 2026" or "… and revenue was $1,500" one. Two words for one thing
+// ("sales" and "revenue") read as two subjects, so the pair is left alone rather than read wrongly. Pure: reads the tagger's
+// parts of speech and lemmas.
+const NOUN = new Set(["NOUN", "PROPN"]);
+/** Words that may stand before the noun that starts the clause ("and the costs", "and our operating costs"). */
+const BEFORE_NOUN = new Set(["DET", "ADJ", "PRON"]);
+const wordOf = (token) => (token.lemma ?? token.surface).toLowerCase();
+/** The last noun of the run of nouns at the start of tokens, past determiners and adjectives ("the operating costs" → cost). */
+const leadingNoun = (tokens) => {
+    const start = tokens.findIndex((token) => !BEFORE_NOUN.has(token.pos));
+    if (start < 0)
+        return undefined;
+    const end = tokens.slice(start).findIndex((token) => !NOUN.has(token.pos));
+    const nouns = tokens.slice(start, end < 0 ? tokens.length : start + end);
+    return nouns.at(-1);
+};
+/**
+ * The joining word at index is followed by a noun the sentence has not used before it: "and costs were", "and costs $1,500"
+ * after "Revenue was $1,000", where "and revenue was" after "ACME's revenue was $1,000" names the same thing again. A
+ * sentence with no noun before the joining word gives nothing to compare with.
+ */
+export const startsOtherSubject = (tokens, index) => {
+    const next = leadingNoun(tokens.slice(index + 1));
+    const before = tokens
+        .slice(0, index)
+        .filter((token) => NOUN.has(token.pos))
+        .map(wordOf);
+    return next !== undefined && before.length > 0 && !before.includes(wordOf(next));
+};
+//# sourceMappingURL=subject-change.js.map

package/dist/structure/subject-change.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subject-change.js","sourceRoot":"","sources":["../../src/structure/subject-change.ts"],"names":[],"mappings":"AAEA,0HAA0H;AAC1H,yHAAyH;AACzH,6HAA6H;AAC7H,8BAA8B;AAE9B,MAAM,IAAI,GAAwB,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAC7D,gHAAgH;AAChH,MAAM,WAAW,GAAwB,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;AAEzE,MAAM,MAAM,GAAG,CAAC,KAAY,EAAU,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;AAEtF,gIAAgI;AAChI,MAAM,WAAW,GAAG,CAAC,MAAwB,EAAqB,EAAE;IAClE,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACvE,IAAI,KAAK,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAChC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3E,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC;IACzE,OAAO,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACtB,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAAwB,EAAE,KAAa,EAAW,EAAE;IACrF,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,MAAM;SAClB,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC;SACf,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACtC,GAAG,CAAC,MAAM,CAAC,CAAC;IACf,OAAO,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AACnF,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chaffjs",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "Prose validation harness. Finds what is hard to read, and never rewrites it for you.",
   "keywords": [
     "chaff",
@@ -87,8 +87,8 @@
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.125.0",
-    "@chaffjs/lang-en": "0.24.0",
-    "@chaffjs/lang-ja": "0.26.0",
+    "@chaffjs/lang-en": "0.25.0",
+    "@chaffjs/lang-ja": "0.27.0",
     "mdast-util-from-markdown": "^2.0.3",
     "mdast-util-frontmatter": "^2.0.1",
     "mdast-util-gfm-table": "^2.0.0",

package/rules/amount-scale-consistency.yaml

@@ -0,0 +1,74 @@
+id: amount-scale-consistency
+layer: L2
+status: stable
+how_to_find: amount-scale
+severity: info
+
+name:
+  ja: 同じ桁の金額を二通りに書いている
+  en: Amounts of one size written two ways
+
+why:
+  ja: 「設計費30万円、制作費250,000円」のように、同じくらいの金額を「万」と数字だけの二通りで書くと、読み手は桁を数え直し、別の扱いの金額かと迷います。別々の見積もりやメールを寄せ集めたときに起きます。小さな金額を数字で、大きな金額を「万」「億」で書くのはふつうの書き方なので、同じ桁（十万の位なら十万の位どうし）の金額だけを比べ、その桁で少ないほうを指します。
+  en: When amounts of one size are written two ways ("$1.5 million for design, $2,500,000 for building"), the reader counts the zeros again and wonders whether the two are different kinds of amount. It happens when quotes and emails are pasted together. Small amounts in digits and large ones with "million" is a normal way of writing, so only amounts of the same order of magnitude are compared, and the way that order uses less is pointed at.
+
+message:
+  ja: 「{written}」と書いています（この文書は同じ桁の金額を「{usual}」のように書きます）
+  en: '"{written}" here, where the document writes amounts of this size like "{usual}"'
+
+how_to_fix:
+  ja: 同じ桁の金額は、文書の多いほうの書き方にそろえてください。
+  en: Write amounts of the same size the way the rest of the document does.
+
+levels: { strict: warning, normal: info, relaxed: info }
+
+use_for: [business, technical, blog, legal, docs, academic, literature, speech]
+
+group: consistency
+summary:
+  ja: 「30万円」と「250,000円」のように、同じ桁の金額を「万」と数字だけの二通りで書いている所
+  en: Amounts of one order of magnitude written both with and without a word of scale, such as "$1.5 million" and "$2,500,000"
+example:
+  ja:
+    before: |
+      お見積もりの総額は55万円です。内訳は、設計費30万円、制作費250,000円です。
+    after: |
+      お見積もりの総額は55万円です。内訳は、設計費30万円、制作費25万円です。
+  en:
+    before: |
+      The total is $4 million: $1.5 million for design and $2,500,000 for building.
+    after: |
+      The total is $4 million: $1.5 million for design and $2.5 million for building.
+
+not_flagged:
+  ja: 桁の違う金額（「480円」と「30万円」）は比べません。小さな金額は数字で、大きな金額は「万」で書くのはふつうの書き方です。端数のある金額（「1,234,567円」）は「万」で書けないので比べません。通貨ごとに比べ、コードの中は読みません。
+  en: Amounts of different sizes ("$480" and "$3 million") are not compared; digits for small amounts and "million" for large ones is a normal way of writing. A precise amount ("$1,234,567") cannot be written with "million" and is not compared. Each currency is compared with itself, and code is not read.
+level_meaning:
+  ja: 同じ桁の金額を二通りに書いたとき、少ないほうを指摘
+  en: reported when amounts of one size are written two ways, at the less common way
+
+rewrite:
+  ja:
+    direction: 同じ桁の金額を、文書で多いほうの書き方にそろえてください。金額そのものは変えません。
+    pairs:
+      - before: 設計費30万円、制作費250,000円
+        after: 設計費30万円、制作費25万円
+      - before: 上限は5,000,000円とする。前項の上限額500万円には
+        after: 上限は5,000,000円とする。前項の上限額5,000,000円には
+    keep:
+      - 金額
+      - どの通貨か
+    avoid:
+      - 桁の違う金額まで同じ書き方にそろえる
+  en:
+    direction: Write amounts of the same size the way the document mostly does. Keep the amounts as they are.
+    pairs:
+      - before: $1.5 million for design and $2,500,000 for building
+        after: $1.5 million for design and $2.5 million for building
+      - before: The cap is $5,000,000. The cap of $5 million includes legal fees.
+        after: The cap is $5,000,000. The cap of $5,000,000 includes legal fees.
+    keep:
+      - the amounts
+      - which currency each amount is in
+    avoid:
+      - rewriting amounts of a different size to match

package/rules/change-rate-mismatch.yaml

@@ -3,6 +3,7 @@ layer: L3
 status: stable
 how_to_find: change-rate
 requires: [structure]
+uses: [pos]
 severity: warning
 
 name:
@@ -10,8 +11,8 @@ name:
   en: A rate of change the two values do not give
 
 why:
-  ja: 「前年同月の1,000社から20%増えて1,200社」のように、もとの値・今の値・増減率を一つの文に書くと、読み手は率を確かめずに信じます。数字を一つだけ更新したとき、率だけを去年の文書から写したときに食い違います。一つの文に、もとの値（「から」「に比べて」の付いた値）、同じ単位の今の値、向きの語（増加、減少）の付いた百分率が一つずつあるとき、二つの値から率を計算して比べます。値は書いた桁までの丸めを認めます（12億円は11.5億円から12.5億円のどれか）。
-  en: When one sentence gives the earlier value, the current one and the rate of change ("1,200 companies, up 20% from 1,000"), readers trust the rate without checking it. It goes wrong when one figure is updated and the others are not, or when the rate is copied from last year's text. When a sentence has one earlier value (marked by "from" or "compared with"), one current value in the same unit, and one percentage with a word of direction (up, decline), chaff computes the rate from the two values and compares. Each value may be rounded to its last written digit ($12 million is anything from $11.5 million to $12.5 million).
+  ja: 「前年同月の1,000社から20%増えて1,200社」のように、もとの値・今の値・増減率を一つの文に書くと、読み手は率を確かめずに信じます。数字を一つだけ更新したとき、率だけを去年の文書から写したときに食い違います。一つの文に、もとの値（「から」「に比べて」「前年の」の付いた値）、同じ単位の今の値、向きの語（増加、減少）の付いた百分率が一つずつあるとき、二つの値から率を計算して比べます。率のそばにもとの値が無くても、「昨年の100万円から今年は150万円になり、前年比50%の増加」「2025年度は100万円、2026年度は150万円で」のように二つの値が並んですぐ後に率が続くなら読みます（年が書いてあれば早い年の値がもとの値）。値は書いた桁までの丸めを認めます（12億円は11.5億円から12.5億円のどれか）。
+  en: When one sentence gives the earlier value, the current one and the rate of change ("1,200 companies, up 20% from 1,000"), readers trust the rate without checking it. It goes wrong when one figure is updated and the others are not, or when the rate is copied from last year's text. When a sentence has one earlier value (marked by "from" or "compared with"), one current value in the same unit, and one percentage with a word of direction (up, decline), chaff computes the rate from the two values and compares. The two values may also stand together right before the rate ("rose from $1.0 million last year to $1.5 million, an increase of 50%", "$1.0 million in 2025 and $1.5 million in 2026, up 50%"; with years, the earlier year's value is the earlier one). Each value may be rounded to its last written digit ($12 million is anything from $11.5 million to $12.5 million).
 
 message:
   ja: 「{rate}%」と書いていますが、二つの値からは {computed}% です
@@ -36,9 +37,9 @@ example:
     before: 利用企業は1,300社となり、前年の1,000社から20%増えました。
     after: 利用企業は1,300社となり、前年の1,000社から30%増えました。
   en:
-    before: 1,300 companies used the app, up 20% from 1,000 companies a year earlier.
-    after: 1,300 companies used the app, up 30% from 1,000 companies a year earlier.
+    before: Revenue was $1.0 million in 2025 and $1.5 million in 2026, up 20%.
+    after: Revenue was $1.0 million in 2025 and $1.5 million in 2026, up 50%.
 
 not_flagged:
-  ja: 率が二つある文、もとの値が「から」「に比べて」で名指されていない文、同じ単位の今の値が一つでない文、向きの語が率のそばに無い文は比べません。「前年比20%増」のように値が一つしか無いもの、ポイントの差、倍は見ません。丸めで届く範囲の率は言いません。
-  en: 'A sentence with two rates, with no value marked as the earlier one, with no single current value in the same unit, or with no word of direction beside the rate is not compared. A change given with one value ("up 20% year on year"), percentage points and "times" are not read. A rate the rounding of the values can reach is not reported.'
+  ja: 向きの語の付いた率が二つある文、もとの値が「から」「に比べて」や年で名指されていない文、二つの値と率のあいだで主語が変わる文（「…に増え、利益は20%増えた」）、二つの値のあいだで主語が変わる文（"$1,000 in 2025 and costs were $1,500 in 2026"）、同じ単位の今の値が一つでない文、向きの語が率のそばに無い文は比べません。「前年比20%増」のように値が一つしか無いもの、ポイントの差、倍は見ません。丸めで届く範囲の率は言いません。
+  en: 'A sentence with two rates that each have a word of direction, with no value marked as the earlier one (by a word or a year), with another subject between the values and the rate ("…, and costs rose 20%") or between the two values ("$1,000 in 2025 and costs were $1,500 in 2026"), with no single current value in the same unit, or with no word of direction beside the rate is not compared. A change given with one value ("up 20% year on year"), percentage points and "times" are not read. A rate the rounding of the values can reach is not reported.'

package/rules/elapsed-years-mismatch.yaml

@@ -10,8 +10,8 @@ name:
   en: A count of years that does not match its starting year
 
 why:
-  ja: 「2015年創業」と書いた文書の「創業5年」や、「1980年生まれ（30歳）」は、どちらかが古いままです。去年の文書を写して日付だけ直したときによく起きます。文書の日付（日付だけの段落や「更新日：」の段落）の年から起点の年を引き、書いた年数と比べます。誕生日の前後や「10年目」の数え方があるので、一年までの違いは指しません。
-  en: 'A document that says "founded in 2015" and "5 years since its founding", or "born in 1980 (aged 30)", has kept one figure from an older version. It happens when last year''s document is copied and only the date is changed. The starting year is taken from the document''s own date (a paragraph holding only a date, or "Updated:") and compared with the count of years. A difference of one year is not pointed out, because of birthdays and of counting the tenth year as 10.'
+  ja: 「2015年創業」と書いた文書の「創業5年」や、「1980年生まれ（30歳）」は、どちらかが古いままです。去年の文書を写して日付だけ直したときによく起きます。文書の日付（日付だけの段落や「更新日：」の段落）の年から起点の年を引き、書いた年数と比べます。誕生日の前後や「10年目」の数え方があるので、一年までの違いは指しません。英語の文書で語で書いた年数（ten years since its founding）も読みます。
+  en: 'A document that says "founded in 2015" and "5 years since its founding", or "born in 1980 (aged 30)", has kept one figure from an older version. It happens when last year''s document is copied and only the date is changed. The starting year is taken from the document''s own date (a paragraph holding only a date, or "Updated:") and compared with the count of years. A difference of one year is not pointed out, because of birthdays and of counting the tenth year as 10. A count written as a word ("ten years since its founding") is read as well.'
 
 message:
   ja: "{origin}から{reference}年までは{expected}年ですが、「{written}」と書かれています"

package/rules/name-variant.yaml

@@ -24,6 +24,9 @@ messages:
   reading:
     ja: 「{name}」は、ほかの所では同じ読みの「{usual}」と書いています
     en: '"{name}" is written "{usual}", read the same, elsewhere in the document'
+  character:
+    ja: 「{name}」は、ほかの所では字体の違う同じ字で「{usual}」と書いています
+    en: '"{name}" is written "{usual}", with another form of the same character, elsewhere in the document'
   near:
     ja: 「{name}」は、ほかの所で何度も書いた「{usual}」と一字違いです
     en: '"{name}" is one letter away from "{usual}", which the document uses more than once'
@@ -61,8 +64,8 @@ example:
       The code lives on GitHub. Reviews happen on GitHub, and releases are tagged on GitHub.
 
 not_flagged:
-  ja: 品詞解析が固有名詞と読んだ語だけを見ます。大文字だけの名前（ACME INC、NASA）は見ません。一字違いの英字の名前は、6 字以上で、多いほうが二度以上、少ないほうが一度だけのときに限ります（Iran と Iraq は別の名前）。
-  en: Only words the tagger reads as proper nouns are checked. Names in capitals only (ACME INC, NASA) are left out. Names one letter apart are reported only when six letters or longer, with the usual form used at least twice and the other once (Iran and Iraq are different names).
+  ja: 品詞解析が固有名詞と読んだ語だけを見ます。大文字だけの名前（ACME INC、NASA）は見ません。一字違いの英字の名前は、6 字以上で、多いほうが二度以上、少ないほうが一度だけのときに限ります（Iran と Iraq は別の名前）。人の名前どうしは、字体の違う同じ字（斎藤 と 斉藤、渡辺 と 渡邊）か、読みが同じで一字だけ違い、多いほうが二度以上、少ないほうが一度だけのとき（松本 と 松元）に限ります（伊藤 と 伊東 は別の人のことがある）。人の名前とは、品詞解析が人名と読んだ語か、「様」「さん」「氏」の付いた名前です（解析器が名前と読めない字体の字を含む名前は、敬称の前の 2〜4 字の漢字を名前と読みます）。
+  en: Only words the tagger reads as proper nouns are checked. Names in capitals only (ACME INC, NASA) are left out. Names one letter apart are reported only when six letters or longer, with the usual form used at least twice and the other once (Iran and Iraq are different names). Two Japanese person names are compared only when written with another form of the same character (斎藤 and 斉藤), or read the same with one character different, the usual form used at least twice and the other once (松本 and 松元); 伊藤 and 伊東 can be two people. A person's name is one the tagger reads as such, or one followed by 様, さん or 氏 (when a name holds a character form the tagger cannot read, the two to four kanji before the honorific are taken as the name).
 rewrite:
   depth: light
   ja:

package/rules/summary-fact-mismatch.yaml

@@ -11,8 +11,8 @@ name:
   en: A summary value that differs from the body
 
 why:
-  ja: 冒頭や「概要」の節は、本文を読まない人も読みます。そこに書いた値が本文と違うと、要約だけを読んだ人が間違った値を持ち帰ります。本文を直したあとに、要約を直し忘れると起きます。最初の見出しより前の文と、概要・要約・まとめの節の「項目：値」「項目は値です」を、本文の同じ項目の値と比べます。本文の値が一通りに揃っていて、要約の値がそれと違うときだけ指します。
-  en: 'The opening and the summary are read by people who never read the body. A value there that differs from the body sends them away with the wrong one. It happens when the body is corrected and the summary is not. Values written as "Item: value" or "The item is value" before the first heading, or in a section headed Summary, Abstract or Overview, are compared with the body''s values for the same item; it is pointed out only when the body gives one value throughout and the summary gives another.'
+  ja: 冒頭や「概要」の節は、本文を読まない人も読みます。そこに書いた値が本文と違うと、要約だけを読んだ人が間違った値を持ち帰ります。本文を直したあとに、要約を直し忘れると起きます。最初の見出しより前の文と、概要・要約・まとめの節の「項目：値」「項目は値です」を、本文の同じ項目の値と比べます。英語の文書では、名前の無い数も、数える動詞と数えるもの（We gained 52 new customers）が同じ本文の数と比べます。本文の値が一通りに揃っていて、要約の値がそれと違うときだけ指します。
+  en: 'The opening and the summary are read by people who never read the body. A value there that differs from the body sends them away with the wrong one. It happens when the body is corrected and the summary is not. Values written as "Item: value" or "The item is value" before the first heading, or in a section headed Summary, Abstract or Overview, are compared with the body''s values for the same item, and so is a count with no label, by the verb and the words of what it counts ("We gained 52 new customers"); it is pointed out only when the body gives one value throughout and the summary gives another.'
 
 message:
   ja: 冒頭・要約の「{label}」 {value} が、本文の {other} と違います

package/src/cli-text.ts

@@ -43,9 +43,10 @@ const USAGE_JA = `chaff — 文章の読みにくいところを見つけます
   chaff facts <file>                     compare が照合する事実を、書き直す前の控えとして一覧にする
   chaff outline <file> [<後>]            見出しの構成と形（見出しの数・節の平均の長さ・箇条書きの割合・太字）を測る。2 つなら前と後を並べる
   chaff ai-score <file>... [--format json]  AI らしさの簡易判定（低・中・高）。生成文に多い目印を、同じジャンルの人の文書と比べる（書いたのが AI かは判定しない）
-  chaff grade <items.jsonl> [--out <results.jsonl>] [--json]
+  chaff grade <items.jsonl> [--out <results.jsonl>] [--baseline <前の results.jsonl>] [--compact] [--json]
                                  AI の出力を JSONL でまとめて採点する（指摘の率・事実・引用・合否。何も送らない）
-  chaff fix-plan <file> [--json]         指摘をルールごとにまとめ、直す方向と確かめのコマンドを、書き直す人や AI 向けの計画にする（何も送らない）
+  chaff fix-plan <file> [--depth light|structure|register] [--json]
+                                 指摘をルールごとにまとめ、直す方向と確かめのコマンドを、書き直す人や AI 向けの計画にする（何も送らない）
   chaff rules                    ルールの一覧を、グループごとに表で出す（いまの段階つき）
   chaff rules --json             いまの設定とルールの説明を JSON で出す（AI に渡す用）
   chaff baseline <dir>           いまある指摘を棚上げする（既存の repo に入れるとき）
@@ -90,9 +91,10 @@ const USAGE_EN = `chaff — finds what makes writing hard to read. It never rewr
   chaff facts <file>                      list the facts compare checks, as an inventory to keep before a rewrite
   chaff outline <file> [<after>]          measure the outline and its shape (headings, average section length, text in lists, bold); two files side by side
   chaff ai-score <file>... [--format json]  quick AI-likeness score (low, medium, high): signs common in generated text against human documents of the genre (not a verdict on who wrote it)
-  chaff grade <items.jsonl> [--out <results.jsonl>] [--json]
+  chaff grade <items.jsonl> [--out <results.jsonl>] [--baseline <earlier results.jsonl>] [--compact] [--json]
                                  grade a JSONL file of model outputs (finding rates, facts, quotations, pass or fail; sends nothing)
-  chaff fix-plan <file> [--json]          a plan for whoever rewrites the file, a person or an AI: findings by rule, how to rewrite each, the checks to run after (sends nothing)
+  chaff fix-plan <file> [--depth light|structure|register] [--json]
+                                 a plan for whoever rewrites the file, a person or an AI: findings by rule, how to rewrite each, the checks to run after (sends nothing)
   chaff rules                    the rules as a table, by group, with the level each runs at now
   chaff rules --json             the current settings and what each rule is, as JSON (to give to an AI)
   chaff baseline <dir>           shelve today's findings (when adding chaff to an existing repository)

package/src/derived/number-word-counts.ts

@@ -0,0 +1,28 @@
+import type { Span } from "../plugin.ts";
+import { escapeRegExp } from "../orthography.ts";
+
+// A count written as a word before its unit ("twelve years", "Ten years"), which the tree does not read as a quantity.
+// Pure: the number words come in order from one (the lexicon count-number, the position is the number).
+
+export type WordCount = Span & { readonly amount: number };
+
+const alternation = (words: readonly string[]): string =>
+  words
+    .filter((word) => word !== "")
+    .map(escapeRegExp)
+    .join("|");
+
+/**
+ * Each number word standing as a word of its own, followed by one of the units after a space. A word joined to letters,
+ * digits or a dash on either side is the tail of a larger number (二十年's 十, "twenty-one years", "fortyten").
+ */
+export const numberWordCounts = (source: string, numberWords: readonly string[], units: readonly string[]): WordCount[] => {
+  const [words, unitWords] = [alternation(numberWords), alternation(units)];
+  if (words === "" || unitWords === "") return [];
+  const pattern = new RegExp(`(?<![\\p{L}\\p{N}\\p{Pd}])(${words})\\s+(?:${unitWords})(?![\\p{L}\\p{N}])`, "giu");
+  const lowered = numberWords.map((word) => word.toLowerCase());
+  return [...source.matchAll(pattern)].flatMap((match) => {
+    const position = lowered.indexOf((match[1] ?? "").toLowerCase());
+    return position < 0 ? [] : [{ start: match.index, end: match.index + match[0].length, amount: position + 1 }];
+  });
+};

package/src/detectors/amount-scale.ts

@@ -0,0 +1,63 @@
+// amount-scale-consistency: the reading half. The amounts are currency-notation's (the lexicon currency-notation says
+// how a currency is written); the words of scale and their values are the lexicon amount-multiplier (weight).
+import type { Detector, Finding, ProseDocument } from "../plugin.ts";
+import { escapeRegExp } from "../orthography.ts";
+import { amountValue, scaleMixes, type ScaleWord, type ScaledAmount } from "../structure/amount-scale.ts";
+import { AMOUNT, amountsIn, formsOf, type WrittenAmount } from "./currency-notation.ts";
+import { quoteAround } from "./quote-around.ts";
+
+/** How far back a larger part of one amount may start (1億2,000万円 is read from 2,000万円). */
+const LEADING_REACH = 40;
+
+const scaleWordsOf = (doc: ProseDocument): ScaleWord[] =>
+  (doc.lexicons["amount-multiplier"] ?? []).flatMap((entry) => (entry.weight === undefined ? [] : [{ word: entry.pattern, value: entry.weight }]));
+
+/** The larger parts written right before an amount the currency notation read from its last part (1億 before 2,000万円). */
+const leadingParts = (text: string, offset: number, words: readonly ScaleWord[]): string => {
+  if (words.length === 0) return "";
+  const scales = words.map((word) => escapeRegExp(word.word)).join("|");
+  const before = text.slice(Math.max(0, offset - LEADING_REACH), offset);
+  return new RegExp(`(?<![0-9０-９.,，])(?:${AMOUNT}(?:${scales}))+$`, "u").exec(before)?.[0] ?? "";
+};
+
+/** The written amount without its currency mark, which is on the side its form says. */
+const numberPart = (amount: WrittenAmount): string => {
+  const [position = "", ...mark] = amount.form.split(":");
+  const pattern = mark.join(":");
+  return position === "before" ? amount.written.trimStart().slice(pattern.length) : amount.written.trimEnd().slice(0, -pattern.length);
+};
+
+/** The largest word of scale written in the number (万 in 1億2,000万 is smaller than 億), undefined when there is none. */
+const unitOf = (number: string, words: readonly ScaleWord[]): number | undefined => {
+  const lower = number.toLowerCase();
+  const values = words.filter((word) => lower.includes(word.word.toLowerCase())).map((word) => word.value);
+  return values.length === 0 ? undefined : Math.max(...values);
+};
+
+const scaledAmountsOf = (text: string, amounts: readonly WrittenAmount[], words: readonly ScaleWord[]): ScaledAmount[] =>
+  amounts.flatMap((amount) => {
+    const leading = amount.form.startsWith("after:") ? leadingParts(text, amount.offset, words) : "";
+    const written = `${leading}${amount.written}`;
+    const number = `${leading}${numberPart(amount)}`;
+    const value = amountValue(number, words);
+    if (value === undefined) return [];
+    return [{ offset: amount.offset - leading.length, written, currency: amount.currency, value, unit: unitOf(number, words) }];
+  });
+
+export const amountScale: Detector = (doc): Finding[] => {
+  const text = doc.prose ?? doc.source;
+  const words = scaleWordsOf(doc);
+  const amounts = amountsIn(
+    text,
+    formsOf(doc),
+    words.map((word) => word.word),
+  );
+  return scaleMixes(scaledAmountsOf(text, amounts, words)).map(({ odd, usual }) => ({
+    rule: "amount-scale-consistency",
+    severity: "info",
+    line: 0,
+    column: 0,
+    quote: quoteAround(text, odd.offset, odd.offset + odd.written.length),
+    values: { written: odd.written.trim(), usual: usual.written.trim(), offset: odd.offset },
+  }));
+};