comparison lisp/mule/japan-util.el @ 776:79940b592197

[xemacs-hg @ 2002-03-15 07:43:14 by ben] .cvsignore: ignore .tmp files that are getting auto-created by VC. Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). alloc.c, emacs.c, lisp.h: add new -no-packages. make sure list of args for sorting is actually correct. clean up arg parsing code. xemacs.mak: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). Makefile: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). mule\chinese.el, mule\japan-util.el: fix warnings. behavior-defs.el: fix errors with require. bytecomp-runtime.el: add new funs {when,and}-{f}boundp, clean up docs. cus-edit.el: pretty-print values. dump-paths.el, find-paths.el, startup.el, setup-paths.el: fix problems/inconsistencies parsing options. support new -no-packages option. merge code duplication in dump-paths and startup. lisp-mode.el: indent macrolet and labels correctly. update comments about lisp-indent-function. flet already handled in cl. apropos.el, auto-save.el, buff-menu.el, cl-extra.el, dragdrop.el, faces.el, files.el, fill.el, font-lock.el, font.el, gtk-faces.el, gui.el, help.el, hyper-apropos.el, info.el, isearch-mode.el, keymap.el, lisp-mnt.el, mouse.el, package-admin.el, package-get.el, printer.el, process.el, resize-minibuffer.el, simple.el, toolbar-items.el, wid-edit.el, win32-native.el: fix warnings. very-early-lisp.el: update docs. mule\chinese.el, mule\japan-util.el: fix warnings. mule\chinese.el, mule\japan-util.el: fix warnings. behavior-defs.el: fix errors with require. bytecomp-runtime.el: add new funs {when,and}-{f}boundp, clean up docs. cus-edit.el: pretty-print values. dump-paths.el, find-paths.el, startup.el, setup-paths.el: fix problems/inconsistencies parsing options. support new -no-packages option. merge code duplication in dump-paths and startup. lisp-mode.el: indent macrolet and labels correctly. update comments about lisp-indent-function. flet already handled in cl. apropos.el, auto-save.el, buff-menu.el, cl-extra.el, dragdrop.el, faces.el, files.el, fill.el, font-lock.el, font.el, gtk-faces.el, gui.el, help.el, hyper-apropos.el, info.el, isearch-mode.el, keymap.el, lisp-mnt.el, mouse.el, package-admin.el, package-get.el, printer.el, process.el, resize-minibuffer.el, simple.el, toolbar-items.el, wid-edit.el, win32-native.el: fix warnings. very-early-lisp.el: update docs. mule\chinese.el, mule\japan-util.el: fix warnings. Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs).
author ben
date Fri, 15 Mar 2002 07:43:43 +0000
parents 943eaba38521
children 2923009caf47
comparison
equal deleted inserted replaced
775:7d972c3de90a 776:79940b592197
236 (while (re-search-forward "\\cH\\|\\cK" nil t) 236 (while (re-search-forward "\\cH\\|\\cK" nil t)
237 (let* ((kana (preceding-char)) 237 (let* ((kana (preceding-char))
238 (composition 238 (composition
239 (and (not hankaku) 239 (and (not hankaku)
240 (get-char-code-property kana 'kana-composition))) 240 (get-char-code-property kana 'kana-composition)))
241 next slot) 241 slot)
242 (if (and composition (setq slot (assq (following-char) composition))) 242 (if (and composition (setq slot (assq (following-char) composition)))
243 (japanese-replace-region (match-beginning 0) (1+ (point)) 243 (japanese-replace-region (match-beginning 0) (1+ (point))
244 (cdr slot)) 244 (cdr slot))
245 (let ((kata (get-char-code-property 245 (let ((kata (get-char-code-property
246 kana (if hankaku 'jisx0201 'katakana)))) 246 kana (if hankaku 'jisx0201 'katakana))))
258 (save-excursion 258 (save-excursion
259 (goto-char (point-min)) 259 (goto-char (point-min))
260 (while (re-search-forward "\\cK\\|\\ck" nil t) 260 (while (re-search-forward "\\cK\\|\\ck" nil t)
261 (let* ((kata (preceding-char)) 261 (let* ((kata (preceding-char))
262 (composition (get-char-code-property kata 'kana-composition)) 262 (composition (get-char-code-property kata 'kana-composition))
263 next slot) 263 slot)
264 (if (and composition (setq slot (assq (following-char) composition))) 264 (if (and composition (setq slot (assq (following-char) composition)))
265 (japanese-replace-region (match-beginning 0) (1+ (point)) 265 (japanese-replace-region (match-beginning 0) (1+ (point))
266 (get-char-code-property 266 (get-char-code-property
267 (cdr slot) 'hiragana)) 267 (cdr slot) 'hiragana))
268 (let ((hira (get-char-code-property kata 'hiragana))) 268 (let ((hira (get-char-code-property kata 'hiragana)))
305 (re-search-forward "\\ck" nil t)) 305 (re-search-forward "\\ck" nil t))
306 (and (not katakana-only) 306 (and (not katakana-only)
307 (re-search-forward "\\ca\\|\\ck" nil t))) 307 (re-search-forward "\\ca\\|\\ck" nil t)))
308 (let* ((hankaku (preceding-char)) 308 (let* ((hankaku (preceding-char))
309 (composition (get-char-code-property hankaku 'kana-composition)) 309 (composition (get-char-code-property hankaku 'kana-composition))
310 next slot) 310 slot)
311 (if (and composition (setq slot (assq (following-char) composition))) 311 (if (and composition (setq slot (assq (following-char) composition)))
312 (japanese-replace-region (match-beginning 0) (1+ (point)) 312 (japanese-replace-region (match-beginning 0) (1+ (point))
313 (cdr slot)) 313 (cdr slot))
314 (let ((zenkaku (japanese-zenkaku hankaku))) 314 (let ((zenkaku (japanese-zenkaku hankaku)))
315 (if zenkaku 315 (if zenkaku