skk-dev の SKK-JISYO.emoji を含めて skkdic-expr2 で結合するよう修正

nanasess · Sep 2, 2024 · 39a2239 · 39a2239
1 parent 9a77be2
commit 39a2239
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/.emacs.d/bin/skkdic-maintenance.sh b/.emacs.d/bin/skkdic-maintenance.sh
@@ -14,7 +14,8 @@ while read -r line; do
     iconv -f euc-jisx0213 -t utf8 "${line}" \
         | sed -e 's/coding: euc-jp/coding: utf-8/g' \
         | sed -e 's/coding: euc-jis-2004/coding: utf-8/g' \
-              > "${ONEDRIVE_DIR}/${line}.utf8"
+              > "${line}.utf8"
+    cp -p "${line}.utf8" "${ONEDRIVE_DIR}/${line}.utf8"
 done < <(cat <<EOF
 SKK-JISYO.JIS2
 SKK-JISYO.JIS2004
@@ -47,20 +48,24 @@ EOF
 
 iconv -f euc-jisx0213 -t utf8 SKK-JISYO.edict \
     | sed -e 's/coding: euc-jp/coding: utf-8/g' \
-          > "${ONEDRIVE_DIR}/SKK-JISYO.edict.utf8"
+          > SKK-JISYO.edict.utf8
 iconv -f euc-jisx0213 -t utf8 zipcode/SKK-JISYO.zipcode \
     | sed -e 's/coding: euc-jis-2004/coding: utf-8/g' \
-          > "${ONEDRIVE_DIR}/SKK-JISYO.zipcode.utf8"
+          > SKK-JISYO.zipcode.utf8
 iconv -f euc-jisx0213 -t utf8 zipcode/SKK-JISYO.office.zipcode \
     | sed -e 's/coding: euc-jis-2004/coding: utf-8/g' \
-          > "${ONEDRIVE_DIR}/SKK-JISYO.office.zipcode.utf8"
+          > SKK-JISYO.office.zipcode.utf8
+cp -rp SKK-JISYO.edict.utf8 "${ONEDRIVE_DIR}/SKK-JISYO.edict.utf8"
+cp -rp SKK-JISYO.zipcode.utf8 "${ONEDRIVE_DIR}/SKK-JISYO.zipcode.utf8"
+cp -rp "${ONEDRIVE_DIR}/SKK-JISYO.office.zipcode.utf8" SKK-JISYO.office.zipcode.utf8
 
 curl -O https://raw.githubusercontent.com/uasi/skk-emoji-jisyo/master/SKK-JISYO.emoji.utf8
 cp -rp SKK-JISYO.emoji.utf8 "${ONEDRIVE_DIR}/SKK-JISYO.emoji.utf8"
 
 curl -sS https://raw.githubusercontent.com/ymrl/SKK-JISYO.emoji-ja/master/SKK-JISYO.emoji-ja.utf8 | skkdic-sort > SKK-JISYO.emoji-ja.utf8
 cp -rp SKK-JISYO.emoji-ja.utf8 "${ONEDRIVE_DIR}/SKK-JISYO.emoji-ja.utf8"
 
+curl -sS https://raw.githubusercontent.com/skk-dev/dict/master/SKK-JISYO.emoji > SKK-JISYO.emoji_official.utf8
 # see https://github.com/eidera/skktools/blob/master/scripts/run.bash
 
 skkdic-expr2 \
@@ -80,10 +85,25 @@ skkdic-expr2 \
     SKK-JISYO.JIS3_4 \
     > SKK-JISYO.all.euc-jisx0213
 
-cat <(iconv -f euc-jisx0213 -t utf8 SKK-JISYO.all.euc-jisx0213) \
-    <(cat SKK-JISYO.emoji.utf8) \
-    <(cat SKK-JISYO.emoji-ja.utf8) \
-    | skkdic-sort > SKK-JISYO.all.utf8
+skkdic-expr2 \
+    SKK-JISYO.L.utf8 + \
+    SKK-JISYO.assoc.utf8 + \
+    SKK-JISYO.edict.utf8 + \
+    SKK-JISYO.fullname.utf8 + \
+    SKK-JISYO.geo.utf8 + \
+    SKK-JISYO.jinmei.utf8 + \
+    SKK-JISYO.law.utf8 + \
+    SKK-JISYO.propernoun.utf8 + \
+    SKK-JISYO.station.utf8 + \
+    SKK-JISYO.zipcode.utf8 + \
+    SKK-JISYO.office.zipcode.utf8 + \
+    SKK-JISYO.JIS2.utf8 + \
+    SKK-JISYO.JIS2004.utf8 + \
+    SKK-JISYO.JIS3_4.utf8 + \
+    SKK-JISYO.emoji.utf8 + \
+    SKK-JISYO.emoji-ja.utf8 + \
+    SKK-JISYO.emoji_official.utf8 \
+    > SKK-JISYO.all.utf8
 
 cd $CURRENT_DIR
 cp -rp skk-jisyo/SKK-JISYO.all.utf8 "${ONEDRIVE_DIR}/SKK-JISYO.all.utf8"

diff --git a/.emacs.d/init.d/skk-init.el b/.emacs.d/init.d/skk-init.el
@@ -5,10 +5,6 @@
 (setq skk-cdb-large-jisyo nil)
 (setq skk-large-jisyo (concat external-directory "ddskk/SKK-JISYO.all.utf8"))
 (setq skk-jisyo-code 'utf-8)
-(add-to-list 'skk-extra-jisyo-file-list
-	     (concat external-directory "ddskk/SKK-JISYO.emoji.utf8"))
-(add-to-list 'skk-extra-jisyo-file-list
-	     (concat external-directory "ddskk/SKK-JISYO.emoji-ja.utf8"))
 
 (setq-default skk-kutouten-type 'en)
 (setq-default skk-kuten-touten-alist