From 8f05fd75fd3d9be0fded5185a421a4ade0428b74 Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Wed, 28 Oct 2026 21:13:30 +0800 Subject: [PATCH] =?UTF-8?q?docs:=20WO91=20merge=20record=20=E2=80=94=20con?= =?UTF-8?q?flict=20resolution=20between=20the=20#211=20restore=20and=20the?= =?UTF-8?q?=20WO90=20batch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TODO.sota/91-wo91-din-bsi-ics-batch.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/TODO.sota/91-wo91-din-bsi-ics-batch.md b/TODO.sota/91-wo91-din-bsi-ics-batch.md index 16b3c65..35b3de4 100644 --- a/TODO.sota/91-wo91-din-bsi-ics-batch.md +++ b/TODO.sota/91-wo91-din-bsi-ics-batch.md @@ -60,3 +60,25 @@ and the DIN Yiddish column were read from high-resolution page crops No map is written for them; nothing is fabricated from the mojibake. - DIN subjects confirmed from title pages: 31636 = Hebrew (2018), 32708 = Japanese (2014), 1460-2 = non-Slavic Cyrillic (2011). + +## Merge record (2026-10-28) + +All campaign PRs rebase-merged on owner instruction: maps #211-#219 and +interscript-models #377. #215 (the 8-map batch) conflicted add/add with the +#211 restore, which had brought back earlier versions of five of the same +systems (ady, kbd, krc, sah, udm). Cross-running the test suites settled it: + +- kbd, krc, udm: main's versions passed 100% of my suites — content-equivalent, + mine retained for the fuller tests (506 vs 99 across the five) and the + source-anomaly notes. +- ady: main's version was RIGHT on one cell where mine was wrong — the capital + tied digraphs are Z͟H/S͟H (both capitals, U+035F over both) per the source's + own inventory note; my map corrected to Z͟H/S͟H (137/137) and the branch + rebased with my versions for all five. +- sah: main's version diverged from the source PDF — it rendered d as D’ and n + as N’ (a palatalization-apostrophe scheme) and did not render fita or the nje + ligature; the BGN/PCGN 2012 table itself specifies dj and ny. Mine retained + (89/89), and the divergence is recorded here. + +After the merge: corpus strict-parse 309/309; map-artifact CI green on the +resulting main push.