* limitations under the License.
*/
#include "mod_chxj.h"
+#include "chxj_encoding.h"
#include "chxj_xhtml_mobile_1_0.h"
#include "chxj_hdml.h"
#include "chxj_dump.h"
#include "chxj_img_conv.h"
#include "chxj_qr_code.h"
-
-static char* s_xhtml_1_0_node_exchange (xhtml_t* xhtml, Node* node, int indent);
-static char* s_xhtml_1_0_start_html_tag (xhtml_t* xhtml, Node* child);
-static char* s_xhtml_1_0_end_html_tag (xhtml_t* xhtml, Node* child);
-static char* s_xhtml_1_0_start_meta_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_meta_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_head_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_head_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_title_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_title_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_base_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_base_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_body_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_body_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_a_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_a_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_br_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_br_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_font_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_font_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_form_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_form_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_input_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_input_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_center_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_center_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_hr_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_hr_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_img_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_img_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_select_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_select_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_option_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_option_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_start_div_tag (xhtml_t* xhtml, Node* node);
-static char* s_xhtml_1_0_end_div_tag (xhtml_t* xhtml, Node* node);
-static void s_init_xhtml(xhtml_t* xhtml, Doc* doc, request_rec* r, device_table_t* spec);
+#define GET_XHTML(X) ((xhtml_t*)(X))
+
+static char* s_xhtml_1_0_start_html_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_html_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_p_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_p_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_pre_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_pre_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_ul_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_ul_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_h1_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_h1_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_h2_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_h2_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_h3_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_h3_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_h4_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_h4_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_h5_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_h5_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_h6_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_h6_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_ol_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_ol_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_li_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_li_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_meta_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_meta_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_head_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_head_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_title_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_title_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_base_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_base_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_body_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_body_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_a_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_a_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_br_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_br_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_tr_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_tr_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_font_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_font_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_form_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_form_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_input_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_input_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_center_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_center_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_hr_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_hr_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_img_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_img_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_select_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_select_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_option_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_option_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_div_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_div_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_textarea_tag(void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_textarea_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_start_b_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_end_b_tag (void* pdoc, Node* node);
+static char* s_xhtml_1_0_chxjif_tag (void* pdoc, Node* node);
+
+static void s_init_xhtml(xhtml_t* xhtml, Doc* doc, request_rec* r, device_table* spec);
static int s_xhtml_search_emoji(xhtml_t* xhtml, char* txt, char** rslt);
-static void s_xhtml_1_0_chxjif_tag(xhtml_t* xhtml, Node* node);
+static char* s_xhtml_1_0_text_tag(void* pdoc, Node* child);
+
+
+tag_handler xhtml_handler[] = {
+ /* tagHTML */
+ {
+ s_xhtml_1_0_start_html_tag,
+ s_xhtml_1_0_end_html_tag,
+ },
+ /* tagMETA */
+ {
+ s_xhtml_1_0_start_meta_tag,
+ s_xhtml_1_0_end_meta_tag,
+ },
+ /* tagTEXTAREA */
+ {
+ s_xhtml_1_0_start_textarea_tag,
+ s_xhtml_1_0_end_textarea_tag,
+ },
+ /* tagP */
+ {
+ s_xhtml_1_0_start_p_tag,
+ s_xhtml_1_0_end_p_tag,
+ },
+ /* tagPRE */
+ {
+ s_xhtml_1_0_start_pre_tag,
+ s_xhtml_1_0_end_pre_tag,
+ },
+ /* tagUL */
+ {
+ s_xhtml_1_0_start_ul_tag,
+ s_xhtml_1_0_end_ul_tag,
+ },
+ /* tagLI */
+ {
+ s_xhtml_1_0_start_li_tag,
+ s_xhtml_1_0_end_li_tag,
+ },
+ /* tagOL */
+ {
+ s_xhtml_1_0_start_ol_tag,
+ s_xhtml_1_0_end_ol_tag,
+ },
+ /* tagH1 */
+ {
+ s_xhtml_1_0_start_h1_tag,
+ s_xhtml_1_0_end_h1_tag,
+ },
+ /* tagH2 */
+ {
+ s_xhtml_1_0_start_h2_tag,
+ s_xhtml_1_0_end_h2_tag,
+ },
+ /* tagH3 */
+ {
+ s_xhtml_1_0_start_h3_tag,
+ s_xhtml_1_0_end_h3_tag,
+ },
+ /* tagH4 */
+ {
+ s_xhtml_1_0_start_h4_tag,
+ s_xhtml_1_0_end_h4_tag,
+ },
+ /* tagH5 */
+ {
+ s_xhtml_1_0_start_h5_tag,
+ s_xhtml_1_0_end_h5_tag,
+ },
+ /* tagH6 */
+ {
+ s_xhtml_1_0_start_h6_tag,
+ s_xhtml_1_0_end_h6_tag,
+ },
+ /* tagHEAD */
+ {
+ s_xhtml_1_0_start_head_tag,
+ s_xhtml_1_0_end_head_tag,
+ },
+ /* tagTITLE */
+ {
+ s_xhtml_1_0_start_title_tag,
+ s_xhtml_1_0_end_title_tag,
+ },
+ /* tagBASE */
+ {
+ s_xhtml_1_0_start_base_tag,
+ s_xhtml_1_0_end_base_tag,
+ },
+ /* tagBODY */
+ {
+ s_xhtml_1_0_start_body_tag,
+ s_xhtml_1_0_end_body_tag,
+ },
+ /* tagA */
+ {
+ s_xhtml_1_0_start_a_tag,
+ s_xhtml_1_0_end_a_tag,
+ },
+ /* tagBR */
+ {
+ s_xhtml_1_0_start_br_tag,
+ s_xhtml_1_0_end_br_tag,
+ },
+ /* tagTABLE */
+ {
+ NULL,
+ NULL,
+ },
+ /* tagTR */
+ {
+ s_xhtml_1_0_start_tr_tag,
+ s_xhtml_1_0_end_tr_tag,
+ },
+ /* tagTD */
+ {
+ NULL,
+ NULL,
+ },
+ /* tagTBODY */
+ {
+ NULL,
+ NULL,
+ },
+ /* tagFONT */
+ {
+ s_xhtml_1_0_start_font_tag,
+ s_xhtml_1_0_end_font_tag,
+ },
+ /* tagFORM */
+ {
+ s_xhtml_1_0_start_form_tag,
+ s_xhtml_1_0_end_form_tag,
+ },
+ /* tagINPUT */
+ {
+ s_xhtml_1_0_start_input_tag,
+ s_xhtml_1_0_end_input_tag,
+ },
+ /* tagCENTER */
+ {
+ s_xhtml_1_0_start_center_tag,
+ s_xhtml_1_0_end_center_tag,
+ },
+ /* tagHR */
+ {
+ s_xhtml_1_0_start_hr_tag,
+ s_xhtml_1_0_end_hr_tag,
+ },
+ /* tagIMG */
+ {
+ s_xhtml_1_0_start_img_tag,
+ s_xhtml_1_0_end_img_tag,
+ },
+ /* tagSELECT */
+ {
+ s_xhtml_1_0_start_select_tag,
+ s_xhtml_1_0_end_select_tag,
+ },
+ /* tagOPTION */
+ {
+ s_xhtml_1_0_start_option_tag,
+ s_xhtml_1_0_end_option_tag,
+ },
+ /* tagDIV */
+ {
+ s_xhtml_1_0_start_div_tag,
+ s_xhtml_1_0_end_div_tag,
+ },
+ /* tagCHXJIF */
+ {
+ s_xhtml_1_0_chxjif_tag,
+ NULL,
+ },
+ /* tagNOBR */
+ {
+ NULL,
+ NULL,
+ },
+ /* tagSMALL */
+ {
+ NULL,
+ NULL,
+ },
+ /* tagSTYLE */
+ {
+ NULL,
+ NULL,
+ },
+ /* tagSPAN */
+ {
+ NULL,
+ NULL,
+ },
+ /* tagTEXT */
+ {
+ s_xhtml_1_0_text_tag,
+ NULL,
+ },
+ /* tagTH */
+ {
+ NULL,
+ NULL,
+ },
+ /* tagB */
+ {
+ s_xhtml_1_0_start_b_tag,
+ s_xhtml_1_0_end_b_tag,
+ },
+};
/**
* converts from CHTML to XHTML.
*/
char*
chxj_exchange_xhtml_mobile_1_0(
- request_rec* r,
- device_table_t* spec,
- const char* src,
- apr_size_t srclen,
- apr_size_t *dstlen)
+ request_rec* r,
+ device_table* spec,
+ const char* src,
+ apr_size_t srclen,
+ apr_size_t* dstlen,
+ chxjconvrule_entry* entryp,
+ const char* cookie_id
+)
{
char* dst = NULL;
char* ss;
xhtml_t xhtml;
Doc doc;
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,"start chxj_exchange_xhtml_mobile_1_0()");
+ DBG(r,"start chxj_exchange_xhtml_mobile_1_0()");
/*--------------------------------------------------------------------------*/
/* If qrcode xml */
*dstlen = srclen;
dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen);
if (dst != NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,"i found qrcode xml");
+ DBG(r,"i found qrcode xml");
return dst;
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,"not found qrcode xml");
+ DBG(r,"not found qrcode xml");
/*--------------------------------------------------------------------------*/
/* The XHTML structure is initialized. */
/*--------------------------------------------------------------------------*/
s_init_xhtml(&xhtml, &doc, r, spec);
+
+ xhtml.entryp = entryp;
+
ap_set_content_type(r, "text/html; charset=Windows-31J");
/*--------------------------------------------------------------------------*/
qs_init_root_node(&doc);
ss = apr_pcalloc(r->pool, srclen + 1);
- memset(ss, 0, srclen + 1);
+ memset(ss, 0, srclen + 1);
memcpy(ss, src, srclen);
#ifdef DUMP_LOG
chxj_dump_out("[src] CHTML->XHTML", ss, srclen);
#endif
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,"start parse");
+ DBG(r,"start parse");
qs_parse_string(&doc,ss, strlen(ss));
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,"end parse");
+ DBG(r,"end parse");
/*--------------------------------------------------------------------------*/
/* It converts it from CHTML to XHTML. */
/*--------------------------------------------------------------------------*/
- dst = s_xhtml_1_0_node_exchange(&xhtml, qs_get_root(&doc), 0);
+ chxj_node_exchange(spec,r,(void*)&xhtml, &doc, qs_get_root(&doc), 0);
+ dst = xhtml.out;
+
qs_all_free(&doc,QX_LOGMARK);
- if (dst == NULL)
+ if (! dst)
return apr_pstrdup(r->pool,ss);
- if (strlen(dst) == 0)
+ if (! strlen(dst))
dst = apr_psprintf(r->pool, "\n");
*dstlen = strlen(dst);
+
#ifdef DUMP_LOG
chxj_dump_out("[dst] CHTML->XHTML", dst, *dstlen);
#endif
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,"end chxj_exchange_xhtml_mobile_1_0()");
+
+ DBG(r,"end chxj_exchange_xhtml_mobile_1_0()");
return dst;
}
* @param spec [i] The pointer to the device_table
*/
static void
-s_init_xhtml(xhtml_t* xhtml, Doc* doc, request_rec* r, device_table_t* spec)
+s_init_xhtml(xhtml_t* xhtml, Doc* doc, request_rec* r, device_table* spec)
{
memset(doc, 0, sizeof(Doc));
memset(xhtml, 0, sizeof(xhtml_t));
xhtml->doc->parse_mode = PARSE_MODE_CHTML;
}
-/**
- * It is main processing of conversion from CHTML to XHTML.
- *
- * @param xhtml [i/o] The pointer to the XHTML structure is specified.
- * @param node [i] The pointer to a current node is specified.
- * @param indent [i] The depth of the node processing it now is specified.
- *
- * @return The character string after it converts it is returned.
- */
-static char*
-s_xhtml_1_0_node_exchange(xhtml_t* xhtml, Node* node, int indent)
-{
- Node* child;
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
-
- /*--------------------------------------------------------------------------*/
- /* It is the main loop of the conversion processing. */
- /*--------------------------------------------------------------------------*/
- for (child = qs_get_child_node(doc,node);
- child ;
- child = qs_get_next_node(doc,child)) {
- char* name = qs_get_node_name(doc,child);
-
- if (*name == 'h' || *name == 'H') {
- /*----------------------------------------------------------------------*/
- /* <HTML> */
- /*----------------------------------------------------------------------*/
- if (strcasecmp(name, "html") == 0) {
- s_xhtml_1_0_start_html_tag(xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child,indent+1);
- s_xhtml_1_0_end_html_tag (xhtml, child);
- }
- /*----------------------------------------------------------------------*/
- /* <HEAD> */
- /*----------------------------------------------------------------------*/
- else
- if (strcasecmp(name, "head") == 0) {
- s_xhtml_1_0_start_head_tag(xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child,indent+1);
- s_xhtml_1_0_end_head_tag (xhtml, child);
- }
- /*----------------------------------------------------------------------*/
- /* <HR> */
- /*----------------------------------------------------------------------*/
- else
- if (strcasecmp(name, "hr") == 0) {
- s_xhtml_1_0_start_hr_tag (xhtml, child);
- s_xhtml_1_0_end_hr_tag (xhtml, child);
- }
- }
- /*------------------------------------------------------------------------*/
- /* <META> */
- /*------------------------------------------------------------------------*/
- else
- if ((*name == 'm' || *name == 'M') && strcasecmp(name, "meta") == 0) {
- s_xhtml_1_0_start_meta_tag(xhtml, child);
- s_xhtml_1_0_end_meta_tag (xhtml, child);
- }
- /*------------------------------------------------------------------------*/
- /* <TITLE> */
- /*------------------------------------------------------------------------*/
- else
- if ((*name == 't' || *name == 'T') && strcasecmp(name, "title") == 0) {
- s_xhtml_1_0_start_title_tag (xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child,indent+1);
- s_xhtml_1_0_end_title_tag (xhtml, child);
- }
- else
- if (*name == 'b' || *name == 'B') {
- /*----------------------------------------------------------------------*/
- /* <BASE> */
- /*----------------------------------------------------------------------*/
- if (strcasecmp(name, "base") == 0) {
- s_xhtml_1_0_start_base_tag(xhtml, child);
- s_xhtml_1_0_end_base_tag (xhtml, child);
- }
- else
- /*----------------------------------------------------------------------*/
- /* <BODY> */
- /*----------------------------------------------------------------------*/
- if (strcasecmp(name, "body") == 0) {
- s_xhtml_1_0_start_body_tag(xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child,indent+1);
- s_xhtml_1_0_end_body_tag (xhtml, child);
- }
- else
- /*----------------------------------------------------------------------*/
- /* <BR> */
- /*----------------------------------------------------------------------*/
- if (strcasecmp(name, "br") == 0) {
- s_xhtml_1_0_start_br_tag (xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child,indent+1);
- s_xhtml_1_0_end_br_tag (xhtml, child);
- }
- }
- /*------------------------------------------------------------------------*/
- /* <A> */
- /*------------------------------------------------------------------------*/
- else
- if ((*name == 'a' || *name == 'A') && strcasecmp(name, "a") == 0) {
- s_xhtml_1_0_start_a_tag (xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child,indent+1);
- s_xhtml_1_0_end_a_tag (xhtml, child);
- }
- else
- if (*name == 'f' || *name == 'F') {
- /*----------------------------------------------------------------------*/
- /* <FONT> */
- /*----------------------------------------------------------------------*/
- if (strcasecmp(name, "font") == 0) {
- s_xhtml_1_0_start_font_tag(xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child,indent+1);
- s_xhtml_1_0_end_font_tag (xhtml, child);
- }
- /*----------------------------------------------------------------------*/
- /* <FORM> */
- /*----------------------------------------------------------------------*/
- else
- if (strcasecmp(name, "form") == 0) {
- s_xhtml_1_0_start_form_tag(xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child,indent+1);
- s_xhtml_1_0_end_form_tag (xhtml, child);
- }
- }
- else
- if (*name == 'i' || *name == 'I') {
- /*----------------------------------------------------------------------*/
- /* <INPUT> */
- /*----------------------------------------------------------------------*/
- if (strcasecmp(name, "input") == 0) {
- s_xhtml_1_0_start_input_tag (xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child,indent+1);
- s_xhtml_1_0_end_input_tag (xhtml, child);
- }
- /*----------------------------------------------------------------------*/
- /* <IMG> */
- /*----------------------------------------------------------------------*/
- else
- if (strcasecmp(name, "img") == 0) {
- s_xhtml_1_0_start_img_tag (xhtml, child);
- s_xhtml_1_0_end_img_tag (xhtml, child);
- }
- }
- /*------------------------------------------------------------------------*/
- /* <SELECT> */
- /*------------------------------------------------------------------------*/
- else
- if ((*name == 's' || *name == 'S') && strcasecmp(name, "select") == 0) {
- s_xhtml_1_0_start_select_tag(xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child, indent+1);
- s_xhtml_1_0_end_select_tag (xhtml, child);
- }
- /*------------------------------------------------------------------------*/
- /* <OPTION> */
- /*------------------------------------------------------------------------*/
- else
- if ((*name == 'o' || *name == 'O') && strcasecmp(name, "option") == 0) {
- s_xhtml_1_0_start_option_tag(xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child, indent+1);
- s_xhtml_1_0_end_option_tag (xhtml, child);
- }
- /*------------------------------------------------------------------------*/
- /* <DIV> */
- /*------------------------------------------------------------------------*/
- else
- if ((*name == 'd' || *name == 'D') && strcasecmp(name, "div") == 0) {
- s_xhtml_1_0_start_div_tag (xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child, indent+1);
- s_xhtml_1_0_end_div_tag (xhtml, child);
- }
- else
- if (*name == 'c' || *name == 'C') {
- /*----------------------------------------------------------------------*/
- /* <CHXJ:IF> */
- /*----------------------------------------------------------------------*/
- if (strcasecmp(name, "chxj:if") == 0) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG,0,r, "chxj:if tag found");
- if (chxj_chxjif_is_mine(xhtml->spec, doc, child)) {
- char* destlang = qs_get_destlang_attr(doc, child, r);
- if (destlang != NULL && strcasecmp(destlang, "hdml") == 0) {
- ap_set_content_type(r, "text/x-hdml; charset=Shift_JIS");
- }
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG,0,r, "chxj:if tag is mine");
-
- char* parse_attr = NULL;
- parse_attr = qs_get_parse_attr(doc, child, r);
- if (parse_attr != NULL && strcasecmp(parse_attr, "true") == 0) {
- s_xhtml_1_0_node_exchange (xhtml, child, indent+1);
- }
- else {
- s_xhtml_1_0_chxjif_tag(xhtml, child);
- }
- }
- }
- /*----------------------------------------------------------------------*/
- /* <CENTER> */
- /*----------------------------------------------------------------------*/
- else
- if (strcasecmp(name, "center") == 0) {
- s_xhtml_1_0_start_center_tag(xhtml, child);
- s_xhtml_1_0_node_exchange (xhtml, child,indent+1);
- s_xhtml_1_0_end_center_tag (xhtml, child);
- }
- }
- /*------------------------------------------------------------------------*/
- /* NORMAL TEXT */
- /*------------------------------------------------------------------------*/
- else
- if (strcasecmp(name, "text") == 0) {
- char* textval;
- char* tmp;
- char* tdst;
- char one_byte[2];
- int ii;
- int tdst_len;
-
- textval = qs_get_node_value(doc,child);
- textval = qs_trim_string(xhtml->doc->r, textval);
- if (strlen(textval) == 0)
- continue;
-
- 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);
- memset(one_byte, 0, sizeof(one_byte));
- tdst_len = 0;
-
- for (ii=0; ii<qs_get_node_size(doc,child); ii++) {
- char* out;
- int rtn = s_xhtml_search_emoji(xhtml, &textval[ii], &out);
- if (rtn != 0) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG,0, r,
- "[%s][%d]", out, rtn);
- tdst = qs_out_apr_pstrcat(r, tdst, out, &tdst_len);
- ii+=(rtn - 1);
- continue;
- }
- if (is_sjis_kanji(textval[ii])) {
- one_byte[0] = textval[ii+0];
- tdst = qs_out_apr_pstrcat(r, tdst, one_byte, &tdst_len);
- one_byte[0] = textval[ii+1];
- tdst = qs_out_apr_pstrcat(r, tdst, one_byte, &tdst_len);
- ii++;
- }
- else if (textval[ii] != '\r' && textval[ii] != '\n') {
- one_byte[0] = textval[ii+0];
- tdst = qs_out_apr_pstrcat(r, tdst, one_byte, &tdst_len);
- }
- }
- xhtml->out = apr_pstrcat(r->pool, xhtml->out, tdst, NULL);
- }
- }
- return xhtml->out;
-}
/**
* Corresponding EMOJI to a current character-code is retrieved.
{
emoji_t* ee;
request_rec* r;
- device_table_t* spec;
+ device_table* spec;
int len;
spec = xhtml->spec;
r = xhtml->doc->r;
if (spec == NULL)
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG,0,r, "spec is NULL");
+ DBG(r,"spec is NULL");
for (ee = xhtml->conf->emoji;
ee;
unsigned char hex1byte;
unsigned char hex2byte;
if (!ee->imode) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "emoji->imode is NULL");
+ DBG(r,"emoji->imode is NULL");
continue;
}
/**
* It is a handler who processes the HTML tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The HTML tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_html_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_html_tag(void* pdoc, Node* node)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
Attr* attr;
Doc* doc = xhtml->doc;
request_rec* r = doc->r;
return xhtml->out;
}
+
/**
* It is a handler who processes the HTML tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The HTML tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_html_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_html_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</html>\r\n", NULL);
return xhtml->out;
}
+
/**
* It is a handler who processes the META tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The META tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_meta_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_meta_tag(void* pdoc, Node* node)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
Attr* attr;
Doc* doc = xhtml->doc;
request_rec* r = doc->r;
+ int content_type_flag = 0;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<meta", NULL);
value,
"\"",
NULL);
+ if ((*value == 'c' || *value == 'C') && strcasecmp(value, "content-type") == 0) {
+ content_type_flag = 1;
+ }
}
else
if (strcasecmp(name, "content") == 0) {
- xhtml->out = apr_pstrcat(r->pool,
- xhtml->out,
- " ",
- name,
- "=\"",
- value,
- "\"",
- NULL);
+ if (content_type_flag) {
+ xhtml->out = apr_pstrcat(r->pool,
+ xhtml->out,
+ " ",
+ name,
+ "=\"",
+ "text/html; charset=Windows-31J",
+ "\"",
+ NULL);
+ }
+ else {
+ xhtml->out = apr_pstrcat(r->pool,
+ xhtml->out,
+ " ",
+ name,
+ "=\"",
+ value,
+ "\"",
+ NULL);
+ }
}
}
/**
* It is a handler who processes the META tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The META tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_meta_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_meta_tag(void* pdoc, Node* child)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the HEAD tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The HEAD tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_head_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_head_tag(void* pdoc, Node* node)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<head>\r\n", NULL);
return xhtml->out;
}
+
/**
* It is a handler who processes the HEAD tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The HEAD tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_head_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_head_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</head>\r\n", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the TITLE tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The TITLE tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_title_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_title_tag(void* pdoc, Node* node)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<title>", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the TITLE tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The TITLE tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_title_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_title_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</title>\r\n", NULL);
return xhtml->out;
}
+
/**
* It is a handler who processes the BASE tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The BASE tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_base_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_base_tag(void* pdoc, Node* node)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
Attr* attr;
Doc* doc = xhtml->doc;
request_rec* r = doc->r;
}
}
xhtml->out = apr_pstrcat(r->pool, xhtml->out, " />\r\n", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the BASE tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The BASE tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_base_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_base_tag(void* pdoc, Node* child)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the BODY tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The BODY tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_body_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_body_tag(void* pdoc, Node* node)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
- Attr* attr;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+ Attr* attr;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<body", NULL);
}
}
xhtml->out = apr_pstrcat(r->pool, xhtml->out, ">\r\n", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the BODY tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The BODY tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_body_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_body_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</body>\r\n", NULL);
return xhtml->out;
}
+
/**
* It is a handler who processes the A tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The A tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_a_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_a_tag(void* pdoc, Node* node)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
Doc* doc = xhtml->doc;
request_rec* r = doc->r;
Attr* attr;
char* name = qs_get_attr_name(doc,attr);
char* value = qs_get_attr_value(doc,attr);
- if (strcasecmp(name, "name") == 0) {
+ if ((*name == 'n' || *name == 'N') && strcasecmp(name, "name") == 0) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" id=\"",
NULL);
}
else
- if (strcasecmp(name, "href") == 0) {
+ if ((*name == 'h' || *name == 'H') && strcasecmp(name, "href") == 0) {
+#if 0
+ apr_size_t ilen;
+ char* dbuf;
+ ap_unescape_url(value);
+ ilen = strlen(value);
+ dbuf = chxj_encoding(r, (const char*)value, (apr_size_t*)&ilen);
+ dbuf = ap_escape_uri(r->pool,dbuf);
+ xhtml->out = apr_pstrcat(r->pool,
+ xhtml->out,
+ " href=\"",
+ dbuf,
+ "\"",
+ NULL);
+#else
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" href=\"",
value,
"\"",
NULL);
+#endif
}
else
- if (strcasecmp(name, "accesskey") == 0) {
+ if ((*name == 'a' || *name == 'A') && strcasecmp(name, "accesskey") == 0) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" accesskey=\"",
}
}
xhtml->out = apr_pstrcat(r->pool, xhtml->out, ">", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the A tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The A tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_a_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_a_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</a>", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the BR tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The BR tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_br_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_br_tag(void* pdoc, Node* node)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<br />\r\n", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the BR tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The BR tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_br_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_br_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the TR tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The TR tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_tr_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<br />\r\n", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the TR tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The TR tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_tr_tag(void* pdoc, Node* child)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the FONT tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The FONT tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_font_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_font_tag(void* pdoc, Node* node)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
- Attr* attr;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+ Attr* attr;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<font", NULL);
+
/* Get Attributes */
for (attr = qs_get_attr(doc,node);
- attr; attr = qs_get_next_attr(doc,attr))
- {
+ 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 (strcasecmp(name, "color") == 0)
- {
+ if ((*name == 'c' || *name == 'C') && strcasecmp(name, "color") == 0) {
xhtml->out = apr_pstrcat(r->pool, xhtml->out, " color=\"",value,"\"", NULL);
}
else
- if (strcasecmp(name, "size") == 0)
- {
+ if ((*name == 's' || *name == 'S') && strcasecmp(name, "size") == 0) {
xhtml->out = apr_pstrcat(r->pool, xhtml->out, " size=\"",value,"\"", NULL);
}
}
xhtml->out = apr_pstrcat(r->pool, xhtml->out, ">", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the FONT tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The FONT tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_font_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_font_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</font>", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the FORM tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The FORM tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_form_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_form_tag(void* pdoc, Node* node)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
- Attr* attr;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+ Attr* attr;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<form", NULL);
/*--------------------------------------------------------------------------*/
for (attr = qs_get_attr(doc,node);
attr;
- attr = qs_get_next_attr(doc,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 (strcasecmp(name, "action") == 0)
- {
+ if ((*name == 'a' || *name == 'A') && strcasecmp(name, "action") == 0) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" action=\"",
NULL);
}
else
- if (strcasecmp(name, "method") == 0)
- {
+ if ((*name == 'm' || *name == 'M') && strcasecmp(name, "method") == 0) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" method=\"",
NULL);
}
else
- if (strcasecmp(name, "utn") == 0)
- {
+ if ((*name == 'u' || *name == 'U') && strcasecmp(name, "utn") == 0) {
/* ignore */
}
}
xhtml->out = apr_pstrcat(r->pool, xhtml->out, ">", NULL);
+
return xhtml->out;
}
/**
* It is a handler who processes the FORM tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The FORM tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_form_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_form_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</form>", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the INPUT tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The INPUT tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_input_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_input_tag(void* pdoc, Node* node)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
Doc* doc = xhtml->doc;
request_rec* r = doc->r;
char* max_length = NULL;
accesskey = qs_get_accesskey_attr(doc, node, r);
size = qs_get_size_attr(doc, node, r);
- if (type != NULL)
- {
+ if (type) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" type=\"",
"\" ",
NULL);
}
- if (size != NULL)
- {
+ if (size) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" size=\"",
"\" ",
NULL);
}
- if (name != NULL)
- {
+ if (name) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" name=\"",
"\" ",
NULL);
}
- if (value != NULL)
- {
+ if (value) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" value=\"",
"\" ",
NULL);
}
- if (accesskey != NULL)
- {
+ if (accesskey) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" accesskey=\"",
accesskey, "\" ",
NULL);
}
- if (istyle != NULL)
- {
+ if (istyle) {
char* fmt = qs_conv_istyle_to_format(r,istyle);
- if (max_length != NULL)
- {
+ if (max_length) {
int ii;
- for (ii=0; ii<strlen(max_length); ii++)
- {
- if (max_length[ii] < '0' || max_length[ii] > '9')
- {
+ for (ii=0; ii<strlen(max_length); ii++) {
+ if (max_length[ii] < '0' || max_length[ii] > '9') {
max_length = apr_psprintf(r->pool, "0");
break;
}
fmt),
NULL);
}
- else
- {
+ else {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" FORMAT=\"",
/*--------------------------------------------------------------------------*/
/* The figure is default for the password. */
/*--------------------------------------------------------------------------*/
- if (type != NULL && istyle == NULL && strcasecmp(type, "password") == 0)
- {
- if (max_length != NULL)
- {
+ if (type && istyle == NULL
+ && (*type == 'p' || *type == 'P')
+ && strcasecmp(type, "password") == 0
+ && ! xhtml->entryp->pc_flag) {
+ if (max_length) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" FORMAT=\"",
"\"",
NULL);
}
- else
- {
+ else {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out,
" FORMAT=\"", "*", "N", "\"", NULL);
}
}
- if (checked != NULL)
- {
+ if (checked) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out, " checked=\"checked\"", NULL);
}
- xhtml->out = apr_pstrcat(r->pool, xhtml->out, " />", NULL);
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, " />", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the INPUT tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The INPUT tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_input_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the CENTER tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The CENTER tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_center_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<center>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the CENTER tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The CENTER tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_center_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</center>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the HR tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The HR tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_hr_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<hr />", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the HR tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The HR tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_hr_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the PRE tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The PRE tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_pre_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->pre_flag++;
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<pre>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the PRE tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The PRE tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_pre_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</pre>", NULL);
+ xhtml->pre_flag--;
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the P tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The P tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_p_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<p>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the P tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The P tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_p_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</p>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the UL tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The UL tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_ul_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<ul>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the UL tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The UL tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_ul_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</ul>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the H1 tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The H1 tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_h1_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<h1>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the H1 tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The H1 tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_h1_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</h1>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the H2 tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The H2 tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_h2_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<h2>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the H2 tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The H2 tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_h2_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</h2>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the H3 tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The H3 tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_h3_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<h3>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the H3 tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The H3 tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_h3_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</h3>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the H4 tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The H4 tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_h4_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<h4>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the H4 tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The H4 tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_h4_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</h4>", NULL);
+
return xhtml->out;
}
+
/**
- * It is a handler who processes the INPUT tag.
+ * It is a handler who processes the H5 tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
- * @param node [i] The INPUT tag node is specified.
+ * @param node [i] The H5 tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_input_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_start_h5_tag(void* pdoc, Node* node)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<h5>", NULL);
+
return xhtml->out;
}
/**
- * It is a handler who processes the CENTER tag.
+ * It is a handler who processes the H5 tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
- * @param node [i] The CENTER tag node is specified.
+ * @param node [i] The H5 tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_center_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_end_h5_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
- xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<center>", NULL);
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</h5>", NULL);
return xhtml->out;
}
+
/**
- * It is a handler who processes the CENTER tag.
+ * It is a handler who processes the H6 tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
- * @param node [i] The CENTER tag node is specified.
+ * @param node [i] The H6 tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_center_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_start_h6_tag(void* pdoc, Node* node)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
- xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</center>", NULL);
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<h6>", NULL);
return xhtml->out;
}
+
/**
- * It is a handler who processes the HR tag.
+ * It is a handler who processes the H6 tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
- * @param node [i] The HR tag node is specified.
+ * @param node [i] The H6 tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_hr_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_end_h6_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
- xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<hr />", NULL);
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</h6>", NULL);
return xhtml->out;
}
+
/**
- * It is a handler who processes the HR tag.
+ * It is a handler who processes the OL tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
- * @param node [i] The HR tag node is specified.
+ * @param node [i] The OL tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_ol_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<ol>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the OL tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The OL tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_ol_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</ol>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the LI tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The LI tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_li_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<li>", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ ** It is a handler who processes the LI tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The LI tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_hr_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_li_tag(void* pdoc, Node* child)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</li>", NULL);
+
return xhtml->out;
}
/**
* It is a handler who processes the IMG tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The IMG tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_img_tag(xhtml_t* xhtml, Node* node)
+s_xhtml_1_0_start_img_tag(void* pdoc, Node* node)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
- Attr* attr;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+ Attr* attr;
#ifndef IMG_NOT_CONVERT_FILENAME
device_table_t* spec = xhtml->spec;
/*--------------------------------------------------------------------------*/
for (attr = qs_get_attr(doc,node);
attr;
- attr = qs_get_next_attr(doc,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 (strcasecmp(name, "src") == 0)
- {
+ if ((*name == 's' || *name == 'S') && strcasecmp(name, "src") == 0) {
#ifdef IMG_NOT_CONVERT_FILENAME
xhtml->out = apr_pstrcat(r->pool,
xhtml->out, " src=\"",value,"\"", NULL);
#endif
}
else
- if (strcasecmp(name, "align" ) == 0)
- {
- xhtml->out = apr_pstrcat(r->pool,
- xhtml->out, " align=\"",value,"\"", NULL);
+ if (*name == 'a' || *name == 'A') {
+ if (strcasecmp(name, "align" ) == 0) {
+ xhtml->out = apr_pstrcat(r->pool,
+ xhtml->out, " align=\"",value,"\"", NULL);
+ }
+ else
+ if (strcasecmp(name, "alt" ) == 0) {
+ xhtml->out = apr_pstrcat(r->pool,
+ xhtml->out, " alt=\"",value,"\"", NULL);
+ }
}
else
- if (strcasecmp(name, "width" ) == 0)
- {
+ if ((*name == 'w' || *name == 'W') && strcasecmp(name, "width" ) == 0) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out, " width=\"",value,"\"", NULL);
}
else
- if (strcasecmp(name, "height") == 0)
- {
- xhtml->out = apr_pstrcat(r->pool,
- xhtml->out, " height=\"",value,"\"", NULL);
- }
- else
- if (strcasecmp(name, "hspace") == 0)
- {
- xhtml->out = apr_pstrcat(r->pool,
- xhtml->out, " hspace=\"",value,"\"", NULL);
+ if (*name == 'h' || *name == 'H') {
+ if (strcasecmp(name, "height") == 0) {
+ xhtml->out = apr_pstrcat(r->pool,
+ xhtml->out, " height=\"",value,"\"", NULL);
+ }
+ else
+ if (strcasecmp(name, "hspace") == 0) {
+ xhtml->out = apr_pstrcat(r->pool,
+ xhtml->out, " hspace=\"",value,"\"", NULL);
+ }
}
else
- if (strcasecmp(name, "vspace") == 0)
- {
+ if ((*name == 'v' || *name == 'V') && strcasecmp(name, "vspace") == 0) {
xhtml->out = apr_pstrcat(r->pool,
xhtml->out, " vspace=\"",value,"\"", NULL);
}
- else
- if (strcasecmp(name, "alt" ) == 0)
- {
- xhtml->out = apr_pstrcat(r->pool,
- xhtml->out, " alt=\"",value,"\"", NULL);
- }
}
xhtml->out = apr_pstrcat(r->pool, xhtml->out, ">", NULL);
return xhtml->out;
}
+
/**
* It is a handler who processes the IMG tag.
*
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_img_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_img_tag(void* pdoc, Node* child)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the SELECT tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The SELECT tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_select_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_start_select_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
- Attr* attr;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+ Attr* attr;
char* size = NULL;
char* name = NULL;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<select", NULL);
for (attr = qs_get_attr(doc,child);
attr;
- attr = qs_get_next_attr(doc,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 (strcasecmp(nm, "size") == 0)
- {
+ if ((*nm == 's' || *nm == 'S') && strcasecmp(nm, "size") == 0) {
/* CHTML version 2.0 */
size = apr_pstrdup(r->pool, val);
}
else
- if (strcasecmp(nm, "name") == 0)
- {
+ if ((*nm == 'n' || *nm == 'N') && strcasecmp(nm, "name") == 0) {
/* CHTML version 2.0 */
name = apr_pstrdup(r->pool, val);
}
else
- if (strcasecmp(nm, "multiple") == 0)
- {
+ if ((*nm == 'm' || *nm == 'M') && strcasecmp(nm, "multiple") == 0) {
/* CHTML version 2.0 */
/* Ignore */
}
}
- if (size != NULL)
- {
+ if (size)
xhtml->out = apr_pstrcat(r->pool, xhtml->out, " size=\"",size,"\"", NULL);
- }
- if (name != NULL)
- {
+
+ if (name)
xhtml->out = apr_pstrcat(r->pool, xhtml->out, " name=\"",name,"\"", NULL);
- }
+
xhtml->out = apr_pstrcat(r->pool, xhtml->out, ">\n", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the SELECT tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The SELECT tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_select_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_select_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</select>\n", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the OPTION tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The OPTION tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_option_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_start_option_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
- Attr* attr;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+ Attr* attr;
char* selected = NULL;
char* value = NULL;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<option", NULL);
for (attr = qs_get_attr(doc,child);
attr;
- attr = qs_get_next_attr(doc,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 (strcasecmp(nm, "selected") == 0)
- {
+ if ((*nm == 's' || *nm == 'S') && strcasecmp(nm, "selected") == 0) {
/* CHTML version 2.0 */
selected = apr_pstrdup(r->pool, val);
}
else
- if (strcasecmp(nm, "value") == 0)
- {
+ if ((*nm == 'v' || *nm == 'V') && strcasecmp(nm, "value") == 0) {
/* CHTML version 2.0 */
value = apr_pstrdup(r->pool, val);
}
}
- if (value != NULL)
- {
+ if (value)
xhtml->out = apr_pstrcat(r->pool, xhtml->out, " value=\"",value,"\"", NULL);
- }
else
- {
xhtml->out = apr_pstrcat(r->pool, xhtml->out, " value=\"\"", NULL);
- }
- if (selected != NULL)
- {
+ if (selected)
xhtml->out = apr_pstrcat(r->pool, xhtml->out, " selected=\"selected\"", NULL);
- }
xhtml->out = apr_pstrcat(r->pool, xhtml->out, ">", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the OPTION tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The OPTION tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_option_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_option_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</option>\n", NULL);
return xhtml->out;
}
+
/**
* It is a handler who processes the DIV tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The DIV tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_start_div_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_start_div_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
- Attr* attr;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+ Attr* attr;
char* align = NULL;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<div", NULL);
for (attr = qs_get_attr(doc,child);
attr;
- attr = qs_get_next_attr(doc,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 (strcasecmp(nm, "align") == 0)
- {
+ if ((*nm == 'a' || *nm == 'A') && strcasecmp(nm, "align") == 0) {
/* CHTML version 3.2 */
align = apr_pstrdup(r->pool, val);
}
}
- if (align != NULL)
- {
+ if (align)
xhtml->out = apr_pstrcat(r->pool,
xhtml->out, " align=\"", align, "\"", NULL);
- }
xhtml->out = apr_pstrcat(r->pool, xhtml->out, ">", NULL);
+
return xhtml->out;
}
+
/**
* It is a handler who processes the DIV tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The DIV tag node is specified.
* @return The conversion result is returned.
*/
static char*
-s_xhtml_1_0_end_div_tag(xhtml_t* xhtml, Node* child)
+s_xhtml_1_0_end_div_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</div>\n", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the B tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The B tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_b_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<div style=\"font-weight:bold\">", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the B tag.
+ *
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
+ * destination is specified.
+ * @param node [i] The B tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_b_tag(void* pdoc, Node* child)
{
- Doc* doc = xhtml->doc;
- request_rec* r = doc->r;
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</div>\n", NULL);
return xhtml->out;
}
+
/**
* It is a handler who processes the CHXJ:IF tag.
*
- * @param xhtml [i/o] The pointer to the XHTML structure at the output
+ * @param pdoc [i/o] The pointer to the XHTML structure at the output
* destination is specified.
* @param node [i] The CHXJ:IF tag node is specified.
*/
-static void
-s_xhtml_1_0_chxjif_tag(xhtml_t* xhtml, Node* node)
+static char*
+s_xhtml_1_0_chxjif_tag(void* pdoc, Node* node)
{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
Doc* doc = xhtml->doc;
Node* child;
request_rec* r = xhtml->doc->r;
for (child = qs_get_child_node(doc, node);
child;
- child = qs_get_next_node(doc, child))
- {
+ child = qs_get_next_node(doc, child)) {
xhtml->out = apr_pstrcat(r->pool, xhtml->out, child->otext, NULL);
s_xhtml_1_0_chxjif_tag(xhtml, child);
}
+
+ return NULL;
+}
+
+
+/**
+ * It is a handler who processes the TEXTARE tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The TEXTAREA tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_start_textarea_tag(void* pdoc, Node* node)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+ Attr* attr;
+
+ xhtml->textarea_flag++;
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "<textarea ", NULL);
+
+ 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 ((*name == 'n' || *name == 'N') && strcasecmp(name, "name") == 0) {
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, " name=\"",value,"\"", NULL);
+ }
+ else
+ if ((*name == 'r' || *name == 'R') && strcasecmp(name, "rows") == 0) {
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, " rows=\"",value,"\"", NULL);
+ }
+ else
+ if ((*name == 'c' || *name == 'C') && strcasecmp(name, "cols") == 0) {
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, " cols=\"",value,"\"", NULL);
+ }
+ }
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, ">\r\n", NULL);
+
+ return xhtml->out;
+}
+
+
+/**
+ * It is a handler who processes the TEXTAREA tag.
+ *
+ * @param pdoc [i/o] The pointer to the CHTML structure at the output
+ * destination is specified.
+ * @param node [i] The TEXTAREA tag node is specified.
+ * @return The conversion result is returned.
+ */
+static char*
+s_xhtml_1_0_end_textarea_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, "</textarea>\r\n", NULL);
+ xhtml->textarea_flag--;
+
+ return xhtml->out;
+}
+
+static char*
+s_xhtml_1_0_text_tag(void* pdoc, Node* child)
+{
+ xhtml_t* xhtml = GET_XHTML(pdoc);
+ Doc* doc = xhtml->doc;
+ request_rec* r = doc->r;
+ char* textval;
+ char* tmp;
+ char* tdst;
+ char one_byte[2];
+ int ii;
+ int tdst_len;
+
+ textval = qs_get_node_value(doc,child);
+ textval = qs_trim_string(xhtml->doc->r, textval);
+ if (strlen(textval) == 0)
+ return xhtml->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);
+ memset(one_byte, 0, sizeof(one_byte));
+ tdst_len = 0;
+
+ for (ii=0; ii<qs_get_node_size(doc,child); ii++) {
+ char* out;
+ int rtn = s_xhtml_search_emoji(xhtml, &textval[ii], &out);
+ if (rtn != 0) {
+ DBG2(r,"[%s][%d]", out, rtn);
+ tdst = qs_out_apr_pstrcat(r, tdst, out, &tdst_len);
+ ii+=(rtn - 1);
+ continue;
+ }
+ if (is_sjis_kanji(textval[ii])) {
+ one_byte[0] = textval[ii+0];
+ tdst = qs_out_apr_pstrcat(r, tdst, one_byte, &tdst_len);
+ one_byte[0] = textval[ii+1];
+ tdst = qs_out_apr_pstrcat(r, tdst, one_byte, &tdst_len);
+ ii++;
+ }
+ else if (xhtml->pre_flag) {
+ one_byte[0] = textval[ii+0];
+ tdst = qs_out_apr_pstrcat(r, tdst, one_byte, &tdst_len);
+ }
+ else if (xhtml->textarea_flag) {
+ one_byte[0] = textval[ii+0];
+ tdst = qs_out_apr_pstrcat(r, tdst, one_byte, &tdst_len);
+ }
+ else if (textval[ii] != '\r' && textval[ii] != '\n') {
+ one_byte[0] = textval[ii+0];
+ tdst = qs_out_apr_pstrcat(r, tdst, one_byte, &tdst_len);
+ }
+ }
+ xhtml->out = apr_pstrcat(r->pool, xhtml->out, tdst, NULL);
+
+ return xhtml->out;
}
/*
* vim:ts=2 et
OSDN Git Service
