diff options
| author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-27 16:10:57 +0000 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-27 16:10:57 +0000 |
| commit | 80cfe125983eb126a9f8afd974196cf0bf347877 (patch) | |
| tree | e6fe993a7ad2fc6859509b661d2d4f721e846e60 /src/parse/properties/page.c | |
| parent | 46e3a946d7b2f7d68f3753a37c6f68a732a36f01 (diff) | |
| download | libcss-80cfe125983eb126a9f8afd974196cf0bf347877.tar.gz libcss-80cfe125983eb126a9f8afd974196cf0bf347877.tar.bz2 | |
Fix libcss to use new libwapcaplet behaviour.
TODO: update the tests to include a refcounting proof
svn path=/trunk/libcss/; revision=10162
Diffstat (limited to 'src/parse/properties/page.c')
| -rw-r--r-- | src/parse/properties/page.c | 51 |
1 files changed, 17 insertions, 34 deletions
diff --git a/src/parse/properties/page.c b/src/parse/properties/page.c index cc2d734..d28ed15 100644 --- a/src/parse/properties/page.c +++ b/src/parse/properties/page.c @@ -48,8 +48,7 @@ css_error parse_orphans(css_language *c, return CSS_INVALID; } - if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + if ((lwc_string_caseless_isequal( token->idata, c->strings[INHERIT], &match) == lwc_error_ok && match)) { flags |= FLAG_INHERIT; @@ -130,33 +129,27 @@ css_error parse_page_break_after(css_language *c, return CSS_INVALID; } - if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + if ((lwc_string_caseless_isequal( ident->idata, c->strings[INHERIT], &match) == lwc_error_ok && match)) { flags |= FLAG_INHERIT; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[AUTO], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_AFTER_AUTO; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[ALWAYS], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_AFTER_ALWAYS; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[AVOID], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_AFTER_AVOID; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[LEFT], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_AFTER_LEFT; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[RIGHT], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_AFTER_RIGHT; @@ -213,33 +206,27 @@ css_error parse_page_break_before(css_language *c, return CSS_INVALID; } - if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + if ((lwc_string_caseless_isequal( ident->idata, c->strings[INHERIT], &match) == lwc_error_ok && match)) { flags |= FLAG_INHERIT; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[AUTO], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_BEFORE_AUTO; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[ALWAYS], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_BEFORE_ALWAYS; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[AVOID], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_BEFORE_AVOID; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[LEFT], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_BEFORE_LEFT; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[RIGHT], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_BEFORE_RIGHT; @@ -296,18 +283,15 @@ css_error parse_page_break_inside(css_language *c, return CSS_INVALID; } - if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + if ((lwc_string_caseless_isequal( ident->idata, c->strings[INHERIT], &match) == lwc_error_ok && match)) { flags |= FLAG_INHERIT; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[AUTO], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_INSIDE_AUTO; - } else if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + } else if ((lwc_string_caseless_isequal( ident->idata, c->strings[AVOID], &match) == lwc_error_ok && match)) { value = PAGE_BREAK_INSIDE_AVOID; @@ -367,8 +351,7 @@ css_error parse_widows(css_language *c, return CSS_INVALID; } - if ((lwc_context_string_caseless_isequal( - c->sheet->dictionary, + if ((lwc_string_caseless_isequal( token->idata, c->strings[INHERIT], &match) == lwc_error_ok && match)) { flags |= FLAG_INHERIT; |