From 696ef2971f16e4bb1c79635f4cdebb846cc9021c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9=20GDSOFT?= Date: Wed, 23 Jan 2019 15:56:30 +0100 Subject: [PATCH 1/3] add parameter add_page_break_before to function append if add_page_break_before is true, a page break is added to the current document before append a new document --- docxcompose/composer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docxcompose/composer.py b/docxcompose/composer.py index 42aef6a..cbd9b9d 100644 --- a/docxcompose/composer.py +++ b/docxcompose/composer.py @@ -45,7 +45,11 @@ def reset_reference_mapping(self): self.anum_id_mapping = {} self._numbering_restarted = set() - def append(self, doc, remove_property_fields=True): + def append(self, doc, remove_property_fields=True, add_page_break_before=False): + # add page break before append doc if needed + if add_page_break_before: + self.doc.add_page_break() + """Append the given document.""" index = self.append_index() self.insert(index, doc, remove_property_fields=remove_property_fields) From d15c6434d3448f40aabd2bec9a89a913e68fb671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9=20GDSOFT?= Date: Wed, 23 Jan 2019 16:36:48 +0100 Subject: [PATCH 2/3] indentation pb --- docxcompose/composer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docxcompose/composer.py b/docxcompose/composer.py index cbd9b9d..52c3f17 100644 --- a/docxcompose/composer.py +++ b/docxcompose/composer.py @@ -46,10 +46,10 @@ def reset_reference_mapping(self): self._numbering_restarted = set() def append(self, doc, remove_property_fields=True, add_page_break_before=False): - # add page break before append doc if needed - if add_page_break_before: - self.doc.add_page_break() - + # add page break before append doc if needed + if add_page_break_before: + self.doc.add_page_break() + """Append the given document.""" index = self.append_index() self.insert(index, doc, remove_property_fields=remove_property_fields) From fe6a29070fa90d88e8c6f9f3c4346049b2f630c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9=20GDSOFT?= Date: Wed, 23 Jan 2019 17:09:26 +0100 Subject: [PATCH 3/3] add an optional argument --pagebreak --- docxcompose/command.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docxcompose/command.py b/docxcompose/command.py index 78f4a9a..b8b3d08 100644 --- a/docxcompose/command.py +++ b/docxcompose/command.py @@ -18,6 +18,8 @@ def setup_parser(): parser.add_argument('-o', '--output-document', dest='ouput_document', default='composed.docx', help='path to the output file', metavar='file') + parser.add_argument('-pb','--pagebreak',help='add a page break before each document appended to master', + action='store_true') return parser @@ -39,7 +41,7 @@ def parse_args(parser, args): def compose_files(parser, parsed_args): composer = Composer(Document(parsed_args.master)) for slave_path in parsed_args.files: - composer.append(Document(slave_path)) + composer.append(Document(slave_path), True, parsed_args.pagebreak) composer.save(parsed_args.ouput_document) parser.exit(message='successfully composed file at {}\n'.format(