* Changed Features.

    - Changed the target of Z2hOn option for SoftBank HTML.

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 99df87e..85888d9 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -25,6 +25,7 @@
 #include "chxj_header_inf.h"
 #include "chxj_jreserved_tag.h"
 #include "chxj_serf.h"
+#include "chxj_conv_z2h.h"
 
 
 #define GET_JHTML(X) ((jhtml_t *)(X))
@@ -1584,6 +1585,11 @@ s_jhtml_start_input_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (value && *value) {
+    if (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type)) {
+      apr_size_t value_len = strlen(value);
+      value = chxj_conv_z2h(r, value, &value_len, jhtml->entryp);
+    }
+
     W_L(" value=\"");
     W_V(chxj_add_slash_to_doublequote(doc->pool, value));
     W_L("\"");
@@ -2579,17 +2585,18 @@ s_jhtml_end_b_tag(void* pdoc, Node* UNUSED(child))
 }
 
 static char*
-s_jhtml_text_tag(void* pdoc, Node* child)
+s_jhtml_text_tag(void *pdoc, Node *child)
 {
-  jhtml_t*     jhtml;
-  Doc*         doc;
-  char*        textval;
-  char*        tmp;
-  char*        tdst;
+  jhtml_t      *jhtml;
+  Doc          *doc;
+  char         *textval;
+  char         *tmp;
+  char         *tdst;
   char         one_byte[2];
   int          ii;
   int          tdst_len;
-  request_rec* r;
+  request_rec  *r;
+  apr_size_t   z2h_input_len;
 
   jhtml = GET_JHTML(pdoc);
   doc   = jhtml->doc;
@@ -2641,6 +2648,9 @@ s_jhtml_text_tag(void* pdoc, Node* child)
       }
     }
   }
+  z2h_input_len = strlen(tdst);
+  tdst = chxj_conv_z2h(r, tdst, &z2h_input_len, jhtml->entryp);
+
   W_V(tdst);
   DBG(r, "end s_jhtml_text_tag()");
   return jhtml->out;