/*
- * Copyright (C) 2005-2008 Atsushi Konno All rights reserved.
+ * Copyright (C) 2005-2009 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_buffered_write.h"
+#include "chxj_header_inf.h"
#define GET_CHTML20(X) ((chtml20_t*)(X))
-#define W20_L(X) do { chtml20->out = BUFFERED_WRITE_LITERAL(chtml20->out, &doc->buf, (X)); } while(0)
-#define W20_V(X) do { chtml20->out = (X) ? BUFFERED_WRITE_VALUE(chtml20->out, &doc->buf, (X)) \
+#undef W_L
+#undef W_V
+#define W_L(X) do { chtml20->out = BUFFERED_WRITE_LITERAL(chtml20->out, &doc->buf, (X)); } while(0)
+#define W_V(X) do { chtml20->out = (X) ? BUFFERED_WRITE_VALUE(chtml20->out, &doc->buf, (X)) \
: BUFFERED_WRITE_LITERAL(chtml20->out, &doc->buf, ""); } while(0)
-
-static char* s_chtml20_start_html_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_html_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_meta_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_meta_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_textarea_tag(void* pdoc, Node* node);
-static char* s_chtml20_end_textarea_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_p_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_p_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_pre_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_pre_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_h1_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_h1_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_h2_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_h2_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_h3_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_h3_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_h4_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_h4_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_h5_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_h5_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_h6_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_h6_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_ul_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_ul_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_ol_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_ol_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_li_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_li_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_head_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_head_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_title_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_title_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_base_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_base_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_body_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_body_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_a_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_a_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_br_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_br_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_tr_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_tr_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_font_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_font_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_form_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_form_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_input_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_input_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_center_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_center_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_hr_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_hr_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_img_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_img_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_select_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_select_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_option_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_option_tag (void* pdoc, Node* node);
-static char* s_chtml20_start_div_tag (void* pdoc, Node* node);
-static char* s_chtml20_end_div_tag (void* pdoc, Node* node);
-
-static void s_init_chtml20(chtml20_t* chtml, Doc* doc, request_rec* r, device_table* spec);
-
-static int s_chtml20_search_emoji(chtml20_t* chtml, char* txt, char** rslt);
-
-static char* s_chtml20_chxjif_tag(void* pdoc, Node* node);
-static char* s_chtml20_text_tag(void* pdoc, Node* node);
+#undef W_NLCODE
+#define W_NLCODE() do { char *nlcode = TO_NLCODE(chtml20->conf); W_V(nlcode); } while (0)
+
+static char *s_chtml20_start_html_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_html_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_meta_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_meta_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_textarea_tag(void *pdoc, Node *node);
+static char *s_chtml20_end_textarea_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_p_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_p_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_pre_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_pre_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_h1_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_h1_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_h2_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_h2_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_h3_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_h3_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_h4_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_h4_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_h5_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_h5_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_h6_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_h6_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_ul_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_ul_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_ol_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_ol_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_li_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_li_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_head_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_head_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_title_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_title_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_base_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_base_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_body_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_body_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_a_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_a_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_br_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_br_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_tr_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_tr_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_font_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_font_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_form_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_form_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_input_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_input_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_center_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_center_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_hr_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_hr_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_img_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_img_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_select_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_select_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_option_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_option_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_div_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_div_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_blockquote_tag(void *pdoc, Node *node);
+static char *s_chtml20_end_blockquote_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_dir_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_dir_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_dl_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_dl_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_dt_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_dt_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_dd_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_dd_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_menu_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_menu_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_plaintext_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_plaintext_tag_inner (void *pdoc, Node *node);
+static char *s_chtml20_end_plaintext_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_blink_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_blink_tag (void *pdoc, Node *node);
+static char *s_chtml20_start_marquee_tag (void *pdoc, Node *node);
+static char *s_chtml20_end_marquee_tag (void *pdoc, Node *node);
+static char *s_chtml20_newline_mark (void *pdoc, Node *node);
+
+static void s_init_chtml20(chtml20_t *chtml, Doc *doc, request_rec *r, device_table *spec);
+
+static int s_chtml20_search_emoji(chtml20_t *chtml, char *txt, char **rslt);
+
+static char *s_chtml20_chxjif_tag(void *pdoc, Node *node);
+static char *s_chtml20_text_tag(void *pdoc, Node *node);
tag_handler chtml20_handler[] = {
},
/* tagDT */
{
- NULL,
- NULL,
+ s_chtml20_start_dt_tag,
+ s_chtml20_end_dt_tag,
},
/* tagLEGEND */
{
NULL,
NULL,
},
+ /* tagBLOCKQUOTE */
+ {
+ s_chtml20_start_blockquote_tag,
+ s_chtml20_end_blockquote_tag,
+ },
+ /* tagDIR */
+ {
+ s_chtml20_start_dir_tag,
+ s_chtml20_end_dir_tag,
+ },
+ /* tagDL */
+ {
+ s_chtml20_start_dl_tag,
+ s_chtml20_end_dl_tag,
+ },
+ /* tagDD */
+ {
+ s_chtml20_start_dd_tag,
+ s_chtml20_end_dd_tag,
+ },
+ /* tagMENU */
+ {
+ s_chtml20_start_menu_tag,
+ s_chtml20_end_menu_tag,
+ },
+ /* tagPLAINTEXT */
+ {
+ s_chtml20_start_plaintext_tag,
+ s_chtml20_end_plaintext_tag,
+ },
+ /* tagBLINK */
+ {
+ s_chtml20_start_blink_tag,
+ s_chtml20_end_blink_tag,
+ },
+ /* tagMAQUEE */
+ {
+ s_chtml20_start_marquee_tag,
+ s_chtml20_end_marquee_tag,
+ },
+ /* tagNLMARK */
+ {
+ s_chtml20_newline_mark,
+ NULL,
+ },
};
/**
* @param src [i] The character string before the converting is appointed.
* @return The character string after the converting is returned.
*/
-char*
-chxj_exchange_chtml20(
- request_rec* r,
- device_table* spec,
- const char* src,
- apr_size_t srclen,
- apr_size_t* dstlen,
- chxjconvrule_entry* entryp,
- cookie_t* cookie
+char *
+chxj_convert_chtml20(
+ request_rec *r,
+ device_table *spec,
+ const char *src,
+ apr_size_t srclen,
+ apr_size_t *dstlen,
+ chxjconvrule_entry *entryp,
+ cookie_t *cookie
)
{
- char *dst = NULL;
- char *ss;
+ char *dst = NULL;
+ char *ss;
chtml20_t chtml20;
Doc doc;
chtml20.entryp = entryp;
chtml20.cookie = cookie;
- ap_set_content_type(r, "text/html; charset=Windows-31J");
+ chxj_set_content_type(r, chxj_header_inf_set_content_type(r, "text/html; charset=Windows-31J"));
/*--------------------------------------------------------------------------*/
/* The character string of the input is analyzed. */
/*--------------------------------------------------------------------------*/
/* It converts it from CHTML to CHTML. */
/*--------------------------------------------------------------------------*/
- chxj_node_exchange(spec,r,(void*)&chtml20, &doc, qs_get_root(&doc), 0);
+ chxj_node_convert(spec,r,(void *)&chtml20, &doc, qs_get_root(&doc), 0);
chtml20.out = chxj_buffered_write_flush(chtml20.out, &doc.buf);
dst = apr_pstrdup(r->pool, chtml20.out);
chxj_buffered_write_terminate(&doc.buf);
* @param spec [i] The pointer to the device_table
*/
static void
-s_init_chtml20(chtml20_t* chtml20, Doc* doc, request_rec* r, device_table* spec)
+s_init_chtml20(chtml20_t *chtml20, Doc *doc, request_rec *r, device_table *spec)
{
memset(doc, 0, sizeof(Doc));
memset(chtml20, 0, sizeof(chtml20_t));
doc->r = r;
chtml20->doc = doc;
chtml20->spec = spec;
- chtml20->out = qs_alloc_zero_byte_string(r);
- chtml20->conf = ap_get_module_config(r->per_dir_config, &chxj_module);
+ chtml20->out = qs_alloc_zero_byte_string(r->pool);
+ chtml20->conf = chxj_get_module_config(r->per_dir_config, &chxj_module);
chtml20->doc->parse_mode = PARSE_MODE_CHTML;
}
* @return When corresponding EMOJI exists, it returns it excluding 0.
*/
static int
-s_chtml20_search_emoji(chtml20_t* chtml20, char* txt, char** rslt)
+s_chtml20_search_emoji(chtml20_t *chtml20, char *txt, char **rslt)
{
- emoji_t* ee;
- request_rec* r;
- device_table* spec;
+ emoji_t *ee;
+ request_rec *r;
+ device_table *spec;
int len;
spec = chtml20->spec;
return 0;
}
+char *
+chxj_chtml20_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len)
+{
+ apr_size_t ii;
+ Doc __doc;
+ Doc *doc;
+ chtml20_t __chtml20;
+ chtml20_t *chtml20;
+ char one_byte[2];
+ char two_byte[3];
+ apr_pool_t *pool;
+
+ chtml20 = &__chtml20;
+ doc = &__doc;
+
+ DBG(r, "REQ[%X] start chxj_chtml20_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
+ memset(doc, 0, sizeof(Doc));
+ memset(chtml20, 0, sizeof(chtml20_t));
+
+ doc->r = r;
+ chtml20->doc = doc;
+ chtml20->spec = spec;
+ chtml20->out = qs_alloc_zero_byte_string(r->pool);
+ chtml20->conf = chxj_get_module_config(r->per_dir_config, &chxj_module);
+ chtml20->doc->parse_mode = PARSE_MODE_CHTML;
+
+ apr_pool_create(&pool, r->pool);
+
+ chxj_buffered_write_init(pool, &doc->buf);
+
+ for (ii=0; ii<len; ii++) {
+ char *out;
+ int rtn;
+
+ rtn = s_chtml20_search_emoji(chtml20, (char *)&src[ii], &out);
+ if (rtn) {
+ W_V(out);
+ ii+=(rtn - 1);
+ continue;
+ }
+
+ if (is_sjis_kanji(src[ii])) {
+ two_byte[0] = src[ii+0];
+ two_byte[1] = src[ii+1];
+ two_byte[2] = 0;
+ W_V(two_byte);
+ ii++;
+ }
+ else {
+ one_byte[0] = src[ii+0];
+ one_byte[1] = 0;
+ W_V(one_byte);
+ }
+ }
+ chtml20->out = chxj_buffered_write_flush(chtml20->out, &doc->buf);
+
+ DBG(r, "REQ[%X] end chxj_chtml20_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
+ return chtml20->out;
+}
+
/**
* It is a handler who processes the HTML tag.
* @param node [i] The HTML tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_html_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_html_tag(void *pdoc, Node *UNUSED(node))
{
- Doc* doc;
- request_rec* r;
- chtml20_t* chtml20;
+ Doc *doc;
+ request_rec *r;
+ chtml20_t *chtml20;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
/*--------------------------------------------------------------------------*/
/* start HTML tag */
/*--------------------------------------------------------------------------*/
- W20_L("<html>\n");
+ W_L("<html>");
return chtml20->out;
}
* @param node [i] The HTML tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_html_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_html_tag(void *pdoc, Node *UNUSED(child))
{
- Doc* doc;
- request_rec* r;
- chtml20_t* chtml20;
+ Doc *doc;
+ request_rec *r;
+ chtml20_t *chtml20;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("</html>\n");
+ W_L("</html>");
return chtml20->out;
}
* @param node [i] The META tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_meta_tag(void* pdoc, Node* node)
+static char *
+s_chtml20_start_meta_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- Attr* attr;
- int content_type_flag;
- int refresh_flag;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
+ int content_type_flag;
+ int refresh_flag;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
content_type_flag = 0;
refresh_flag = 0;
- W20_L("<meta");
+ W_L("<meta");
/*--------------------------------------------------------------------------*/
/* Get Attributes */
/*--------------------------------------------------------------------------*/
for (attr = qs_get_attr(doc,node);
attr;
attr = qs_get_next_attr(doc,attr)) {
-
- char* name;
- char* value;
-
- name = qs_get_attr_name(doc,attr);
- value = qs_get_attr_value(doc,attr);
-
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
switch(*name) {
case 'h':
case 'H':
- if (strcasecmp(name, "http-equiv") == 0) {
+ if (strcasecmp(name, "http-equiv") == 0 && value && *value) {
/*----------------------------------------------------------------------*/
/* CHTML 2.0 */
/*----------------------------------------------------------------------*/
- W20_L(" http-equiv=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" http-equiv=\"");
+ W_V(value);
+ W_L("\"");
if (STRCASEEQ('c','C',"content-type", value)) {
content_type_flag = 1;
}
case 'c':
case 'C':
- if (strcasecmp(name, "content") == 0) {
+ if (strcasecmp(name, "content") == 0 && value && *value) {
if (content_type_flag) {
- W20_L(" ");
- W20_V(name);
- W20_L("=\"text/html; charset=Windows-31J\"");
+ W_L(" ");
+ W_V(name);
+ W_L("=\"");
+ W_V(chxj_header_inf_set_content_type(r, "text/html; charset=SHIFT_JIS"));
+ W_L("\"");
}
else if (refresh_flag) {
- char* buf = apr_pstrdup(r->pool, value);
- char* sec;
- char* url;
+ char *buf = apr_pstrdup(r->pool, value);
+ char *sec;
+ char *url;
url = strchr(buf, ';');
if (url) {
url++;
url = chxj_encoding_parameter(r, url);
url = chxj_add_cookie_parameter(r, url, chtml20->cookie);
- W20_L(" ");
- W20_V(name);
- W20_L("=\"");
- W20_V(sec);
- W20_L(";");
- W20_V(url);
- W20_L("\"");
+ W_L(" ");
+ W_V(name);
+ W_L("=\"");
+ W_V(sec);
+ W_L(";");
+ W_V(url);
+ W_L("\"");
}
}
else {
- W20_L(" ");
- W20_V(name);
- W20_L("=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" ");
+ W_V(name);
+ W_L("=\"");
+ W_V(value);
+ W_L("\"");
}
}
break;
break;
}
}
- W20_L(">");
+ W_L(">");
+
return chtml20->out;
}
* @param node [i] The META tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_meta_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_meta_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
-
- chtml20 = GET_CHTML20(pdoc);
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
return chtml20->out;
}
* @param node [i] The HEAD tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_head_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_head_tag(void *pdoc, Node *UNUSED(node))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
- r = doc->r;
- W20_L("<head>\r\n");
+ W_L("<head>");
+
return chtml20->out;
}
* @param node [i] The HEAD tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_head_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_head_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("</head>\r\n");
+ W_L("</head>");
+
return chtml20->out;
}
* @param node [i] The TITLE tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_title_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_title_tag(void *pdoc, Node *UNUSED(node))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<title>");
+ W_L("<title>");
+
return chtml20->out;
}
* @param node [i] The TITLE tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_title_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_title_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("</title>\r\n");
+ W_L("</title>");
+
return chtml20->out;
}
* @param node [i] The BASE tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_base_tag(void* pdoc, Node* node)
+static char *
+s_chtml20_start_base_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- Attr* attr;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<base");
+ W_L("<base");
/*--------------------------------------------------------------------------*/
/* Get Attributes */
/*--------------------------------------------------------------------------*/
for (attr = qs_get_attr(doc,node);
attr;
attr = qs_get_next_attr(doc,attr)) {
-
- char* name;
- char* value;
-
- name = qs_get_attr_name(doc,attr);
- value = qs_get_attr_value(doc,attr);
-
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
if (STRCASEEQ('h','H',"href", name)) {
- W20_L(" href=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" href=\"");
+ W_V(value);
+ W_L("\"");
}
}
- W20_L(" >\r\n");
+ W_L(">");
+
return chtml20->out;
}
* @param node [i] The BASE tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_base_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_base_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
* @param node [i] The BODY tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_body_tag(void* pdoc, Node* node)
+static char *
+s_chtml20_start_body_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- Attr* attr;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<body");
+ W_L("<body");
/*--------------------------------------------------------------------------*/
/* Get Attributes */
/*--------------------------------------------------------------------------*/
for (attr = qs_get_attr(doc,node);
attr;
attr = qs_get_next_attr(doc,attr)) {
- char* name;
- char* value;
-
- name = qs_get_attr_name(doc,attr);
- value = qs_get_attr_value(doc,attr);
-
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
switch(*name) {
case 'b':
case 'B':
- if (strcasecmp(name, "bgcolor") == 0) {
+ if (strcasecmp(name, "bgcolor") == 0 && value && *value != 0) {
/*----------------------------------------------------------------------*/
/* CHTML 2.0 */
/*----------------------------------------------------------------------*/
- W20_L(" bgcolor=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" bgcolor=\"");
+ W_V(value);
+ W_L("\"");
}
break;
case 't':
case 'T':
- if (strcasecmp(name, "text") == 0) {
+ if (strcasecmp(name, "text") == 0 && value && *value != 0) {
/*----------------------------------------------------------------------*/
/* CHTML 2.0 */
/*----------------------------------------------------------------------*/
- W20_L(" text=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" text=\"");
+ W_V(value);
+ W_L("\"");
}
break;
case 'l':
case 'L':
- if (strcasecmp(name, "link") == 0) {
+ if (strcasecmp(name, "link") == 0 && value && *value != 0) {
/*----------------------------------------------------------------------*/
/* CHTML 2.0 */
/*----------------------------------------------------------------------*/
- W20_L(" link=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" link=\"");
+ W_V(value);
+ W_L("\"");
}
break;
break;
}
}
- W20_L(">\r\n");
+ W_L(">");
+
return chtml20->out;
}
* @param node [i] The BODY tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_body_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_body_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("</body>\r\n");
+ W_L("</body>");
+
return chtml20->out;
}
* @param node [i] The A tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_a_tag(void* pdoc, Node* node)
+static char *
+s_chtml20_start_a_tag(void *pdoc, Node *node)
{
- Attr* attr;
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ Attr *attr;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
+ W_L("<a");
/*--------------------------------------------------------------------------*/
/* Get Attributes */
/*--------------------------------------------------------------------------*/
for (attr = qs_get_attr(doc,node);
attr;
attr = qs_get_next_attr(doc,attr)) {
-
- char* name;
- char* value;
-
- name = qs_get_attr_name(doc,attr);
- value = qs_get_attr_value(doc,attr);
-
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
switch(*name) {
case 'n':
case 'N':
/*--------------------------------------------------------------------*/
/* CHTML1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" name=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" name=\"");
+ W_V(value);
+ W_L("\"");
}
break;
/* CHTML1.0 */
/*--------------------------------------------------------------------*/
value = chxj_encoding_parameter(r, value);
- value = chxj_add_cookie_parameter(r, value, chtml20->cookie);
- W20_L(" href=\"");
- W20_V(value);
- W20_L("\"");
+ if (! chxj_starts_with(value, "mailto:") && ! chxj_starts_with(value, "tel:")) {
+ value = chxj_add_cookie_parameter(r, value, chtml20->cookie);
+ }
+ W_L(" href=\"");
+ W_V(value);
+ W_L("\"");
}
break;
/*--------------------------------------------------------------------*/
/* CHTML1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" accesskey=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" accesskey=\"");
+ W_V(value);
+ W_L("\"");
}
break;
/*--------------------------------------------------------------------*/
/* CHTML 2.0 */
/*--------------------------------------------------------------------*/
- W20_L(" cti=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" cti=\"");
+ W_V(value);
+ W_L("\"");
}
break;
break;
}
}
- W20_L(">");
+ W_L(">");
return chtml20->out;
}
* @param node [i] The A tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_a_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_a_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("</a>");
+ W_L("</a>");
+
return chtml20->out;
}
* @param node [i] The BR tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_br_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_br_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<br>\r\n");
+ W_L("<br");
+ /*--------------------------------------------------------------------------*/
+ /* Get Attributes */
+ /*--------------------------------------------------------------------------*/
+ for (attr = qs_get_attr(doc,node);
+ attr;
+ attr = qs_get_next_attr(doc,attr)) {
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
+ if (STRCASEEQ('c','C',"clear",name)) {
+ if (value && (STRCASEEQ('l','L',"left",value) || STRCASEEQ('r','R',"right",value) || STRCASEEQ('a','A',"all",value))) {
+ W_L(" clear=\"");
+ W_V(value);
+ W_L("\"");
+ }
+ }
+ }
+ W_L(">");
+
return chtml20->out;
}
* @param node [i] The BR tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_br_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_br_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
* @param node [i] The TR tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_tr_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_tr_tag(void *pdoc, Node *UNUSED(node))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
* @param node [i] The TR tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_tr_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_tr_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<br>\r\n");
+ W_L("<br>");
+
return chtml20->out;
}
* @param node [i] The FONT tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_font_tag(void* pdoc, Node* node)
+static char *
+s_chtml20_start_font_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- Attr* attr;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
+ char *color = NULL;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<font");
/*--------------------------------------------------------------------------*/
/* Get Attributes */
/*--------------------------------------------------------------------------*/
for (attr = qs_get_attr(doc,node);
- attr;
+ attr && color == NULL;
attr = qs_get_next_attr(doc,attr)) {
-
- char* name;
- char* value;
-
- name = qs_get_attr_name(doc,attr);
- value = qs_get_attr_value(doc,attr);
-
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
switch(*name) {
case 'c':
case 'C':
- if (strcasecmp(name, "color") == 0) {
- W20_L(" color=\"");
- W20_V(value);
- W20_L("\"");
+ if (strcasecmp(name, "color") == 0 && value && *value) {
+ color = apr_pstrdup(doc->buf.pool, value);
}
break;
break;
}
}
- W20_L(">");
+ if (color) {
+ W_L("<font color=\"");
+ W_V(color);
+ W_L("\">");
+ chtml20->font_flag++;
+ }
return chtml20->out;
}
* @param node [i] The FONT tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_font_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_font_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("</font>");
+ if (chtml20->font_flag) {
+ W_L("</font>");
+ chtml20->font_flag--;
+ }
return chtml20->out;
}
* @param node [i] The FORM tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_form_tag(void* pdoc, Node* node)
+static char *
+s_chtml20_start_form_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- Attr* attr;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
+ char *new_hidden_tag = NULL;
+ char *attr_method = NULL;
+ char *attr_action = NULL;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<form");
/*--------------------------------------------------------------------------*/
/* Get Attributes */
/*--------------------------------------------------------------------------*/
for (attr = qs_get_attr(doc,node);
attr;
attr = qs_get_next_attr(doc,attr)) {
-
- char* name;
- char* value;
-
+ char *name;
+ char *value;
name = qs_get_attr_name(doc,attr);
value = qs_get_attr_value(doc,attr);
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- value = chxj_encoding_parameter(r, value);
- value = chxj_add_cookie_parameter(r, value, chtml20->cookie);
-
- W20_L(" action=\"");
- W20_V(value);
- W20_L("\"");
+ attr_action = chxj_encoding_parameter(r, value);
+ attr_action= chxj_add_cookie_parameter(r, attr_action, chtml20->cookie);
}
break;
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" method=\"");
- W20_V(value);
- W20_L("\"");
+ attr_method = apr_pstrdup(doc->pool, value);
}
break;
break;
}
}
- W20_L(">");
+
+ int post_flag = (attr_method && strcasecmp(attr_method, "post") == 0) ? 1 : 0;
+
+ W_L("<form");
+ if (attr_action) {
+ char *q;
+ char *new_query_string = NULL;
+ q = strchr(attr_action, '?');
+ if (q) {
+ new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag, &new_query_string, CHXJ_TRUE, CHXJ_FALSE, chtml20->entryp);
+ if (new_hidden_tag || new_query_string) {
+ *q = 0;
+ }
+ }
+ W_L(" action=\"");
+ W_V(attr_action);
+ if (new_query_string) {
+ W_L("?");
+ W_V(new_query_string);
+ }
+ W_L("\"");
+ }
+ if (attr_method) {
+ W_L(" method=\"");
+ W_V(attr_method);
+ W_L("\"");
+ }
+ W_L(">");
+ if (new_hidden_tag) {
+ W_V(new_hidden_tag);
+ }
return chtml20->out;
}
* @param node [i] The FORM tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_form_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_form_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("</form>");
+ W_L("</form>");
+
return chtml20->out;
}
* @param node [i] The INPUT tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_input_tag(void* pdoc, Node* node)
+static char *
+s_chtml20_start_input_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- char* max_length = NULL;
- char* type = NULL;
- char* name = NULL;
- char* value = NULL;
- char* istyle = NULL;
- char* size = NULL;
- char* checked = NULL;
- char* accesskey = NULL;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ char *max_length = NULL;
+ char *type = NULL;
+ char *name = NULL;
+ char *value = NULL;
+ char *istyle = NULL;
+ char *size = NULL;
+ char *checked = NULL;
+ char *accesskey = NULL;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<input");
+ W_L("<input");
/*--------------------------------------------------------------------------*/
/* Get Attributes */
/*--------------------------------------------------------------------------*/
-
- type = qs_get_type_attr(doc, node, r);
- name = qs_get_name_attr(doc, node, r);
- value = qs_get_value_attr(doc,node,r);
- istyle = qs_get_istyle_attr(doc,node,r);
- max_length = qs_get_maxlength_attr(doc,node,r);
- checked = qs_get_checked_attr(doc,node,r);
- accesskey = qs_get_accesskey_attr(doc, node, r);
- size = qs_get_size_attr(doc, node, r);
+ type = qs_get_type_attr(doc, node, doc->buf.pool);
+ name = qs_get_name_attr(doc, node, doc->buf.pool);
+ value = qs_get_value_attr(doc,node,doc->buf.pool);
+ istyle = qs_get_istyle_attr(doc,node,doc->buf.pool);
+ max_length = qs_get_maxlength_attr(doc,node,doc->buf.pool);
+ checked = qs_get_checked_attr(doc,node,doc->buf.pool);
+ accesskey = qs_get_accesskey_attr(doc, node, doc->buf.pool);
+ size = qs_get_size_attr(doc, node, doc->buf.pool);
if (type) {
- W20_L(" type=\"");
- W20_V(type);
- W20_L("\" ");
+ type = qs_trim_string(doc->buf.pool, type);
+ if (type && (STRCASEEQ('t','T',"text", type) ||
+ STRCASEEQ('p','P',"password",type) ||
+ STRCASEEQ('c','C',"checkbox",type) ||
+ STRCASEEQ('r','R',"radio", type) ||
+ STRCASEEQ('h','H',"hidden", type) ||
+ STRCASEEQ('s','S',"submit", type) ||
+ STRCASEEQ('r','R',"reset", type))) {
+ W_L(" type=\"");
+ W_V(type);
+ W_L("\"");
+ }
}
-
- if (size) {
- W20_L(" size=\"");
- W20_V(size);
- W20_L("\" ");
+ if (size && *size) {
+ W_L(" size=\"");
+ W_V(size);
+ W_L("\"");
}
-
- if (name) {
- W20_L(" name=\"");
- W20_V(name);
- W20_L("\" ");
+ if (name && *name) {
+ W_L(" name=\"");
+ W_V(name);
+ W_L("\"");
}
-
- if (value) {
- W20_L(" value=\"");
- W20_V(value);
- W20_L("\" ");
+ if (value && *value) {
+ W_L(" value=\"");
+ W_V(chxj_add_slash_to_doublequote(doc->pool, value));
+ W_L("\"");
}
-
- if (accesskey) {
- W20_L(" accesskey=\"");
- W20_V(accesskey);
- W20_L("\" ");
+ if (accesskey && *accesskey) {
+ W_L(" accesskey=\"");
+ W_V(accesskey);
+ W_L("\"");
}
-
if (istyle) {
/*------------------------------------------------------------------------*/
/* CHTML 2.0 */
/*------------------------------------------------------------------------*/
- W20_L(" istyle=\"");
- W20_V(istyle);
- W20_L("\" ");
+ if (*istyle == '1' || *istyle == '2' || *istyle == '3' || *istyle == '4') {
+ W_L(" istyle=\"");
+ W_V(istyle);
+ W_L("\"");
+ }
}
-
/*--------------------------------------------------------------------------*/
/* The figure is default for the password. */
/*--------------------------------------------------------------------------*/
- if (max_length) {
- if (chxj_chk_numeric(max_length) != 0)
+ if (max_length && *max_length) {
+ if (chxj_chk_numeric(max_length) != 0) {
max_length = apr_psprintf(doc->buf.pool, "0");
- if (istyle != NULL && strcasecmp(istyle, "1") == 0) {
+ }
+ if (istyle && *istyle == '1') {
char *vv = apr_psprintf(doc->buf.pool, " maxlength=\"%d\"", chxj_atoi(max_length) * 2);
- W20_V(vv);
+ W_V(vv);
}
else {
char *vv = apr_psprintf(doc->buf.pool, " maxlength=\"%d\"", chxj_atoi(max_length));
- W20_V(vv);
+ W_V(vv);
}
}
-
if (checked) {
- W20_L(" checked");
+ W_L(" checked");
}
- W20_L(" >");
+ W_L(">");
+
return chtml20->out;
}
* @param node [i] The INPUT tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_input_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_input_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
* @param node [i] The CENTER tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_center_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_center_tag(void *pdoc, Node *UNUSED(node))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<center>");
+ W_L("<center>");
return chtml20->out;
}
* @param node [i] The CENTER tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_center_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_center_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("</center>");
+ W_L("</center>");
+
return chtml20->out;
}
* @param node [i] The UL tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_ul_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_ul_tag(void *pdoc, Node *UNUSED(node))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<ul>");
+ W_L("<ul>");
+
return chtml20->out;
}
* @param node [i] The UL tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_ul_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_ul_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("</ul>");
+ W_L("</ul>");
+
return chtml20->out;
}
* @param node [i] The OL tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_ol_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_ol_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<ol>");
+ W_L("<ol");
+ /*--------------------------------------------------------------------------*/
+ /* Get Attributes */
+ /*--------------------------------------------------------------------------*/
+ for (attr = qs_get_attr(doc,node);
+ attr;
+ attr = qs_get_next_attr(doc,attr)) {
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
+ if (STRCASEEQ('t','T',"type",name) && value && (*value == '1' || *value == 'a' || *value == 'A')) {
+ W_L(" type=\"");
+ W_V(value);
+ W_L("\"");
+ }
+ else if (STRCASEEQ('s','S',"start",name) && value && *value) {
+ W_L(" start=\"");
+ W_V(value);
+ W_L("\"");
+ }
+ }
+ W_L(">");
+
return chtml20->out;
}
* @param node [i] The OL tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_ol_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_ol_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("</ol>");
+ W_L("</ol>");
+
return chtml20->out;
}
* @param node [i] The LI tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_li_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_li_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<li>");
+ W_L("<li");
+ /*--------------------------------------------------------------------------*/
+ /* Get Attributes */
+ /*--------------------------------------------------------------------------*/
+ for (attr = qs_get_attr(doc,node);
+ attr;
+ attr = qs_get_next_attr(doc,attr)) {
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
+ if (STRCASEEQ('t','T',"type",name) && value && (*value == '1' || *value == 'a' || *value == 'A')) {
+ W_L(" type=\"");
+ W_V(value);
+ W_L("\"");
+ }
+ else if (STRCASEEQ('v','V',"value", name) && value && *value) {
+ W_L(" value=\"");
+ W_V(value);
+ W_L("\"");
+ }
+ }
+ W_L(">");
return chtml20->out;
}
* @param node [i] The LI tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_li_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_li_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
-
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
-
- W20_L("</li>");
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
return chtml20->out;
}
* @param node [i] The HR tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_hr_tag(void* pdoc, Node* node)
+static char *
+s_chtml20_start_hr_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- Attr* attr;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<hr ");
+ W_L("<hr");
for (attr = qs_get_attr(doc,node);
attr;
attr = qs_get_next_attr(doc,attr)) {
-
- char* name;
- char* value;
-
- name = qs_get_attr_name(doc,attr);
- value = qs_get_attr_value(doc,attr);
-
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
switch(*name) {
case 'a':
case 'A':
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" align=\"");
- W20_V(value);
- W20_L("\" ");
+ if (value && (STRCASEEQ('l','L',"left",value) || STRCASEEQ('r','R',"right",value) || STRCASEEQ('c','C',"center",value))) {
+ W_L(" align=\"");
+ W_V(value);
+ W_L("\"");
+ }
}
break;
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" size=\"");
- W20_V(value);
- W20_L("\" ");
+ if (value && value[0] != '\0') {
+ W_L(" size=\"");
+ W_V(value);
+ W_L("\"");
+ }
}
break;
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" width=\"");
- W20_V(value);
- W20_L("\" ");
+ if (value && value[0] != '\0') {
+ W_L(" width=\"");
+ W_V(value);
+ W_L("\"");
+ }
}
break;
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" noshade ");
+ W_L(" noshade");
}
break;
break;
}
}
- W20_L(" >");
+ W_L(">");
return chtml20->out;
}
* @param node [i] The HR tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_hr_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_hr_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
-
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
-
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
return chtml20->out;
}
* @param node [i] The IMG tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_img_tag(void* pdoc, Node* node)
+static char *
+s_chtml20_start_img_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- Attr* attr;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
#ifndef IMG_NOT_CONVERT_FILENAME
- device_table* spec;
+ device_table *spec;
#endif
chtml20 = GET_CHTML20(pdoc);
spec = chtml20->spec;
#endif
+ W_L("<img");
/*-------------------------------------------------------------------------*/
/* Get Attributes */
/*-------------------------------------------------------------------------*/
for (attr = qs_get_attr(doc,node);
attr;
attr = qs_get_next_attr(doc,attr)) {
-
- char* name;
- char* value;
-
- name = qs_get_attr_name(doc,attr);
- value = qs_get_attr_value(doc,attr);
-
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
switch(*name) {
case 's':
case 'S':
#ifdef IMG_NOT_CONVERT_FILENAME
value = chxj_encoding_parameter(r, value);
value = chxj_add_cookie_parameter(r, value, chtml20->cookie);
- if (value) {
- value = apr_psprintf(doc->buf.pool,
- "%s%c%s=true",
- value,
- (strchr(value, '?')) ? '&' : '?',
- CHXJ_COOKIE_NOUPDATE_PARAM);
- }
- W20_L(" src=\"");
- W20_V(value);
- W20_L("\"");
+ value = chxj_add_cookie_no_update_parameter(r, value);
+ W_L(" src=\"");
+ W_V(value);
+ W_L("\"");
#else
value = chxj_img_conv(r, spec, value);
value = chxj_encoding_parameter(r, value);
value = chxj_add_cookie_parameter(r, value, chtml20->cookie);
- if (value) {
- value = apr_psprintf(doc->buf.pool,
- "%s%c%s=true",
- value,
- (strchr(value, '?')) ? '&' : '?',
- CHXJ_COOKIE_NOUPDATE_PARAM);
- }
- W20_L(" src=\"");
- W20_V(value);
- W20_L("\"");
+ value = chxj_add_cookie_no_update_parameter(r, value);
+ W_L(" src=\"");
+ W_V(value);
+ W_L("\"");
#endif
}
break;
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" align=\"");
- W20_V(value);
- W20_L("\"");
+ if (value) {
+ if (STRCASEEQ('t','T',"top", value) ||
+ STRCASEEQ('m','M',"middle",value) ||
+ STRCASEEQ('b','B',"bottom",value) ||
+ STRCASEEQ('l','L',"left", value) ||
+ STRCASEEQ('r','R',"right", value)) {
+ W_L(" align=\"");
+ W_V(value);
+ W_L("\"");
+ }
+ else if (STRCASEEQ('c','C',"center", value)) {
+ W_L(" align=\"");
+ W_L("middle");
+ W_L("\"");
+ }
+ }
}
- else
- if (strcasecmp(name, "alt" ) == 0) {
+ else if (strcasecmp(name, "alt" ) == 0 && value && *value) {
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" alt=\"");
- W20_V(value);
- W20_L("\"");
- }
- else
- if (strcasecmp(name, "align" ) == 0) {
- /*--------------------------------------------------------------------*/
- /* CHTML 4.0 */
- /*--------------------------------------------------------------------*/
- /* ignore */
+ W_L(" alt=\"");
+ W_V(value);
+ W_L("\"");
}
break;
case 'w':
case 'W':
- if (strcasecmp(name, "width" ) == 0) {
+ if (strcasecmp(name, "width" ) == 0 && value && *value) {
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" width=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" width=\"");
+ W_V(value);
+ W_L("\"");
}
break;
case 'h':
case 'H':
- if (strcasecmp(name, "height") == 0) {
+ if (strcasecmp(name, "height") == 0 && value && *value) {
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" height=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" height=\"");
+ W_V(value);
+ W_L("\"");
}
- else
- if (strcasecmp(name, "hspace") == 0) {
+ else if (strcasecmp(name, "hspace") == 0 && value && *value) {
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" hspace=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" hspace=\"");
+ W_V(value);
+ W_L("\"");
}
break;
case 'v':
case 'V':
- if (strcasecmp(name, "vspace") == 0) {
+ if (strcasecmp(name, "vspace") == 0 && value && *value) {
/*--------------------------------------------------------------------*/
/* CHTML 1.0 */
/*--------------------------------------------------------------------*/
- W20_L(" vspace=\"");
- W20_V(value);
- W20_L("\"");
+ W_L(" vspace=\"");
+ W_V(value);
+ W_L("\"");
}
break;
break;
}
}
- W20_L(">");
+ W_L(">");
return chtml20->out;
}
* @param node [i] The IMG tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_img_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_img_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
-
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
return chtml20->out;
}
* @param node [i] The SELECT tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_select_tag(void* pdoc, Node* child)
+static char *
+s_chtml20_start_select_tag(void *pdoc, Node *child)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- Attr* attr;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- char* size = NULL;
- char* name = NULL;
+ char *size = NULL;
+ char *name = NULL;
+ char *multiple = NULL;
- W20_L("<select");
+ W_L("<select");
for (attr = qs_get_attr(doc,child);
attr;
attr = qs_get_next_attr(doc,attr)) {
-
- char* nm;
- char* val;
-
- nm = qs_get_attr_name(doc,attr);
- val = qs_get_attr_value(doc,attr);
-
+ char *nm = qs_get_attr_name(doc,attr);
+ char *val = qs_get_attr_value(doc,attr);
switch(*nm) {
case 's':
case 'S':
/*--------------------------------------------------------------------*/
/* CHTML 1.0 version 2.0 */
/*--------------------------------------------------------------------*/
- /* not support */
+ multiple = apr_pstrdup(doc->buf.pool, val);
}
break;
break;
}
}
-
- if (size) {
- W20_L(" size=\"");
- W20_V(size);
- W20_L("\"");
+ if (size && *size) {
+ W_L(" size=\"");
+ W_V(size);
+ W_L("\"");
}
-
- if (name) {
- W20_L(" name=\"");
- W20_V(name);
- W20_L("\"");
+ if (name && *name) {
+ W_L(" name=\"");
+ W_V(name);
+ W_L("\"");
}
-
- W20_L(">\r\n");
+ if (multiple) {
+ W_L(" multiple");
+ }
+ W_L(">");
return chtml20->out;
}
* @param node [i] The SELECT tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_select_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_select_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
- r = doc->r;
- W20_L("</select>\r\n");
+ W_L("</select>");
return chtml20->out;
}
* @param node [i] The OPTION tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_option_tag(void* pdoc, Node* child)
+static char *
+s_chtml20_start_option_tag(void *pdoc, Node *child)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- Attr* attr;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- char* selected = NULL;
- char* value = NULL;
+ char *selected = NULL;
+ char *value = NULL;
- W20_L("<option");
+ W_L("<option");
for (attr = qs_get_attr(doc,child);
attr;
attr = qs_get_next_attr(doc,attr)) {
-
- char* nm;
- char* val;
-
- nm = qs_get_attr_name(doc,attr);
- val = qs_get_attr_value(doc,attr);
-
+ char *nm = qs_get_attr_name(doc,attr);
+ char *val = qs_get_attr_value(doc,attr);
switch(*nm) {
case 's':
case 'S':
}
if (value) {
- W20_L(" value=\"");
- W20_V(value);
- W20_L("\"");
- }
- else {
- W20_L(" value=\"\"");
+ W_L(" value=\"");
+ W_V(value);
+ W_L("\"");
}
if (selected) {
- W20_L(" selected ");
+ W_L(" selected");
}
- W20_L(">");
+ W_L(">");
return chtml20->out;
}
* @param node [i] The OPTION tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_option_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_option_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
-
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
/* Don't close */
* @param node [i] The DIV tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_div_tag(void* pdoc, Node* child)
+static char *
+s_chtml20_start_div_tag(void *pdoc, Node *child)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- Attr* attr;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- char* align = NULL;
+ char *align = NULL;
+ W_L("<div");
for (attr = qs_get_attr(doc,child);
attr;
attr = qs_get_next_attr(doc,attr)) {
-
- char* nm;
- char* val;
-
- nm = qs_get_attr_name(doc,attr);
- val = qs_get_attr_value(doc,attr);
-
+ char *nm = qs_get_attr_name(doc,attr);
+ char *val = qs_get_attr_value(doc,attr);
if (STRCASEEQ('a','A', "align", nm)) {
/*----------------------------------------------------------------------*/
/* CHTML 1.0 (W3C version 3.2) */
/*----------------------------------------------------------------------*/
- align = apr_pstrdup(doc->buf.pool, val);
+ if (val && (STRCASEEQ('l','L',"left",val) || STRCASEEQ('r','R',"right",val) || STRCASEEQ('c','C',"center",val))) {
+ align = apr_pstrdup(doc->buf.pool, val);
+ }
}
}
-
if (align) {
- W20_L(" align=\"");
- W20_V(align);
- W20_L("\"");
+ W_L(" align=\"");
+ W_V(align);
+ W_L("\"");
}
-
- W20_L(">");
+ W_L(">");
return chtml20->out;
}
* @param node [i] The DIV tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_div_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_div_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
-
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
- W20_L("</div>\r\n");
+ W_L("</div>");
return chtml20->out;
}
* @param node [i] The H1 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_h1_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_h1_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<h1>\r\n");
+ W_L("<h1");
+ for (attr = qs_get_attr(doc,node);
+ attr;
+ attr = qs_get_next_attr(doc,attr)) {
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
+ if (STRCASEEQ('a','A',"align", name)) {
+ if (value && (STRCASEEQ('l','L',"left",value) || STRCASEEQ('r','R',"right",value) || STRCASEEQ('c','C',"center",value))) {
+ W_L(" align=\"");
+ W_V(value);
+ W_L("\"");
+ break;
+ }
+ }
+ }
+ W_L(">");
return chtml20->out;
}
* @param node [i] The H1 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_h1_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_h1_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
- r = doc->r;
- W20_L("</h1>\r\n");
+ W_L("</h1>");
return chtml20->out;
}
* @param node [i] The H2 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_h2_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_h2_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<h2>\r\n");
+ W_L("<h2");
+ for (attr = qs_get_attr(doc,node);
+ attr;
+ attr = qs_get_next_attr(doc,attr)) {
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
+ if (STRCASEEQ('a','A',"align", name)) {
+ if (value && (STRCASEEQ('l','L',"left",value) || STRCASEEQ('r','R',"right",value) || STRCASEEQ('c','C',"center",value))) {
+ W_L(" align=\"");
+ W_V(value);
+ W_L("\"");
+ break;
+ }
+ }
+ }
+ W_L(">");
return chtml20->out;
}
* @param node [i] The H2 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_h2_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_h2_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
+ W_L("</h2>");
- W20_L("</h2>\r\n");
return chtml20->out;
}
* @param node [i] The H3 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_h3_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_h3_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<h3>\r\n");
+ W_L("<h3");
+ for (attr = qs_get_attr(doc,node);
+ attr;
+ attr = qs_get_next_attr(doc,attr)) {
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
+ if (STRCASEEQ('a','A',"align", name)) {
+ if (value && (STRCASEEQ('l','L',"left",value) || STRCASEEQ('r','R',"right",value) || STRCASEEQ('c','C',"center",value))) {
+ W_L(" align=\"");
+ W_V(value);
+ W_L("\"");
+ break;
+ }
+ }
+ }
+ W_L(">");
return chtml20->out;
}
* @param node [i] The H3 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_h3_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_h3_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
-
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
- W20_L("</h3>\r\n");
+ W_L("</h3>");
return chtml20->out;
}
* @param node [i] The H4 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_h4_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_h4_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<h4>\r\n");
+ W_L("<h4");
+ for (attr = qs_get_attr(doc,node);
+ attr;
+ attr = qs_get_next_attr(doc,attr)) {
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
+ if (STRCASEEQ('a','A',"align", name)) {
+ if (value && (STRCASEEQ('l','L',"left",value) || STRCASEEQ('r','R',"right",value) || STRCASEEQ('c','C',"center",value))) {
+ W_L(" align=\"");
+ W_V(value);
+ W_L("\"");
+ break;
+ }
+ }
+ }
+ W_L(">");
return chtml20->out;
}
* @param node [i] The H4 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_h4_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_h4_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
-
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
- W20_L("</h4>\r\n");
+ W_L("</h4>");
return chtml20->out;
}
* @param node [i] The H5 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_h5_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_h5_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<h5>\r\n");
- return chtml20->out;
-}
-
+ W_L("<h5");
+ for (attr = qs_get_attr(doc,node);
+ attr;
+ attr = qs_get_next_attr(doc,attr)) {
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
+ if (STRCASEEQ('a','A',"align", name)) {
+ if (value && (STRCASEEQ('l','L',"left",value) || STRCASEEQ('r','R',"right",value) || STRCASEEQ('c','C',"center",value))) {
+ W_L(" align=\"");
+ W_V(value);
+ W_L("\"");
+ break;
+ }
+ }
+ }
+ W_L(">");
+ return chtml20->out;
+}
+
/**
* It is a handler who processes the H5 tag.
* @param node [i] The H5 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_h5_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_h5_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
-
- W20_L("</h5>\r\n");
+ W_L("</h5>");
return chtml20->out;
}
* @param node [i] The H6 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_h6_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_h6_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<h6>\r\n");
+ W_L("<h6");
+ for (attr = qs_get_attr(doc,node);
+ attr;
+ attr = qs_get_next_attr(doc,attr)) {
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
+ if (STRCASEEQ('a','A',"align", name)) {
+ if (value && (STRCASEEQ('l','L',"left",value) || STRCASEEQ('r','R',"right",value) || STRCASEEQ('c','C',"center",value))) {
+ W_L(" align=\"");
+ W_V(value);
+ W_L("\"");
+ break;
+ }
+ }
+ }
+ W_L(">");
return chtml20->out;
}
* @param node [i] The H6 tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_h6_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_h6_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
-
- W20_L("</h6>\r\n");
+ W_L("</h6>");
return chtml20->out;
}
* @param node [i] The PRE tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_pre_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_pre_tag(void *pdoc, Node *UNUSED(node))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
-
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
chtml20->pre_flag++;
+ W_L("<pre>");
return chtml20->out;
}
* @param node [i] The PRE tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_pre_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_pre_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
-
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
- W20_L("</pre>");
+ W_L("</pre>");
chtml20->pre_flag--;
return chtml20->out;
* @param node [i] The P tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_p_tag(void* pdoc, Node* UNUSED(node))
+static char *
+s_chtml20_start_p_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
+ char *align = NULL;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("<p>");
+ W_L("<p");
+ for (attr = qs_get_attr(doc,node);
+ attr;
+ attr = qs_get_next_attr(doc,attr)) {
+ char *nm = qs_get_attr_name(doc,attr);
+ char *val = qs_get_attr_value(doc,attr);
+ if (STRCASEEQ('a','A',"align", nm)) {
+ /*----------------------------------------------------------------------*/
+ /* CHTML 1.0 (W3C version 3.2) */
+ /*----------------------------------------------------------------------*/
+ if (val && (STRCASEEQ('l','L',"left",val) || STRCASEEQ('r','R',"right",val) || STRCASEEQ('c','C',"center",val))) {
+ align = apr_pstrdup(doc->buf.pool, val);
+ break;
+ }
+ }
+ }
+ if (align) {
+ W_L(" align=\"");
+ W_V(align);
+ W_L("\"");
+ }
+ W_L(">");
return chtml20->out;
}
* @param node [i] The P tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_p_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_p_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
- W20_L("</p>");
+ W_L("</p>");
return chtml20->out;
}
-static char*
-s_chtml20_chxjif_tag(void* pdoc, Node* node)
+static char *
+s_chtml20_chxjif_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- Node* child;
- request_rec* r;
+ chtml20_t *chtml20;
+ Doc *doc;
+ Node *child;
+ request_rec *r;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
child;
child = qs_get_next_node(doc, child)) {
- W20_V(child->otext);
+ W_V(child->otext);
s_chtml20_chxjif_tag(pdoc, child);
}
* @param node [i] The TEXTAREA tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_start_textarea_tag(void* pdoc, Node* node)
+static char *
+s_chtml20_start_textarea_tag(void *pdoc, Node *node)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- Attr* attr;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ Attr *attr;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
chtml20->textarea_flag++;
- W20_L("<textarea ");
+ W_L("<textarea");
for (attr = qs_get_attr(doc,node);
attr;
attr = qs_get_next_attr(doc,attr)) {
-
- char* name;
- char* value;
-
- name = qs_get_attr_name(doc,attr);
- value = qs_get_attr_value(doc,attr);
-
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
switch(*name) {
+ case 'a':
+ case 'A':
+ if (strcasecmp(name, "accesskey") == 0 && value && *value != 0) {
+ W_L(" accesskey=\"");
+ W_V(value);
+ W_L("\"");
+ }
+ break;
+
case 'n':
case 'N':
- if (strcasecmp(name, "name") == 0) {
- W20_L(" name=\"");
- W20_V(value);
- W20_L("\"");
+ if (strcasecmp(name, "name") == 0 && value && *value != 0) {
+ W_L(" name=\"");
+ W_V(value);
+ W_L("\"");
}
break;
case 'r':
case 'R':
- if (strcasecmp(name, "rows") == 0) {
- W20_L(" rows=\"");
- W20_V(value);
- W20_L("\"");
+ if (strcasecmp(name, "rows") == 0 && value && *value != 0) {
+ W_L(" rows=\"");
+ W_V(value);
+ W_L("\"");
}
break;
case 'c':
case 'C':
- if (strcasecmp(name, "cols") == 0) {
- W20_L(" cols=\"");
- W20_V(value);
- W20_L("\"");
+ if (strcasecmp(name, "cols") == 0 && value && *value != 0) {
+ W_L(" cols=\"");
+ W_V(value);
+ W_L("\"");
+ }
+ break;
+
+ case 'i':
+ case 'I':
+ if (strcasecmp(name, "istyle") == 0 && value && (*value == '1' || *value == '2' || *value == '3' || *value == '4')) {
+ W_L(" istyle=\"");
+ W_V(value);
+ W_L("\"");
}
break;
break;
}
}
- W20_L(">\r\n");
+ W_L(">");
return chtml20->out;
}
* @param node [i] The TEXTAREA tag node is specified.
* @return The conversion result is returned.
*/
-static char*
-s_chtml20_end_textarea_tag(void* pdoc, Node* UNUSED(child))
+static char *
+s_chtml20_end_textarea_tag(void *pdoc, Node *UNUSED(child))
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
- chtml20 = GET_CHTML20(pdoc);
- doc = chtml20->doc;
- r = doc->r;
-
- W20_L("</textarea>\r\n");
+ W_L("</textarea>");
chtml20->textarea_flag--;
return chtml20->out;
}
-static char*
-s_chtml20_text_tag(void* pdoc, Node* child)
+static char *
+s_chtml20_text_tag(void *pdoc, Node *child)
{
- chtml20_t* chtml20;
- Doc* doc;
- request_rec* r;
- char* textval;
- char* tmp;
- char* tdst;
- char one_byte[2];
- int ii;
- int tdst_len;
+ chtml20_t *chtml20;
+ Doc *doc;
+ request_rec *r;
+ char *textval;
+ char *tmp;
+ char *tdst;
+ char one_byte[2];
+ int ii;
+ int tdst_len;
chtml20 = GET_CHTML20(pdoc);
doc = chtml20->doc;
r = doc->r;
textval = qs_get_node_value(doc,child);
- textval = qs_trim_string(chtml20->doc->r, textval);
- if (strlen(textval) == 0)
+ if (strlen(textval) == 0) {
return chtml20->out;
+ }
tmp = apr_palloc(r->pool, qs_get_node_size(doc,child)+1);
memset(tmp, 0, qs_get_node_size(doc,child)+1);
- tdst = qs_alloc_zero_byte_string(r);
+ tdst = qs_alloc_zero_byte_string(doc->buf.pool);
memset(one_byte, 0, sizeof(one_byte));
tdst_len = 0;
for (ii=0; ii<qs_get_node_size(doc,child); ii++) {
- char* out;
+ char *out;
int rtn = s_chtml20_search_emoji(chtml20, &textval[ii], &out);
if (rtn != 0) {
tdst = qs_out_apr_pstrcat(r, tdst, out, &tdst_len);
tdst = qs_out_apr_pstrcat(r, tdst, one_byte, &tdst_len);
}
}
- W20_V(tdst);
+ W_V(tdst);
+ return chtml20->out;
+}
+
+
+/**
+ * It is a handler who processes the BLOCKQUOTE tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The BLOCKQUOTE tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_start_blockquote_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ W_L("<blockquote>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a handler who processes the BLOCKQUOTE tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The BLOCKQUOTE tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_end_blockquote_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ W_L("</blockquote>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a handler who processes the DIR tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The DIR tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_start_dir_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ W_L("<dir>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a handler who processes the DIR tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The DIR tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_end_dir_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+
+ W_L("</dir>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a handler who processes the DL tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The DL tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_start_dl_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ W_L("<dl>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a handler who processes the DL tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The DL tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_end_dl_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ W_L("</dl>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a handter who processes the DT tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The DT tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_start_dt_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ W_L("<dt>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a handter who processes the DT tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The DT tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_end_dt_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+
+ return chtml20->out;
+}
+
+
+/**
+ * It is a handder who processes the DD tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The DD tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_start_dd_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ W_L("<dd>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a handder who processes the DD tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The DD tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_end_dd_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+
+ return chtml20->out;
+}
+
+
+/**
+ * It is a hanmenuer who processes the MENU tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The MENU tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_start_menu_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+
+ W_L("<menu>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a hanmenuer who processes the MENU tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The MENU tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_end_menu_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+
+ W_L("</menu>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a hanplaintexter who processes the PLAINTEXT tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The PLAINTEXT tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_start_plaintext_tag(void *pdoc, Node *node)
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+
+ W_L("<plaintext>");
+ s_chtml20_start_plaintext_tag_inner(pdoc,node);
+ return chtml20->out;
+}
+
+static char *
+s_chtml20_start_plaintext_tag_inner(void *pdoc, Node *node)
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ Node *child;
+
+ for (child = qs_get_child_node(doc, node);
+ child;
+ child = qs_get_next_node(doc, child)) {
+ W_V(child->otext);
+ s_chtml20_start_plaintext_tag_inner(pdoc, child);
+ }
+ return chtml20->out;
+}
+
+
+/**
+ * It is a hanplaintexter who processes the PLAINTEXT tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The PLAINTEXT tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_end_plaintext_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ return chtml20->out;
+}
+
+/**
+ * It is a hanblinker who processes the BLINK tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The BLINK tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_start_blink_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ W_L("<blink>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a hanblinker who processes the BLINK tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The BLINK tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_end_blink_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ W_L("</blink>");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a hanmarqueeer who processes the MARQUEE tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The MARQUEE tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_start_marquee_tag(void *pdoc, Node *node)
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ Attr *attr;
+ W_L("<marquee");
+ /*--------------------------------------------------------------------------*/
+ /* Get Attributes */
+ /*--------------------------------------------------------------------------*/
+ for (attr = qs_get_attr(doc,node);
+ attr;
+ attr = qs_get_next_attr(doc,attr)) {
+ char *name = qs_get_attr_name(doc,attr);
+ char *value = qs_get_attr_value(doc,attr);
+ if (STRCASEEQ('d','D',"direction", name)) {
+ if (value && (STRCASEEQ('l','L',"left",value) || STRCASEEQ('r','R',"right",value))) {
+ W_L(" direction=\"");
+ W_V(value);
+ W_L("\"");
+ }
+ }
+ else if (STRCASEEQ('b','B',"behavior",name)) {
+ if (value && (STRCASEEQ('s','S',"scroll",value) || STRCASEEQ('s','S',"slide",value) || STRCASEEQ('a','A',"alternate",value))) {
+ W_L(" behavior=\"");
+ W_V(value);
+ W_L("\"");
+ }
+ }
+ else if (STRCASEEQ('l','L',"loop",name)) {
+ if (value && *value) {
+ W_L(" loop=\"");
+ W_V(value);
+ W_L("\"");
+ }
+ }
+ }
+ W_L(">");
+ return chtml20->out;
+}
+
+
+/**
+ * It is a hanmarqueeer who processes the MARQUEE tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The MARQUEE tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char *
+s_chtml20_end_marquee_tag(void *pdoc, Node *UNUSED(child))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ W_L("</marquee>");
+ return chtml20->out;
+}
+
+
+/**
+ * * It is handler who processes the New Line Code.
+ * */
+static char *
+s_chtml20_newline_mark(void *pdoc, Node *UNUSED(node))
+{
+ chtml20_t *chtml20 = GET_CHTML20(pdoc);
+ Doc *doc = chtml20->doc;
+ W_NLCODE();
return chtml20->out;
}
/*
OSDN Git Service
