From ba2765f985bf4215cb5a03c24a5b2528e21a69d7 Mon Sep 17 00:00:00 2001
From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Mon, 14 Jul 2008 08:00:00 +0000
Subject: [PATCH]   * Added h4 tag with CSS for SoftBank XHTML converter.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@2915 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---
 src/chxj_jxhtml.c                   |  56 +++++--
 test/chxj_jxhtml/test_chxj_jxhtml.c | 313 ++++++++++++++++++++++++++++++++++--
 2 files changed, 338 insertions(+), 31 deletions(-)

diff --git a/src/chxj_jxhtml.c b/src/chxj_jxhtml.c
index 42ab1d9e..4a898a4f 100644
--- a/src/chxj_jxhtml.c
+++ b/src/chxj_jxhtml.c
@@ -3388,11 +3388,12 @@ s_jxhtml_end_h3_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_jxhtml_start_h4_tag(void *pdoc, Node *node)
 {
-  jxhtml_t       *jxhtml;
-  Doc           *doc;
-  request_rec   *r;
-  Attr          *attr;
-  char          *align = NULL;
+  jxhtml_t    *jxhtml;
+  Doc         *doc;
+  request_rec *r;
+  Attr        *attr;
+  char        *attr_style = NULL;
+  char        *attr_align = NULL;
 
   jxhtml   = GET_JXHTML(pdoc);
   doc     = jxhtml->doc;
@@ -3405,17 +3406,41 @@ s_jxhtml_start_h4_tag(void *pdoc, Node *node)
     char *value = qs_get_attr_value(doc,attr);
     if (STRCASEEQ('a','A',"align", name)) {
       if (value && (STRCASEEQ('l','L',"left",value) || STRCASEEQ('r','R',"right",value) || STRCASEEQ('c','C',"center",value))) {
-        jxhtml->h4_align_flag++;
-        align = apr_pstrdup(doc->buf.pool, value);
-        break;
+        attr_align = value;
       }
     }
+    else if (STRCASEEQ('s','S',"style",name) && value && *value) {
+      attr_style = value;
+    }
   }
-  if (align) {
-    W_L("<div align=\"");
-    W_V(align);
-    W_L("\">");
+  if (IS_CSS_ON(jxhtml->entryp)) {
+    css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style);
+    if (style) {
+      css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align");
+      css_property_t *cur;
+      for (cur = list_style_type_prop->next; cur != list_style_type_prop; cur = cur->next) {
+        if (STRCASEEQ('l','L',"left", cur->value)) {
+          attr_align = apr_pstrdup(doc->pool, "left");
+        }
+        else if (STRCASEEQ('c','C',"center",cur->value)) {
+          attr_align = apr_pstrdup(doc->pool, "center");
+        }
+        else if (STRCASEEQ('r','R',"right",cur->value)) {
+          attr_align = apr_pstrdup(doc->pool, "right");
+        }
+      }
+    }
+  }
+  W_L("<div");
+  W_L(" style=\""); 
+  W_L("font-size:x-small;");
+  if (attr_align) {
+    W_L("text-align:");
+    W_V(attr_align);
+    W_L(";");
   }
+  W_L("\">");
+
   return jxhtml->out;
 }
 
@@ -3439,10 +3464,11 @@ s_jxhtml_end_h4_tag(void *pdoc, Node *UNUSED(child))
   doc     = jxhtml->doc;
   r       = doc->r;
   
-  if (jxhtml->h4_align_flag) {
-    jxhtml->h4_align_flag--;
-    W_L("</div>");
+  W_L("</div>");
+  if (IS_CSS_ON(jxhtml->entryp)) {
+    chxj_css_pop_prop_list(jxhtml->css_prop_stack);
   }
+
   return jxhtml->out;
 }
 
diff --git a/test/chxj_jxhtml/test_chxj_jxhtml.c b/test/chxj_jxhtml/test_chxj_jxhtml.c
index 0d24788f..79ec5a77 100644
--- a/test/chxj_jxhtml/test_chxj_jxhtml.c
+++ b/test/chxj_jxhtml/test_chxj_jxhtml.c
@@ -586,6 +586,20 @@ void test_jxhtml_h2_tag_with_css_003();
 void test_jxhtml_h2_tag_with_css_004();
 void test_jxhtml_h2_tag_with_css_005();
 void test_jxhtml_h2_tag_with_css_006();
