* Added #undef W_NLCODE

  * set NLTYPE_NONE to test code.

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

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index e476ae5..38c3816 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -24,10 +24,13 @@
 #include "chxj_buffered_write.h"
 
 #define GET_CHTML10(X) ((chtml10_t *)(X))
+#undef W_L
+#undef W_V
 #define W_L(X)          do { chtml10->out = BUFFERED_WRITE_LITERAL(chtml10->out, &doc->buf, (X)); } while(0)
 #define W_V(X)          do { chtml10->out = (X) ? BUFFERED_WRITE_VALUE(chtml10->out, &doc->buf, (X))  \
                                                   : BUFFERED_WRITE_LITERAL(chtml10->out, &doc->buf, ""); } while(0)
 
+#undef W_NLCODE
 #define W_NLCODE()     do { char *nlcode = TO_NLCODE(chtml10->conf); W_V(nlcode); } while (0)
 
 static char *s_chtml10_start_html_tag     (void *pdoc, Node *node);

diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c
index c546bd6..fe94442 100644 (file)
--- a/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@ -30,6 +30,7 @@
 #define W_L(X)          do { chtml20->out = BUFFERED_WRITE_LITERAL(chtml20->out, &doc->buf, (X)); } while(0)
 #define W_V(X)          do { chtml20->out = (X) ? BUFFERED_WRITE_VALUE(chtml20->out, &doc->buf, (X))  \
                                                   : BUFFERED_WRITE_LITERAL(chtml20->out, &doc->buf, ""); } while(0)
+#undef W_NLCODE
 #define W_NLCODE()     do { char *nlcode = TO_NLCODE(chtml20->conf); W_V(nlcode); } while (0)
 
 static char *s_chtml20_start_html_tag    (void *pdoc, Node *node);

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 4599f12..41c09e6 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -29,6 +29,7 @@
 #define W_L(X)          do { chtml30->out = BUFFERED_WRITE_LITERAL(chtml30->out, &doc->buf, (X)); } while(0)
 #define W_V(X)          do { chtml30->out = (X) ? BUFFERED_WRITE_VALUE(chtml30->out, &doc->buf, (X))  \
                                                 : BUFFERED_WRITE_LITERAL(chtml30->out, &doc->buf, ""); } while(0)
+#undef W_NLCODE
 #define W_NLCODE()     do { char *nlcode = TO_NLCODE(chtml30->conf); W_V(nlcode); } while (0)
 
 static char *s_chtml30_start_html_tag     (void *pdoc, Node *node);

diff --git a/src/chxj_chtml40.c b/src/chxj_chtml40.c
index 1c77deb..4b8fe7d 100644 (file)
--- a/src/chxj_chtml40.c
+++ b/src/chxj_chtml40.c
@@ -29,6 +29,7 @@
 #define W_L(X)          do { chtml40->out = BUFFERED_WRITE_LITERAL(chtml40->out, &doc->buf, (X)); } while(0)
 #define W_V(X)          do { chtml40->out = (X) ? BUFFERED_WRITE_VALUE(chtml40->out, &doc->buf, (X))  \
                                                 : BUFFERED_WRITE_LITERAL(chtml40->out, &doc->buf, ""); } while(0)
+#undef W_NLCODE
 #define W_NLCODE()     do { char *nlcode = TO_NLCODE(chtml40->conf); W_V(nlcode); } while (0)
 
 static char *s_chtml40_start_html_tag     (void *pdoc, Node *node);

diff --git a/src/chxj_chtml50.c b/src/chxj_chtml50.c
index 1480dd2..41d3057 100644 (file)
--- a/src/chxj_chtml50.c
+++ b/src/chxj_chtml50.c
@@ -29,6 +29,7 @@
 #define W_L(X)          do { chtml50->out = BUFFERED_WRITE_LITERAL(chtml50->out, &doc->buf, (X)); } while(0)
 #define W_V(X)          do { chtml50->out = (X) ? BUFFERED_WRITE_VALUE(chtml50->out, &doc->buf, (X))  \
                                                 : BUFFERED_WRITE_LITERAL(chtml50->out, &doc->buf, ""); } while(0)
