summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2005-02-04 19:41:59 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2005-02-04 19:41:59 +0000
commit430d7bc1ae7b3780bb3935c73486c5110b027302 (patch)
tree7e9f8443a4725da20b25211e9061b7e6efe42ecb
parentb07582615bc805ed6b99820412e0f81c49e534c6 (diff)
downloadnetsurf-430d7bc1ae7b3780bb3935c73486c5110b027302.tar.gz
netsurf-430d7bc1ae7b3780bb3935c73486c5110b027302.tar.bz2
[project @ 2005-02-04 19:41:59 by jmb]
Prevent assertion failure on pages with white-space: pre-wrap / pre-line svn path=/import/netsurf/; revision=1492
-rw-r--r--render/box.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/render/box.c b/render/box.c
index 94c891629..8b043ce50 100644
--- a/render/box.c
+++ b/render/box.c
@@ -578,7 +578,12 @@ bool convert_xml_to_box(xmlNode *n, struct content *content,
/* white-space: pre */
char *text = cnv_space2nbsp(n->content);
char *current;
- assert(parent_style->white_space == CSS_WHITE_SPACE_PRE);
+ /* note: pre-wrap/pre-line are unimplemented */
+ assert(parent_style->white_space == CSS_WHITE_SPACE_PRE ||
+ parent_style->white_space ==
+ CSS_WHITE_SPACE_PRE_LINE ||
+ parent_style->white_space ==
+ CSS_WHITE_SPACE_PRE_WRAP);
if (!text)
goto no_memory;
if (parent_style->text_transform != CSS_TEXT_TRANSFORM_NONE)