aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/css.cc6
-rw-r--r--src/css.hh2
-rw-r--r--src/html.cc14
-rw-r--r--src/styleengine.cc4
-rw-r--r--src/styleengine.hh4
-rw-r--r--src/table.cc8
6 files changed, 19 insertions, 19 deletions
diff --git a/src/css.cc b/src/css.cc
index 8248464b..e9111f03 100644
--- a/src/css.cc
+++ b/src/css.cc
@@ -152,14 +152,14 @@ CssContext::~CssContext () {
}
void CssContext::apply (CssPropertyList *props, Doctree *docTree,
- CssPropertyList *tagStyle, CssPropertyList *nonCss) {
+ CssPropertyList *tagStyle, CssPropertyList *nonCssHints) {
for (int o = CSS_PRIMARY_USER_AGENT; o <= CSS_PRIMARY_USER; o++)
if (sheet[o])
sheet[o]->apply (props, docTree);
- if (nonCss)
- nonCss->apply (props);
+ if (nonCssHints)
+ nonCssHints->apply (props);
for (int o = CSS_PRIMARY_AUTHOR; o <= CSS_PRIMARY_USER_IMPORTANT; o++)
if (sheet[o])
diff --git a/src/css.hh b/src/css.hh
index 90dc2130..1af0e811 100644
--- a/src/css.hh
+++ b/src/css.hh
@@ -247,7 +247,7 @@ class CssContext {
void addRule (CssRule *rule, CssPrimaryOrder order);
void apply (CssPropertyList *props,
Doctree *docTree,
- CssPropertyList *tagStyle, CssPropertyList *nonCss);
+ CssPropertyList *tagStyle, CssPropertyList *nonCssHints);
};
#endif
diff --git a/src/html.cc b/src/html.cc
index 2bd8914d..29bbfcf8 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -1736,7 +1736,7 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize)
S_TOP(html)->current_bg_color);
}
- html->styleEngine->setNonCssProperties (&props);
+ html->styleEngine->setNonCssHints (&props);
html->dw->setStyle (html->styleEngine->style ());
S_TOP(html)->parse_mode = DILLO_HTML_PARSE_MODE_BODY;
@@ -1770,7 +1770,7 @@ static void Html_tag_open_p(DilloHtml *html, const char *tag, int tagsize)
DW2TB(html->dw)->addParbreak (9, html->styleEngine->style ());
}
a_Html_tag_set_align_attr (html, &props, tag, tagsize);
- html->styleEngine->setNonCssProperties (&props);
+ html->styleEngine->setNonCssHints (&props);
}
/*
@@ -1864,7 +1864,7 @@ static void Html_tag_open_h(DilloHtml *html, const char *tag, int tagsize)
DW2TB(html->dw)->addParbreak (9, html->styleEngine->style ());
a_Html_tag_set_align_attr (html, &props, tag, tagsize);
- html->styleEngine->setNonCssProperties (&props);
+ html->styleEngine->setNonCssHints (&props);
/* First finalize unclosed H tags (we test if already named anyway) */
a_Menu_pagemarks_set_text(html->bw, html->Stash->str);
@@ -1931,7 +1931,7 @@ static void Html_tag_open_font(DilloHtml *html, const char *tag, int tagsize)
if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "face")))
props.set (CssProperty::CSS_PROPERTY_FONT_FAMILY, attrbuf);
- html->styleEngine->setNonCssProperties (&props);
+ html->styleEngine->setNonCssHints (&props);
}
/*
@@ -2462,7 +2462,7 @@ static void Html_tag_open_a(DilloHtml *html, const char *tag, int tagsize)
props.set (CssProperty::PROPERTY_X_LINK, Html_set_new_link(html, &url));
- html->styleEngine->setNonCssProperties (&props);
+ html->styleEngine->setNonCssHints (&props);
}
if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "name"))) {
@@ -2626,7 +2626,7 @@ static void Html_tag_open_ol(DilloHtml *html, const char *tag, int tagsize)
listStyleType = LIST_STYLE_TYPE_UPPER_ROMAN;
props.set (CssProperty::CSS_PROPERTY_LIST_STYLE_TYPE, listStyleType);
- html->styleEngine->setNonCssProperties (&props);
+ html->styleEngine->setNonCssHints (&props);
}
DW2TB(html->dw)->addParbreak (9, html->styleEngine->style ());
@@ -3038,7 +3038,7 @@ static void Html_tag_open_div(DilloHtml *html, const char *tag, int tagsize)
DW2TB(html->dw)->addParbreak (0, html->styleEngine->style ());
a_Html_tag_set_align_attr (html, &props, tag, tagsize);
- html->styleEngine->setNonCssProperties (&props);
+ html->styleEngine->setNonCssHints (&props);
}
/*
diff --git a/src/styleengine.cc b/src/styleengine.cc
index 9eaca826..d1d3b022 100644
--- a/src/styleengine.cc
+++ b/src/styleengine.cc
@@ -69,10 +69,10 @@ void StyleEngine::startElement (int element, const char *id, const char *klass,
* \brief set properties that were definded using (mostly deprecated) HTML
* attributes (e.g. bgColor).
*/
-void StyleEngine::setNonCssProperties (CssPropertyList *props) {
+void StyleEngine::setNonCssHints (CssPropertyList *nonCssHints) {
if (stack->getRef (stack->size () - 1)->style)
stack->getRef (stack->size () - 1)->style->unref ();
- style0 (props); // evaluate now, so caller can free props
+ style0 (nonCssHints); // evaluate now, so caller can free nonCssHints
}
/**
diff --git a/src/styleengine.hh b/src/styleengine.hh
index 7a646d3b..7f41705e 100644
--- a/src/styleengine.hh
+++ b/src/styleengine.hh
@@ -17,7 +17,7 @@ class StyleEngine : public Doctree {
lout::misc::SimpleVector <Node> *stack;
CssContext *cssContext;
- dw::core::style::Style *style0 (CssPropertyList *nonCssProperties = NULL);
+ dw::core::style::Style *style0 (CssPropertyList *nonCssHints = NULL);
void apply (dw::core::style::StyleAttrs *attrs, CssPropertyList *props);
int computeValue (CssLength value, dw::core::style::Font *font);
@@ -40,7 +40,7 @@ class StyleEngine : public Doctree {
void startElement (int tag, const char *id = NULL, const char *klass = NULL,
const char *style = NULL);
void endElement (int tag);
- void setNonCssProperties (CssPropertyList *props);
+ void setNonCssHints (CssPropertyList *nonCssHints);
void setPseudoClass (const char *pseudoClass);
inline dw::core::style::Style *style () {
diff --git a/src/table.cc b/src/table.cc
index ee93c5b0..900ae1a2 100644
--- a/src/table.cc
+++ b/src/table.cc
@@ -98,7 +98,7 @@ void Html_tag_open_table(DilloHtml *html, const char *tag, int tagsize)
}
}
- html->styleEngine->setNonCssProperties (&props);
+ html->styleEngine->setNonCssHints (&props);
/* The style for the cells */
table_cell_props = new CssPropertyList ();
@@ -159,14 +159,14 @@ void Html_tag_open_tr(DilloHtml *html, const char *tag, int tagsize)
}
}
- html->styleEngine->setNonCssProperties (&props);
+ html->styleEngine->setNonCssHints (&props);
((dw::Table*)S_TOP(html)->table)->addRow (html->styleEngine->style ());
if (a_Html_get_attr (html, tag, tagsize, "align")) {
S_TOP(html)->cell_text_align_set = TRUE;
a_Html_tag_set_align_attr (html, &props, tag, tagsize);
- html->styleEngine->setNonCssProperties (&props);
+ html->styleEngine->setNonCssHints (&props);
}
table_cell_props = new CssPropertyList (*S_TOP(html)->table_cell_props);
@@ -283,7 +283,7 @@ static void Html_tag_open_table_cell(DilloHtml *html,
}
}
- html->styleEngine->setNonCssProperties (&props);
+ html->styleEngine->setNonCssHints (&props);
if (html->styleEngine->style ()->textAlign
== TEXT_ALIGN_STRING)