+#undef W_NLCODE
 #define W_NLCODE()     do { char *nlcode = TO_NLCODE(chtml50->conf); W_V(nlcode); } while (0)
 
 static char *s_chtml50_start_html_tag     (void *pdoc, Node *node);

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 55806ed..7281606 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -30,6 +30,7 @@
 #define W_L(X)          do { jhtml->out = BUFFERED_WRITE_LITERAL(jhtml->out, &doc->buf, (X)); } while(0)
 #define W_V(X)          do { jhtml->out = (X) ? BUFFERED_WRITE_VALUE(jhtml->out, &doc->buf, (X))  \
                                               : BUFFERED_WRITE_LITERAL(jhtml->out, &doc->buf, ""); } while(0)
+#undef W_NLCODE
 #define W_NLCODE()     do { char *nlcode = TO_NLCODE(jhtml->conf); W_V(nlcode); } while (0)
 
 static char *s_jhtml_start_html_tag     (void *pdoc, Node *node);

diff --git a/src/chxj_jxhtml.c b/src/chxj_jxhtml.c
index 2ca741b..a14c4ea 100644 (file)
--- a/src/chxj_jxhtml.c
+++ b/src/chxj_jxhtml.c
@@ -30,6 +30,7 @@
 #define W_L(X)          do { jxhtml->out = BUFFERED_WRITE_LITERAL(jxhtml->out, &doc->buf, (X)); } while(0)
 #define W_V(X)          do { jxhtml->out = (X) ? BUFFERED_WRITE_VALUE(jxhtml->out, &doc->buf, (X))  \
                                                : BUFFERED_WRITE_LITERAL(jxhtml->out, &doc->buf, ""); } while(0)
+#undef W_NLCODE
 #define W_NLCODE()     do { char *nlcode = TO_NLCODE(jxhtml->conf); W_V(nlcode); } while (0)
 
 static char *s_jxhtml_start_html_tag     (void *pdoc, Node *node);

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index 81e277d..caa0caf 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -30,6 +30,7 @@
 #define W_L(X)          do { xhtml->out = BUFFERED_WRITE_LITERAL(xhtml->out, &doc->buf, (X)); } while(0)
 #define W_V(X)          do { xhtml->out = (X) ? BUFFERED_WRITE_VALUE(xhtml->out, &doc->buf, (X))  \
                                                : BUFFERED_WRITE_LITERAL(xhtml->out, &doc->buf, ""); } while(0)
+#undef W_NLCODE
 #define W_NLCODE()     do { char *nlcode = TO_NLCODE(xhtml->conf); W_V(nlcode); } while (0)
 
 static char *s_xhtml_1_0_start_html_tag   (void *pdoc, Node *node);

diff --git a/test/chxj_chtml10/test_chxj_chtml10.c b/test/chxj_chtml10/test_chxj_chtml10.c
index 48b1d55..d70b715 100644 (file)
--- a/test/chxj_chtml10/test_chxj_chtml10.c
+++ b/test/chxj_chtml10/test_chxj_chtml10.c
@@ -842,6 +842,7 @@ void * test_get_module_config(const ap_conf_vector_t *cv, const module *m)
 {
   static mod_chxj_config cfg;
   memset(&cfg, 0, sizeof(mod_chxj_config));
+  cfg.new_line_type = NLTYPE_NONE;
   return &cfg;
 }
 

diff --git a/test/chxj_chtml20/test_chxj_chtml20.c b/test/chxj_chtml20/test_chxj_chtml20.c
index 9b4f700..52c8a37 100644 (file)
--- a/test/chxj_chtml20/test_chxj_chtml20.c
+++ b/test/chxj_chtml20/test_chxj_chtml20.c
@@ -966,6 +966,7 @@ void * test_get_module_config(const ap_conf_vector_t *cv, const module *m)
 {
   static mod_chxj_config cfg;
   memset(&cfg, 0, sizeof(mod_chxj_config));
+  cfg.new_line_type = NLTYPE_NONE;
   return &cfg;
 }
 

diff --git a/test/chxj_chtml30/test_chxj_chtml30.c b/test/chxj_chtml30/test_chxj_chtml30.c
index b2920a2..84eadd1 100644 (file)
--- a/test/chxj_chtml30/test_chxj_chtml30.c
+++ b/test/chxj_chtml30/test_chxj_chtml30.c
@@ -963,6 +963,7 @@ void * test_get_module_config(const ap_conf_vector_t *cv, const module *m)
 {
   static mod_chxj_config cfg;
   memset(&cfg, 0, sizeof(mod_chxj_config));
+  cfg.new_line_type = NLTYPE_NONE;
   return &cfg;
 }
 

diff --git a/test/chxj_chtml40/test_chxj_chtml40.c b/test/chxj_chtml40/test_chxj_chtml40.c
index 28d3cdf..f9594a2 100644 (file)
--- a/test/chxj_chtml40/test_chxj_chtml40.c
+++ b/test/chxj_chtml40/test_chxj_chtml40.c
@@ -983,6 +983,7 @@ void * test_get_module_config(const ap_conf_vector_t *cv, const module *m)
 {
   static mod_chxj_config cfg;
   memset(&cfg, 0, sizeof(mod_chxj_config));
+  cfg.new_line_type = NLTYPE_NONE;
   return &cfg;
 }
 

diff --git a/test/chxj_chtml50/test_chxj_chtml50.c b/test/chxj_chtml50/test_chxj_chtml50.c
index 8df5e9d..5c3f0a1 100644 (file)
--- a/test/chxj_chtml50/test_chxj_chtml50.c
+++ b/test/chxj_chtml50/test_chxj_chtml50.c
@@ -1011,6 +1011,7 @@ void * test_get_module_config(const ap_conf_vector_t *cv, const module *m)
 {
   static mod_chxj_config cfg;
   memset(&cfg, 0, sizeof(mod_chxj_config));
+  cfg.new_line_type = NLTYPE_NONE;
   return &cfg;
 }
 

diff --git a/test/chxj_jhtml/test_chxj_jhtml.c b/test/chxj_jhtml/test_chxj_jhtml.c
index 03861e7..3acbc8f 100644 (file)
--- a/test/chxj_jhtml/test_chxj_jhtml.c
+++ b/test/chxj_jhtml/test_chxj_jhtml.c
@@ -1079,6 +1079,7 @@ void * test_get_module_config(const ap_conf_vector_t *cv, const module *m)
 {
   static mod_chxj_config cfg;
   memset(&cfg, 0, sizeof(mod_chxj_config));
+  cfg.new_line_type = NLTYPE_NONE;
   return &cfg;
 }
 

diff --git a/test/chxj_jxhtml/test_chxj_jxhtml.c b/test/chxj_jxhtml/test_chxj_jxhtml.c
index a082351..d2eb352 100644 (file)
--- a/test/chxj_jxhtml/test_chxj_jxhtml.c
+++ b/test/chxj_jxhtml/test_chxj_jxhtml.c
@@ -1093,6 +1093,7 @@ void * test_get_module_config(const ap_conf_vector_t *cv, const module *m)
 {
   static mod_chxj_config cfg;
   memset(&cfg, 0, sizeof(mod_chxj_config));
+  cfg.new_line_type = NLTYPE_NONE;
   return &cfg;
 }
 
@@ -1194,7 +1195,7 @@ void test_jxhtml_002()
 void test_jxhtml_comment_tag_001() 
 {
 #define  TEST_STRING "<html><!--</html><body>--><head></head><body></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 version=\"1.0\"><head></head><body></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></body></html>"
   char  *ret;
   device_table spec;
   chxjconvrule_entry entry;
@@ -1876,7 +1877,7 @@ void test_jxhtml_blockquote_tag_004()
 void test_jxhtml_body_tag_001() 
 {
 #define  TEST_STRING "<body></body>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -1906,7 +1907,7 @@ void test_jxhtml_body_tag_001()
 void test_jxhtml_body_tag_002() 
 {
 #define  TEST_STRING   "<body bgcolor>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -1936,7 +1937,7 @@ void test_jxhtml_body_tag_002()
 void test_jxhtml_body_tag_003() 
 {
 #define  TEST_STRING "<body bgcolor=\"\"></body>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -1966,7 +1967,7 @@ void test_jxhtml_body_tag_003()
 void test_jxhtml_body_tag_004() 
 {
 #define  TEST_STRING "<body bgcolor=\"#ff0000\"></body>"
-#define  RESULT_STRING "<body bgcolor=\"#ff0000\"></body>"
+#define  RESULT_STRING "<body bgcolor=\"#ff0000\"><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -1996,7 +1997,7 @@ void test_jxhtml_body_tag_004()
 void test_jxhtml_body_tag_005() 
 {
 #define  TEST_STRING "<body text></body>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -2026,7 +2027,7 @@ void test_jxhtml_body_tag_005()
 void test_jxhtml_body_tag_006() 
 {
 #define  TEST_STRING "<body text=\"\"></body>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -2056,7 +2057,7 @@ void test_jxhtml_body_tag_006()
 void test_jxhtml_body_tag_007() 
 {
 #define  TEST_STRING "<body text=\"#ff0000\"></body>"
-#define  RESULT_STRING "<body text=\"#ff0000\"></body>"
+#define  RESULT_STRING "<body text=\"#ff0000\"><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -2086,7 +2087,7 @@ void test_jxhtml_body_tag_007()
 void test_jxhtml_body_tag_008() 
 {
 #define  TEST_STRING "<body link></body>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -2116,7 +2117,7 @@ void test_jxhtml_body_tag_008()
 void test_jxhtml_body_tag_009() 
 {
 #define  TEST_STRING "<body link=\"\"></body>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -2146,7 +2147,7 @@ void test_jxhtml_body_tag_009()
 void test_jxhtml_body_tag_010() 
 {
 #define  TEST_STRING   "<body link=\"#ff0000\"></body>"
-#define  RESULT_STRING "<body link=\"#ff0000\"></body>"
+#define  RESULT_STRING "<body link=\"#ff0000\"><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -2176,7 +2177,7 @@ void test_jxhtml_body_tag_010()
 void test_jxhtml_body_tag_011() 
 {
 #define  TEST_STRING   "<body vlink></body>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -2206,7 +2207,7 @@ void test_jxhtml_body_tag_011()
 void test_jxhtml_body_tag_012() 
 {
 #define  TEST_STRING   "<body vlink=\"\"></body>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -2236,7 +2237,7 @@ void test_jxhtml_body_tag_012()
 void test_jxhtml_body_tag_013() 
 {
 #define  TEST_STRING   "<body vlink=\"#ff0000\"></body>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -2267,7 +2268,7 @@ void test_jxhtml_body_tag_013()
 void test_jxhtml_body_tag_014() 
 {
 #define  TEST_STRING   "<body alink=\"#FF0000\"></body>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -2297,7 +2298,7 @@ void test_jxhtml_body_tag_014()
 void test_jxhtml_body_tag_015() 
 {
 #define  TEST_STRING "<body boyoyon=\"#FF0000\"></body>"
-#define  RESULT_STRING "<body></body>"
+#define  RESULT_STRING "<body><div></div></body>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -5918,7 +5919,7 @@ void test_jxhtml_hr_tag_018_2()
 void test_jxhtml_html_tag_001()
 {
 #define  TEST_STRING "<html><head></head><body></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 version=\"1.0\"><head></head><body></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></body></html>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -7964,7 +7965,7 @@ void test_jxhtml_input_tag_029()
 void test_jxhtml_input_tag_030() 
 {
 #define  TEST_STRING "<input checked>"
-#define  RESULT_STRING "<input checked />"
+#define  RESULT_STRING "<input checked=\"checked\" />"
   char  *ret;
   char  *tmp;
   device_table spec;