From fe05bc51ee70190516d6cc65f03e343bfdc4f849 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Fri, 28 Nov 2014 11:53:32 +0100 Subject: html: Make font-size keywords relative sized based on a 1.2 scaling factor. --- source/html/css-apply.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'source/html/css-apply.c') diff --git a/source/html/css-apply.c b/source/html/css-apply.c index 48d4f04d..9a6d7a89 100644 --- a/source/html/css-apply.c +++ b/source/html/css-apply.c @@ -812,15 +812,15 @@ fz_apply_css_style(fz_context *ctx, fz_html_font_set *set, fz_css_style *style, value = value_from_property(match, "font-size"); if (value) { - if (!strcmp(value->data, "xx-large")) style->font_size = make_number(20, N_NUMBER); - else if (!strcmp(value->data, "x-large")) style->font_size = make_number(16, N_NUMBER); - else if (!strcmp(value->data, "large")) style->font_size = make_number(14, N_NUMBER); - else if (!strcmp(value->data, "medium")) style->font_size = make_number(12, N_NUMBER); - else if (!strcmp(value->data, "small")) style->font_size = make_number(10, N_NUMBER); - else if (!strcmp(value->data, "x-small")) style->font_size = make_number(8, N_NUMBER); - else if (!strcmp(value->data, "xx-small")) style->font_size = make_number(6, N_NUMBER); - else if (!strcmp(value->data, "larger")) style->font_size = make_number(1.25f, N_SCALE); - else if (!strcmp(value->data, "smaller")) style->font_size = make_number(0.8f, N_SCALE); + if (!strcmp(value->data, "xx-large")) style->font_size = make_number(1.73, N_SCALE); + else if (!strcmp(value->data, "x-large")) style->font_size = make_number(1.44, N_SCALE); + else if (!strcmp(value->data, "large")) style->font_size = make_number(1.2, N_SCALE); + else if (!strcmp(value->data, "medium")) style->font_size = make_number(1, N_SCALE); + else if (!strcmp(value->data, "small")) style->font_size = make_number(0.83, N_SCALE); + else if (!strcmp(value->data, "x-small")) style->font_size = make_number(0.69, N_SCALE); + else if (!strcmp(value->data, "xx-small")) style->font_size = make_number(0.69, N_SCALE); + else if (!strcmp(value->data, "larger")) style->font_size = make_number(1.2f, N_SCALE); + else if (!strcmp(value->data, "smaller")) style->font_size = make_number(1/1.2f, N_SCALE); else style->font_size = number_from_value(value, 12, N_NUMBER); } else -- cgit v1.2.3