214 Commits

Author SHA1 Message Date
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
a3c15b226e Fix runtests.py v0.4.11 2018-05-16 14:03:37 +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 {{ v0.4.8 2018-02-03 10:58:33 +01:00
Eric Lapouyade
03703cb84a
Merge pull request #100 from anselal/patch-1
Fix minor typo
v0.4.7
2017-12-20 15:28:36 +01:00
Anastasios Selalmazidis
f6bbbcf52a
Fix minor typo 2017-12-20 12:07:31 +02:00
elapouya
57fbf33ff5 Remove debug traces v0.4.6 2017-10-16 08:19:15 +02:00
Eric Lapouyade
3d96e6e5f1 Add {% vm %} to merge cell vertically within a loop 0.4.6 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
v0.4.5
2017-10-15 11:41:18 +02:00
Arthas
e35f8858f9 del .DS_Store 2017-10-15 11:01:59 +08:00
Arthas
10dba16ce9 recover order.py 2017-10-15 10:57:58 +08:00
Arthas
52df98c914 recover order.py&doc and create vertical_merge.py&doc 2017-10-15 10:52:56 +08: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 v0.4.4 2017-10-13 09:47:25 +02:00
Arthas
a7348b2dfb modify testfiles for virtical merge 2017-10-10 00:09:00 +08:00
Arthas
2a7630a80b add {% vm %} to make the table cell virtically merged within a {% for %} 2017-10-09 23:18:25 +08:00
Eric Lapouyade
12f759cb8e Merge pull request #92 from rgusmero/master
Added possibility to pass a file-like object to replace_pic
v0.4.3
2017-10-06 08:15:50 +02: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
Riccardo Gusmeroli
a322097223 Merge pull request #1 from elapouya/master
Sync
2017-10-06 08:03:28 +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
Eric Lapouyade
997c9e3168 Merge pull request #91 from rgusmero/master
Nice ! many thanks !
v0.4.2
2017-10-05 16:53:29 +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
7e168168a6 Merge pull request #88 from hugokernel/defer-image-attachment
Defer image attachment
v0.4.1
2017-09-10 12:33:31 +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)
v0.4.0.1
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() v0.4.0 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 v0.3.9 2017-06-21 00:17:58 +02:00
Eric Lapouyade
00db8d49c8 Better head/footer jinja2 handling& 2017-06-13 08:55:05 +02:00
Eric Lapouyade
fcbfdfc484 Better head/footer jinja2 handling& v0.3.7 2017-06-10 11:03:30 +02:00
hugokernel
6f89e33d4f Update tests 2017-06-09 10:16:44 +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 ("), 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 v0.3.6 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 v0.3.5 2017-02-14 11:20:46 +01:00
Eric Lapouyade
90e6dc12c3 Add {%tc } tags for dynamic table columns v0.3.4 2017-02-07 09:58:31 +01:00
Eric Lapouyade
35df392f79 Remove version limitation over sphinx package in setup.py v0.3.2 v0.3.3 2017-01-31 09:26:14 +01:00
Eric Lapouyade
6e1b8b72cf Add PNG & JPEG in tests/test_files/ v0.3.1 2017-01-16 09:44:24 +01:00
Eric Lapouyade
86b1c49991 Add InlineImage class to add images into generated doc without using subdoc v0.3.0 2017-01-15 11:48:00 +01:00
Eric Lapouyade
4989ff6297 working on inline image... 2017-01-14 19:42:23 +01:00
Eric Lapouyade
e80f5c3fd1 add {% colspan %} tag, doc and test files v0.2.5 2017-01-14 17:39:23 +01:00
Eric Lapouyade
eb5830839d Merge pull request #60 from majkls23/master
add possibility to manage colspan cell property
2017-01-14 17:12:27 +01:00