merge

2 files changed, 21 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 911a715f..a27b729e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,10 @@ Dillo project
 dillo-2.2.1 [not released yet]
 
 +- Implemented "View source" as a dpi.
-   Patch: Jorge Arellano Cid
+ - Accept application/xhtml+xml.
+ - Small caps support.
+ - Border-collapse, border-style properties.
+   Patches: Jorge Arellano Cid
 +- Configurable User-Agent HTTP header.
    Patch: Alexander Voigt, corvid
 +- Include Accept header in HTTP queries.
@@ -19,9 +22,18 @@ dillo-2.2.1 [not released yet]
  - Handle white-space: pre-wrap and pre-line.
  - Support for the word-spacing property.
  - Fix segfault with https and self-signed certificates.
+ - Text-indent property.
    Patches: corvid
++- Reintroduce bg_color dillorc option.
+ - Make Dillo compile with Clang.
+   Patches: Johannes Hofmann
 +- Implement line-height.
-   Patch: Johannes Hofmann, corvid
+ - Draw image maps when image not loaded.
+   Patches: Johannes Hofmann, corvid
++- Support @media rules.
+ - Implement media-conditional @import rules.
+ - Configure/Makefile cleanup.
+   Patches: Jeremy Henty
 
 -----------------------------------------------------------------------------
 
diff --git a/src/styleengine.cc b/src/styleengine.cc
index 9e859aa0..aa09f286 100644
--- a/src/styleengine.cc
+++ b/src/styleengine.cc
@@ -619,6 +619,13 @@ bool StyleEngine::computeValue (int *dest, CssLength value, Font *font) {
       case CSS_LENGTH_TYPE_EX:
          *dest = roundInt (CSS_LENGTH_VALUE(value) * font->xHeight);
         return true;
+       case CSS_LENGTH_TYPE_NONE:
+         // length values other than 0 without unit are only allowed
+         // in special cases (line-height) and have to be handled
+         // separately.
+         assert ((int) CSS_LENGTH_VALUE (value) == 0);
+         *dest = 0;
+         return true;
       default:
          break;
    }