* Makefile (elc): Remove emu*.elc to use newest emu by

[elisp/apel.git] / emu-mule.el

diff --git a/emu-mule.el b/emu-mule.el
index c726ab9..8b74e36 100644 (file)
--- a/emu-mule.el
+++ b/emu-mule.el
@@ -29,7 +29,7 @@
 ;;;
 
 (cond (running-emacs-19
 ;;;
 
 (cond (running-emacs-19

-       (require 'emu-19)
+       (require 'emu-e19)

        
        ;; Suggested by SASAKI Osamu <osamu@shuugr.bekkoame.or.jp>
        ;; (cf. [os2-emacs-ja:78])
        
        ;; Suggested by SASAKI Osamu <osamu@shuugr.bekkoame.or.jp>
        ;; (cf. [os2-emacs-ja:78])

@@ -45,8 +45,8 @@
                       (string-to-number
                        (substring
                         pat (1+ (match-beginning 0)) (1- (match-end 0))))
                       (string-to-number
                        (substring
                         pat (1+ (match-beginning 0)) (1- (match-end 0))))

-                    0)))
-            )))
+                    0))
+              ))))

        )
       (running-emacs-18
        (require 'emu-18)
        )
       (running-emacs-18
        (require 'emu-18)

@@ -69,6 +69,12 @@
 (defalias 'charset-columns     'char-width)
 (defalias 'charset-direction   'char-direction)
 
 (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
 ;;;
 
 ;;; @ coding system
 ;;;

@@ -76,37 +82,39 @@
 (defun encode-coding-region (start end coding-system)
   "Encode the text between START and END to CODING-SYSTEM.
 \[EMACS 20 emulating function]"
 (defun encode-coding-region (start end coding-system)
   "Encode the text between START and END to CODING-SYSTEM.
 \[EMACS 20 emulating function]"

-  (code-convert-region start end *internal* coding-system)
-  )
+  ;; If `coding-system' is nil, do nothing.
+  (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]"
 
 (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*)
-  )
+  ;; If `coding-system' is nil, do nothing.
+  (code-convert-region start end coding-system *internal*))

 
 

+;; XXX: Should we support optional NOCOPY argument? (only in Emacs 20.x)

 (defun encode-coding-string (str coding-system)
   "Encode the STRING to CODING-SYSTEM.
 \[EMACS 20 emulating function]"
 (defun encode-coding-string (str coding-system)
   "Encode the STRING to CODING-SYSTEM.
 \[EMACS 20 emulating function]"

-  (code-convert-string str *internal* coding-system)
-  )
+  (if coding-system
+      (code-convert-string str *internal* coding-system)
+    ;;(code-convert-string str *internal* nil) returns nil instead of str.
+    str))

 
 

+;; XXX: Should we support optional NOCOPY argument? (only in Emacs 20.x)

 (defun decode-coding-string (str coding-system)
   "Decode the string STR which is encoded in CODING-SYSTEM.
 \[EMACS 20 emulating function]"
 (defun decode-coding-string (str coding-system)
   "Decode the string STR which is encoded in CODING-SYSTEM.
 \[EMACS 20 emulating function]"

-  (let ((len (length str))
-       ret)
-    (while (and
-           (< 0 len)
-           (null
-            (setq ret
-                  (code-convert-string (substring str 0 len)
-                                       coding-system *internal*))
-            ))
-      (setq len (1- len))
-      )
-    (concat ret (substring str len))
-    ))
+  (if coding-system
+      (let ((len (length str))
+           ret)
+       (while (and (< 0 len)
+                   (null (setq ret
+                               (code-convert-string
+                                (substring str 0 len)
+                                coding-system *internal*))))
+         (setq len (1- len)))
+       (concat ret (substring str len)))
+    str))

 
 (defalias 'detect-coding-region 'code-detect-region)
 
 
 (defalias 'detect-coding-region 'code-detect-region)
 

@@ -118,22 +126,19 @@
           mc-flag      
           (default-process-coding-system (cons *noconv* *noconv*))
           program-coding-system-alist)
           mc-flag      
           (default-process-coding-system (cons *noconv* *noconv*))
           program-coding-system-alist)

-       (,@ body)
-       )))
+       (,@ body))))

 
 (defmacro as-binary-input-file (&rest body)
   (` (let (mc-flag
           (file-coding-system-for-read *noconv*)
           )
 
 (defmacro as-binary-input-file (&rest body)
   (` (let (mc-flag
           (file-coding-system-for-read *noconv*)
           )

-       (,@ body)
-       )))
+       (,@ body))))

 
 (defmacro as-binary-output-file (&rest body)
   (` (let (mc-flag
           (file-coding-system *noconv*)
           )
 
 (defmacro as-binary-output-file (&rest body)
   (` (let (mc-flag
           (file-coding-system *noconv*)
           )

-       (,@ body)
-       )))
+       (,@ body))))

 
 (defalias 'set-process-input-coding-system 'set-process-coding-system)
 
 
 (defalias 'set-process-input-coding-system 'set-process-coding-system)
 

