* Added New Features.

[modchxj/mod_chxj.git] / src / chxj_chtml20.c

diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c
index f60b36a..1d9d8a0 100644 (file)
--- a/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@ -1,5 +1,5 @@
 /*
- * 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");
@@ -22,22 +22,17 @@
 #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))
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
 #undef W_L
 #undef W_V
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 #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)
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
 #undef W_NLCODE
 #define W_NLCODE()     do { char *nlcode = TO_NLCODE(chtml20->conf); W_V(nlcode); } while (0)
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
 static char *s_chtml20_start_html_tag    (void *pdoc, Node *node);
 static char *s_chtml20_end_html_tag      (void *pdoc, Node *node);
@@ -118,6 +113,7 @@ 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);
 
@@ -393,6 +389,11 @@ tag_handler chtml20_handler[] = {
     s_chtml20_start_marquee_tag,
     s_chtml20_end_marquee_tag,
   },
+  /* tagNLMARK */
+  {
+    s_chtml20_newline_mark,
+    NULL,
+  },
 };
 
 /**
@@ -415,8 +416,8 @@ chxj_convert_chtml20(
   cookie_t           *cookie
 )
 {
-  char *dst = NULL;
-  char *ss;
+  char      *dst = NULL;
+  char      *ss;
   chtml20_t chtml20;
   Doc       doc;
 
@@ -440,7 +441,7 @@ chxj_convert_chtml20(
   chtml20.entryp = entryp;
   chtml20.cookie = cookie;
 
-  chxj_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.                           */
@@ -458,15 +459,7 @@ chxj_convert_chtml20(
 
   qs_parse_string(&doc,ss, strlen(ss));
 
-<<<<<<< HEAD:src/chxj_chtml20.c
-  if (! chxj_buffered_write_init(r->pool, &doc.buf)) {
-    ERR(r, "failed: chxj_buffered_write_init()");
-    DBG(r, "end chxj_convert_chtml20()");
-    return apr_pstrdup(r->pool, ss);
-  }
-=======
   chxj_buffered_write_init(r->pool, &doc.buf);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   /*--------------------------------------------------------------------------*/
   /* It converts it from CHTML to CHTML.                                      */
   /*--------------------------------------------------------------------------*/
@@ -513,11 +506,7 @@ s_init_chtml20(chtml20_t *chtml20, Doc *doc, request_rec *r, device_table *spec)
   doc->r        = r;
   chtml20->doc  = doc;
   chtml20->spec = spec;
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20->out  = qs_alloc_zero_byte_string(r);
-=======
   chtml20->out  = qs_alloc_zero_byte_string(r->pool);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   chtml20->conf = chxj_get_module_config(r->per_dir_config, &chxj_module);
 
   chtml20->doc->parse_mode = PARSE_MODE_CHTML;
@@ -578,6 +567,66 @@ s_chtml20_search_emoji(chtml20_t *chtml20, char *txt, char **rslt)
   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.
@@ -602,10 +651,6 @@ s_chtml20_start_html_tag(void *pdoc, Node *UNUSED(node))
   /* start HTML tag                                                           */
   /*--------------------------------------------------------------------------*/
   W_L("<html>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -630,10 +675,6 @@ s_chtml20_end_html_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   W_L("</html>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -697,7 +738,9 @@ s_chtml20_start_meta_tag(void *pdoc, Node *node)
         if (content_type_flag) {
           W_L(" ");
           W_V(name);
-          W_L("=\"text/html; charset=Windows-31J\"");
+          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);
@@ -735,7 +778,6 @@ s_chtml20_start_meta_tag(void *pdoc, Node *node)
     }
   }
   W_L(">");
-  W_NLCODE();
 
   return chtml20->out;
 }
@@ -776,11 +818,7 @@ s_chtml20_start_head_tag(void *pdoc, Node *UNUSED(node))
   doc     = chtml20->doc;
 
   W_L("<head>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -805,11 +843,7 @@ s_chtml20_end_head_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   W_L("</head>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -834,7 +868,6 @@ s_chtml20_start_title_tag(void *pdoc, Node *UNUSED(node))
   r       = doc->r;
 
   W_L("<title>");
-  W_NLCODE();
 
   return chtml20->out;
 }
