* Added test code of the <ul type> attribute for CHTML5.0 converter.

  * Added <ul type> attribute for CHTML5.0 converter.
  * Added <menu type> attribute for CHTML5.0 converter.

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

diff --git a/src/chxj_chtml40.c b/src/chxj_chtml40.c
index 713d22c..a0c0dfd 100644 (file)
--- a/src/chxj_chtml40.c
+++ b/src/chxj_chtml40.c
@@ -2004,7 +2004,7 @@ s_chtml40_start_ul_tag(void *pdoc, Node *node)
 {
   chtml40_t   *chtml40 = GET_CHTML40(pdoc);
   Doc         *doc     = chtml40->doc;
-  Attr    *attr;
+  Attr        *attr;
   W_L("<ul");
   /*--------------------------------------------------------------------------*/
   /* Get Attributes                                                           */

diff --git a/src/chxj_chtml50.c b/src/chxj_chtml50.c
index cd7a020..ae6ab02 100644 (file)
--- a/src/chxj_chtml50.c
+++ b/src/chxj_chtml50.c
@@ -2002,13 +2002,29 @@ s_chtml50_end_div_tag(void *pdoc, Node *UNUSED(node))
  * @return The conversion result is returned.
  */
 static char *
-s_chtml50_start_ul_tag(void *pdoc, Node *UNUSED(node)) 
+s_chtml50_start_ul_tag(void *pdoc, Node *node)
 {
   chtml50_t   *chtml50 = GET_CHTML50(pdoc);
   Doc         *doc     = chtml50->doc;
-
-  W_L("<ul>");
-
+  Attr        *attr;
+  W_L("<ul");
+  /*--------------------------------------------------------------------------*/
+  /* Get Attributes                                                           */
+  /*--------------------------------------------------------------------------*/
+  for (attr = qs_get_attr(doc,node);
+       attr;
+       attr = qs_get_next_attr(doc,attr)) {
+    char *name   = qs_get_attr_name(doc,attr);
+    char *value  = qs_get_attr_value(doc,attr);
+    if (STRCASEEQ('t','T',"type",name)) {
+      if (value && (STRCASEEQ('d','D',"disc",value) || STRCASEEQ('c','C',"circle",value) || STRCASEEQ('s','S',"square",value))) {
+        W_L(" type=\"");
+        W_V(value);
+        W_L("\"");
+      }
+    }
+  }
+  W_L(">");
   return chtml50->out;
 }
 
@@ -3108,11 +3124,29 @@ s_chtml50_end_blink_tag(void *pdoc, Node *UNUSED(child))
  * @return The conversion result is returned.
  */
 static char *
-s_chtml50_start_menu_tag(void *pdoc, Node *UNUSED(child))
+s_chtml50_start_menu_tag(void *pdoc, Node *node)
 {
   chtml50_t *chtml50 = GET_CHTML50(pdoc);
   Doc       *doc     = chtml50->doc;
-  W_L("<menu>");
+  Attr      *attr;
+  W_L("<menu");
+  /*--------------------------------------------------------------------------*/
+  /* Get Attributes                                                           */
+  /*--------------------------------------------------------------------------*/
+  for (attr = qs_get_attr(doc,node);
+       attr;
+       attr = qs_get_next_attr(doc,attr)) {
+    char *name   = qs_get_attr_name(doc,attr);
+    char *value  = qs_get_attr_value(doc,attr);
+    if (STRCASEEQ('t','T',"type",name)) {
+      if (value && (STRCASEEQ('d','D',"disc",value) || STRCASEEQ('c','C',"circle",value) || STRCASEEQ('s','S',"square",value))) {
+        W_L(" type=\"");
+        W_V(value);
+        W_L("\"");
+      }
+    }
+  }
+  W_L(">");
   return chtml50->out;
 }
 

diff --git a/test/chxj_chtml50/test_chxj_chtml50.c b/test/chxj_chtml50/test_chxj_chtml50.c
index f9182a2..031e77a 100644 (file)
--- a/test/chxj_chtml50/test_chxj_chtml50.c
+++ b/test/chxj_chtml50/test_chxj_chtml50.c
@@ -430,6 +430,12 @@ void test_chtml50_ul_tag_002();
 void test_chtml50_ul_tag_003();
 void test_chtml50_ul_tag_004();
 void test_chtml50_ul_tag_005();
+void test_chtml50_ul_tag_006();
+void test_chtml50_ul_tag_007();
+void test_chtml50_ul_tag_008();
+void test_chtml50_ul_tag_009();
+void test_chtml50_ul_tag_010();
+void test_chtml50_ul_tag_011();
 
 void test_chtml50_blink_tag_001();
 void test_chtml50_blink_tag_002();
@@ -863,6 +869,12 @@ main()
   CU_add_test(chtml50_suite, "test <ul> 3." ,                                     test_chtml50_ul_tag_003);
   CU_add_test(chtml50_suite, "test <ul> 4." ,                                     test_chtml50_ul_tag_004);
   CU_add_test(chtml50_suite, "test <ul> 5." ,                                     test_chtml50_ul_tag_005);
+  CU_add_test(chtml50_suite, "test <ul> 6." ,                                     test_chtml50_ul_tag_006);
+  CU_add_test(chtml50_suite, "test <ul> 7." ,                                     test_chtml50_ul_tag_007);
+  CU_add_test(chtml50_suite, "test <ul> 8." ,                                     test_chtml50_ul_tag_008);
+  CU_add_test(chtml50_suite, "test <ul> 9." ,                                     test_chtml50_ul_tag_009);
+  CU_add_test(chtml50_suite, "test <ul> 10." ,                                    test_chtml50_ul_tag_010);
+  CU_add_test(chtml50_suite, "test <ul> 11." ,                                    test_chtml50_ul_tag_011);
 
   CU_add_test(chtml50_suite, "test <blink> 1." ,                                  test_chtml50_blink_tag_001);
   CU_add_test(chtml50_suite, "test <blink> 2." ,                                  test_chtml50_blink_tag_002);