Reverted to r21-2-47-utf-2000-0_19-b1.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5fa325..d8dc978 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,3 @@
-2002-08-22  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
-
-       * iso8859-1.el: Don't set `iso8859/1-case-table' to the
-       standard-case-table.
-
 2002-08-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * mule/mule-coding.el (coded-charset-entity-reference-alist): Add

diff --git a/lisp/iso8859-1.el b/lisp/iso8859-1.el
index 37ed71e..01a15eb 100644 (file)
--- a/lisp/iso8859-1.el
+++ b/lisp/iso8859-1.el
@@ -142,7 +142,6 @@
   )
 
 \f
-(unless (featurep 'utf-2000)
 (defconst iso8859/1-case-table nil
   "The case table for ISO-8859/1 characters.")
 
@@ -199,7 +198,6 @@
  )
 
 (set-standard-case-table (mapcar 'copy-sequence iso8859/1-case-table))
-)
 
 (setq-default ctl-arrow 'iso-8859/1)
 

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 59711d4..cf6ad87 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,10 +1,3 @@
-2002-08-23  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
-
-       * update-cdb.el: Reset `->lowercase' and `->uppercase' when using
-       external character database; get attribute values of `->lowercase'
-       for U+0000 ... U+007F after reset `->lowercase' to avoid dumping
-       database object.
-
 2002-08-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * Ideograph-R211-Tooth.el, Ideograph-R213-Turtle.el,

diff --git a/lisp/utf-2000/update-cdb.el b/lisp/utf-2000/update-cdb.el
index ad41432..3eadd0b 100644 (file)
--- a/lisp/utf-2000/update-cdb.el
+++ b/lisp/utf-2000/update-cdb.el
@@ -76,12 +76,6 @@
       (save-charset-mapping-table ccs))
     )
    (t
-    (reset-char-attribute-table '->lowercase)
-    (let ((i 0))
-      (while (<= i 127)
-       (get-char-attribute (decode-char 'ascii i) '->lowercase)
-       (setq i (1+ i))))
-    (reset-char-attribute-table '->uppercase)
     (mapcar (lambda (file)
              (mount-char-attribute-table
               (intern (file-name-char-attribute-name file))))

diff --git a/src/ChangeLog b/src/ChangeLog
index ec3f250..05f0fb8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,30 +1,3 @@
-2002-08-23  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
-
-       * casetab.c (complex_vars_of_casetab): If uppercase/lowercase is
-       not defined for a character, don't put the identical conversion
-       into the uppercase/lowercase table in UTF-2000.
-
-       * buffer.h (SET_TRT_TABLE_CHAR_1): Set a list instead of a
-       character in a char-attribute in UTF-2000.
-
-2002-08-23  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
-
-       * chartab.h: Add an EXFUN for Fmount_char_attribute_table.
-
-       * casetab.c (Q_lowercase): New variable in UTF-2000.
-       (Q_uppercase): Likewise.
-       (Fput_case_table): New implementation in UTF-2000.
-       (Fput_case_table_pair): Likewise.
-       (Fcopy_case_table): Likewise.
-       (syms_of_casetab): Add new symbol `->lowercase' and `->uppercase'.
-       (complex_vars_of_casetab): Use char-attribute `->lowercase' and
-       `->uppercase' in Vstandard_case_table in UTF-2000.
-
-2002-08-22  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
-
-       * buffer.h (TRT_TABLE_CHAR_1): New implementation in UTF-2000.
-       (SET_TRT_TABLE_CHAR_1): Likewise.
-
 2002-08-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * text-coding.c (decode_add_er_char): Support isolated-chars.

diff --git a/src/buffer.h b/src/buffer.h
index 7684d0b..2fffa70 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -2,7 +2,6 @@
    Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995
    Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 2002 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -28,7 +27,6 @@ Boston, MA 02111-1307, USA.  */
    FSF: long ago.
    JWZ: separated out bufslots.h, early in Lemacs.
    Ben Wing: almost completely rewritten for Mule, 19.12.
-   MORIOKA Tomohiko: modified for UTF-2000.
  */
 
 #ifndef INCLUDED_buffer_h_
@@ -1380,43 +1378,14 @@ INLINE_HEADER Emchar
 TRT_TABLE_CHAR_1 (Lisp_Object table, Emchar ch)
 {
   Lisp_Object TRT_char;
-#ifdef UTF2000
-  if (CHAR_TABLEP (table))
-    TRT_char = get_char_table (ch, XCHAR_TABLE (table));
-  else
-    {
-      TRT_char = Fget_char_attribute (make_char (ch), table, Qnil);
-      if (CONSP (TRT_char))
-       {
-         TRT_char = XCAR (TRT_char);
-         if (CONSP (TRT_char))
-           TRT_char = Ffind_char (TRT_char);
-       }
-    }
-#else
-    TRT_char = get_char_table (ch, XCHAR_TABLE (table));
-#endif
+  TRT_char = get_char_table (ch, XCHAR_TABLE (table));
   if (NILP (TRT_char))
     return ch;
   else
     return XCHAR (TRT_char);
 }
-#ifdef UTF2000
-INLINE_HEADER Lisp_Object
-SET_TRT_TABLE_CHAR_1 (Lisp_Object table, Emchar ch1, Emchar ch2);
-INLINE_HEADER Lisp_Object
-SET_TRT_TABLE_CHAR_1 (Lisp_Object table, Emchar ch1, Emchar ch2)
-{
-  if (CHAR_TABLEP (table))
-    return Fput_char_table (make_char (ch1), make_char (ch2), table);
-  else
-    return Fput_char_attribute (make_char (ch1), table,
-                               list1 (make_char (ch2)));
-}
-#else
 #define SET_TRT_TABLE_CHAR_1(table, ch1, ch2)  \
   Fput_char_table (make_char (ch1), make_char (ch2), table);
-#endif
 
 INLINE_HEADER Emchar TRT_TABLE_OF (Lisp_Object trt, Emchar c);
 INLINE_HEADER Emchar

diff --git a/src/casetab.c b/src/casetab.c
index 3ec9792..656a592 100644 (file)
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -1,7 +1,6 @@
 /* XEmacs routines to deal with case tables.
    Copyright (C) 1987, 1992, 1993, 1994 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 2002 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -30,7 +29,6 @@ Boston, MA 02111-1307, USA.  */
    distribution file chartab.c for details. */
 
 /* Modified for Mule by Ben Wing. */
-/* Modified for UTF-2000 by MORIOKA Tomohiko */
 
 /* Case table consists of four char-table.  Those are for downcase,
    upcase, canonical and equivalent respectively.
@@ -52,9 +50,6 @@ Boston, MA 02111-1307, USA.  */
 
 Lisp_Object Qcase_tablep, Qdowncase, Qupcase;
 Lisp_Object Vstandard_case_table;
-#ifdef UTF2000
-Lisp_Object Q_lowercase, Q_uppercase;
-#endif
 
 static void compute_trt_inverse (Lisp_Object trt, Lisp_Object inverse);
 Lisp_Object case_table_char (Lisp_Object ch, Lisp_Object table);
@@ -199,15 +194,6 @@ See also `put-case-table-pair'.
 
   if (EQ (char_case, Qdowncase))
     {
-#ifdef UTF2000
-      Lisp_Object table;
-
-      table = XCASE_TABLE_DOWNCASE (case_table);
-      if (CHAR_TABLEP (table))
-       return Fput_char_table (character, value, table);
-      else
-       return Fput_char_attribute (character, table, value);
-#else
       Fput_char_table (character, value, XCASE_TABLE_DOWNCASE (case_table));
       /* This one is not at all intuitive.  */
       Fput_char_table (character, value, XCASE_TABLE_UPCASE (case_table));
@@ -215,26 +201,15 @@ See also `put-case-table-pair'.
       Fput_char_table (value, value, XCASE_TABLE_CANON (case_table));
       Fput_char_table (value, character, XCASE_TABLE_EQV (case_table));
       Fput_char_table (character, value, XCASE_TABLE_EQV (case_table));
-#endif
     }
   else if (EQ (char_case, Qupcase))
     {
-#ifdef UTF2000
-      Lisp_Object table;
-
-      table = XCASE_TABLE_UPCASE (case_table);
-      if (CHAR_TABLEP (table))
-       return Fput_char_table (character, value, table);
-      else
-       return Fput_char_attribute (character, table, value);
-#else
       Fput_char_table (character, value, XCASE_TABLE_UPCASE (case_table));
       Fput_char_table (character, character, XCASE_TABLE_DOWNCASE (case_table));
       Fput_char_table (character, character, XCASE_TABLE_CANON (case_table));
       Fput_char_table (value, character, XCASE_TABLE_CANON (case_table));
       Fput_char_table (value, character, XCASE_TABLE_EQV (case_table));
       Fput_char_table (character, value, XCASE_TABLE_EQV (case_table));
-#endif
     }
   else
     signal_simple_error ("Char case must be downcase or upcase", char_case);
@@ -252,23 +227,6 @@ UC is an uppercase character and LC is a downcase character.
   CHECK_CHAR (lc);
   CHECK_CASE_TABLE (case_table);
 
-#ifdef UTF2000
-  {
-    Lisp_Object table;
-
-    table = XCASE_TABLE_UPCASE (case_table);
-    if (CHAR_TABLEP (table))
-      Fput_char_table (lc, uc, table);
-    else
-      Fput_char_attribute (lc, table, uc);
-
-    table = XCASE_TABLE_DOWNCASE (case_table);
-    if (CHAR_TABLEP (table))
-      Fput_char_table (uc, lc, table);
-    else
-      Fput_char_attribute (uc, table, lc);
-  }
-#else
   Fput_char_table (lc, lc, XCASE_TABLE_DOWNCASE (case_table));
   Fput_char_table (uc, lc, XCASE_TABLE_UPCASE (case_table));
   Fput_char_table (uc, lc, XCASE_TABLE_DOWNCASE (case_table));
@@ -278,7 +236,6 @@ UC is an uppercase character and LC is a downcase character.
   Fput_char_table (uc, lc, XCASE_TABLE_CANON (case_table));
   Fput_char_table (uc, lc, XCASE_TABLE_EQV (case_table));
   Fput_char_table (lc, uc, XCASE_TABLE_EQV (case_table));
-#endif
   return Qnil;
 }
 
@@ -291,35 +248,6 @@ Return a new case table which is a copy of CASE-TABLE
   CHECK_CASE_TABLE (case_table);
 
   new_obj = allocate_case_table ();
-#ifdef UTF2000
-  {
-    Lisp_Object table;
-
-    table = XCASE_TABLE_DOWNCASE (case_table);
-    if (CHAR_TABLEP (table))
-      XSET_CASE_TABLE_DOWNCASE (new_obj, Fcopy_char_table (table));
-    else
-      XSET_CASE_TABLE_DOWNCASE (new_obj, table);
-
-    table = XCASE_TABLE_UPCASE (case_table);
-    if (CHAR_TABLEP (table))
-      XSET_CASE_TABLE_UPCASE (new_obj, Fcopy_char_table (table));
-    else
-      XSET_CASE_TABLE_UPCASE (new_obj, table);
-
-    table = XCASE_TABLE_CANON (case_table);
-    if (CHAR_TABLEP (table))
-      XSET_CASE_TABLE_CANON (new_obj, Fcopy_char_table (table));
-    else
-      XSET_CASE_TABLE_CANON (new_obj, table);
-
-    table = XCASE_TABLE_EQV (case_table);
-    if (CHAR_TABLEP (table))
-      XSET_CASE_TABLE_EQV (new_obj, Fcopy_char_table (table));
-    else
-      XSET_CASE_TABLE_EQV (new_obj, table);
-  }
-#else
   XSET_CASE_TABLE_DOWNCASE
     (new_obj, Fcopy_char_table (XCASE_TABLE_DOWNCASE (case_table)));
   XSET_CASE_TABLE_UPCASE
@@ -328,7 +256,6 @@ Return a new case table which is a copy of CASE-TABLE
     (new_obj, Fcopy_char_table (XCASE_TABLE_CANON (case_table)));
   XSET_CASE_TABLE_EQV
     (new_obj, Fcopy_char_table (XCASE_TABLE_EQV (case_table)));
-#endif
   return new_obj;
 }
 
@@ -523,10 +450,6 @@ syms_of_casetab (void)
   defsymbol (&Qcase_tablep, "case-table-p");
   defsymbol (&Qdowncase, "downcase");
   defsymbol (&Qupcase, "upcase");
-#ifdef UTF2000
-  defsymbol (&Q_lowercase, "->lowercase");
-  defsymbol (&Q_uppercase, "->uppercase");
-#endif
 
   DEFSUBR (Fcase_table_p);
   DEFSUBR (Fget_case_table);
@@ -549,44 +472,28 @@ complex_vars_of_casetab (void)
 
   Vstandard_case_table = allocate_case_table ();
 
-#ifdef UTF2000
-  tem = Q_lowercase;
-#else /* UTF2000 */
   tem = MAKE_TRT_TABLE ();
-#endif /* not UTF2000 */
   XSET_CASE_TABLE_DOWNCASE (Vstandard_case_table, tem);
   XSET_CASE_TABLE_CANON (Vstandard_case_table, tem);
 
-#ifdef UTF2000
-  Fmount_char_attribute_table (Q_lowercase);
-#endif
   /* Under Mule, can't do set_string_char() until Vcharset_control_1
      and Vcharset_ascii are initialized. */
   for (i = 0; i < 256; i++)
     {
       unsigned char lowered = tolower (i);
 
-      if (lowered != i)
-       SET_TRT_TABLE_CHAR_1 (tem, i, lowered);
+      SET_TRT_TABLE_CHAR_1 (tem, i, lowered);
     }
 
-#ifdef UTF2000
-  tem = Q_uppercase;
-#else /* UTF2000 */
   tem = MAKE_TRT_TABLE ();
-#endif /* not UTF2000 */
   XSET_CASE_TABLE_UPCASE (Vstandard_case_table, tem);
   XSET_CASE_TABLE_EQV (Vstandard_case_table, tem);
 
-#ifdef UTF2000
-  Fmount_char_attribute_table (Q_uppercase);
-#endif
   for (i = 0; i < 256; i++)
     {
       unsigned char flipped = (isupper (i) ? tolower (i)
                               : (islower (i) ? toupper (i) : i));
 
-      if (flipped != i)
-       SET_TRT_TABLE_CHAR_1 (tem, i, flipped);
+      SET_TRT_TABLE_CHAR_1 (tem, i, flipped);
     }
 }

diff --git a/src/chartab.h b/src/chartab.h
index f67e493..e6d637b 100644 (file)
--- a/src/chartab.h
+++ b/src/chartab.h
@@ -42,8 +42,6 @@ EXFUN (Fput_char_attribute, 3);
 
 EXFUN (Ffind_char, 1);
 
-EXFUN (Fmount_char_attribute_table, 1);
-
 
 /************************************************************************/
 /*                         Char-ID Tables                              */