*** empty log message ***

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

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index af16e0e..0db8534 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -42,9 +42,9 @@ static char* s_chtml10_start_ol_tag       (void* pdoc, Node* node);
 static char* s_chtml10_end_ol_tag         (void* pdoc, Node* node);
 static char* s_chtml10_start_h1_tag       (void* pdoc, Node* node);
 static char* s_chtml10_end_h1_tag         (void* pdoc, Node* node);
+static char* s_chtml10_start_h2_tag       (void* pdoc, Node* node);
+static char* s_chtml10_end_h2_tag         (void* pdoc, Node* node);
 
-static char* s_chtml10_start_h2_tag     (chtml10_t* chtml, Node* node);
-static char* s_chtml10_end_h2_tag       (chtml10_t* chtml, Node* node);
 static char* s_chtml10_start_h3_tag     (chtml10_t* chtml, Node* node);
 static char* s_chtml10_end_h3_tag       (chtml10_t* chtml, Node* node);
 static char* s_chtml10_start_h4_tag     (chtml10_t* chtml, Node* node);
@@ -144,8 +144,13 @@ tag_handler chtml10_handler[] = {
     s_chtml10_start_h1_tag,
     s_chtml10_end_h1_tag,
   },
+  /* tagH2 */
+  {
+    "h2",
+    s_chtml10_start_h2_tag,
+    s_chtml10_end_h2_tag,
+  }
 #if 0
-  tagH2,
   tagH3,
   tagH4,
   tagH5,
@@ -1084,16 +1089,21 @@ s_chtml10_end_h1_tag(void* pdoc, Node* child)
 /**
  * It is a handler who processes the H2 tag.
  *
- * @param chtml10  [i/o] The pointer to the CHTML structure at the output
+ * @param pdoc  [i/o] The pointer to the CHTML 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_chtml10_start_h2_tag(chtml10_t* chtml10, Node* node) 
+s_chtml10_start_h2_tag(void* pdoc, Node* node) 
 {
-  Doc*          doc = chtml10->doc;
-  request_rec*  r   = doc->r;
+  Doc*          doc;
+  request_rec*  r;
+  chtml10_t*    chtml10;
+
+  chtml10 = GET_CHTML10(pdoc);
+  doc     = chtml10->doc;
+  r       = doc->r;
 
   chtml10->out = apr_pstrcat(r->pool, chtml10->out, "<h2>\r\n", NULL);
 
@@ -1103,16 +1113,21 @@ s_chtml10_start_h2_tag(chtml10_t* chtml10, Node* node)
 /**
  * It is a handler who processes the H2 tag.
  *
- * @param chtml10  [i/o] The pointer to the CHTML structure at the output
+ * @param pdoc  [i/o] The pointer to the CHTML 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_chtml10_end_h2_tag(chtml10_t* chtml10, Node* child) 
+s_chtml10_end_h2_tag(void* pdoc, Node* child) 
 {
-  Doc*          doc = chtml10->doc;
-  request_rec*  r   = doc->r;
+  Doc*          doc;
+  request_rec*  r;
+  chtml10_t*    chtml10;
+
+  chtml10 = GET_CHTML10(pdoc);
+  doc     = chtml10->doc;
+  r       = doc->r;
 
   chtml10->out = apr_pstrcat(r->pool, chtml10->out, "</h2>\r\n", NULL);