* Fixed Bug

    - wrap-input-format --> wap-input-format
    - When CrLf is contained in the style tag, it is not read correctly.

diff --git a/configure b/configure
index d6e7844..7f05de1 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for mod_chxj 0.13.2.
+# Generated by GNU Autoconf 2.67 for mod_chxj 0.13.3rc1.
 #
 # Report bugs to <konn@users.sourceforge.jp>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mod_chxj'
 PACKAGE_TARNAME='mod_chxj'
-PACKAGE_VERSION='0.13.2'
-PACKAGE_STRING='mod_chxj 0.13.2'
+PACKAGE_VERSION='0.13.3rc1'
+PACKAGE_STRING='mod_chxj 0.13.3rc1'
 PACKAGE_BUGREPORT='konn@users.sourceforge.jp'
 PACKAGE_URL=''
 
@@ -1447,7 +1447,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mod_chxj 0.13.2 to adapt to many kinds of systems.
+\`configure' configures mod_chxj 0.13.3rc1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1518,7 +1518,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_chxj 0.13.2:";;
+     short | recursive ) echo "Configuration of mod_chxj 0.13.3rc1:";;
    esac
   cat <<\_ACEOF
 
@@ -1633,7 +1633,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_chxj configure 0.13.2
+mod_chxj configure 0.13.3rc1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2002,7 +2002,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mod_chxj $as_me 0.13.2, which was
+It was created by mod_chxj $as_me 0.13.3rc1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2929,7 +2929,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=mod_chxj
- VERSION=0.13.2
+ VERSION=0.13.3rc1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12175,7 +12175,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mod_chxj $as_me 0.13.2, which was
+This file was extended by mod_chxj $as_me 0.13.3rc1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12241,7 +12241,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mod_chxj config.status 0.13.2
+mod_chxj config.status 0.13.3rc1
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index c690185..585142a 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.2],[konn@users.sourceforge.jp])
+AC_INIT([mod_chxj],[0.13.3rc1],[konn@users.sourceforge.jp])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([src/mod_chxj.c])
 AC_CANONICAL_TARGET

diff --git a/include/config.h b/include/config.h
index 7b7623b..f1d8b59 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -100,7 +100,7 @@
 #define PACKAGE_NAME "mod_chxj"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mod_chxj 0.13.2"
+#define PACKAGE_STRING "mod_chxj 0.13.3rc1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "mod_chxj"
@@ -109,13 +109,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.13.2"
+#define PACKAGE_VERSION "0.13.3rc1"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.13.2"
+#define VERSION "0.13.3rc1"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/src/chxj_ixhtml10.c b/src/chxj_ixhtml10.c
index 770762c..d110bf2 100644 (file)
--- a/src/chxj_ixhtml10.c
+++ b/src/chxj_ixhtml10.c
@@ -6633,6 +6633,8 @@ s_ixhtml10_style_tag(void *pdoc, Node *node)
   Doc           *doc;
   Attr          *attr;
   char          *type = NULL;
+  Node          *child   = NULL;
+  char          *style;
 
   ixhtml10 = GET_IXHTML10(pdoc);
   doc     = ixhtml10->doc;
@@ -6653,14 +6655,23 @@ s_ixhtml10_style_tag(void *pdoc, Node *node)
     }
   }
 
-  Node *child = qs_get_child_node(doc, node);
-  if (type && child) {
-    char *name  = qs_get_node_name(doc, child);
-    if (STRCASEEQ('t','T',"text", name)) {
-      char *value = qs_get_node_value(doc, child);
-      DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value);
-      ixhtml10->style = chxj_css_parse_style_value(doc, ixhtml10->style, value);
-      DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value);
+  if (type) {
+    style = "";
+    for (child = qs_get_child_node(doc, node);
+         child;
+         child = qs_get_next_node(doc, child)) {
+      char *name = qs_get_node_name(doc, child);
+      if (STRCASEEQ('t','T',"text", name)) {
+        char *value = qs_get_node_value(doc, child);
+        if (value && *value) {
+          style = apr_pstrcat(doc->r->pool, style, value, NULL);
+        }
+      }
+    }
+    if (strlen(style) > 0) {
+      DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),style);
+      ixhtml10->style = chxj_css_parse_style_value(doc, ixhtml10->style, style);
+      DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),style);
     }
   }
   return ixhtml10->out;

diff --git a/src/chxj_jxhtml.c b/src/chxj_jxhtml.c
index c82cd3e..3a797df 100644 (file)
--- a/src/chxj_jxhtml.c
+++ b/src/chxj_jxhtml.c
@@ -6625,6 +6625,8 @@ s_jxhtml_style_tag(void *pdoc, Node *node)
   Doc           *doc;
   Attr          *attr;
   char          *type = NULL;
+  Node          *child   = NULL;
+  char          *style;
 
   jxhtml = GET_JXHTML(pdoc);
   doc     = jxhtml->doc;
@@ -6645,14 +6647,23 @@ s_jxhtml_style_tag(void *pdoc, Node *node)
     }
   }
 
-  Node *child = qs_get_child_node(doc, node);
-  if (type && child) {
-    char *name  = qs_get_node_name(doc, child);
-    if (STRCASEEQ('t','T',"text", name)) {
-      char *value = qs_get_node_value(doc, child);
-      DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value);
-      jxhtml->style = chxj_css_parse_style_value(doc, jxhtml->style, value);
-      DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value);
+  if (type) {
+    style = "";
+    for (child = qs_get_child_node(doc, node);
+         child;
+         child = qs_get_next_node(doc, child)) {
+      char *name = qs_get_node_name(doc, child);
+     if (STRCASEEQ('t','T',"text", name)) {
+        char *value = qs_get_node_value(doc, child);
+        if (value && *value) {
+          style = apr_pstrcat(doc->r->pool, style, value, NULL);
+        }
+      }
+    }
+    if (strlen(style) > 0) {
+      DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),style);
+      jxhtml->style = chxj_css_parse_style_value(doc, jxhtml->style, style);
+      DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),style);
     }
   }
   return jxhtml->out;

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index 64ae102..285c353 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -6277,6 +6277,8 @@ s_xhtml_1_0_style_tag(void *pdoc, Node *node)
   Doc           *doc;
   Attr          *attr;
   char          *type = NULL;
+  Node          *child   = NULL;
+  char          *style;
 
   xhtml = GET_XHTML(pdoc);
   doc     = xhtml->doc;
@@ -6297,14 +6299,23 @@ s_xhtml_1_0_style_tag(void *pdoc, Node *node)
     }
   }
 
-  Node *child = qs_get_child_node(doc, node);
-  if (type && child) {
-    char *name  = qs_get_node_name(doc, child);
-    if (STRCASEEQ('t','T',"text", name)) {
-      char *value = qs_get_node_value(doc, child);
-      DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value);
-      xhtml->style = chxj_css_parse_style_value(doc, xhtml->style, value);
-      DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value);
+  if (type) {
+    style = "";
+    for (child = qs_get_child_node(doc, node);
+         child;
+         child = qs_get_next_node(doc, child)) {
+      char *name = qs_get_node_name(doc, child);
+      if (STRCASEEQ('t','T',"text", name)) {
+        char *value = qs_get_node_value(doc, child);
+        if (value && *value) {
+          style = apr_pstrcat(doc->r->pool, style, value, NULL);
+        }
+      }
+    }
+    if (strlen(style) > 0) {
+      DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),style);
+      xhtml->style = chxj_css_parse_style_value(doc, xhtml->style, style);
+      DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),style);
     }
   }
   return xhtml->out;

diff --git a/support/centos/mod-chxj.spec b/support/centos/mod-chxj.spec
index 38d7a57..50bf6c0 100644 (file)
--- a/support/centos/mod-chxj.spec
+++ b/support/centos/mod-chxj.spec
@@ -1,4 +1,4 @@
-%define version 0.13.2
+%define version 0.13.3rc1
 
 Summary: CHTML to HDML,XHTML,JHTML convert module for Apache HTTPD.
 Name:  mod_chxj

diff --git a/support/freebsd/Makefile b/support/freebsd/Makefile
index e7252fd..fbbd09d 100644 (file)
--- a/support/freebsd/Makefile
+++ b/support/freebsd/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=       mod_chxj
-PORTVERSION=    0.13.2
+PORTVERSION=    0.13.3rc1
 PORTREVISION=   1
 PORTEPOCH=      1
 CATEGORIES=     www
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE_JP:=modchxj/51413/}
 PKGNAMEPREFIX=  ${APACHE_PKGNAMEPREFIX}
-DISTNAME=       mod-chxj_0.13.2
+DISTNAME=       mod-chxj_0.13.3rc1
 EXTRACT_SUFX=   .src.tar.gz
 
 MAINTAINER=     konno@qsdn.co.jp