X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchartab.c;h=b23f3d9f833166a894998433924b6021474a51e2;hb=60d3b8e1b6f85cd509af2b607b11a3221d61b801;hp=b8984ea70599afd1a42dc6a59bd1175c85500acc;hpb=483d3fdb6be43da350fee11caec0dbf97a75137b;p=chise%2Fxemacs-chise.git diff --git a/src/chartab.c b/src/chartab.c index b8984ea..b23f3d9 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -4,7 +4,7 @@ Copyright (C) 1995, 1996 Ben Wing. Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko + Copyright (C) 1999,2000,2001,2002,2003,2004,2005 MORIOKA Tomohiko This file is part of XEmacs. @@ -76,7 +76,6 @@ EXFUN (Fchar_refs_simplify_char_specs, 1); extern Lisp_Object Qideographic_structure; Lisp_Object Vnext_defined_char_id; -EXFUN (Fdefine_char, 1); EXFUN (Fmap_char_attribute, 3); @@ -1130,11 +1129,14 @@ make_char_id_table (Lisp_Object initval) } -#if defined(HAVE_CHISE) && !defined(HAVE_LIBCHISE_LIBCHISE) -Lisp_Object Qsystem_char_id; -#endif - Lisp_Object Qcomposition; +Lisp_Object Qmap_decomposition; +Lisp_Object Qto_decomposition_at_superscript; +Lisp_Object Qto_decomposition_at_circled; +Lisp_Object Q_canonical; +Lisp_Object Q_superscript_of; +Lisp_Object Q_subscript_of; +Lisp_Object Q_circled_of; Lisp_Object Q_decomposition; Lisp_Object Q_identical; Lisp_Object Q_identical_from; @@ -1144,10 +1146,6 @@ Lisp_Object Q_subsumptive; Lisp_Object Q_subsumptive_from; Lisp_Object Q_component; Lisp_Object Q_component_of; -Lisp_Object Q_same; -Lisp_Object Q_same_of; -Lisp_Object Q_vulgar; -Lisp_Object Q_vulgar_of; Lisp_Object Qto_ucs; Lisp_Object Q_ucs_unified; Lisp_Object Qcompat; @@ -1244,15 +1242,16 @@ Return variants of CHARACTER. */ (character)) { - Lisp_Object ret; - CHECK_CHAR (character); - ret = Fchar_feature (character, Q_ucs_unified, Qnil, - Qnil, Qnil); - if (CONSP (ret)) - return Fcopy_list (ret); - else - return Qnil; + return + nconc2 + (Fcopy_list (Fget_char_attribute (character, Q_subsumptive, Qnil)), + (nconc2 + (Fcopy_list (Fget_char_attribute (character, Q_denotational, Qnil)), + (nconc2 + (Fcopy_list (Fget_char_attribute (character, Q_identical, Qnil)), + Fcopy_list (Fchar_feature (character, Q_ucs_unified, Qnil, + Qnil, Qnil))))))); } #endif @@ -1400,7 +1399,7 @@ char_table_type_to_symbol (enum char_table_type type) { switch (type) { - default: abort(); + default: ABORT(); case CHAR_TABLE_TYPE_GENERIC: return Qgeneric; case CHAR_TABLE_TYPE_SYNTAX: return Qsyntax; case CHAR_TABLE_TYPE_DISPLAY: return Qdisplay; @@ -1858,7 +1857,7 @@ Reset CHAR-TABLE to its default state. break; default: - abort (); + ABORT (); } return Qnil; @@ -2041,7 +2040,7 @@ XCHARSET_CELL_RANGE (Lisp_Object ccs) return (0 << 8) | 255; #endif default: - abort (); + ABORT (); return 0; } } @@ -2103,7 +2102,7 @@ decode_char_table_range (Lisp_Object range, struct chartab_range *outrange) } #endif else - abort (); + ABORT (); } else { @@ -2336,8 +2335,13 @@ If there is more than one value, return MULTI (defaults to nil). #endif /* not UTF2000 */ #endif /* not MULE */ +#ifdef UTF2000 + case CHARTAB_RANGE_DEFAULT: + return ct->default_value; +#endif /* not UTF2000 */ + default: - abort (); + ABORT (); } return Qnil; /* not reached */ @@ -2387,7 +2391,7 @@ check_valid_char_table_value (Lisp_Object value, enum char_table_type type, break; default: - abort (); + ABORT (); } return 0; /* not reached */ @@ -2833,7 +2837,7 @@ map_char_table_for_charset_fun (struct chartab_range *range, break; default: - abort (); + ABORT (); } return 0; @@ -3044,7 +3048,7 @@ map_char_table (Lisp_Char_Table *ct, } default: - abort (); + ABORT (); } return 0; @@ -3090,7 +3094,7 @@ slow_map_char_table_fun (struct chartab_range *range, ranjarg = make_char (range->ch); break; default: - abort (); + ABORT (); } closure->retval = call2 (closure->function, ranjarg, val); @@ -3387,20 +3391,21 @@ Return DEFAULT-VALUE if the value is not exist. return default_value; } -void put_char_composition (Lisp_Object character, Lisp_Object value); -void +Lisp_Object +put_char_composition (Lisp_Object character, Lisp_Object value); +Lisp_Object put_char_composition (Lisp_Object character, Lisp_Object value) { if (!CONSP (value)) - signal_simple_error ("Invalid value for ->decomposition", + signal_simple_error ("Invalid value for =decomposition", value); - if (CONSP (Fcdr (value))) + if (CONSP (XCDR (value))) { - if (NILP (Fcdr (Fcdr (value)))) + if (NILP (Fcdr (XCDR (value)))) { - Lisp_Object base = Fcar (value); - Lisp_Object modifier = Fcar (Fcdr (value)); + Lisp_Object base = XCAR (value); + Lisp_Object modifier = XCAR (XCDR (value)); if (INTP (base)) { @@ -3410,7 +3415,7 @@ put_char_composition (Lisp_Object character, Lisp_Object value) if (INTP (modifier)) { modifier = make_char (XINT (modifier)); - Fsetcar (Fcdr (value), modifier); + Fsetcar (XCDR (value), modifier); } if (CHARP (base)) { @@ -3426,15 +3431,45 @@ put_char_composition (Lisp_Object character, Lisp_Object value) else Fsetcdr (ret, character); } + else if (EQ (base, Qsuper)) + return Q_superscript_of; + else if (EQ (base, Qsub)) + return Q_subscript_of; + else if (EQ (base, Qcircle)) + return Q_circled_of; + else if ( EQ (base, Qisolated)|| + EQ (base, Qinitial) || + EQ (base, Qmedial) || + EQ (base, Qfinal) ) + return + Fintern (concat2 (build_string ("<-formed@"), + Fsymbol_name (base)), + Qnil); + else if (SYMBOLP (base)) + return + Fintern (concat2 (build_string ("<-"), + Fsymbol_name (base)), + Qnil); } + else if (EQ (XCAR (value), Qsuper)) + return Qto_decomposition_at_superscript; + else if (EQ (XCAR (value), Qcircle)) + return Qto_decomposition_at_circled; + else + return + Fintern (concat2 (build_string ("=>decomposition@"), + Fsymbol_name (XCAR (value))), + Qnil); } else { + return Q_canonical; +#if 0 Lisp_Object v = Fcar (value); if (INTP (v)) { - Emchar c = XINT (v); + Emchar c = DECODE_CHAR (Vcharset_ucs, XINT (v), 0); Lisp_Object ret = Fchar_feature (make_char (c), Q_ucs_unified, Qnil, Qnil, Qnil); @@ -3450,7 +3485,9 @@ put_char_composition (Lisp_Object character, Lisp_Object value) Fcons (character, ret)); } } +#endif } + return Qmap_decomposition; } static Lisp_Object @@ -3487,8 +3524,14 @@ Store CHARACTER's ATTRIBUTE with VALUE. value = put_char_ccs_code_point (character, ccs, value); attribute = XCHARSET_NAME (ccs); } - else if (EQ (attribute, Q_decomposition)) - put_char_composition (character, value); + else if ( EQ (attribute, Qmap_decomposition) || + EQ (attribute, Q_decomposition) ) + { + attribute = put_char_composition (character, value); + if ( !EQ (attribute, Qmap_decomposition) && + SYMBOLP (XCAR (value)) ) + value = XCDR (value); + } else if (EQ (attribute, Qto_ucs)) { Lisp_Object ret; @@ -3497,7 +3540,7 @@ Store CHARACTER's ATTRIBUTE with VALUE. if (!INTP (value)) signal_simple_error ("Invalid value for =>ucs", value); - c = XINT (value); + c = DECODE_CHAR (Vcharset_ucs, XINT (value), 0); ret = Fchar_feature (make_char (c), Q_ucs_unified, Qnil, Qnil, Qnil); @@ -3508,23 +3551,29 @@ Store CHARACTER's ATTRIBUTE with VALUE. Fput_char_attribute (make_char (c), Q_ucs_unified, Fcons (character, ret)); } - else if ( EQ (attribute, Q_subsumptive) || - EQ (attribute, Q_subsumptive_from) || - EQ (attribute, Q_denotational) || - EQ (attribute, Q_denotational_from) || - EQ (attribute, Q_identical) || - EQ (attribute, Q_identical_from) || - EQ (attribute, Q_component) || - EQ (attribute, Q_component_of) || - EQ (attribute, Q_same) || - EQ (attribute, Q_same_of) || - EQ (attribute, Q_vulgar) || - EQ (attribute, Q_vulgar_of) || - !NILP (Fstring_match - (build_string ("^<-\\(simplified" - "\\|wrong\\)[^*]*$"), - Fsymbol_name (attribute), - Qnil, Qnil)) ) + if ( EQ (attribute, Q_subsumptive) || + EQ (attribute, Q_subsumptive_from) || + EQ (attribute, Q_denotational) || + EQ (attribute, Q_denotational_from) || + EQ (attribute, Q_identical) || + EQ (attribute, Q_identical_from) || + EQ (attribute, Q_canonical) || + EQ (attribute, Q_superscript_of) || + EQ (attribute, Q_subscript_of) || + EQ (attribute, Q_circled_of) || + EQ (attribute, Q_component) || + EQ (attribute, Q_component_of) || + !NILP (Fstring_match + (build_string ("^\\(<-\\|->\\)\\(" + "canonical" + "\\|superscript\\|subscript" + "\\|circled\\|font\\|compat" + "\\|fullwidth\\|halfwidth" + "\\|simplified\\|vulgar\\|wrong" + "\\|same\\|original\\|ancient" + "\\|Oracle-Bones\\)[^*]*$"), + Fsymbol_name (attribute), + Qnil, Qnil)) ) { Lisp_Object rest = value; Lisp_Object ret; @@ -3548,27 +3597,28 @@ Store CHARACTER's ATTRIBUTE with VALUE. rev_feature = Q_component_of; else if (EQ (attribute, Q_component_of)) rev_feature = Q_component; - else if (EQ (attribute, Q_same)) - rev_feature = Q_same_of; - else if (EQ (attribute, Q_same_of)) - rev_feature = Q_same; - else if (EQ (attribute, Q_vulgar)) - rev_feature = Q_vulgar_of; - else if (EQ (attribute, Q_vulgar_of)) - rev_feature = Q_vulgar; else { Lisp_String* name = symbol_name (XSYMBOL (attribute)); Bufbyte *name_str = string_data (name); - if (name_str[0] == '<' && name_str[1] == '-') + if ( (name_str[0] == '<' && name_str[1] == '-') || + (name_str[0] == '-' && name_str[1] == '>') ) { Bytecount length = string_length (name); Bufbyte *rev_name_str = alloca (length + 1); memcpy (rev_name_str + 2, name_str + 2, length - 2); - rev_name_str[0] = '-'; - rev_name_str[1] = '>'; + if (name_str[0] == '<') + { + rev_name_str[0] = '-'; + rev_name_str[1] = '>'; + } + else + { + rev_name_str[0] = '<'; + rev_name_str[1] = '-'; + } rev_name_str[length] = 0; rev_feature = intern (rev_name_str); } @@ -3580,7 +3630,17 @@ Store CHARACTER's ATTRIBUTE with VALUE. if (CONSP (ret)) ret = Fdefine_char (ret); - + else if (INTP (ret)) + { + int code_point = XINT (ret); + Emchar cid = DECODE_CHAR (Vcharset_ucs, code_point, 0); + + if (cid >= 0) + ret = make_char (cid); + else + ret = make_char (code_point); + } + if ( !NILP (ret) && !EQ (ret, character) ) { Lisp_Object ffv; @@ -3589,8 +3649,9 @@ Store CHARACTER's ATTRIBUTE with VALUE. if (!CONSP (ffv)) put_char_attribute (ret, rev_feature, list1 (character)); else if (NILP (Fmemq (character, ffv))) - put_char_attribute (ret, rev_feature, - Fcons (character, ffv)); + put_char_attribute + (ret, rev_feature, + nconc2 (Fcopy_sequence (ffv), list1 (character))); Fsetcar (rest, ret); } rest = XCDR (rest); @@ -3598,7 +3659,11 @@ Store CHARACTER's ATTRIBUTE with VALUE. UNGCPRO; } #if 1 - else if (EQ (attribute, Qideographic_structure)) + else if ( EQ (attribute, Qideographic_structure) || + !NILP (Fstring_match + (build_string ("^=>decomposition\\(\\|@[^*]+\\)$"), + Fsymbol_name (attribute), + Qnil, Qnil)) ) value = Fcopy_sequence (Fchar_refs_simplify_char_specs (value)); #endif return put_char_attribute (character, attribute, value); @@ -3643,11 +3708,11 @@ open_chise_data_source_maybe () { if (default_chise_data_source == NULL) { - Lisp_Object db_dir = Vexec_directory; + Lisp_Object db_dir = Vdata_directory; int modemask = 0755; /* rwxr-xr-x */ if (NILP (db_dir)) - db_dir = build_string ("../lib-src"); + db_dir = build_string ("../etc"); db_dir = Fexpand_file_name (build_string ("chise-db"), db_dir); default_chise_data_source @@ -3655,6 +3720,10 @@ open_chise_data_source_maybe () 0 /* DB_HASH */, modemask); if (default_chise_data_source == NULL) return -1; +#if 0 + chise_ds_set_make_string_function (default_chise_data_source, + &make_string); +#endif } return 0; } @@ -3730,8 +3799,13 @@ char_table_get_db (Lisp_Char_Table* cit, Emchar ch) if (!status) { +#if 0 val = Fread (make_string (chise_value_data (&value), chise_value_size (&value) )); +#else + val = read_from_c_string (chise_value_data (&value), + chise_value_size (&value) ); +#endif } else val = Qunbound; @@ -3751,10 +3825,10 @@ Lisp_Object char_attribute_system_db_file (Lisp_Object key_type, Lisp_Object attribute, int writing_mode) { - Lisp_Object db_dir = Vexec_directory; + Lisp_Object db_dir = Vdata_directory; if (NILP (db_dir)) - db_dir = build_string ("../lib-src"); + db_dir = build_string ("../etc"); db_dir = Fexpand_file_name (build_string ("chise-db"), db_dir); if (writing_mode && NILP (Ffile_exists_p (db_dir))) @@ -3837,16 +3911,22 @@ Save values of ATTRIBUTE into database file. { Lisp_Object (*filter)(Lisp_Object value); - if ( EQ (attribute, Qideographic_structure) - || EQ (attribute, Q_identical) - || EQ (attribute, Q_identical_from) - || EQ (attribute, Q_same) - || EQ (attribute, Q_same_of) - || !NILP (Fstring_match - (build_string ("^\\(<-\\|->\\)\\(" - "simplified\\|wrong\\)[^*]*$"), - Fsymbol_name (attribute), - Qnil, Qnil)) ) + if ( !NILP (Ffind_charset (attribute)) ) + filter = NULL; + else if ( EQ (attribute, Qideographic_structure) || + EQ (attribute, Q_identical) || + EQ (attribute, Q_identical_from) || + EQ (attribute, Q_canonical) || + EQ (attribute, Q_superscript_of) || + EQ (attribute, Q_subscript_of) || + EQ (attribute, Q_circled_of) || + !NILP (Fstring_match + (build_string ("^\\(<-\\|->\\)\\(simplified" + "\\|same\\|vulgar\\|wrong" + "\\|original\\|ancient" + "\\|Oracle-Bones\\)[^*]*$"), + Fsymbol_name (attribute), + Qnil, Qnil)) ) filter = &Fchar_refs_simplify_char_specs; else filter = NULL; @@ -4352,7 +4432,7 @@ chartab_instantiate (Lisp_Object data) Fput_char_table (make_char (i), val, chartab); } else - abort (); + ABORT (); } else Fput_char_table (range, val, chartab); @@ -4620,11 +4700,15 @@ syms_of_chartab (void) defsymbol (&Q_identical_from, "<-identical"); defsymbol (&Q_component, "->ideographic-component-forms"); defsymbol (&Q_component_of, "<-ideographic-component-forms"); - defsymbol (&Q_same, "->same"); - defsymbol (&Q_same_of, "<-same"); - defsymbol (&Q_vulgar, "->vulgar"); - defsymbol (&Q_vulgar_of, "<-vulgar"); defsymbol (&Qcomposition, "composition"); + defsymbol (&Qmap_decomposition, "=decomposition"); + defsymbol (&Qto_decomposition_at_superscript, + "=>decomposition@superscript"); + defsymbol (&Qto_decomposition_at_circled, "=>decomposition@circled"); + defsymbol (&Q_canonical, "->canonical"); + defsymbol (&Q_superscript_of, "<-superscript"); + defsymbol (&Q_subscript_of, "<-subscript"); + defsymbol (&Q_circled_of, "<-circled"); defsymbol (&Q_decomposition, "->decomposition"); defsymbol (&Qcompat, "compat"); defsymbol (&Qisolated, "isolated");