* change writting.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1173 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index bab3485..8bda730 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -65,9 +65,9 @@ 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_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);
@@ -204,7 +204,6 @@ tag_handler xhtml_handler[] = {
     s_xhtml_1_0_start_tr_tag,
     s_xhtml_1_0_end_tr_tag,
   },
-#if 0
   /* tagTD */
   {
     NULL,
@@ -217,9 +216,10 @@ tag_handler xhtml_handler[] = {
   },
   /* tagFONT */
   {
-    s_chtml10_start_font_tag,
-    s_chtml10_end_font_tag,
+    s_xhtml_1_0_start_font_tag,
+    s_xhtml_1_0_end_font_tag,
   },
+#if 0
   /* tagFORM */
   {
     s_chtml10_start_form_tag,
@@ -1616,19 +1616,21 @@ s_xhtml_1_0_end_tr_tag(void* pdoc, Node* child)
 /**
  * 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)) {
@@ -1643,26 +1645,32 @@ s_xhtml_1_0_start_font_tag(xhtml_t* xhtml, Node* node)
     }
   }
   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.
  *