Eric Lapouyade
ba1d4458ed
Merge pull request #140 from nickgashkov/fix/vmerge-nested
...
Fix broken tables caused by vertical merge inside complex nested tables
2018-09-03 10:20:14 +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
7f994dc107
Use 'six' in template_error.py test
2018-08-07 10:51:19 +02:00
Eric Lapouyade
cb6971009f
Merge pull request #135 from jhpyle/error-context
...
Added test script for TemplateError trapping
2018-08-07 10:19:57 +02:00
Jonathan Pyle
0a3627d23a
Added test script for TemplateError trapping
2018-08-06 22:04:00 -04:00
elapouya
23fbe8c048
Add Hyperlink in RichText
2018-08-03 15:26:56 +02:00
Eric Lapouyade
c9afd31320
Merge pull request #134 from jhpyle/error-context
...
add docx file context to TemplateError exceptions
2018-08-03 11:26:21 +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
Eric Lapouyade
76345f454f
Merge pull request #124 from isaacsucn/master
...
Insert exist document as subdocument
2018-06-21 12:16:40 +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
Eric Lapouyade
86350034bb
Merge pull request #123 from f1remind/master
...
Experimental font option for RichText objects
2018-06-07 15:53:59 +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
a3c15b226e
Fix runtests.py
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 {{
2018-02-03 10:58:33 +01:00
Eric Lapouyade
03703cb84a
Merge pull request #100 from anselal/patch-1
...
Fix minor typo
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
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
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
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
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 !
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
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)
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
Eric Lapouyade
fcbfdfc484
Better head/footer jinja2 handling&
2017-06-10 11:03:30 +02:00
