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 かんじ 漢字 幹事 感じ えがお 笑顔 きごう 記号 普通