Merge branch 'branch_0.12.0'

Conflicts:
	src/mod_chxj.c

diff --cc etc/device_data.xml
Simple merge

diff --cc include/chxj_chtml10.h
Simple merge

diff --cc include/chxj_chtml20.h
Simple merge

diff --cc include/chxj_chtml30.h
Simple merge

diff --cc include/chxj_chtml40.h
Simple merge

diff --cc include/chxj_chtml50.h
Simple merge

diff --cc include/chxj_jhtml.h
Simple merge

diff --cc include/chxj_jxhtml.h
Simple merge

diff --cc include/chxj_xhtml_mobile_1_0.h
Simple merge

diff --cc include/mod_chxj.h
Simple merge

diff --cc src/chxj_chtml10.c
Simple merge

diff --cc src/chxj_chtml20.c
Simple merge

diff --cc src/chxj_chtml30.c
Simple merge

diff --cc src/chxj_chtml40.c
Simple merge

diff --cc src/chxj_chtml50.c
Simple merge

diff --cc src/chxj_jhtml.c
Simple merge

diff --cc src/chxj_jxhtml.c
Simple merge

diff --cc src/chxj_tag_util.c
Simple merge

diff --cc src/chxj_xhtml_mobile_1_0.c
Simple merge

diff --cc src/mod_chxj.c
index 2e83047,8c7f32a..4c88fdf
--- 1/src/mod_chxj.c
--- 2/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@@ -112,13 -116,15 +118,15 @@@ converter_t convert_routine[] = 
    },
    {
      /* CHXJ_SPEC_Chtml_6_0        */
 -    .converter            = chxj_convert_chtml50,
 -    .encoder              = chxj_encoding,
 -    .emoji_only_converter = chxj_chtml50_emoji_only_converter,
 +    .converter = chxj_convert_ixhtml10,
 +    .encoder  = chxj_encoding,
++    .emoji_only_converter = chxj_chtml50_emoji_only_converter, /* XXX: TODO */
    },
    {
      /* CHXJ_SPEC_Chtml_7_0        */
 -    .converter            = chxj_convert_chtml50,
 -    .encoder              = chxj_encoding,
 -    .emoji_only_converter = chxj_chtml50_emoji_only_converter,
 +    .converter = chxj_convert_ixhtml10,
 +    .encoder  = chxj_encoding,
++    .emoji_only_converter = chxj_chtml50_emoji_only_converter, /* XXX: TODO */
    },
    {
      /* CHXJ_SPEC_XHtml_Mobile_1_0 */