From 01ad6e89171a79e68874456a6109a7dc9f97f66d Mon Sep 17 00:00:00 2001 From: morioka Date: Wed, 11 Mar 1998 12:28:11 +0000 Subject: [PATCH] tm 7.101. --- emu-e20.el | 177 +++++++++++++++++++++++++----------------------------------- emu-x20.el | 141 ++++++++++++++++++++++-------------------------- 2 files changed, 138 insertions(+), 180 deletions(-) diff --git a/emu-e20.el b/emu-e20.el index e5623a1..cdaf629 100644 --- a/emu-e20.el +++ b/emu-e20.el @@ -1,9 +1,9 @@ -;;; emu-e20.el --- emu API implementation for Emacs/mule (delta) +;;; emu-e20.el --- emu API implementation for Emacs/mule (19.34.91) -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996,1997 Free Software Foundation, Inc. ;; Author: MORIOKA Tomohiko -;; Version: $Id: emu-e20.el,v 7.2 1996/12/18 13:12:15 morioka Exp $ +;; Version: $Id: emu-e20.el,v 7.9 1997/01/18 09:35:35 morioka Exp $ ;; Keywords: emulation, compatibility, Mule ;; This file is part of emu. @@ -31,42 +31,35 @@ (require 'emu-19) (defun fontset-pixel-size (fontset) - (require 'cl) (let* ((info (fontset-info fontset)) (height (aref info 1)) ) - (if (> height 0) - height - (let ((str (car (find-if (function identity) (aref info 2))))) - (if (string-match "--\\([0-9]+\\)-\\*-\\*-\\*-\\*-\\*-ISO8859-1" str) - (string-to-number - (substring str (match-beginning 1)(match-end 1)) - ) - 0))))) + (cond ((> height 0) height) + ((string-match "-\\([0-9]+\\)-" fontset) + (string-to-number + (substring fontset (match-beginning 1)(match-end 1)) + ) + ) + (t 0) + ))) ;;; @ character set ;;; -(defalias 'charset-columns 'charset-width) - -(defun charset-iso-class (charset) - "Return ISO-class of CHARSET. -\(0/CLASS94, 1/CLASS96, 2/CLASS94x94, 3/CLASS96x96) [emu-e20.el]" - (aref (charset-info charset) 5) - ) +;; (defalias 'charset-columns 'charset-width) (defun find-non-ascii-charset-string (string) "Return a list of charsets in the STRING except ascii. \[emu-e20.el; Mule emulating function]" - (delq charset-ascii (find-charset-string string)) + (delq 'ascii (find-charset-string string)) ) (defun find-non-ascii-charset-region (start end) "Return a list of charsets except ascii in the region between START and END. \[emu-e20.el; Mule emulating function]" - (delq charset-ascii (find-charset-string (buffer-substring start end))) + (delq 'ascii (find-charset-string (buffer-substring start end))) ) @@ -94,65 +87,41 @@ in the region between START and END. ;;; (defvar charsets-mime-charset-alist - (list - (cons (list charset-ascii) 'us-ascii) - (cons (list charset-ascii charset-latin-iso8859-1) 'iso-8859-1) - (cons (list charset-ascii charset-latin-iso8859-2) 'iso-8859-2) - (cons (list charset-ascii charset-latin-iso8859-3) 'iso-8859-3) - (cons (list charset-ascii charset-latin-iso8859-4) 'iso-8859-4) -;;;(cons (list charset-ascii -;;; charset-cyrillic-iso8859-5) 'iso-8859-5) - (cons (list charset-ascii - charset-cyrillic-iso8859-5) 'koi8-r) - (cons (list charset-ascii charset-arabic-iso8859-6) 'iso-8859-6) - (cons (list charset-ascii charset-greek-iso8859-7) 'iso-8859-7) - (cons (list charset-ascii charset-hebrew-iso8859-8) 'iso-8859-8) - (cons (list charset-ascii charset-latin-iso8859-9) 'iso-8859-9) - (cons (list charset-ascii - charset-latin-jisx0201 - charset-japanese-jisx0208-1978 - charset-japanese-jisx0208) 'iso-2022-jp) - (cons (list charset-ascii charset-korean-ksc5601) 'euc-kr) - (cons (list charset-ascii charset-chinese-gb2312) 'cn-gb-2312) - (cons (list charset-ascii - charset-chinese-big5-1 - charset-chinese-big5-2) 'cn-big5) - (cons (list charset-ascii charset-latin-iso8859-1 - charset-greek-iso8859-7 - charset-latin-jisx0201 - charset-japanese-jisx0208-1978 - charset-chinese-gb2312 - charset-japanese-jisx0208 - charset-korean-ksc5601 - charset-japanese-jisx0212) 'iso-2022-jp-2) - (cons (list charset-ascii charset-latin-iso8859-1 - charset-greek-iso8859-7 - charset-latin-jisx0201 - charset-japanese-jisx0208-1978 - charset-chinese-gb2312 - charset-japanese-jisx0208 - charset-korean-ksc5601 - charset-japanese-jisx0212 - charset-chinese-cns11643-1 - charset-chinese-cns11643-2) 'iso-2022-int-1) - (cons (list charset-ascii charset-latin-iso8859-1 - charset-latin-iso8859-2 - charset-cyrillic-iso8859-5 - charset-greek-iso8859-7 - charset-latin-jisx0201 - charset-japanese-jisx0208-1978 - charset-chinese-gb2312 - charset-japanese-jisx0208 - charset-korean-ksc5601 - charset-japanese-jisx0212 - charset-chinese-cns11643-1 - charset-chinese-cns11643-2 - charset-chinese-cns11643-3 - charset-chinese-cns11643-4 - charset-chinese-cns11643-5 - charset-chinese-cns11643-6 - charset-chinese-cns11643-7) 'iso-2022-int-1) - )) + '(((ascii) . us-ascii) + ((ascii latin-iso8859-1) . iso-8859-1) + ((ascii latin-iso8859-2) . iso-8859-2) + ((ascii latin-iso8859-3) . iso-8859-3) + ((ascii latin-iso8859-4) . iso-8859-4) +;;; ((ascii cyrillic-iso8859-5) . iso-8859-5) + ((ascii cyrillic-iso8859-5) . koi8-r) + ((ascii arabic-iso8859-6) . iso-8859-6) + ((ascii greek-iso8859-7) . iso-8859-7) + ((ascii hebrew-iso8859-8) . iso-8859-8) + ((ascii latin-iso8859-9) . iso-8859-9) + ((ascii latin-jisx0201 + japanese-jisx0208-1978 japanese-jisx0208) . iso-2022-jp) + ((ascii korean-ksc5601) . euc-kr) + ((ascii chinese-gb2312) . cn-gb-2312) + ((ascii chinese-big5-1 chinese-big5-2) . cn-big5) + ((ascii latin-iso8859-1 greek-iso8859-7 + latin-jisx0201 japanese-jisx0208-1978 + chinese-gb2312 japanese-jisx0208 + korean-ksc5601 japanese-jisx0212) . iso-2022-jp-2) + ((ascii latin-iso8859-1 greek-iso8859-7 + latin-jisx0201 japanese-jisx0208-1978 + chinese-gb2312 japanese-jisx0208 + korean-ksc5601 japanese-jisx0212 + chinese-cns11643-1 chinese-cns11643-2) . iso-2022-int-1) + ((ascii latin-iso8859-1 latin-iso8859-2 + cyrillic-iso8859-5 greek-iso8859-7 + latin-jisx0201 japanese-jisx0208-1978 + chinese-gb2312 japanese-jisx0208 + korean-ksc5601 japanese-jisx0212 + chinese-cns11643-1 chinese-cns11643-2 + chinese-cns11643-3 chinese-cns11643-4 + chinese-cns11643-5 chinese-cns11643-6 + chinese-cns11643-7) . iso-2022-int-1) + )) (defvar default-mime-charset 'x-ctext) @@ -244,7 +213,7 @@ TABLE defaults to the current buffer's category table. (defalias 'string-columns 'string-width) -(defalias 'sset 'string-embed-string) +(defalias 'sset 'store-substring) (defun string-to-char-list (string) "Return a list of which elements are characters in the STRING. @@ -266,29 +235,29 @@ TABLE defaults to the current buffer's category table. ;;; @ regulation ;;; -(defun regulate-latin-char (chr) - (cond ((and (<= ?Ａ chr)(<= chr ?Ｚ)) - (+ (- chr ?Ａ) ?A) - ) - ((and (<= ?ａ chr)(<= chr ?ｚ)) - (+ (- chr ?ａ) ?a) - ) - ((eq chr ?．) ?.) - ((eq chr ?，) ?,) - (t chr) - )) - -(defun regulate-latin-string (str) - (let ((len (length str)) - (i 0) - chr (dest "")) - (while (< i len) - (setq chr (sref str i)) - (setq dest (concat dest - (char-to-string (regulate-latin-char chr)))) - (setq i (+ i (char-bytes chr))) - ) - dest)) +;; (defun regulate-latin-char (chr) +;; (cond ((and (<= ?Ａ chr)(<= chr ?Ｚ)) +;; (+ (- chr ?Ａ) ?A) +;; ) +;; ((and (<= ?ａ chr)(<= chr ?ｚ)) +;; (+ (- chr ?ａ) ?a) +;; ) +;; ((eq chr ?．) ?.) +;; ((eq chr ?，) ?,) +;; (t chr) +;; )) + +;; (defun regulate-latin-string (str) +;; (let ((len (length str)) +;; (i 0) +;; chr (dest "")) +;; (while (< i len) +;; (setq chr (sref str i)) +;; (setq dest (concat dest +;; (char-to-string (regulate-latin-char chr)))) +;; (setq i (+ i (char-bytes chr))) +;; ) +;; dest)) ;;; @ end diff --git a/emu-x20.el b/emu-x20.el index f56c63f..3dfd4bd 100644 --- a/emu-x20.el +++ b/emu-x20.el @@ -1,13 +1,12 @@ ;;; emu-x20.el --- emu API implementation for XEmacs 20 with mule -;; Copyright (C) 1995 Free Software Foundation, Inc. -;; Copyright (C) 1994,1995,1996 MORIOKA Tomohiko +;; Copyright (C) 1994,1995,1996,1997 MORIOKA Tomohiko ;; Author: MORIOKA Tomohiko -;; Version: $Id: emu-x20.el,v 7.43 1996/12/07 06:07:15 morioka Exp $ +;; Version: $Id: emu-x20.el,v 7.45 1997/01/18 09:44:43 morioka Exp $ ;; Keywords: emulation, compatibility, Mule, XEmacs -;; This file is part of tl (Tiny Library). +;; This file is part of XEmacs. ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -36,28 +35,6 @@ ))) -;;; @ graphic character set -;;; - -(defalias 'charset-description 'charset-doc-string) - -(defalias 'find-charset-string 'charsets-in-string) -(defalias 'find-charset-region 'charsets-in-region) - -(defun find-non-ascii-charset-string (string) - "Return a list of charsets in the STRING except ascii. -\[emu-x20.el; Mule emulating function]" - (delq 'ascii (charsets-in-string string)) - ) - -(defun find-non-ascii-charset-region (start end) - "Return a list of charsets except ascii -in the region between START and END. -\[emu-x20.el; Mule emulating function]" - (delq 'ascii (charsets-in-region start end)) - ) - - ;;; @ coding-system ;;; @@ -96,30 +73,42 @@ in the region between START and END. ((ascii greek-iso8859-7) . iso-8859-7) ((ascii hebrew-iso8859-8) . iso-8859-8) ((ascii latin-iso8859-9) . iso-8859-9) - ((ascii japanese-jisx0208-1978 japanese-jisx0208) . iso-2022-jp) + ((ascii latin-jisx0201 + japanese-jisx0208-1978 japanese-jisx0208) . iso-2022-jp) ((ascii korean-ksc5601) . euc-kr) - ((ascii chinese-big5-1 chinese-big5-2) . big5) - ((ascii japanese-jisx0208-1978 chinese-gb - japanese-jisx0208 korean-ksc5601 - japanese-jisx0212 latin-iso8859-1 - greek-iso8859-7) . iso-2022-jp-2) - ((ascii japanese-jisx0208-1978 chinese-gb2312 - japanese-jisx0208 korean-ksc5601 - japanese-jisx0212 + ((ascii chinese-gb2312) . cn-gb-2312) + ((ascii chinese-big5-1 chinese-big5-2) . cn-big5) + ((ascii latin-iso8859-1 greek-iso8859-7 + latin-jisx0201 japanese-jisx0208-1978 + chinese-gb2312 japanese-jisx0208 + korean-ksc5601 japanese-jisx0212) . iso-2022-jp-2) + ((ascii latin-iso8859-1 greek-iso8859-7 + latin-jisx0201 japanese-jisx0208-1978 + chinese-gb2312 japanese-jisx0208 + korean-ksc5601 japanese-jisx0212 + chinese-cns11643-1 chinese-cns11643-2) . iso-2022-int-1) + ((ascii latin-iso8859-1 latin-iso8859-2 + cyrillic-iso8859-5 greek-iso8859-7 + latin-jisx0201 japanese-jisx0208-1978 + chinese-gb2312 japanese-jisx0208 + korean-ksc5601 japanese-jisx0212 chinese-cns11643-1 chinese-cns11643-2 - latin-iso8859-1 greek-iso8859-7) . iso-2022-int-1) + chinese-cns11643-3 chinese-cns11643-4 + chinese-cns11643-5 chinese-cns11643-6 + chinese-cns11643-7) . iso-2022-int-1) )) -(defvar default-mime-charset 'iso-2022-int-1) +(defvar default-mime-charset 'x-ctext) (defvar mime-charset-coding-system-alist - '((iso-8859-1 . 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) + '((iso-8859-1 . ctext) + (x-ctext . ctext) + (hz-gb-2312 . hz) + (cn-gb-2312 . euc-china) + (gb2312 . euc-china) + (cn-big5 . big5) + (koi8-r . koi8) + (iso-2022-jp-2 . iso-2022-ss2-7) )) (defun mime-charset-to-coding-system (charset) @@ -170,24 +159,24 @@ in the region between START and END. ;;; @ character ;;; -(defun char-bytes (chr) 1) +;; (defun char-bytes (chr) 1) -(defun char-length (character) - "Return number of elements a CHARACTER occupies in a string or buffer. -\[emu-x20.el]" - 1) +;; (defun char-length (character) +;; "Return number of elements a CHARACTER occupies in a string or buffer. +;; \[emu-x20.el]" +;; 1) -(defun char-columns (character) - "Return number of columns a CHARACTER occupies when displayed. -\[emu-x20.el]" - (charset-columns (char-charset character)) - ) +;; (defun char-columns (character) +;; "Return number of columns a CHARACTER occupies when displayed. +;; \[emu-x20.el]" +;; (charset-columns (char-charset character)) +;; ) ;;; @@ Mule emulating aliases ;;; ;;; You should not use them. -(defalias 'char-width 'char-columns) +;;(defalias 'char-width 'char-columns) (defalias 'char-leading-char 'char-charset) @@ -206,34 +195,34 @@ TABLE defaults to the current buffer's category table. ;;; @ string ;;; -(defun string-columns (string) - "Return number of columns STRING occupies when displayed. -\[emu-x20.el]" - (let ((col 0) - (len (length string)) - (i 0)) - (while (< i len) - (setq col (+ col (char-columns (aref string i)))) - (setq i (1+ i)) - ) - col)) +;; (defun string-columns (string) +;; "Return number of columns STRING occupies when displayed. +;; \[emu-x20.el]" +;; (let ((col 0) +;; (len (length string)) +;; (i 0)) +;; (while (< i len) +;; (setq col (+ col (char-columns (aref string i)))) +;; (setq i (1+ i)) +;; ) +;; col)) -(defalias 'string-width 'string-columns) +;;(defalias 'string-width 'string-columns) (defun string-to-int-list (str) (mapcar #'char-int str) ) -(defalias 'sref 'aref) +;;(defalias 'sref 'aref) -(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-x20.el; Mule 2.3 emulating function]" - (or start-column - (setq start-column 0)) - (substring str start-column width) - ) +;; (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-x20.el; Mule 2.3 emulating function]" +;; (or start-column +;; (setq start-column 0)) +;; (substring str start-column width) +;; ) ;;; @ end -- 1.7.10.4