X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftextprop.c;h=5fb93a4fe635a3c5577a2f5922f952f67824e06f;hb=6803bafaacdfe59594e815c460a1e1e19672b607;hp=40705e50db2422284de795eff2fcc3997ce4390e;hpb=4ae73bb6cb07bcb25656b25de9be3e77bcbb11d6;p=m17n%2Fm17n-lib.git diff --git a/src/textprop.c b/src/textprop.c index 40705e5..5fb93a4 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the m17n library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 02111-1307, USA. */ /***en @@ -512,7 +512,7 @@ adjust_intervals (MInterval *head, MInterval *tail, int diff) if (diff < 0) { - /* Adjust end poistions of properties starting before HEAD. */ + /* Adjust end positions of properties starting before HEAD. */ for (i = 0; i < head->nprops; i++) { prop = head->stack[i]; @@ -1021,20 +1021,19 @@ pop_all_properties (MTextPlist *plist, int from, int to) } -/* Delete volatile text properties between FROM and TO. If KEY is - Mnil, we are going to delete text, thus both strongly and weakly - volatile properties must be deleted. Otherwise we are going to - modify a text property KEY, thus only strongly volatile properties - whose key is not KEY must be deleted. */ +/* Delete volatile text properties between FROM and TO. If DELETING + is nonzero, we are going to delete text, thus both strongly and + weakly volatile properties must be deleted. Otherwise we are going + to modify a text property KEY, thus only strongly volatile + properties whose key is not KEY must be deleted. */ static void -prepare_to_modify (MText *mt, int from, int to, MSymbol key) +prepare_to_modify (MText *mt, int from, int to, MSymbol key, int deleting) { MTextPlist *plist = mt->plist, *prev = NULL; int mask_bits = MTEXTPROP_VOLATILE_STRONG; - int deleting = (key == Mnil) && (from < to); - if (key == Mnil) + if (deleting) mask_bits |= MTEXTPROP_VOLATILE_WEAK; while (plist) { @@ -1185,7 +1184,7 @@ dump_textplist (MTextPlist *plist, int indent) int mtext__prop_init () { - text_property_table.count = 0; + M17N_OBJECT_ADD_ARRAY (text_property_table, "Text property"); Mtext_prop_serializer = msymbol ("text-prop-serializer"); Mtext_prop_deserializer = msymbol ("text-prop-deserializer"); return 0; @@ -1203,7 +1202,6 @@ mtext__prop_fini () pool = next; } interval_pool_root.next = NULL; - mdebug__report_object ("Text property", &text_property_table); } @@ -1260,7 +1258,7 @@ mtext__adjust_plist_for_delete (MText *mt, int pos, int len) } to = pos + len; - prepare_to_modify (mt, pos, to, Mnil); + prepare_to_modify (mt, pos, to, Mnil, 1); for (plist = mt->plist; plist; plist = plist->next) { MInterval *interval = pop_all_properties (plist, pos, to); @@ -1300,7 +1298,7 @@ mtext__adjust_plist_for_insert (MText *mt, int pos, int nchars, return; } if (pos > 0 && pos < mtext_nchars (mt)) - prepare_to_modify (mt, pos, pos, Mnil); + prepare_to_modify (mt, pos, pos, Mnil, 0); for (pl_last = NULL, pl = mt->plist; pl; pl_last = pl, pl = pl->next) { @@ -1429,16 +1427,52 @@ mtext__adjust_plist_for_insert (MText *mt, int pos, int nchars, } } +/* len1 > 0 && len2 > 0 */ + void -mtext__adjust_plist_for_change (MText *mt, int from, int to) +mtext__adjust_plist_for_change (MText *mt, int pos, int len1, int len2) { - MTextPlist *plist; + int pos2 = pos + len1; - prepare_to_modify (mt, from, to, Mnil); - for (plist = mt->plist; plist; plist = plist->next) + prepare_to_modify (mt, pos, pos2, Mnil, 0); + + if (len1 < len2) { - pop_all_properties (plist, from, to); - xassert (check_plist (plist, 0) == 0); + int diff = len2 - len1; + MTextPlist *plist; + + for (plist = mt->plist; plist; plist = plist->next) + { + MInterval *head = find_interval (plist, pos2); + MInterval *tail = plist->tail; + MTextProperty *prop; + int i; + + if (head) + { + if (head->start == pos2) + head = head->prev; + while (tail != head) + { + for (i = 0; i < tail->nprops; i++) + { + prop = tail->stack[i]; + if (prop->start == tail->start) + prop->start += diff, prop->end += diff; + } + tail->start += diff; + tail->end += diff; + tail = tail->prev; + } + } + for (i = 0; i < tail->nprops; i++) + tail->stack[i]->end += diff; + tail->end += diff; + } + } + else if (len1 > len2) + { + mtext__adjust_plist_for_delete (mt, pos + len2, len1 - len2); } } @@ -1611,7 +1645,7 @@ mtext_get_prop_values (MText *mt, int pos, MSymbol key, /*=*/ /***en - @brief Get list of text property keys at a position of an M-text. + @brief Get a list of text property keys at a position of an M-text. The mtext_get_prop_keys () function creates an array whose elements are the keys of text properties found at position $POS in @@ -1747,7 +1781,7 @@ mtext_put_prop (MText *mt, int from, int to, MSymbol key, void *val) M_CHECK_RANGE (mt, from, to, -1, 0); - prepare_to_modify (mt, from, to, key); + prepare_to_modify (mt, from, to, key, 0); plist = get_plist_create (mt, key, 1); interval = pop_all_properties (plist, from, to); prop = new_text_property (mt, from, to, key, val, 0); @@ -1808,7 +1842,7 @@ mtext_put_prop_values (MText *mt, int from, int to, M_CHECK_RANGE (mt, from, to, -1, 0); - prepare_to_modify (mt, from, to, key); + prepare_to_modify (mt, from, to, key, 0); plist = get_plist_create (mt, key, 1); interval = pop_all_properties (plist, from, to); if (num > 0) @@ -1837,7 +1871,8 @@ mtext_put_prop_values (MText *mt, int from, int to, The mtext_push_prop () function pushes a text property whose key is $KEY and value is $VAL to the characters between $FROM - (inclusive) and $TO (exclusive) in $MT. With this function, + (inclusive) and $TO (exclusive) in M-text $MT. With this + function, @verbatim FROM TO @@ -1905,7 +1940,7 @@ mtext_push_prop (MText *mt, int from, int to, M_CHECK_RANGE (mt, from, to, -1, 0); - prepare_to_modify (mt, from, to, key); + prepare_to_modify (mt, from, to, key, 0); plist = get_plist_create (mt, key, 1); /* Find an interval that covers the position FROM. */ @@ -2070,7 +2105,7 @@ mtext_pop_prop (MText *mt, int from, int to, MSymbol key) /* No property to pop. */ return 0; - prepare_to_modify (mt, from, to, key); + prepare_to_modify (mt, from, to, key, 0); /* If the found interval starts before FROM and has value(s), divide it at FROM. */ @@ -2154,7 +2189,7 @@ mtext_pop_prop (MText *mt, int from, int to, MSymbol key) ´Ø¿ô mtext_prop_range () ¤Ï¡¢»ØÄꤷ¤¿¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬Æ±¤¸ ¤Ç¤¢¤ëϢ³¤·¤¿Ê¸»ú¤ÎÈϰϤòÄ´¤Ù¤ë¡£¤Þ¤º M-text $MT ¤Î $POS ¤Î°ÌÃÖ¤Ë - ¤¢¤ëʸ»ú¤Î¥×¥í¥Ñ¥Æ¥£¤Î¤¦¤Á¡¢¥­¡¼ $KEY ¤Ç»ØÄꤵ¤ì¤¿¤â¤Î¤ÎÃͤò¸«¤Ä¤± + ¤¢¤ëʸ»ú¤Î¥×¥í¥Ñ¥Æ¥£¤Î¤¦¤Á¡¢¥­¡¼ $KEY ¤Ç»ØÄꤵ¤ì¤¿¤â¤ÎÃͤò¸«¤Ä¤± ¤ë¡£¤½¤·¤ÆÁ°¸å¤Îʸ»ú¤â $KEY ¤Î¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬Æ±¤¸¤Ç¤¢¤ë¤«¤É¤¦¤«¤ò Ä´¤Ù¤ë¡£¸«¤Ä¤±¤¿ÈϰϤκǽé¤ÈºÇ¸å¤ò¡¢¤½¤ì¤¾¤ì $FROM ¤È $TO ¤Ë¥Ý¥¤¥ó ¥È¤µ¤ì¤ëÊÑ¿ô¤ËÊݸ¤¹¤ë¡£$FROM ¤ËÊݸ¤µ¤ì¤ëʸ»ú¤Î°ÌÃ֤ϸ«¤Ä¤±¤¿ÈÏ°Ï @@ -2249,6 +2284,7 @@ mtext_prop_range (MText *mt, MSymbol key, int pos, $CONTROL_BITS must be 0 or logical OR of @c enum @c MTextPropertyControl. */ + /***ja @brief ¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤òÀ¸À®¤¹¤ë. @@ -2271,6 +2307,7 @@ mtext_property (MSymbol key, void *val, int control_bits) The mtext_property_mtext () function returns the M-text to which text property $PROP is attached. If $PROP is currently detached, NULL is returned. */ + /***ja @brief ¤¢¤ë¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ò»ý¤Ä M-text ¤òÊÖ¤¹. @@ -2289,6 +2326,7 @@ mtext_property_mtext (MTextProperty *prop) The mtext_property_key () function returns the key (symbol) of text property $PROP. */ + /***ja @brief ¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤òÊÖ¤¹. @@ -2306,6 +2344,7 @@ mtext_property_key (MTextProperty *prop) The mtext_property_value () function returns the value of text property $PROP. */ + /***ja @brief ¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ÎÃͤòÊÖ¤¹. @@ -2325,6 +2364,7 @@ mtext_property_value (MTextProperty *prop) text property $PROP. The start position is a character position of an M-text where $PROP begins. If $PROP is detached, it returns -1. */ + /***ja @brief ¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤Î³«»Ï°ÌÃÖ¤òÊÖ¤¹. @@ -2345,6 +2385,7 @@ mtext_property_start (MTextProperty *prop) text property $PROP. The end position is a character position of an M-text where $PROP ends. If $PROP is detached, it returns -1. */ + /***ja @brief ¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤Î½ªÎ»°ÌÃÖ¤òÊÖ¤¹. @@ -2372,6 +2413,7 @@ mtext_property_end (MTextProperty *prop) If an error is detected, mtext_get_property () returns @c NULL and assigns an error code to the external variable #merror_code. */ + /***ja @brief °ìÈÖ¾å¤Î¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤òÆÀ¤ë. @@ -2419,6 +2461,7 @@ mtext_get_property (MText *mt, int pos, MSymbol key) $POS does not have a property whose key is $KEY, the return value is 0. If an error is detected, mtext_get_properties () returns -1 and assigns an error code to the external variable #merror_code. */ + /***ja @brief Ê£¿ô¤Î¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤òÆÀ¤ë. @@ -2482,6 +2525,7 @@ mtext_get_properties (MText *mt, int pos, MSymbol key, If the operation was successful, mtext_attach_property () returns 0. Otherwise it returns -1 and assigns an error code to the external variable #merror_code. */ + /***ja @brief M-text¤Ë¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤òÉղ乤ë. @@ -2505,7 +2549,7 @@ mtext_attach_property (MText *mt, int from, int to, MTextProperty *prop) M17N_OBJECT_REF (prop); if (prop->mt) mtext_detach_property (prop); - prepare_to_modify (mt, from, to, prop->key); + prepare_to_modify (mt, from, to, prop->key, 0); plist = get_plist_create (mt, prop->key, 1); xassert (check_plist (plist, 0) == 0); interval = pop_all_properties (plist, from, to); @@ -2532,6 +2576,7 @@ mtext_attach_property (MText *mt, int from, int to, MTextProperty *prop) @return This function always returns 0. */ + /***ja @brief M-text ¤«¤é¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤òʬΥ¤¹¤ë. @@ -2548,7 +2593,7 @@ mtext_detach_property (MTextProperty *prop) if (! prop->mt) return 0; - prepare_to_modify (prop->mt, start, end, prop->key); + prepare_to_modify (prop->mt, start, end, prop->key, 0); plist = get_plist_create (prop->mt, prop->key, 0); xassert (plist); detach_property (plist, prop, NULL); @@ -2558,18 +2603,21 @@ mtext_detach_property (MTextProperty *prop) /***en @brief Push a text property onto an M-text. - The mtext_push_property () function attaches text property $PROP on - M-text $MT by the "push" manner. + The mtext_push_property () function pushes text property $PROP to + the characters between $FROM (inclusive) and $TO (exclusive) in + M-text $MT. @return If the operation was successful, mtext_push_property () returns 0. Otherwise it returns -1 and assigns an error code to the external variable #merror_code. */ + /***ja @brief M-text ¤Ë¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ò¥×¥Ã¥·¥å¤¹¤ë. - ´Ø¿ô mtext_push_property () ¤Ï¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£ $PROP ¤òM-text - $MT ¤Ë¥×¥Ã¥·¥å¤·¤ÆÉղ乤롣 + ´Ø¿ô mtext_push_property () ¤Ï¡¢¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£ $PROP ¤ò¡¢ + M-text $MT Ãæ¤Î $FROM ¡Ê´Þ¤Þ¤ì¤ë¡Ë¤«¤é $TO ¡Ê´Þ¤Þ¤ì¤Ê¤¤¡Ë¤ÎÈϰϤΠ+ ʸ»ú¤Ë¥×¥Ã¥·¥å¤¹¤ë¡£ @return ½èÍý¤ËÀ®¸ù¤¹¤ì¤Ð¡¢mtext_push_property () ¤Ï 0 ¤òÊÖ¤¹¡£¤½¤¦¤Ç¤Ê¤± @@ -2588,7 +2636,7 @@ mtext_push_property (MText *mt, int from, int to, MTextProperty *prop) M17N_OBJECT_REF (prop); if (prop->mt) mtext_detach_property (prop); - prepare_to_modify (mt, from, to, prop->key); + prepare_to_modify (mt, from, to, prop->key, 0); plist = get_plist_create (mt, prop->key, 1); prop->mt = mt; prop->start = from; @@ -2672,17 +2720,20 @@ mtext_push_property (MText *mt, int from, int to, MTextProperty *prop) property whose key is #Mtext_prop_serializer and value is a pointer to an appropriate serializer function. - @seealso Mtext_prop_serializer (), MTextPropSerializeFunc + @seealso + mtext_serialize (), #MTextPropSerializeFunc */ + /***ja @brief ¥·¥ê¥¢¥é¥¤¥¶´Ø¿ô¤ò»ØÄꤹ¤ë¥·¥ó¥Ü¥ë. - ¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ò¥·¥ê¥¢¥é¥¤¥º¤¹¤ë¤¿¤á¤Ë¡¢¥æ¡¼¥¶¤Ï¥Æ¥­¥¹¥È¥×¥í¥Ñ + ¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ò¥·¥ê¥¢¥é¥¤¥º¤¹¤ë¤¿¤á¤Ë¤Ï¡¢¤½¤Î¥Æ¥­¥¹¥È¥×¥í¥Ñ ¥Æ¥£ÍѤΥ·¥ê¥¢¥é¥¤¥¶´Ø¿ô¤òÍ¿¤¨¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¶ñÂÎŪ¤Ë¤Ï¡¢ #Mtext_prop_serializer ¤ò¥­¡¼¤È¤·¡¢Å¬Àڤʥ·¥ê¥¢¥é¥¤¥º´Ø¿ô¤Ø¤Î¥Ý¥¤ - ¥ó¥¿¤òÃͤȤ¹¤ë¥·¥ó¥Ü¥ë¤ò»ØÄꤹ¤ë¡£ + ¥ó¥¿¤òÃͤȤ¹¤ë¥·¥ó¥Ü¥ë¥×¥í¥Ñ¥Æ¥£¤ò»ØÄꤹ¤ë¡£ - @seealso Mtext_prop_serializer (), MTextPropSerializeFunc + @seealso + mtext_serialize (), #MTextPropSerializeFunc */ MSymbol Mtext_prop_serializer; @@ -2694,17 +2745,20 @@ MSymbol Mtext_prop_serializer; property whose key is #Mtext_prop_deserializer and value is a pointer to an appropriate deserializer function. - @seealso Mtext_prop_serializer (), MTextPropSerializeFunc + @seealso + mtext_deserialize (), #MTextPropSerializeFunc */ + /***ja @brief ¥Ç¥·¥ê¥¢¥é¥¤¥¶´Ø¿ô¤ò»ØÄꤹ¤ë¥·¥ó¥Ü¥ë. - ¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ò¥Ç¥·¥ê¥¢¥é¥¤¥º¤¹¤ë¤¿¤á¤Ë¡¢¥æ¡¼¥¶¤Ï¥Æ¥­¥¹¥È¥×¥í + ¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ò¥Ç¥·¥ê¥¢¥é¥¤¥º¤¹¤ë¤¿¤á¤Ë¤Ï¡¢¤½¤Î¥Æ¥­¥¹¥È¥×¥í ¥Ñ¥Æ¥£ÍѤΥǥ·¥ê¥¢¥é¥¤¥¶´Ø¿ô¤òÍ¿¤¨¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¶ñÂÎŪ¤Ë¤Ï¡¢ #Mtext_prop_deserializer ¤ò¥­¡¼¤È¤·¡¢Å¬Àڤʥǥ·¥ê¥¢¥é¥¤¥º´Ø¿ô¤Ø¤Î - ¥Ý¥¤¥ó¥¿¤òÃͤȤ¹¤ë¥·¥ó¥Ü¥ë¤ò»ØÄꤹ¤ë¡£ + ¥Ý¥¤¥ó¥¿¤òÃͤȤ¹¤ë¥·¥ó¥Ü¥ë¥×¥í¥Ñ¥Æ¥£¤ò»ØÄꤹ¤ë¡£ - @seealso Mtext_prop_serializer (), MTextPropSerializeFunc + @seealso + mtext_deserialize (), #MTextPropSerializeFunc */ MSymbol Mtext_prop_deserializer; @@ -2712,14 +2766,15 @@ MSymbol Mtext_prop_deserializer; @brief Serialize text properties in an M-text. The mtext_serialize () function serializes the text between $FROM - and $TO in M-text $MT. The serialized result is an M-text in the + and $TO in M-text $MT. The serialized result is an M-text in a form of XML. $PROPERTY_LIST limits the text properties to be - serialized. If a symbol - @li appears as the value of an element in $PROPERTY_LIST (the key must be @c Mt ), and - @li has the symbol property #Mtext_prop_serializer, - - a text property having that symbol as its key is turned into the - "property" element in the resulting XML representation. + serialized. Only those text properties whose key + + @li appears as the value of an element in $PROPERTY_LIST, and + @li has the symbol property #Mtext_prop_serializer + + are serialized as a "property" element in the resulting XML + representation. The DTD of the generated XML is as follows: @@ -2745,19 +2800,21 @@ MSymbol Mtext_prop_deserializer; error code to the external variable #merror_code. @seealso - mtext_deserialize (), Mtext_prop_serializer */ + mtext_deserialize (), #Mtext_prop_serializer */ + /***ja @brief M-text Ãæ¤Î¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ò¥·¥ê¥¢¥é¥¤¥º¤¹¤ë. ´Ø¿ô mtext_serialize () ¤Ï M-text $MT ¤Î $FROM ¤«¤é $TO ¤Þ¤Ç¤Î¥Æ¥­ - ¥¹¥È¤ò¥·¥ê¥¢¥é¥¤¥º¤¹¤ë¡£¥·¥ê¥¢¥é¥¤¥º¤·¤¿·ë²Ì XML ·Á¼°¤Î M-text ¤Ç + ¥¹¥È¤ò¥·¥ê¥¢¥é¥¤¥º¤¹¤ë¡£¥·¥ê¥¢¥é¥¤¥º¤·¤¿·ë²Ì¤Ï XML ·Á¼°¤Î M-text ¤Ç ¤¢¤ë¡£ $PROPERTY_LIST ¤Ï¥·¥ê¥¢¥é¥¤¥º¤µ¤ì¤ë¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ò¸ÂÄê - ¤¹¤ë¡£¥·¥ó¥Ü¥ë¤¬ - @li $PROPERTY_LIST (¥­¡¼¤Ï @c Mt) ¤ÎÍ×ÁǤÎÃͤȤ·¤Æ¸½¤ï¤ì¡¢ - @li ¥·¥ó¥Ü¥ë¥×¥í¥Ñ¥Æ¥£ #Mtext_prop_serializer ¤ò»ý¤Ä¤Ê¤é¤Ð¡¢ + ¤¹¤ë¡£ÂоݤȤʤë¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤Ï¡¢¤½¤Î¥­¡¼¤¬ + + @li $PROPERTY_LIST ¤ÎÍ×ÁǤÎÃͤȤ·¤Æ¸½¤ï¤ì¡¢¤«¤Ä + @li ¥·¥ó¥Ü¥ë¥×¥í¥Ñ¥Æ¥£ #Mtext_prop_serializer ¤ò»ý¤Ä - ¤³¤Î¥·¥ó¥Ü¥ë¤ò¥­¡¼¤È¤¹¤ë¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤Ï¡¢À¸À®¤µ¤ì¤ë XML ɽ¸½ - Ãæ¤Ç "property" Í×ÁǤËÊÑ´¹¤µ¤ì¤ë¡£ + ¤â¤Î¤Î¤ß¤Ç¤¢¤ë¡£¤³¤Î¾ò·ï¤òËþ¤¿¤¹¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤Ï¡¢À¸À®¤µ¤ì¤ë + XML ɽ¸½Ãæ¤Ç "property" Í×ÁǤ˥·¥ê¥¢¥é¥¤¥º¤µ¤ì¤ë¡£ À¸À®¤µ¤ì¤ë XML ¤Î DTD ¤Ï°Ê²¼¤ÎÄ̤ê: @@ -2783,7 +2840,7 @@ MSymbol Mtext_prop_deserializer; ¤òÀßÄꤹ¤ë¡£ @seealso - mtext_deserialize (), Mtext_prop_serializer */ + mtext_deserialize (), #Mtext_prop_serializer */ MText * mtext_serialize (MText *mt, int from, int to, MPlist *property_list) @@ -2798,6 +2855,11 @@ mtext_serialize (MText *mt, int from, int to, MPlist *property_list) int n; M_CHECK_RANGE (mt, from, to, NULL, NULL); + if (mt->format != MTEXT_FORMAT_US_ASCII + && mt->format != MTEXT_FORMAT_UTF_8) + mtext__adjust_format (mt, MTEXT_FORMAT_UTF_8); + if (MTEXT_DATA (mt)[mtext_nbytes (mt)] != 0) + MTEXT_DATA (mt)[mtext_nbytes (mt)] = 0; doc = xmlParseMemory (XML_TEMPLATE, strlen (XML_TEMPLATE) + 1); node = xmlDocGetRootElement (doc); @@ -2825,7 +2887,7 @@ mtext_serialize (MText *mt, int from, int to, MPlist *property_list) if (! serialized_plist) continue; mtext_reset (work); - mplist__serialize (work, serialized_plist); + mplist__serialize (work, serialized_plist, 0); child = xmlNewChild (node, NULL, (xmlChar *) "property", NULL); xmlSetProp (child, (xmlChar *) "key", (xmlChar *) MSYMBOL_NAME (prop->key)); @@ -2872,7 +2934,7 @@ mtext_serialize (MText *mt, int from, int to, MPlist *property_list) @brief Deserialize text properties in an M-text. The mtext_deserialize () function deserializes M-text $MT. $MT - must be an XML having the followng DTD. + must be an XML having the following DTD. @verbatim