* Added center tag with CSS for CHTML3.0 converter.

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

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 2acdb02..4d05b02 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -1778,6 +1778,7 @@ s_chtml30_start_center_tag(void *pdoc, Node *node)
   Doc         *doc;
   Attr        *attr;
   char        *attr_style = NULL;
+  char        *attr_color = NULL;
 
   chtml30 = GET_CHTML30(pdoc);
   doc     = chtml30->doc;
@@ -1792,11 +1793,31 @@ s_chtml30_start_center_tag(void *pdoc, Node *node)
     }
   }
 
-  W_L("<center>");
   if (IS_CSS_ON(chtml30->entryp)) {
-    s_chtml30_push_and_get_now_style(pdoc, node, attr_style);
+    css_prop_list_t *style = s_chtml30_push_and_get_now_style(pdoc, node, attr_style);
+    if (style) {
+      css_property_t *color_prop      = chxj_css_get_property_value(doc, style, "color");
+      css_property_t *cur;
+      for (cur = color_prop->next; cur != color_prop; cur = cur->next) {
+        if (cur->value && *cur->value) {
+          attr_color = apr_pstrdup(doc->pool, cur->value);
+        }
+      }
+    }
   }
 
+  W_L("<center>");
+  chtml30_flags_t *flg = (chtml30_flags_t *)apr_palloc(doc->pool, sizeof(chtml30_flags_t));
+  memset(flg, 0, sizeof(*flg));
+  if (attr_color) {
+    attr_color = chxj_css_rgb_func_to_value(doc->pool, attr_color);
+    W_L("<font color=\"");
+    W_V(attr_color);
+    W_L("\">");
+    flg->with_font_flag = 1;
+  }
+  node->userData = flg;
+
   return chtml30->out;
 }
 
@@ -1810,7 +1831,7 @@ s_chtml30_start_center_tag(void *pdoc, Node *node)
  * @return The conversion result is returned.
  */
 static char *
-s_chtml30_end_center_tag(void *pdoc, Node *UNUSED(child)) 
+s_chtml30_end_center_tag(void *pdoc, Node *node)
 {
   chtml30_t     *chtml30;
   Doc           *doc;
@@ -1818,10 +1839,14 @@ s_chtml30_end_center_tag(void *pdoc, Node *UNUSED(child))
   chtml30 = GET_CHTML30(pdoc);
   doc     = chtml30->doc;
 
-  W_L("</center>");
   if (IS_CSS_ON(chtml30->entryp)) {
     chxj_css_pop_prop_list(chtml30->css_prop_stack);
   }
+  chtml30_flags_t *flg = (chtml30_flags_t *)node->userData;
+  if (flg && flg->with_font_flag) {
+    W_L("</font>");
+  }
+  W_L("</center>");
 
   return chtml30->out;
 }

diff --git a/test/chxj_chtml30/test_chxj_chtml30.c b/test/chxj_chtml30/test_chxj_chtml30.c
index c2dea35..397e293 100644 (file)
--- a/test/chxj_chtml30/test_chxj_chtml30.c
+++ b/test/chxj_chtml30/test_chxj_chtml30.c
@@ -606,6 +606,11 @@ void test_chtml30_input_tag_with_css_005();
 void test_chtml30_input_tag_with_css_006();
 void test_chtml30_input_tag_with_css_007();
 void test_chtml30_input_tag_with_css_008();
+
+void test_chtml30_center_tag_with_css_001();
+void test_chtml30_center_tag_with_css_002();
+void test_chtml30_center_tag_with_css_003();
+void test_chtml30_center_tag_with_css_004();
 /* pend */
 
 int
@@ -1173,6 +1178,11 @@ main()
   CU_add_test(chtml30_suite, "test input with css 006",                            test_chtml30_input_tag_with_css_006);
   CU_add_test(chtml30_suite, "test input with css 007",                            test_chtml30_input_tag_with_css_007);
   CU_add_test(chtml30_suite, "test input with css 008",                            test_chtml30_input_tag_with_css_008);
+
+  CU_add_test(chtml30_suite, "test center with css 001",                           test_chtml30_center_tag_with_css_001);
+  CU_add_test(chtml30_suite, "test center with css 002",                           test_chtml30_center_tag_with_css_002);
+  CU_add_test(chtml30_suite, "test center with css 003",                           test_chtml30_center_tag_with_css_003);
+  CU_add_test(chtml30_suite, "test center with css 004",                           test_chtml30_center_tag_with_css_004);
   /* aend */
 
   CU_basic_run_tests();
