From aeb07aa3294a1ab74bd644b15dffd337eaaf801f Mon Sep 17 00:00:00 2001 From: coltware Date: Sat, 27 Mar 2010 13:01:33 +0000 Subject: [PATCH] ?Bug? push -> nopush --- src/chxj_ixhtml10.c | 56 ++++++++++++++++++++++-------------------- src/chxj_jxhtml.c | 54 ++++++++++++++++++++-------------------- src/chxj_xhtml_mobile_1_0.c | 60 ++++++++++++++++++++++----------------------- 3 files changed, 86 insertions(+), 84 deletions(-) diff --git a/src/chxj_ixhtml10.c b/src/chxj_ixhtml10.c index c721dd3d..061df8fd 100755 --- a/src/chxj_ixhtml10.c +++ b/src/chxj_ixhtml10.c @@ -1071,7 +1071,7 @@ s_ixhtml10_start_body_tag(void *pdoc, Node *node) } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *bgcolor_prop = chxj_css_get_property_value(doc, style, "background-color"); @@ -1354,7 +1354,7 @@ s_ixhtml10_start_a_tag(void *pdoc, Node *node) W_L(">"); if (IS_CSS_ON(ixhtml10->entryp)) { - s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); } return ixhtml10->out; @@ -2115,7 +2115,7 @@ s_ixhtml10_start_font_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -2301,7 +2301,7 @@ s_ixhtml10_start_form_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *text_align_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); @@ -2745,7 +2745,7 @@ s_ixhtml10_start_center_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -2863,7 +2863,7 @@ s_ixhtml10_start_li_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "list-style-type"); css_property_t *cur; @@ -2987,7 +2987,7 @@ s_ixhtml10_start_ol_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "list-style-type"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3105,7 +3105,7 @@ s_ixhtml10_start_p_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *text_align_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); @@ -3220,7 +3220,7 @@ s_ixhtml10_start_pre_tag(void *pdoc, Node *node) } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3305,7 +3305,7 @@ s_ixhtml10_start_ul_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "list-style-type"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3955,7 +3955,7 @@ s_ixhtml10_start_select_tag(void *pdoc, Node *node) W_L(">"); if (IS_CSS_ON(ixhtml10->entryp)) { - s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); } return ixhtml10->out; @@ -4039,7 +4039,7 @@ s_ixhtml10_start_option_tag(void *pdoc, Node *node) W_L(">"); if (IS_CSS_ON(ixhtml10->entryp)) { - s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); } return ixhtml10->out; @@ -4613,7 +4613,7 @@ s_ixhtml10_start_blockquote_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *font_size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -4735,7 +4735,7 @@ s_ixhtml10_start_dir_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -4854,7 +4854,7 @@ s_ixhtml10_start_dl_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -4970,7 +4970,7 @@ s_ixhtml10_start_dt_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -5076,7 +5076,7 @@ s_ixhtml10_start_dd_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -5193,7 +5193,7 @@ s_ixhtml10_start_h1_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5311,7 +5311,7 @@ s_ixhtml10_start_h2_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5426,7 +5426,7 @@ s_ixhtml10_start_h3_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5541,7 +5541,7 @@ s_ixhtml10_start_h4_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5657,7 +5657,7 @@ s_ixhtml10_start_h5_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5773,7 +5773,7 @@ s_ixhtml10_start_h6_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5884,7 +5884,7 @@ s_ixhtml10_start_menu_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -6056,7 +6056,7 @@ s_ixhtml10_start_blink_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -6188,7 +6188,7 @@ s_ixhtml10_start_marquee_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -6448,7 +6448,7 @@ s_ixhtml10_start_span_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(ixhtml10->entryp)) { - css_prop_list_t *style = s_ixhtml10_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -6602,9 +6602,11 @@ s_ixhtml10_end_span_tag(void *pdoc, Node *UNUSED(node)) Doc *doc = ixhtml10->doc; W_L(""); + /* if (IS_CSS_ON(ixhtml10->entryp)) { chxj_css_pop_prop_list(ixhtml10->css_prop_stack); } + */ return ixhtml10->out; } diff --git a/src/chxj_jxhtml.c b/src/chxj_jxhtml.c index b642fae5..1df54688 100755 --- a/src/chxj_jxhtml.c +++ b/src/chxj_jxhtml.c @@ -1117,7 +1117,7 @@ s_jxhtml_start_body_tag(void *pdoc, Node *node) } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *bgcolor_prop = chxj_css_get_property_value(doc, style, "background-color"); @@ -1372,7 +1372,7 @@ s_jxhtml_start_a_tag(void *pdoc, Node *node) W_L(">"); if (IS_CSS_ON(jxhtml->entryp)) { - s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); } return jxhtml->out; @@ -2087,7 +2087,7 @@ s_jxhtml_start_font_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -2299,7 +2299,7 @@ s_jxhtml_start_form_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *text_align_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); @@ -2726,7 +2726,7 @@ s_jxhtml_start_center_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -2845,7 +2845,7 @@ s_jxhtml_start_li_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "list-style-type"); css_property_t *cur; @@ -2969,7 +2969,7 @@ s_jxhtml_start_ol_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "list-style-type"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3088,7 +3088,7 @@ s_jxhtml_start_p_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *text_align_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); @@ -3202,7 +3202,7 @@ s_jxhtml_start_pre_tag(void *pdoc, Node *node) } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3287,7 +3287,7 @@ s_jxhtml_start_ul_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "list-style-type"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3933,7 +3933,7 @@ s_jxhtml_start_select_tag(void *pdoc, Node *node) W_L(">"); if (IS_CSS_ON(jxhtml->entryp)) { - s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); } return jxhtml->out; @@ -4017,7 +4017,7 @@ s_jxhtml_start_option_tag(void *pdoc, Node *node) W_L(">"); if (IS_CSS_ON(jxhtml->entryp)) { - s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); } return jxhtml->out; @@ -4573,7 +4573,7 @@ s_jxhtml_start_blockquote_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *font_size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -4695,7 +4695,7 @@ s_jxhtml_start_dir_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -4814,7 +4814,7 @@ s_jxhtml_start_dl_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -4930,7 +4930,7 @@ s_jxhtml_start_dt_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -5036,7 +5036,7 @@ s_jxhtml_start_dd_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -5153,7 +5153,7 @@ s_jxhtml_start_h1_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5269,7 +5269,7 @@ s_jxhtml_start_h2_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5384,7 +5384,7 @@ s_jxhtml_start_h3_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5499,7 +5499,7 @@ s_jxhtml_start_h4_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5615,7 +5615,7 @@ s_jxhtml_start_h5_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5731,7 +5731,7 @@ s_jxhtml_start_h6_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -5842,7 +5842,7 @@ s_jxhtml_start_menu_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -6014,7 +6014,7 @@ s_jxhtml_start_blink_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -6146,7 +6146,7 @@ s_jxhtml_start_marquee_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -6406,7 +6406,7 @@ s_jxhtml_start_span_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(jxhtml->entryp)) { - css_prop_list_t *style = s_jxhtml_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_jxhtml_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c index 1fb45567..d8cafeca 100755 --- a/src/chxj_xhtml_mobile_1_0.c +++ b/src/chxj_xhtml_mobile_1_0.c @@ -1077,7 +1077,7 @@ s_xhtml_1_0_start_body_tag(void *pdoc, Node *node) } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *bgcolor_prop = chxj_css_get_property_value(doc, style, "background-color"); @@ -1185,9 +1185,11 @@ s_xhtml_1_0_end_body_tag(void *pdoc, Node *UNUSED(child)) Doc *doc = xhtml->doc; W_L(""); + /* if (IS_CSS_ON(xhtml->entryp)) { chxj_css_pop_prop_list(xhtml->css_prop_stack); } + */ return xhtml->out; } @@ -1282,7 +1284,7 @@ s_xhtml_1_0_start_a_tag(void *pdoc, Node *node) W_L(">"); if (IS_CSS_ON(xhtml->entryp)) { - s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); } return xhtml->out; @@ -1966,7 +1968,7 @@ s_xhtml_1_0_start_font_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -2169,7 +2171,7 @@ s_xhtml_1_0_start_form_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *text_align_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); @@ -2606,7 +2608,7 @@ s_xhtml_1_0_start_center_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -2918,7 +2920,7 @@ s_xhtml_1_0_start_pre_tag(void *pdoc, Node *node) } if (IS_CSS_ON(xhtml->entryp)) { - s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); } xhtml->pre_flag++; @@ -2990,7 +2992,7 @@ s_xhtml_1_0_start_p_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *text_align_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); @@ -3110,7 +3112,7 @@ s_xhtml_1_0_start_ul_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "list-style-type"); css_property_t *cur; @@ -3195,7 +3197,7 @@ s_xhtml_1_0_start_h1_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3300,7 +3302,7 @@ s_xhtml_1_0_start_h2_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3405,7 +3407,7 @@ s_xhtml_1_0_start_h3_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3511,7 +3513,7 @@ s_xhtml_1_0_start_h4_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3617,7 +3619,7 @@ s_xhtml_1_0_start_h5_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3723,7 +3725,7 @@ s_xhtml_1_0_start_h6_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "text-align"); css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear"); @@ -3841,7 +3843,7 @@ s_xhtml_1_0_start_ol_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "list-style-type"); css_property_t *cur; @@ -3947,7 +3949,7 @@ s_xhtml_1_0_start_li_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "list-style-type"); css_property_t *cur; @@ -4340,7 +4342,7 @@ s_xhtml_1_0_start_select_tag(void *pdoc, Node *node) } W_L(">"); if (IS_CSS_ON(xhtml->entryp)) { - s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); } return xhtml->out; @@ -4417,7 +4419,7 @@ s_xhtml_1_0_start_option_tag(void *pdoc, Node *node) } W_L(">"); if (IS_CSS_ON(xhtml->entryp)) { - s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); } return xhtml->out; } @@ -4942,7 +4944,7 @@ s_xhtml_1_0_start_blockquote_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *font_size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -5054,7 +5056,7 @@ s_xhtml_1_0_start_dir_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -5172,7 +5174,7 @@ s_xhtml_1_0_start_dl_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -5279,7 +5281,7 @@ s_xhtml_1_0_start_dt_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -5386,7 +5388,7 @@ s_xhtml_1_0_start_dd_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -5498,7 +5500,7 @@ s_xhtml_1_0_start_menu_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -5668,7 +5670,7 @@ s_xhtml_1_0_start_blink_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -5804,7 +5806,7 @@ s_xhtml_1_0_start_marquee_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -6099,7 +6101,7 @@ s_xhtml_1_0_start_span_tag(void *pdoc, Node *node) } } if (IS_CSS_ON(xhtml->entryp)) { - css_prop_list_t *style = s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style); + css_prop_list_t *style = s_xhtml_1_0_nopush_and_get_now_style(pdoc, node, attr_style); if (style) { css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color"); css_property_t *size_prop = chxj_css_get_property_value(doc, style, "font-size"); @@ -6253,9 +6255,7 @@ s_xhtml_1_0_end_span_tag(void *pdoc, Node *UNUSED(node)) Doc *doc = xhtml->doc; W_L(""); - if (IS_CSS_ON(xhtml->entryp)) { - chxj_css_pop_prop_list(xhtml->css_prop_stack); - } + return xhtml->out; } -- 2.11.0