@@ -149,14 +154,31 @@ automatic uncompression, etc.
 
 Namely this function ensures that only format decoding and character
 code conversion will not take place."
 
 Namely this function ensures that only format decoding and character
 code conversion will not take place."

-  (let (mc-flag
-       (file-coding-system *noconv*))
-    (insert-file-contents filename visit beg end replace)
-    ))
+  (as-binary-input-file
+   ;; Returns list absolute file name and length of data inserted.
+   (insert-file-contents filename visit beg end replace)))

 
 (defalias 'insert-binary-file-contents 'insert-file-contents-as-binary)
 (make-obsolete 'insert-binary-file-contents 'insert-file-contents-as-binary)
 
 
 (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))
+      (let ((return-val
+            ;; Returns list absolute file name and length of data inserted.
+            (insert-file-contents-as-binary filename visit beg end replace)))
+       (goto-char (point-min))
+       (while (re-search-forward "\r$" nil t)
+         (replace-match ""))
+       (list (car return-val) (buffer-size))))))
+

 (defun insert-binary-file-contents-literally (filename
                                              &optional visit beg end replace)
   "Like `insert-file-contents-literally', q.v., but don't code conversion.
 (defun insert-binary-file-contents-literally (filename
                                              &optional visit beg end replace)
   "Like `insert-file-contents-literally', q.v., but don't code conversion.

@@ -164,29 +186,51 @@ 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."
 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)
-    ))
+  (as-binary-input-file
+   ;; Returns list absolute file name and length of data inserted.
+   (insert-file-contents-literally filename visit beg end replace)))

 
 

-(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.
+(cond
+ (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."
   (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)
-      ))
+    (as-binary-output-file
+     (write-region start end filename append visit lockname)))
+
+  (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))))

   )
   )

+ (t
+  ;; 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."
+    (as-binary-output-file
+     (write-region start end filename append visit)))
+
+  (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))))
+  ))

 
 
 ;;; @ MIME charset
 
 
 ;;; @ MIME charset

@@ -199,9 +243,9 @@ find-file-hooks, etc.
        (code-convert start end *internal* cs)
       )))
 
        (code-convert start end *internal* cs)
       )))
 

-(defun decode-mime-charset-region (start end charset)
+(defun decode-mime-charset-region (start end charset &optional lbt)

   "Decode the text between START and END as MIME CHARSET."
   "Decode the text between START and END as MIME CHARSET."

-  (let ((cs (mime-charset-to-coding-system charset)))
+  (let ((cs (mime-charset-to-coding-system charset lbt)))

     (if cs
        (code-convert start end cs *internal*)
       )))
     (if cs
        (code-convert start end cs *internal*)
       )))

@@ -213,13 +257,35 @@ find-file-hooks, etc.
        (code-convert-string string *internal* cs)
       string)))
 
        (code-convert-string string *internal* cs)
       string)))
 

-(defun decode-mime-charset-string (string charset)
+(defun decode-mime-charset-string (string charset &optional lbt)

   "Decode the STRING which is encoded in MIME CHARSET."
   "Decode the STRING which is encoded in MIME CHARSET."

-  (let ((cs (mime-charset-to-coding-system charset)))
+  (let ((cs (mime-charset-to-coding-system charset lbt)))

     (if cs
        (decode-coding-string string cs)
       string)))
 
     (if cs
        (decode-coding-string string cs)
       string)))
 

