diff options
| author | Jorge Arellano Cid <jcid@dillo.org> | 2009-01-22 08:31:44 -0300 |
|---|---|---|
| committer | Jorge Arellano Cid <jcid@dillo.org> | 2009-01-22 08:31:44 -0300 |
| commit | 3c08987366e61ed0835a48cdd677a012171fc1e4 (patch) | |
| tree | fcf00addf837d120c8191b53f56dd38128f36fb7 | |
| parent | 277814bf2e1b8b056a57f8c319ecd305690e386a (diff) | |
| parent | 98330dc9464729ea29d7e3624f1247094ca24de8 (diff) | |
merge
| -rw-r--r-- | src/css.cc | 4 | ||||
| -rw-r--r-- | src/cssparser.cc | 4 | ||||
| -rw-r--r-- | src/styleengine.cc | 12 |
3 files changed, 14 insertions, 6 deletions
@@ -347,7 +347,7 @@ void CssContext::addRule (CssRule *rule, CssPrimaryOrder order) { void CssContext::buildUserAgentStyle () { const char *cssBuf = - "body {background-color: #dcd1ba; font-family: helvetica; color: black;" + "body {background-color: #dcd1ba; font-family: sans; color: black;" " margin: 5px}" "big {font-size: 1.17em}" "blockquote, dd {margin-left: 40px; margin-right: 40px}" @@ -382,7 +382,7 @@ void CssContext::buildUserAgentStyle () { "td {border-style: inset; padding: 2px}" "thead, tbody, tfoot { vertical-align: middle}" "th { font-weight: bolder; text-align: center}" - "code, tt, pre, samp, kbd {font-family: courier}"; + "code, tt, pre, samp, kbd {font-family: monospace}"; a_Css_parse (this, cssBuf, strlen (cssBuf), 0, CSS_ORIGIN_USER_AGENT); } diff --git a/src/cssparser.cc b/src/cssparser.cc index a50ef9da..4eb6049b 100644 --- a/src/cssparser.cc +++ b/src/cssparser.cc @@ -579,7 +579,7 @@ static bool Css_token_matches_property(CssParser * parser, return parser->ttype == CSS_TK_STRING; case CSS_TYPE_SYMBOL: - return parser->ttype == CSS_TK_SYMBOL; + return parser->ttype == CSS_TK_SYMBOL || parser->ttype == CSS_TK_STRING; case CSS_TYPE_FONT_WEIGHT: if (parser->ttype == CSS_TK_DECINT) { @@ -728,7 +728,7 @@ static bool Css_parse_value(CssParser * parser, break; case CSS_TYPE_SYMBOL: - if (parser->ttype == CSS_TK_SYMBOL) { + if (parser->ttype == CSS_TK_SYMBOL || parser->ttype == CSS_TK_STRING) { val->strVal = dStrdup(parser->tval); ret = true; Css_next_token(parser); diff --git a/src/styleengine.cc b/src/styleengine.cc index fbf9c8ee..d5089d71 100644 --- a/src/styleengine.cc +++ b/src/styleengine.cc @@ -30,7 +30,7 @@ StyleEngine::StyleEngine (dw::core::Layout *layout) { Node *n = stack->getRef (stack->size () - 1); /* Create a dummy font, attribute, and tag for the bottom of the stack. */ - font_attrs.name = "helvetica"; + font_attrs.name = prefs.vw_fontname; font_attrs.size = (int) (14 * prefs.font_factor + 0.5); font_attrs.weight = CssProperty::CSS_FONT_WEIGHT_NORMAL; font_attrs.style = FONT_STYLE_NORMAL; @@ -170,7 +170,15 @@ void StyleEngine::apply (StyleAttrs *attrs, CssPropertyList *props) { switch (p->name) { case CssProperty::CSS_PROPERTY_FONT_FAMILY: - fontAttrs.name = p->value.strVal; + // \todo memory management of font name strings + // \todo handle comma separated lists of font names + // \todo handle sans-serif, cursive, fantasy + if (strcmp (p->value.strVal, "sans") == 0) + fontAttrs.name = prefs.vw_fontname; + else if (strcmp (p->value.strVal, "monospace") == 0) + fontAttrs.name = prefs.fw_fontname; + else + fontAttrs.name = p->value.strVal; break; case CssProperty::CSS_PROPERTY_FONT_SIZE: parentFont = stack->get (stack->size () - 2).style->font; |