From ff54701578ac0c25d5aa75a39f78b543d9b2c954 Mon Sep 17 00:00:00 2001
From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Sat, 5 Apr 2008 18:16:51 +0000
Subject: [PATCH]   * Added <h1 align> attribute to CHTML1.0 converter.   *
 Added test code for <h1> to CHTML1.0 converter.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_11_0@2013 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---
 src/chxj_chtml10.c                    |  30 +++-
 test/chxj_chtml10/test_chxj_chtml10.c | 272 ++++++++++++++++++++++++++++++++++
 2 files changed, 296 insertions(+), 6 deletions(-)

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index ee7874dd..7f071ba8 100644
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -832,17 +832,35 @@ s_chtml10_end_li_tag(void* pdoc, Node* UNUSED(child))
  * @return The conversion result is returned.
  */
 static char*
-s_chtml10_start_h1_tag(void* pdoc, Node* UNUSED(node)) 
+s_chtml10_start_h1_tag(void* pdoc, Node* node) 
 {
   Doc*          doc;
   request_rec*  r;
+  Attr*         attr;
   chtml10_t*    chtml10;
 
   chtml10 = GET_CHTML10(pdoc);
   doc     = chtml10->doc;
   r       = doc->r;
 
-  W10_L("<h1>");
+  W10_L("<h1");
+  for (attr = qs_get_attr(doc,node);
+       attr;
+       attr = qs_get_next_attr(doc,attr)) {
+    char* name;
+    char* value;
+    name  = qs_get_attr_name(doc,attr);
+    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))) {
+        W10_L(" align=\"");
+        W10_V(value);
+        W10_L("\"");
+        break;
+      }
+    }
+  }
+  W10_L(">");
 
   return chtml10->out;
 }
@@ -892,7 +910,7 @@ s_chtml10_start_h2_tag(void* pdoc, Node* UNUSED(node))
   doc     = chtml10->doc;
   r       = doc->r;
 
-  W10_L("<h2>\r\n");
+  W10_L("<h2>");
 
   return chtml10->out;
 }
@@ -917,7 +935,7 @@ s_chtml10_end_h2_tag(void* pdoc, Node* UNUSED(child))
   doc     = chtml10->doc;
   r       = doc->r;
 
-  W10_L("</h2>\r\n");
+  W10_L("</h2>");
 
   return chtml10->out;
 }
@@ -942,7 +960,7 @@ s_chtml10_start_h3_tag(void* pdoc, Node* UNUSED(node))
   doc     = chtml10->doc;
   r       = doc->r;
 
-  W10_L("<h3>\r\n");
+  W10_L("<h3>");
 
   return chtml10->out;
 }
@@ -967,7 +985,7 @@ s_chtml10_end_h3_tag(void* pdoc, Node* UNUSED(child))
   doc     = chtml10->doc;
   r       = doc->r;
 
-  W10_L("</h3>\r\n");
+  W10_L("</h3>");
 
   return chtml10->out;
 }
diff --git a/test/chxj_chtml10/test_chxj_chtml10.c b/test/chxj_chtml10/test_chxj_chtml10.c
index ae78bf35..1fb9b73d 100644
--- a/test/chxj_chtml10/test_chxj_chtml10.c
+++ b/test/chxj_chtml10/test_chxj_chtml10.c
@@ -116,6 +116,17 @@ void test_chtml10_h1_tag_001();
 void test_chtml10_h1_tag_002(); 
 void test_chtml10_h1_tag_003(); 
 void test_chtml10_h1_tag_004(); 
+void test_chtml10_h1_tag_005(); 
+
+void test_chtml10_h2_tag_001(); 
+void test_chtml10_h2_tag_002(); 
+void test_chtml10_h2_tag_003(); 
+void test_chtml10_h2_tag_004(); 
+
+void test_chtml10_h3_tag_001(); 
+void test_chtml10_h3_tag_002(); 
+void test_chtml10_h3_tag_003(); 
+void test_chtml10_h3_tag_004(); 
 
 int
 main()
@@ -192,6 +203,15 @@ main()
   CU_add_test(chtml10_suite, "test <h1> with value.",                             test_chtml10_h1_tag_002); 
   CU_add_test(chtml10_suite, "test <h1> with value(japanese).",                   test_chtml10_h1_tag_003); 
   CU_add_test(chtml10_suite, "test <h1> with value(japanese-hankaku).",           test_chtml10_h1_tag_004); 