@@ -16847,6 +16857,174 @@ void test_chtml30_input_tag_with_css_008()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
+
+
+/*===========================================================================*/
+/* center tag with CSS                                                       */
+/*===========================================================================*/
+char *test_chxj_serf_get084(request_rec *r, apr_pool_t *ppool, const char *uri_path, int ss, apr_size_t *len)
+{
+  static char *css = "a:focus { display: none }\n"
+                     "a:link  { display: none }\n"
+                     "a       { display: none }\n"
+                     "hr      { display: none }\n"
+                     "center  { color:rgb(100%,0%,0%);}\n";
+  *len = strlen(css);
+  call_check = 1;
+  return css;
+}
+void test_chtml30_center_tag_with_css_001()
+{
+#define  TEST_STRING "<html><head><link rel=\"stylesheet\" href=\"http://localhost/a.css\"  type=\"text/css\" />" \
+                     "</head><body><center>あいうえお</center></body></html>"
+#define  RESULT_STRING "<html><head></head><body><center><font color=\"#ff0000\">あいうえお</font></center></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+  chxj_serf_get = test_chxj_serf_get084;
+  call_check = 0;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+  entry.action |= CONVRULE_CSS_ON_BIT;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_convert_chtml30(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
+  ret = chxj_rencoding(&r, ret, &destlen);
+  fprintf(stderr, "actual:[%s]\n", ret);
+  fprintf(stderr, "expect:[%s]\n", RESULT_STRING);
+  CU_ASSERT(ret != NULL);
+  CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);
+  CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);
+  CU_ASSERT(call_check == 1);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
+void test_chtml30_center_tag_with_css_002()
+{
+#define  TEST_STRING "<html><head>" \
+                     "</head><body><center style=\"color:#ff0000\">あいうえお</center></body></html>"
+#define  RESULT_STRING "<html><head></head><body><center><font color=\"#ff0000\">あいうえお</font></center></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+  chxj_serf_get = test_chxj_serf_get084;
+  call_check = 0;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+  entry.action |= CONVRULE_CSS_ON_BIT;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_convert_chtml30(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
+  ret = chxj_rencoding(&r, ret, &destlen);
+  fprintf(stderr, "actual:[%s]\n", ret);
+  fprintf(stderr, "expect:[%s]\n", RESULT_STRING);
+  CU_ASSERT(ret != NULL);
+  CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);
+  CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);
+  CU_ASSERT(call_check == 0);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
+
+char *test_chxj_serf_get085(request_rec *r, apr_pool_t *ppool, const char *uri_path, int ss, apr_size_t *len)
+{
+  static char *css = "a:focus { display: none }\n"
+                     "a:link  { display: none }\n"
+                     "a       { display: none }\n"
+                     "hr      { display: none }\n"
+                     "center  { font-size:xx-small;}\n";
+  *len = strlen(css);
+  call_check = 1;
+  return css;
+}
+void test_chtml30_center_tag_with_css_003()
+{
+#define  TEST_STRING "<html><head><link rel=\"stylesheet\" href=\"http://localhost/a.css\"  type=\"text/css\" />" \
+                     "</head><body><center>あいうえお</center></body></html>"
+#define  RESULT_STRING "<html><head></head><body><center>あいうえお</center></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+  chxj_serf_get = test_chxj_serf_get085;
+  call_check = 0;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+  entry.action |= CONVRULE_CSS_ON_BIT;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_convert_chtml30(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
+  ret = chxj_rencoding(&r, ret, &destlen);
+  fprintf(stderr, "actual:[%s]\n", ret);
+  fprintf(stderr, "expect:[%s]\n", RESULT_STRING);
+  CU_ASSERT(ret != NULL);
+  CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);
+  CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);
+  CU_ASSERT(call_check == 1);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
+void test_chtml30_center_tag_with_css_004()
+{
+#define  TEST_STRING "<html><head>" \
+                     "</head><body><center style=\"font-size:xx-small;\">あいうえお</center></body></html>"
+#define  RESULT_STRING "<html><head></head><body><center>あいうえお</center></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+  chxj_serf_get = test_chxj_serf_get085;
+  call_check = 0;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+  entry.action |= CONVRULE_CSS_ON_BIT;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_convert_chtml30(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
+  ret = chxj_rencoding(&r, ret, &destlen);
+  fprintf(stderr, "actual:[%s]\n", ret);
+  fprintf(stderr, "expect:[%s]\n", RESULT_STRING);
+  CU_ASSERT(ret != NULL);
+  CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);
+  CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);
+  CU_ASSERT(call_check == 0);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
 /*
  * vim:ts=2 et
  */