diff options
Diffstat (limited to 'source/html')
| -rw-r--r-- | source/html/css-apply.c | 18 | ||||
| -rw-r--r-- | source/html/html-layout.c | 2 |
2 files changed, 10 insertions, 10 deletions
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 diff --git a/source/html/html-layout.c b/source/html/html-layout.c index 42392d03..0f304616 100644 --- a/source/html/html-layout.c +++ b/source/html/html-layout.c @@ -13,7 +13,7 @@ static const char *default_css = "h3{font-size:1.17em;margin:.83em 0}" "h4,p,blockquote,ul,ol,dl,dir,menu{margin:1.12em 0}" "h5{font-size:.83em;margin:1.5em 0}" -"h6{font-size:.75em;margin:1.67em 0}" +"h6{font-size:.67em;margin:1.67em 0}" "h1,h2,h3,h4,h5,h6,b,strong{font-weight:bold}" "blockquote{margin-left:40px;margin-right:40px}" "i,cite,em,var,address{font-style:italic}" |