130 Commits

Author SHA1 Message Date
Max P
5ee43cf3e1 Imported unescape. 2018-11-05 17:36:05 -08:00
Eric Lapouyade
c04483e4d5 v0.5.6 - Fix #152 2018-10-18 10:07:28 +02:00
Vuong Quoc Binh
0c2b27584d Fix invalid xml 2018-10-16 15:13:25 +07:00
elapouya
4ea5d5fdaa Cast to string, import cgi -> html 2018-10-05 14:24:05 +02:00
elapouya
b987864c3f Declare package as python2 and python3 compatible 2018-09-19 09:47:00 +02:00
elapouya
a3b3fdfa18 Add sub/superscript in RichText 2018-09-19 09:42:48 +02:00
Johan Svensson
01b2f2e397 added props for sub and super
tested on word for macOS, version 16.17 (180909). Documentation found here: http://www.datypic.com/sc/ooxml/e-w_vertAlign-1.html
2018-09-18 21:22:10 +02:00
Eric Lapouyade
b84b52e97e v0.5.2 2018-09-13 09:45:34 +02:00
Nick Gashkov
98ad7eebf7 Fix '{% vm %}' tag for table cells with XML attributes
Updated regex to match cell content inside '<w:t>' even if <w:t> has XML
attributes such as 'xml:space="preserve"'. Updated test to have this kind
of '<w:t>'.
2018-09-12 12:14:56 +03:00
elapouya
f807749be5 Fix table vertical merge 2018-09-05 16:31:38 +02:00
Nick Gashkov
5ae0dbbf29 Fix broken tables caused by vertical merge inside complex nested tables
Updated regex pattern to make '{% vm %}' replace a two-step process:
  - Search for <w:tc>...{% vm %}...</w:tc>;
  - Parse table cell and put jinja tags inside correct places.
2018-08-31 18:57:54 +03:00
elapouya
23fbe8c048 Add Hyperlink in RichText 2018-08-03 15:26:56 +02:00
Jonathan Pyle
3b221fb0c6 add docx file context to TemplateError exceptions 2018-08-02 14:30:00 -04:00
Eric Lapouyade
5456b1cfad Subdocument can now be based on an existing docx 2018-06-21 15:10:11 +02:00
isaacsucn
871dd85d49 Inset exist document as subdocument 2018-06-21 17:57:42 +08:00
Eric Lapouyade
95ffebb3fe Add font option in RichText 2018-06-07 16:42:12 +02:00
Jan-Niklas Nowak
8453ad58de Fixed Typo
Added comma after 'strike'
2018-06-06 15:26:16 +02:00
Jan-Niklas Nowak
197807d272 Experimental font option for RichText objects 2018-06-06 14:31:28 +02:00
elapouya
7437268425 Better tabs and spaces management for MS Word 2016 2018-05-16 13:56:50 +02:00
Eric Lapouyade
f2e76d0e61 Add jinja2 tags test file 2018-05-15 18:21:20 +02:00
Eric Lapouyade
aa9889fc26 Manage autoscaping on InlineImage, Richtext and Subdoc 2018-05-08 14:20:43 +02:00
Eric Lapouyade
ee9cfd1d3e Purge MANIFEST.in file 2018-04-20 18:35:14 +02:00
Eric Lapouyade
fc9eb4733f Accept variables starting with 'r' in {{}} when no space after {{ 2018-02-03 10:58:33 +01:00
elapouya
57fbf33ff5 Remove debug traces 2017-10-16 08:19:15 +02:00
Eric Lapouyade
3d96e6e5f1 Add {% vm %} to merge cell vertically within a loop 2017-10-15 16:29:41 +02:00
Eric Lapouyade
41671a0363 Merge pull request #93 from Arthaslixin/master
Add vertical cell merge support in a loop
2017-10-15 11:41:18 +02:00
elapouya
0903bf42fc use six.iteritems() instead of iteritems for python 3 compatibility 2017-10-13 10:04:48 +02:00
elapouya
992b52f223 Fixed Bug #95 on replace_pic() method 2017-10-13 09:47:25 +02:00
Arthas
2a7630a80b add {% vm %} to make the table cell virtically merged within a {% for %} 2017-10-09 23:18:25 +08:00
Riccardo Gusmeroli
399d8d995c Pass a file-like object to replace_pic
Added possibilitu to pass a file-like object to replace_pic
2017-10-06 08:05:02 +02:00
Eric Lapouyade
b94fad8232 Add replace_pic() method to replace pictures from its filename (Thanks to Riccardo Gusmeroli) 2017-10-05 18:01:36 +02:00
Riccardo Gusmeroli
d1452e5a8b Comments fix 2017-10-05 12:39:09 +02:00
Riccardo Gusmeroli
c7425832b0 New image replacement function 2017-10-05 12:32:07 +02:00
Eric Lapouyade
c0e50b47e0 Improve image attachment for InlineImage ojects 2017-09-10 12:41:15 +02:00
Eric Lapouyade
b2295a7d4b Merge branch 'master' into defer-image-attachment 2017-09-10 12:33:18 +02:00
Eric Lapouyade
be149b367d - Add replace_embedded() method (useful for embedding docx)
- Add replace_media() method (useful for header/footer images)
2017-09-09 12:28:22 +02:00
hugokernel
35cac9c937 Defer image attachment
If the Word template does not use the images sent in the template context
information, there is no need to insert them into the generated document.
2017-09-08 11:51:30 +02:00
Eric Lapouyade
b7947ca10c Add replace_medias() utility (useful for header/footer images) 2017-09-03 20:36:31 +02:00
Eric Lapouyade
a4fa1b4f26 Fix exception in fix_table() 2017-06-27 16:38:40 +02:00
Eric Lapouyade
dac4425a1f Fix bug when using more than one {{r }} or {%r %} in the same run 2017-06-21 00:17:58 +02:00
Eric Lapouyade
00db8d49c8 Better head/footer jinja2 handling& 2017-06-13 08:55:05 +02:00
hugokernel
546dc55077 Remove useless code 2017-06-09 10:07:25 +02:00
hugokernel
878197a93c Force header / footer nodes format.
get_headers_footers_xml was returning the xml in a raw string without any
processing on it. If we had a quote in docx document, it was encode in a xml
entity (&quot;), but because of the entities, Jinja raise error.

Now, xml passes through etree.tostring and we have a clean string.
2017-06-09 10:06:33 +02:00
hugokernel
1e6523d464 Put xml to string code in a new independent method 2017-06-09 10:05:52 +02:00
Eric Lapouyade
c35a4ed676 Fix bug where one is using '%' (modulo operator) inside a tag 2017-02-20 09:12:54 +01:00
Eric Lapouyade
84062c0c28 Add Listing class to manage \n and \a (new paragraph) and escape text AND keep current styling 2017-02-14 11:20:46 +01:00
Eric Lapouyade
90e6dc12c3 Add {%tc } tags for dynamic table columns 2017-02-07 09:58:31 +01:00
Eric Lapouyade
35df392f79 Remove version limitation over sphinx package in setup.py 2017-01-31 09:26:14 +01:00
Eric Lapouyade
6e1b8b72cf Add PNG & JPEG in tests/test_files/ 2017-01-16 09:44:24 +01:00
Eric Lapouyade
86b1c49991 Add InlineImage class to add images into generated doc without using subdoc 2017-01-15 11:48:00 +01:00