@@ -860,11 +893,7 @@ s_chtml20_end_title_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   W_L("</title>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -898,22 +927,14 @@ s_chtml20_start_base_tag(void *pdoc, Node *node)
        attr = qs_get_next_attr(doc,attr)) {
     char *name  = qs_get_attr_name(doc,attr);
     char *value = qs_get_attr_value(doc,attr);
-<<<<<<< HEAD:src/chxj_chtml20.c
-    if (STRCASEEQ('h','H',"href",name)) {
-=======
     if (STRCASEEQ('h','H',"href", name)) {
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
       W_L(" href=\"");
       W_V(value);
       W_L("\"");
     }
   }
   W_L(">");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -1032,11 +1053,7 @@ s_chtml20_start_body_tag(void *pdoc, Node *node)
     }
   }
   W_L(">");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -1061,11 +1078,7 @@ s_chtml20_end_body_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   W_L("</body>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -1119,7 +1132,9 @@ s_chtml20_start_a_tag(void *pdoc, Node *node)
         /* CHTML1.0                                                           */
         /*--------------------------------------------------------------------*/
         value = chxj_encoding_parameter(r, value);
-        value = chxj_add_cookie_parameter(r, value, chtml20->cookie);
+        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("\"");
@@ -1257,7 +1272,6 @@ s_chtml20_end_a_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   W_L("</a>");
-  W_NLCODE();
 
   return chtml20->out;
 }
@@ -1274,17 +1288,10 @@ s_chtml20_end_a_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_br_tag(void *pdoc, Node *node) 
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t     *chtml20;
-  Doc           *doc;
-  request_rec   *r;
-  Attr *attr;
-=======
   chtml20_t   *chtml20;
   Doc         *doc;
   request_rec *r;
   Attr        *attr;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
   chtml20 = GET_CHTML20(pdoc);
   doc     = chtml20->doc;
@@ -1297,17 +1304,8 @@ s_chtml20_start_br_tag(void *pdoc, Node *node)
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
-<<<<<<< HEAD:src/chxj_chtml20.c
-    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);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
     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=\"");
@@ -1317,11 +1315,7 @@ s_chtml20_start_br_tag(void *pdoc, Node *node)
     }
   }
   W_L(">");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -1392,11 +1386,7 @@ s_chtml20_end_tr_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   W_L("<br>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -1501,24 +1491,29 @@ s_chtml20_end_font_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_form_tag(void *pdoc, Node *node) 
 {
-  chtml20_t   *chtml20;
-  Doc         *doc;
+  chtml20_t *chtml20;
+  Doc *doc;
   request_rec *r;
-  Attr        *attr;
+  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;
 
-  W_L("<form");
   /*--------------------------------------------------------------------------*/
   /* 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);
+    char *name;
+    char *value;
+    name  = qs_get_attr_name(doc,attr);
+    value = qs_get_attr_value(doc,attr);
+
     switch(*name) {
     case 'a':
     case 'A':
@@ -1526,12 +1521,8 @@ s_chtml20_start_form_tag(void *pdoc, Node *node)
         /*--------------------------------------------------------------------*/
         /* CHTML 1.0                                                          */
         /*--------------------------------------------------------------------*/
-        value = chxj_encoding_parameter(r, value);
-        value = chxj_add_cookie_parameter(r, value, chtml20->cookie);
-
-        W_L(" action=\"");
-        W_V(value);
-        W_L("\"");
+        attr_action = chxj_encoding_parameter(r, value);
+        attr_action= chxj_add_cookie_parameter(r, attr_action, chtml20->cookie);
       }
       break;
 
@@ -1541,9 +1532,7 @@ s_chtml20_start_form_tag(void *pdoc, Node *node)
         /*--------------------------------------------------------------------*/
         /* CHTML 1.0                                                          */
         /*--------------------------------------------------------------------*/
-        W_L(" method=\"");
-        W_V(value);
-        W_L("\"");
+        attr_method = apr_pstrdup(doc->pool, value);
       }
       break;
 
@@ -1561,9 +1550,37 @@ s_chtml20_start_form_tag(void *pdoc, Node *node)
       break;
     }
   }
-  W_L(">");
-  W_NLCODE();
 
+  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;
 }
 
@@ -1588,7 +1605,6 @@ s_chtml20_end_form_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   W_L("</form>");
-  W_NLCODE();
 
   return chtml20->out;
 }