+(cond
+ (running-emacs-19_29-or-later
+  ;; for MULE 2.3 based on Emacs 19.34.
+  (defun write-region-as-mime-charset (charset start end filename
+                                              &optional append visit lockname)
+    "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 lockname)))
+  )
+ (t
+  ;; for MULE 2.3 based on Emacs 19.28.
+  (defun write-region-as-mime-charset (charset start end filename
+                                              &optional append visit lockname)
+    "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
 ;;;
 
 ;;; @@ to coding-system
 ;;;

@@ -235,20 +301,22 @@ find-file-hooks, etc.
     (x-shiftjis      . *sjis*)
     ))
 
     (x-shiftjis      . *sjis*)
     ))
 

-(defun mime-charset-to-coding-system (charset &optional lbt)
+(defsubst mime-charset-to-coding-system (charset &optional lbt)

   (if (stringp charset)
       (setq charset (intern (downcase charset)))
     )
   (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 (concat (symbol-name cs) (symbol-name lbt)))
-      )))
+  (setq charset (or (cdr (assq charset mime-charset-coding-system-alist))
+                   (intern (concat "*" (symbol-name charset) "*"))))
+  (if lbt
+      (setq charset (intern (format "%s%s" charset
+                                   (cond ((eq lbt 'CRLF) 'dos)
+                                         ((eq lbt 'LF) 'unix)
+                                         ((eq lbt 'CR) 'mac)
+                                         (t lbt)))))
+    )
+  (if (coding-system-p charset)
+      charset
+    ))

 
 
 ;;; @@ detection
 
 
 ;;; @@ detection

@@ -312,14 +380,44 @@ It must be symbol.")
    (cons lc-ascii (find-charset-region start end))))
 
 
    (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)
 
 ;;; @ 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
 
 
 ;;; @ string

