Mercurial > hg > xemacs-beta

comparison src/mule-ccl.c @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-05 09:54:39 by ben] Textual renaming: text/char names abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization. [a] distinguish between "charptr" when it refers to operations on the pointer itself and when it refers to operations on text; and [b] use consistent naming for everything referring to internal format, i.e. Itext == text in internal format Ibyte == a byte in such text Ichar == a char as represented in internal character format thus e.g. set_charptr_emchar -> set_itext_ichar The pre and post tags on either side of this change are: pre-internal-format-textual-renaming post-internal-format-textual-renaming See the Internals Manual for details of exactly how this was done, how to handle the change in your workspace, etc.
author ben
date Wed, 05 Jun 2002 09:58:45 +0000
parents 6728e641994e
children 04bc9d2f42c7
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
726 { \ 726 { \
727 Dynarr_add (destination, ch); \ 727 Dynarr_add (destination, ch); \
728 } \ 728 } \
729 else \ 729 else \
730 { \ 730 { \
731 Intbyte work[MAX_EMCHAR_LEN]; \ 731 Ibyte work[MAX_ICHAR_LEN]; \
732 int len; \ 732 int len; \
733 len = non_ascii_set_charptr_emchar (work, ch); \ 733 len = non_ascii_set_itext_ichar (work, ch); \
734 Dynarr_add_many (destination, work, len); \ 734 Dynarr_add_many (destination, work, len); \
735 } \ 735 } \
736 } \ 736 } \
737 else \ 737 else \
738 { \ 738 { \
739 if (!emchar_multibyte_p(ch)) \ 739 if (!ichar_multibyte_p(ch)) \
740 { \ 740 { \
741 Dynarr_add (destination, ch); \ 741 Dynarr_add (destination, ch); \
742 } \ 742 } \
743 else \ 743 else \
744 { \ 744 { \
745 Intbyte work[MAX_EMCHAR_LEN]; \ 745 Ibyte work[MAX_ICHAR_LEN]; \
746 int len; \ 746 int len; \
747 len = non_ascii_set_charptr_emchar (work, ch); \ 747 len = non_ascii_set_itext_ichar (work, ch); \
748 Dynarr_add_many (destination, work, len); \ 748 Dynarr_add_many (destination, work, len); \
749 } \ 749 } \
750 } \ 750 } \
751 } while (0) 751 } while (0)
752 752
753 /* Write a string at ccl_prog[IC] of length LEN to the current output 753 /* Write a string at ccl_prog[IC] of length LEN to the current output
754 buffer. But this macro treat this string as a binary. Therefore, 754 buffer. But this macro treat this string as a binary. Therefore,
755 cannot handle a multibyte string except for Control-1 characters. */ 755 cannot handle a multibyte string except for Control-1 characters. */
756 #define CCL_WRITE_STRING(len) \ 756 #define CCL_WRITE_STRING(len) \
757 do { \ 757 do { \
758 Intbyte work[MAX_EMCHAR_LEN]; \ 758 Ibyte work[MAX_ICHAR_LEN]; \
759 int ch, bytes; \ 759 int ch, bytes; \
760 if (!destination) \ 760 if (!destination) \
761 CCL_INVALID_CMD; \ 761 CCL_INVALID_CMD; \
762 else if (conversion_mode == CCL_MODE_ENCODING) \ 762 else if (conversion_mode == CCL_MODE_ENCODING) \
763 { \ 763 { \
781 { \ 781 { \
782 Dynarr_add (destination, ch); \ 782 Dynarr_add (destination, ch); \
783 } \ 783 } \
784 else \ 784 else \
785 { \ 785 { \
786 bytes = non_ascii_set_charptr_emchar (work, ch); \ 786 bytes = non_ascii_set_itext_ichar (work, ch); \
787 Dynarr_add_many (destination, work, len); \ 787 Dynarr_add_many (destination, work, len); \
788 } \ 788 } \
789 } \ 789 } \
790 } \ 790 } \
791 else \ 791 else \
792 { \ 792 { \
793 for (i = 0; i < (len); i++) \ 793 for (i = 0; i < (len); i++) \
794 { \ 794 { \
795 ch = ((XINT (ccl_prog[ic + (i / 3)])) \ 795 ch = ((XINT (ccl_prog[ic + (i / 3)])) \
796 >> ((2 - (i % 3)) * 8)) & 0xFF; \ 796 >> ((2 - (i % 3)) * 8)) & 0xFF; \
797 if (!emchar_multibyte_p(ch)) \ 797 if (!ichar_multibyte_p(ch)) \
798 { \ 798 { \
799 Dynarr_add (destination, ch); \ 799 Dynarr_add (destination, ch); \
800 } \ 800 } \
801 else \ 801 else \
802 { \ 802 { \
803 bytes = non_ascii_set_charptr_emchar (work, ch); \ 803 bytes = non_ascii_set_itext_ichar (work, ch); \
804 Dynarr_add_many (destination, work, len); \ 804 Dynarr_add_many (destination, work, len); \
805 } \ 805 } \
806 } \ 806 } \
807 } \ 807 } \
808 } while (0) 808 } while (0)
826 } \ 826 } \
827 } while (0) 827 } while (0)
828 828
829 829
830 /* Set C to the character code made from CHARSET and CODE. This is 830 /* Set C to the character code made from CHARSET and CODE. This is
831 like make_emchar but check the validity of CHARSET and CODE. If they 831 like make_ichar but check the validity of CHARSET and CODE. If they
832 are not valid, set C to (CODE & 0xFF) because that is usually the 832 are not valid, set C to (CODE & 0xFF) because that is usually the
833 case that CCL_ReadMultibyteChar2 read an invalid code and it set 833 case that CCL_ReadMultibyteChar2 read an invalid code and it set
834 CODE to that invalid byte. */ 834 CODE to that invalid byte. */
835 835
836 /* On XEmacs, TranslateCharacter is not supported. Thus, this 836 /* On XEmacs, TranslateCharacter is not supported. Thus, this
846 { \ 846 { \
847 int c1 = (code) & 0x7F, c2 = 0; \ 847 int c1 = (code) & 0x7F, c2 = 0; \
848 \ 848 \
849 if ((code) >= 256) \ 849 if ((code) >= 256) \
850 c2 = c1, c1 = ((code) >> 7) & 0x7F; \ 850 c2 = c1, c1 = ((code) >> 7) & 0x7F; \
851 (c) = make_emchar (charset, c1, c2); \ 851 (c) = make_ichar (charset, c1, c2); \
852 } \ 852 } \
853 else \ 853 else \
854 (c) = (code) & 0xFF; \ 854 (c) = (code) & 0xFF; \
855 } while (0) 855 } while (0)
856 #endif 856 #endif