Mercurial > hg > xemacs-beta
view lisp/mule/mule-category.el @ 1315:70921960b980
[xemacs-hg @ 2003-02-20 08:19:28 by ben]
check in makefile fixes et al
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory into src/. Simplify the dependencies -- everything
in src/ is dependent on the single entry `src' in MAKE_SUBDIRS.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc.
mule/mule-msw-init.el: Removed.
Delete this file.
mule/mule-win32-init.el: New file, with stuff from mule-msw-init.el -- not just for MS Windows
native, boys and girls!
bytecomp.el: Change code inserted to catch trying to load a Mule-only .elc
file in a non-Mule XEmacs. Formerly you got the rather cryptic
"The required feature `mule' cannot be provided". Now you get
"Loading this file requires Mule support".
finder.el: Remove dependency on which directory this function is invoked
from.
update-elc.el: Don't mess around with ../src/BYTECOMPILE_CHANGE. Now that
Makefile.in.in and xemacs.mak are in sync, both of them use
NEEDTODUMP and the other one isn't used.
dumped-lisp.el: Rewrite in terms of `list' and `nconc' instead of assemble-list, so
we can have arbitrary forms, not just `when-feature'.
very-early-lisp.el: Nuke this file.
finder-inf.el, packages.el, update-elc.el, update-elc-2.el, loadup.el, make-docfile.el: Eliminate references to very-early-lisp.
msw-glyphs.el: Comment clarification.
xemacs.mak: Add macros DO_TEMACS, DO_XEMACS, and a few others; this macro
section is now completely in sync with src/Makefile.in.in. Copy
check-features, load-shadows, and rebuilding finder-inf.el from
src/Makefile.in.in. The main build/dump/recompile process is now
synchronized with src/Makefile.in.in. Change `WARNING' to `NOTE'
and `error checking' to `error-checking' TO avoid tripping
faux warnings and errors in the VC++ IDE.
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory from top-level Makefile.in.in to here. Simplify
the dependencies. Rearrange into logical subsections.
Synchronize the main compile/dump/build-elcs section with
xemacs.mak, which is already clean and in good working order.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. Add
additional levels of macros \(e.g. DO_TEMACS, DO_XEMACS,
TEMACS_BATCH, XEMACS_BATCH, XEMACS_BATCH_PACKAGES) to factor out
duplicated stuff. Clean up handling of "HEAP_IN_DATA" (Cygwin) so
it doesn't need to ignore the return value from dumping. Add
.NO_PARALLEL since various aspects of building and dumping must be
serialized but do not always have dependencies between them
(this is impossible in some cases). Everything related to src/
now gets built in one pass in this directory by just running
`make' (except the Makefiles themselves and config.h, paths.h,
Emacs.ad.h, and other generated .h files).
console.c: Update list of possibly valid console types.
emacs.c: Rationalize the specifying and handling of the type of the first
frame. This was originally prompted by a workspace in which I got
GTK to compile under C++ and in the process fixed it so it could
coexist with X in the same build -- hence, a combined
TTY/X/MS-Windows/GTK build is now possible under Cygwin. (However,
you can't simultaneously *display* more than one kind of device
connection -- but getting that to work is not that difficult.
Perhaps a project for a bored grad student. I (ben) would do it
but don't see the use.) To make sense of this, I added new
switches that can be used to specifically indicate the window
system: -x [aka --use-x], -tty \[aka --use-tty], -msw [aka
--use-ms-windows], -gtk [aka --use-gtk], and -gnome [aka
--use-gnome, same as --use-gtk]. -nw continues as an alias for
-tty. When none have been given, XEmacs checks for other
parameters implying particular device types (-t -> tty, -display
-> x [or should it have same treatment as DISPLAY below?]), and
has ad-hoc logic afterwards: if env var DISPLAY is set, use x (or
gtk? perhaps should check whether gnome is running), else MS
Windows if it exsits, else TTY if it exists, else stream, and you
must be running in batch mode. This also fixes an existing bug
whereby compiling with no x, no mswin, no tty, when running non-
interactively (e.g. to dump) I get "sorry, must have TTY support".
emacs.c: Turn on Vstack_trace_on_error so that errors are debuggable even
when occurring extremely early in reinitialization.
emacs.c: Try to make sure that the user can see message output under
Windows (i.e. it doesn't just disappear right away) regardless of
when it occurs, e.g. in the middle of creating the first frame.
emacs.c: Define new function `emacs-run-status', indicating whether XEmacs
is noninteractive or interactive, whether raw,
post-dump/pdump-load or run-temacs, whether we are dumping,
whether pdump is in effect.
event-stream.c: It's "mommas are fat", not "momas are fat".
Fix other typo.
event-stream.c: Conditionalize in_menu_callback check on HAVE_MENUBARS,
because it won't exist on w/o menubar support,
lisp.h: More hackery on RETURN_NOT_REACHED. Cygwin v3.2 DOES complain here
if RETURN_NOT_REACHED() is blank, as it is for GCC 2.5+. So make it
blank only for GCC 2.5 through 2.999999999999999.
Declare Vstack_trace_on_error.
profile.c: Need to include "profile.h" to fix warnings.
sheap.c: Don't fatal() when need to rerun Make, just stderr_out() and exit(0).
That way we can distinguish between a dumping failing expectedly
(due to lack of stack space, triggering another dump) and unexpectedly,
in which case, we want to stop building. (or go on, if -K is given)
syntax.c, syntax.h: Use ints where they belong, and enum syntaxcode's where they belong,
and fix warnings thereby.
syntax.h: Fix crash caused by an edge condition in the syntax-cache macros.
text.h: Spacing fixes.
xmotif.h: New file, to get around shadowing warnings.
EmacsManager.c, event-Xt.c, glyphs-x.c, gui-x.c, input-method-motif.c, xmmanagerp.h, xmprimitivep.h: Include xmotif.h.
alloc.c: Conditionalize in_malloc on ERROR_CHECK_MALLOC.
config.h.in, file-coding.h, fileio.c, getloadavg.c, select-x.c, signal.c, sysdep.c, sysfile.h, systime.h, text.c, unicode.c: Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead.
Replace defined (WIN32_NATIVE) || defined (CYGWIN) with WIN32_ANY.
lisp.h: More futile attempts to walk and chew gum at the same time when
dealing with subr's that don't return.
author | ben |
---|---|
date | Thu, 20 Feb 2003 08:19:44 +0000 |
parents | c10d0c3f965f |
children | 949ac151a10d |
line wrap: on
line source
;;; mule-category.el --- category functions for XEmacs/Mule. -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1992,93,94,95 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. ;; Copyright (C) 1995 Amdahl Corporation. ;; Copyright (C) 1995 Sun Microsystems. ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; Functions for working with category tables, which are a particular ;; type of char table. Some function names / arguments should be ;; parallel with syntax tables. ;; Written by Ben Wing <ben@xemacs.org>. The initialization code ;; at the end of this file comes from Mule. ;; Some bugfixes by Jareth Hein <jhod@po.iijnet.or.jp> ;;; Code: (defvar defined-category-hashtable (make-hash-table :size 50)) (defun define-category (designator doc-string) "Make a new category whose designator is DESIGNATOR. DESIGNATOR should be a visible letter of ' ' thru '~'. STRING is a doc string for the category. Letters of 'a' thru 'z' are already used or kept for the system." (check-argument-type 'category-designator-p designator) (check-argument-type 'stringp doc-string) (puthash designator doc-string defined-category-hashtable)) (defun undefine-category (designator) "Undefine DESIGNATOR as a designator for a category." (check-argument-type 'category-designator-p designator) (remhash designator defined-category-hashtable)) (defun defined-category-p (designator) "Return non-nil if DESIGNATOR is a designator for a defined category." (and (category-designator-p designator) (gethash designator defined-category-hashtable))) (defun defined-category-list () "Return a list of the currently defined categories. Categories are given by their designators." (let (list) (maphash #'(lambda (key value) (setq list (cons key list))) defined-category-hashtable) (nreverse list))) (defun undefined-category-designator () "Return an undefined category designator, or nil if there are none." (let ((a 32) found) (while (and (< a 127) (not found)) (unless (gethash a defined-category-hashtable) (setq found (make-char 'ascii a))) (setq a (1+ a))) found)) (defun category-doc-string (designator) "Return the doc-string for the category denoted by DESIGNATOR." (check-argument-type 'defined-category-p designator) (gethash designator defined-category-hashtable)) (defun modify-category-entry (char-range designator &optional category-table reset) "Add a category to the categories associated with CHAR-RANGE. CHAR-RANGE is a single character or a range of characters, as per `put-char-table'. The category is given by a designator character. The changes are made in CATEGORY-TABLE, which defaults to the current buffer's category table. If optional fourth argument RESET is non-nil, previous categories associated with CHAR-RANGE are removed before adding the specified category." (or category-table (setq category-table (category-table))) (check-argument-type 'category-table-p category-table) (check-argument-type 'defined-category-p designator) (if reset ;; clear all existing stuff. (put-char-table char-range nil category-table)) (map-char-table #'(lambda (key value) ;; make sure that this range has a bit-vector assigned to it (if (not (bit-vector-p value)) (setq value (make-bit-vector 95 0)) (setq value (copy-sequence value))) ;; set the appropriate bit in that vector. (aset value (- designator 32) 1) ;; put the vector back, thus assuring we have a unique setting for this range (put-char-table key value category-table)) category-table char-range)) (defun char-category-list (character &optional category-table) "Return a list of the categories that CHARACTER is in. CATEGORY-TABLE defaults to the current buffer's category table. The categories are given by their designators." (or category-table (setq category-table (category-table))) (check-argument-type 'category-table-p category-table) (let ((vec (get-char-table character category-table))) (if (null vec) nil (let ((a 32) list) (while (< a 127) (if (= 1 (aref vec (- a 32))) (setq list (cons (make-char 'ascii a) list))) (setq a (1+ a))) (nreverse list))))) ;; implemented in C, file chartab.c (97/3/14 jhod@po.iijnet.or.jp) ;(defun char-in-category-p (char category &optional table) ; "Return non-nil if CHAR is in CATEGORY. ;TABLE defaults to the current buffer's category table. ;Categories are specified by their designators." ; (or table (setq table (category-table))) ; (check-argument-type 'category-table-p table) ; (check-argument-type 'category-designator-p category) ; (let ((vec (get-char-table char table))) ; (if (null vec) nil ; (= 1 (aref vec (- category 32)))))) (put 'with-category-table 'lisp-indent-function 1) (defmacro with-category-table (category-table &rest body) `(let ((current-category-table (category-table))) (set-category-table ,category-table) (unwind-protect (progn ,@body) (set-category-table current-category-table)))) (defun describe-category () "Describe the category specifications in the category table. The descriptions are inserted in a buffer, which is then displayed." (interactive) (with-displaying-help-buffer (lambda () (describe-category-table (category-table) standard-output)))) (defun describe-category-table (table stream) (let (first-char last-char prev-val (describe-one (lambda (first last value stream) (if (and (bit-vector-p value) (> (reduce '+ value) 0)) (progn (if (equal first last) (cond ((vectorp first) (princ (format "%s, row %d" (charset-name (aref first 0)) (aref first 1)) stream)) ((charsetp first) (princ (charset-name first) stream)) (t (princ first stream))) (cond ((vectorp first) (princ (format "%s, rows %d .. %d" (charset-name (aref first 0)) (aref first 1) (aref last 1)) stream)) (t (princ (format "%s .. %s" first last) stream)))) (describe-category-code value stream)))))) (map-char-table (lambda (range value) (if (and (or (and (characterp range) (characterp first-char) (eq (char-charset range) (char-charset first-char)) (= (char-to-int last-char) (1- (char-to-int range)))) (and (vectorp range) (vectorp first-char) (eq (aref range 0) (aref first-char 0)) (= (aref last-char 1) (1- (aref range 1)))) (equal value prev-val))) (setq last-char range) (if first-char (progn (funcall describe-one first-char last-char prev-val stream) (setq first-char nil))) (funcall describe-one range range value stream)) nil) table) (if first-char (funcall describe-one first-char last-char prev-val stream)))) (defun describe-category-code (code stream) (let ((standard-output (or stream standard-output))) (princ "\tin categories: ") (if (not (bit-vector-p code)) (princ "(none)") (let ((i 0) already-matched) (while (< i 95) (if (= 1 (aref code i)) (progn (if (not already-matched) (setq already-matched t) (princ " ")) (princ (int-to-char (+ 32 i))))) (setq i (1+ i))) (if (not already-matched) (princ "(none)"))) (let ((i 0)) (while (< i 95) (if (= 1 (aref code i)) (princ (format "\n\t\tmeaning: %s" (category-doc-string (int-to-char (+ 32 i)))))) (setq i (1+ i))))) (terpri))) (defconst predefined-category-list '((latin-iso8859-1 ?l "Latin-1 through Latin-5 character set") (latin-iso8859-2 ?l) (latin-iso8859-3 ?l) (latin-iso8859-4 ?l) (latin-iso8859-9 ?l) (cyrillic-iso8859-5 ?y "Cyrillic character set") (arabic-iso8859-6 ?b "Arabic character set") (greek-iso8859-7 ?g "Greek character set") (hebrew-iso8859-8 ?w "Hebrew character set") (katakana-jisx0201 ?k "Japanese 1-byte Katakana character set") (latin-jisx0201 ?r "Japanese 1-byte Roman character set") (japanese-jisx0208-1978 ?j "Japanese 2-byte character set (old)") (japanese-jisx0208 ?j "Japanese 2-byte character set") (japanese-jisx0212 ?j) (chinese-gb2312 ?c "Chinese GB (China, PRC) 2-byte character set") (chinese-cns11643-1 ?t "Chinese Taiwan (CNS or Big5) 2-byte character set") (chinese-cns11643-2 ?t) (chinese-big5-1 ?t) (chinese-big5-2 ?t) (korean-ksc5601 ?h "Hangul (Korean) 2-byte character set") ) "List of predefined categories. Each element is a list of a charset, a designator, and maybe a doc string.") (let (i l) (define-category ?a "ASCII character set.") (define-category ?l "Latin-1 through Latin-5 character set") (setq i 32) (while (< i 127) (modify-category-entry i ?a) (modify-category-entry i ?l) (setq i (1+ i))) (setq l predefined-category-list) (while l (if (and (nth 2 (car l)) (not (defined-category-p (nth 2 (car l))))) (define-category (nth 1 (car l)) (nth 2 (car l)))) (modify-category-entry (car (car l)) (nth 1 (car l)) nil t) (setq l (cdr l)))) ;;; Setting word boundary. (setq word-combining-categories '((?l . ?l))) (setq word-separating-categories ; (2-byte character sets) '((?A . ?K) ; Alpha numeric - Katakana (?A . ?C) ; Alpha numeric - Chinese (?H . ?A) ; Hiragana - Alpha numeric (?H . ?K) ; Hiragana - Katakana (?H . ?C) ; Hiragana - Chinese (?K . ?A) ; Katakana - Alpha numeric (?K . ?C) ; Katakana - Chinese (?C . ?A) ; Chinese - Alpha numeric (?C . ?K) ; Chinese - Katakana )) ;;; At the present, I know Japanese and Chinese text can ;;; break line at any point under a restriction of 'kinsoku'. ;;; #### SJT this needs to be set by language environments and probably should ;;; be buffer-local---strategy for dealing with this: check all $language.el ;;; files and also mule-base/$language-utils.el files for variables set; ;;; these should be made buffer local and some kind of a- or p-list of vars ;;; to be set for a language environment created. (defvar word-across-newline "\\(\\cj\\|\\cc\\|\\ct\\)" "Regular expression of such characters which can be a word across newline.") (defvar ascii-char "[\40-\176]") (defvar ascii-space "[ \t]") (defvar ascii-symbols "[\40-\57\72-\100\133-\140\173-\176]") (defvar ascii-numeric "[\60-\71]") (defvar ascii-English-Upper "[\101-\132]") (defvar ascii-English-Lower "[\141-\172]") (defvar ascii-alphanumeric "[\60-\71\101-\132\141-\172]") (defvar kanji-char "\\cj") (defvar kanji-space "$B!!(B") (defvar kanji-symbols "\\cS") (defvar kanji-numeric "[$B#0(B-$B#9(B]") (defvar kanji-English-Upper "[$B#A(B-$B#Z(B]") (defvar kanji-English-Lower "[$B#a(B-$B#z(B]") (defvar kanji-hiragana "\\cH") (defvar kanji-katakana "\\cK") (defvar kanji-Greek-Upper "[$B&!(B-$B&8(B]") (defvar kanji-Greek-Lower "[$B&A(B-$B&X(B]") (defvar kanji-Russian-Upper "[$B'!(B-$B'A(B]") (defvar kanji-Russian-Lower "[$B'Q(B-$B'q(B]") (defvar kanji-Kanji-1st-Level "[$B0!(B-$BOS(B]") (defvar kanji-Kanji-2nd-Level "[$BP!(B-$Bt$(B]") (defvar kanji-kanji-char "\\(\\cH\\|\\cK\\|\\cC\\)")