Skip to content

Commit a5492e3

Browse files
committed
update module: chinese
1 parent f61f346 commit a5492e3

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

modules/h-cheung/chinese/config.el

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,14 @@
2222
;;
2323
;;; Hack
2424
;;;
25-
(defadvice! +chinese--org-html-paragraph-a (args)
26-
"Join consecutive Chinese lines into a single long line without)
25+
(define-advice org-html-paragraph (:filter-args (args) chinese-a)
26+
"Join consecutive Chinese lines into a single long line without
2727
unwanted space when exporting org-mode to html."
28-
:filter-args #'org-html-paragraph
2928
(++chinese--org-paragraph args))
3029

31-
(defadvice! +chinese--org-hugo-paragraph-a (args)
30+
(define-advice org-hugo-paragraph (:filter-args (args) chinese-a)
3231
"Join consecutive Chinese lines into a single long line without
3332
unwanted space when exporting org-mode to hugo markdown."
34-
:filter-args #'org-hugo-paragraph
3533
(++chinese--org-paragraph args))
3634

3735
(defun ++chinese--org-paragraph (args)
@@ -58,21 +56,17 @@ unwanted space when exporting org-mode to hugo markdown."
5856
:bind
5957
("C-S-s-j" . #'+rime-convert-string-at-point)
6058
(:map rime-active-mode-map
61-
("C-S-s-j" . #'rime-inline-ascii)
62-
("C-M-S-s-j" . #'rime-inline-ascii))
59+
("C-S-s-j" . #'rime-inline-ascii)
60+
("C-M-S-s-j" . #'rime-inline-ascii))
6361
(:map rime-mode-map
64-
("C-M-S-s-j" . #'rime-force-enable)
65-
("C-." . #'rime-send-keybinding)
66-
("S-SPC" . #'rime-send-keybinding)
67-
("C-`" . #'rime-send-keybinding)
68-
("C-~" . #'rime-send-keybinding)
69-
("C-S-`" . #'rime-send-keybinding))
62+
("C-M-S-s-j" . #'rime-force-enable)
63+
("C-." . #'rime-send-keybinding)
64+
("S-SPC" . #'rime-send-keybinding)
65+
("C-`" . #'rime-send-keybinding)
66+
("C-~" . #'rime-send-keybinding)
67+
("C-S-`" . #'rime-send-keybinding))
7068
:custom
7169
(default-input-method "rime")
72-
;; (rime-librime-root (cond (IS-MAC (let ((dir (expand-file-name "~/repos/librime/dist")))
73-
;; (when (file-directory-p dir)
74-
;; dir)))
75-
;; (t rime-librime-root)))
7670
(rime-share-data-dir
7771
(cl-some (lambda (dir)
7872
(let ((abs-dir (expand-file-name dir)))
@@ -147,17 +141,17 @@ input scheme to convert to Chinese."
147141

148142
(unless (fboundp 'rime--posframe-display-content)
149143
(error "Function `rime--posframe-display-content' is not available."))
150-
(defadvice! +rime--posframe-display-content-a (args)
144+
(define-advice rime--posframe-display-content (:filter-args (args) resolve-posframe-issue-a)
151145
"`rime--posframe-display-content' 传入的字符串加一个全角空
152146
格,以解决 `posframe' 偶尔吃字的问题。"
153-
:filter-args #'rime--posframe-display-content
154147
(cl-destructuring-bind (content) args
155148
(let ((newresult (if (string-blank-p content)
156149
content
157150
(concat content " "))))
158151
(list newresult))))
152+
159153
(when (featurep! +rime-predicates)
160-
(load! "+rime-predicates")))
154+
(load! "+rime-predicates")))
161155

162156

163157
;; Support pinyin in Ivy

modules/h-cheung/chinese/packages.el

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
;;; h-cheung/chinese/packages.el
33

44

5-
(package! pangu-spacing :disable t)
65
(package! rime)
76
(package! ace-pinyin)
87
(package! pinyinlib)

0 commit comments

Comments
 (0)