feat: tearoff layout improvements

Author: gardenerik

bullet/documents/generators/tearoff.py

@@ -38,7 +38,6 @@ def __init__(self, problem_pdf_root: Path, primary_language: str):
 
         self.statements_per_page = round(297 / statement_height)
         self.statement_height = 297 / self.statements_per_page
-        print(self.statement_height, self.statements_per_page)
 
         register_font("IBMPlexMono-Regular")
         register_font("IBMPlexMono-Bold")
@@ -168,7 +167,7 @@ def _place_stamp(
 
         bar_h = 8
         start_x = (offset_y + 5) * mm
-        start_y = (-210 + self.stamp_width - 2) * mm
+        start_y = (-210 + self.stamp_width + 2) * mm
         max_width = (self.statement_height - 10) * mm
         max_height = (self.stamp_width - 2 - 5) * mm
 
@@ -195,18 +194,6 @@ def _place_stamp(
             inverted = tearoff.team.venue.shortcode[-1] == "S"
 
         font_size = max_height - (bar_h + 0.5) * mm
-        # canvas.setFillGray(0)
-        # if inverted:
-        #     canvas.rect(
-        #         start_x,
-        #         start_y,
-        #         max_width - max_height - 2 * mm,
-        #         -font_size,
-        #         fill=True,
-        #         stroke=False,
-        #     )
-        #     canvas.setFillGray(1)
-
         spacing = 2 * mm if inverted else 1 * mm
 
         text = canvas.beginText()
@@ -253,16 +240,14 @@ def _place_stamp(
                 start_y - max_height,
             )
 
-        canvas.restoreState()
-
         text = canvas.beginText()
-        text.setTextOrigin(12 * mm, (offset_y + 5) * mm)
-        text.setFont("LinLibertine-Bold", 10)
-        text.textOut(f"{tearoff.team.code}: ")
-        text.setFont("LinLibertine-Regular", 10)
+        text.setTextOrigin(start_x, start_y - max_height - 8)
+        text.setFont("IBMPlexMono-Regular", 6)
         text.textOut(tearoff.team.display_name_short)
         canvas.drawText(text)
 
+        canvas.restoreState()
+
     def add_statements_to_page(self, page: Page, tearoffs: Iterable[Tearoff | None]):
         for i, tearoff in enumerate(tearoffs):
             if tearoff is None:

bullet/users/models/contestants.py

@@ -119,10 +119,10 @@ def display_name(self):
     @property
     def display_name_short(self):
         if self.name:
-            return shorten(self.name, 75)
+            return shorten(self.name, 55)
         if self.in_school_symbol:
-            return f"{shorten(str(self.school), 75)} {self.in_school_symbol}"
-        return shorten(str(self.school), 75)
+            return f"{shorten(str(self.school), 55)} {self.in_school_symbol}"
+        return shorten(str(self.school), 55)
 
     @property
     def contact_phone_pretty(self):