* Added <font> tag for CHTML5.0 converter.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_12_0@2552 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/src/chxj_chtml50.c b/src/chxj_chtml50.c
index cfa8958..320b0ed 100644 (file)
--- a/src/chxj_chtml50.c
+++ b/src/chxj_chtml50.c
@@ -1237,11 +1237,13 @@ s_chtml50_start_font_tag(void *pdoc, Node *node)
       W_V(value);
       W_L("\"");
     }
-    else if (STRCASEEQ('s','S',"size", name)) {
+    else if (STRCASEEQ('s','S',"size", name) && value && *value) {
       /*----------------------------------------------------------------------*/
       /* CHTML 5.0                                                            */
       /*----------------------------------------------------------------------*/
-      /* ignore */
+      W_L(" size=\"");
+      W_V(value);
+      W_L("\"");
     }
   }
   W_L(">");

diff --git a/test/chxj_chtml50/test_chxj_chtml50.c b/test/chxj_chtml50/test_chxj_chtml50.c
index 5873dab..8df5e9d 100644 (file)
--- a/test/chxj_chtml50/test_chxj_chtml50.c
+++ b/test/chxj_chtml50/test_chxj_chtml50.c
@@ -949,6 +949,14 @@ main()
   CU_add_test(chtml50_suite, "test <font> 3." ,                                   test_chtml50_font_tag_003);
   CU_add_test(chtml50_suite, "test <font> 4." ,                                   test_chtml50_font_tag_004);
   CU_add_test(chtml50_suite, "test <font> 5." ,                                   test_chtml50_font_tag_005);
+  CU_add_test(chtml50_suite, "test <font> 5-1." ,                                 test_chtml50_font_tag_005_2);
+  CU_add_test(chtml50_suite, "test <font> 5-2." ,                                 test_chtml50_font_tag_005_3);
+  CU_add_test(chtml50_suite, "test <font> 5-3." ,                                 test_chtml50_font_tag_005_4);
+  CU_add_test(chtml50_suite, "test <font> 5-4." ,                                 test_chtml50_font_tag_005_5);
+  CU_add_test(chtml50_suite, "test <font> 5-5." ,                                 test_chtml50_font_tag_005_6);
+  CU_add_test(chtml50_suite, "test <font> 5-6." ,                                 test_chtml50_font_tag_005_7);
+  CU_add_test(chtml50_suite, "test <font> 5-7." ,                                 test_chtml50_font_tag_005_8);
+  CU_add_test(chtml50_suite, "test <font> 5-8." ,                                 test_chtml50_font_tag_005_9);
   CU_add_test(chtml50_suite, "test <font> 6." ,                                   test_chtml50_font_tag_006);
   CU_add_test(chtml50_suite, "test <font> 7." ,                                   test_chtml50_font_tag_007);
   /* aend */
@@ -12703,7 +12711,7 @@ void test_chtml50_font_tag_005_3()
 void test_chtml50_font_tag_005_4() 
 {
 #define  TEST_STRING "<font size=\"4\">aaa</font>"
-#define  RESULT_STRING "<font size=\"5\">aaa</font>"
+#define  RESULT_STRING "<font size=\"4\">aaa</font>"
   char  *ret;
   char  *tmp;
   device_table spec;