Update style defaults: figure sizes, font sizes, and padding (#90)

* fix: Update figure sizes

* chore: Update dependencies

* fix: Update font sizes

* fix: Update comment

* chore: Re-execute notebooks

* fix: Fix type errors

* refactor: Rename "float_wide" to "float"

* fix: Change "float_wide" to "float"

* fix: Update `FIGURE_SIZES_IN_INCHES`

* fix: Fix font rendering on Plotly figures

* chore: Execute all notebooks

Author: wasimxyz

arcadia_pycolor/mpl.py

@@ -173,9 +173,7 @@ def save_figure(
         filepath (str): Path to save the figure to.
         size (FigureSize): The size of the figure, which must be one of the following:
             - "full_wide"
-            - "full_square"
-            - "float_wide"
-            - "float_square"
+            - "float"
             - "half_square"
         filetypes (list[str], optional): The file types(s) to save the figure to.
             If None, the original filetype of `filepath` is used.
@@ -507,9 +505,7 @@ def get_figure_dimensions(size: FigureSize) -> tuple[float, float]:
     Args:
         size (FigureSize): The size of the figure, which must be one of the following:
             - "full_wide"
-            - "full_square"
-            - "float_wide"
-            - "float_square"
+            - "float"
             - "half_square"
 
     Returns:

arcadia_pycolor/plotly_utils.py

@@ -151,9 +151,7 @@ def save_figure(
         filepath (str): The path to save the figure to.
         size (FigureSize): The size of the figure, which must be one of the following:
             - "full_wide"
-            - "full_square"
-            - "float_wide"
-            - "float_square"
+            - "float"
             - "half_square"
         filetypes (list[str], optional): The file types(s) to save the figure to.
             If None, the original filetype of `filepath` is used.
@@ -168,8 +166,8 @@ def save_figure(
     # so that the correct margins can be applied in Adobe Illustrator.
     # TODO(#69): Write a custom function to apply the margins.
     updated_margins = dict(l=0, r=0, t=0, b=0)
-    updated_width = FIGURE_SIZES_IN_PIXELS[size][0] - 80
-    updated_height = FIGURE_SIZES_IN_PIXELS[size][1] - 80
+    updated_width = FIGURE_SIZES_IN_PIXELS[size][0] - 60
+    updated_height = FIGURE_SIZES_IN_PIXELS[size][1] - 60
 
     # For some reason, the axis linewidths (which are set to 1 px) are being rendered as
     # 1 pt in Illustrator. Manually setting these to 0.75 px renders them as 0.75 pt.
@@ -927,9 +925,7 @@ def set_figure_dimensions(fig: go.Figure, size: FigureSize) -> None:
         fig (go.Figure): The figure to modify.
         size (FigureSize): The size of the figure, which must be one of the following:
             - "full_wide"
-            - "full_square"
-            - "float_wide"
-            - "float_square"
+            - "float"
             - "half_square"
 
     Raises:

arcadia_pycolor/style_defaults.py

@@ -12,46 +12,45 @@
 BASE_DPI = 72
 PRINT_DPI = 300
 
-FIGURE_PADDING_PIXELS = 20
+FIGURE_PADDING_PIXELS = 30
 FIGURE_PADDING_INCHES = FIGURE_PADDING_PIXELS / BASE_DPI
 
 # Common figure sizes for Arcadia Creative Cloud library templates.
-FigureSize = Literal["full_wide", "full_square", "float_wide", "float_square", "half_square"]
+FigureSize = Literal["full_wide", "float", "half_square"]
 
-# This dictionary contains figure sizes in inches WITHOUT padding for the transparent border.
-# For example, the "full_wide" figure width is 13.33333333 inches, or 960 pixels at 72 DPI.
+# This dictionary contains figure sizes in inches WITH padding for the transparent border.
+# For example, the "full_wide" figure width is 13.8888888889 inches, or 1000 pixels at 72 DPI.
 # They are used to set dimensions for matplotlib figures.
 FIGURE_SIZES_IN_INCHES: dict[FigureSize, tuple[float, float]] = {
-    "full_wide": (13.33333333, 5.27777777),
-    "full_square": (6.52777777, 6.52777777),
-    "float_wide": (9.16666667, 5.27777777),
-    "float_square": (4.44444444, 4.44444444),
-    "half_square": (6.38888888, 6.38888888),
+    "full_wide": (13.8888888889, 5.27777777),
+    "float": (9.02777777778, 5.27777777),
+    "half_square": (6.80555555556, 6.80555555556),
 }
 
 # This dictionary contains full figure sizes in pixels WITH padding for the transparent border.
-# For example, the "full_wide" figure width is 960 pixels plus 20 pixels of padding on each side.
+# For example, the "full_wide" figure width is 940 pixels plus 30 pixels of padding on each side.
 # They are used to set dimensions for Plotly figures.
 FIGURE_SIZES_IN_PIXELS: dict[FigureSize, tuple[int, int]] = {
     "full_wide": (1000, 420),
-    "full_square": (500, 500),
-    "float_wide": (700, 420),
-    "float_square": (360, 360),
-    "half_square": (500, 500),
+    "float": (650, 420),
+    "half_square": (490, 490),
 }
 
 # Font families.
 FONT_FILTER = "Atkinson"
 DEFAULT_FONT = "Atkinson Hyperlegible Next"
 MONOSPACE_FONT = "Atkinson Hyperlegible Mono"
 
-DEFAULT_FONT_PLOTLY = "AtkinsonHyperlegibleNext"
-MONOSPACE_FONT_PLOTLY = "AtkinsonHyperlegibleMono"
+DEFAULT_FONT_PLOTLY = f"AtkinsonHyperlegibleNext, {DEFAULT_FONT}"
+DEFAULT_FONT_PLOTLY_MEDIUM = f"AtkinsonHyperlegibleNext-Medium, {DEFAULT_FONT}"
+DEFAULT_FONT_PLOTLY_SEMIBOLD = f"AtkinsonHyperlegibleNext-SemiBold, {DEFAULT_FONT}"
+MONOSPACE_FONT_PLOTLY = f"AtkinsonHyperlegibleMono, {MONOSPACE_FONT}"
 
 # Font sizes.
-BASE_FONT_SIZE = 15
-TITLE_FONT_SIZE = 16
-MONOSPACE_FONT_SIZE = 14.5
+TITLE_FONT_SIZE = 17  # Key title, legend title
+AXIS_TITLE_FONT_SIZE = 15
+BASE_FONT_SIZE = 15  # Axis label, key label, explanatory text
+MONOSPACE_FONT_SIZE = 14.5  # Numbers
 
 # Specifications for categorical axes.
 CATEGORICAL_AXIS_TICKLENGTH = 0
@@ -89,7 +88,7 @@
     "axes.grid.axis": "both",
     "axes.grid.which": "major",
     "axes.prop_cycle": plt.cycler(color=palettes.all_ordered.colors),  # type: ignore
-    "axes.titlesize": TITLE_FONT_SIZE + 2,
+    "axes.titlesize": AXIS_TITLE_FONT_SIZE,
     "axes.titleweight": "medium",
     "axes.titlepad": 16,
     "axes.labelsize": BASE_FONT_SIZE,
@@ -189,7 +188,7 @@
     ticks="outside",
     tickwidth=1,
     title=dict(
-        font=dict(family=f"{DEFAULT_FONT_PLOTLY}-Medium", size=BASE_FONT_SIZE, color="black"),
+        font=dict(family=DEFAULT_FONT_PLOTLY_MEDIUM, size=BASE_FONT_SIZE, color="black"),
     ),
 )
 
@@ -202,7 +201,7 @@
             ticks="outside",
             tickfont=dict(family=MONOSPACE_FONT_PLOTLY, size=MONOSPACE_FONT_SIZE),
             title=dict(
-                font=dict(family=f"{DEFAULT_FONT_PLOTLY}-Medium", size=BASE_FONT_SIZE),
+                font=dict(family=DEFAULT_FONT_PLOTLY_MEDIUM, size=BASE_FONT_SIZE),
                 side="right",
             ),
         ),
@@ -219,7 +218,7 @@
     ),
     legend=go.layout.Legend(
         title=dict(
-            font=dict(family=f"{DEFAULT_FONT_PLOTLY}-SemiBold", size=TITLE_FONT_SIZE, color="black")
+            font=dict(family=DEFAULT_FONT_PLOTLY_SEMIBOLD, size=TITLE_FONT_SIZE, color="black")
         ),
         font=dict(family=DEFAULT_FONT_PLOTLY, size=BASE_FONT_SIZE, color="black"),
         indentation=-12,
@@ -240,7 +239,7 @@
         zaxis=go.layout.scene.ZAxis(**PLOTLY_3D_AXIS_ATTRIBUTES),
     ),
     title=go.layout.Title(
-        font=dict(family=f"{DEFAULT_FONT_PLOTLY}-SemiBold", size=TITLE_FONT_SIZE, color="black"),
+        font=dict(family=DEFAULT_FONT_PLOTLY_SEMIBOLD, size=TITLE_FONT_SIZE, color="black"),
         automargin=True,
         yref="container",
     ),
@@ -254,7 +253,7 @@
         ticks="outside",
         tickwidth=1,
         title=dict(
-            font=dict(family=f"{DEFAULT_FONT_PLOTLY}-Medium", size=BASE_FONT_SIZE, color="black"),
+            font=dict(family=DEFAULT_FONT_PLOTLY_MEDIUM, size=BASE_FONT_SIZE, color="black"),
             standoff=10,
         ),
         zerolinecolor="rgba(0,0,0,0)",
@@ -270,7 +269,7 @@
         ticks="outside",
         tickwidth=1,
         title=dict(
-            font=dict(family=f"{DEFAULT_FONT_PLOTLY}-Medium", size=BASE_FONT_SIZE, color="black"),
+            font=dict(family=DEFAULT_FONT_PLOTLY_MEDIUM, size=BASE_FONT_SIZE, color="black"),
             standoff=10,
         ),
         zerolinecolor="rgba(0,0,0,0)",

arcadia_pycolor/tests/test_plotly_save_figure.py

@@ -13,7 +13,7 @@ def simple_plot():
         labels={"x": "Proteins", "y": "Molecular Weight (kDa)"},
     )
     apc.plotly.style_plot(fig, categorical_axes="x", monospaced_axes="y")
-    apc.plotly.set_figure_dimensions(fig, "full_square")
+    apc.plotly.set_figure_dimensions(fig, "half_square")
     return fig
 
 
@@ -36,7 +36,7 @@ def test_plotly_save_figure_filetype_examples(tmp_path, fname, filetypes, expect
     apc.plotly.save_figure(
         fig,
         tmp_path / fname,
-        "full_square",
+        "half_square",
         filetypes=filetypes,
     )
     for output in expected_outputs:
@@ -58,7 +58,7 @@ def test_plotly_save_figure_filetype_invalid(tmp_path, fname, filetypes, capsys)
     apc.plotly.save_figure(
         fig,
         tmp_path / fname,
-        "float_square",
+        "float",
         filetypes=filetypes,
     )
     captured = capsys.readouterr()