1. xemacs
  2. mule-base

Commits

youngs  committed f81181d

Sync to old tree.

  • Participants
  • Parent commits ed800f5
  • Branches default
  • Tags XEMACS_BEFORE_MOVE_TO_SUNSITE_DK, mule-base-1_39 7
    1. sumo-2001-09-29
    2. sumo-2001-12-11
    3. sumo-2001-12-13
    4. sumo-2001-12-16
    5. sumo-2002-01-19
    6. xemacs-sumo-2001-07-08
    7. xemacs-sumo-2001-07-09

Comments (0)

Files changed (3)

File ChangeLog

View file
+2001-05-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* japan-util.el (japanese-symbol-table): Fix a rule for a japanese
+	hyphen character.
+	(japanese-hankaku): Prefer the charset `jisx0201' when the
+	optional argument `ascii-only' is not specified.
+	(japanese-hankaku-region): Ditto.
+
 2001-05-11  Alexey Mahotkin  <alexm@hsys.msk.ru>
 
 	* mule-diag.el: Fix list-coding-systems.

File Makefile

View file
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 1.38
+VERSION = 1.39
 AUTHOR_VERSION =
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = mule-base

File japan-util.el

View file
 (defconst japanese-symbol-table
   '((?\$B!!(B ?\ ) (?$B!$(B ?, ?(I$(B) (?$B!%(B ?. ?(I!(B) (?$B!"(B ?, ?(I$(B) (?$B!#(B ?. ?(I!(B) (?$B!&(B nil ?(I%(B)
     (?$B!'(B ?:) (?$B!((B ?\;) (?$B!)(B ??) (?$B!*(B ?!) (?$B!+(B nil ?(I^(B) (?$B!,(B nil ?(I_(B)
-    (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?-) (?$B!=(B ?-) (?$B!>(B ?-)
+    (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?- ?(I0(B) (?$B!=(B ?-) (?$B!>(B ?-)
     (?$B!?(B ?/) (?$B!@(B ?\\) (?$B!A(B ?~)  (?$B!C(B ?|) (?$B!F(B ?`) (?$B!G(B ?') (?$B!H(B ?\") (?$B!I(B ?\")
     (?\$B!J(B ?\() (?\$B!K(B ?\)) (?\$B!N(B ?[) (?\$B!O(B ?]) (?\$B!P(B ?{) (?\$B!Q(B ?})
     (?$B!R(B ?<) (?$B!S(B ?>) (?$B!\(B ?+) (?$B!](B ?-) (?$B!a(B ?=) (?$B!c(B ?<) (?$B!d(B ?>)
 Optional argument ASCII-ONLY non-nil means to return only ASCII character."
   (if (stringp obj)
       (japanese-string-conversion obj 'japanese-hankaku-region ascii-only)
-    (or (get-char-code-property obj 'ascii)
-	(and (not ascii-only)
+    (or (and (not ascii-only)
 	     (get-char-code-property obj 'jisx0201))
+	(get-char-code-property obj 'ascii)
 	obj)))
 
 ;;;###autoload
       (goto-char (point-min))
       (while (re-search-forward "\\cj" nil t)
 	(let* ((zenkaku (preceding-char))
-	       (hankaku (or (get-char-code-property zenkaku 'ascii)
-			    (and (not ascii-only)
-				 (get-char-code-property zenkaku 'jisx0201)))))
+	       (hankaku (or (and (not ascii-only)
+				 (get-char-code-property zenkaku 'jisx0201))
+			    (get-char-code-property zenkaku 'ascii))))
 	  (if hankaku
 	      (japanese-replace-region (match-beginning 0) (match-end 0)
 				       hankaku)))))))