From 9ed192faebdbde7d15734027a546217ed15ad7a8 Mon Sep 17 00:00:00 2001 From: konn Date: Tue, 29 Apr 2008 10:28:41 +0000 Subject: [PATCH] * Added NewLIneCode for CHTML5.0 converter. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_12_0@2564 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_chtml50.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/src/chxj_chtml50.c b/src/chxj_chtml50.c index 320b0ed5..1480dd20 100644 --- a/src/chxj_chtml50.c +++ b/src/chxj_chtml50.c @@ -29,6 +29,7 @@ #define W_L(X) do { chtml50->out = BUFFERED_WRITE_LITERAL(chtml50->out, &doc->buf, (X)); } while(0) #define W_V(X) do { chtml50->out = (X) ? BUFFERED_WRITE_VALUE(chtml50->out, &doc->buf, (X)) \ : BUFFERED_WRITE_LITERAL(chtml50->out, &doc->buf, ""); } while(0) +#define W_NLCODE() do { char *nlcode = TO_NLCODE(chtml50->conf); W_V(nlcode); } while (0) static char *s_chtml50_start_html_tag (void *pdoc, Node *node); static char *s_chtml50_end_html_tag (void *pdoc, Node *node); @@ -579,6 +580,7 @@ s_chtml50_start_html_tag(void *pdoc, Node *UNUSED(node)) /* start HTML tag */ /*--------------------------------------------------------------------------*/ W_L(""); + W_NLCODE(); return chtml50->out; } @@ -599,6 +601,8 @@ s_chtml50_end_html_tag(void *pdoc, Node *UNUSED(child)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); + return chtml50->out; } @@ -700,6 +704,8 @@ s_chtml50_start_meta_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); + return chtml50->out; } @@ -736,6 +742,7 @@ s_chtml50_start_head_tag(void* pdoc, Node* UNUSED(node)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -756,6 +763,7 @@ s_chtml50_end_head_tag(void *pdoc, Node *UNUSED(node)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -796,6 +804,7 @@ s_chtml50_end_title_tag(void *pdoc, Node *UNUSED(child)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -837,6 +846,8 @@ s_chtml50_start_base_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); + return chtml50->out; } @@ -929,6 +940,8 @@ s_chtml50_start_body_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); + return chtml50->out; } @@ -951,6 +964,7 @@ s_chtml50_end_body_tag(void *pdoc, Node *UNUSED(child)) doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -1098,6 +1112,7 @@ s_chtml50_end_a_tag(void *pdoc, Node *UNUSED(child)) doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -1140,6 +1155,7 @@ s_chtml50_start_br_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); return chtml50->out; } @@ -1198,6 +1214,7 @@ s_chtml50_end_tr_tag(void *pdoc, Node *UNUSED(child)) r = doc->r; W_L("
"); + W_NLCODE(); return chtml50->out; } @@ -1271,6 +1288,7 @@ s_chtml50_end_font_tag(void *pdoc, Node *UNUSED(child)) r = doc->r; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -1332,6 +1350,7 @@ s_chtml50_start_form_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); return chtml50->out; } @@ -1354,6 +1373,7 @@ s_chtml50_end_form_tag(void *pdoc, Node *UNUSED(child)) doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -1463,6 +1483,8 @@ s_chtml50_start_input_tag(void *pdoc, Node *node) W_L(" checked"); } W_L(">"); + W_NLCODE(); + return chtml50->out; } @@ -1502,6 +1524,7 @@ s_chtml50_start_center_tag(void *pdoc, Node *UNUSED(node)) doc = chtml50->doc; W_L("
"); + W_NLCODE(); return chtml50->out; } @@ -1525,6 +1548,7 @@ s_chtml50_end_center_tag(void *pdoc, Node *UNUSED(child)) doc = chtml50->doc; W_L("
"); + W_NLCODE(); return chtml50->out; } @@ -1603,6 +1627,8 @@ s_chtml50_start_hr_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); + return chtml50->out; } @@ -1752,6 +1778,8 @@ s_chtml50_start_img_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); + return chtml50->out; } @@ -1830,6 +1858,8 @@ s_chtml50_start_select_tag(void *pdoc, Node *child) W_L(" multiple"); } W_L(">"); + W_NLCODE(); + return chtml50->out; } @@ -1849,6 +1879,8 @@ s_chtml50_end_select_tag(void *pdoc, Node *UNUSED(child)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); + return chtml50->out; } @@ -1971,6 +2003,8 @@ s_chtml50_start_div_tag(void *pdoc, Node *child) W_L("\""); } W_L(">"); + W_NLCODE(); + return chtml50->out; } @@ -1990,6 +2024,7 @@ s_chtml50_end_div_tag(void *pdoc, Node *UNUSED(node)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -2027,6 +2062,7 @@ s_chtml50_start_ul_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); return chtml50->out; } @@ -2046,6 +2082,7 @@ s_chtml50_end_ul_tag(void *pdoc, Node *UNUSED(child)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -2067,6 +2104,7 @@ s_chtml50_start_pre_tag(void *pdoc, Node *UNUSED(node)) chtml50->pre_flag++; W_L("
");
+  W_NLCODE();
 
   return chtml50->out;
 }
@@ -2087,6 +2125,7 @@ s_chtml50_end_pre_tag(void *pdoc, Node *UNUSED(child))
   Doc           *doc     = chtml50->doc;
 
   W_L("
"); + W_NLCODE(); chtml50->pre_flag--; return chtml50->out; @@ -2136,6 +2175,7 @@ s_chtml50_start_p_tag(void *pdoc, Node *node) W_L("\""); } W_L(">"); + W_NLCODE(); return chtml50->out; } @@ -2158,6 +2198,7 @@ s_chtml50_end_p_tag(void *pdoc, Node *UNUSED(child)) doc = chtml50->doc; W_L("

"); + W_NLCODE(); return chtml50->out; } @@ -2204,6 +2245,7 @@ s_chtml50_start_ol_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); return chtml50->out; } @@ -2224,6 +2266,7 @@ s_chtml50_end_ol_tag(void *pdoc, Node *UNUSED(node)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -2347,6 +2390,7 @@ s_chtml50_end_h1_tag(void *pdoc, Node *UNUSED(child)) doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -2407,6 +2451,7 @@ s_chtml50_end_h2_tag(void *pdoc, Node *UNUSED(child)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -2468,6 +2513,7 @@ s_chtml50_end_h3_tag(void *pdoc, Node *UNUSED(child)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -2528,6 +2574,7 @@ s_chtml50_end_h4_tag(void *pdoc, Node *UNUSED(child)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -2588,6 +2635,7 @@ s_chtml50_end_h5_tag(void *pdoc, Node *UNUSED(child)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -2648,6 +2696,7 @@ s_chtml50_end_h6_tag(void *pdoc, Node *UNUSED(child)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -2708,6 +2757,7 @@ s_chtml50_start_textarea_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); return chtml50->out; } @@ -2727,6 +2777,7 @@ s_chtml50_end_textarea_tag(void *pdoc, Node *UNUSED(child)) Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); chtml50->textarea_flag--; return chtml50->out; @@ -2834,6 +2885,7 @@ s_chtml50_start_blockquote_tag(void *pdoc, Node *UNUSED(child)) chtml50_t *chtml50 = GET_CHTML50(pdoc); Doc *doc = chtml50->doc; W_L("
"); + W_NLCODE(); return chtml50->out; } @@ -2852,6 +2904,7 @@ s_chtml50_end_blockquote_tag(void *pdoc, Node *UNUSED(child)) chtml50_t *chtml50 = GET_CHTML50(pdoc); Doc *doc = chtml50->doc; W_L("
"); + W_NLCODE(); return chtml50->out; } @@ -2885,6 +2938,7 @@ s_chtml50_start_dir_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); return chtml50->out; } @@ -2903,6 +2957,7 @@ s_chtml50_end_dir_tag(void *pdoc, Node *UNUSED(child)) chtml50_t *chtml50 = GET_CHTML50(pdoc); Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -2921,6 +2976,7 @@ s_chtml50_start_dl_tag(void *pdoc, Node *UNUSED(child)) chtml50_t *chtml50 = GET_CHTML50(pdoc); Doc *doc = chtml50->doc; W_L("
"); + W_NLCODE(); return chtml50->out; } @@ -2939,6 +2995,7 @@ s_chtml50_end_dl_tag(void *pdoc, Node *UNUSED(child)) chtml50_t *chtml50 = GET_CHTML50(pdoc); Doc *doc = chtml50->doc; W_L("
"); + W_NLCODE(); return chtml50->out; } @@ -3086,6 +3143,7 @@ s_chtml50_end_marquee_tag(void *pdoc, Node *UNUSED(child)) chtml50_t *chtml50 = GET_CHTML50(pdoc); Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -3122,6 +3180,7 @@ s_chtml50_end_blink_tag(void *pdoc, Node *UNUSED(child)) chtml50_t *chtml50 = GET_CHTML50(pdoc); Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } @@ -3158,6 +3217,7 @@ s_chtml50_start_menu_tag(void *pdoc, Node *node) } } W_L(">"); + W_NLCODE(); return chtml50->out; } @@ -3176,6 +3236,7 @@ s_chtml50_end_menu_tag(void *pdoc, Node *UNUSED(child)) chtml50_t *chtml50 = GET_CHTML50(pdoc); Doc *doc = chtml50->doc; W_L(""); + W_NLCODE(); return chtml50->out; } -- 2.11.0