* Fixed bug.

    - It doesn't become a conversion target when setting as JXHTML.

  * Added name attribute of form tag.

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

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index 2f5bebc..47f7f72 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -1286,7 +1286,8 @@ s_add_copyright(MagickWand *magick_wand, request_rec *r, device_table *spec)
 
     DBG(r, "Add COPYRIGHT [%s]", conf->image_copyright);
 
-    if (spec->html_spec_type == CHXJ_SPEC_Jhtml) {
+    if (spec->html_spec_type == CHXJ_SPEC_Jhtml
+    ||  spec->html_spec_type == CHXJ_SPEC_Jxhtml) {
       apr_table_setn(r->headers_out, "x-jphone-copyright", "no-transfer");
       if (MagickCommentImage(magick_wand, 
                              apr_psprintf(r->pool, 

diff --git a/src/chxj_jxhtml.c b/src/chxj_jxhtml.c
index 3768dc4..2df147e 100644 (file)
--- a/src/chxj_jxhtml.c
+++ b/src/chxj_jxhtml.c
@@ -1439,6 +1439,11 @@ s_jxhtml_start_form_tag(void *pdoc, Node *node)
       /*----------------------------------------------------------------------*/
       /* ignore */
     }
+    else if (STRCASEEQ('n','N',"name",name)) {
+      W_L(" name=\"");
+      W_V(value);
+      W_L("\"");
+    }
   }
   W_L(">");
   return jxhtml->out;

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index 27de646..6d4625c 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -1340,6 +1340,11 @@ s_xhtml_1_0_start_form_tag(void *pdoc, Node *node)
     else if (STRCASEEQ('u','U',"utn",name)) {
       /* ignore */
     }
+    else if (STRCASEEQ('n','N',"name",name)) {
+      W_L(" name=\"");
+      W_V(value);
+      W_L("\"");
+    }
   }
   W_L(">");
   return xhtml->out;

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index 75fa452..7dc9a37 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -130,7 +130,7 @@ converter_t convert_routine[] = {
     .encoder  = chxj_encoding,
   },
   {
-    /* CHXJ_SPEC_Jxtml            */
+    /* CHXJ_SPEC_Jxhtml            */
     .converter = chxj_convert_jxhtml,
     .encoder  = chxj_encoding,
   },
@@ -182,6 +182,7 @@ chxj_headers_fixup(request_rec *r)
   case CHXJ_SPEC_XHtml_Mobile_1_0:
   case CHXJ_SPEC_Hdml:
   case CHXJ_SPEC_Jhtml:
+  case CHXJ_SPEC_Jxhtml:
     entryp = chxj_apply_convrule(r, dconf->convrules);
     if (! entryp) {
       DBG(r, "end chxj_headers_fixup() no pattern");
@@ -1305,6 +1306,7 @@ chxj_insert_filter(request_rec *r)
   case CHXJ_SPEC_XHtml_Mobile_1_0:
   case CHXJ_SPEC_Hdml:
   case CHXJ_SPEC_Jhtml:
+  case CHXJ_SPEC_Jxhtml:
     break;
 
   default: