diff options
Diffstat (limited to 'source/html/html-layout.c')
| -rw-r--r-- | source/html/html-layout.c | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/source/html/html-layout.c b/source/html/html-layout.c index 26d821f2..fcb8eb8e 100644 --- a/source/html/html-layout.c +++ b/source/html/html-layout.c @@ -1019,7 +1019,7 @@ static void measure_string(fz_context *ctx, fz_html_flow *node, hb_buffer_t *hb_ node->x = 0; node->y = 0; node->w = 0; - node->h = fz_from_css_number_scale(node->box->style.line_height, em, em, em); + node->h = fz_from_css_number_scale(node->box->style.line_height, em); s = get_node_text(ctx, node); init_string_walker(ctx, &walker, hb_buf, node->bidi_level & 1, node->box->style.font, node->script, node->markup_lang, s); @@ -1220,7 +1220,7 @@ static void layout_flow_inline(fz_context *ctx, fz_html_box *box, fz_html_box *t while (box) { box->y = top->y; - box->em = fz_from_css_number(box->style.font_size, top->em, top->em); + box->em = fz_from_css_number(box->style.font_size, top->em, top->em, top->em); if (box->down) layout_flow_inline(ctx, box->down, box); box = box->next; @@ -1233,8 +1233,8 @@ static void layout_flow(fz_context *ctx, fz_html_box *box, fz_html_box *top, flo float line_w, candidate_w, indent, break_w, nonbreak_w; int line_align, align; - float em = box->em = fz_from_css_number(box->style.font_size, top->em, top->em); - indent = box->is_first_flow ? fz_from_css_number(top->style.text_indent, em, top->w) : 0; + float em = box->em = fz_from_css_number(box->style.font_size, top->em, top->em, top->em); + indent = box->is_first_flow ? fz_from_css_number(top->style.text_indent, em, top->w, 0) : 0; align = top->style.text_align; if (box->markup_dir == FZ_BIDI_RTL) @@ -1369,6 +1369,7 @@ static int layout_block_page_break(fz_context *ctx, fz_html_box *box, float page static float layout_block(fz_context *ctx, fz_html_box *box, fz_html_box *top, float page_h, float vertical, hb_buffer_t *hb_buf) { fz_html_box *child; + float auto_width; int first; fz_css_style *style = &box->style; @@ -1376,22 +1377,22 @@ static float layout_block(fz_context *ctx, fz_html_box *box, fz_html_box *top, f float *border = box->border; float *padding = box->padding; - float em = box->em = fz_from_css_number(style->font_size, top->em, top->em); + float em = box->em = fz_from_css_number(style->font_size, top->em, top->em, top->em); - margin[0] = fz_from_css_number(style->margin[0], em, top->w); - margin[1] = fz_from_css_number(style->margin[1], em, top->w); - margin[2] = fz_from_css_number(style->margin[2], em, top->w); - margin[3] = fz_from_css_number(style->margin[3], em, top->w); + margin[0] = fz_from_css_number(style->margin[0], em, top->w, 0); + margin[1] = fz_from_css_number(style->margin[1], em, top->w, 0); + margin[2] = fz_from_css_number(style->margin[2], em, top->w, 0); + margin[3] = fz_from_css_number(style->margin[3], em, top->w, 0); - padding[0] = fz_from_css_number(style->padding[0], em, top->w); - padding[1] = fz_from_css_number(style->padding[1], em, top->w); - padding[2] = fz_from_css_number(style->padding[2], em, top->w); - padding[3] = fz_from_css_number(style->padding[3], em, top->w); + padding[0] = fz_from_css_number(style->padding[0], em, top->w, 0); + padding[1] = fz_from_css_number(style->padding[1], em, top->w, 0); + padding[2] = fz_from_css_number(style->padding[2], em, top->w, 0); + padding[3] = fz_from_css_number(style->padding[3], em, top->w, 0); - border[0] = style->border_style_0 ? fz_from_css_number(style->border_width[0], em, top->w) : 0; - border[1] = style->border_style_1 ? fz_from_css_number(style->border_width[1], em, top->w) : 0; - border[2] = style->border_style_2 ? fz_from_css_number(style->border_width[2], em, top->w) : 0; - border[3] = style->border_style_3 ? fz_from_css_number(style->border_width[3], em, top->w) : 0; + border[0] = style->border_style_0 ? fz_from_css_number(style->border_width[0], em, top->w, 0) : 0; + border[1] = style->border_style_1 ? fz_from_css_number(style->border_width[1], em, top->w, 0) : 0; + border[2] = style->border_style_2 ? fz_from_css_number(style->border_width[2], em, top->w, 0) : 0; + border[3] = style->border_style_3 ? fz_from_css_number(style->border_width[3], em, top->w, 0) : 0; /* TODO: remove 'vertical' margin adjustments across automatic page breaks */ @@ -1399,7 +1400,8 @@ static float layout_block(fz_context *ctx, fz_html_box *box, fz_html_box *top, f vertical = 0; box->x = top->x + margin[L] + border[L] + padding[L]; - box->w = top->w - (margin[L] + margin[R] + border[L] + border[R] + padding[L] + padding[R]); + auto_width = top->w - (margin[L] + margin[R] + border[L] + border[R] + padding[L] + padding[R]); + box->w = fz_from_css_number(style->width, em, auto_width, auto_width); if (margin[T] > vertical) margin[T] -= vertical; @@ -1435,7 +1437,7 @@ static float layout_block(fz_context *ctx, fz_html_box *box, fz_html_box *top, f } else if (child->type == BOX_BREAK) { - box->h += fz_from_css_number_scale(style->line_height, em, em, em); + box->h += fz_from_css_number_scale(style->line_height, em); vertical = 0; first = 0; } @@ -1454,7 +1456,7 @@ static float layout_block(fz_context *ctx, fz_html_box *box, fz_html_box *top, f /* reserve space for the list mark */ if (box->list_item && box->h == 0) { - box->h += fz_from_css_number_scale(style->line_height, em, em, em); + box->h += fz_from_css_number_scale(style->line_height, em); vertical = 0; } @@ -1778,7 +1780,7 @@ static void draw_list_mark(fz_context *ctx, fz_html_box *box, float page_top, fl } else { - float h = fz_from_css_number_scale(box->style.line_height, box->em, box->em, box->em); + float h = fz_from_css_number_scale(box->style.line_height, box->em); float a = box->em * 0.8; float d = box->em * 0.2; if (a + d > h) @@ -2449,10 +2451,10 @@ fz_layout_html(fz_context *ctx, fz_html *html, float w, float h, float em) fz_var(hb_buf); fz_var(unlocked); - html->page_margin[T] = fz_from_css_number(html->root->style.margin[T], em, em); - html->page_margin[B] = fz_from_css_number(html->root->style.margin[B], em, em); - html->page_margin[L] = fz_from_css_number(html->root->style.margin[L], em, em); - html->page_margin[R] = fz_from_css_number(html->root->style.margin[R], em, em); + html->page_margin[T] = fz_from_css_number(html->root->style.margin[T], em, em, 0); + html->page_margin[B] = fz_from_css_number(html->root->style.margin[B], em, em, 0); + html->page_margin[L] = fz_from_css_number(html->root->style.margin[L], em, em, 0); + html->page_margin[R] = fz_from_css_number(html->root->style.margin[R], em, em, 0); html->page_w = w - html->page_margin[L] - html->page_margin[R]; html->page_h = h - html->page_margin[T] - html->page_margin[B]; |