xemacs-beta: src/text.c comparison

comparison src/text.c @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet

author	Ben Wing <ben@xemacs.org>
date	Sat, 26 Dec 2009 21:18:49 -0600
parents	38493c0fb952
children	6ef8256a020a 19a72041c5ed

comparison

equal deleted inserted replaced

-:3742ea8250b5
+:e0db3c197671
 composite characters under Mule would decrease the number
 of possible faces that can exist.  Mule already has shrunk
 this to 2048, and further shrinkage would become uncomfortable.
 No such problems exist in XEmacs.
-Composite characters could be represented as 0x8D C1 C2 C3,
+Composite characters could be represented as 0x8D C1 C2 C3, where each
-where each C[1-3] is in the range 0xA0 - 0xFF.  This allows
+C[1-3] is in the range 0xA0 - 0xFF.  This allows for slightly under
-for slightly under 2^20 (one million) composite characters
+2^20 (one million) composite characters over the XEmacs process
-over the XEmacs process lifetime, and you only need to
+lifetime. Or you could use 0x8D C1 C2 C3 C4, allowing for about 85
-increase the size of a Mule character from 19 to 21 bits.
+million (slightly over 2^26) composite characters.
-Or you could use 0x8D C1 C2 C3 C4, allowing for about
-85 million (slightly over 2^26) composite characters.
 ==========================================================================
 10. Internal API's
 ==========================================================================
 variable.
 @item
 The Eistring API
-(This API is currently under-used) When doing simple things with
+\(This API is currently under-used) When doing simple things with
 internal text, the basic internal-format API's are enough.  But to do
 things like delete or replace a substring, concatenate various strings,
 etc. is difficult to do cleanly because of the allocation issues.
 The Eistring API is designed to deal with this, and provides a clean
 way of modifying and building up internal text. (Note that the former
 charsets[ichar_leading_byte (str[i]) - MIN_LEADING_BYTE] = 1;
 }
 #endif
 }
+/* A couple of these functions should only be called on a non-Mule build. */
+#ifdef MULE
+#define ASSERT_BUILT_WITH_MULE() assert(1)
+#else /* MULE */
+#define ASSERT_BUILT_WITH_MULE() assert(0)
+#endif /* MULE */
 int
 ibyte_string_displayed_columns (const Ibyte *str, Bytecount len)
 {
 int cols = 0;
 const Ibyte *end = str + len;
+Ichar ch;
+ASSERT_BUILT_WITH_MULE();
 while (str < end)
 {
-#ifdef MULE
+ch = itext_ichar (str);
-Ichar ch = itext_ichar (str);
 cols += XCHARSET_COLUMNS (ichar_charset (ch));
-#else
-cols++;
-#endif
 INC_IBYTEPTR (str);
 }
 return cols;
 }
 int
-ichar_string_displayed_columns (const Ichar *USED_IF_MULE (str), Charcount len)
+ichar_string_displayed_columns (const Ichar * USED_IF_MULE(str), Charcount len)
 {
-#ifdef MULE
 int cols = 0;
 int i;
+ASSERT_BUILT_WITH_MULE();
 for (i = 0; i < len; i++)
 cols += XCHARSET_COLUMNS (ichar_charset (str[i]));
 return cols;
-#else  /* not MULE */
-return len;
-#endif
 }
 Charcount
 ibyte_string_nonascii_chars (const Ibyte *USED_IF_MULE (str),
 			     Bytecount USED_IF_MULE (len))
 int
 eicmp_1 (Eistring *ei, Bytecount off, Charcount charoff,
 	 Bytecount len, Charcount charlen, const Ibyte *data,
 	 const Eistring *ei2, int is_ascii, int fold_case)
 {
+assert ((data == 0) != (ei == 0));
+assert ((is_ascii != 0) == (data != 0));
+assert (fold_case >= 0 && fold_case <= 2);
 assert ((off < 0) != (charoff < 0));
 if (off < 0)
 {
 off = charcount_to_bytecount (ei->data_, charoff);
 if (charlen < 0)
 	len = -1;
 if (len < 0)
 len = ei->bytelen_ - off;
 assert (off >= 0 && off <= ei->bytelen_);
 assert (len >= 0 && off + len <= ei->bytelen_);
-assert ((data == 0) != (ei == 0));
-assert ((is_ascii != 0) == (data != 0));
-assert (fold_case >= 0 && fold_case <= 2);
 {
 Bytecount dstlen;
 const Ibyte *src = ei->data_, *dst;
 int
 non_ascii_valid_ichar_p (Ichar ch)
 {
 int f1, f2, f3;
-/* Must have only lowest 19 bits set */
+/* Must have only lowest 21 bits set */
-if (ch & ~0x7FFFF)
+if (ch & ~0x1FFFFF)
 return 0;
 f1 = ichar_field1 (ch);
 f2 = ichar_field2 (ch);
 f3 = ichar_field3 (ch);
 return make_int (octet1);
 else
 invalid_constant ("Octet number must be 0 or 1", n);
 }
+#endif /* MULE */
 DEFUN ("split-char", Fsplit_char, 1, 1, 0, /*
 Return list of charset and one or two position-codes of CHAR.
 */
 (character))
 {
 GCPRO2 (charset, rc);
 CHECK_CHAR_COERCE_INT (character);
 BREAKUP_ICHAR (XCHAR (character), charset, c1, c2);
-if (XCHARSET_DIMENSION (Fget_charset (charset)) == 2)
+if (XCHARSET_DIMENSION (charset) == 2)
 {
 rc = list3 (XCHARSET_NAME (charset), make_int (c1), make_int (c2));
 }
 else
 {
 }
 UNGCPRO;
 return rc;
 }
-#endif /* MULE */
 /************************************************************************/
 /*                     composite character functions                    */
 /************************************************************************/
 void
 syms_of_text (void)
 {
 DEFSUBR (Fmake_char);
+DEFSUBR (Fsplit_char);
 #ifdef MULE
 DEFSUBR (Fchar_charset);
 DEFSUBR (Fchar_octet);
-DEFSUBR (Fsplit_char);
 #ifdef ENABLE_COMPOSITE_CHARS
 DEFSUBR (Fmake_composite_char);
 DEFSUBR (Fcomposite_char_string);
 #endif

Mercurial > hg > xemacs-beta

comparison src/text.c @ 5118:e0db3c197671 ben-lisp-object