X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchartab.c;h=02ef2df8a0ba5f1abf8807285f4e82b39366a51e;hb=32694402321fce2d34d01838861545f2943ffeca;hp=1ce7474ec0b22a1d6535039d14c25aeae2aeccd3;hpb=0de6b9b1086e3a55fb2bfb10fce8a3023c499ceb;p=chise%2Fxemacs-chise.git diff --git a/src/chartab.c b/src/chartab.c index 1ce7474..02ef2df 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -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,10 +1129,6 @@ 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 Q_decomposition; Lisp_Object Q_identical; @@ -1144,8 +1139,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 Qto_ucs; Lisp_Object Q_ucs_unified; Lisp_Object Qcompat; @@ -3432,7 +3425,7 @@ put_char_composition (Lisp_Object character, Lisp_Object 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); @@ -3495,7 +3488,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); @@ -3514,11 +3507,13 @@ Store CHARACTER's ATTRIBUTE with VALUE. EQ (attribute, Q_identical_from) || EQ (attribute, Q_component) || EQ (attribute, Q_component_of) || - EQ (attribute, Q_same) || - EQ (attribute, Q_same_of) || - !NILP (Fstring_match (build_string ("^<-simplified[^*]*$"), - Fsymbol_name (attribute), - Qnil, Qnil)) ) + !NILP (Fstring_match + (build_string ("^\\(<-\\|->\\)\\(simplified" + "\\|same\\|vulgar\\|wrong" + "\\|original\\|ancient" + "\\)[^*]*$"), + Fsymbol_name (attribute), + Qnil, Qnil)) ) { Lisp_Object rest = value; Lisp_Object ret; @@ -3542,23 +3537,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 { 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); } @@ -3579,8 +3579,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); @@ -3633,11 +3634,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 @@ -3741,10 +3742,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))) @@ -3827,13 +3828,16 @@ Save values of ATTRIBUTE into database file. { Lisp_Object (*filter)(Lisp_Object value); - if ( EQ (attribute, Qideographic_structure) + 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_same) - || EQ (attribute, Q_same_of) || !NILP (Fstring_match - (build_string ("^\\(<-\\|->\\)simplified[^*]*$"), + (build_string ("^\\(<-\\|->\\)\\(simplified" + "\\|same\\|vulgar\\|wrong" + "\\|original\\|ancient" + "\\)[^*]*$"), Fsymbol_name (attribute), Qnil, Qnil)) ) filter = &Fchar_refs_simplify_char_specs; @@ -4599,10 +4603,6 @@ syms_of_chartab (void) INIT_LRECORD_IMPLEMENTATION (uint16_byte_table); INIT_LRECORD_IMPLEMENTATION (byte_table); -#if defined(HAVE_CHISE) && !defined(HAVE_LIBCHISE_LIBCHISE) - defsymbol (&Qsystem_char_id, "system-char-id"); -#endif - defsymbol (&Qto_ucs, "=>ucs"); defsymbol (&Q_ucs_unified, "->ucs-unified"); defsymbol (&Q_subsumptive, "->subsumptive"); @@ -4613,8 +4613,6 @@ 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 (&Qcomposition, "composition"); defsymbol (&Q_decomposition, "->decomposition"); defsymbol (&Qcompat, "compat");