Mercurial > hg > xemacs-beta
view src/mule-charset.c @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 71ee43b8a74d |
| children | 308d34e9f07d |
line wrap: on
line source
/* Functions to handle multilingual characters. Copyright (C) 1992, 1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 2001, 2002, 2004, 2005, 2010 Ben Wing. 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. */ /* Synched up with: FSF 20.3. Not in FSF. */ /* Rewritten by Ben Wing <ben@xemacs.org>. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "chartab.h" #include "elhash.h" #include "device.h" #include "faces.h" #include "lstream.h" #include "mule-ccl.h" #include "fontcolor.h" #include "specifier.h" /* The various pre-defined charsets. */ Lisp_Object Vcharset_ascii; Lisp_Object Vcharset_control_1; Lisp_Object Vcharset_latin_iso8859_1; Lisp_Object Vcharset_latin_iso8859_2; Lisp_Object Vcharset_latin_iso8859_3; Lisp_Object Vcharset_latin_iso8859_4; Lisp_Object Vcharset_thai_tis620; Lisp_Object Vcharset_greek_iso8859_7; Lisp_Object Vcharset_arabic_iso8859_6; Lisp_Object Vcharset_hebrew_iso8859_8; Lisp_Object Vcharset_katakana_jisx0201; Lisp_Object Vcharset_latin_jisx0201; Lisp_Object Vcharset_cyrillic_iso8859_5; Lisp_Object Vcharset_latin_iso8859_9; Lisp_Object Vcharset_latin_iso8859_15; Lisp_Object Vcharset_japanese_jisx0208_1978; Lisp_Object Vcharset_chinese_gb2312; Lisp_Object Vcharset_japanese_jisx0208; Lisp_Object Vcharset_korean_ksc5601; Lisp_Object Vcharset_japanese_jisx0212; Lisp_Object Vcharset_chinese_cns11643_1; Lisp_Object Vcharset_chinese_cns11643_2; Lisp_Object Vcharset_chinese_big5_1; Lisp_Object Vcharset_chinese_big5_2; Lisp_Object Vcharset_composite; struct charset_lookup *chlook; static const struct memory_description charset_lookup_description_1[] = { { XD_LISP_OBJECT_ARRAY, offsetof (struct charset_lookup, charset_by_leading_byte), NUM_LEADING_BYTES+4*128*2 }, { XD_END } }; static const struct sized_memory_description charset_lookup_description = { sizeof (struct charset_lookup), charset_lookup_description_1 }; Lisp_Object Qcharsetp; /* Qdoc_string, Qdimension, Qchars, Qfinal defined in general.c */ Lisp_Object Qregistries, Qgraphic, Qregistry; Lisp_Object Qdirection; Lisp_Object Qreverse_direction_charset; Lisp_Object Qshort_name, Qlong_name; Lisp_Object Qto_unicode; Lisp_Object Qlatin_iso8859_1, Qlatin_iso8859_2, Qlatin_iso8859_3, Qlatin_iso8859_4, Qthai_tis620, Qgreek_iso8859_7, Qarabic_iso8859_6, Qhebrew_iso8859_8, Qkatakana_jisx0201, Qlatin_jisx0201, Qcyrillic_iso8859_5, Qlatin_iso8859_9, Qlatin_iso8859_15, Qjapanese_jisx0208_1978, Qchinese_gb2312, Qjapanese_jisx0208, Qkorean_ksc5601, Qjapanese_jisx0212, Qchinese_cns11643_1, Qchinese_cns11643_2, Qchinese_big5_1, Qchinese_big5_2, Qcomposite; Lisp_Object Ql2r, Qr2l; Lisp_Object Vcharset_hash_table; /************************************************************************/ /* charset object */ /************************************************************************/ static Lisp_Object mark_charset (Lisp_Object obj) { Lisp_Charset *cs = XCHARSET (obj); mark_object (cs->short_name); mark_object (cs->long_name); mark_object (cs->doc_string); mark_object (cs->registries); mark_object (cs->ccl_program); return cs->name; } static void print_charset (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Lisp_Charset *cs = XCHARSET (obj); if (print_readably) printing_unreadable_lisp_object (obj, XSTRING_DATA (XSYMBOL (XCHARSET_NAME (obj))->name)); write_fmt_string_lisp (printcharfun, "#<charset %s %S %S %S", 4, CHARSET_NAME (cs), CHARSET_SHORT_NAME (cs), CHARSET_LONG_NAME (cs), CHARSET_DOC_STRING (cs)); write_fmt_string (printcharfun, " %s %s cols=%d g%d final='%c' reg=", CHARSET_TYPE (cs) == CHARSET_TYPE_94 ? "94" : CHARSET_TYPE (cs) == CHARSET_TYPE_96 ? "96" : CHARSET_TYPE (cs) == CHARSET_TYPE_94X94 ? "94x94" : "96x96", CHARSET_DIRECTION (cs) == CHARSET_LEFT_TO_RIGHT ? "l2r" : "r2l", CHARSET_COLUMNS (cs), CHARSET_GRAPHIC (cs), CHARSET_FINAL (cs)); print_internal (CHARSET_REGISTRIES (cs), printcharfun, 0); write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj)); } static const struct memory_description charset_description[] = { { XD_INT, offsetof (Lisp_Charset, dimension) }, { XD_INT, offsetof (Lisp_Charset, from_unicode_levels) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, name) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, doc_string) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, registries) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, short_name) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, long_name) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, reverse_direction_charset) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, ccl_program) }, { XD_UNION, offsetof (Lisp_Charset, to_unicode_table), XD_INDIRECT (0, 0), { &to_unicode_description }, XD_FLAG_NO_KKCC }, { XD_UNION, offsetof (Lisp_Charset, from_unicode_table), XD_INDIRECT (1, 0), { &from_unicode_description }, XD_FLAG_NO_KKCC }, { XD_END } }; DEFINE_DUMPABLE_LISP_OBJECT ("charset", charset, mark_charset, print_charset, 0, 0, 0, charset_description, Lisp_Charset); /* Make a new charset. */ /* #### SJT Should generic properties be allowed? */ static Lisp_Object make_charset (int id, Lisp_Object name, int rep_bytes, int type, int columns, int graphic, Ibyte final, int direction, Lisp_Object short_name, Lisp_Object long_name, Lisp_Object doc, Lisp_Object reg, int overwrite, int encode_as_utf_8) { Lisp_Object obj; Lisp_Charset *cs; if (!overwrite) { obj = ALLOC_NORMAL_LISP_OBJECT (charset); cs = XCHARSET (obj); if (final) { /* some charsets do not have final characters. This includes ASCII, Control-1, Composite, and the two faux private charsets. */ assert (NILP (chlook-> charset_by_attributes[type][final][direction])); chlook->charset_by_attributes[type][final][direction] = obj; } assert (NILP (chlook->charset_by_leading_byte[id - MIN_LEADING_BYTE])); chlook->charset_by_leading_byte[id - MIN_LEADING_BYTE] = obj; } else { Lisp_Object ret; /* Actually overwrite the properties of the existing charset. We do this because until now charsets could never be "deleted", so parts of the code don't bother to GC charsets. */ obj = chlook->charset_by_leading_byte[id - MIN_LEADING_BYTE]; cs = XCHARSET (obj); assert (EQ (chlook->charset_by_attributes[type][final][direction], obj)); ret = Fremhash (XCHARSET_NAME (obj), Vcharset_hash_table); assert (!NILP (ret)); } CHARSET_ID (cs) = id; CHARSET_NAME (cs) = name; CHARSET_SHORT_NAME (cs) = short_name; CHARSET_LONG_NAME (cs) = long_name; CHARSET_REP_BYTES (cs) = rep_bytes; CHARSET_DIRECTION (cs) = direction; CHARSET_TYPE (cs) = type; CHARSET_COLUMNS (cs) = columns; CHARSET_GRAPHIC (cs) = graphic; CHARSET_FINAL (cs) = final; CHARSET_DOC_STRING (cs) = doc; CHECK_VECTOR(reg); CHARSET_REGISTRIES (cs) = reg; CHARSET_ENCODE_AS_UTF_8 (cs) = encode_as_utf_8 ? 1 : 0; CHARSET_CCL_PROGRAM (cs) = Qnil; CHARSET_REVERSE_DIRECTION_CHARSET (cs) = Qnil; CHARSET_DIMENSION (cs) = (CHARSET_TYPE (cs) == CHARSET_TYPE_94 || CHARSET_TYPE (cs) == CHARSET_TYPE_96) ? 1 : 2; CHARSET_CHARS (cs) = (CHARSET_TYPE (cs) == CHARSET_TYPE_94 || CHARSET_TYPE (cs) == CHARSET_TYPE_94X94) ? 94 : 96; if (id == LEADING_BYTE_ASCII || id == LEADING_BYTE_CONTROL_1 #ifdef ENABLE_COMPOSITE_CHARS || id == LEADING_BYTE_COMPOSITE #endif ) assert (!overwrite); else { if (overwrite) free_charset_unicode_tables (obj); init_charset_unicode_tables (obj); } /* Some charsets are "faux" and don't have names or really exist at all except in the leading-byte table. */ if (!NILP (name)) { assert (NILP (Fgethash (name, Vcharset_hash_table, Qnil))); Fputhash (name, obj, Vcharset_hash_table); } recalculate_unicode_precedence (); setup_charset_initial_specifier_tags (obj); return obj; } static int get_unallocated_leading_byte (int dimension) { int lb; if (dimension == 1) { if (chlook->next_allocated_1_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_1) lb = 0; else lb = chlook->next_allocated_1_byte_leading_byte++; } else { /* awfully fragile, but correct */ #if MAX_LEADING_BYTE_PRIVATE_2 == 255 if (chlook->next_allocated_2_byte_leading_byte == 0) #else if (chlook->next_allocated_2_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_2) #endif lb = 0; else lb = chlook->next_allocated_2_byte_leading_byte++; } if (!lb) invalid_operation ("No more character sets free for this dimension", make_int (dimension)); return lb; } /************************************************************************/ /* Basic charset Lisp functions */ /************************************************************************/ void get_charset_limits (Lisp_Object charset, int *low, int *high) { Lisp_Charset *cs = XCHARSET (charset); if (EQ (charset, Vcharset_ascii)) *low = 0, *high = 127; else if (EQ (charset, Vcharset_control_1)) *low = 0, *high = 31; else if (CHARSET_CHARS (cs) == 94) *low = 33, *high = 126; else /* CHARSET_CHARS (cs) == 96) */ *low = 32, *high = 127; } DEFUN ("charsetp", Fcharsetp, 1, 1, 0, /* Return non-nil if OBJECT is a charset. */ (object)) { return CHARSETP (object) ? Qt : Qnil; } DEFUN ("find-charset", Ffind_charset, 1, 1, 0, /* Retrieve the charset of the given name. If CHARSET-OR-NAME is a charset object, it is simply returned. Otherwise, CHARSET-OR-NAME should be a symbol. If there is no such charset, nil is returned. Otherwise the associated charset object is returned. */ (charset_or_name)) { if (CHARSETP (charset_or_name)) return charset_or_name; CHECK_SYMBOL (charset_or_name); return Fgethash (charset_or_name, Vcharset_hash_table, Qnil); } DEFUN ("get-charset", Fget_charset, 1, 1, 0, /* Retrieve the charset of the given name. Same as `find-charset' except an error is signalled if there is no such charset instead of returning nil. */ (name)) { Lisp_Object charset = Ffind_charset (name); if (NILP (charset)) invalid_argument ("No such charset", name); return charset; } /* We store the charsets in hash tables with the names as the key and the actual charset object as the value. Occasionally we need to use them in a list format. These routines provide us with that. */ struct charset_list_closure { Lisp_Object *charset_list; }; static int add_charset_to_list_mapper (Lisp_Object UNUSED (key), Lisp_Object value, void *charset_list_closure) { /* This function can GC */ struct charset_list_closure *chcl = (struct charset_list_closure*) charset_list_closure; Lisp_Object *charset_list = chcl->charset_list; *charset_list = Fcons (XCHARSET_NAME (value), *charset_list); return 0; } DEFUN ("charset-list", Fcharset_list, 0, 0, 0, /* Return a list of the names of all defined charsets. */ ()) { Lisp_Object charset_list = Qnil; struct gcpro gcpro1; struct charset_list_closure charset_list_closure; GCPRO1 (charset_list); charset_list_closure.charset_list = &charset_list; elisp_maphash (add_charset_to_list_mapper, Vcharset_hash_table, &charset_list_closure); UNGCPRO; return charset_list; } DEFUN ("charset-name", Fcharset_name, 1, 1, 0, /* Return the name of charset CHARSET. */ (charset)) { return XCHARSET_NAME (Fget_charset (charset)); } /* #### SJT Should generic properties be allowed? */ DEFUN ("make-charset", Fmake_charset, 3, 3, 0, /* Define a new character set. This function is for use with Mule support. NAME is a symbol, the name by which the character set is normally referred. DOC-STRING is a string describing the character set. PROPS is a property list, describing the specific nature of the character set. Recognized properties are: `short-name' Short version of the charset name (ex: Latin-1) `long-name' Long version of the charset name (ex: ISO8859-1 (Latin-1)) `registries' A vector of possible XLFD REGISTRY-ENCODING combinations for this character set. Note that this is not a regular expression. `dimension' Number of octets used to index a character in this charset. Either 1 or 2. Defaults to 1. `columns' Number of columns used to display a character in this charset. Only used in TTY mode. (Under X, the actual width of a character can be derived from the font used to display the characters.) If unspecified, defaults to the dimension (this is almost always the correct value). `chars' Number of characters in each dimension (94 or 96). Defaults to 94. Note that if the dimension is 2, the character set thus described is 94x94 or 96x96. `final' Final byte of ISO 2022 escape sequence. Must be supplied. Each combination of (DIMENSION, CHARS) defines a separate namespace for final bytes. Note that ISO 2022 restricts the final byte to the range 0x30 - 0x7E if dimension == 1, and 0x30 - 0x5F if dimension == 2. Note also that final bytes in the range 0x30 - 0x3F are reserved for user-defined (not official) character sets. `graphic' 0 (use left half of font on output) or 1 (use right half of font on output). Defaults to 0. For example, for a font whose registry is ISO8859-1, the left half (octets 0x20 - 0x7F) is the `ascii' character set, while the right half (octets 0xA0 - 0xFF) is the `latin-1' character set. With `graphic' set to 0, the octets will have their high bit cleared; with it set to 1, the octets will have their high bit set. `direction' `l2r' (left-to-right) or `r2l' (right-to-left). Defaults to `l2r'. `ccl-program' A compiled CCL program used to convert a character in this charset into an index into the font. This is in addition to the `graphic' property. The CCL program is passed the octets of the character, with the high bit cleared and set depending upon whether the value of the `graphic' property is 0 or 1. `encode-as-utf-8' If non-nil, the charset will be written out using the UTF-8 escape syntax in ISO 2022-oriented coding systems. Used for supporting characters we know are part of Unicode but not of any other known character set in escape-quoted and compound text. */ (name, doc_string, props)) { int id, dimension = 1, chars = 94, graphic = 0, columns = -1; Ibyte final = 0; int direction = CHARSET_LEFT_TO_RIGHT; int type; Lisp_Object registries = Qnil; Lisp_Object charset = Qnil; Lisp_Object ccl_program = Qnil; Lisp_Object short_name = Qnil, long_name = Qnil; int encode_as_utf_8 = 0; Lisp_Object existing_charset; int temporary = UNBOUNDP (name); /* NOTE: name == Qunbound is a directive from the iso2022 code to create a temporary charset for an unknown final. We allow the final to be overwritten with a real charset later on. */ if (!NILP (doc_string)) CHECK_STRING (doc_string); if (!UNBOUNDP (name)) { CHECK_SYMBOL (name); charset = Ffind_charset (name); if (!NILP (charset)) invalid_operation ("Cannot redefine existing charset", name); } { EXTERNAL_PROPERTY_LIST_LOOP_3 (keyword, value, props) { if (EQ (keyword, Qshort_name)) { CHECK_STRING (value); short_name = value; } else if (EQ (keyword, Qlong_name)) { CHECK_STRING (value); long_name = value; } else if (EQ (keyword, Qdimension)) { CHECK_INT (value); dimension = XINT (value); if (dimension < 1 || dimension > 2) invalid_constant ("Invalid value for `dimension'", value); } else if (EQ (keyword, Qchars)) { CHECK_INT (value); chars = XINT (value); if (chars != 94 && chars != 96) invalid_constant ("Invalid value for `chars'", value); } else if (EQ (keyword, Qcolumns)) { CHECK_INT (value); columns = XINT (value); if (columns != 1 && columns != 2) invalid_constant ("Invalid value for `columns'", value); } else if (EQ (keyword, Qgraphic)) { CHECK_INT (value); graphic = XINT (value); if (graphic < 0 || graphic > 1) invalid_constant ("Invalid value for `graphic'", value); } else if (EQ (keyword, Qregistries)) { CHECK_VECTOR (value); registries = value; } else if (EQ (keyword, Qregistry)) { Lisp_Object quoted_registry; CHECK_STRING (value); quoted_registry = Fregexp_quote(value); if (qxestrcmp(XSTRING_DATA(quoted_registry), XSTRING_DATA(value))) { warn_when_safe (Qregistry, Qwarning, "Regexps no longer allowed for charset-registry. " "Treating %s as string", XSTRING_DATA(value)); } registries = vector1(value); } else if (EQ (keyword, Qdirection)) { if (EQ (value, Ql2r)) direction = CHARSET_LEFT_TO_RIGHT; else if (EQ (value, Qr2l)) direction = CHARSET_RIGHT_TO_LEFT; else invalid_constant ("Invalid value for `direction'", value); } else if (EQ (keyword, Qencode_as_utf_8)) { encode_as_utf_8 = NILP (value) ? 0 : 1; } else if (EQ (keyword, Qfinal)) { CHECK_CHAR_COERCE_INT (value); final = XCHAR (value); if (final < '0' || final > '~') invalid_constant ("Invalid value for `final'", value); } else if (EQ (keyword, Qccl_program)) { /* This errors if VALUE is not a valid CCL program. */ ccl_program = get_ccl_program (value); } else invalid_constant ("Unrecognized property", keyword); } } if (!final) invalid_argument ("`final' must be specified", Qunbound); if (dimension == 2 && final > 0x5F) invalid_constant ("Final must be in the range 0x30 - 0x5F for dimension == 2", make_char (final)); if (dimension == 1) type = (chars == 94) ? CHARSET_TYPE_94 : CHARSET_TYPE_96; else type = (chars == 94) ? CHARSET_TYPE_94X94 : CHARSET_TYPE_96X96; existing_charset = charset_by_attributes (type, final, direction); if (!NILP (existing_charset) && !XCHARSET (existing_charset)->temporary) invalid_argument ("Character set already defined for this DIMENSION/CHARS/FINAL/DIRECTION combo", existing_charset); if (!NILP (existing_charset)) /* Reuse same leading byte */ id = XCHARSET_ID (existing_charset); else id = get_unallocated_leading_byte (dimension); if (temporary) { Ibyte tempname[80]; qxesprintf (tempname, "___temporary___%d__", id); name = Fmake_symbol (build_istring (tempname)); /* Uninterned. */ } if (NILP (doc_string)) doc_string = build_ascstring (""); if (NILP (registries)) registries = make_vector(0, Qnil); if (NILP (short_name)) short_name = XSYMBOL (name)->name; if (NILP (long_name)) long_name = doc_string; if (columns == -1) columns = dimension; charset = make_charset (id, name, dimension + 2, type, columns, graphic, final, direction, short_name, long_name, doc_string, registries, !NILP (existing_charset), encode_as_utf_8); XCHARSET (charset)->temporary = temporary; if (!NILP (ccl_program)) XCHARSET_CCL_PROGRAM (charset) = ccl_program; { Lisp_Object revdircs = charset_by_attributes (type, final, direction == CHARSET_LEFT_TO_RIGHT ? CHARSET_RIGHT_TO_LEFT : CHARSET_LEFT_TO_RIGHT); if (!NILP (revdircs)) { XCHARSET_REVERSE_DIRECTION_CHARSET (revdircs) = charset; XCHARSET_REVERSE_DIRECTION_CHARSET (charset) = revdircs; } } return charset; } DEFUN ("make-reverse-direction-charset", Fmake_reverse_direction_charset, 2, 2, 0, /* Make a charset equivalent to CHARSET but which goes in the opposite direction. NEW-NAME is the name of the new charset. Return the new charset. */ (charset, new_name)) { Lisp_Object new_charset = Qnil; int id, dimension, columns, graphic, encode_as_utf_8; Ibyte final; int direction, type; Lisp_Object registries, doc_string, short_name, long_name; Lisp_Charset *cs; charset = Fget_charset (charset); if (!NILP (XCHARSET_REVERSE_DIRECTION_CHARSET (charset))) invalid_operation ("Charset already has reverse-direction charset", charset); CHECK_SYMBOL (new_name); if (!NILP (Ffind_charset (new_name))) invalid_operation ("Cannot redefine existing charset", new_name); cs = XCHARSET (charset); type = CHARSET_TYPE (cs); columns = CHARSET_COLUMNS (cs); dimension = CHARSET_DIMENSION (cs); id = get_unallocated_leading_byte (dimension); graphic = CHARSET_GRAPHIC (cs); final = CHARSET_FINAL (cs); direction = CHARSET_RIGHT_TO_LEFT; if (CHARSET_DIRECTION (cs) == CHARSET_RIGHT_TO_LEFT) direction = CHARSET_LEFT_TO_RIGHT; doc_string = CHARSET_DOC_STRING (cs); short_name = CHARSET_SHORT_NAME (cs); long_name = CHARSET_LONG_NAME (cs); registries = CHARSET_REGISTRIES (cs); encode_as_utf_8 = CHARSET_ENCODE_AS_UTF_8 (cs); new_charset = make_charset (id, new_name, dimension + 2, type, columns, graphic, final, direction, short_name, long_name, doc_string, registries, 0, encode_as_utf_8); CHARSET_REVERSE_DIRECTION_CHARSET (cs) = new_charset; XCHARSET_REVERSE_DIRECTION_CHARSET (new_charset) = charset; return new_charset; } DEFUN ("charset-reverse-direction-charset", Fcharset_reverse_direction_charset, 1, 1, 0, /* Return the reverse-direction charset parallel to CHARSET, if any. This is the charset with the same properties (in particular, the same dimension, number of characters per dimension, and final byte) as CHARSET but whose characters are displayed in the opposite direction. */ (charset)) { charset = Fget_charset (charset); return XCHARSET_REVERSE_DIRECTION_CHARSET (charset); } DEFUN ("charset-from-attributes", Fcharset_from_attributes, 3, 4, 0, /* Return a charset with the given DIMENSION, CHARS, FINAL, and DIRECTION. If DIRECTION is omitted, both directions will be checked (left-to-right will be returned if character sets exist for both directions). */ (dimension, chars, final, direction)) { int dm, ch, fi, di = -1; int type; Lisp_Object obj = Qnil; CHECK_INT (dimension); dm = XINT (dimension); if (dm < 1 || dm > 2) invalid_constant ("Invalid value for DIMENSION", dimension); CHECK_INT (chars); ch = XINT (chars); if (ch != 94 && ch != 96) invalid_constant ("Invalid value for CHARS", chars); CHECK_CHAR_COERCE_INT (final); fi = XCHAR (final); if (fi < '0' || fi > '~') invalid_constant ("Invalid value for FINAL", final); if (EQ (direction, Ql2r)) di = CHARSET_LEFT_TO_RIGHT; else if (EQ (direction, Qr2l)) di = CHARSET_RIGHT_TO_LEFT; else if (!NILP (direction)) invalid_constant ("Invalid value for DIRECTION", direction); if (dm == 2 && fi > 0x5F) invalid_constant ("Final must be in the range 0x30 - 0x5F for dimension == 2", final); if (dm == 1) type = (ch == 94) ? CHARSET_TYPE_94 : CHARSET_TYPE_96; else type = (ch == 94) ? CHARSET_TYPE_94X94 : CHARSET_TYPE_96X96; if (di == -1) { obj = charset_by_attributes (type, fi, CHARSET_LEFT_TO_RIGHT); if (NILP (obj)) obj = charset_by_attributes (type, fi, CHARSET_RIGHT_TO_LEFT); } else obj = charset_by_attributes (type, fi, di); if (CHARSETP (obj)) return XCHARSET_NAME (obj); return obj; } DEFUN ("charset-short-name", Fcharset_short_name, 1, 1, 0, /* Return short name of CHARSET. */ (charset)) { return XCHARSET_SHORT_NAME (Fget_charset (charset)); } DEFUN ("charset-long-name", Fcharset_long_name, 1, 1, 0, /* Return long name of CHARSET. */ (charset)) { return XCHARSET_LONG_NAME (Fget_charset (charset)); } DEFUN ("charset-description", Fcharset_description, 1, 1, 0, /* Return description of CHARSET. */ (charset)) { return XCHARSET_DOC_STRING (Fget_charset (charset)); } DEFUN ("charset-dimension", Fcharset_dimension, 1, 1, 0, /* Return dimension of CHARSET. */ (charset)) { return make_int (XCHARSET_DIMENSION (Fget_charset (charset))); } DEFUN ("charset-property", Fcharset_property, 2, 2, 0, /* Return property PROP of CHARSET, a charset object or symbol naming a charset. Recognized properties are those listed in `make-charset', as well as `name' and `doc-string'. */ (charset, prop)) { Lisp_Charset *cs; charset = Fget_charset (charset); cs = XCHARSET (charset); CHECK_SYMBOL (prop); if (EQ (prop, Qname)) return CHARSET_NAME (cs); if (EQ (prop, Qshort_name)) return CHARSET_SHORT_NAME (cs); if (EQ (prop, Qlong_name)) return CHARSET_LONG_NAME (cs); if (EQ (prop, Qdoc_string)) return CHARSET_DOC_STRING (cs); if (EQ (prop, Qdimension)) return make_int (CHARSET_DIMENSION (cs)); if (EQ (prop, Qcolumns)) return make_int (CHARSET_COLUMNS (cs)); if (EQ (prop, Qgraphic)) return make_int (CHARSET_GRAPHIC (cs)); if (EQ (prop, Qfinal)) return make_char (CHARSET_FINAL (cs)); if (EQ (prop, Qchars)) return make_int (CHARSET_CHARS (cs)); if (EQ (prop, Qregistries)) return CHARSET_REGISTRIES (cs); if (EQ (prop, Qencode_as_utf_8)) return CHARSET_ENCODE_AS_UTF_8 (cs) ? Qt : Qnil; if (EQ (prop, Qccl_program)) return CHARSET_CCL_PROGRAM (cs); if (EQ (prop, Qdirection)) return CHARSET_DIRECTION (cs) == CHARSET_LEFT_TO_RIGHT ? Ql2r : Qr2l; if (EQ (prop, Qreverse_direction_charset)) { Lisp_Object obj = CHARSET_REVERSE_DIRECTION_CHARSET (cs); /* #### Is this translation OK? If so, error checking sufficient? */ return CHARSETP (obj) ? XCHARSET_NAME (obj) : obj; } invalid_constant ("Unrecognized charset property name", prop); RETURN_NOT_REACHED (Qnil); } DEFUN ("charset-id", Fcharset_id, 1, 1, 0, /* Return charset identification number of CHARSET. */ (charset)) { return make_int (XCHARSET_LEADING_BYTE (Fget_charset (charset))); } /* #### We need to figure out which properties we really want to allow to be set. */ DEFUN ("set-charset-ccl-program", Fset_charset_ccl_program, 2, 2, 0, /* Set the `ccl-program' property of CHARSET to CCL-PROGRAM. */ (charset, ccl_program)) { charset = Fget_charset (charset); XCHARSET_CCL_PROGRAM (charset) = get_ccl_program (ccl_program); face_property_was_changed (Vdefault_face, Qfont, Qglobal); return Qnil; } void set_charset_registries(Lisp_Object charset, Lisp_Object registries) { XCHARSET_REGISTRIES (charset) = registries; invalidate_charset_font_caches (charset); face_property_was_changed (Vdefault_face, Qfont, Qglobal); } DEFUN ("set-charset-registries", Fset_charset_registries, 2, 3, 0, /* Set the `registries' property of CHARSET to REGISTRIES. REGISTRIES is an ordered vector of strings that describe the X11 CHARSET_REGISTRY and the CHARSET_ENCODINGs appropriate for this charset. Separate each registry from the corresponding encoding with a dash. The strings are not regular expressions, in contrast to the old behavior of the `charset-registry' property. One reason to call this function might be if you're in Japan and you'd prefer the backslash to display as a Yen sign; the corresponding syntax would be: (set-charset-registries 'ascii ["jisx0201.1976-0"]) If optional argument FORCE is non-nil, avoid sanity-checking the elements of REGISTRIES. Normally the strings are checked to make sure they contain no XLFD wild cards and that they contain at least one hyphen; the only context in which one might want not to do this is in order to use a font which doesn't have a full XLFD--and thus, an effective CHARSET_REGISTRY-CHARSET_ENCODING of ""--to display ASCII. We recommend strongly that you specify a full XLFD, since this makes multilingual and variant font handling work much better. To get the full XLFD of any font, start xfd with the short name as the pattern argument: xfd -fn 8x16kana and use the text that appears at the top of the window. */ (charset, registries, force)) { int i; charset = Fget_charset (charset); CHECK_VECTOR (registries); for (i = 0; i < XVECTOR_LENGTH(registries); ++i) { CHECK_STRING (XVECTOR_DATA(registries)[i]); if (!NILP(force)) { continue; } if (NULL == qxestrchr(XSTRING_DATA(XVECTOR_DATA(registries)[i]), '-')) { invalid_argument("Not an X11 REGISTRY-ENCODING combination", XVECTOR_DATA(registries)[i]); } if (qxestrchr(XSTRING_DATA(XVECTOR_DATA(registries)[i]), '*') || qxestrchr(XSTRING_DATA(XVECTOR_DATA(registries)[i]), '?')) { invalid_argument ("XLFD wildcards not allowed in charset-registries", XVECTOR_DATA(registries)[i]); } } set_charset_registries(charset, registries); return Qnil; } DEFUN ("charsets-in-region", Fcharsets_in_region, 2, 3, 0, /* Return a list of the charsets in the region between START and END. BUFFER defaults to the current buffer if omitted. */ (start, end, buffer)) { /* This function can GC */ struct buffer *buf = decode_buffer (buffer, 1); Charbpos pos, stop; /* Limits of the region. */ Lisp_Object res = Qnil; int charsets[NUM_LEADING_BYTES]; Ibyte lb; struct gcpro gcpro1; memset(charsets, 0, sizeof(charsets)); get_buffer_range_char (buf, start, end, &pos, &stop, 0); GCPRO1 (res); while (pos < stop) { lb = ichar_leading_byte(BUF_FETCH_CHAR (buf, pos)); if (0 == charsets[lb - MIN_LEADING_BYTE]) { charsets[lb - MIN_LEADING_BYTE] = 1; res = Fcons (XCHARSET_NAME(charset_by_leading_byte(lb)), res); } ++pos; } UNGCPRO; return res; } /************************************************************************/ /* memory usage */ /************************************************************************/ #ifdef MEMORY_USAGE_STATS struct charset_stats { struct usage_stats u; Bytecount from_unicode; Bytecount to_unicode; }; static void compute_charset_usage (Lisp_Object charset, struct charset_stats *stats, struct usage_stats *ustats) { stats->from_unicode += compute_from_unicode_table_size (charset, ustats); stats->to_unicode += compute_to_unicode_table_size (charset, ustats); } static void charset_memory_usage (Lisp_Object charset, struct generic_usage_stats *gustats) { struct charset_stats *stats = (struct charset_stats *) gustats; compute_charset_usage (charset, stats, &stats->u); } #endif /* MEMORY_USAGE_STATS */ /************************************************************************/ /* initialization */ /************************************************************************/ void mule_charset_objects_create (void) { #ifdef MEMORY_USAGE_STATS OBJECT_HAS_METHOD (charset, memory_usage); #endif } void syms_of_mule_charset (void) { INIT_LISP_OBJECT (charset); DEFSUBR (Fcharsetp); DEFSUBR (Ffind_charset); DEFSUBR (Fget_charset); DEFSUBR (Fcharset_list); DEFSUBR (Fcharset_name); DEFSUBR (Fmake_charset); DEFSUBR (Fmake_reverse_direction_charset); DEFSUBR (Fcharset_reverse_direction_charset); DEFSUBR (Fcharset_from_attributes); DEFSUBR (Fcharset_short_name); DEFSUBR (Fcharset_long_name); DEFSUBR (Fcharset_description); DEFSUBR (Fcharset_dimension); DEFSUBR (Fcharset_property); DEFSUBR (Fcharset_id); DEFSUBR (Fset_charset_ccl_program); DEFSUBR (Fset_charset_registries); DEFSUBR (Fcharsets_in_region); DEFSYMBOL (Qcharsetp); DEFSYMBOL (Qregistries); DEFSYMBOL (Qfinal); DEFSYMBOL (Qgraphic); DEFSYMBOL (Qregistry); DEFSYMBOL (Qdirection); DEFSYMBOL (Qreverse_direction_charset); DEFSYMBOL (Qshort_name); DEFSYMBOL (Qlong_name); DEFSYMBOL (Qto_unicode); DEFSYMBOL (Ql2r); DEFSYMBOL (Qr2l); /* Charsets, compatible with FSF 20.3 Naming convention is Script-Charset[-Edition] */ DEFSYMBOL (Qlatin_iso8859_1); DEFSYMBOL (Qlatin_iso8859_2); DEFSYMBOL (Qlatin_iso8859_3); DEFSYMBOL (Qlatin_iso8859_4); DEFSYMBOL (Qthai_tis620); DEFSYMBOL (Qgreek_iso8859_7); DEFSYMBOL (Qarabic_iso8859_6); DEFSYMBOL (Qhebrew_iso8859_8); DEFSYMBOL (Qkatakana_jisx0201); DEFSYMBOL (Qlatin_jisx0201); DEFSYMBOL (Qcyrillic_iso8859_5); DEFSYMBOL (Qlatin_iso8859_9); DEFSYMBOL (Qlatin_iso8859_15); DEFSYMBOL (Qjapanese_jisx0208_1978); DEFSYMBOL (Qchinese_gb2312); DEFSYMBOL (Qjapanese_jisx0208); DEFSYMBOL (Qkorean_ksc5601); DEFSYMBOL (Qjapanese_jisx0212); DEFSYMBOL (Qchinese_cns11643_1); DEFSYMBOL (Qchinese_cns11643_2); DEFSYMBOL (Qchinese_big5_1); DEFSYMBOL (Qchinese_big5_2); DEFSYMBOL (Qcomposite); } void vars_of_mule_charset (void) { int i, j, k; #ifdef MEMORY_USAGE_STATS OBJECT_HAS_PROPERTY (charset, memusage_stats_list, list2 (Qfrom_unicode, Qto_unicode)); #endif /* MEMORY_USAGE_STATS */ chlook = xnew_and_zero (struct charset_lookup); /* zero for Purify. */ dump_add_root_block_ptr (&chlook, &charset_lookup_description); /* Table of charsets indexed by leading byte. */ for (i = 0; i < countof (chlook->charset_by_leading_byte); i++) chlook->charset_by_leading_byte[i] = Qnil; /* Table of charsets indexed by type/final-byte/direction. */ for (i = 0; i < countof (chlook->charset_by_attributes); i++) for (j = 0; j < countof (chlook->charset_by_attributes[0]); j++) for (k = 0; k < countof (chlook->charset_by_attributes[0][0]); k++) chlook->charset_by_attributes[i][j][k] = Qnil; chlook->next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1; chlook->next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2; staticpro (&Vcharset_hash_table); Vcharset_hash_table = make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, Qeq); } void complex_vars_of_mule_charset (void) { /* Predefined character sets. We store them into variables for ease of access. */ staticpro (&Vcharset_ascii); Vcharset_ascii = make_charset (LEADING_BYTE_ASCII, Qascii, 1, CHARSET_TYPE_94, 1, 0, 'B', CHARSET_LEFT_TO_RIGHT, build_ascstring ("ASCII"), build_defer_string ("ASCII"), build_defer_string ("ASCII (ISO646 IRV)"), vector1(build_ascstring("iso8859-1")), 0, 0); staticpro (&Vcharset_control_1); Vcharset_control_1 = make_charset (LEADING_BYTE_CONTROL_1, Qcontrol_1, 2, CHARSET_TYPE_94, 1, 1, 0, CHARSET_LEFT_TO_RIGHT, build_ascstring ("C1"), build_defer_string ("Control characters"), build_defer_string ("Control characters 128-191"), vector1(build_ascstring("iso8859-1")), 0, 0); staticpro (&Vcharset_latin_iso8859_1); Vcharset_latin_iso8859_1 = make_charset (LEADING_BYTE_LATIN_ISO8859_1, Qlatin_iso8859_1, 2, CHARSET_TYPE_96, 1, 1, 'A', CHARSET_LEFT_TO_RIGHT, build_ascstring ("Latin-1"), build_defer_string ("ISO8859-1 (Latin-1)"), build_defer_string ("ISO8859-1 (Latin-1)"), vector1(build_ascstring("iso8859-1")), 0, 0); staticpro (&Vcharset_latin_iso8859_2); Vcharset_latin_iso8859_2 = make_charset (LEADING_BYTE_LATIN_ISO8859_2, Qlatin_iso8859_2, 2, CHARSET_TYPE_96, 1, 1, 'B', CHARSET_LEFT_TO_RIGHT, build_ascstring ("Latin-2"), build_defer_string ("ISO8859-2 (Latin-2)"), build_defer_string ("ISO8859-2 (Latin-2)"), vector1(build_ascstring("iso8859-2")), 0, 0); staticpro (&Vcharset_latin_iso8859_3); Vcharset_latin_iso8859_3 = make_charset (LEADING_BYTE_LATIN_ISO8859_3, Qlatin_iso8859_3, 2, CHARSET_TYPE_96, 1, 1, 'C', CHARSET_LEFT_TO_RIGHT, build_ascstring ("Latin-3"), build_defer_string ("ISO8859-3 (Latin-3)"), build_defer_string ("ISO8859-3 (Latin-3)"), vector1(build_ascstring("iso8859-3")), 0, 0); staticpro (&Vcharset_latin_iso8859_4); Vcharset_latin_iso8859_4 = make_charset (LEADING_BYTE_LATIN_ISO8859_4, Qlatin_iso8859_4, 2, CHARSET_TYPE_96, 1, 1, 'D', CHARSET_LEFT_TO_RIGHT, build_ascstring ("Latin-4"), build_defer_string ("ISO8859-4 (Latin-4)"), build_defer_string ("ISO8859-4 (Latin-4)"), vector1(build_ascstring("iso8859-4")), 0, 0); staticpro (&Vcharset_thai_tis620); Vcharset_thai_tis620 = make_charset (LEADING_BYTE_THAI_TIS620, Qthai_tis620, 2, CHARSET_TYPE_96, 1, 1, 'T', CHARSET_LEFT_TO_RIGHT, build_ascstring ("TIS620"), build_defer_string ("TIS620 (Thai)"), build_defer_string ("TIS620.2529 (Thai)"), vector1(build_ascstring("tis620.2529-1")), 0, 0); staticpro (&Vcharset_greek_iso8859_7); Vcharset_greek_iso8859_7 = make_charset (LEADING_BYTE_GREEK_ISO8859_7, Qgreek_iso8859_7, 2, CHARSET_TYPE_96, 1, 1, 'F', CHARSET_LEFT_TO_RIGHT, build_ascstring ("ISO8859-7"), build_defer_string ("ISO8859-7 (Greek)"), build_defer_string ("ISO8859-7 (Greek)"), vector1(build_ascstring("iso8859-7")), 0, 0); staticpro (&Vcharset_arabic_iso8859_6); Vcharset_arabic_iso8859_6 = make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 2, CHARSET_TYPE_96, 1, 1, 'G', CHARSET_RIGHT_TO_LEFT, build_ascstring ("ISO8859-6"), build_defer_string ("ISO8859-6 (Arabic)"), build_defer_string ("ISO8859-6 (Arabic)"), vector1(build_ascstring ("iso8859-6")), 0, 0); staticpro (&Vcharset_hebrew_iso8859_8); Vcharset_hebrew_iso8859_8 = make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2, CHARSET_TYPE_96, 1, 1, 'H', CHARSET_RIGHT_TO_LEFT, build_ascstring ("ISO8859-8"), build_defer_string ("ISO8859-8 (Hebrew)"), build_defer_string ("ISO8859-8 (Hebrew)"), vector1(build_ascstring ("iso8859-8")), 0, 0); staticpro (&Vcharset_katakana_jisx0201); Vcharset_katakana_jisx0201 = make_charset (LEADING_BYTE_KATAKANA_JISX0201, Qkatakana_jisx0201, 2, CHARSET_TYPE_94, 1, 1, 'I', CHARSET_LEFT_TO_RIGHT, build_ascstring ("JISX0201 Kana"), build_defer_string ("JISX0201.1976 (Japanese Kana)"), build_defer_string ("JISX0201.1976 Japanese Kana"), vector1(build_ascstring ("jisx0201.1976-0")), 0, 0); staticpro (&Vcharset_latin_jisx0201); Vcharset_latin_jisx0201 = make_charset (LEADING_BYTE_LATIN_JISX0201, Qlatin_jisx0201, 2, CHARSET_TYPE_94, 1, 0, 'J', CHARSET_LEFT_TO_RIGHT, build_ascstring ("JISX0201 Roman"), build_defer_string ("JISX0201.1976 (Japanese Roman)"), build_defer_string ("JISX0201.1976 Japanese Roman"), vector1(build_ascstring ("jisx0201.1976-0")), 0, 0); staticpro (&Vcharset_cyrillic_iso8859_5); Vcharset_cyrillic_iso8859_5 = make_charset (LEADING_BYTE_CYRILLIC_ISO8859_5, Qcyrillic_iso8859_5, 2, CHARSET_TYPE_96, 1, 1, 'L', CHARSET_LEFT_TO_RIGHT, build_ascstring ("ISO8859-5"), build_defer_string ("ISO8859-5 (Cyrillic)"), build_defer_string ("ISO8859-5 (Cyrillic)"), vector1(build_ascstring ("iso8859-5")), 0, 0); staticpro (&Vcharset_latin_iso8859_9); Vcharset_latin_iso8859_9 = make_charset (LEADING_BYTE_LATIN_ISO8859_9, Qlatin_iso8859_9, 2, CHARSET_TYPE_96, 1, 1, 'M', CHARSET_LEFT_TO_RIGHT, build_ascstring ("Latin-5"), build_defer_string ("ISO8859-9 (Latin-5)"), build_defer_string ("ISO8859-9 (Latin-5)"), vector1(build_ascstring ("iso8859-9")), 0, 0); staticpro (&Vcharset_latin_iso8859_15); Vcharset_latin_iso8859_15 = make_charset (LEADING_BYTE_LATIN_ISO8859_15, Qlatin_iso8859_15, 2, CHARSET_TYPE_96, 1, 1, 'b', CHARSET_LEFT_TO_RIGHT, build_ascstring ("Latin-9"), build_defer_string ("ISO8859-15 (Latin-9)"), build_defer_string ("ISO8859-15 (Latin-9)"), vector1(build_ascstring ("iso8859-15")), 0, 0); staticpro (&Vcharset_japanese_jisx0208_1978); Vcharset_japanese_jisx0208_1978 = make_charset (LEADING_BYTE_JAPANESE_JISX0208_1978, Qjapanese_jisx0208_1978, 3, CHARSET_TYPE_94X94, 2, 0, '@', CHARSET_LEFT_TO_RIGHT, build_ascstring ("JISX0208.1978"), build_defer_string ("JISX0208.1978 (Japanese)"), build_defer_string ("JISX0208.1978 Japanese Kanji (so called \"old JIS\")"), vector2(build_ascstring("jisx0208.1978-0"), build_ascstring("jisc6226.1978-0")), 0, 0); staticpro (&Vcharset_chinese_gb2312); Vcharset_chinese_gb2312 = make_charset (LEADING_BYTE_CHINESE_GB2312, Qchinese_gb2312, 3, CHARSET_TYPE_94X94, 2, 0, 'A', CHARSET_LEFT_TO_RIGHT, build_ascstring ("GB2312"), build_defer_string ("GB2312)"), build_defer_string ("GB2312 Chinese simplified"), vector2(build_ascstring("gb2312.1980-0"), build_ascstring("gb2312.80&gb8565.88-0")), 0, 0); staticpro (&Vcharset_japanese_jisx0208); Vcharset_japanese_jisx0208 = make_charset (LEADING_BYTE_JAPANESE_JISX0208, Qjapanese_jisx0208, 3, CHARSET_TYPE_94X94, 2, 0, 'B', CHARSET_LEFT_TO_RIGHT, build_ascstring ("JISX0208"), build_defer_string ("JISX0208.1983/1990 (Japanese)"), build_defer_string ("JISX0208.1983/1990 Japanese Kanji"), vector2(build_ascstring("jisx0208.1983-0"), build_ascstring("jisx0208.1990-0")), 0, 0); staticpro (&Vcharset_korean_ksc5601); Vcharset_korean_ksc5601 = make_charset (LEADING_BYTE_KOREAN_KSC5601, Qkorean_ksc5601, 3, CHARSET_TYPE_94X94, 2, 0, 'C', CHARSET_LEFT_TO_RIGHT, build_ascstring ("KSC5601"), build_defer_string ("KSC5601 (Korean"), build_defer_string ("KSC5601 Korean Hangul and Hanja"), vector1(build_ascstring("ksc5601.1987-0")), 0, 0); staticpro (&Vcharset_japanese_jisx0212); Vcharset_japanese_jisx0212 = make_charset (LEADING_BYTE_JAPANESE_JISX0212, Qjapanese_jisx0212, 3, CHARSET_TYPE_94X94, 2, 0, 'D', CHARSET_LEFT_TO_RIGHT, build_ascstring ("JISX0212"), build_defer_string ("JISX0212 (Japanese)"), build_defer_string ("JISX0212 Japanese Supplement"), vector1(build_ascstring("jisx0212.1990-0")), 0, 0); #define CHINESE_CNS_PLANE(n) "cns11643.1992-" n staticpro (&Vcharset_chinese_cns11643_1); Vcharset_chinese_cns11643_1 = make_charset (LEADING_BYTE_CHINESE_CNS11643_1, Qchinese_cns11643_1, 3, CHARSET_TYPE_94X94, 2, 0, 'G', CHARSET_LEFT_TO_RIGHT, build_ascstring ("CNS11643-1"), build_defer_string ("CNS11643-1 (Chinese traditional)"), build_defer_string ("CNS 11643 Plane 1 Chinese traditional"), vector1(build_ascstring (CHINESE_CNS_PLANE("1"))), 0, 0); staticpro (&Vcharset_chinese_cns11643_2); Vcharset_chinese_cns11643_2 = make_charset (LEADING_BYTE_CHINESE_CNS11643_2, Qchinese_cns11643_2, 3, CHARSET_TYPE_94X94, 2, 0, 'H', CHARSET_LEFT_TO_RIGHT, build_ascstring ("CNS11643-2"), build_defer_string ("CNS11643-2 (Chinese traditional)"), build_defer_string ("CNS 11643 Plane 2 Chinese traditional"), vector1(build_ascstring (CHINESE_CNS_PLANE("2"))), 0, 0); staticpro (&Vcharset_chinese_big5_1); Vcharset_chinese_big5_1 = make_charset (LEADING_BYTE_CHINESE_BIG5_1, Qchinese_big5_1, 3, CHARSET_TYPE_94X94, 2, 0, '0', CHARSET_LEFT_TO_RIGHT, build_ascstring ("Big5"), build_defer_string ("Big5 (Level-1)"), build_defer_string ("Big5 Level-1 Chinese traditional"), vector1(build_ascstring ("big5.eten-0")), 0, 0); staticpro (&Vcharset_chinese_big5_2); Vcharset_chinese_big5_2 = make_charset (LEADING_BYTE_CHINESE_BIG5_2, Qchinese_big5_2, 3, CHARSET_TYPE_94X94, 2, 0, '1', CHARSET_LEFT_TO_RIGHT, build_ascstring ("Big5"), build_defer_string ("Big5 (Level-2)"), build_defer_string ("Big5 Level-2 Chinese traditional"), vector1(build_ascstring ("big5.eten-0")), 0, 0); #ifdef ENABLE_COMPOSITE_CHARS /* #### For simplicity, we put composite chars into a 96x96 charset. This is going to lead to problems because you can run out of room, esp. as we don't yet recycle numbers. */ staticpro (&Vcharset_composite); Vcharset_composite = make_charset (LEADING_BYTE_COMPOSITE, Qcomposite, 3, CHARSET_TYPE_96X96, 2, 0, 0, CHARSET_LEFT_TO_RIGHT, build_ascstring ("Composite"), build_defer_string ("Composite characters"), build_defer_string ("Composite characters"), vector1(build_ascstring ("")), 0, 0); #else /* We create a hack so that we have a way of storing ESC 0 and ESC 1 sequences as "characters", so that they will be output correctly. */ staticpro (&Vcharset_composite); Vcharset_composite = make_charset (LEADING_BYTE_COMPOSITE_REPLACEMENT, Qcomposite, 2, CHARSET_TYPE_96, 1, 1, '|', CHARSET_LEFT_TO_RIGHT, build_ascstring ("Composite hack"), build_defer_string ("Composite characters hack"), build_defer_string ("Composite characters hack"), vector1(build_ascstring ("")), 0, 0); #endif /* ENABLE_COMPOSITE_CHARS */ }