WIP

Author: rrthomas

psutils/command/psnup.py

@@ -208,7 +208,7 @@ def psnup(argv: list[str] = sys.argv[1:]) -> None:
                 in_size = paper_size
         if size is None:
             die("output page size not set, and could not get default paper size")
-        assert(in_size)
+        assert in_size
 
         # Take account of flip
         if args.flip:
@@ -281,9 +281,10 @@ def reduce_waste(
         )
 
         # Page centring shifts
-        hshift, vshift = (ppwid / horiz - in_size.width * scale) / 2, (
-            pphgt / vert - in_size.height * scale
-        ) / 2
+        hshift, vshift = (
+            (ppwid / horiz - in_size.width * scale) / 2,
+            (pphgt / vert - in_size.height * scale) / 2,
+        )
 
         # Construct specification list
         spec_list = []
@@ -303,12 +304,12 @@ def reduce_waste(
                 xoff = args.margin + across * ppwid / horiz + hshift
             yoff = args.margin + up * pphgt / vert + vshift
             spec_list.append(
-                f'{page}{"L" if rotate else ""}@{scale:f}({xoff:f},{yoff:f})'
+                f"{page}{'L' if rotate else ''}@{scale:f}({xoff:f},{yoff:f})"
             )
 
         # Rearrange pages
         specs, modulo, flipped = parsespecs(
-            f'{args.nup}:{"+".join(spec_list)}', paper_context
+            f"{args.nup}:{'+'.join(spec_list)}", paper_context
         )
         transform = document_transform(
             doc, outfile, size, orig_in_size, specs, args.draw, in_size_guessed

psutils/transformers.py

@@ -445,30 +445,35 @@ def write_page(
                 ):
                     # Calculate input page transformation
                     t = Matrix(Identity)
+                    mbox = self.reader[real_page].mediabox
                     if spec.hflip:
                         t.concat(t, Matrix(-1, 0, 0, 1, self.in_size.width, 0))
                     elif spec.vflip:
                         t.concat(t, Matrix(1, 0, 0, -1, 0, self.in_size.height))
+                    if spec.rotate != 0:
+                        t.prerotate(spec.rotate % 360)
                     if spec.scale != 1.0:
-                        t = t.prescale(spec.scale, spec.scale)
+                        t.prescale(spec.scale, spec.scale)
                     if spec.off != Offset(0.0, 0.0):
-                        t = t.pretranslate(spec.off.x, spec.off.y)
+                        # (t.prerotate applies translation according to original axes)
+                        t.e += spec.off.x
+                        t.f += spec.off.y
                     # Transform input page mediabox
                     t.concat(t, outpdf_page.transformation_matrix)
-                    mbox = self.reader[real_page].mediabox.transform(t)
+                    mbox.transform(t)
                     # Merge input page into the output document
                     outpdf_page.show_pdf_page(
                         mbox, self.reader, real_page, rotate=spec.rotate % 360
                     )
-                    if self.draw > 0:  # FIXME: draw the line at the requested width
+                    if self.draw > 0:
                         line = [
-                            (mbox.x0 + spec.off.x, mbox.y1 + spec.off.y),
-                            (mbox.x0 + spec.off.x, mbox.y0 + spec.off.y),
-                            (mbox.x1 + spec.off.x, mbox.y0 + spec.off.y),
-                            (mbox.x1 + spec.off.x, mbox.y1 + spec.off.y),
-                            (mbox.x0 + spec.off.x, mbox.y1 + spec.off.y),
+                            (mbox.x0, mbox.y1),
+                            (mbox.x0, mbox.y0),
+                            (mbox.x1, mbox.y0),
+                            (mbox.x1, mbox.y1),
+                            (mbox.x0, mbox.y1),
                         ]
-                        outpdf_page.draw_polyline(line)
+                        outpdf_page.draw_polyline(line, width=self.draw)
 
     def finalize(self) -> None:
         self.outfile.write(self.writer.convert_to_pdf())