From 42568ab020d36b1ea9f85ba34d6132ed9fc58380 Mon Sep 17 00:00:00 2001 From: Hojun-Cho Date: Mon, 17 Aug 2026 01:49:45 +0900 Subject: [PATCH] build, data: skk2ktrans keeps the SKK header; the recipe names every generator; an inert config line goes An SKK dictionary's ";;" header carries its license notice, which LICENSES/README.md relies on for kanji.dict, and skk2ktrans dropped every ";;" line: a re-import as map/README describes lost the grant. The leading comment block is kept now. README's regenerate-and-verify recipe omitted mktelex.py although verify-map checks its output; and the Dockerfile set a shell variable named egrep in plan9's config that 9c never reads, calling egrep by name. --- Dockerfile | 1 - README.md | 8 +++++--- map/skk2ktrans | 8 +++++++- tests/data/skk/expected.tsv | 1 + 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index be03e9c..b5169eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,6 @@ RUN export DEBUGINFOD_URLS=https://debuginfod.archlinux.org \ "$debugdir/${buildid#??}.debug" \ && rm -rf /root/.cache/debuginfod_client -RUN printf "egrep='grep -E'\n" > /usr/lib/plan9/config RUN dbus-uuidgen --ensure=/etc/machine-id ENV PLAN9=/usr/lib/plan9 diff --git a/README.md b/README.md index c074a15..2269a77 100644 --- a/README.md +++ b/README.md @@ -183,16 +183,18 @@ is not started and the popup is disabled. ## Dictionary data -After changing an input source, regenerate and verify the dictionaries: +After changing an input source, regenerate and verify the maps and +dictionaries: ```sh +python3 map/mktelex.py >map/telex.map map/mkemoji >map/emoji.dict map/mkhanja >map/hanja.dict make verify-map ``` -See [`map/README`](map/README) for Hanja import and Japanese dictionary -generation. +See [`map/README`](map/README) for the emoji, Hanja, and Japanese data and +where it comes from. ## Benchmark diff --git a/map/skk2ktrans b/map/skk2ktrans index a00157e..8732469 100755 --- a/map/skk2ktrans +++ b/map/skk2ktrans @@ -36,10 +36,16 @@ function add(k, v, id) { row[k] = row[k] " " row[k] = row[k] v } -/^;;/ || /^[[:space:]]*$/ { +/^;;/ { + if(!body) # the header, with its license notice, is kept + print + next +} +/^[[:space:]]*$/ { next } { + body = 1 if(!match($0, /[[:space:]]+/)) fail("missing candidate list") key = substr($0, 1, RSTART-1) diff --git a/tests/data/skk/expected.tsv b/tests/data/skk/expected.tsv index 9f2a6ae..d2b5a06 100644 --- a/tests/data/skk/expected.tsv +++ b/tests/data/skk/expected.tsv @@ -1,3 +1,4 @@ +;; converter fixture; the test transcodes this file to EUC-JP かんじ 漢字 幹事 感じ えがお 笑顔 きごう 記号 普通