@@ -330,38 +428,40 @@ It must be symbol.")
 (defalias 'string-to-int-list 'string-to-char-list)
 
 (or (fboundp 'truncate-string)
 (defalias 'string-to-int-list 'string-to-char-list)
 
 (or (fboundp 'truncate-string)

-;;; Imported from Mule-2.3
-(defun truncate-string (str width &optional start-column)
-  "Truncate STR to fit in WIDTH columns.
+    ;; Imported from Mule-2.3
+    (defun truncate-string (str width &optional start-column)
+      "\
+Truncate STR to fit in WIDTH columns.

 Optional non-nil arg START-COLUMN specifies the starting column.
 \[emu-mule.el; Mule 2.3 emulating function]"
 Optional non-nil arg START-COLUMN specifies the starting column.
 \[emu-mule.el; Mule 2.3 emulating function]"

-  (or start-column
-      (setq start-column 0))
-  (let ((max-width (string-width str))
-       (len (length str))
-       (from 0)
-       (column 0)
-       to-prev to ch)
-    (if (>= width max-width)
-       (setq width max-width))
-    (if (>= start-column width)
-       ""
-      (while (< column start-column)
-       (setq ch (aref str from)
-             column (+ column (char-width ch))
-             from (+ from (char-bytes ch))))
-      (if (< width max-width)
-         (progn
-           (setq to from)
-           (while (<= column width)
-             (setq ch (aref str to)
-                   column (+ column (char-width ch))
-                   to-prev to
-                   to (+ to (char-bytes ch))))
-           (setq to to-prev)))
-      (substring str from to))))
-;;;
-  )
+      (or start-column
+         (setq start-column 0))
+      (let ((max-width (string-width str))
+           (len (length str))
+           (from 0)
+           (column 0)
+           to-prev to ch)
+       (if (>= width max-width)
+           (setq width max-width))
+       (if (>= start-column width)
+           ""
+         (while (< column start-column)
+           (setq ch (aref str from)
+                 column (+ column (char-width ch))
+                 from (+ from (char-bytes ch))))
+         (if (< width max-width)
+             (progn
+               (setq to from)
+               (while (<= column width)
+                 (setq ch (aref str to)
+                       column (+ column (char-width ch))
+                       to-prev to
+                       to (+ to (char-bytes ch))))
+               (setq to to-prev)))
+         (substring str from to))))
+    )
+
+(defalias 'looking-at-as-unibyte 'looking-at)

 
 
 ;;; @ regulation
 
 
 ;;; @ regulation

@@ -369,15 +469,12 @@ Optional non-nil arg START-COLUMN specifies the starting column.
 
 (defun regulate-latin-char (chr)
   (cond ((and (<= ?\e$B#A\e(B chr)(<= chr ?\e$B#Z\e(B))
 
 (defun regulate-latin-char (chr)
   (cond ((and (<= ?\e$B#A\e(B chr)(<= chr ?\e$B#Z\e(B))

-        (+ (- chr ?\e$B#A\e(B) ?A)
-        )
+        (+ (- chr ?\e$B#A\e(B) ?A))

        ((and (<= ?\e$B#a\e(B chr)(<= chr ?\e$B#z\e(B))
        ((and (<= ?\e$B#a\e(B chr)(<= chr ?\e$B#z\e(B))

-        (+ (- chr ?\e$B#a\e(B) ?a)
-        )
+        (+ (- chr ?\e$B#a\e(B) ?a))

        ((eq chr ?\e$B!%\e(B) ?.)
        ((eq chr ?\e$B!$\e(B) ?,)
        ((eq chr ?\e$B!%\e(B) ?.)
        ((eq chr ?\e$B!$\e(B) ?,)

-       (t chr)
-       ))
+       (t chr)))

 
 (defun regulate-latin-string (str)
   (let ((len (length str))
 
 (defun regulate-latin-string (str)
   (let ((len (length str))

@@ -387,11 +484,78 @@ Optional non-nil arg START-COLUMN specifies the starting column.
       (setq chr (sref str i))
       (setq dest (concat dest
                         (char-to-string (regulate-latin-char chr))))
       (setq chr (sref str i))
       (setq dest (concat dest
                         (char-to-string (regulate-latin-char chr))))

-      (setq i (+ i (char-bytes chr)))
-      )
+      (setq i (+ i (char-bytes chr))))

     dest))
 
 
     dest))
 
 

+;;; @ CCL
+;;;
+(require 'ccl)
+
+(defconst ccl-use-symbol-as-program nil
+  "t if CCL related builtins accept symbol as CCL program.
+(20.2 with ExCCL, 20.3 or later)
+Otherwise nil (20.2 without ExCCL or former).
+
+Because emu provides functions accepting symbol as CCL program,
+user programs should not refer this variable.")
+
+(defun make-ccl-coding-system
+  (coding-system mnemonic doc-string decoder encoder)
+  "Define a new CODING-SYSTEM (symbol) by CCL programs
+DECODER (symbol) and ENCODER (symbol)."
+  (setq decoder (symbol-value decoder)
+       encoder (symbol-value encoder))
+  (make-coding-system coding-system 4 mnemonic doc-string
+                     nil ; Mule takes one more optional argument: EOL-TYPE.
+                     (cons decoder encoder)))
+
+(eval-when-compile
+  (define-ccl-program test-ccl-eof-block
+    '(1
+      (read r0)
+      (write "[EOF]")))
+
+  (make-ccl-coding-system
+   'test-ccl-eof-block-cs ?T "CCL_EOF_BLOCK tester"
+   'test-ccl-eof-block 'test-ccl-eof-block)
+  )
+
+(defconst ccl-encoder-eof-block-is-broken
+  (eval-when-compile
+    (not (equal (encode-coding-string "" 'test-ccl-eof-block-cs)
+               "[EOF]")))
+  "t if CCL_EOF_BLOCK is not executed when coding system encounts EOF on
+encoding.")
+
+(defconst ccl-decoder-eof-block-is-broken
+  (eval-when-compile
+    (not (equal (decode-coding-string "" 'test-ccl-eof-block-cs)
+               "[EOF]")))
+  "t if CCL_EOF_BLOCK is not executed when coding system encounts EOF on
+decoding.")
+
+(defconst ccl-eof-block-is-broken
+  (or ccl-encoder-eof-block-is-broken
+      ccl-decoder-eof-block-is-broken))
+
+(defun ccl-execute (ccl-prog reg)
+  "Execute CCL-PROG with registers initialized by REGISTERS.
+If CCL-PROG is symbol, it is dereferenced.
+\[Emacs 20.3 emulating function]"
+  (exec-ccl
+   (if (symbolp ccl-prog) (symbol-value ccl-prog) ccl-prog)
+   reg))
+
+(defun ccl-execute-on-string (ccl-prog status string &optional contin)
+  "Execute CCL-PROG with initial STATUS on STRING.
+If CCL-PROG is symbol, it is dereferenced.
+\[Emacs 20.3 emulating function]"
+  (exec-ccl-string
+   (if (symbolp ccl-prog) (symbol-value ccl-prog) ccl-prog)
+   string status))
+
+

 ;;; @ end
 ;;;
 
 ;;; @ end
 ;;;