/*
- * Copyright (C) 2005-2009 Atsushi Konno All rights reserved.
+ * Copyright (C) 2005-2011 Atsushi Konno All rights reserved.
* Copyright (C) 2005 QSDN,Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
#include "chxj_qr_code.h"
#include "chxj_encoding.h"
#include "chxj_header_inf.h"
+#include "chxj_conv_z2h.h"
#define GET_CHTML40(X) ((chtml40_t *)(X))
#undef W_L
static void s_init_chtml40(chtml40_t *chtml, Doc *doc, request_rec *r, device_table *spec);
-static int s_chtml40_search_emoji(chtml40_t *chtml, char *txt, char **rslt);
+static int s_chtml40_search_emoji(chtml40_t *chtml, char *txt, char **rslt, Node *node);
static css_prop_list_t *s_chtml40_push_and_get_now_style(void *pdoc, Node *node, const char *style_attr_value);
static css_prop_list_t *s_chtml40_nopush_and_get_now_style(void *pdoc, Node *node, const char *style_attr_value);
s_chtml40_chxjif_tag,
NULL,
},
+ /* tagCHXJRAW */
+ {
+ s_chtml40_chxjif_tag,
+ NULL,
+ },
/* tagNOBR */
{
NULL,
s_chtml40_newline_mark,
NULL,
},
+ /* tagObject */
+ {
+ NULL,
+ NULL,
+ },
+ /* tagParam */
+ {
+ NULL,
+ NULL,
+ },
+ /* tagCAPTION */
+ {
+ NULL,
+ NULL,
+ },
};
chtml40_t chtml40;
Doc doc;
- DBG(r, "start chxj_convert_chtml40()");
+ DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__);
/*--------------------------------------------------------------------------*/
/* If qrcode xml */
*dstlen = srclen;
dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen);
if (dst) {
- DBG(r,"i found qrcode xml");
- DBG(r, "end chxj_convert_chtml40()");
+ DBG(r,"REQ[%X] found qrcode xml",TO_ADDR(r));
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return dst;
}
- DBG(r,"not found qrcode xml");
/*--------------------------------------------------------------------------*/
/* The CHTML structure is initialized. */
chxj_dump_out("[src] CHTML -> CHTML4.0", dst, *dstlen);
#endif
- DBG(r, "end chxj_convert_chtml40()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return dst;
}
* EMOJI is specified.
* @param rslt [o] The pointer to the pointer that stores the result is
* specified.
+ * @param node [i] The current node to check whether tag is span/font for CHXJ_IMODE_EMOJI_COLOR_AUTO.
* @return When corresponding EMOJI exists, it returns it excluding 0.
*/
static int
-s_chtml40_search_emoji(chtml40_t *chtml40, char *txt, char **rslt)
+s_chtml40_search_emoji(chtml40_t *chtml40, char *txt, char **rslt, Node *node)
{
emoji_t *ee;
request_rec *r;
r = chtml40->doc->r;
if (!spec) {
- DBG(r,"spec is NULL");
+ DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r));
}
for (ee = chtml40->conf->emoji;
(*rslt)[0] = ee->imode->hex1byte & 0xff;
(*rslt)[1] = ee->imode->hex2byte & 0xff;
(*rslt)[2] = 0;
+
+ if(chtml40->conf->imode_emoji_color >= CHXJ_IMODE_EMOJI_COLOR_AUTO ){
+ if(ee->imode->color != NULL){
+ if(chtml40->conf->imode_emoji_color == CHXJ_IMODE_EMOJI_COLOR_AUTO && node != NULL ){
+ if(strcasecmp(node->parent->name, "span") == 0 ||
+ strcasecmp(node->parent->name, "font") == 0 ){
+ return strlen(ee->imode->string);
+ }
+ }
+ char *tmp = apr_pstrdup(r->pool,*rslt);
+ *rslt = apr_psprintf(r->pool,
+ "<font color=\"%s\">%s</font>",ee->imode->color,tmp);
+ }
+ }
return strlen(ee->imode->string);
}
chtml40 = &__chtml40;
doc = &__doc;
- DBG(r, "REQ[%X] start chxj_chtml40_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
+ DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__);
memset(doc, 0, sizeof(Doc));
memset(chtml40, 0, sizeof(chtml40_t));
char *out;
int rtn;
- rtn = s_chtml40_search_emoji(chtml40, (char *)&src[ii], &out);
+ rtn = s_chtml40_search_emoji(chtml40, (char *)&src[ii], &out, NULL);
if (rtn) {
W_V(out);
ii+=(rtn - 1);
}
chtml40->out = chxj_buffered_write_flush(chtml40->out, &doc->buf);
- DBG(r, "REQ[%X] end chxj_chtml40_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return chtml40->out;
}
W_L("\"");
}
if (attr_value) {
+ if (attr_type && (STRCASEEQ('s','S',"submit",attr_type) || STRCASEEQ('r','R',"reset",attr_type))) {
+ apr_size_t value_len = strlen(attr_value);
+ attr_value = chxj_conv_z2h(r, attr_value, &value_len, chtml40->entryp);
+ }
+
W_L(" value=\"");
W_V(chxj_add_slash_to_doublequote(doc->pool, attr_value));
W_L("\"");
value = chxj_encoding_parameter(r, value, 0);
value = chxj_add_cookie_parameter(r, value, chtml40->cookie);
value = chxj_add_cookie_no_update_parameter(r, value);
+ value = chxj_img_rewrite_parameter(r,chtml40->conf,value);
attr_src = value;
#else
value = chxj_img_conv(r,spec,value);
value = chxj_encoding_parameter(r, value, 0);
value = chxj_add_cookie_parameter(r, value, chtml40->cookie);
value = chxj_add_cookie_no_update_parameter(r, value);
+ value = chxj_img_rewrite_parameter(r,chtml40->conf,value);
attr_src = value;
#endif
}
char one_byte[2];
int ii;
int tdst_len;
+ apr_size_t z2h_input_len;
chtml40 = GET_CHTML40(pdoc);
doc = chtml40->doc;
for (ii=0; ii<qs_get_node_size(doc,child); ii++) {
char* out;
- int rtn = s_chtml40_search_emoji(chtml40, &textval[ii], &out);
+ int rtn = s_chtml40_search_emoji(chtml40, &textval[ii], &out, child);
if (rtn) {
tdst = qs_out_apr_pstrcat(r, tdst, out, &tdst_len);
ii+=(rtn - 1);
tdst = qs_out_apr_pstrcat(r, tdst, one_byte, &tdst_len);
}
}
+ z2h_input_len = strlen(tdst);
+ tdst = chxj_conv_z2h(r, tdst, &z2h_input_len, chtml40->entryp);
W_V(tdst);
return chtml40->out;
}
}
if (rel && href && type) {
- DBG(doc->r, "start load CSS. url:[%s]", href);
+ DBG(doc->r, "REQ[%X] start load CSS. url:[%s]", TO_ADDR(doc->r),href);
chtml40->style = chxj_css_parse_from_uri(doc->r, doc->pool, chtml40->style, href);
- DBG(doc->r, "end load CSS. url:[%s]", href);
+ DBG(doc->r, "REQ[%X] end load CSS. url:[%s]", TO_ADDR(doc->r),href);
}
return chtml40->out;
char *name = qs_get_node_name(doc, child);
if (STRCASEEQ('t','T',"text", name)) {
char *value = qs_get_node_value(doc, child);
- DBG(doc->r, "start load CSS. buf:[%s]", value);
+ DBG(doc->r, "REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value);
chtml40->style = chxj_css_parse_style_value(doc, chtml40->style, value);
- DBG(doc->r, "end load CSS. value:[%s]", value);
+ DBG(doc->r, "REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value);
}
}
return chtml40->out;