What was the change below to layout.c for? The width of the inline container shouldn't depend on the contents, and I don't think this is correct for right-justified or centred text. Sorry about the delay, I only noticed this today. James /** * Layout lines of text or inline boxes with floats. * * \param box inline container * \param width horizontal space available * \param cont ancestor box which defines horizontal space, for floats * \param cx box position relative to cont * \param cy box position relative to cont * \param content memory pool for any new boxes * \return true on success, false on memory exhaustion */ bool layout_inline_container(struct box *inline_container, int width, struct box *cont, int cx, int cy, struct content *content) { bool first_line = true; bool has_text_children; struct box *c, *next; int y = 0; + int curwidth,maxwidth = width; assert(inline_container->type == BOX_INLINE_CONTAINER); LOG(("inline_container %p, width %i, cont %p, cx %i, cy %i", inline_container, width, cont, cx, cy)); has_text_children = false; for (c = inline_container->children; c; c = c->next) if ((!c->object && c->text && c->length) || c->type == BOX_BR) has_text_children = true; - + + /** \todo fix wrapping so that a box with horizontal scrollbar will shrink back to 'width' if no word is wider than 'width' (Or just set curwidth = width and have the multiword lines wrap to the min width) */ for (c = inline_container->children; c; ) { LOG(("c %p", c)); - if (!layout_line(c, width, &y, cx, cy + y, cont, first_line, + curwidth = inline_container->width; + if (!layout_line(c, &curwidth, &y, cx, cy + y, cont, first_line, has_text_children, content, &next)) return false; + maxwidth = max(maxwidth,curwidth); c = next; first_line = false; } - inline_container->width = width; + inline_container->width = maxwidth; inline_container->height = y; return true; }