Sync up with XEmacs 21.4.17.

[chise/xemacs-chise.git.1] / lisp / mule / japanese.el

diff --git a/lisp/mule/japanese.el b/lisp/mule/japanese.el
index 0898366..02ef1d3 100644 (file)
--- a/lisp/mule/japanese.el
+++ b/lisp/mule/japanese.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
-;; Copyright (C) 1997 MORIOKA Tomohiko
+;; Copyright (C) 1997,1999,2002,2004,2005 MORIOKA Tomohiko
 
 ;; Keywords: multilingual, Japanese
 
@@ -97,8 +97,10 @@
        "\e$B!#\e(B"
        "\\)"
        "[ \t\n]*"))
-(setq paragraph-start    "^[ \e$B!!\e(B\t\n\f]")
-(setq paragraph-separate "^[ \e$B!!\e(B\t\f]*$")
+
+;; allow paragraphs to start with a zenkaku space
+(setq paragraph-start    "[ \e$B!!\e(B\t\n\f]")
+(setq paragraph-separate "[ \e$B!!\e(B\t\f]*$")
 
 ;; EGG specific setup
 (define-egg-environment 'japanese
@@ -125,8 +127,11 @@
     ;; (setq egg-default-startup-file "eggrc-wnn")
     (setq-default its:*current-map* (its:get-mode-map "roma-kana"))))
 
-;; stuff for providing gramatic processing of Japanese text
+;; stuff for providing grammatic processing of Japanese text
 ;; something like this should probably be created for all environments...
+;; #### Arrgh.  This stuff should defvar'd in either fill.el or kinsoku.el.
+;; Then the language environment should set these things, probably buffer-
+;; locally.
 
 (defvar aletter (concat "\\(" ascii-char "\\|" kanji-char "\\)"))
 (defvar kanji-space-insertable (concat 
@@ -137,6 +142,7 @@
           ascii-alphanumeric  kanji-kanji-char "\\|"
           kanji-kanji-char    ascii-alphanumeric ))
 
+;; #### will be moved to fill.el
 (defvar space-insertable (concat " " aletter "\\|" kanji-space-insertable)
   "Regexp for finding points that can have spaces inserted into them for justification")
 \f
@@ -153,13 +159,21 @@
 (make-coding-system
  'iso-2022-jp 'iso2022
  "Coding-system used for communication with mail and news in Japan."
- '(charset-g0 ascii
-   short t
-   seven t
-   input-charset-conversion ((latin-jisx0201 ascii)
-                            (japanese-jisx0208-1978 japanese-jisx0208))
-   mnemonic "MULE/7bit"
-   ))
+ (let ((conf
+       '(charset-g0 ascii
+         short t
+         seven t
+         mnemonic "MULE/7bit")))
+   (if (featurep 'utf-2000)
+       (list* 'ccs-priority-list
+             '(ascii
+               =jis-x0208@1983 =jis-x0208@1978
+               latin-jisx0201)
+             conf)
+     (list* 'input-charset-conversion
+           '((latin-jisx0201 ascii)
+             (japanese-jisx0208-1978 japanese-jisx0208))
+           conf))))
 
 (define-coding-system-alias 'junet 'iso-2022-jp)
 
@@ -239,6 +253,18 @@
    mnemonic "Ja/EUC"
    ))
 
+;; [tomo] Moved to mule-conf.el.
+;; (make-coding-system
+;;  'euc-jisx0213 'iso2022
+;;  "Coding-system of Japanese EUC based on JIS X 0213."
+;;  '(charset-g0 ascii
+;;    charset-g1 japanese-jisx0213-1
+;;    charset-g2 katakana-jisx0201
+;;    charset-g3 japanese-jisx0213-2
+;;    short t
+;;    mnemonic "Ja/EUC0213"
+;;    ))
+
 ;; (define-coding-system-alias 'euc-japan-1990 'japanese-iso-8bit)
 ;; (define-coding-system-alias 'euc-japan 'japanese-iso-8bit)
 ;; (define-coding-system-alias 'euc-jp 'japanese-iso-8bit)
@@ -258,7 +284,7 @@
                               shift_jis iso-2022-jp-2)
 ;;           (input-method . "japanese")
              (features japan-util)
-             (sample-text . "Japanese (\e$BF|K\8l\e(B)   \e$B$3$s$K$A$O\e(B, \e)IºÝÆÁÊ")\e-A
+             (sample-text . "Japanese (\e$BF|K\8l\e(B)   \e$B$3$s$K$A$O\e(B, \e(I:]FAJ\e(B")
              (documentation . t)))
 
 ;;; japanese.el ends here