*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index b71347e..bbf1f7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-12-27  Kenichi Handa  <handa@m17n.org>
 
+       * Version 1.2.0 released.
+
+2004-12-27  Kenichi Handa  <handa@m17n.org>
+
        * m17n-config.in: Fix documentation.
 
 2004-12-10  Kenichi Handa  <handa@m17n.org>

diff --git a/NEWS b/NEWS
index 753ddeb..48eb5e6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@ specify which font-backend to use.  The value must be Mx or Mfreetype.
 ** New function m17n_status () returns the current initialization
 status.
 
+** New function minput_reset () resets the current input context.
+
 \f
 * Changes in the m17n library 1.1.0
 

diff --git a/example/ChangeLog b/example/ChangeLog
index 4d1bcb1..e86e725 100644 (file)
--- a/example/ChangeLog
+++ b/example/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-27  Kenichi Handa  <handa@m17n.org>
+
+       * Version 1.2.0 released.
+
 2004-12-21  Kenichi Handa  <handa@m17n.org>
 
        * medit.c (ButtonProc): Reset the current input method (if

diff --git a/src/ChangeLog b/src/ChangeLog
index c10a644..649e41a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2004-12-27  Kenichi Handa  <handa@m17n.org>
 
+       * Version 1.2.0 released.
+
+2004-12-27  Kenichi Handa  <handa@m17n.org>
+
        * mtext.c (mtext_from_data): Fix documentation.
 
 2004-12-25  Kenichi Handa  <handa@m17n.org>

diff --git a/src/m17n-core.h b/src/m17n-core.h
index d2f0629..5a2f81e 100644 (file)
--- a/src/m17n-core.h
+++ b/src/m17n-core.h
@@ -576,20 +576,20 @@ extern MSymbol Mtext_prop_deserializer;
     @brief Type of serializer functions.
 
     This is the type of serializer functions.  If the key of a symbol
-    property is #Msymbol_prop_serializer, the value must be of this
+    property is #Mtext_prop_serializer, the value must be of this
     type.
 
     @seealso
-    mtext_prop_serialize (), Mtext_prop_serializer
+    mtext_serialize (), #Mtext_prop_serializer
 */
 /***ja
     @brief ¥·¥ê¥¢¥é¥¤¥¶´Ø¿ô¤Î·¿Àë¸À.
 
     ¥·¥ê¥¢¥é¥¤¥¶´Ø¿ô¤Î·¿¤Ç¤¢¤ë¡£ ¤¢¤ë¥·¥ó¥Ü¥ë¤Î¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤¬ @c
-    #Msymbol_prop_serializer ¤Ç¤¢¤ë¤È¤­¡¢ ÃͤϤ³¤Î·¿¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
+    #Mtext_prop_serializer ¤Ç¤¢¤ë¤È¤­¡¢ ÃͤϤ³¤Î·¿¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
 
     @seealso
-    Mtext_prop_serialize (), Mtext_prop_serializer
+    mtext_serialize (), #Mtext_prop_serializer
 */
 
 typedef MPlist *(*MTextPropSerializeFunc) (void *val);
@@ -599,11 +599,11 @@ typedef MPlist *(*MTextPropSerializeFunc) (void *val);
     @brief Type of deserializer functions.
 
     This is the type of deserializer functions.  If the key of a
-    symbol property is #Msymbol_prop_deserializer, the value must be
-    of this type.
+    symbol property is #Mtext_prop_deserializer, the value must be of
+    this type.
 
     @seealso
-    Mtext_prop_deserialize (), Mtext_prop_deserializer
+    mtext_deserialize (), #Mtext_prop_deserializer
 */
 /***ja
     @brief ¥Ç¥·¥ê¥¢¥é¥¤¥¶´Ø¿ô¤Î·¿Àë¸À.

diff --git a/src/textprop.c b/src/textprop.c
index e90f04a..e5b0e0f 100644 (file)
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -2687,7 +2687,7 @@ mtext_push_property (MText *mt, int from, int to, MTextProperty *prop)
     pointer to an appropriate serializer function.
 
     @seealso
-    mtext_serialize (), MTextPropSerializeFunc
+    mtext_serialize (), #MTextPropSerializeFunc
   */
 
 /***ja
@@ -2699,7 +2699,7 @@ mtext_push_property (MText *mt, int from, int to, MTextProperty *prop)
     ¥ó¥¿¤òÃͤȤ¹¤ë¥·¥ó¥Ü¥ë¥×¥í¥Ñ¥Æ¥£¤ò»ØÄꤹ¤ë¡£
 
     @seealso
-    mtext_serialize (), MTextPropSerializeFunc
+    mtext_serialize (), #MTextPropSerializeFunc
   */
 MSymbol Mtext_prop_serializer;
 
@@ -2712,7 +2712,7 @@ MSymbol Mtext_prop_serializer;
     pointer to an appropriate deserializer function.
 
     @seealso
-    mtext_deserialize (), MTextPropSerializeFunc
+    mtext_deserialize (), #MTextPropSerializeFunc
   */
 
 /***ja
@@ -2724,7 +2724,7 @@ MSymbol Mtext_prop_serializer;
     ¥Ý¥¤¥ó¥¿¤òÃͤȤ¹¤ë¥·¥ó¥Ü¥ë¥×¥í¥Ñ¥Æ¥£¤ò»ØÄꤹ¤ë¡£
 
     @seealso
-    mtext_deserialize (), MTextPropSerializeFunc
+    mtext_deserialize (), #MTextPropSerializeFunc
   */
 MSymbol Mtext_prop_deserializer;
 
@@ -2766,7 +2766,7 @@ 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 Ãæ¤Î¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ò¥·¥ê¥¢¥é¥¤¥º¤¹¤ë.
@@ -2806,7 +2806,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)
@@ -2919,7 +2919,7 @@ mtext_serialize (MText *mt, int from, int to, MPlist *property_list)
     code to the external variable #merror_code.
 
     @seealso
-    mtext_serialize (), Mtext_prop_deserializer  */
+    mtext_serialize (), #Mtext_prop_deserializer  */
 
 /***ja
     @brief M-text Ãæ¤Î¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ò¥Ç¥·¥ê¥¢¥é¥¤¥º¤¹¤ë.
@@ -2949,7 +2949,7 @@ mtext_serialize (MText *mt, int from, int to, MPlist *property_list)
     ¥³¡¼¥É¤òÀßÄꤹ¤ë¡£
 
     @seealso
-    mtext_serialize (), Mtext_prop_deserializer  */
+    mtext_serialize (), #Mtext_prop_deserializer  */
 
 MText *
 mtext_deserialize (MText *mt)