comparison src/mule-charset.c @ 793:e38acbeb1cae

[xemacs-hg @ 2002-03-29 04:46:17 by ben] lots o' fixes etc/ChangeLog: New file. Separated out all entries for etc/ into their own ChangeLog. Includes entries for the following files: etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad, etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL, etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS, etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL, etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se, etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh, etc/custom/example-themes/europe-theme.el, etc/custom/example-themes/ex-custom-file, etc/custom/example-themes/example-theme.el, etc/e/eterm.ti, etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1, etc/gnuserv.README, etc/package-index.LATEST.gpg, etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm, etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs, etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E, etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm, etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm, etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar, etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1, etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL, etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el, etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\* unicode/unicode-consortium/8859-16.TXT: New file. mule/english.el: Define this charset now, since a bug was fixed that formerly prevented it. mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be integers. Makefile.in.in: Always include gui.c, to fix compile error when TTY-only. EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo(). Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate nearly all uses of Lisp_String * in favor of Lisp_Object, and correct macros so most of them favor Lisp_Object. Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings, but at level `debug' (usually ignored). Use it when instantiating specifiers, so problems can be debugged. Move log-warning-minimum-level into C so that we can optimize ERROR_ME_DEBUG_WARN. Fix warning levels consistent with new definitions. Add default_ and parent fields to char table; not yet implemented. New fun Dynarr_verify(); use for further error checking on Dynarrs. Rearrange code at top of lisp.h in conjunction with dynarr changes. Fix eifree(). Use Eistrings in various places (format_event_object(), where_is_to_char(), and callers thereof) to avoid fixed-size strings buffers. New fun write_eistring(). Reindent and fix GPM code to follow standards. Set default MS Windows font to Lucida Console (same size as Courier New but less interline spacing, so more lines fit). Increase default frame size on Windows to 50 lines. (If that's too big for the workspace, the frame will be shrunk as necessary.) Fix problem with text files with no newlines (). (Change `convert-eol' coding system to use `nil' for autodetect, consistent with make-coding-system.) Correct compile warnings in vm-limit.c. Fix handling of reverse-direction charsets to avoid errors when opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el. Recode some object printing methods to use write_fmt_string() instead of a fixed buffer and sprintf. Turn on display of png comments as warnings (level `info'), now that they're unobtrusive. Revamped the sound documentation. Fixed bug in redisplay w.r.t. hscroll/truncation/continuation glyphs causing jumping up and down of the lines, since they're bigger than the line size. (It was seen most obviously when there's a horizontal scroll bar, e.g. do C-h a glyph or something like that.) The problem was that the glyph-contrib-p setting on glyphs was ignored even if it was set properly, which it wasn't until now.
author ben
date Fri, 29 Mar 2002 04:49:13 +0000
parents 026c5bf9c134
children 2b676dc88c66
comparison
equal deleted inserted replaced
792:4e83fdb13eb9 793:e38acbeb1cae
137 { 137 {
138 Lisp_Charset *cs = XCHARSET (obj); 138 Lisp_Charset *cs = XCHARSET (obj);
139 139
140 if (print_readably) 140 if (print_readably)
141 printing_unreadable_object ("#<charset %s 0x%x>", 141 printing_unreadable_object ("#<charset %s 0x%x>",
142 string_data (XSYMBOL (CHARSET_NAME (cs))-> 142 XSTRING_DATA (XSYMBOL (CHARSET_NAME (cs))->
143 name), 143 name),
144 cs->header.uid); 144 cs->header.uid);
145 145
146 write_fmt_string_lisp (printcharfun, "#<charset %s %S %S %S", 4, 146 write_fmt_string_lisp (printcharfun, "#<charset %s %S %S %S", 4,
147 CHARSET_NAME (cs), CHARSET_SHORT_NAME (cs), 147 CHARSET_NAME (cs), CHARSET_SHORT_NAME (cs),
213 213
214 if (!overwrite) 214 if (!overwrite)
215 { 215 {
216 cs = alloc_lcrecord_type (Lisp_Charset, &lrecord_charset); 216 cs = alloc_lcrecord_type (Lisp_Charset, &lrecord_charset);
217 zero_lcrecord (cs); 217 zero_lcrecord (cs);
218 XSETCHARSET (obj, cs); 218 obj = wrap_charset (cs);
219 219
220 if (final) 220 if (final)
221 { 221 {
222 /* some charsets do not have final characters. This includes 222 /* some charsets do not have final characters. This includes
223 ASCII, Control-1, Composite, and the two faux private 223 ASCII, Control-1, Composite, and the two faux private
589 if (dimension == 1) 589 if (dimension == 1)
590 type = (chars == 94) ? CHARSET_TYPE_94 : CHARSET_TYPE_96; 590 type = (chars == 94) ? CHARSET_TYPE_94 : CHARSET_TYPE_96;
591 else 591 else
592 type = (chars == 94) ? CHARSET_TYPE_94X94 : CHARSET_TYPE_96X96; 592 type = (chars == 94) ? CHARSET_TYPE_94X94 : CHARSET_TYPE_96X96;
593 593
594 existing_charset = CHARSET_BY_ATTRIBUTES (type, final, 594 existing_charset = CHARSET_BY_ATTRIBUTES (type, final, direction);
595 CHARSET_LEFT_TO_RIGHT);
596 if (NILP (existing_charset))
597 existing_charset = CHARSET_BY_ATTRIBUTES (type, final,
598 CHARSET_RIGHT_TO_LEFT);
599 595
600 if (!NILP (existing_charset) && !XCHARSET (existing_charset)->temporary) 596 if (!NILP (existing_charset) && !XCHARSET (existing_charset)->temporary)
601 invalid_argument 597 invalid_argument
602 ("Character set already defined for this DIMENSION/CHARS/FINAL combo", 598 ("Character set already defined for this DIMENSION/CHARS/FINAL/DIRECTION combo",
603 existing_charset); 599 existing_charset);
604 600
605 if (!NILP (existing_charset)) 601 if (!NILP (existing_charset))
606 /* Reuse same leading byte */ 602 /* Reuse same leading byte */
607 id = XCHARSET_ID (existing_charset); 603 id = XCHARSET_ID (existing_charset);
618 if (NILP (doc_string)) 614 if (NILP (doc_string))
619 doc_string = build_string (""); 615 doc_string = build_string ("");
620 if (NILP (registry)) 616 if (NILP (registry))
621 registry = build_string (""); 617 registry = build_string ("");
622 if (NILP (short_name)) 618 if (NILP (short_name))
623 XSETSTRING (short_name, XSYMBOL (name)->name); 619 short_name = XSYMBOL (name)->name;
624 if (NILP (long_name)) 620 if (NILP (long_name))
625 long_name = doc_string; 621 long_name = doc_string;
626 if (columns == -1) 622 if (columns == -1)
627 columns = dimension; 623 columns = dimension;
628 624
631 doc_string, registry, !NILP (existing_charset)); 627 doc_string, registry, !NILP (existing_charset));
632 628
633 XCHARSET (charset)->temporary = temporary; 629 XCHARSET (charset)->temporary = temporary;
634 if (!NILP (ccl_program)) 630 if (!NILP (ccl_program))
635 XCHARSET_CCL_PROGRAM (charset) = ccl_program; 631 XCHARSET_CCL_PROGRAM (charset) = ccl_program;
632
633 {
634 Lisp_Object revdircs =
635 CHARSET_BY_ATTRIBUTES (type, final,
636 direction == CHARSET_LEFT_TO_RIGHT ?
637 CHARSET_RIGHT_TO_LEFT : CHARSET_LEFT_TO_RIGHT);
638 if (!NILP (revdircs))
639 {
640 XCHARSET_REVERSE_DIRECTION_CHARSET (revdircs) = charset;
641 XCHARSET_REVERSE_DIRECTION_CHARSET (charset) = revdircs;
642 }
643 }
636 644
637 return charset; 645 return charset;
638 } 646 }
639 647
640 DEFUN ("make-reverse-direction-charset", Fmake_reverse_direction_charset, 648 DEFUN ("make-reverse-direction-charset", Fmake_reverse_direction_charset,
652 Lisp_Charset *cs; 660 Lisp_Charset *cs;
653 661
654 charset = Fget_charset (charset); 662 charset = Fget_charset (charset);
655 if (!NILP (XCHARSET_REVERSE_DIRECTION_CHARSET (charset))) 663 if (!NILP (XCHARSET_REVERSE_DIRECTION_CHARSET (charset)))
656 invalid_operation ("Charset already has reverse-direction charset", 664 invalid_operation ("Charset already has reverse-direction charset",
657 charset); 665 charset);
658 666
659 CHECK_SYMBOL (new_name); 667 CHECK_SYMBOL (new_name);
660 if (!NILP (Ffind_charset (new_name))) 668 if (!NILP (Ffind_charset (new_name)))
661 invalid_operation ("Cannot redefine existing charset", new_name); 669 invalid_operation ("Cannot redefine existing charset", new_name);
662 670
685 XCHARSET_REVERSE_DIRECTION_CHARSET (new_charset) = charset; 693 XCHARSET_REVERSE_DIRECTION_CHARSET (new_charset) = charset;
686 694
687 return new_charset; 695 return new_charset;
688 } 696 }
689 697
690 /* #### Reverse direction charsets not yet implemented. */
691 #if 0
692 DEFUN ("charset-reverse-direction-charset", Fcharset_reverse_direction_charset, 698 DEFUN ("charset-reverse-direction-charset", Fcharset_reverse_direction_charset,
693 1, 1, 0, /* 699 1, 1, 0, /*
694 Return the reverse-direction charset parallel to CHARSET, if any. 700 Return the reverse-direction charset parallel to CHARSET, if any.
695 This is the charset with the same properties (in particular, the same 701 This is the charset with the same properties (in particular, the same
696 dimension, number of characters per dimension, and final byte) as 702 dimension, number of characters per dimension, and final byte) as
699 (charset)) 705 (charset))
700 { 706 {
701 charset = Fget_charset (charset); 707 charset = Fget_charset (charset);
702 return XCHARSET_REVERSE_DIRECTION_CHARSET (charset); 708 return XCHARSET_REVERSE_DIRECTION_CHARSET (charset);
703 } 709 }
704 #endif
705 710
706 DEFUN ("charset-from-attributes", Fcharset_from_attributes, 3, 4, 0, /* 711 DEFUN ("charset-from-attributes", Fcharset_from_attributes, 3, 4, 0, /*
707 Return a charset with the given DIMENSION, CHARS, FINAL, and DIRECTION. 712 Return a charset with the given DIMENSION, CHARS, FINAL, and DIRECTION.
708 If DIRECTION is omitted, both directions will be checked (left-to-right 713 If DIRECTION is omitted, both directions will be checked (left-to-right
709 will be returned if character sets exist for both directions). 714 will be returned if character sets exist for both directions).
830 DEFUN ("charset-id", Fcharset_id, 1, 1, 0, /* 835 DEFUN ("charset-id", Fcharset_id, 1, 1, 0, /*
831 Return charset identification number of CHARSET. 836 Return charset identification number of CHARSET.
832 */ 837 */
833 (charset)) 838 (charset))
834 { 839 {
835 return make_int(XCHARSET_LEADING_BYTE (Fget_charset (charset))); 840 return make_int (XCHARSET_LEADING_BYTE (Fget_charset (charset)));
836 } 841 }
837 842
838 /* #### We need to figure out which properties we really want to 843 /* #### We need to figure out which properties we really want to
839 allow to be set. */ 844 allow to be set. */
840 845
961 DEFSUBR (Fget_charset); 966 DEFSUBR (Fget_charset);
962 DEFSUBR (Fcharset_list); 967 DEFSUBR (Fcharset_list);
963 DEFSUBR (Fcharset_name); 968 DEFSUBR (Fcharset_name);
964 DEFSUBR (Fmake_charset); 969 DEFSUBR (Fmake_charset);
965 DEFSUBR (Fmake_reverse_direction_charset); 970 DEFSUBR (Fmake_reverse_direction_charset);
966 /* DEFSUBR (Freverse_direction_charset); */ 971 DEFSUBR (Fcharset_reverse_direction_charset);
967 DEFSUBR (Fcharset_from_attributes); 972 DEFSUBR (Fcharset_from_attributes);
968 DEFSUBR (Fcharset_short_name); 973 DEFSUBR (Fcharset_short_name);
969 DEFSUBR (Fcharset_long_name); 974 DEFSUBR (Fcharset_long_name);
970 DEFSUBR (Fcharset_description); 975 DEFSUBR (Fcharset_description);
971 DEFSUBR (Fcharset_dimension); 976 DEFSUBR (Fcharset_dimension);