X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=emu-mule.el;h=6af919f975f0c71376551ba45a41da2b85903a9c;hb=d6afa7832d7fc6a6ddded8aac2994b187b43c12a;hp=a0b8470ad8c7df03eef132a410f151495fd622f0;hpb=07071cb2a2c5919f7b85b8cf68238d10baeca5f6;p=elisp%2Fapel.git

diff --git a/emu-mule.el b/emu-mule.el
index a0b8470..6af919f 100644
--- a/emu-mule.el
+++ b/emu-mule.el
@@ -1,13 +1,12 @@
-;;; emu-mule.el --- Mule 2.* emulation module for Mule
+;;; emu-mule.el --- emu module for Mule 1.* and Mule 2.*
 
-;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version:
-;;	$Id: emu-mule.el,v 7.52 1996/09/18 08:32:56 morioka Exp $
+;;         Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: emulation, compatibility, Mule
 
-;; This file is part of tl (Tiny Library).
+;; This file is part of emu.
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -20,8 +19,8 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with This program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
@@ -30,7 +29,7 @@
 ;;;
 
 (cond (running-emacs-19
-       (require 'emu-19)
+       (require 'emu-e19)
        
        ;; Suggested by SASAKI Osamu <osamu@shuugr.bekkoame.or.jp>
        ;; (cf. [os2-emacs-ja:78])
@@ -51,33 +50,56 @@
        )
       (running-emacs-18
        (require 'emu-18)
-       (defun tl:make-overlay (beg end &optional buffer type))
-       (defun tl:overlay-put (overlay prop value))
+       (defun make-overlay (beg end &optional buffer type))
+       (defun overlay-put (overlay prop value))
        ))
 
 
 ;;; @ character set
 ;;;
 
+(defalias 'make-char 'make-character)
+
+(defalias 'find-non-ascii-charset-string 'find-charset-string)
+(defalias 'find-non-ascii-charset-region 'find-charset-region)
+
 (defalias 'charset-bytes	'char-bytes)
 (defalias 'charset-description	'char-description)
 (defalias 'charset-registry	'char-registry)
 (defalias 'charset-columns	'char-width)
 (defalias 'charset-direction	'char-direction)
 
+(defun charset-chars (charset)
+  "Return the number of characters per dimension of CHARSET."
+  (if (= (logand (nth 2 (character-set charset)) 1) 1)
+      96
+    94))
+
 
 ;;; @ coding system
 ;;;
 
 (defun encode-coding-region (start end coding-system)
   "Encode the text between START and END to CODING-SYSTEM.
-\[emu-mule.el; EMACS 20 emulating function]"
+\[EMACS 20 emulating function]"
   (code-convert-region start end *internal* coding-system)
   )
 
+(defun decode-coding-region (start end coding-system)
+  "Decode the text between START and END which is encoded in CODING-SYSTEM.
+\[EMACS 20 emulating function]"
+  (code-convert-region start end coding-system *internal*)
+  )
+
+(defun encode-coding-string (str coding-system)
+  "Encode the STRING to CODING-SYSTEM.
+\[EMACS 20 emulating function]"
+  (code-convert-string str *internal* coding-system)
+  )
+
 (defun decode-coding-string (str coding-system)
   "Decode the string STR which is encoded in CODING-SYSTEM.
-\[emu-mule.el]"
+\[EMACS 20 emulating function]"
   (let ((len (length str))
 	ret)
     (while (and
@@ -92,6 +114,10 @@
     (concat ret (substring str len))
     ))
 
+(defalias 'detect-coding-region 'code-detect-region)
+
+(defalias 'set-buffer-file-coding-system 'set-file-coding-system)
+
 (defmacro as-binary-process (&rest body)
   (` (let (selective-display	; Disable ^M to nl translation.
 	   ;; Mule
@@ -108,108 +134,271 @@
        (,@ body)
        )))
 
+(defmacro as-binary-output-file (&rest body)
+  (` (let (mc-flag
+	   (file-coding-system *noconv*)
+	   )
+       (,@ body)
+       )))
+
 (defalias 'set-process-input-coding-system 'set-process-coding-system)
 
 
-;;; @ MIME charset
+;;; @ binary access
 ;;;
 
-(defvar charsets-mime-charset-alist
-  (list
-   (cons (list lc-ascii)				'us-ascii)
-   (cons (list lc-ascii lc-ltn1)			'iso-8859-1)
-   (cons (list lc-ascii lc-ltn2)			'iso-8859-2)
-   (cons (list lc-ascii lc-ltn3)			'iso-8859-3)
-   (cons (list lc-ascii lc-ltn4)			'iso-8859-4)
-;;;(cons (list lc-ascii lc-crl)				'iso-8859-5)
-   (cons (list lc-ascii lc-crl)				'koi8-r)
-   (cons (list lc-ascii lc-arb)				'iso-8859-6)
-   (cons (list lc-ascii lc-grk)				'iso-8859-7)
-   (cons (list lc-ascii lc-hbw)				'iso-8859-8)
-   (cons (list lc-ascii lc-ltn5)			'iso-8859-9)
-   (cons (list lc-ascii lc-roman lc-jpold lc-jp)	'iso-2022-jp)
-   (cons (list lc-ascii lc-kr)				'euc-kr)
-   (cons (list lc-ascii lc-cn)				'gb2312)
-   (cons (list lc-ascii lc-big5-1 lc-big5-2)		'big5)
-   (cons (list lc-ascii lc-roman lc-ltn1 lc-grk
-	       lc-jpold lc-cn lc-jp lc-kr lc-jp2)	'iso-2022-jp-2)
-   (cons (list lc-ascii lc-roman lc-ltn1 lc-grk
-	       lc-jpold lc-cn lc-jp lc-kr lc-jp2
-	       lc-cns1 lc-cns2)				'iso-2022-int-1)
-   (cons (list lc-ascii lc-roman
-	       lc-ltn1 lc-ltn2 lc-crl lc-grk
-	       lc-jpold lc-cn lc-jp lc-kr lc-jp2
-	       lc-cns1 lc-cns2 lc-cns3 lc-cns4
-	       lc-cns5 lc-cns6 lc-cns7)			'iso-2022-int-1)
-   ))
-
-(defvar default-mime-charset 'x-ctext)
+(defun insert-file-contents-as-binary (filename
+				       &optional visit beg end replace)
+  "Like `insert-file-contents', q.v., but don't code and format conversion.
+Like `insert-file-contents-literary', but it allows find-file-hooks,
+automatic uncompression, etc.
+
+Namely this function ensures that only format decoding and character
+code conversion will not take place."
+  (let (mc-flag
+	(file-coding-system-for-read *noconv*))
+    (insert-file-contents filename visit beg end replace)
+    ))
 
-(defvar mime-charset-coding-system-alist
-  '((iso-8859-1      . *ctext*)
-    (x-ctext         . *ctext*)
-    (gb2312          . *euc-china*)
-    (koi8-r          . *koi8*)
-    (iso-2022-jp-2   . *iso-2022-ss2-7*)
-    (x-iso-2022-jp-2 . *iso-2022-ss2-7*)
-    (shift_jis       . *sjis*)
-    (x-shiftjis      . *sjis*)
+(defalias 'insert-binary-file-contents 'insert-file-contents-as-binary)
+(make-obsolete 'insert-binary-file-contents 'insert-file-contents-as-binary)
+
+(defun insert-file-contents-as-raw-text (filename
+					 &optional visit beg end replace)
+  "Like `insert-file-contents', q.v., but don't code and format conversion.
+Like `insert-file-contents-literary', but it allows find-file-hooks,
+automatic uncompression, etc.
+Like `insert-file-contents-as-binary', but it converts line-break
+code."
+  (save-excursion
+    (save-restriction
+      (narrow-to-region (point)(point))
+      (insert-file-contents-as-binary filename visit beg end replace)
+      (goto-char (point-min))
+      (while (re-search-forward "\r$" nil t)
+	(replace-match "")
+	))))
+
+(defun insert-binary-file-contents-literally (filename
+					      &optional visit beg end replace)
+  "Like `insert-file-contents-literally', q.v., but don't code conversion.
+A buffer may be modified in several ways after reading into the buffer due
+to advanced Emacs features, such as file-name-handlers, format decoding,
+find-file-hooks, etc.
+  This function ensures that none of these modifications will take place."
+  (let (mc-flag
+	(file-coding-system *noconv*))
+    (insert-file-contents-literally filename visit beg end replace)
     ))
 
-(defun mime-charset-to-coding-system (charset)
-  (if (stringp charset)
-      (setq charset (intern (downcase charset)))
-    )
-  (or (cdr (assq charset mime-charset-coding-system-alist))
-      (let ((cs (intern (concat "*" (symbol-name charset) "*"))))
-	(and (coding-system-p cs) cs)
-	)))
+(if running-emacs-19_29-or-later
+    ;; for MULE 2.3 based on Emacs 19.34.
+    (defun write-region-as-binary (start end filename
+					 &optional append visit lockname)
+      "Like `write-region', q.v., but don't code conversion."
+      (let (mc-flag
+	    (file-coding-system *noconv*))
+	(write-region start end filename append visit lockname)
+	))
+  ;; for MULE 2.3 based on Emacs 19.28.
+  (defun write-region-as-binary (start end filename
+				       &optional append visit lockname)
+    "Like `write-region', q.v., but don't code conversion."
+    (let (mc-flag
+	  (file-coding-system *noconv*))
+      (write-region start end filename append visit)
+      ))
+  )
 
-(defun detect-mime-charset-region (start end)
-  "Return MIME charset for region between START and END.
-\[emu-mule.el]"
-  (charsets-to-mime-charset
-   (cons lc-ascii (find-charset-region start end))))
+(defun write-region-as-raw-text-CRLF (start end filename
+					    &optional append visit lockname)
+  "Like `write-region', q.v., but don't code conversion."
+  (let ((the-buf (current-buffer)))
+    (with-temp-buffer
+      (insert-buffer-substring the-buf start end)
+      (goto-char (point-min))
+      (while (re-search-forward "\\(\\=\\|[^\r]\\)\n" nil t)
+	(replace-match "\\1\r\n")
+	)
+      (write-region-as-binary (point-min)(point-max)
+			      filename append visit lockname)
+      )))
+
+
+;;; @ MIME charset
+;;;
 
 (defun encode-mime-charset-region (start end charset)
-  "Encode the text between START and END as MIME CHARSET.
-\[emu-mule.el]"
+  "Encode the text between START and END as MIME CHARSET."
   (let ((cs (mime-charset-to-coding-system charset)))
     (if cs
 	(code-convert start end *internal* cs)
       )))
 
-(defun decode-mime-charset-region (start end charset)
-  "Decode the text between START and END as MIME CHARSET.
-\[emu-mule.el]"
-  (let ((cs (mime-charset-to-coding-system charset)))
+(defun decode-mime-charset-region (start end charset &optional lbt)
+  "Decode the text between START and END as MIME CHARSET."
+  (let ((cs (mime-charset-to-coding-system charset lbt)))
     (if cs
 	(code-convert start end cs *internal*)
       )))
 
 (defun encode-mime-charset-string (string charset)
-  "Encode the STRING as MIME CHARSET. [emu-mule.el]"
+  "Encode the STRING as MIME CHARSET."
   (let ((cs (mime-charset-to-coding-system charset)))
     (if cs
 	(code-convert-string string *internal* cs)
       string)))
 
-(defun decode-mime-charset-string (string charset)
-  "Decode the STRING which is encoded in MIME CHARSET. [emu-mule.el]"
-  (let ((cs (mime-charset-to-coding-system charset)))
+(defun decode-mime-charset-string (string charset &optional lbt)
+  "Decode the STRING which is encoded in MIME CHARSET."
+  (let ((cs (mime-charset-to-coding-system charset lbt)))
     (if cs
 	(decode-coding-string string cs)
       string)))
 
+(defun write-region-as-mime-charset (charset start end filename)
+  "Like `write-region', q.v., but code-convert by MIME CHARSET."
+  (let ((file-coding-system
+	 (or (mime-charset-to-coding-system charset)
+	     *noconv*)))
+    (write-region start end filename append visit)
+    ))
+
+
+;;; @@ to coding-system
+;;;
+
+(defvar mime-charset-coding-system-alist
+  '((iso-8859-1      . *ctext*)
+    (x-ctext         . *ctext*)
+    (gb2312          . *euc-china*)
+    (koi8-r          . *koi8*)
+    (iso-2022-jp-2   . *iso-2022-ss2-7*)
+    (x-iso-2022-jp-2 . *iso-2022-ss2-7*)
+    (shift_jis       . *sjis*)
+    (x-shiftjis      . *sjis*)
+    ))
+
+(defun mime-charset-to-coding-system (charset &optional lbt)
+  (if (stringp charset)
+      (setq charset (intern (downcase charset)))
+    )
+  (let ((cs
+	 (or (cdr (assq charset mime-charset-coding-system-alist))
+	     (let ((cs (intern (concat "*" (symbol-name charset) "*"))))
+	       (and (coding-system-p cs) cs)
+	       ))))
+    (if (or (null lbt)
+	    (null cs))
+	cs
+      (intern (format "%s%s" cs (cond ((eq lbt 'CRLF) 'dos)
+				      ((eq lbt 'LF) 'unix)
+				      ((eq lbt 'CR) 'mac)
+				      (t lbt))))
+      )))
+
+
+;;; @@ detection
+;;;
+
+(defvar charsets-mime-charset-alist
+  (let ((alist
+	 '(((lc-ascii)					. us-ascii)
+	   ((lc-ascii lc-ltn1)				. iso-8859-1)
+	   ((lc-ascii lc-ltn2)				. iso-8859-2)
+	   ((lc-ascii lc-ltn3)				. iso-8859-3)
+	   ((lc-ascii lc-ltn4)				. iso-8859-4)
+;;;	   ((lc-ascii lc-crl)				. iso-8859-5)
+	   ((lc-ascii lc-crl)				. koi8-r)
+	   ((lc-ascii lc-arb)				. iso-8859-6)
+	   ((lc-ascii lc-grk)				. iso-8859-7)
+	   ((lc-ascii lc-hbw)				. iso-8859-8)
+	   ((lc-ascii lc-ltn5)				. iso-8859-9)
+	   ((lc-ascii lc-roman lc-jpold lc-jp)		. iso-2022-jp)
+	   ((lc-ascii lc-kr)				. euc-kr)
+	   ((lc-ascii lc-cn)				. gb2312)
+	   ((lc-ascii lc-big5-1 lc-big5-2)		. big5)
+	   ((lc-ascii lc-roman lc-ltn1 lc-grk
+		      lc-jpold lc-cn lc-jp lc-kr
+		      lc-jp2)				. iso-2022-jp-2)
+	   ((lc-ascii lc-roman lc-ltn1 lc-grk
+		      lc-jpold lc-cn lc-jp lc-kr lc-jp2
+		      lc-cns1 lc-cns2)			. iso-2022-int-1)
+	   ((lc-ascii lc-roman
+		      lc-ltn1 lc-ltn2 lc-crl lc-grk
+		      lc-jpold lc-cn lc-jp lc-kr lc-jp2
+		      lc-cns1 lc-cns2 lc-cns3 lc-cns4
+		      lc-cns5 lc-cns6 lc-cns7)		. iso-2022-int-1)
+	   ))
+	dest)
+    (while alist
+      (catch 'not-found
+	(let ((pair (car alist)))
+	  (setq dest
+		(append dest
+			(list
+			 (cons (mapcar (function
+					(lambda (cs)
+					  (if (boundp cs)
+					      (symbol-value cs)
+					    (throw 'not-found nil)
+					    )))
+				       (car pair))
+			       (cdr pair)))))))
+      (setq alist (cdr alist)))
+    dest))
+
+(defvar default-mime-charset 'x-ctext
+  "Default value of MIME-charset.
+It is used when MIME-charset is not specified.
+It must be symbol.")
+
+(defun detect-mime-charset-region (start end)
+  "Return MIME charset for region between START and END."
+  (charsets-to-mime-charset
+   (cons lc-ascii (find-charset-region start end))))
+
+
+;;; @ buffer representation
+;;;
+
+(defsubst-maybe set-buffer-multibyte (flag)
+  "Set the multibyte flag of the current buffer to FLAG.
+If FLAG is t, this makes the buffer a multibyte buffer.
+If FLAG is nil, this makes the buffer a single-byte buffer.
+The buffer contents remain unchanged as a sequence of bytes
+but the contents viewed as characters do change.
+\[Emacs 20.3 emulating function]"
+  (setq mc-flag flag)
+  )
+
 
 ;;; @ character
 ;;;
 
 (defalias 'char-charset 'char-leading-char)
 
-(defalias 'char-length 'char-bytes)
+(defun split-char (character)
+  "Return list of charset and one or two position-codes of CHARACTER."
+  (let ((p (1- (char-bytes character)))
+	dest)
+    (while (>= p 1)
+      (setq dest (cons (- (char-component character p) 128) dest)
+	    p (1- p))
+      )
+    (cons (char-charset character) dest)
+    ))
 
-(defalias 'char-columns 'char-width)
+(defmacro char-next-index (char index)
+  "Return index of character succeeding CHAR whose index is INDEX."
+  (` (+ (, index) (char-bytes (, char)))))
+
+;;; @@ obsoleted aliases
+;;;
+;;; You should not use them.
+
+(defalias 'char-length 'char-bytes)
+;;(defalias 'char-columns 'char-width)
 
 
 ;;; @ string
@@ -253,6 +442,8 @@ Optional non-nil arg START-COLUMN specifies the starting column.
 ;;;
   )
 
+(defalias 'looking-at-as-unibyte 'looking-at)
+
 
 ;;; @ regulation
 ;;;