diff --git a/CHANGES.rst b/CHANGES.rst index eba4fa7..77d2dff 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,7 @@ +0.5.6 (2018-10-18) +------------------ +- Fix invalid xml parse because using {% vm %} + 0.5.5 (2018-10-05) ------------------ - Cast to string non-string value given to RichText or Listing objects @@ -22,166 +26,58 @@ 0.4.13 (2018-06-21) ------------------- - Subdocument can now be based on an existing docx - -0.4.12 (2018-06-07) -------------------- - Add font option in RichText - -0.4.11 (2018-05-16) -------------------- - Better tabs and spaces management for MS Word 2016 - -0.4.10 (2018-05-08) -------------------- - Wheel distribution - -0.4.9 (2018-05-08) ------------------- - Manage autoscaping on InlineImage, Richtext and Subdoc - -0.4.8 (2018-04-20) ------------------- - Purge MANIFEST.in file - -0.4.7 (2018-02-03) ------------------- - Accept variables starting with 'r' in {{}} when no space after {{ - -0.4.6 (2017-10-15) ------------------- - Remove debug traces - -0.4.5 (2017-10-15) ------------------- - Add {% vm %} to merge cell vertically within a loop (Thanks to Arthaslixin) - -0.4.4 (2017-10-13) ------------------- - use six.iteritems() instead of iteritems for python 3 compatibility - -0.4.3 (2017-10-13) ------------------- - Fixed Bug #95 on replace_pic() method - -0.4.2 (2017-10-05) ------------------- - Add replace_pic() method to replace pictures from its filename (Thanks to Riccardo Gusmeroli) - -0.4.1 (2017-09-10) ------------------- - Improve image attachment for InlineImage ojects - -0.4.0 (2017-09-09) ------------------- - Add replace_media() method (useful for header/footer images) - Add replace_embedded() method (useful for embedding docx) 0.3.9 (2017-06-27) ------------------ - Fix exception in fix_table() - -0.3.8 (2017-06-20) ------------------- - Fix bug when using more than one {{r }} or {%r %} in the same run - -0.3.7 (2017-06-13) ------------------- - Fix git tag v0.3.6 was in fact for 0.3.5 package version so create a tag 0.3.7 for 0.3.7 package version - -0.3.6 (2017-06-10) ------------------- - Better head/footer jinja2 handling (Thanks to hugokernel) - -0.3.5 (2017-02-20) ------------------- - Fix bug where one is using '%' (modulo operator) inside a tag - -0.3.4 (2017-02-14) ------------------- - Add Listing class to manage \n and \a (new paragraph) and escape text AND keep current styling - -0.3.3 (2017-02-07) ------------------- - Add {%tc } tags for dynamic table columns (Thanks to majkls23) - -0.3.2 (2017-01-16) ------------------- - Remove version limitation over sphinx package in setup.py - -0.3.1 (2017-01-16) ------------------- - Add PNG & JPEG in tests/test_files/ - -0.3.0 (2017-01-15) ------------------- - You can now add images directly without using subdoc, it is much more faster. 0.2.5 (2017-01-14) ------------------ - Add dynamic colspan tag for tables - -0.2.4 (2016-11-30) ------------------- - Fix /n in RichText class - -0.2.3 (2016-08-09) ------------------- - Add Python 3 support for footer and header - -0.2.2 (2016-06-11) ------------------- - Fix bug when using utf-8 chracters inside footer or header in .docx template It now detects header/footer encoding automatically - -0.2.1 (2016-06-11) ------------------- - Fix bug where using subdocs is corrupting header and footer in generated docx Thanks to Denny Weinberg for his help. - -0.2.0 (2016-03-17) ------------------- - Add Header and Footer support (Thanks to Denny Weinberg) 0.1.11 (2016-03-1) ------------------ - '>' and '<' can now be used inside jinja tags - -0.1.10 (2016-02-11) -------------------- - render() accepts optionnal jinja_env argument : useful to set custom filters and other things - -0.1.9 (2016-01-18) ------------------- - better subdoc management : accept tables - -0.1.8 (2015-11-05) ------------------- - better xml code cleaning around Jinja2 tags - -0.1.7 (2015-09-09) ------------------- - python 3 support - -0.1.6 (2015-05-11) ------------------- - remove debug code - add lxml dependency - -0.1.5 (2015-05-11) ------------------- - fix template filter with quote - -0.1.4 (2015-03-27) ------------------- - add RichText support - -0.1.3 (2015-03-13) ------------------- - add subdoc support - add some exemples in tests/ - -0.1.2 (2015-03-12) ------------------- - First running version diff --git a/docxtpl/__init__.py b/docxtpl/__init__.py index 09ff4ca..c20bdc1 100644 --- a/docxtpl/__init__.py +++ b/docxtpl/__init__.py @@ -5,7 +5,7 @@ Created : 2015-03-12 @author: Eric Lapouyade ''' -__version__ = '0.5.5' +__version__ = '0.5.6' from lxml import etree from docx import Document diff --git a/tests/test_files/cellbg.docx b/tests/test_files/cellbg.docx index 28b02b1..ca70ebf 100644 Binary files a/tests/test_files/cellbg.docx and b/tests/test_files/cellbg.docx differ diff --git a/tests/test_files/dynamic_table.docx b/tests/test_files/dynamic_table.docx index c018e98..1a480e2 100644 Binary files a/tests/test_files/dynamic_table.docx and b/tests/test_files/dynamic_table.docx differ diff --git a/tests/test_files/embedded.docx b/tests/test_files/embedded.docx index 779fa1f..4d80e02 100644 Binary files a/tests/test_files/embedded.docx and b/tests/test_files/embedded.docx differ diff --git a/tests/test_files/embedded_embedded_docx.docx b/tests/test_files/embedded_embedded_docx.docx index 7af8367..19548a0 100644 Binary files a/tests/test_files/embedded_embedded_docx.docx and b/tests/test_files/embedded_embedded_docx.docx differ diff --git a/tests/test_files/escape.docx b/tests/test_files/escape.docx index 7c45987..30daca0 100644 Binary files a/tests/test_files/escape.docx and b/tests/test_files/escape.docx differ diff --git a/tests/test_files/header_footer.docx b/tests/test_files/header_footer.docx index d79ab50..83f8912 100644 Binary files a/tests/test_files/header_footer.docx and b/tests/test_files/header_footer.docx differ diff --git a/tests/test_files/header_footer_entities.docx b/tests/test_files/header_footer_entities.docx index 230da7c..5c57dfa 100644 Binary files a/tests/test_files/header_footer_entities.docx and b/tests/test_files/header_footer_entities.docx differ diff --git a/tests/test_files/header_footer_image.docx b/tests/test_files/header_footer_image.docx index d9d4adb..8708571 100644 Binary files a/tests/test_files/header_footer_image.docx and b/tests/test_files/header_footer_image.docx differ diff --git a/tests/test_files/header_footer_utf8.docx b/tests/test_files/header_footer_utf8.docx index dd0091f..5b48dab 100644 Binary files a/tests/test_files/header_footer_utf8.docx and b/tests/test_files/header_footer_utf8.docx differ diff --git a/tests/test_files/inline_image.docx b/tests/test_files/inline_image.docx index 7d28c6e..da4aedb 100644 Binary files a/tests/test_files/inline_image.docx and b/tests/test_files/inline_image.docx differ diff --git a/tests/test_files/nested_for.docx b/tests/test_files/nested_for.docx index c7895b8..6a6eb0c 100644 Binary files a/tests/test_files/nested_for.docx and b/tests/test_files/nested_for.docx differ diff --git a/tests/test_files/order.docx b/tests/test_files/order.docx index 3fad155..510bd2c 100644 Binary files a/tests/test_files/order.docx and b/tests/test_files/order.docx differ diff --git a/tests/test_files/replace_picture.docx b/tests/test_files/replace_picture.docx index 8e50d61..19245b2 100644 Binary files a/tests/test_files/replace_picture.docx and b/tests/test_files/replace_picture.docx differ diff --git a/tests/test_files/richtext.docx b/tests/test_files/richtext.docx index 0e954b3..0e7fe5b 100644 Binary files a/tests/test_files/richtext.docx and b/tests/test_files/richtext.docx differ diff --git a/tests/test_files/richtext_and_if.docx b/tests/test_files/richtext_and_if.docx index 7d021e3..dfad17f 100644 Binary files a/tests/test_files/richtext_and_if.docx and b/tests/test_files/richtext_and_if.docx differ diff --git a/tests/test_files/subdoc.docx b/tests/test_files/subdoc.docx index 2a89a89..8a862f7 100644 Binary files a/tests/test_files/subdoc.docx and b/tests/test_files/subdoc.docx differ diff --git a/tests/test_files/template_error.docx b/tests/test_files/template_error.docx index f458c64..1718649 100644 Binary files a/tests/test_files/template_error.docx and b/tests/test_files/template_error.docx differ diff --git a/tests/test_files/vertical_merge.docx b/tests/test_files/vertical_merge.docx index b0adeab..f3fc3d2 100644 Binary files a/tests/test_files/vertical_merge.docx and b/tests/test_files/vertical_merge.docx differ diff --git a/tests/test_files/vertical_merge_nested.docx b/tests/test_files/vertical_merge_nested.docx index 917d29a..9d4b5a9 100644 Binary files a/tests/test_files/vertical_merge_nested.docx and b/tests/test_files/vertical_merge_nested.docx differ diff --git a/tests/test_files/word2016.docx b/tests/test_files/word2016.docx index 211ad86..c2d6b19 100644 Binary files a/tests/test_files/word2016.docx and b/tests/test_files/word2016.docx differ