* Changed softbank input format.

    - old: -wap-input-format:*<ja:n> ...  to new: -wap-input-format:'*M'

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

diff --git a/include/chxj_hdml.h b/include/chxj_hdml.h
index 3d9f650..5de3d6c 100644 (file)
--- a/include/chxj_hdml.h
+++ b/include/chxj_hdml.h
@@ -119,8 +119,6 @@ extern char *qs_out_apr_pstrcat(
   char         *s, 
   int          *len);
 
-extern char *qs_conv_istyle_to_format(
-  request_rec  *r, 
-  char         *is);
+extern char *qs_conv_istyle_to_format(apr_pool_t *p, char *is);
 
 #endif

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 0bfa7ee..1ffa266 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -1493,7 +1493,7 @@ s_hdml_do_input_text_tag(hdml_t *hdml, Node *tag)
   is   = qs_get_istyle_attr     (doc, tag, r->pool);
   val  = qs_get_value_attr      (doc, tag, r->pool);
 
-  fmt  = qs_conv_istyle_to_format(r, is);
+  fmt  = qs_conv_istyle_to_format(r->pool, is);
   DBG(r,"qs_conv_istyle_to_format end");
         
   if (fmt) {
@@ -2020,7 +2020,7 @@ s_hdml_do_input_checkbox_tag(hdml_t *hdml, Node *tag)
  * @return The ISTYLE attribute converted into the HDML form is returned. 
  */
 char *
-qs_conv_istyle_to_format(request_rec *r, char *is)
+qs_conv_istyle_to_format(apr_pool_t *p, char *is)
 {
   char *fmt;
 
@@ -2029,19 +2029,19 @@ qs_conv_istyle_to_format(request_rec *r, char *is)
   
   switch(*is) {
   case '1':
-    fmt = apr_psprintf(r->pool, "M");
+    fmt = apr_psprintf(p, "M");
     break;
   case '2':
-    fmt = apr_psprintf(r->pool, "M");
+    fmt = apr_psprintf(p, "M");
     break;
   case '3':
-    fmt = apr_psprintf(r->pool, "m");
+    fmt = apr_psprintf(p, "m");
     break;
   case '4':
-    fmt = apr_psprintf(r->pool, "N");
+    fmt = apr_psprintf(p, "N");
     break;
   default:
-    return NULL;
+    return apr_pstrdup(p, "M");
   }
 
   return fmt;
@@ -3364,7 +3364,7 @@ s_hdml_start_textarea_tag(void *pdoc, Node *node)
   is   = qs_get_istyle_attr     (doc, node, r->pool);
   val  = s_hdml_inner_textarea_tag_get_value(hdml, node);
 
-  fmt  = qs_conv_istyle_to_format(r, is);
+  fmt  = qs_conv_istyle_to_format(r->pool, is);
   if (fmt) {
     if (mlen) {
       for (ii=0; ii<strlen(mlen); ii++) {

diff --git a/src/chxj_ixhtml10.c b/src/chxj_ixhtml10.c
index 671b9a8..dcf4c4d 100644 (file)
--- a/src/chxj_ixhtml10.c
+++ b/src/chxj_ixhtml10.c
@@ -131,7 +131,6 @@ static void  s_init_ixhtml10(ixhtml10_t *ixhtml10, Doc *doc, request_rec *r, dev
 
 static int   s_ixhtml10_search_emoji(ixhtml10_t *ixhtml10, char *txt, char **rslt);
 
-static char *s_ixhtml10_istyle_to_mode(apr_pool_t *p, const char *s);
 static char *s_ixhtml10_istyle_to_wap_input_format(apr_pool_t *p, const char *s);
 static css_prop_list_t *s_ixhtml10_nopush_and_get_now_style(void *pdoc, Node *node, const char *style_attr_value);
 static css_prop_list_t *s_ixhtml10_push_and_get_now_style(void *pdoc, Node *node, const char *style_attr_value);
@@ -3470,23 +3469,6 @@ s_ixhtml10_end_div_tag(void *pdoc, Node *UNUSED(child))
 
 
 static char *
-s_ixhtml10_istyle_to_mode(apr_pool_t *p, const char *s)
-{
-  if (s) {
-    switch (s[0]) {
-    case '1': return apr_psprintf(p, "hiragana");
-    case '2': return apr_psprintf(p, "hankakukana");
-    case '3': return apr_psprintf(p, "alphabet");
-    case '4': return apr_psprintf(p, "numeric");
-    default:
-      return apr_pstrdup(p, "");
-    }
-  }
-
-  return apr_pstrdup(p,"");
-}
-
-static char *
 s_ixhtml10_istyle_to_wap_input_format(apr_pool_t *p, const char *s)
 {
   if (s) {
@@ -5696,7 +5678,7 @@ s_ixhtml10_create_style_data(apr_pool_t *pool, const char *style_data)
  * @return The conversion result is returned.
  */
 static char *
-s_ixhtml10_start_nobr_tag(void *pdoc, Node *node)
+s_ixhtml10_start_nobr_tag(void *pdoc, Node *UNUSED(node))
 {
   ixhtml10_t *ixhtml10;
   Doc *doc;
@@ -5738,7 +5720,7 @@ s_ixhtml10_end_nobr_tag(void *pdoc, Node *UNUSED(node))
  * @return The conversion result is returned.
  */
 static char *
-s_ixhtml10_start_small_tag(void *pdoc, Node *node)
+s_ixhtml10_start_small_tag(void *pdoc, Node *UNUSED(node))
 {
   ixhtml10_t *ixhtml10;
   Doc *doc;

diff --git a/src/chxj_jxhtml.c b/src/chxj_jxhtml.c
index 33e9e51..781718e 100644 (file)
--- a/src/chxj_jxhtml.c
+++ b/src/chxj_jxhtml.c
@@ -126,7 +126,6 @@ static void  s_init_jxhtml(jxhtml_t *jxhtml, Doc *doc, request_rec *r, device_ta
 
 static int   s_jxhtml_search_emoji(jxhtml_t *jxhtml, char *txt, char **rslt);
 
-static char *s_jxhtml_istyle_to_wap_input_format(apr_pool_t *p, const char *s);
 static css_prop_list_t *s_jxhtml_nopush_and_get_now_style(void *pdoc, Node *node, const char *style_attr_value);
 static css_prop_list_t *s_jxhtml_push_and_get_now_style(void *pdoc, Node *node, const char *style_attr_value);
 
@@ -1844,11 +1843,11 @@ s_jxhtml_start_input_tag(void *pdoc, Node *node)
       W_L(" style=\"-wap-input-format:"*<ja:n>";\"");
     }
     else {
-      char *vv = s_jxhtml_istyle_to_wap_input_format(doc->buf.pool,attr_istyle);
+      char *vv = qs_conv_istyle_to_format(doc->buf.pool, attr_istyle);
       W_L(" style=\"");
-      W_L("-wap-input-format:");
+      W_L("-wap-input-format:'*");
       W_V(vv);
-      W_L(";");
+      W_L("';");
       W_L("\"");
     }
   }
@@ -1948,11 +1947,11 @@ s_jxhtml_start_input_tag(void *pdoc, Node *node)
       W_L(" style=\"-wap-input-format: "*<ja:n>";\"");
     }
     else {
-      char *vv = s_jxhtml_istyle_to_wap_input_format(doc->buf.pool,istyle);
+      char *vv = qs_conv_istyle_to_format(doc->buf.pool, istyle);
       W_L(" style=\"");
-      W_L("-wap-input-format: ");
+      W_L("-wap-input-format:'*");
       W_V(vv);
-      W_L(";");
+      W_L("';");
       W_L("\"");
     }
   }
@@ -3329,24 +3328,6 @@ s_jxhtml_end_div_tag(void *pdoc, Node *UNUSED(child))
 
 
 static char *
-s_jxhtml_istyle_to_wap_input_format(apr_pool_t *p, const char *s)
-{
-  if (s) {
-    switch (s[0]) {
-    case '1': return apr_psprintf(p, ""*<ja:h>"");
-    case '2': return apr_psprintf(p, ""*<ja:hk>"");
-    case '3': return apr_psprintf(p, ""*<ja:en>"");
-    case '4': return apr_psprintf(p, ""*<ja:n>"");
-    default: 
-      return apr_pstrdup(p, "");
-    }
-  }
-
-  return apr_pstrdup(p,"");
-}
-
-
-static char *
 s_jxhtml_chxjif_tag(void *pdoc, Node *node)
 {
   jxhtml_t *jxhtml;
@@ -3463,11 +3444,11 @@ s_jxhtml_start_textarea_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (attr_istyle) {
-    char *vv = s_jxhtml_istyle_to_wap_input_format(doc->buf.pool,attr_istyle);
+    char *vv = qs_conv_istyle_to_format(doc->buf.pool, attr_istyle);
     W_L(" style=\"");
-    W_L("-wap-input-format:");
+    W_L("-wap-input-format:'*");
     W_V(vv);
-    W_L(";");
+    W_L("';");
     W_L("\"");
   }
   W_L(">");

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index af04064..2718b82 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -1752,7 +1752,7 @@ s_xhtml_1_0_start_input_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (attr_istyle && *attr_istyle && (*attr_istyle == '1' || *attr_istyle == '2' || *attr_istyle == '3' || *attr_istyle == '4')) {
-    char *fmt = qs_conv_istyle_to_format(r,attr_istyle);
+    char *fmt = qs_conv_istyle_to_format(r->pool,attr_istyle);
     if (attr_max_length && *attr_max_length) {
       int ii;
       for (ii=0; (unsigned int)ii<strlen(attr_max_length); ii++) {
@@ -1851,7 +1851,7 @@ s_xhtml_1_0_start_input_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (istyle && *istyle && (*istyle == '1' || *istyle == '2' || *istyle == '3' || *istyle == '4')) {
-    char *fmt = qs_conv_istyle_to_format(r,istyle);
+    char *fmt = qs_conv_istyle_to_format(r->pool,istyle);
     if (max_length && *max_length) {
       int ii;
       for (ii=0; (unsigned int)ii<strlen(max_length); ii++) {
@@ -3818,7 +3818,7 @@ s_xhtml_1_0_start_textarea_tag(void *pdoc, Node *node)
     else if (STRCASEEQ('i','I',"istyle", name) && value && (*value == '1' || *value == '2' || *value == '3' || *value == '4')) {
       attr_istyle = value;
 #if 0
-      char *fmt = qs_conv_istyle_to_format(doc->r,value);
+      char *fmt = qs_conv_istyle_to_format(doc->r->pool,value);
       W_L(" FORMAT=\"*");
       W_V(fmt);
       W_L("\"");
@@ -3874,7 +3874,7 @@ s_xhtml_1_0_start_textarea_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (attr_istyle) {
-    char *fmt = qs_conv_istyle_to_format(doc->r, attr_istyle);
+    char *fmt = qs_conv_istyle_to_format(doc->r->pool, attr_istyle);
     W_L(" FORMAT=\"*");
     W_V(fmt);
     W_L("\"");