mirror of
https://github.com/Kozea/WeasyPrint.git
synced 2024-10-04 07:57:52 +03:00
Merge branch 'pydyfsvg' of github.com:Kozea/WeasyPrint into pydyfsvg
This commit is contained in:
Lucie Anglade
commit
89808b3aac
@ -4,6 +4,7 @@ build-backend = 'flit_core.buildapi'
|
||||
|
||||
[project]
|
||||
name = 'weasyprint'
|
||||
description = 'The Awesome Document Factory'
|
||||
keywords = ['html', 'css', 'pdf', 'converter']
|
||||
authors = [{name = 'Simon Sapin', email = 'simon.sapin@exyr.org'}]
|
||||
maintainers = [{name = 'CourtBouillon', email = 'contact@courtbouillon.org'}]
|
||||
@ -39,15 +40,15 @@ classifiers = [
|
||||
'Topic :: Multimedia :: Graphics :: Graphics Conversion',
|
||||
'Topic :: Printing',
|
||||
]
|
||||
dynamic = ['version', 'description']
|
||||
dynamic = ['version']
|
||||
|
||||
[project.urls]
|
||||
home-page = 'https://www.courtbouillon.org/weasyprint'
|
||||
documentation = 'https://doc.courtbouillon.org/weasyprint/'
|
||||
code = 'https://github.com/Kozea/WeasyPrint'
|
||||
issues = 'https://github.com/Kozea/WeasyPrint/issues'
|
||||
changelog = 'https://github.com/Kozea/WeasyPrint/releases'
|
||||
donation = 'https://opencollective.com/courtbouillon'
|
||||
Homepage = 'https://www.courtbouillon.org/weasyprint'
|
||||
Documentation = 'https://doc.courtbouillon.org/weasyprint/'
|
||||
Code = 'https://github.com/Kozea/WeasyPrint'
|
||||
Issues = 'https://github.com/Kozea/WeasyPrint/issues'
|
||||
Changelog = 'https://github.com/Kozea/WeasyPrint/releases'
|
||||
Donation = 'https://opencollective.com/courtbouillon'
|
||||
|
||||
[project.optional-dependencies]
|
||||
doc = ['sphinx', 'sphinx_rtd_theme']
|
||||
|
||||
@ -6,28 +6,201 @@
|
||||
|
||||
"""
|
||||
|
||||
import pytest
|
||||
|
||||
from ...testing_utils import assert_no_logs
|
||||
from .. import assert_pixels
|
||||
|
||||
|
||||
@assert_no_logs
|
||||
def test_text_fill():
|
||||
assert_pixels('text_fill', 20, 6, '''
|
||||
assert_pixels('text_fill', 20, 2, '''
|
||||
BBBBBB__BBBBBB______
|
||||
BBBBBB__BBBBBB______
|
||||
____________________
|
||||
____________________
|
||||
____________________
|
||||
____________________
|
||||
''', '''
|
||||
<style>
|
||||
@font-face { src: url(weasyprint.otf); font-family: weasyprint }
|
||||
@page { size: 20px 6px }
|
||||
@page { size: 20px 2px }
|
||||
svg { display: block }
|
||||
</style>
|
||||
<svg width="20px" height="6px" xmlns="http://www.w3.org/2000/svg">
|
||||
<text x="0" y="2" font-family="weasyprint" font-size="2" fill="blue">
|
||||
<svg width="20px" height="2px" xmlns="http://www.w3.org/2000/svg">
|
||||
<text x="0" y="1" font-family="weasyprint" font-size="2" fill="blue">
|
||||
ABC DEF
|
||||
</text>
|
||||
</svg>
|
||||
''')
|
||||
|
||||
|
||||
@pytest.mark.xfail
|
||||
@assert_no_logs
|
||||
def test_text_stroke():
|
||||
assert_pixels('text_fill', 20, 4, '''
|
||||
BBBBBBBBBBBB________
|
||||
BBBBBBBBBBBB________
|
||||
BBBBBBBBBBBB________
|
||||
BBBBBBBBBBBB________
|
||||
''', '''
|
||||
<style>
|
||||
@font-face { src: url(weasyprint.otf); font-family: weasyprint }
|
||||
@page { size: 20px 4px }
|
||||
svg { display: block }
|
||||
</style>
|
||||
<svg width="20px" height="4px" xmlns="http://www.w3.org/2000/svg">
|
||||
<text x="0" y="2" font-family="weasyprint" font-size="2"
|
||||
fill="transparent" stroke="black" stroke-width="2">
|
||||
A B C
|
||||
</text>
|
||||
</svg>
|
||||
''')
|
||||
|
||||
|
||||
@assert_no_logs
|
||||
def test_text_x():
|
||||
assert_pixels('text_x', 20, 2, '''
|
||||
BB__BB_BBBB_________
|
||||
BB__BB_BBBB_________
|
||||
''', '''
|
||||
<style>
|
||||
@font-face { src: url(weasyprint.otf); font-family: weasyprint }
|
||||
@page { size: 20px 2px }
|
||||
svg { display: block }
|
||||
</style>
|
||||
<svg width="20px" height="2px" xmlns="http://www.w3.org/2000/svg">
|
||||
<text x="0 4 7" y="1" font-family="weasyprint" font-size="2"
|
||||
fill="blue">
|
||||
ABCD
|
||||
</text>
|
||||
</svg>
|
||||
''')
|
||||
|
||||
|
||||
@assert_no_logs
|
||||
def test_text_y():
|
||||
assert_pixels('text_y', 30, 10, '''
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
BBBBBBBBBB_____BBBBB__________
|
||||
BBBBBBBBBB_____BBBBB__________
|
||||
BBBBBBBBBB_____BBBBB__________
|
||||
BBBBBBBBBB_____BBBBB__________
|
||||
BBBBBBBBBB_____BBBBB__________
|
||||
''', '''
|
||||
<style>
|
||||
@font-face { src: url(weasyprint.otf); font-family: weasyprint }
|
||||
@page { size: 30px 10px }
|
||||
svg { display: block }
|
||||
</style>
|
||||
<svg width="30px" height="10px" xmlns="http://www.w3.org/2000/svg">
|
||||
<text x="0" y="9 9 4 9 4" font-family="weasyprint" font-size="5"
|
||||
fill="blue">
|
||||
ABCDEF
|
||||
</text>
|
||||
</svg>
|
||||
''')
|
||||
|
||||
|
||||
@assert_no_logs
|
||||
def test_text_xy():
|
||||
assert_pixels('text_xy', 30, 10, '''
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
BBBBB__________BBBBB__________
|
||||
BBBBB__________BBBBB__________
|
||||
BBBBB__________BBBBB__________
|
||||
BBBBB__________BBBBB__________
|
||||
BBBBB__________BBBBB__________
|
||||
''', '''
|
||||
<style>
|
||||
@font-face { src: url(weasyprint.otf); font-family: weasyprint }
|
||||
@page { size: 30px 10px }
|
||||
svg { display: block }
|
||||
</style>
|
||||
<svg width="30px" height="10px" xmlns="http://www.w3.org/2000/svg">
|
||||
<text x="0 10" y="9 4 9 4" font-family="weasyprint" font-size="5"
|
||||
fill="blue">
|
||||
ABCDE
|
||||
</text>
|
||||
</svg>
|
||||
''')
|
||||
|
||||
|
||||
@assert_no_logs
|
||||
def test_text_dx():
|
||||
assert_pixels('text_dx', 20, 2, '''
|
||||
BB__BB_BBBB_________
|
||||
BB__BB_BBBB_________
|
||||
''', '''
|
||||
<style>
|
||||
@font-face { src: url(weasyprint.otf); font-family: weasyprint }
|
||||
@page { size: 20px 2px }
|
||||
svg { display: block }
|
||||
</style>
|
||||
<svg width="20px" height="2px" xmlns="http://www.w3.org/2000/svg">
|
||||
<text dx="0 2 1" y="1" font-family="weasyprint" font-size="2"
|
||||
fill="blue">
|
||||
ABCD
|
||||
</text>
|
||||
</svg>
|
||||
''')
|
||||
|
||||
|
||||
@assert_no_logs
|
||||
def test_text_dy():
|
||||
assert_pixels('text_dy', 30, 10, '''
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
BBBBBBBBBB_____BBBBB__________
|
||||
BBBBBBBBBB_____BBBBB__________
|
||||
BBBBBBBBBB_____BBBBB__________
|
||||
BBBBBBBBBB_____BBBBB__________
|
||||
BBBBBBBBBB_____BBBBB__________
|
||||
''', '''
|
||||
<style>
|
||||
@font-face { src: url(weasyprint.otf); font-family: weasyprint }
|
||||
@page { size: 30px 10px }
|
||||
svg { display: block }
|
||||
</style>
|
||||
<svg width="30px" height="10px" xmlns="http://www.w3.org/2000/svg">
|
||||
<text x="0" dy="9 0 -5 5 -5" font-family="weasyprint" font-size="5"
|
||||
fill="blue">
|
||||
ABCDEF
|
||||
</text>
|
||||
</svg>
|
||||
''')
|
||||
|
||||
|
||||
@assert_no_logs
|
||||
def test_text_dx_dy():
|
||||
assert_pixels('text_dx_dy', 30, 10, '''
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
__________BBBBB_____BBBBBBBBBB
|
||||
BBBBB__________BBBBB__________
|
||||
BBBBB__________BBBBB__________
|
||||
BBBBB__________BBBBB__________
|
||||
BBBBB__________BBBBB__________
|
||||
BBBBB__________BBBBB__________
|
||||
''', '''
|
||||
<style>
|
||||
@font-face { src: url(weasyprint.otf); font-family: weasyprint }
|
||||
@page { size: 30px 10px }
|
||||
svg { display: block }
|
||||
</style>
|
||||
<svg width="30px" height="10px" xmlns="http://www.w3.org/2000/svg">
|
||||
<text dx="0 5" dy="9 -5 5 -5" font-family="weasyprint" font-size="5"
|
||||
fill="blue">
|
||||
ABCDE
|
||||
</text>
|
||||
</svg>
|
||||
''')
|
||||
|
||||
@ -30,7 +30,7 @@ if hasattr(sys, 'frozen'): # pragma: no cover
|
||||
else:
|
||||
ROOT = Path(os.path.dirname(__file__))
|
||||
|
||||
VERSION = __version__ = '53.0a0'
|
||||
VERSION = __version__ = '53.0a1'
|
||||
|
||||
__all__ = [
|
||||
'HTML', 'CSS', 'Attachment', 'Document', 'Page', 'default_url_fetcher',
|
||||
|
||||
@ -68,18 +68,18 @@ def text(svg, node, font_size):
|
||||
|
||||
# Get rotations and translations
|
||||
x, y, dx, dy, rotate = [], [], [], [], [0]
|
||||
if 'x' in node:
|
||||
if 'x' in node.attrib:
|
||||
x = [size(i, font_size, svg.concrete_width)
|
||||
for i in normalize(node['x']).strip().split(' ')]
|
||||
if 'y' in node:
|
||||
for i in normalize(node.attrib['x']).strip().split(' ')]
|
||||
if 'y' in node.attrib:
|
||||
y = [size(i, font_size, svg.concrete_height)
|
||||
for i in normalize(node['y']).strip().split(' ')]
|
||||
if 'dx' in node:
|
||||
for i in normalize(node.attrib['y']).strip().split(' ')]
|
||||
if 'dx' in node.attrib:
|
||||
dx = [size(i, font_size, svg.concrete_width)
|
||||
for i in normalize(node['dx']).strip().split(' ')]
|
||||
if 'dy' in node:
|
||||
for i in normalize(node.attrib['dx']).strip().split(' ')]
|
||||
if 'dy' in node.attrib:
|
||||
dy = [size(i, font_size, svg.concrete_height)
|
||||
for i in normalize(node['dy']).strip().split(' ')]
|
||||
for i in normalize(node.attrib['dy']).strip().split(' ')]
|
||||
if 'rotate' in node:
|
||||
rotate = [radians(float(i)) if i else 0
|
||||
for i in normalize(node['rotate']).strip().split(' ')]
|
||||
@ -191,7 +191,6 @@ def text(svg, node, font_size):
|
||||
svg.stream.transform(
|
||||
cos(angle), sin(angle), -sin(angle), cos(angle), 0, 0)
|
||||
svg.stream.transform(1, 0, 0, 1, 0, svg.cursor_d_position[1])
|
||||
svg.stream.move_to(0, 0)
|
||||
bounding_box = extend_bounding_box(
|
||||
bounding_box, ((end_point[0], width),))
|
||||
else:
|
||||
@ -200,9 +199,6 @@ def text(svg, node, font_size):
|
||||
y = svg.cursor_position[1] if y is None else y
|
||||
if i:
|
||||
x += letter_spacing
|
||||
svg.stream.move_to(
|
||||
x + svg.cursor_d_position[0] + x_align,
|
||||
y + svg.cursor_d_position[1] + y_align)
|
||||
cursor_position = x + width, y
|
||||
angle = last_r if r is None else r
|
||||
svg.stream.transform(
|
||||
@ -223,7 +219,8 @@ def text(svg, node, font_size):
|
||||
svg.stream.set_color_rgb(red, green, blue)
|
||||
svg.stream.set_alpha(alpha)
|
||||
draw_first_line(
|
||||
svg.stream, TextBox(layout, style), 'none', 'none', x, y)
|
||||
svg.stream, TextBox(layout, style), 'none', 'none',
|
||||
x + svg.cursor_d_position[0], y + svg.cursor_d_position[1])
|
||||
svg.stream.pop_state()
|
||||
if not text_path:
|
||||
svg.cursor_position = cursor_position
|
||||
|
||||
Loading…
Reference in New Issue
Block a user