@@ -1661,7 +1677,7 @@ s_chtml20_start_input_tag(void *pdoc, Node *node)
   }
   if (value && *value) {
     W_L(" value=\"");
-    W_V(value);
+    W_V(chxj_add_slash_to_doublequote(doc->pool, value));
     W_L("\"");
   }
   if (accesskey && *accesskey) {
@@ -1699,11 +1715,7 @@ s_chtml20_start_input_tag(void *pdoc, Node *node)
     W_L(" checked");
   }
   W_L(">");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -1775,7 +1787,6 @@ s_chtml20_end_center_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   W_L("</center>");
-  W_NLCODE();
 
   return chtml20->out;
 }
@@ -1801,7 +1812,6 @@ s_chtml20_start_ul_tag(void *pdoc, Node *UNUSED(node))
   r       = doc->r;
 
   W_L("<ul>");
-  W_NLCODE();
 
   return chtml20->out;
 }
@@ -1827,7 +1837,6 @@ s_chtml20_end_ul_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   W_L("</ul>");
-  W_NLCODE();
 
   return chtml20->out;
 }
@@ -1844,17 +1853,10 @@ s_chtml20_end_ul_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_ol_tag(void *pdoc, Node *node) 
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t     *chtml20;
-  Doc           *doc;
-  request_rec   *r;
-  Attr          *attr;
-=======
   chtml20_t   *chtml20;
   Doc         *doc;
   request_rec *r;
   Attr        *attr;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
   chtml20 = GET_CHTML20(pdoc);
   doc     = chtml20->doc;
@@ -1881,11 +1883,7 @@ s_chtml20_start_ol_tag(void *pdoc, Node *node)
     }
   }
   W_L(">");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -1910,7 +1908,6 @@ s_chtml20_end_ol_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   W_L("</ol>");
-  W_NLCODE();
 
   return chtml20->out;
 }
@@ -1927,17 +1924,10 @@ s_chtml20_end_ol_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_li_tag(void *pdoc, Node *node) 
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t     *chtml20;
-  Doc           *doc;
-  request_rec   *r;
-  Attr *attr;
-=======
   chtml20_t   *chtml20;
   Doc         *doc;
   request_rec *r;
   Attr        *attr;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
   chtml20 = GET_CHTML20(pdoc);
   doc     = chtml20->doc;
@@ -2004,25 +1994,13 @@ s_chtml20_start_hr_tag(void *pdoc, Node *node)
   doc     = chtml20->doc;
   r       = doc->r;
 
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("<hr");
   for (attr = qs_get_attr(doc,node);
        attr; 
        attr = qs_get_next_attr(doc,attr)) {
-<<<<<<< HEAD:src/chxj_chtml20.c
-    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);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
     switch(*name) {
     case 'a':
     case 'A':
@@ -2091,10 +2069,6 @@ s_chtml20_start_hr_tag(void *pdoc, Node *node)
     }
   }
   W_L(">");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -2161,13 +2135,7 @@ s_chtml20_start_img_tag(void *pdoc, Node *node)
 #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);
-        }
+        value = chxj_add_cookie_no_update_parameter(r, value);
         W_L(" src=\"");
         W_V(value);
         W_L("\"");
@@ -2175,13 +2143,7 @@ s_chtml20_start_img_tag(void *pdoc, Node *node)
         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);
-        }
+        value = chxj_add_cookie_no_update_parameter(r, value);
         W_L(" src=\"");
         W_V(value);
         W_L("\"");
@@ -2195,16 +2157,6 @@ s_chtml20_start_img_tag(void *pdoc, Node *node)
         /*--------------------------------------------------------------------*/
         /* CHTML 1.0                                                          */
         /*--------------------------------------------------------------------*/
-<<<<<<< HEAD:src/chxj_chtml20.c
-        if (value && (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("\"");
-=======
         if (value) {
           if (STRCASEEQ('t','T',"top",   value) ||
               STRCASEEQ('m','M',"middle",value) ||
@@ -2220,7 +2172,6 @@ s_chtml20_start_img_tag(void *pdoc, Node *node)
             W_L("middle");
             W_L("\"");
           }
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
         }
       }
       else if (strcasecmp(name, "alt"   ) == 0 && value && *value) {
@@ -2282,7 +2233,6 @@ s_chtml20_start_img_tag(void *pdoc, Node *node)
     }
   }
   W_L(">");
-  W_NLCODE();
   return chtml20->out;
 }
 
@@ -2383,10 +2333,6 @@ s_chtml20_start_select_tag(void *pdoc, Node *child)
     W_L(" multiple");
   }
   W_L(">");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -2409,10 +2355,6 @@ s_chtml20_end_select_tag(void *pdoc, Node *UNUSED(child))
   doc     = chtml20->doc;
 
   W_L("</select>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -2472,7 +2414,7 @@ s_chtml20_start_option_tag(void *pdoc, Node *child)
     }
   }
 
-  if (value && *value) {
+  if (value) {
     W_L(" value=\"");
     W_V(value);
     W_L("\"");
@@ -2532,18 +2474,8 @@ s_chtml20_start_div_tag(void *pdoc, Node *child)
   for (attr = qs_get_attr(doc,child);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
-<<<<<<< HEAD:src/chxj_chtml20.c
-
-    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);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
     if (STRCASEEQ('a','A', "align", nm)) {
       /*----------------------------------------------------------------------*/
       /* CHTML 1.0 (W3C version 3.2)                                          */
@@ -2574,27 +2506,10 @@ s_chtml20_start_div_tag(void *pdoc, Node *child)
 static char *
 s_chtml20_end_div_tag(void *pdoc, Node *UNUSED(child))
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t *chtml20;
-  Doc *doc;
-  request_rec *r;
-=======
   chtml20_t   *chtml20 = GET_CHTML20(pdoc);
   Doc         *doc     = chtml20->doc;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20 = GET_CHTML20(pdoc);
-  doc     = chtml20->doc;
-  r       = doc->r;
-
-=======
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("</div>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -2610,17 +2525,10 @@ s_chtml20_end_div_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_h1_tag(void *pdoc, Node *node) 
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t     *chtml20;
-  Doc           *doc;
-  request_rec   *r;
-  Attr          *attr;
-=======
   chtml20_t   *chtml20;
   Doc         *doc;
   request_rec *r;
   Attr        *attr;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
   chtml20 = GET_CHTML20(pdoc);
   doc     = chtml20->doc;
@@ -2630,15 +2538,8 @@ s_chtml20_start_h1_tag(void *pdoc, Node *node)
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
-<<<<<<< HEAD:src/chxj_chtml20.c
-    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);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
     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=\"");
@@ -2671,10 +2572,6 @@ s_chtml20_end_h1_tag(void *pdoc, Node *UNUSED(child))
   doc     = chtml20->doc;
 
   W_L("</h1>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -2693,11 +2590,7 @@ s_chtml20_start_h2_tag(void *pdoc, Node *node)
   chtml20_t   *chtml20;
   Doc         *doc;
   request_rec *r;
-<<<<<<< HEAD:src/chxj_chtml20.c
-  Attr *attr;
-=======
   Attr        *attr;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
   chtml20 = GET_CHTML20(pdoc);
   doc     = chtml20->doc;
@@ -2707,15 +2600,8 @@ s_chtml20_start_h2_tag(void *pdoc, Node *node)
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
-<<<<<<< HEAD:src/chxj_chtml20.c
-    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);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
     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=\"");
@@ -2745,12 +2631,7 @@ s_chtml20_end_h2_tag(void *pdoc, Node *UNUSED(child))
   Doc         *doc     = chtml20->doc;
 
   W_L("</h2>");
-  W_NLCODE();
 
-<<<<<<< HEAD:src/chxj_chtml20.c
-  W_L("</h2>");
-=======
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -2766,17 +2647,10 @@ s_chtml20_end_h2_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_h3_tag(void *pdoc, Node *node) 
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t     *chtml20;
-  Doc           *doc;
-  request_rec   *r;
-  Attr          *attr;
-=======
   chtml20_t   *chtml20;
   Doc         *doc;
   request_rec *r;
   Attr        *attr;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
   chtml20 = GET_CHTML20(pdoc);
   doc     = chtml20->doc;
@@ -2786,15 +2660,8 @@ s_chtml20_start_h3_tag(void *pdoc, Node *node)
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
-<<<<<<< HEAD:src/chxj_chtml20.c
-    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);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
     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=\"");
@@ -2824,10 +2691,6 @@ s_chtml20_end_h3_tag(void *pdoc, Node *UNUSED(child))
   Doc         *doc     = chtml20->doc;
 
   W_L("</h3>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -2843,17 +2706,10 @@ s_chtml20_end_h3_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_h4_tag(void *pdoc, Node *node)
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t     *chtml20;
-  Doc           *doc;
-  request_rec   *r;
-  Attr          *attr;
-=======
   chtml20_t   *chtml20;
   Doc         *doc;
   request_rec *r;
   Attr        *attr;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
   chtml20 = GET_CHTML20(pdoc);
   doc     = chtml20->doc;
@@ -2863,15 +2719,8 @@ s_chtml20_start_h4_tag(void *pdoc, Node *node)
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
-<<<<<<< HEAD:src/chxj_chtml20.c
-    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);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
     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=\"");
@@ -2901,10 +2750,6 @@ s_chtml20_end_h4_tag(void *pdoc, Node *UNUSED(child))
   Doc         *doc     = chtml20->doc;
 
   W_L("</h4>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -2920,17 +2765,10 @@ s_chtml20_end_h4_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_h5_tag(void *pdoc, Node *node)
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t     *chtml20;
-  Doc           *doc;
-  request_rec   *r;
-  Attr          *attr;
-=======
   chtml20_t   *chtml20;
   Doc         *doc;
   request_rec *r;
   Attr        *attr;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
   chtml20 = GET_CHTML20(pdoc);
   doc     = chtml20->doc;
@@ -2940,15 +2778,8 @@ s_chtml20_start_h5_tag(void *pdoc, Node *node)
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
-<<<<<<< HEAD:src/chxj_chtml20.c
-    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);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
     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=\"");
@@ -2978,10 +2809,6 @@ s_chtml20_end_h5_tag(void *pdoc, Node *UNUSED(child))
   Doc         *doc     = chtml20->doc;
 
   W_L("</h5>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -2997,17 +2824,10 @@ s_chtml20_end_h5_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_h6_tag(void *pdoc, Node *node)
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t     *chtml20;
-  Doc           *doc;
-  request_rec   *r;
-  Attr          *attr;
-=======
   chtml20_t   *chtml20;
   Doc         *doc;
   request_rec *r;
   Attr        *attr;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
   chtml20 = GET_CHTML20(pdoc);
   doc     = chtml20->doc;
@@ -3017,15 +2837,8 @@ s_chtml20_start_h6_tag(void *pdoc, Node *node)
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
-<<<<<<< HEAD:src/chxj_chtml20.c
-    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);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
     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=\"");
@@ -3054,18 +2867,7 @@ s_chtml20_end_h6_tag(void *pdoc, Node *UNUSED(child))
   chtml20_t   *chtml20 = GET_CHTML20(pdoc);
   Doc         *doc     = chtml20->doc;
 
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20 = GET_CHTML20(pdoc);
-  doc     = chtml20->doc;
-  r       = doc->r;
-
-=======
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("</h6>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -3086,7 +2888,6 @@ s_chtml20_start_pre_tag(void *pdoc, Node *UNUSED(node))
 
   chtml20->pre_flag++;
   W_L("<pre>");
-  W_NLCODE();
   return chtml20->out;
 }
 
@@ -3106,7 +2907,6 @@ s_chtml20_end_pre_tag(void *pdoc, Node *UNUSED(child))
   Doc         *doc     = chtml20->doc;
 
   W_L("</pre>");
-  W_NLCODE();
   chtml20->pre_flag--;
 
   return chtml20->out;
@@ -3124,19 +2924,11 @@ s_chtml20_end_pre_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_p_tag(void *pdoc, Node *node)
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t     *chtml20;
-  Doc           *doc;
-  request_rec   *r;
-  Attr *attr;
-  char *align = NULL;
-=======
   chtml20_t   *chtml20;
   Doc         *doc;
   request_rec *r;
   Attr        *attr;
   char        *align = NULL;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
   chtml20 = GET_CHTML20(pdoc);
   doc     = chtml20->doc;
