Skip to content

Add floating images #1

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

Open
jtrain wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Add floating images #1

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b8d115b
Add a rudimentary anchor type shape
jtrain Apr 28, 2017
42323a4
Expand .gitignore
jtrain Apr 28, 2017
d81aaf1
Add float image
jtrain Apr 28, 2017
45b9cf9
Style
jtrain May 1, 2017
f7b8a57
Implement position and wrapText for floating images
jtrain May 1, 2017
7e2a854
Missing args
jtrain May 1, 2017
a162814
Add margin
jtrain May 1, 2017
af65204
Change alignment to absolute on paragraph
jtrain May 1, 2017
ddd652b
unicode
jtrain May 1, 2017
6bff619
Margins should be ints not floats
jtrain May 2, 2017
45c0cbf
Dont allowOverlap and vertical position from line
jtrain May 2, 2017
275ff9c
Wrap options based on enum
jtrain May 3, 2017
09b3097
Support cleared images
jtrain May 3, 2017
046fddc
remove unicode
jtrain Oct 18, 2017
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
Prev Previous commit
Next Next commit
Margins should be ints not floats
  • Loading branch information
@jtrain
jtrain committed May 2, 2017
commit 6bff61938e14d94da4dd2c01b0716f1b78571640
8 changes: 4 additions & 4 deletions docx/oxml/shape.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ def new(cls, cx, cy, shape_id, pic, position, margin=None, wrap=None):
anchor.positionV.getchildren()[0].text = unicode(positionV)

if margin is not None:
anchor.set('distT', unicode(margin.get('top', 0)))
anchor.set('distR', unicode(margin.get('right', 0)))
anchor.set('distB', unicode(margin.get('bottom', 0)))
anchor.set('distL', unicode(margin.get('left', 0)))
anchor.set('distT', u"%d" % margin.get('top', 0))
anchor.set('distR', u"%d" % margin.get('right', 0))
anchor.set('distB', u"%d" % margin.get('bottom', 0))
anchor.set('distL', u"%d" % margin.get('left', 0))

if wrap is not None:
anchor.wrapSquare.set('wrapText', wrap)
Expand Down