elapouya
0382ece29d
Update doc
2018-12-05 09:08:41 +01:00
elapouya
77043c1a66
Update doc
2018-12-05 09:07:33 +01:00
elapouya
c15ece28c1
Smart double quotes in jinja tags are now converted into simple double quotes
2018-11-21 09:41:44 +01:00
Eric Lapouyade
e5c4c14966
- Smart quotes in jinja tags are now converted into simple quotes
...
- Add custom jinja filter example in tests/
- Reformat the code to be a little more PEP8 compliant
2018-11-20 15:30:12 +01:00
Eric Lapouyade
20e30c541c
v0.5.9
2018-11-18 17:56:14 +01:00
Eric Lapouyade
b0560c87b9
Merge pull request #158 from nickgashkov/feature/horizontal-merge
...
Implemented horizontal merge tag
2018-11-18 16:46:09 +01:00
Nick Gashkov
9aa6019d25
Add horizontal merge '{% hm %}' tag support
2018-11-16 16:44:12 +03:00
Eric Lapouyade
8b351236f7
fix #154
2018-11-08 12:20:09 +01:00
Eric Lapouyade
d73a47fc6b
Merge remote-tracking branch 'origin/master'
2018-11-08 12:13:23 +01:00
Eric Lapouyade
01f4d16767
Merge pull request #155 from mx2048/master
...
Added compatibility with Python 2.7 as to the method `escape_values`.
2018-11-08 12:12:46 +01:00
Eric Lapouyade
fe7362f4d4
run tests
2018-11-08 12:11:59 +01:00
Eric Lapouyade
be2e9942bc
run rests
2018-11-08 12:07:24 +01:00
Max P
4564fed0b3
Added compatibility with Python 2.7 as to the method escape_values.
2018-11-07 17:38:57 -08:00
Max P
d5335cb36f
Removed import sys and corresponding code.
2018-11-07 17:18:06 -08:00
Max P
5ac9c5f2c6
Imported escape and unescape methods for Python 2.7
2018-11-07 17:14:39 -08:00
Max P
2420a560e3
Fixed SyntaxError connected with nonlocal Python3-specific keyword.
2018-11-07 17:09:04 -08:00
elapouya
bc9820e7cf
Render can now autoescape context dict
2018-11-07 16:56:25 +01:00
Eric Lapouyade
69f8320fd4
Merge pull request #153 from mx2048/master
...
Auto escape strings
2018-11-07 16:31:17 +01:00
Max P
8dc7cc7de3
Added reminder for the test files.
2018-11-05 18:31:16 -08:00
Max P
7e72603441
Added test files for the auto escape.
2018-11-05 18:29:33 -08:00
Max P
40bf39cde7
Added method escape_values. Exclusively for Python3.
2018-11-05 18:17:43 -08:00
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
Eric Lapouyade
344fe8215d
Merge pull request #152 from devgt/master
...
Fix invalid xml parse because using {%vm%}
2018-10-16 15:54:51 +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
Eric Lapouyade
fe9a34ebbd
Merge pull request #145 from jsve/add-subscript-and-superscript-to-list-of-styling-props
...
added props for sub and super
2018-09-19 08:31:47 +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
Eric Lapouyade
0c02520b6d
Merge pull request #142 from nickgashkov/fix/vmerge-w-t-attributes
...
Fix vertical merge tag for table cells with XML attributes
2018-09-12 17:14:31 +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
Eric Lapouyade
4b0b1da2eb
Merge pull request #141 from nickgashkov/fix/six-print
...
Fix test incompatibility with Python 3 versions
2018-09-11 15:44:37 +02:00
Nick Gashkov
d6bfc8be79
Fix test incompatibility with Python 3 versions
...
Replaced 'print' instruction with call of a 'six' package's
implementation compatible with Python 2 as well as Python 3.
2018-09-11 16:08:19 +03:00
elapouya
f807749be5
Fix table vertical merge
2018-09-05 16:31:38 +02:00
elapouya
aa903ac99f
Testing new cell vertical merge
2018-09-03 10:35:20 +02:00
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
