From 8d308e8edd031c9a202ccdc20d67cf203f4769b9 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 5 May 2015 12:40:11 +0200 Subject: epub: Use the correct word order in border style names. --- source/html/css-apply.c | 70 ++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'source/html') diff --git a/source/html/css-apply.c b/source/html/css-apply.c index e0e62e3b..d78d82ee 100644 --- a/source/html/css-apply.c +++ b/source/html/css-apply.c @@ -400,21 +400,21 @@ static void add_shorthand_border_width(fz_css_match *match, fz_css_value *value, int spec) { add_shorthand_trbl(match, value, spec, - "border-width-top", "border-width-right", "border-width-bottom", "border-width-left"); + "border-top-width", "border-right-width", "border-bottom-width", "border-left-width"); } static void add_shorthand_border_color(fz_css_match *match, fz_css_value *value, int spec) { add_shorthand_trbl(match, value, spec, - "border-color-top", "border-color-right", "border-color-bottom", "border-color-left"); + "border-top-color", "border-right-color", "border-bottom-color", "border-left-color"); } static void add_shorthand_border_style(fz_css_match *match, fz_css_value *value, int spec) { add_shorthand_trbl(match, value, spec, - "border-style-top", "border-style-right", "border-style-bottom", "border-style-left"); + "border-top-style", "border-right-style", "border-bottom-style", "border-left-style"); } static void @@ -424,41 +424,41 @@ add_shorthand_border(fz_css_match *match, fz_css_value *value, int spec, int T, { if (value->type == CSS_HASH) { - if (T) add_property(match, "border-color-top", value, spec); - if (R) add_property(match, "border-color-right", value, spec); - if (B) add_property(match, "border-color-bottom", value, spec); - if (L) add_property(match, "border-color-left", value, spec); + if (T) add_property(match, "border-top-color", value, spec); + if (R) add_property(match, "border-right-color", value, spec); + if (B) add_property(match, "border-bottom-color", value, spec); + if (L) add_property(match, "border-left-color", value, spec); } else if (value->type == CSS_KEYWORD) { if (keyword_in_list(value->data, border_width_kw, nelem(border_width_kw))) { - if (T) add_property(match, "border-width-top", value, spec); - if (R) add_property(match, "border-width-right", value, spec); - if (B) add_property(match, "border-width-bottom", value, spec); - if (L) add_property(match, "border-width-left", value, spec); + if (T) add_property(match, "border-top-width", value, spec); + if (R) add_property(match, "border-right-width", value, spec); + if (B) add_property(match, "border-bottom-width", value, spec); + if (L) add_property(match, "border-left-width", value, spec); } else if (keyword_in_list(value->data, border_style_kw, nelem(border_style_kw))) { - if (T) add_property(match, "border-style-top", value, spec); - if (R) add_property(match, "border-style-right", value, spec); - if (B) add_property(match, "border-style-bottom", value, spec); - if (L) add_property(match, "border-style-left", value, spec); + if (T) add_property(match, "border-top-style", value, spec); + if (R) add_property(match, "border-right-style", value, spec); + if (B) add_property(match, "border-bottom-style", value, spec); + if (L) add_property(match, "border-left-style", value, spec); } else if (keyword_in_list(value->data, color_kw, nelem(color_kw))) { - if (T) add_property(match, "border-color-top", value, spec); - if (R) add_property(match, "border-color-right", value, spec); - if (B) add_property(match, "border-color-bottom", value, spec); - if (L) add_property(match, "border-color-left", value, spec); + if (T) add_property(match, "border-top-color", value, spec); + if (R) add_property(match, "border-right-color", value, spec); + if (B) add_property(match, "border-bottom-color", value, spec); + if (L) add_property(match, "border-left-color", value, spec); } } else { - if (T) add_property(match, "border-width-top", value, spec); - if (R) add_property(match, "border-width-right", value, spec); - if (B) add_property(match, "border-width-bottom", value, spec); - if (L) add_property(match, "border-width-left", value, spec); + if (T) add_property(match, "border-top-width", value, spec); + if (R) add_property(match, "border-right-width", value, spec); + if (B) add_property(match, "border-bottom-width", value, spec); + if (L) add_property(match, "border-left-width", value, spec); } value = value->next; } @@ -1003,20 +1003,20 @@ fz_apply_css_style(fz_context *ctx, fz_html_font_set *set, fz_css_style *style, style->color = color_from_property(match, "color", black); style->background_color = color_from_property(match, "background-color", transparent); - style->border_style[0] = border_style_from_property(match, "border-style-top"); - style->border_style[1] = border_style_from_property(match, "border-style-right"); - style->border_style[2] = border_style_from_property(match, "border-style-bottom"); - style->border_style[3] = border_style_from_property(match, "border-style-left"); + style->border_style[0] = border_style_from_property(match, "border-top-style"); + style->border_style[1] = border_style_from_property(match, "border-right-style"); + style->border_style[2] = border_style_from_property(match, "border-bottom-style"); + style->border_style[3] = border_style_from_property(match, "border-left-style"); - style->border_color[0] = color_from_property(match, "border-color-top", style->color); - style->border_color[1] = color_from_property(match, "border-color-right", style->color); - style->border_color[2] = color_from_property(match, "border-color-bottom", style->color); - style->border_color[3] = color_from_property(match, "border-color-left", style->color); + style->border_color[0] = color_from_property(match, "border-top-color", style->color); + style->border_color[1] = color_from_property(match, "border-right-color", style->color); + style->border_color[2] = color_from_property(match, "border-bottom-color", style->color); + style->border_color[3] = color_from_property(match, "border-left-color", style->color); - style->border_width[0] = border_width_from_property(match, "border-width-top"); - style->border_width[1] = border_width_from_property(match, "border-width-right"); - style->border_width[2] = border_width_from_property(match, "border-width-bottom"); - style->border_width[3] = border_width_from_property(match, "border-width-left"); + style->border_width[0] = border_width_from_property(match, "border-top-width"); + style->border_width[1] = border_width_from_property(match, "border-right-width"); + style->border_width[2] = border_width_from_property(match, "border-bottom-width"); + style->border_width[3] = border_width_from_property(match, "border-left-width"); { const char *font_family = string_from_property(match, "font-family", "serif"); -- cgit v1.2.3