+
+void test_jxhtml_h3_tag_with_css_001();
+void test_jxhtml_h3_tag_with_css_002();
+void test_jxhtml_h3_tag_with_css_003();
+void test_jxhtml_h3_tag_with_css_004();
+void test_jxhtml_h3_tag_with_css_005();
+void test_jxhtml_h3_tag_with_css_006();
+
+void test_jxhtml_h4_tag_with_css_001();
+void test_jxhtml_h4_tag_with_css_002();
+void test_jxhtml_h4_tag_with_css_003();
+void test_jxhtml_h4_tag_with_css_004();
+void test_jxhtml_h4_tag_with_css_005();
+void test_jxhtml_h4_tag_with_css_006();
 /* pend */
 
 int
@@ -1219,6 +1233,20 @@ main()
   CU_add_test(jxhtml_suite, "test h2 with css 004",                               test_jxhtml_h2_tag_with_css_004);
   CU_add_test(jxhtml_suite, "test h2 with css 005",                               test_jxhtml_h2_tag_with_css_005);
   CU_add_test(jxhtml_suite, "test h2 with css 006",                               test_jxhtml_h2_tag_with_css_006);
+
+  CU_add_test(jxhtml_suite, "test h3 with css 001",                               test_jxhtml_h3_tag_with_css_001);
+  CU_add_test(jxhtml_suite, "test h3 with css 002",                               test_jxhtml_h3_tag_with_css_002);
+  CU_add_test(jxhtml_suite, "test h3 with css 003",                               test_jxhtml_h3_tag_with_css_003);
+  CU_add_test(jxhtml_suite, "test h3 with css 004",                               test_jxhtml_h3_tag_with_css_004);
+  CU_add_test(jxhtml_suite, "test h3 with css 005",                               test_jxhtml_h3_tag_with_css_005);
+  CU_add_test(jxhtml_suite, "test h3 with css 006",                               test_jxhtml_h3_tag_with_css_006);
+
+  CU_add_test(jxhtml_suite, "test h4 with css 001",                               test_jxhtml_h4_tag_with_css_001);
+  CU_add_test(jxhtml_suite, "test h4 with css 002",                               test_jxhtml_h4_tag_with_css_002);
+  CU_add_test(jxhtml_suite, "test h4 with css 003",                               test_jxhtml_h4_tag_with_css_003);
+  CU_add_test(jxhtml_suite, "test h4 with css 004",                               test_jxhtml_h4_tag_with_css_004);
+  CU_add_test(jxhtml_suite, "test h4 with css 005",                               test_jxhtml_h4_tag_with_css_005);
+  CU_add_test(jxhtml_suite, "test h4 with css 006",                               test_jxhtml_h4_tag_with_css_006);
   /* aend */
 
   CU_basic_run_tests();