+  CU_add_test(chtml10_suite, "test <h1> with align attribute(void).",             test_chtml10_h1_tag_005); 
+  CU_add_test(chtml10_suite, "test <h2>.",                                        test_chtml10_h2_tag_001); 
+  CU_add_test(chtml10_suite, "test <h2> with value.",                             test_chtml10_h2_tag_002); 
+  CU_add_test(chtml10_suite, "test <h2> with value(japanese).",                   test_chtml10_h2_tag_003); 
+  CU_add_test(chtml10_suite, "test <h2> with value(japanese-hankaku).",           test_chtml10_h2_tag_004); 
+  CU_add_test(chtml10_suite, "test <h3>.",                                        test_chtml10_h3_tag_001); 
+  CU_add_test(chtml10_suite, "test <h3> with value.",                             test_chtml10_h3_tag_002); 
+  CU_add_test(chtml10_suite, "test <h3> with value(japanese).",                   test_chtml10_h3_tag_003); 
+  CU_add_test(chtml10_suite, "test <h3> with value(japanese-hankaku).",           test_chtml10_h3_tag_004); 
   CU_basic_run_tests();
   CU_cleanup_registry();
 
@@ -2193,6 +2213,258 @@ void test_chtml10_h1_tag_004()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
+void test_chtml10_h1_tag_005() 
+{
+#define  TEST_STRING "<html><head></head><body><h1 align></h1></body></html>"
+#define  RESULT_STRING "<html><head></head><body><h1></h1></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_exchange_chtml10(&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);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
+void test_chtml10_h2_tag_001() 
+{
+#define  TEST_STRING "<html><head></head><body><h2></h2></body></html>"
+#define  RESULT_STRING "<html><head></head><body><h2></h2></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_exchange_chtml10(&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);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
+void test_chtml10_h2_tag_002() 
+{
+#define  TEST_STRING "<html><head></head><body><h2>abc</h2></body></html>"
+#define  RESULT_STRING "<html><head></head><body><h2>abc</h2></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_exchange_chtml10(&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);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
+void test_chtml10_h2_tag_003() 
+{
+#define  TEST_STRING "<html><head></head><body><h2>亀さん</h2></body></html>"
+#define  RESULT_STRING "<html><head></head><body><h2>亀さん</h2></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_exchange_chtml10(&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);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
+void test_chtml10_h2_tag_004() 
+{
+#define  TEST_STRING "<html><head></head><body><h2>ﾊﾝｶｸ</h2></body></html>"
+#define  RESULT_STRING "<html><head></head><body><h2>ﾊﾝｶｸ</h2></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_exchange_chtml10(&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);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
+void test_chtml10_h3_tag_001() 
+{
+#define  TEST_STRING "<html><head></head><body><h3></h3></body></html>"
+#define  RESULT_STRING "<html><head></head><body><h3></h3></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_exchange_chtml10(&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);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
+void test_chtml10_h3_tag_002() 
+{
+#define  TEST_STRING "<html><head></head><body><h3>abc</h3></body></html>"
+#define  RESULT_STRING "<html><head></head><body><h3>abc</h3></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_exchange_chtml10(&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);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
+void test_chtml10_h3_tag_003() 
+{
+#define  TEST_STRING "<html><head></head><body><h3>亀さん</h3></body></html>"
+#define  RESULT_STRING "<html><head></head><body><h3>亀さん</h3></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_exchange_chtml10(&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);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
+void test_chtml10_h3_tag_004() 
+{
+#define  TEST_STRING "<html><head></head><body><h3>ﾊﾝｶｸ</h3></body></html>"
+#define  RESULT_STRING "<html><head></head><body><h3>ﾊﾝｶｸ</h3></body></html>"
+  char  *ret;
+  char  *tmp;
+  device_table spec;
+  chxjconvrule_entry entry;
+  cookie_t cookie;
+  apr_size_t destlen;
+  APR_INIT;
+
+  COOKIE_INIT(cookie);
+
+  SPEC_INIT(spec);
+  destlen = sizeof(TEST_STRING)-1;
+
+  tmp = chxj_encoding(&r, TEST_STRING, &destlen);
+  ret = chxj_exchange_chtml10(&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);
+
+  APR_TERM;
+#undef TEST_STRING
+#undef RESULT_STRING
+}
 /*
  * vim:ts=2 et
  */
-- 
2.11.0