Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ddskk で絵文字変換ができない不具合修正 #393

Merged
merged 2 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions .emacs.d/bin/skkdic-maintenance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,21 @@ zipcode.tar.gz
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"
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"
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"
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"
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"
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"

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"

# see https://github.com/eidera/skktools/blob/master/scripts/run.bash

skkdic-expr2 \
SKK-JISYO.L + \
SKK-JISYO.assoc + \
Expand All @@ -69,7 +77,9 @@ 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) > SKK-JISYO.all.utf8
cat <(iconv -f euc-jisx0213 -t utf8 SKK-JISYO.all.euc-jisx0213) \
<(cat SKK-JISYO.emoji.utf8) \
| skkdic-sort > SKK-JISYO.all.utf8

cd $CURRENT_DIR
cp -rp skk-jisyo/SKK-JISYO.all.utf8 "${ONEDRIVE_DIR}/SKK-JISYO.all.utf8"
Expand Down
10 changes: 3 additions & 7 deletions .emacs.d/init.d/skk-init.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,10 @@
;;

(setq skk-cdb-large-jisyo nil)
(setq skk-large-jisyo (concat external-directory "ddskk/SKK-JISYO.L.utf8"))
(setq skk-large-jisyo (concat external-directory "ddskk/SKK-JISYO.all.utf8"))
(setq skk-jisyo-code 'utf-8)
(dolist (JISYO
(list "emoji" "JIS2004" "JIS3_4" "JIS2" "office.zipcode" "zipcode" "station"
"pubdic+" "propernoun" "propernoun" "law" "jinmei" "itaiji" "geo"
"fullname" "edict" "assoc"))
(add-to-list 'skk-extra-jisyo-file-list
(concat external-directory "ddskk/SKK-JISYO." JISYO ".utf8")))
(add-to-list 'skk-extra-jisyo-file-list
(concat external-directory "ddskk/SKK-JISYO.emoji.utf8"))

(setq-default skk-kutouten-type 'en)
(setq-default skk-kuten-touten-alist
Expand Down
Loading