entrouvert
/
debian-weasyprint
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Ignore overflow_wrap: break-word when calculating min-content width 

See https://drafts.csswg.org/css-text-3/#overflow-wrap-property

Fix #582.
This commit is contained in:
Guillaume Ayoub 2018-03-05 01:23:32 +01:00
parent f631cec184
commit f8993cacb0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
weasyprint/layout/preferred.py
View File

@ -255,7 +255,8 @@ def inline_line_widths(context, box, outer, is_line_start, minimum,
_, _, new_resume_at, width, _, _ = (
text.split_first_line(
child_text[resume_at:], child.style, context,
max_width, child.justification_spacing))
max_width, child.justification_spacing,
minimum=True))
lines.append(width)
if first_line:
break

5
weasyprint/text.py
View File

@ -915,7 +915,8 @@ def create_layout(text, style, context, max_width, justification_spacing):
return layout
def split_first_line(text, style, context, max_width, justification_spacing):
def split_first_line(text, style, context, max_width, justification_spacing,
minimum=False):
"""Fit as much as possible in the available width for one line of text.
Return ``(layout, length, resume_at, width, height, baseline)``.
@ -1127,7 +1128,7 @@ def split_first_line(text, style, context, max_width, justification_spacing):
first_line_width, _ = get_size(first_line, style)
space = max_width - first_line_width
# If we can break words and the first line is too long
if overflow_wrap == 'break-word' and space < 0:
if not minimum and overflow_wrap == 'break-word' and space < 0:
# Is it really OK to remove hyphenation for word-break ?
hyphenated = False
# TODO: Modify code to preserve W3C condition: