#include <config.h>
#include "lisp.h"
#include "buffer.h"
-#include "charset.h"
+#include "character.h"
Lisp_Object Qcase_table_p, Qcase_table;
Lisp_Object Vascii_downcase_table, Vascii_upcase_table;
/* Used as a temporary in DOWNCASE and other macros in lisp.h. No
need to mark it, since it is used only very temporarily. */
-Lisp_Object case_temp1, case_temp2;
+int case_temp1;
+Lisp_Object case_temp2;
static void set_canon ();
static void set_identity ();
static void shuffle ();
DEFUN ("case-table-p", Fcase_table_p, Scase_table_p, 1, 1, 0,
- "Return t iff OBJECT is a case table.\n\
-See `set-case-table' for more information on these data structures.")
- (object)
+ doc: /* Return t iff OBJECT is a case table.
+See `set-case-table' for more information on these data structures. */)
+ (object)
Lisp_Object object;
{
Lisp_Object up, canon, eqv;
}
DEFUN ("current-case-table", Fcurrent_case_table, Scurrent_case_table, 0, 0, 0,
- "Return the case table of the current buffer.")
- ()
+ doc: /* Return the case table of the current buffer. */)
+ ()
{
return current_buffer->downcase_table;
}
DEFUN ("standard-case-table", Fstandard_case_table, Sstandard_case_table, 0, 0, 0,
- "Return the standard case table.\n\
-This is the one used for new buffers.")
- ()
+ doc: /* Return the standard case table.
+This is the one used for new buffers. */)
+ ()
{
return Vascii_downcase_table;
}
static Lisp_Object set_case_table ();
DEFUN ("set-case-table", Fset_case_table, Sset_case_table, 1, 1, 0,
- "Select a new case table for the current buffer.\n\
-A case table is a char-table which maps characters\n\
-to their lower-case equivalents. It also has three \"extra\" slots\n\
-which may be additional char-tables or nil.\n\
-These slots are called UPCASE, CANONICALIZE and EQUIVALENCES.\n\
-UPCASE maps each character to its upper-case equivalent;\n\
- if lower and upper case characters are in 1-1 correspondence,\n\
- you may use nil and the upcase table will be deduced from DOWNCASE.\n\
-CANONICALIZE maps each character to a canonical equivalent;\n\
- any two characters that are related by case-conversion have the same\n\
- canonical equivalent character; it may be nil, in which case it is\n\
- deduced from DOWNCASE and UPCASE.\n\
-EQUIVALENCES is a map that cyclicly permutes each equivalence class\n\
- (of characters with the same canonical equivalent); it may be nil,\n\
- in which case it is deduced from CANONICALIZE.")
- (table)
+ doc: /* Select a new case table for the current buffer.
+A case table is a char-table which maps characters
+to their lower-case equivalents. It also has three \"extra\" slots
+which may be additional char-tables or nil.
+These slots are called UPCASE, CANONICALIZE and EQUIVALENCES.
+UPCASE maps each character to its upper-case equivalent;
+ if lower and upper case characters are in 1-1 correspondence,
+ you may use nil and the upcase table will be deduced from DOWNCASE.
+CANONICALIZE maps each character to a canonical equivalent;
+ any two characters that are related by case-conversion have the same
+ canonical equivalent character; it may be nil, in which case it is
+ deduced from DOWNCASE and UPCASE.
+EQUIVALENCES is a map that cyclicly permutes each equivalence class
+ (of characters with the same canonical equivalent); it may be nil,
+ in which case it is deduced from CANONICALIZE. */)
+ (table)
Lisp_Object table;
{
return set_case_table (table, 0);
}
DEFUN ("set-standard-case-table", Fset_standard_case_table, Sset_standard_case_table, 1, 1, 0,
- "Select a new standard case table for new buffers.\n\
-See `set-case-table' for more info on case tables.")
- (table)
+ doc: /* Select a new standard case table for new buffers.
+See `set-case-table' for more info on case tables. */)
+ (table)
Lisp_Object table;
{
return set_case_table (table, 1);
char-tables CANON, UP, and DOWN are in CASE_TABLE. */
static void
-set_canon (case_table, c, elt)
- Lisp_Object case_table, c, elt;
+set_canon (case_table, range, elt)
+ Lisp_Object case_table, range, elt;
{
Lisp_Object up = XCHAR_TABLE (case_table)->extras[0];
Lisp_Object canon = XCHAR_TABLE (case_table)->extras[1];
+ int from, to;
if (NATNUMP (elt))
- Faset (canon, c, Faref (case_table, Faref (up, elt)));
+ {
+ if (CONSP (range))
+ {
+ from = XINT (XCAR (range));
+ to = XINT (XCDR (range));
+ }
+ else
+ from = to = XINT (range);
+
+ for (; from <= to; from++)
+ {
+ Lisp_Object val1, val2;
+
+ val1 = Faref (up, elt);
+ if (EQ (val1, Qt))
+ val1 = elt;
+ else if (! NATNUMP (val1))
+ continue;
+ val2 = Faref (case_table, val1);
+ if (EQ (val2, Qt))
+ val2 = val1;
+ else if (! NATNUMP (val2))
+ continue;
+ Faset (canon, make_number (from), val2);
+ }
+ }
}
-/* Set elements of char-table TABLE for C to C itself. This is done
- only when ELT is a character. This is called in map_char_table. */
+/* Set elements of char-table TABLE for characters in RANGE to
+ themselves. This is done only when ELT is a character. This is
+ called in map_char_table. */
static void
-set_identity (table, c, elt)
- Lisp_Object table, c, elt;
+set_identity (table, range, elt)
+ Lisp_Object table, range, elt;
{
- if (NATNUMP (elt))
- Faset (table, c, c);
+ if (EQ (elt, Qt) || NATNUMP (elt))
+ Fset_char_table_range (table, range, Qt);
}
/* Permute the elements of TABLE (which is initially an identity
operated. */
static void
-shuffle (table, c, elt)
- Lisp_Object table, c, elt;
+shuffle (table, range, elt)
+ Lisp_Object table, range, elt;
{
- if (NATNUMP (elt) && c != elt)
+ int from, to;
+
+ if (NATNUMP (elt))
{
- Lisp_Object tem = Faref (table, elt);
- Faset (table, elt, c);
- Faset (table, c, tem);
+ Lisp_Object tem;
+
+ if (CONSP (range))
+ {
+ from = XINT (XCAR (range));
+ to = XINT (XCDR (range));
+ }
+ else
+ from = to = XINT (range);
+
+ for (; from <= to; from++)
+ if (from != XINT (elt))
+ {
+ tem = Faref (table, elt);
+ if (EQ (tem, Qt))
+ tem = elt;
+ Faset (table, elt, make_number (from));
+ Faset (table, make_number (from), tem);
+ }
}
}
\f
+void
init_casetab_once ()
{
register int i;
Vascii_downcase_table = down;
XCHAR_TABLE (down)->purpose = Qcase_table;
- for (i = 0; i < CHAR_TABLE_SINGLE_BYTE_SLOTS; i++)
- XSETFASTINT (XCHAR_TABLE (down)->contents[i],
- (i >= 'A' && i <= 'Z') ? i + ('a' - 'A') : i);
+ for (i = 0; i < 128; i++)
+ CHAR_TABLE_SET (down, i, (i >= 'A' && i <= 'Z') ? i + ('a' - 'A') : i);
XCHAR_TABLE (down)->extras[1] = Fcopy_sequence (down);
up = Fmake_char_table (Qcase_table, Qnil);
XCHAR_TABLE (down)->extras[0] = up;
- for (i = 0; i < CHAR_TABLE_SINGLE_BYTE_SLOTS; i++)
- XSETFASTINT (XCHAR_TABLE (up)->contents[i],
- ((i >= 'A' && i <= 'Z')
- ? i + ('a' - 'A')
- : ((i >= 'a' && i <= 'z')
- ? i + ('A' - 'a')
- : i)));
+ for (i = 0; i < 128; i++)
+ CHAR_TABLE_SET (up, i, ((i >= 'A' && i <= 'Z')
+ ? i + ('a' - 'A')
+ : ((i >= 'a' && i <= 'z')
+ ? i + ('A' - 'a')
+ : i)));
XCHAR_TABLE (down)->extras[2] = Fcopy_sequence (up);
}
+void
syms_of_casetab ()
{
Qcase_table_p = intern ("case-table-p");
HCoop / bpt / emacs.git / blobdiff