From 5b20d71c604be39f12d51b607f083a67ba978c95 Mon Sep 17 00:00:00 2001 From: konn Date: Sat, 24 Jun 2006 11:48:54 +0000 Subject: [PATCH] * change writting. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1165 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_xhtml_mobile_1_0.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c index 15b205dd..f15e2f18 100644 --- a/src/chxj_xhtml_mobile_1_0.c +++ b/src/chxj_xhtml_mobile_1_0.c @@ -39,9 +39,9 @@ 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_h4_tag (xhtml_t* xhtml, Node* node); -static char* s_xhtml_1_0_end_h4_tag (xhtml_t* xhtml, Node* node); static char* s_xhtml_1_0_start_h5_tag (xhtml_t* xhtml, Node* node); static char* s_xhtml_1_0_end_h5_tag (xhtml_t* xhtml, Node* node); static char* s_xhtml_1_0_start_h6_tag (xhtml_t* xhtml, Node* node); @@ -152,12 +152,12 @@ tag_handler xhtml_handler[] = { s_xhtml_1_0_start_h3_tag, s_xhtml_1_0_end_h3_tag, }, -#if 0 /* tagH4 */ { - s_chtml10_start_h4_tag, - s_chtml10_end_h4_tag, + s_xhtml_1_0_start_h4_tag, + s_xhtml_1_0_end_h4_tag, }, +#if 0 /* tagH5 */ { s_chtml10_start_h5_tag, @@ -2167,41 +2167,45 @@ s_xhtml_1_0_end_h3_tag(void* pdoc, Node* child) /** * It is a handler who processes the H4 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 H4 tag node is specified. * @return The conversion result is returned. */ static char* -s_xhtml_1_0_start_h4_tag(xhtml_t* xhtml, Node* node) +s_xhtml_1_0_start_h4_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, "

", NULL); return xhtml->out; } + /** * It is a handler who processes the H4 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 H4 tag node is specified. * @return The conversion result is returned. */ static char* -s_xhtml_1_0_end_h4_tag(xhtml_t* xhtml, Node* child) +s_xhtml_1_0_end_h4_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, "

", NULL); return xhtml->out; } + /** * It is a handler who processes the H5 tag. * -- 2.11.0