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
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) {
* @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;
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;
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++) {
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);
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) {
* @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;
* @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;
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);
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("\"");
}
}
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("\"");
}
}
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;
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(">");
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++) {
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++) {
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("\"");
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("\"");