mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-24 22:40:51 -08:00
Include "character.h".
(copy_category_entry): New function. (copy_category_table): Call map_char_table and copy_category_entry. (Fmake_category_table): Initialize all top-vel slots. (char_category_set): New function. (modify_lower_category_set): Deleted. (Fmodify_category_entry): Call char_table_ref_and_range.
This commit is contained in:
Kenichi Handa
parent
1ee5d538f3
commit
ea012abd5c
1 changed files with 61 additions and 152 deletions
213
src/category.c
213
src/category.c
|
|
@ -1,6 +1,9 @@
|
|||
/* GNU Emacs routines to deal with category tables.
|
||||
Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
|
||||
Licensed to the Free Software Foundation.
|
||||
Copyright (C) 2001, 2002
|
||||
National Institute of Advanced Industrial Science and Technology (AIST)
|
||||
Registration Number H13PRO009
|
||||
|
||||
This file is part of GNU Emacs.
|
||||
|
||||
|
|
@ -27,6 +30,7 @@ Boston, MA 02111-1307, USA. */
|
|||
#include <ctype.h>
|
||||
#include "lisp.h"
|
||||
#include "buffer.h"
|
||||
#include "character.h"
|
||||
#include "charset.h"
|
||||
#include "category.h"
|
||||
#include "keymap.h"
|
||||
|
|
@ -186,6 +190,15 @@ This is the one used for new buffers. */)
|
|||
return Vstandard_category_table;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
copy_category_entry (table, range, val)
|
||||
Lisp_Object table, range, val;
|
||||
{
|
||||
char_table_set_range (table, XINT (XCAR (range)), XINT (XCDR (range)),
|
||||
Fcopy_sequence (val));
|
||||
}
|
||||
|
||||
/* Return a copy of category table TABLE. We can't simply use the
|
||||
function copy-sequence because no contents should be shared between
|
||||
the original and the copy. This function is called recursively by
|
||||
|
|
@ -195,44 +208,15 @@ Lisp_Object
|
|||
copy_category_table (table)
|
||||
Lisp_Object table;
|
||||
{
|
||||
Lisp_Object tmp;
|
||||
int i, to;
|
||||
table = copy_char_table (table);
|
||||
|
||||
if (!NILP (XCHAR_TABLE (table)->top))
|
||||
{
|
||||
/* TABLE is a top level char table.
|
||||
At first, make a copy of tree structure of the table. */
|
||||
table = Fcopy_sequence (table);
|
||||
if (! NILP (XCHAR_TABLE (table)->defalt))
|
||||
XCHAR_TABLE (table)->defalt
|
||||
= Fcopy_sequence (XCHAR_TABLE (table)->defalt);
|
||||
XCHAR_TABLE (table)->extras[0]
|
||||
= Fcopy_sequence (XCHAR_TABLE (table)->extras[0]);
|
||||
|
||||
/* Then, copy elements for single byte characters one by one. */
|
||||
for (i = 0; i < CHAR_TABLE_SINGLE_BYTE_SLOTS; i++)
|
||||
if (!NILP (tmp = XCHAR_TABLE (table)->contents[i]))
|
||||
XCHAR_TABLE (table)->contents[i] = Fcopy_sequence (tmp);
|
||||
to = CHAR_TABLE_ORDINARY_SLOTS;
|
||||
|
||||
/* Also copy the first (and sole) extra slot. It is a vector
|
||||
containing docstring of each category. */
|
||||
Fset_char_table_extra_slot
|
||||
(table, make_number (0),
|
||||
Fcopy_sequence (Fchar_table_extra_slot (table, make_number (0))));
|
||||
}
|
||||
else
|
||||
{
|
||||
i = 32;
|
||||
to = SUB_CHAR_TABLE_ORDINARY_SLOTS;
|
||||
}
|
||||
|
||||
/* If the table has non-nil default value, copy it. */
|
||||
if (!NILP (tmp = XCHAR_TABLE (table)->defalt))
|
||||
XCHAR_TABLE (table)->defalt = Fcopy_sequence (tmp);
|
||||
|
||||
/* At last, copy the remaining elements while paying attention to a
|
||||
sub char table. */
|
||||
for (; i < to; i++)
|
||||
if (!NILP (tmp = XCHAR_TABLE (table)->contents[i]))
|
||||
XCHAR_TABLE (table)->contents[i]
|
||||
= (SUB_CHAR_TABLE_P (tmp)
|
||||
? copy_category_table (tmp) : Fcopy_sequence (tmp));
|
||||
map_char_table (copy_category_entry, Qnil, table, table, 0, NULL);
|
||||
|
||||
return table;
|
||||
}
|
||||
|
|
@ -258,9 +242,12 @@ DEFUN ("make-category-table", Fmake_category_table, Smake_category_table,
|
|||
()
|
||||
{
|
||||
Lisp_Object val;
|
||||
int i;
|
||||
|
||||
val = Fmake_char_table (Qcategory_table, Qnil);
|
||||
XCHAR_TABLE (val)->defalt = MAKE_CATEGORY_SET;
|
||||
for (i = 0; i < (1 << CHARTAB_SIZE_BITS_0); i++)
|
||||
XCHAR_TABLE (val)->contents[i] = MAKE_CATEGORY_SET;
|
||||
Fset_char_table_extra_slot (val, make_number (0),
|
||||
Fmake_vector (make_number (95), Qnil));
|
||||
return val;
|
||||
|
|
@ -281,6 +268,13 @@ DEFUN ("set-category-table", Fset_category_table, Sset_category_table, 1, 1, 0,
|
|||
}
|
||||
|
||||
|
||||
Lisp_Object
|
||||
char_category_set (c)
|
||||
int c;
|
||||
{
|
||||
return CHAR_TABLE_REF (current_buffer->category_table, c);
|
||||
}
|
||||
|
||||
DEFUN ("char-category-set", Fchar_category_set, Schar_category_set, 1, 1, 0,
|
||||
doc: /* Return the category set of CHAR. */)
|
||||
(ch)
|
||||
|
|
@ -313,34 +307,6 @@ The return value is a string containing those same categories. */)
|
|||
return build_string (str);
|
||||
}
|
||||
|
||||
/* Modify all category sets stored under sub char-table TABLE so that
|
||||
they contain (SET_VALUE is t) or don't contain (SET_VALUE is nil)
|
||||
CATEGORY. */
|
||||
|
||||
void
|
||||
modify_lower_category_set (table, category, set_value)
|
||||
Lisp_Object table, category, set_value;
|
||||
{
|
||||
Lisp_Object val;
|
||||
int i;
|
||||
|
||||
val = XCHAR_TABLE (table)->defalt;
|
||||
if (!CATEGORY_SET_P (val))
|
||||
val = MAKE_CATEGORY_SET;
|
||||
SET_CATEGORY_SET (val, category, set_value);
|
||||
XCHAR_TABLE (table)->defalt = val;
|
||||
|
||||
for (i = 32; i < SUB_CHAR_TABLE_ORDINARY_SLOTS; i++)
|
||||
{
|
||||
val = XCHAR_TABLE (table)->contents[i];
|
||||
|
||||
if (CATEGORY_SET_P (val))
|
||||
SET_CATEGORY_SET (val, category, set_value);
|
||||
else if (SUB_CHAR_TABLE_P (val))
|
||||
modify_lower_category_set (val, category, set_value);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
set_category_set (category_set, category, val)
|
||||
Lisp_Object category_set, category, val;
|
||||
|
|
@ -369,9 +335,23 @@ then delete CATEGORY from the category set instead of adding it. */)
|
|||
int c, charset, c1, c2;
|
||||
Lisp_Object set_value; /* Actual value to be set in category sets. */
|
||||
Lisp_Object val, category_set;
|
||||
int start, end;
|
||||
int from, to;
|
||||
|
||||
if (INTEGERP (character))
|
||||
{
|
||||
CHECK_CHARACTER (character);
|
||||
start = end = XFASTINT (character);
|
||||
}
|
||||
else
|
||||
{
|
||||
CHECK_CONS (character);
|
||||
CHECK_CHARACTER (XCAR (character));
|
||||
CHECK_CHARACTER (XCDR (character));
|
||||
start = XFASTINT (XCAR (character));
|
||||
end = XFASTINT (XCDR (character));
|
||||
}
|
||||
|
||||
CHECK_NUMBER (character);
|
||||
c = XINT (character);
|
||||
CHECK_CATEGORY (category);
|
||||
table = check_category_table (table);
|
||||
|
||||
|
|
@ -380,94 +360,23 @@ then delete CATEGORY from the category set instead of adding it. */)
|
|||
|
||||
set_value = NILP (reset) ? Qt : Qnil;
|
||||
|
||||
if (c < CHAR_TABLE_SINGLE_BYTE_SLOTS)
|
||||
while (start <= end)
|
||||
{
|
||||
val = XCHAR_TABLE (table)->contents[c];
|
||||
if (!CATEGORY_SET_P (val))
|
||||
XCHAR_TABLE (table)->contents[c] = (val = MAKE_CATEGORY_SET);
|
||||
SET_CATEGORY_SET (val, category, set_value);
|
||||
return Qnil;
|
||||
category_set = char_table_ref_and_range (table, start, &from, &to);
|
||||
if (from < start || to > end)
|
||||
category_set = Fcopy_sequence (category_set);
|
||||
SET_CATEGORY_SET (category_set, category, set_value);
|
||||
if (from < start)
|
||||
{
|
||||
if (to > end)
|
||||
char_table_set_range (table, start, end, category_set);
|
||||
else
|
||||
char_table_set_range (table, start, to, category_set);
|
||||
}
|
||||
else if (to > end)
|
||||
char_table_set_range (table, start, end, category_set);
|
||||
start = to + 1;
|
||||
}
|
||||
|
||||
SPLIT_CHAR (c, charset, c1, c2);
|
||||
|
||||
/* The top level table. */
|
||||
val = XCHAR_TABLE (table)->contents[charset + 128];
|
||||
if (CATEGORY_SET_P (val))
|
||||
category_set = val;
|
||||
else if (!SUB_CHAR_TABLE_P (val))
|
||||
{
|
||||
category_set = val = MAKE_CATEGORY_SET;
|
||||
XCHAR_TABLE (table)->contents[charset + 128] = category_set;
|
||||
}
|
||||
|
||||
if (c1 <= 0)
|
||||
{
|
||||
/* Only a charset is specified. */
|
||||
if (SUB_CHAR_TABLE_P (val))
|
||||
/* All characters in CHARSET should be the same as for having
|
||||
CATEGORY or not. */
|
||||
modify_lower_category_set (val, category, set_value);
|
||||
else
|
||||
SET_CATEGORY_SET (category_set, category, set_value);
|
||||
return Qnil;
|
||||
}
|
||||
|
||||
/* The second level table. */
|
||||
if (!SUB_CHAR_TABLE_P (val))
|
||||
{
|
||||
val = make_sub_char_table (Qnil);
|
||||
XCHAR_TABLE (table)->contents[charset + 128] = val;
|
||||
/* We must set default category set of CHARSET in `defalt' slot. */
|
||||
XCHAR_TABLE (val)->defalt = category_set;
|
||||
}
|
||||
table = val;
|
||||
|
||||
val = XCHAR_TABLE (table)->contents[c1];
|
||||
if (CATEGORY_SET_P (val))
|
||||
category_set = val;
|
||||
else if (!SUB_CHAR_TABLE_P (val))
|
||||
{
|
||||
category_set = val = Fcopy_sequence (XCHAR_TABLE (table)->defalt);
|
||||
XCHAR_TABLE (table)->contents[c1] = category_set;
|
||||
}
|
||||
|
||||
if (c2 <= 0)
|
||||
{
|
||||
if (SUB_CHAR_TABLE_P (val))
|
||||
/* All characters in C1 group of CHARSET should be the same as
|
||||
for CATEGORY. */
|
||||
modify_lower_category_set (val, category, set_value);
|
||||
else
|
||||
SET_CATEGORY_SET (category_set, category, set_value);
|
||||
return Qnil;
|
||||
}
|
||||
|
||||
/* The third (bottom) level table. */
|
||||
if (!SUB_CHAR_TABLE_P (val))
|
||||
{
|
||||
val = make_sub_char_table (Qnil);
|
||||
XCHAR_TABLE (table)->contents[c1] = val;
|
||||
/* We must set default category set of CHARSET and C1 in
|
||||
`defalt' slot. */
|
||||
XCHAR_TABLE (val)->defalt = category_set;
|
||||
}
|
||||
table = val;
|
||||
|
||||
val = XCHAR_TABLE (table)->contents[c2];
|
||||
if (CATEGORY_SET_P (val))
|
||||
category_set = val;
|
||||
else if (!SUB_CHAR_TABLE_P (val))
|
||||
{
|
||||
category_set = Fcopy_sequence (XCHAR_TABLE (table)->defalt);
|
||||
XCHAR_TABLE (table)->contents[c2] = category_set;
|
||||
}
|
||||
else
|
||||
/* This should never happen. */
|
||||
error ("Invalid category table");
|
||||
|
||||
SET_CATEGORY_SET (category_set, category, set_value);
|
||||
|
||||
return Qnil;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue