* starts with 0.

  * Added start_html_flag.

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

diff --git a/configure.ac b/configure.ac
index e6c6029..39ae2ce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([mod_chxj],[0.13.1-rc],[konn@users.sourceforge.jp])
+AC_INIT([mod_chxj],[0.13.0-rc],[konn@users.sourceforge.jp])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([src/mod_chxj.c])
 AC_CANONICAL_TARGET

diff --git a/include/chxj_xhtml_mobile_1_0.h b/include/chxj_xhtml_mobile_1_0.h
index 2f52547..56bd429 100644 (file)
--- a/include/chxj_xhtml_mobile_1_0.h
+++ b/include/chxj_xhtml_mobile_1_0.h
@@ -40,6 +40,8 @@ struct xhtml_t {
   cookie_t            *cookie;
   css_stylesheet_t    *style;
   css_prop_list_stack_t *css_prop_stack;
+
+  int                 start_html_flag;
 };
 
 typedef struct _xhtml_flags_t xhtml_flags_t;

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index 348415c..a7657ea 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -710,6 +710,7 @@ s_xhtml_1_0_start_html_tag(void *pdoc, Node *node)
     }
   }
   W_L(">");
+  xhtml->start_html_flag = 1;
   return xhtml->out;
 }
 
@@ -4990,7 +4991,9 @@ s_xhtml_1_0_newline_mark(void *pdoc, Node *UNUSED(node))
 {
   xhtml_t *xhtml = GET_XHTML(pdoc);
   Doc *doc = xhtml->doc;
-  W_NLCODE();
+  if (xhtml->start_html_flag) {
+    W_NLCODE();
+  }
   return xhtml->out;
 }