1999-07-23 Hirokazu FUKUI * egg.el: Remove `katakana-region' and `hiragana-region', `zenkaku-region', `hankaku-region'. Use `japanese-katakana-region', `japanese-hiragana-region', `japanese-zenkaku-region', `japanese-hankaku-region' instead of `katakana-region' and `hiragana-region', `zenkaku-region', `hankaku-region'. * egg-keymap.el (global-map): Use `japanese-katakana-region' and `japanese-hiragana-region', `japanese-zenkaku-region', `japanese-hankaku-region' instead of `katakana-region' and `hiragana-region', `zenkaku-region', `hankaku-region'. * egg-jisx0201.el (fence-katakana): Use `japanese-katakana-region' instead of `katakana-region'. (fence-hiragana): Use `japanese-hiragana-region' instead of `hiragana-region'. diff -u -r egg-its-pkg-199907140102.orig/egg-jisx0201.el egg-its/egg-jisx0201.el --- egg-its-pkg-199907140102.orig/egg-jisx0201.el Fri Jul 23 23:03:53 1999 +++ egg-its/egg-jisx0201.el Fri Jul 23 23:05:07 1999 @@ -275,11 +275,11 @@ (defun fence-katakana () (interactive) (zenkaku-katakana-region egg:*region-start* egg:*region-end* ) - (katakana-region egg:*region-start* egg:*region-end*)) + (japanese-katakana-region egg:*region-start* egg:*region-end*)) (defun fence-hiragana () (interactive) (zenkaku-katakana-region egg:*region-start* egg:*region-end*) - (hiragana-region egg:*region-start* egg:*region-end*)) + (japanese-hiragana-region egg:*region-start* egg:*region-end*)) (define-key fence-mode-map "\ex" 'fence-hankaku-katakana) diff -u -r egg-its-pkg-199907140102.orig/egg-keymap.el egg-its/egg-keymap.el --- egg-its-pkg-199907140102.orig/egg-keymap.el Fri Jul 23 23:03:53 1999 +++ egg-its/egg-keymap.el Fri Jul 23 23:05:07 1999 @@ -69,10 +69,10 @@ (define-key global-map [f2] 'edit-dict-item) (define-key global-map [f3] 'jis-code-input) (define-key global-map [f4] 'toroku-region) -(define-key global-map [f5] 'zenkaku-region) -(define-key global-map [f6] 'hankaku-region) -(define-key global-map [f7] 'katakana-region) -(define-key global-map [f8] 'hiragana-region) +(define-key global-map [f5] 'japanese-zenkaku-region) +(define-key global-map [f6] 'japanese-hankaku-region) +(define-key global-map [f7] 'japanese-katakana-region) +(define-key global-map [f8] 'japanese-hiragana-region) (define-key global-map [f9] 'henkan-region) (define-key global-map [f11] 'insert-buffer) @@ -99,10 +99,10 @@ (define-key sun-fkeymap "12~" 'edit-dict-item) ; F2 (define-key sun-fkeymap "13~" 'jis-code-input) ; F3 (define-key sun-fkeymap "14~" 'toroku-region) ; F4 -(define-key sun-fkeymap "15~" 'zenkaku-region) ; F5 -(define-key sun-fkeymap "17~" 'hankaku-region) ; F6 -(define-key sun-fkeymap "18~" 'katakana-region) ; F7 -(define-key sun-fkeymap "19~" 'hiragana-region) ; F8 +(define-key sun-fkeymap "15~" 'japanese-zenkaku-region) ; F5 +(define-key sun-fkeymap "17~" 'japanese-hankaku-region) ; F6 +(define-key sun-fkeymap "18~" 'japanese-katakana-region); F7 +(define-key sun-fkeymap "19~" 'japanese-hiragana-region); F8 (define-key sun-fkeymap "20~" 'henkan-region) ; F9 (define-key sun-fkeymap "23~" 'insert-buffer) ; F11 or L1 diff -u -r egg-its-pkg-199907140102.orig/egg.el egg-its/egg.el --- egg-its-pkg-199907140102.orig/egg.el Fri Jul 23 23:03:53 1999 +++ egg-its/egg.el Fri Jul 23 23:05:07 1999 @@ -705,19 +705,6 @@ ;;; ひらがな変換 ;;; -(defun hiragana-region (start end) - (interactive "r") - (goto-char start) - (while (re-search-forward kanji-katakana end end) - (let ((ch (char-before (point)))) - (cond( (not (or (> ch ?ン) - (eq ch ?ー) - (eq ch ?゛) - (eq ch ?゜))) - (delete-char -1) - (insert (make-char (find-charset 'japanese-jisx0208) 36 - (nth 2 (split-char ch))))))))) - (defun hiragana-paragraph () "hiragana paragraph at or after point." (interactive ) @@ -725,7 +712,7 @@ (forward-paragraph) (let ((end (point))) (backward-paragraph) - (hiragana-region (point) end )))) + (japanese-hiragana-region (point) end )))) (defun hiragana-sentence () "hiragana sentence at or after point." @@ -734,22 +721,12 @@ (forward-sentence) (let ((end (point))) (backward-sentence) - (hiragana-region (point) end )))) + (japanese-hiragana-region (point) end )))) ;;; ;;; カタカナ変換 ;;; -(defun katakana-region (start end) - (interactive "r") - (goto-char start) - (while (re-search-forward kanji-hiragana end end) - (let ((ch (char-before (point)))) - (cond ((not (memq ch '(?ー ?゛ ?゜))) - (delete-char -1) - (insert (make-char (find-charset 'japanese-jisx0208) 37 - (nth 2 (split-char ch))))))))) - (defun katakana-paragraph () "katakana paragraph at or after point." (interactive ) @@ -757,7 +734,7 @@ (forward-paragraph) (let ((end (point))) (backward-paragraph) - (katakana-region (point) end )))) + (japanese-katakana-region (point) end )))) (defun katakana-sentence () "katakana sentence at or after point." @@ -766,33 +743,12 @@ (forward-sentence) (let ((end (point))) (backward-sentence) - (katakana-region (point) end )))) + (japanese-katakana-region (point) end )))) ;;; ;;; 半角変換 ;;; -(defun hankaku-region (start end) - (interactive "r") - (save-restriction - (narrow-to-region start end) - (goto-char (point-min)) - (while (re-search-forward "\\cS\\|\\cA\\|\\cK" (point-max) (point-max)) - (let* ((ch (split-char (char-before (point)))) - (ch1 (nth 1 ch)) - (ch2 (nth 2 ch))) - (cond ((= ch1 33) ;Symbols - (let ((val (cdr (assq ch2 *hankaku-alist*)))) - (if val (progn - (delete-char -1) - (insert val))))) -; ((= ch1 37) ;Katakana -; (delete-char -1) -; (insert (- ch2 ?\200 ))) - ((= ch1 35) ;Alphas - (delete-char -1) - (insert ch2))))))) - (defun hankaku-paragraph () "hankaku paragraph at or after point." (interactive ) @@ -800,7 +756,7 @@ (forward-paragraph) (let ((end (point))) (backward-paragraph) - (hankaku-region (point) end )))) + (japanese-hankaku-region (point) end )))) (defun hankaku-sentence () "hankaku sentence at or after point." @@ -809,69 +765,18 @@ (forward-sentence) (let ((end (point))) (backward-sentence) - (hankaku-region (point) end )))) + (japanese-hankaku-region (point) end )))) (defun hankaku-word (arg) (interactive "p") (let ((start (point))) (forward-word arg) - (hankaku-region start (point)))) - -(defvar *hankaku-alist* - '(( 161 . ?\ ) - ( 170 . ?\! ) - ( 201 . ?\" ) - ( 244 . ?\# ) - ( 240 . ?\$ ) - ( 243 . ?\% ) - ( 245 . ?\& ) - ( 199 . ?\' ) - ( 202 . ?\( ) - ( 203 . ?\) ) - ( 246 . ?\* ) - ( 220 . ?\+ ) - ( 164 . ?\, ) - ( 221 . ?\- ) - ( 165 . ?\. ) - ( 191 . ?\/ ) - ( 167 . ?\: ) - ( 168 . ?\; ) - ( 227 . ?\< ) - ( 225 . ?\= ) - ( 228 . ?\> ) - ( 169 . ?\? ) - ( 247 . ?\@ ) - ( 206 . ?\[ ) - ( 239 . ?\\ ) - ( 207 . ?\] ) - ( 176 . ?^ ) - ( 178 . ?\_ ) - ( 208 . ?\{ ) - ( 195 . ?\| ) - ( 209 . ?\} ) - ( 177 . ?\~ ) - ( 198 . ?` ) ; 92.6.26 by M.Shikida - )) + (japanese-hankaku-region start (point)))) ;;; ;;; 全角変換 ;;; -(defun zenkaku-region (start end) - (interactive "r") - (save-restriction - (narrow-to-region start end) - (goto-char (point-min)) - (while (re-search-forward "[ -~]" (point-max) (point-max)) - (let ((ch (char-before (point)))) - (if (and (<= ? ch) (<= ch ?~)) - (progn - (delete-char -1) - (let ((zen (cdr (assq ch *zenkaku-alist*)))) - (if zen (insert zen) - (insert (make-char (find-charset 'japanese-jisx0208) 38 - (char-to-int ch))))))))))) - (defun zenkaku-paragraph () "zenkaku paragraph at or after point." (interactive ) @@ -879,7 +784,7 @@ (forward-paragraph) (let ((end (point))) (backward-paragraph) - (zenkaku-region (point) end )))) + (japanese-zenkaku-region (point) end )))) (defun zenkaku-sentence () "zenkaku sentence at or after point." @@ -888,48 +793,13 @@ (forward-sentence) (let ((end (point))) (backward-sentence) - (zenkaku-region (point) end )))) + (japanese-zenkaku-region (point) end )))) (defun zenkaku-word (arg) (interactive "p") (let ((start (point))) (forward-word arg) - (zenkaku-region start (point)))) - -(defvar *zenkaku-alist* - '((? . "　") - (?! . "！") - (?\" . "”") - (?# . "＃") - (?$ . "＄") - (?% . "％") - (?& . "＆") - (?' . "’") - (?( . "（") - (?) . "）") - (?* . "＊") - (?+ . "＋") - (?, . "，") - (?- . "−") - (?. . "．") - (?/ . "／") - (?: . "：") - (?\; . "；") - (?< . "＜") - (?= . "＝") - (?> . "＞") - (?? . "？") - (?@ . "＠") - (?[ . "［") - (?\\ . "￥") - (?] . "］") - (?^ . "＾") - (?_ . "＿") - (?{ . "｛") - (?| . "｜") - (?} . "｝") - (?~ . "￣") - (?` . "‘"))) ; 92.6.26 by M.Shikida + (japanese-zenkaku-region start (point)))) ;;; ;;; ローマ字かな変換 @@ -2433,19 +2303,19 @@ (defun fence-katakana () (interactive) - (katakana-region egg:*region-start* egg:*region-end* )) + (japanese-katakana-region egg:*region-start* egg:*region-end* )) (defun fence-hiragana () (interactive) - (hiragana-region egg:*region-start* egg:*region-end*)) + (japanese-hiragana-region egg:*region-start* egg:*region-end*)) (defun fence-hankaku () (interactive) - (hankaku-region egg:*region-start* egg:*region-end*)) + (japanese-hankaku-region egg:*region-start* egg:*region-end*)) (defun fence-zenkaku () (interactive) - (zenkaku-region egg:*region-start* egg:*region-end*)) + (japanese-zenkaku-region egg:*region-start* egg:*region-end*)) (defun fence-backward-char () (interactive)