@@ -3164,10 +2956,6 @@ s_chtml20_start_p_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   W_L(">");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -3192,7 +2980,6 @@ s_chtml20_end_p_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   W_L("</p>");
-  W_NLCODE();
   return chtml20->out;
 }
 
@@ -3299,10 +3086,6 @@ s_chtml20_start_textarea_tag(void *pdoc, Node *node)
     }
   }
   W_L(">");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -3321,18 +3104,7 @@ s_chtml20_end_textarea_tag(void *pdoc, Node *UNUSED(child))
   chtml20_t   *chtml20 = GET_CHTML20(pdoc);
   Doc         *doc     = chtml20->doc;
 
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20 = GET_CHTML20(pdoc);
-  doc     = chtml20->doc;
-  r       = doc->r;
-
-=======
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("</textarea>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   chtml20->textarea_flag--;
 
   return chtml20->out;
@@ -3403,87 +3175,6 @@ s_chtml20_text_tag(void *pdoc, Node *child)
   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;
-  Doc *doc;
-  chtml20 = GET_CHTML20(pdoc);
-  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;
-  Doc *doc;
-
-  chtml20 = GET_CHTML20(pdoc);
-  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;
-  Doc *doc;
-  chtml20 = GET_CHTML20(pdoc);
-  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;
-  Doc *doc;
-
-  chtml20 = GET_CHTML20(pdoc);
-  doc     = chtml20->doc;
-  W_L("</dir>");
-  return chtml20->out;
-}
-
 
 /**
  * It is a handler who processes the BLOCKQUOTE tag.
@@ -3499,7 +3190,6 @@ s_chtml20_start_blockquote_tag(void *pdoc, Node *UNUSED(child))
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   Doc       *doc     = chtml20->doc;
   W_L("<blockquote>");
-  W_NLCODE();
   return chtml20->out;
 }
 
@@ -3518,7 +3208,6 @@ s_chtml20_end_blockquote_tag(void *pdoc, Node *UNUSED(child))
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   Doc       *doc     = chtml20->doc;
   W_L("</blockquote>");
-  W_NLCODE();
   return chtml20->out;
 }
 
@@ -3537,7 +3226,6 @@ s_chtml20_start_dir_tag(void *pdoc, Node *UNUSED(child))
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   Doc       *doc     = chtml20->doc;
   W_L("<dir>");
-  W_NLCODE();
   return chtml20->out;
 }
 
@@ -3557,7 +3245,6 @@ s_chtml20_end_dir_tag(void *pdoc, Node *UNUSED(child))
   Doc       *doc     = chtml20->doc;
 
   W_L("</dir>");
-  W_NLCODE();
   return chtml20->out;
 }
 
@@ -3573,17 +3260,9 @@ s_chtml20_end_dir_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_dl_tag(void *pdoc, Node *UNUSED(child))
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t *chtml20;
-  Doc *doc;
-  chtml20 = GET_CHTML20(pdoc);
-  doc     = chtml20->doc;
-=======
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   Doc       *doc     = chtml20->doc;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("<dl>");
-  W_NLCODE();
   return chtml20->out;
 }
 
@@ -3599,20 +3278,9 @@ s_chtml20_start_dl_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_end_dl_tag(void *pdoc, Node *UNUSED(child))
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t *chtml20;
-  Doc *doc;
-  chtml20 = GET_CHTML20(pdoc);
-  doc     = chtml20->doc;
-=======
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   Doc       *doc     = chtml20->doc;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("</dl>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -3628,15 +3296,8 @@ s_chtml20_end_dl_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_dt_tag(void *pdoc, Node *UNUSED(child))
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t *chtml20;
-  Doc *doc;
-  chtml20 = GET_CHTML20(pdoc);
-  doc     = chtml20->doc;
-=======
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   Doc       *doc     = chtml20->doc;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("<dt>");
   return chtml20->out;
 }
@@ -3653,13 +3314,8 @@ s_chtml20_start_dt_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_end_dt_tag(void *pdoc, Node *UNUSED(child))
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t *chtml20;
-  chtml20 = GET_CHTML20(pdoc);
-=======
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -3675,15 +3331,8 @@ s_chtml20_end_dt_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_dd_tag(void *pdoc, Node *UNUSED(child))
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t *chtml20;
-  Doc *doc;
-  chtml20 = GET_CHTML20(pdoc);
-  doc     = chtml20->doc;
-=======
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   Doc       *doc     = chtml20->doc;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("<dd>");
   return chtml20->out;
 }
@@ -3700,21 +3349,11 @@ s_chtml20_start_dd_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_end_dd_tag(void *pdoc, Node *UNUSED(child))
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t *chtml20;
-  chtml20 = GET_CHTML20(pdoc);
-  return chtml20->out;
-}
-=======
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
   return chtml20->out;
 }
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
 /**
  * It is a hanmenuer who processes the MENU tag.
@@ -3727,21 +3366,10 @@ s_chtml20_end_dd_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_menu_tag(void *pdoc, Node *UNUSED(child))
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t *chtml20;
-  Doc *doc;
-  chtml20 = GET_CHTML20(pdoc);
-  doc     = chtml20->doc;
-=======
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   Doc       *doc     = chtml20->doc;
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("<menu>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -3758,17 +3386,9 @@ static char *
 s_chtml20_end_menu_tag(void *pdoc, Node *UNUSED(child))
 {
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
-<<<<<<< HEAD:src/chxj_chtml20.c
-  Doc *doc = chtml20->doc;
-=======
   Doc       *doc = chtml20->doc;
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("</menu>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
-  W_NLCODE();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 
@@ -3784,19 +3404,9 @@ s_chtml20_end_menu_tag(void *pdoc, Node *UNUSED(child))
 static char *
 s_chtml20_start_plaintext_tag(void *pdoc, Node *node)
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t *chtml20;
-  Doc *doc;
-=======
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   Doc       *doc     = chtml20->doc;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20 = GET_CHTML20(pdoc);
-  doc     = chtml20->doc;
-=======
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("<plaintext>");
   s_chtml20_start_plaintext_tag_inner(pdoc,node);
   return chtml20->out;
@@ -3805,18 +3415,10 @@ s_chtml20_start_plaintext_tag(void *pdoc, Node *node)
 static char *
 s_chtml20_start_plaintext_tag_inner(void *pdoc, Node *node)
 {
-<<<<<<< HEAD:src/chxj_chtml20.c
-  chtml20_t *chtml20;
-  Doc *doc;
-  Node *child;
-  chtml20 = GET_CHTML20(pdoc);
-  doc     = chtml20->doc;
-=======
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   Doc       *doc     = chtml20->doc;
   Node      *child;
 
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   for (child = qs_get_child_node(doc, node);
        child;
        child = qs_get_next_node(doc, child)) {
@@ -3841,8 +3443,6 @@ s_chtml20_end_plaintext_tag(void *pdoc, Node *UNUSED(child))
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   return chtml20->out;
 }
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
 
 /**
  * It is a hanblinker who processes the BLINK tag.
@@ -3876,49 +3476,9 @@ s_chtml20_end_blink_tag(void *pdoc, Node *UNUSED(child))
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
   Doc       *doc = chtml20->doc;
   W_L("</blink>");
-  W_NLCODE();
-  return chtml20->out;
-}
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
-
-<<<<<<< HEAD:src/chxj_chtml20.c
-/**
- * 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;
 }
 
-=======
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
 
 /**
  * It is a hanmarqueeer who processes the MARQUEE tag.
@@ -3932,13 +3492,8 @@ static char *
 s_chtml20_start_marquee_tag(void *pdoc, Node *node)
 {
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
-<<<<<<< HEAD:src/chxj_chtml20.c
-  Doc *doc = chtml20->doc;
-  Attr *attr;
-=======
   Doc       *doc = chtml20->doc;
   Attr      *attr;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("<marquee");
   /*--------------------------------------------------------------------------*/
   /* Get Attributes                                                           */
@@ -3987,16 +3542,21 @@ static char *
 s_chtml20_end_marquee_tag(void *pdoc, Node *UNUSED(child))
 {
   chtml20_t *chtml20 = GET_CHTML20(pdoc);
-<<<<<<< HEAD:src/chxj_chtml20.c
-  Doc *doc = chtml20->doc;
-=======
   Doc       *doc = chtml20->doc;
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   W_L("</marquee>");
-<<<<<<< HEAD:src/chxj_chtml20.c
-=======
+  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();
->>>>>>>   * updated new trunk.:src/chxj_chtml20.c
   return chtml20->out;
 }
 /*