diff options
| author | corvid <corvid@lavabit.com> | 2010-03-30 23:48:17 +0000 |
|---|---|---|
| committer | corvid <corvid@lavabit.com> | 2010-03-30 23:48:17 +0000 |
| commit | 565407d069abeab5a11cdefa1bca403ce531a6fb (patch) | |
| tree | db013c7970a84a4914e6be984845cbeb9f04ef5a /src | |
| parent | d20b6d2fceb41d61e110da21e29b9f6cabdb4563 (diff) | |
white-space: pre-wrap
thread:
http://lists.auriga.wearlab.de/pipermail/dillo-dev/2010-March/007420.html
Diffstat (limited to 'src')
| -rw-r--r-- | src/cssparser.cc | 2 | ||||
| -rw-r--r-- | src/html.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/cssparser.cc b/src/cssparser.cc index f1d8faef..332a989a 100644 --- a/src/cssparser.cc +++ b/src/cssparser.cc @@ -111,7 +111,7 @@ static const char *const Css_vertical_align_vals[] = { }; static const char *const Css_white_space_vals[] = { - "normal", "pre", "nowrap", NULL + "normal", "pre", "nowrap", "pre-wrap", "pre-line", NULL }; const CssPropertyInfo Css_property_info[CSS_PROPERTY_LAST] = { diff --git a/src/html.cc b/src/html.cc index 4a7b50f3..1a5d8caf 100644 --- a/src/html.cc +++ b/src/html.cc @@ -3497,7 +3497,8 @@ static void Html_process_tag(DilloHtml *html, char *tag, int tagsize) break; if (S_TOP(html)->parse_mode != DILLO_HTML_PARSE_MODE_PRE && - html->styleEngine->style ()->whiteSpace == WHITE_SPACE_PRE) { + (html->styleEngine->style ()->whiteSpace == WHITE_SPACE_PRE || + html->styleEngine->style ()->whiteSpace == WHITE_SPACE_PRE_WRAP)) { S_TOP(html)->parse_mode = DILLO_HTML_PARSE_MODE_PRE; html->pre_column = 0; html->PreFirstChar = true; |