@@ -4580,13 +4608,14 @@ void test_jxhtml_h3_tag_010()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
+
 /*===========================================================================*/
 /* <h4>                                                                      */
 /*===========================================================================*/
 void test_jxhtml_h4_tag_001() 
 {
 #define  TEST_STRING "<h4></h4>"
-#define  RESULT_STRING "\n"
+#define  RESULT_STRING "<div style=\"font-size:x-small;\"></div>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -4616,7 +4645,7 @@ void test_jxhtml_h4_tag_001()
 void test_jxhtml_h4_tag_002() 
 {
 #define  TEST_STRING "<h4>abc</h4>"
-#define  RESULT_STRING "abc"
+#define  RESULT_STRING "<div style=\"font-size:x-small;\">abc</div>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -4646,7 +4675,7 @@ void test_jxhtml_h4_tag_002()
 void test_jxhtml_h4_tag_003() 
 {
 #define  TEST_STRING "<h4>亀さん</h4>"
-#define  RESULT_STRING "亀さん"
+#define  RESULT_STRING "<div style=\"font-size:x-small;\">亀さん</div>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -4676,7 +4705,7 @@ void test_jxhtml_h4_tag_003()
 void test_jxhtml_h4_tag_004() 
 {
 #define  TEST_STRING "<h4>ﾊﾝｶｸ</h4>"
-#define  RESULT_STRING "ﾊﾝｶｸ"
+#define  RESULT_STRING "<div style=\"font-size:x-small;\">ﾊﾝｶｸ</div>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -4706,7 +4735,7 @@ void test_jxhtml_h4_tag_004()
 void test_jxhtml_h4_tag_005() 
 {
 #define  TEST_STRING "<h4 align></h4>"
-#define  RESULT_STRING "\n"
+#define  RESULT_STRING "<div style=\"font-size:x-small;\"></div>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -4736,7 +4765,7 @@ void test_jxhtml_h4_tag_005()
 void test_jxhtml_h4_tag_006() 
 {
 #define  TEST_STRING "<h4 align=\"\"></h4>"
-#define  RESULT_STRING "\n"
+#define  RESULT_STRING "<div style=\"font-size:x-small;\"></div>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -4766,7 +4795,7 @@ void test_jxhtml_h4_tag_006()
 void test_jxhtml_h4_tag_007() 
 {
 #define  TEST_STRING "<h4 align=\"left\"></h4>"
-#define  RESULT_STRING "<div align=\"left\"></div>"
+#define  RESULT_STRING "<div style=\"font-size:x-small;text-align:left;\"></div>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -4796,7 +4825,7 @@ void test_jxhtml_h4_tag_007()
 void test_jxhtml_h4_tag_008() 
 {
 #define  TEST_STRING "<h4 align=\"right\"></h4>"
-#define  RESULT_STRING "<div align=\"right\"></div>"
+#define  RESULT_STRING "<div style=\"font-size:x-small;text-align:right;\"></div>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -4826,7 +4855,7 @@ void test_jxhtml_h4_tag_008()
 void test_jxhtml_h4_tag_009() 
 {
 #define  TEST_STRING "<h4 align=\"center\"></h4>"
-#define  RESULT_STRING "<div align=\"center\"></div>"
+#define  RESULT_STRING "<div style=\"font-size:x-small;text-align:center;\"></div>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -4856,7 +4885,7 @@ void test_jxhtml_h4_tag_009()
 void test_jxhtml_h4_tag_010() 
 {
 #define  TEST_STRING "<h4 align=\"unkown\"></h4>"
-#define  RESULT_STRING "\n"
+#define  RESULT_STRING "<div style=\"font-size:x-small;\"></div>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -16958,7 +16987,7 @@ void test_jxhtml_h3_tag_with_css_001()
 #define  TEST_STRING "<html><head><link rel=\"stylesheet\" href=\"http://localhost/a.css\"  type=\"text/css\" />" \
                      "</head><body><h3>あいう</h3></body></html>"
 #define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
-                       "<html><head></head><body><div><div style=\"font-size:x-large;text-align:right;\">あいう</div></div></body></html>"
+                       "<html><head></head><body><div><div style=\"font-size:large;text-align:right;\">あいう</div></div></body></html>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -17004,7 +17033,7 @@ void test_jxhtml_h3_tag_with_css_002()
 #define  TEST_STRING "<html><head><link rel=\"stylesheet\" href=\"http://localhost/a.css\"  type=\"text/css\" />" \
                      "</head><body><h3>あいう</h3></body></html>"
 #define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
-                       "<html><head></head><body><div><div style=\"font-size:x-large;text-align:center;\">あいう</div></div></body></html>"
+                       "<html><head></head><body><div><div style=\"font-size:large;text-align:center;\">あいう</div></div></body></html>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -17050,7 +17079,7 @@ void test_jxhtml_h3_tag_with_css_003()
 #define  TEST_STRING "<html><head><link rel=\"stylesheet\" href=\"http://localhost/a.css\"  type=\"text/css\" />" \
                      "</head><body><h3>あいう</h3></body></html>"
 #define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
-                       "<html><head></head><body><div><div style=\"font-size:x-large;text-align:right;\">あいう</div></div></body></html>"
+                       "<html><head></head><body><div><div style=\"font-size:large;text-align:right;\">あいう</div></div></body></html>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -17084,7 +17113,7 @@ void test_jxhtml_h3_tag_with_css_004()
 #define  TEST_STRING "<html><head>" \
                      "</head><body><h3 style=\"text-align: left\">あいう</h3></body></html>"
 #define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
-                       "<html><head></head><body><div><div style=\"font-size:x-large;text-align:left;\">あいう</div></div></body></html>"
+                       "<html><head></head><body><div><div style=\"font-size:large;text-align:left;\">あいう</div></div></body></html>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -17118,7 +17147,7 @@ void test_jxhtml_h3_tag_with_css_005()
 #define  TEST_STRING "<html><head>" \
                      "</head><body><h3 style=\"text-align: center\">あいう</h3></body></html>"
 #define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
-                       "<html><head></head><body><div><div style=\"font-size:x-large;text-align:center;\">あいう</div></div></body></html>"
+                       "<html><head></head><body><div><div style=\"font-size:large;text-align:center;\">あいう</div></div></body></html>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -17138,6 +17167,8 @@ void test_jxhtml_h3_tag_with_css_005()
   tmp = chxj_encoding(&r, TEST_STRING, &destlen);
   ret = chxj_convert_jxhtml(&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);
@@ -17152,7 +17183,7 @@ void test_jxhtml_h3_tag_with_css_006()
 #define  TEST_STRING "<html><head>" \
                      "</head><body><h3 style=\"text-align: right\">あいう</h3></body></html>"
 #define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
-                       "<html><head></head><body><div><div style=\"font-size:x-large;text-align:right;\">あいう</div></div></body></html>"
+                       "<html><head></head><body><div><div style=\"font-size:large;text-align:right;\">あいう</div></div></body></html>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -17172,6 +17203,256 @@ void test_jxhtml_h3_tag_with_css_006()
   tmp = chxj_encoding(&r, TEST_STRING, &destlen);
   ret = chxj_convert_jxhtml(&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
+}
+
+
+
+/*===========================================================================*/
+/* h4 tag with CSS                                                           */
+/*===========================================================================*/
+char *test_chxj_serf_get049(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"
+                     "a:visited { display:none }\n"
+                     "h4      { text-align: right }\n";
+  *len = strlen(css);
+  call_check = 1;
+  return css;
+}
+void test_jxhtml_h4_tag_with_css_001()
+{
+#define  TEST_STRING "<html><head><link rel=\"stylesheet\" href=\"http://localhost/a.css\"  type=\"text/css\" />" \
+                     "</head><body><h4>あいう</h4></body></html>"
+#define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
+                       "<html><head></head><body><div><div style=\"font-size:x-small;text-align:right;\">あいう</div></div></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_get049;
+  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_jxhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
+  ret = chxj_rencoding(&r, ret, &destlen);
+  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
+}
+char *test_chxj_serf_get050(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"
+                     "a:visited { display:none }\n"
+                     "h4      { text-align: center }\n";
+  *len = strlen(css);
+  call_check = 1;
+  return css;
+}
+void test_jxhtml_h4_tag_with_css_002()
+{
+#define  TEST_STRING "<html><head><link rel=\"stylesheet\" href=\"http://localhost/a.css\"  type=\"text/css\" />" \
+                     "</head><body><h4>あいう</h4></body></html>"
+#define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
+                       "<html><head></head><body><div><div style=\"font-size:x-small;text-align:center;\">あいう</div></div></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_get050;
+  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_jxhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
+  ret = chxj_rencoding(&r, ret, &destlen);
+  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
+}
+char *test_chxj_serf_get051(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"
+                     "a:visited { display:none }\n"
+                     "h4      { text-align: right }\n";
+  *len = strlen(css);
+  call_check = 1;
+  return css;
+}
+void test_jxhtml_h4_tag_with_css_003()
+{
+#define  TEST_STRING "<html><head><link rel=\"stylesheet\" href=\"http://localhost/a.css\"  type=\"text/css\" />" \
+                     "</head><body><h4>あいう</h4></body></html>"
+#define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
+                       "<html><head></head><body><div><div style=\"font-size:x-small;text-align:right;\">あいう</div></div></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_get051;
+  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_jxhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
+  ret = chxj_rencoding(&r, ret, &destlen);
+  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_jxhtml_h4_tag_with_css_004()
+{
+#define  TEST_STRING "<html><head>" \
+                     "</head><body><h4 style=\"text-align: left\">あいう</h4></body></html>"
+#define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
+                       "<html><head></head><body><div><div style=\"font-size:x-small;text-align:left;\">あいう</div></div></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_get051;
+  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_jxhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
+  ret = chxj_rencoding(&r, ret, &destlen);
+  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
+}
+void test_jxhtml_h4_tag_with_css_005()
+{
+#define  TEST_STRING "<html><head>" \
+                     "</head><body><h4 style=\"text-align: center\">あいう</h4></body></html>"
+#define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
+                       "<html><head></head><body><div><div style=\"font-size:x-small;text-align:center;\">あいう</div></div></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_get051;
+  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_jxhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
+  ret = chxj_rencoding(&r, ret, &destlen);
+  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
+}
+void test_jxhtml_h4_tag_with_css_006()
+{
+#define  TEST_STRING "<html><head>" \
+                     "</head><body><h4 style=\"text-align: right\">あいう</h4></body></html>"
+#define  RESULT_STRING "<?xml version='1.0' encoding='Shift_JIS' ?><!DOCTYPE html PUBLIC \"-//J-PHONE//DTD XHTML Basic 1.0 Plus//EN\" \"html-basic10-plus.dtd\">" \
+                       "<html><head></head><body><div><div style=\"font-size:x-small;text-align:right;\">あいう</div></div></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_get051;
+  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_jxhtml(&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);
-- 
2.11.0