Merge branch 'branch_0.13.0' into branch_0.13.0-svn

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

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index 577e677..20c20e6 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -258,6 +258,7 @@ typedef enum {
   tagOPTION,
   tagDIV,
   tagCHXJIF,  
+  tagCHXJRAW,  
   tagNOBR,  
   tagSMALL,  
   tagSTYLE,  

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index d05adaa..6868360 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -321,6 +321,11 @@ tag_handler chtml10_handler[] = {
     s_chtml10_chxjif_tag,
     NULL,
   },
+  /* tagCHXJRAW */
+  {
+    s_chtml10_chxjif_tag,
+    NULL,
+  },
   /* tagNOBR */
   {
     NULL,

diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c
index 2d2135e..66394be 100644 (file)
--- a/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@ -377,6 +377,11 @@ tag_handler chtml20_handler[] = {
     s_chtml20_chxjif_tag,
     NULL,
   },
+  /* tagCHXJRAW */
+  {
+    s_chtml20_chxjif_tag,
+    NULL,
+  },
   /* tagNOBR */
   {
     NULL,

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 17aec3c..b657f19 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -376,6 +376,11 @@ tag_handler chtml30_handler[] = {
     s_chtml30_chxjif_tag,
     NULL,
   },
+  /* tagCHXJRAW */
+  {
+    s_chtml30_chxjif_tag,
+    NULL,
+  },
   /* tagNOBR */
   {
     NULL,

diff --git a/src/chxj_chtml40.c b/src/chxj_chtml40.c
index 035e39f..747280f 100644 (file)
--- a/src/chxj_chtml40.c
+++ b/src/chxj_chtml40.c
@@ -319,6 +319,11 @@ tag_handler chtml40_handler[] = {
     s_chtml40_chxjif_tag,
     NULL,
   },
+  /* tagCHXJRAW */
+  {
+    s_chtml40_chxjif_tag,
+    NULL,
+  },
   /* tagNOBR */
   {
     NULL,

diff --git a/src/chxj_chtml50.c b/src/chxj_chtml50.c
index e24ad9c..4b86d2b 100644 (file)
--- a/src/chxj_chtml50.c
+++ b/src/chxj_chtml50.c
@@ -299,6 +299,11 @@ tag_handler chtml50_handler[] = {
     s_chtml50_chxjif_tag,
     NULL,
   },
+  /* tagCHXJRAW */
+  {
+    s_chtml50_chxjif_tag,
+    NULL,
+  },
   /* tagNOBR */
   {
     NULL,

diff --git a/src/chxj_ixhtml10.c b/src/chxj_ixhtml10.c
index 401f043..4b56d8d 100644 (file)
--- a/src/chxj_ixhtml10.c
+++ b/src/chxj_ixhtml10.c
@@ -310,6 +310,11 @@ tag_handler ixhtml10_handler[] = {
     s_ixhtml10_chxjif_tag,
     NULL,
   },
+  /* tagCHXJRAW */
+  {
+    s_ixhtml10_chxjif_tag,
+    NULL,
+  },
   /* tagNOBR */
   {
     s_ixhtml10_start_nobr_tag,

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 83bb01e..4275378 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -308,6 +308,11 @@ tag_handler jhtml_handler[] = {
     s_jhtml_chxjif_tag,
     NULL,
   },
+  /* tagCHXJRAW */
+  {
+    s_jhtml_chxjif_tag,
+    NULL,
+  },
   /* tagNOBR */
   {
     NULL,

diff --git a/src/chxj_jxhtml.c b/src/chxj_jxhtml.c
index 3ade1f7..566f043 100644 (file)
--- a/src/chxj_jxhtml.c
+++ b/src/chxj_jxhtml.c
@@ -305,6 +305,11 @@ tag_handler jxhtml_handler[] = {
     s_jxhtml_chxjif_tag,
     NULL,
   },
+  /* tagCHXJRAW */
+  {
+    s_jxhtml_chxjif_tag,
+    NULL,
+  },
   /* tagNOBR */
   {
     NULL,

diff --git a/src/chxj_node_convert.c b/src/chxj_node_convert.c
index 24d31cf..16cec3e 100644 (file)
--- a/src/chxj_node_convert.c
+++ b/src/chxj_node_convert.c
@@ -808,6 +808,15 @@ chxj_node_convert(
           }
         }
       }
+      /*----------------------------------------------------------------------*/
+      /* <CHXJ:RAW>                                                           */
+      /*----------------------------------------------------------------------*/
+      else
+      if (strcasecmp(name, "chxj:raw") == 0) {
+        if (handlers[tagCHXJRAW].start_tag_handler) {
+           handlers[tagCHXJRAW].start_tag_handler(pdoc, child);
+        }
+      }
       else {
         chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index 1fb4055..cbb955d 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -302,6 +302,11 @@ tag_handler xhtml_handler[] = {
     s_xhtml_1_0_chxjif_tag,
     NULL,
   },
+  /* tagCHXJRAW */
+  {
+    s_xhtml_1_0_chxjif_tag,
+    NULL,
+  },
   /* tagNOBR */
   {
     NULL,

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index 8be061d..0237a37 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -3029,7 +3029,7 @@ static const command_rec cmds[] = {
     NULL,
     OR_ALL,
     "for CustomLog directive. mod_chxj's internal POST log environment name.(Default:chxj-post-log)"),
-  {NULL}
+  {NULL,{NULL},NULL,0,0,NULL},
 };
 
 

diff --git a/src/qs_parse_string.c b/src/qs_parse_string.c
index e1e9cec..2cb612c 100644 (file)
--- a/src/qs_parse_string.c
+++ b/src/qs_parse_string.c
@@ -230,7 +230,7 @@ qs_parse_string(Doc *doc, const char *src, int srclen)
         }
         else
         if (doc->parse_mode == PARSE_MODE_NO_PARSE) {
-          if (STRCASEEQ('c','C',"chxj:if",&node->name[1]) || STRCASEEQ('p','P',"plaintext",&node->name[1])) {
+          if (STRCASEEQ('c','C',"chxj:if",&node->name[1]) || STRCASEEQ('p','P',"plaintext",&node->name[1]) || STRCASEEQ('c','C',"chxj:raw",&node->name[1])) {
             if (doc->now_parent_node->parent != NULL) {
               doc->now_parent_node = doc->now_parent_node->parent;
               doc->parse_mode = PARSE_MODE_CHTML;
@@ -257,7 +257,7 @@ qs_parse_string(Doc *doc, const char *src, int srclen)
           continue;
       }
 
-      if (doc->parse_mode == PARSE_MODE_CHTML && STRCASEEQ('c','C',"chxj:if", node->name)) {
+      if (doc->parse_mode == PARSE_MODE_CHTML && (STRCASEEQ('c','C',"chxj:if", node->name) || STRCASEEQ('c','C',"chxj:raw",node->name))) {
         Attr *parse_attr;
         doc->parse_mode = PARSE_MODE_NO_PARSE;
         doc->now_parent_node = node;