Merge pull request #1150 from KarstenSchulz/reorder_caller_args

Reorder caller args as discussed in #1146
rst2pdf · Apr 24, 2023 · 9bb7e8e · 9bb7e8e
2 parents 3a3e80c + fccb930
commit 9bb7e8e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/rst2pdf/createpdf.py b/rst2pdf/createpdf.py
@@ -649,7 +649,7 @@ def createPdf(
                 t_style = TableStyle(self.styles['endnote'].commands)
                 colWidths = self.styles['endnote'].colWidths
                 elements.append(
-                    DelayedTable([[n[0], n[1]]], style=t_style, colWidths=colWidths)
+                    DelayedTable([[n[0], n[1]]], colWidths=colWidths, style=t_style)
                 )
 
         if self.floating_images:

diff --git a/rst2pdf/genelements.py b/rst2pdf/genelements.py
@@ -300,8 +300,8 @@ def gather_elements(self, client, node, style):
         return [
             DelayedTable(
                 [[fn, fb]],
-                style=t_style,
                 colWidths=client.styles['field-list'].colWidths,
+                style=t_style,
             )
         ]
 
@@ -380,7 +380,7 @@ def gather_elements(self, client, node, style):
                 client.gather_elements(node, style=style),
             ]
         ]
-        return [DelayedTable(td, style=t_style, colWidths=colWidths)]
+        return [DelayedTable(td, colWidths=colWidths, style=t_style)]
 
 
 class HandleFList(NodeHandler):
@@ -579,8 +579,8 @@ def gather_elements(self, client, node, style):
         node.elements = [
             DelayedTable(
                 [[client.PreformattedFit(optext, client.styles["literal"]), desc]],
-                style=t_style,
                 colWidths=colWidths,
+                style=t_style,
             )
         ]
         return node.elements
@@ -690,17 +690,17 @@ def gather_elements(self, client, node, style):
                 MySpacer(0, sb),
                 SplitTable(
                     [[Paragraph(b, style=bStyle), el]],
-                    style=t_style,
                     colWidths=colWidths,
+                    style=t_style,
                 ),
             ]
         else:
             node.elements = [
                 MySpacer(0, sb),
                 DelayedTable(
                     [[Paragraph(b, style=bStyle), el]],
-                    style=t_style,
                     colWidths=colWidths,
+                    style=t_style,
                 ),
             ]
         return node.elements
@@ -845,7 +845,7 @@ def gather_elements(self, client, node, style):
         cw = [w]
         sub_elems = client.gather_elements(node, style=None)
         t_style = TableStyle(cmd)
-        table = DelayedTable([[e] for e in sub_elems], style=t_style, colWidths=cw)
+        table = DelayedTable([[e] for e in sub_elems], colWidths=cw, style=t_style)
         table.hAlign = node.get('align', 'CENTER').upper()
         return [
             MySpacer(0, style.spaceBefore),
@@ -920,7 +920,7 @@ def gather_elements(self, client, node, style):
             t.append(r)
         t_style = TableStyle(client.styles['table'].commands)
         colWidths = client.styles['table'].colWidths
-        return [DelayedTable(t, style=t_style, colWidths=colWidths)]
+        return [DelayedTable(t, colWidths=colWidths, style=t_style)]
 
 
 class HandleFootnote(NodeHandler, docutils.nodes.footnote, docutils.nodes.citation):
@@ -969,7 +969,7 @@ def gather_elements(self, client, node, style):
             colWidths = client.styles['endnote'].colWidths
             node.elements = [
                 MySpacer(0, st.spaceBefore),
-                DelayedTable([[label, contents]], style=t_style, colWidths=colWidths),
+                DelayedTable([[label, contents]], colWidths=colWidths, style=t_style),
                 MySpacer(0, st.spaceAfter),
             ]
             if client.real_footnotes:
@@ -1075,8 +1075,8 @@ def gather_elements(self, client, node, style):
                 MySpacer(0, st.spaceBefore),
                 SplitTable(
                     [['', rows]],
-                    style=t_style,
                     colWidths=[0, None],
+                    style=t_style,
                     padding=st.borderPadding,
                 ),
                 MySpacer(0, st.spaceAfter),
@@ -1089,7 +1089,7 @@ def gather_elements(self, client, node, style):
             t_style.add(*p4)
             node.elements = [
                 MySpacer(0, st.spaceBefore),
-                DelayedTable([['', rows]], style=t_style, colWidths=[0, None]),
+                DelayedTable([['', rows]], colWidths=[0, None], style=t_style),
                 MySpacer(0, st.spaceAfter),
             ]
         return node.elements