(Q_circled_of): New variable.

(put_char_composition): Return `<-circled' instead of `=decomposition'
for compatibility mapping to single character tagged `circle'.
(Fput_char_attribute): Convert char-specs in value of
`{<-|->}circled[^*]*' to characters and put reverse links.
(Fsave_char_attribute_table): Use `Fchar_refs_simplify_char_specs' for
`<-circled'.
(syms_of_chartab): Add new symbol `<-circled'.

diff --git a/src/chartab.c b/src/chartab.c
index 6b33280..f0cacbe 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -1136,6 +1136,7 @@ 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_compat_of;
 Lisp_Object Q_decomposition;
 Lisp_Object Q_identical;
@@ -3435,6 +3436,8 @@ put_char_composition (Lisp_Object character, Lisp_Object value)
            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, Qcompat))
            return Q_compat_of;
        }
@@ -3547,13 +3550,15 @@ Store CHARACTER's ATTRIBUTE with VALUE.
        EQ (attribute, Q_canonical)             ||
        EQ (attribute, Q_superscript_of)                ||
        EQ (attribute, Q_subscript_of)          ||
+       EQ (attribute, Q_circled_of)            ||
        EQ (attribute, Q_compat_of)             ||
        EQ (attribute, Q_component)             ||
        EQ (attribute, Q_component_of)          ||
        !NILP (Fstring_match
              (build_string ("^\\(<-\\|->\\)\\("
                             "canonical"
-                            "\\|superscript\\|subscript\\|compat"
+                            "\\|superscript\\|subscript"
+                            "\\|circled\\|compat"
                             "\\|fullwidth\\|halfwidth"
                             "\\|simplified\\|vulgar\\|wrong"
                             "\\|same\\|original\\|ancient"
@@ -3905,6 +3910,7 @@ Save values of ATTRIBUTE into database file.
                EQ (attribute, Q_canonical)             ||
                EQ (attribute, Q_superscript_of)        ||
                EQ (attribute, Q_subscript_of)          ||
+               EQ (attribute, Q_circled_of)            ||
                EQ (attribute, Q_compat_of)             ||
                !NILP (Fstring_match
                       (build_string ("^\\(<-\\|->\\)\\(simplified"
@@ -4694,6 +4700,7 @@ syms_of_chartab (void)
   defsymbol (&Q_canonical,             "->canonical");
   defsymbol (&Q_superscript_of,                "<-superscript");
   defsymbol (&Q_subscript_of,          "<-subscript");
+  defsymbol (&Q_circled_of,            "<-circled");
   defsymbol (&Q_compat_of,             "<-compat");
   defsymbol (&Q_decomposition,         "->decomposition");
   defsymbol (&Qcompat,                 "compat");