refactor(theme): set axis title/text margins per side (panel-facing)

Author: has2k1

plotnine/themes/theme_gray.py

@@ -56,26 +56,23 @@ def __init__(self, base_size=11, base_family=None):
             axis_line_x=element_blank(),
             axis_line_y=element_blank(),
             axis_text=element_text(size=base_size * 0.8, color="#4D4D4D"),
-            axis_text_x=element_text(
-                va="top", margin=margin(t=fifth_line, b=fifth_line)
-            ),
-            axis_text_y=element_text(
-                ha="right", margin=margin(r=fifth_line, l=fifth_line)
-            ),
+            axis_text_x=element_text(va="top"),
+            axis_text_x_bottom=element_text(margin=margin(t=fifth_line)),
+            axis_text_x_top=element_text(margin=margin(b=fifth_line)),
+            axis_text_y=element_text(ha="right"),
+            axis_text_y_left=element_text(margin=margin(r=fifth_line)),
+            axis_text_y_right=element_text(margin=margin(l=fifth_line)),
             axis_ticks=element_line(color="#333333"),
             axis_ticks_length=0,
             axis_ticks_length_major=quarter_line,
             axis_ticks_length_minor=eighth_line,
             axis_ticks_minor=element_blank(),
-            axis_title_x=element_text(
-                va="bottom", ha="center", margin=margin(t=m, b=m, unit="fig")
-            ),
-            axis_title_y=element_text(
-                angle=90,
-                va="center",
-                ha="left",
-                margin=margin(r=m, l=m, unit="fig"),
-            ),
+            axis_title_x=element_text(va="bottom", ha="center"),
+            axis_title_x_bottom=element_text(margin=margin(t=m, unit="fig")),
+            axis_title_x_top=element_text(margin=margin(b=m, unit="fig")),
+            axis_title_y=element_text(angle=90, va="center", ha="left"),
+            axis_title_y_left=element_text(margin=margin(r=m, unit="fig")),
+            axis_title_y_right=element_text(margin=margin(l=m, unit="fig")),
             dpi=get_option("dpi"),
             figure_size=get_option("figure_size"),
             # legend, None values are for parameters where the

plotnine/themes/theme_matplotlib.py

@@ -47,20 +47,18 @@ def __init__(self, rc=None, fname=None, use_defaults=True):
                 margin=margin(),
             ),
             aspect_ratio=get_option("aspect_ratio"),
-            axis_text=element_text(
-                size=base_size * 0.8,
-                margin=margin(t=2.4, b=2.4, r=2.4, l=2.4, unit="pt"),
-            ),
-            axis_title_x=element_text(
-                va="bottom", ha="center", margin=margin(t=m, b=m, unit="fig")
-            ),
+            axis_text=element_text(size=base_size * 0.8),
+            axis_text_x_bottom=element_text(margin=margin(t=2.4, unit="pt")),
+            axis_text_x_top=element_text(margin=margin(b=2.4, unit="pt")),
+            axis_text_y_left=element_text(margin=margin(r=2.4, unit="pt")),
+            axis_text_y_right=element_text(margin=margin(l=2.4, unit="pt")),
+            axis_title_x=element_text(va="bottom", ha="center"),
+            axis_title_x_bottom=element_text(margin=margin(t=m, unit="fig")),
+            axis_title_x_top=element_text(margin=margin(b=m, unit="fig")),
             axis_line=element_blank(),
-            axis_title_y=element_text(
-                angle=90,
-                va="center",
-                ha="left",
-                margin=margin(r=m, l=m, unit="fig"),
-            ),
+            axis_title_y=element_text(angle=90, va="center", ha="left"),
+            axis_title_y_left=element_text(margin=margin(r=m, unit="fig")),
+            axis_title_y_right=element_text(margin=margin(l=m, unit="fig")),
             dpi=get_option("dpi"),
             figure_size=get_option("figure_size"),
             legend_background=element_rect(color="none"),

plotnine/themes/theme_seaborn.py

@@ -54,25 +54,25 @@ def __init__(
             dpi=get_option("dpi"),
             figure_size=get_option("figure_size"),
             text=element_text(size=base_size, rotation=0, margin={}),
-            axis_text=element_text(
-                size=base_size * 0.8,
-                margin=margin(
-                    t=line_margin,
-                    b=line_margin,
-                    l=line_margin,
-                    r=line_margin,
-                    unit="pt",
-                ),
+            axis_text=element_text(size=base_size * 0.8),
+            axis_text_x_bottom=element_text(
+                margin=margin(t=line_margin, unit="pt")
             ),
-            axis_title_x=element_text(
-                va="bottom", ha="center", margin=margin(t=m, b=m, unit="fig")
+            axis_text_x_top=element_text(
+                margin=margin(b=line_margin, unit="pt")
             ),
-            axis_title_y=element_text(
-                angle=90,
-                va="center",
-                ha="left",
-                margin=margin(r=m, l=m, unit="fig"),
+            axis_text_y_left=element_text(
+                margin=margin(r=line_margin, unit="pt")
+            ),
+            axis_text_y_right=element_text(
+                margin=margin(l=line_margin, unit="pt")
             ),
+            axis_title_x=element_text(va="bottom", ha="center"),
+            axis_title_x_bottom=element_text(margin=margin(t=m, unit="fig")),
+            axis_title_x_top=element_text(margin=margin(b=m, unit="fig")),
+            axis_title_y=element_text(angle=90, va="center", ha="left"),
+            axis_title_y_left=element_text(margin=margin(r=m, unit="fig")),
+            axis_title_y_right=element_text(margin=margin(l=m, unit="fig")),
             legend_box_margin=0,
             legend_box_spacing=m * 3,  # figure units
             legend_key_spacing_x=6,