Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added spacing attrs to InlineImage #566

Closed
wants to merge 5 commits into from
Closed

Added spacing attrs to InlineImage #566

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
521ff1f
Added spacing attrs to InlineImage
jeanmarcosdarosa Oct 23, 2024
7cbdd13
Fix: correction that considers spaces with zeros
jeanmarcosdarosa Oct 23, 2024
5394cbb
Fix: correction that considers spaces with zeros individualy
jeanmarcosdarosa Oct 23, 2024
c03ae86
Refatoring space of InlineImage logic
jeanmarcosdarosa Oct 23, 2024
aac1461
Fix: lint errors
jeanmarcosdarosa Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions docxtpl/inline_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@author: Eric Lapouyade
"""
from docx.oxml import OxmlElement, parse_xml
from docx.oxml import OxmlElement
from docx.oxml.ns import qn


Expand All @@ -19,11 +19,16 @@ class InlineImage(object):
width = None
height = None
anchor = None
spacing_left = None
spacing_right = None
spacing_top = None
spacing_bottom = None

def __init__(self, tpl, image_descriptor, width=None, height=None, anchor=None):
def __init__(self, tpl, image_descriptor, width=None, height=None, anchor=None, spacing_left=None, spacing_right=None, spacing_top=None, spacing_bottom=None):
self.tpl, self.image_descriptor = tpl, image_descriptor
self.width, self.height = width, height
self.anchor = anchor
self.spacing_left, self.spacing_right, self.spacing_top, self.spacing_bottom = spacing_left, spacing_right, spacing_top, spacing_bottom

def _add_hyperlink(self, run, url, part):
# Create a relationship for the hyperlink
Expand Down Expand Up @@ -54,18 +59,24 @@ def _insert_image(self):
self.image_descriptor,
self.width,
self.height,
).xml
)
if self.spacing_top is not None:
pic.set('distT', str(self.spacing_top))
if self.spacing_bottom is not None:
pic.set('distB', str(self.spacing_bottom))
if self.spacing_left is not None:
pic.set('distL', str(self.spacing_left))
if self.spacing_right is not None:
pic.set('distR', str(self.spacing_right))
if self.anchor:
run = parse_xml(pic)
if run.xpath(".//a:blip"):
if pic.xpath(".//a:blip"):
hyperlink = self._add_hyperlink(
run, self.anchor, self.tpl.current_rendering_part
pic, self.anchor, self.tpl.current_rendering_part
)
pic = hyperlink.xml

pic = hyperlink
return (
"</w:t></w:r><w:r><w:drawing>%s</w:drawing></w:r><w:r>"
'<w:t xml:space="preserve">' % pic
'<w:t xml:space="preserve">' % pic.xml
)

def __unicode__(self):
Expand Down
Loading