summaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2005-07-31 15:55:36 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2005-07-31 15:55:36 +0000
commit0686a7664995dd460507087338b3b420499f4eff (patch)
tree59ce3167a49e86ca357ed92b1eafdb2baa842f14 /css
parent0455ab1c5445ba34b63e5a8618427dd6099e949c (diff)
downloadnetsurf-0686a7664995dd460507087338b3b420499f4eff.tar.gz
netsurf-0686a7664995dd460507087338b3b420499f4eff.tar.bz2
[project @ 2005-07-31 15:55:36 by jmb]
Make length -> pixel conversion more accurate. Fix handling of CSS <numbers> Fix border widths. svn path=/import/netsurf/; revision=1832
Diffstat (limited to 'css')
-rw-r--r--css/css.c19
-rw-r--r--css/scanner.l2
2 files changed, 12 insertions, 9 deletions
diff --git a/css/css.c b/css/css.c
index 706e27561..b6d872e09 100644
--- a/css/css.c
+++ b/css/css.c
@@ -300,13 +300,13 @@ const struct css_style css_blank_style = {
{ CSS_BACKGROUND_POSITION_PERCENT, { 0.0 } } },
CSS_BACKGROUND_REPEAT_REPEAT,
{ { 0x000000, { CSS_BORDER_WIDTH_LENGTH,
- { 0, CSS_UNIT_PX } }, CSS_BORDER_STYLE_NONE },
+ { 2, CSS_UNIT_PX } }, CSS_BORDER_STYLE_NONE },
{ 0x000000, { CSS_BORDER_WIDTH_LENGTH,
- { 0, CSS_UNIT_PX } }, CSS_BORDER_STYLE_NONE },
+ { 2, CSS_UNIT_PX } }, CSS_BORDER_STYLE_NONE },
{ 0x000000, { CSS_BORDER_WIDTH_LENGTH,
- { 0, CSS_UNIT_PX } }, CSS_BORDER_STYLE_NONE },
+ { 2, CSS_UNIT_PX } }, CSS_BORDER_STYLE_NONE },
{ 0x000000, { CSS_BORDER_WIDTH_LENGTH,
- { 0, CSS_UNIT_PX } }, CSS_BORDER_STYLE_NONE } },
+ { 2, CSS_UNIT_PX } }, CSS_BORDER_STYLE_NONE } },
CSS_BORDER_COLLAPSE_INHERIT,
{ CSS_BORDER_SPACING_INHERIT,
{ 0, CSS_UNIT_PX }, { 0, CSS_UNIT_PX } },
@@ -2980,11 +2980,14 @@ float css_len2px(const struct css_length *length,
case CSS_UNIT_EM: return length->value * css_len2px(&style->font_size.value.length, 0);
case CSS_UNIT_EX: return length->value * css_len2px(&style->font_size.value.length, 0) * 0.6;
case CSS_UNIT_PX: return length->value;
+ /* RISC OS assumes 90dpi */
case CSS_UNIT_IN: return length->value * 90.0;
- case CSS_UNIT_CM: return length->value * 35.0;
- case CSS_UNIT_MM: return length->value * 3.5;
- case CSS_UNIT_PT: return length->value * 90.0 / 72.0;
- case CSS_UNIT_PC: return length->value * 90.0 / 6.0;
+ case CSS_UNIT_CM: return length->value * 35.43307087;
+ case CSS_UNIT_MM: return length->value * 3.543307087;
+ /* 1pt = 1in/72 */
+ case CSS_UNIT_PT: return length->value * 1.25;
+ /* 1pc = 1pt * 12 */
+ case CSS_UNIT_PC: return length->value * 15.0;
default: break;
}
return 0;
diff --git a/css/scanner.l b/css/scanner.l
index 4a9b272b0..d40007e87 100644
--- a/css/scanner.l
+++ b/css/scanner.l
@@ -51,7 +51,7 @@ nmchar = [-a-zA-Z0-9_] | nonascii | escape;
nmstart = [a-zA-Z_] | nonascii | escape;
ident = [-]? nmstart nmchar*;
name = nmchar+;
-num = [+-]? [0-9]+ | [0-9]* "." [0-9]+;
+num = [+-]? ([0-9]+ | [0-9]* "." [0-9]+);
nl = "\n" | "\r\n" | "\r" | "\f";
string1 = "\"" ([\t !#$%&(-~] | "\\" nl | "'" | nonascii | escape)* "\"";
string2 = "'" ([\t !#$%&(-~] | "\\" nl | "\""| nonascii | escape)* "'";