Mercurial > hg > xemacs-beta
view lisp/mule/mule-composite.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 | 2923009caf47 |
children | 308d34e9f07d |
line wrap: on
line source
;;; mule-composite.el --- support character composition ;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. ;; Keywords: mule, multilingual, character composition ;; This file is part of GNU Emacs. ;; GNU Emacs 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. ;; GNU Emacs 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 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. ;;; Synched up with: Emacs 21.1 (lisp/composite.el). ;;; Commentary: ;;; Code: ;;;###autoload (defconst reference-point-alist '((tl . 0) (tc . 1) (tr . 2) (Bl . 3) (Bc . 4) (Br . 5) (bl . 6) (bc . 7) (br . 8) (cl . 9) (cc . 10) (cr . 11) (top-left . 0) (top-center . 1) (top-right . 2) (base-left . 3) (base-center . 4) (base-right . 5) (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) (center-left . 9) (center-center . 10) (center-right . 11) ;; For backward compatibility... (ml . 3) (mc . 10) (mr . 5) (mid-left . 3) (mid-center . 10) (mid-right . 5)) "UNIMPLEMENTED. Alist of symbols vs integer codes of glyph reference points. A glyph reference point symbol is to be used to specify a composition rule in COMPONENTS argument to such functions as `compose-region' and `make-composition'. Meanings of glyph reference point codes are as follows: 0----1----2 <---- ascent 0:tl or top-left | | 1:tc or top-center | | 2:tr or top-right | | 3:Bl or base-left 9:cl or center-left 9 10 11 <---- center 4:Bc or base-center 10:cc or center-center | | 5:Br or base-right 11:cr or center-right --3----4----5-- <-- baseline 6:bl or bottom-left | | 7:bc or bottom-center 6----7----8 <---- descent 8:br or bottom-right Glyph reference point symbols are to be used to specify composition rule of the form \(GLOBAL-REF-POINT . NEW-REF-POINT), where GLOBAL-REF-POINT is a reference point in the overall glyphs already composed, and NEW-REF-POINT is a reference point in the new glyph to be added. For instance, if GLOBAL-REF-POINT is `br' (bottom-right) and NEW-REF-POINT is `tc' (top-center), the overall glyph is updated as follows (the point `*' corresponds to both reference points): +-------+--+ <--- new ascent | | | | global| | | glyph | | -- | | |-- <--- baseline \(doesn't change) +----+--*--+ | | new | | |glyph| +----+-----+ <--- new descent ") ;; Encode composition rule RULE into an integer value. RULE is a cons ;; of global and new reference point symbols. ;; This must be compatible with C macro COMPOSITION_ENCODE_RULE ;; defined in mule-composite.h. (defun encode-composition-rule (rule) (if (and (integerp rule) (< rule 144)) ;; Already encoded. rule (or (consp rule) (error "Invalid composition rule: %S" rule)) (let ((gref (car rule)) (nref (cdr rule))) (or (integerp gref) (setq gref (cdr (assq gref reference-point-alist)))) (or (integerp nref) (setq nref (cdr (assq nref reference-point-alist)))) (or (and (>= gref 0) (< gref 12) (>= nref 0) (< nref 12)) (error "Invalid composition rule: %S" rule)) (+ (* gref 12) nref)))) ;; Decode encoded composition rule RULE-CODE. The value is a cons of ;; global and new reference point symbols. ;; This must be compatible with C macro COMPOSITION_DECODE_RULE ;; defined in mule-composite.h. (defun decode-composition-rule (rule-code) (or (and (natnump rule-code) (< rule-code 144)) (error "Invalid encoded composition rule: %S" rule-code)) (let ((gref (car (rassq (/ rule-code 12) reference-point-alist))) (nref (car (rassq (% rule-code 12) reference-point-alist)))) (or (and gref (symbolp gref) nref (symbolp nref)) (error "Invalid composition rule code: %S" rule-code)) (cons gref nref))) ;; Encode composition rules in composition components COMPONENTS. The ;; value is a copy of COMPONENTS, where composition rules (cons of ;; global and new glyph reference point symbols) are replaced with ;; encoded composition rules. Optional 2nd argument NOCOPY non-nil ;; means don't make a copy but modify COMPONENTS directly. (defun encode-composition-components (components &optional nocopy) (or nocopy (setq components (copy-sequence components))) (if (vectorp components) (let ((len (length components)) (i 1)) (while (< i len) (aset components i (encode-composition-rule (aref components i))) (setq i (+ i 2)))) (let ((tail (cdr components))) (while tail (setcar tail (encode-composition-rule (car tail))) (setq tail (nthcdr 2 tail))))) components) ;; Decode composition rule codes in composition components COMPONENTS. ;; The value is a copy of COMPONENTS, where composition rule codes are ;; replaced with composition rules (cons of global and new glyph ;; reference point symbols). Optional 2nd argument NOCOPY non-nil ;; means don't make a copy but modify COMPONENTS directly. ;; It is assumed that COMPONENTS is a vector and is for rule-base ;; composition, thus (2N+1)th elements are rule codes. (defun decode-composition-components (components &optional nocopy) (or nocopy (setq components (copy-sequence components))) (let ((len (length components)) (i 1)) (while (< i len) (aset components i (decode-composition-rule (aref components i))) (setq i (+ i 2)))) components) ;;;###autoload (defun compose-region (start end &optional components modification-func) "UNIMPLEMENTED. Compose characters in the current region. When called from a program, expects these four arguments. First two arguments START and END are positions (integers or markers) specifying the region. Optional 3rd argument COMPONENTS, if non-nil, is a character or a sequence (vector, list, or string) of integers. If it is a character, it is an alternate character to display instead of the text in the region. If it is a string, the elements are alternate characters. If it is a vector or list, it is a sequence of alternate characters and composition rules, where (2N)th elements are characters and (2N+1)th elements are composition rules to specify how to compose (2N+2)th elements with previously composed N glyphs. A composition rule is a cons of global and new glyph reference point symbols. See the documentation of `reference-point-alist' for more detail. Optional 4th argument MODIFICATION-FUNC is a function to call to adjust the composition when it gets invalid because of a change of text in the composition." (interactive "r") (let ((modified-p (buffer-modified-p)) (buffer-read-only nil)) (if (or (vectorp components) (listp components)) (setq components (encode-composition-components components))) (compose-region-internal start end components modification-func) (set-buffer-modified-p modified-p))) ;;;###autoload (defun decompose-region (start end) "UNIMPLEMENTED. Decompose text in the current region. When called from a program, expects two arguments, positions (integers or markers) specifying the region." (interactive "r") (let ((modified-p (buffer-modified-p)) (buffer-read-only nil)) (remove-text-properties start end '(composition nil)) (set-buffer-modified-p modified-p))) ;;;###autoload (defun compose-string (string &optional start end components modification-func) "UNIMPLEMENTED. Compose characters in string STRING. The return value is STRING where `composition' property is put on all the characters in it. Optional 2nd and 3rd arguments START and END specify the range of STRING to be composed. They defaults to the beginning and the end of STRING respectively. Optional 4th argument COMPONENTS, if non-nil, is a character or a sequence (vector, list, or string) of integers. See the function `compose-region' for more detail. Optional 5th argument MODIFICATION-FUNC is a function to call to adjust the composition when it gets invalid because of a change of text in the composition." (if (or (vectorp components) (listp components)) (setq components (encode-composition-components components))) (or start (setq start 0)) (or end (setq end (length string))) (compose-string-internal string start end components modification-func) string) ;;;###autoload (defun decompose-string (string) "UNIMPLEMENTED. Return STRING where `composition' property is removed." (remove-text-properties 0 (length string) '(composition nil) string) string) ;;;###autoload (defun compose-chars (&rest args) "UNIMPLEMENTED. Return a string from arguments in which all characters are composed. For relative composition, arguments are characters. For rule-based composition, Mth \(where M is odd) arguments are characters, and Nth \(where N is even) arguments are composition rules. A composition rule is a cons of glyph reference points of the form \(GLOBAL-REF-POINT . NEW-REF-POINT). See the documentation of `reference-point-alist' for more detail." (let (str components) (if (consp (car (cdr args))) ;; Rule-base composition. (let (;(len (length args)) (tail (encode-composition-components args 'nocopy))) (while tail (setq str (cons (car tail) str)) (setq tail (nthcdr 2 tail))) (setq str (concat (nreverse str)) components args)) ;; Relative composition. (setq str (concat args))) (compose-string-internal str 0 (length str) components))) ;;;###autoload (defun find-composition (pos &optional limit string detail-p) "UNIMPLEMENTED. Return information about a composition at or nearest to buffer position POS. If the character at POS has `composition' property, the value is a list of FROM, TO, and VALID-P. FROM and TO specify the range of text that has the same `composition' property, VALID-P is non-nil if and only if this composition is valid. If there's no composition at POS, and the optional 2nd argument LIMIT is non-nil, search for a composition toward LIMIT. If no composition is found, return nil. Optional 3rd argument STRING, if non-nil, is a string to look for a composition in; nil means the current buffer. If a valid composition is found and the optional 4th argument DETAIL-P is non-nil, the return value is a list of FROM, TO, COMPONENTS, RELATIVE-P, MOD-FUNC, and WIDTH. COMPONENTS is a vector of integers, the meaning depends on RELATIVE-P. RELATIVE-P is t if the composition method is relative, else nil. If RELATIVE-P is t, COMPONENTS is a vector of characters to be composed. If RELATIVE-P is nil, COMPONENTS is a vector of characters and composition rules as described in `compose-region'. MOD-FUNC is a modification function of the composition. WIDTH is a number of columns the composition occupies on the screen." (let ((result (find-composition-internal pos limit string detail-p))) (if (and detail-p result (nth 2 result) (not (nth 3 result))) ;; This is a valid rule-base composition. (decode-composition-components (nth 2 result) 'nocopy)) result)) ;;;###autoload (defun compose-chars-after (pos &optional limit object) "UNIMPLEMENTED. Compose characters in current buffer after position POS. It looks up the char-table `composition-function-table' (which see) by a character after POS. If non-nil value is found, the format of the value should be an alist of PATTERNs vs FUNCs, where PATTERNs are regular expressions and FUNCs are functions. If the text after POS matches one of PATTERNs, call the corresponding FUNC with three arguments POS, TO, and PATTERN, where TO is the end position of text matching PATTERN, and return what FUNC returns. Otherwise, return nil. FUNC is responsible for composing the text properly. The return value is: nil -- if no characters were composed. CHARS (integer) -- if CHARS characters were composed. Optional 2nd arg LIMIT, if non-nil, limits the matching of text. Optional 3rd arg OBJECT, if non-nil, is a string that contains the text to compose. In that case, POS and LIMIT index to the string. This function is the default value of `compose-chars-after-function'." (let ((tail (get-char-table (char-after pos) composition-function-table)) pattern func result) (when tail (save-match-data (save-excursion (while (and tail (not func)) (setq pattern (car (car tail)) func (cdr (car tail))) (goto-char pos) (if (if limit (and (re-search-forward pattern limit t) (= (match-beginning 0) pos)) (looking-at pattern)) (setq result (funcall func pos (match-end 0) pattern nil)) (setq func nil tail (cdr tail))))))) result)) ;;;###autoload (defun compose-last-chars (args) "UNIMPLEMENTED. Compose last characters. The argument is a parameterized event of the form \(compose-last-chars N COMPONENTS), where N is the number of characters before point to compose, COMPONENTS, if non-nil, is the same as the argument to `compose-region' \(which see). If it is nil, `compose-chars-after' is called, and that function find a proper rule to compose the target characters. This function is intended to be used from input methods. The global keymap binds special event `compose-last-chars' to this function. Input method may generate an event (compose-last-chars N COMPONENTS) after a sequence character events." (interactive "e") (let ((chars (nth 1 args))) (if (and (numberp chars) (>= (- (point) (point-min)) chars)) (if (nth 2 args) (compose-region (- (point) chars) (point) (nth 2 args)) (compose-chars-after (- (point) chars) (point)))))) ;;;###autoload(global-set-key [compose-last-chars] 'compose-last-chars) ;;; The following codes are only for backward compatibility with Emacs ;;; 20.4 and the earlier. ;;;###autoload (defun decompose-composite-char (char &optional type with-composition-rule) "UNIMPLEMENTED. Convert CHAR to string. This is only for backward compatibility with Emacs 20.4 and the earlier. If optional 2nd arg TYPE is non-nil, it is `string', `list', or `vector'. In this case, CHAR is converted string, list of CHAR, or vector of CHAR respectively." (cond ((or (null type) (eq type 'string)) (char-to-string char)) ((eq type 'list) (list char)) (t (vector char)))) (make-obsolete 'decompose-composite-char 'char-to-string ;;"21.1" ) ;;; mule-composite.el ends here