241 Commits

Author SHA1 Message Date
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
majkls23
cdf1eb622c Example script for using colspan
This script uses changing colspan attribute for generation of table with dynamic column count depending on input data.
2017-01-13 13:23:04 +01:00
majkls23
44c129c5c7 Example for changing colspan property
Added example for changing colspan propery. Uses count filter for counting columns and then adjust the colspan value of top cell
2017-01-13 13:20:45 +01:00
majkls23
a92a219595 add possibility to manage colspan cell property
Added colspan subroutine to patch_xml(). Usage is like tag bgcolor in template, however parameter is number representing colspan
2017-01-13 09:50:20 +01:00
Eric Lapouyade
670471eb52 Merge pull request #57 from maerteijn/fix-sphinx-dependency
Install sphinx with pip install -e .[docs] from now on
2017-01-08 21:39:15 +01:00
Martijn Jacobs
1406462cf0 Install sphinx with pip install -e .[docs] from now on
Removed the sphinx dependency as we don't need it when installing the package.
2017-01-08 21:15:41 +01:00
Eric Lapouyade
47feece958 v0.2.4 v0.2.4 2016-11-30 09:12:36 +01:00
Eric Lapouyade
3e37fa795a py3 support merged 2016-11-30 09:07:01 +01:00
Eric Lapouyade
b56d474287 py3 support 2016-11-30 09:04:54 +01:00
Eric Lapouyade
5fb424405b v0.2.3 v0.2.3 2016-11-30 08:51:44 +01:00
Eric Lapouyade
59daded708 Merge pull request #54 from Ezequieltbh/patchBugEnter
Fix bug with \n in RichText.
2016-11-29 18:27:18 +01:00
EzequielTBH
803c3b332f Fix bug with enter in RichText.
The character (\n) is not escaped correctly, which causes that the line
break does not appear in any office version.
(Open office, Libre office or Microsoft office)
2016-11-29 12:49:12 -03:00
Eric Lapouyade
053bbdfdef Merge pull request #47 from nostalgiaz/master
Supporting py3
2016-08-09 17:08:12 +02:00
Mattia Larentis
548230732e supporting py3... 2016-08-09 16:47:35 +02:00
Mattia Larentis
ec7a93718f supporting py3... 2016-08-09 16:42:47 +02:00
Eric Lapouyade
fde82ef51f fix typo 2016-07-19 10:33:07 +02:00
Eric Lapouyade
4e024bef06 add utf-8 support in header/footer -> docxtpl 0.2.2 v0.2.2 2016-07-19 10:23:12 +02:00
Eric Lapouyade
12316e94d7 Autodetect header/footer encoding 2016-07-13 16:38:40 +02:00
Eric Lapouyade
4088bc4ab0 Version 0.2.1 2016-06-11 19:28:27 +00:00
Eric Lapouyade
686c519bf1 Fix bug in RichText, add new paragraph for \a,
add escape example, update doc
2016-04-09 11:35:16 +02:00
Eric Lapouyade
e3efb07d09 Merge pull request #37 from MrLeeh/patch-1
Update index.rst
2016-04-07 11:22:52 +02:00
Stefan Lehmann
03c73a22c9 Update index.rst
Fixed some small spelling issues
2016-04-07 09:41:35 +02:00
Eric Lapouyade
424af11f34 Add nested_for.py test 2016-03-26 16:53:11 +01:00
Eric Lapouyade
f333486577 fix typo 2016-03-17 14:06:15 +01:00