plotnine 0.14.5__py3-none-any.whl → 0.15.0a2__py3-none-any.whl

plotnine/themes/theme.py

@@ -19,6 +19,8 @@ if typing.TYPE_CHECKING:
 
     from plotnine import ggplot
 
+    from .elements import margin
+
 
 # All complete themes are initiated with these rcparams. They
 # can be overridden.
@@ -122,6 +124,11 @@ class theme:
         plot_title=None,
         plot_subtitle=None,
         plot_caption=None,
+        plot_tag=None,
+        plot_title_position=None,
+        plot_caption_position=None,
+        plot_tag_location=None,
+        plot_tag_position=None,
         strip_text_x=None,
         strip_text_y=None,
         strip_text=None,
@@ -169,13 +176,6 @@ class theme:
         axis_ticks_length_minor_y=None,
         axis_ticks_length_minor=None,
         axis_ticks_length=None,
-        axis_ticks_pad_major_x=None,
-        axis_ticks_pad_major_y=None,
-        axis_ticks_pad_major=None,
-        axis_ticks_pad_minor_x=None,
-        axis_ticks_pad_minor_y=None,
-        axis_ticks_pad_minor=None,
-        axis_ticks_pad=None,
         panel_spacing_x=None,
         panel_spacing_y=None,
         panel_spacing=None,
@@ -270,6 +270,20 @@ class theme:
         """
         return self.themeables.getp
 
+    def get_margin(self, name: str) -> margin:
+        """
+        Return the margin propery of a element_text themeables
+        """
+        return self.themeables.getp((name, "margin"))
+
+    @cached_property
+    def get_ha(self):
+        return self.themeables.get_ha
+
+    @cached_property
+    def get_va(self):
+        return self.themeables.get_va
+
     def apply(self):
         """
         Apply this theme, then apply additional modifications in order.

plotnine/themes/theme_538.py

@@ -23,7 +23,6 @@ class theme_538(theme_gray):
             axis_ticks=element_blank(),
             title=element_text(color="#3C3C3C"),
             legend_background=element_rect(fill="none"),
-            legend_key=element_rect(fill="#E0E0E0"),
             panel_background=element_rect(fill=bgcolor),
             panel_border=element_blank(),
             panel_grid_major=element_line(color="#D5D5D5"),

plotnine/themes/theme_bw.py

@@ -20,7 +20,6 @@ class theme_bw(theme_gray):
         super().__init__(base_size, base_family)
         self += theme(
             axis_text=element_text(size=0.8 * base_size),
-            legend_key=element_rect(fill="none", color="#CCCCCC"),
             panel_background=element_rect(fill="white"),
             panel_border=element_rect(fill="none", color="#7f7f7f"),
             panel_grid_major=element_line(color="#E5E5E5"),

plotnine/themes/theme_dark.py

@@ -24,7 +24,6 @@ class theme_dark(theme_gray):
         self += theme(
             axis_ticks=element_line(color="#666666", size=0.5),
             axis_ticks_minor=element_blank(),
-            legend_key=element_rect(fill="#7F7F7F", color="#666666", size=0.5),
             panel_background=element_rect(fill="#7F7F7F", color="none"),
             panel_grid_major=element_line(color="#666666", size=0.5),
             panel_grid_minor=element_line(color="#737373", size=0.25),

plotnine/themes/theme_gray.py

@@ -1,6 +1,13 @@
 from .._utils.registry import alias
 from ..options import get_option
-from .elements import element_blank, element_line, element_rect, element_text
+from .elements import (
+    element_blank,
+    element_line,
+    element_rect,
+    element_text,
+    margin,
+    margin_auto,
+)
 from .theme import theme
 
 
@@ -21,6 +28,7 @@ class theme_gray(theme):
 
     def __init__(self, base_size=11, base_family=None):
         base_family = base_family or get_option("base_family")
+        half_line = base_size / 2
         quarter_line = base_size / 4
         fifth_line = base_size / 5
         eighth_line = base_size / 8
@@ -37,32 +45,32 @@ class theme_gray(theme):
                 family=base_family,
                 style="normal",
                 color="black",
+                ma="center",
                 size=base_size,
                 linespacing=0.9,
                 rotation=0,
-                margin={},
+                margin=margin(),
             ),
             aspect_ratio=get_option("aspect_ratio"),
             axis_line=element_line(),
             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={"t": fifth_line}),
-            axis_text_y=element_text(ha="right", margin={"r": fifth_line}),
+            axis_text_x=element_text(va="top", margin=margin(t=fifth_line)),
+            axis_text_y=element_text(ha="right", margin=margin(r=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_ticks_pad=2,
             axis_title_x=element_text(
-                va="bottom", ha="center", margin={"t": m, "units": "fig"}
+                va="bottom", ha="center", margin=margin(t=m, unit="fig")
             ),
             axis_title_y=element_text(
                 angle=90,
                 va="center",
                 ha="left",
-                margin={"r": m, "units": "fig"},
+                margin=margin(r=m, unit="fig"),
             ),
             dpi=get_option("dpi"),
             figure_size=get_option("figure_size"),
@@ -75,7 +83,6 @@ class theme_gray(theme):
             legend_frame=element_blank(),
             legend_key_spacing_x=6,
             legend_key_spacing_y=2,
-            legend_key=element_rect(fill="#F2F2F2", colour="none"),
             legend_key_size=base_size * 0.8 * 1.8,
             legend_ticks_length=0.2,
             legend_margin=0,  # points
@@ -83,25 +90,13 @@ class theme_gray(theme):
             legend_spacing=10,  # points
             legend_text=element_text(
                 size=base_size * 0.8,
-                margin={
-                    "t": m / 1.5,
-                    "b": m / 1.5,
-                    "l": m / 1.5,
-                    "r": m / 1.5,
-                    "units": "fig",
-                },
+                margin=margin_auto(m / 1.5, unit="fig"),
             ),
             legend_ticks=element_line(color="#CCCCCC", size=1),
             legend_title=element_text(
-                margin={
-                    "t": m,
-                    "b": m / 2,
-                    "l": m * 2,
-                    "r": m * 2,
-                    "units": "fig",
-                },
+                margin=margin(t=m, l=m * 2, b=m / 2, r=m * 2, unit="fig")
             ),
-            panel_background=element_rect(fill="#EBEBEB"),
+            panel_background=element_rect(fill="#EBEBEB", color="none"),
             panel_border=element_blank(),
             panel_grid_major=element_line(color="white", size=1),
             panel_grid_minor=element_line(color="white", size=0.5),
@@ -112,20 +107,29 @@ class theme_gray(theme):
                 ha="right",
                 va="bottom",
                 ma="left",
-                margin={"t": m, "units": "fig"},
+                margin=margin(t=m, unit="fig"),
             ),
             plot_margin=m,
             plot_subtitle=element_text(
                 va="top",
                 ma="left",
-                margin={"b": m, "units": "fig"},
+                margin=margin(b=m, unit="fig"),
             ),
             plot_title=element_text(
                 size=base_size * 1.2,
                 va="top",
                 ma="left",
-                margin={"b": m, "units": "fig"},
+                margin=margin(b=m, unit="fig"),
             ),
+            plot_tag=element_text(
+                size=base_size * 1.2,
+                va="center",
+                ha="center",
+            ),
+            plot_title_position="panel",
+            plot_caption_position="panel",
+            plot_tag_location="margin",
+            plot_tag_position="topleft",
             strip_align=0,
             strip_background=element_rect(color="none", fill="#D9D9D9"),
             strip_background_x=element_rect(width=1),
@@ -133,14 +137,8 @@ class theme_gray(theme):
             strip_text=element_text(
                 color="#1A1A1A",
                 size=base_size * 0.8,
-                linespacing=1.0,
-                margin={
-                    "t": 1 / 3,
-                    "b": 1 / 3,
-                    "l": 1 / 3,
-                    "r": 1 / 3,
-                    "units": "lines",
-                },
+                linespacing=1.5,
+                margin=margin_auto(half_line * 0.8),
             ),
             strip_text_y=element_text(rotation=-90),
             complete=True,

plotnine/themes/theme_light.py

@@ -24,7 +24,7 @@ class theme_light(theme_gray):
         self += theme(
             axis_ticks=element_line(color="#B3B3B3", size=0.5),
             axis_ticks_minor=element_blank(),
-            legend_key=element_rect(fill="white", color="#7F7F7F", size=0.72),
+            legend_key=element_rect(color="#7F7F7F", size=0.72),
             panel_background=element_rect(fill="white"),
             panel_border=element_rect(fill="none", color="#B3B3B3", size=1),
             panel_grid_major=element_line(color="#D9D9D9", size=0.5),

plotnine/themes/theme_matplotlib.py

@@ -1,5 +1,12 @@
 from ..options import get_option
-from .elements import element_blank, element_line, element_rect, element_text
+from .elements import (
+    element_blank,
+    element_line,
+    element_rect,
+    element_text,
+    margin,
+    margin_auto,
+)
 from .theme import theme
 
 
@@ -27,6 +34,7 @@ class theme_matplotlib(theme):
         m = get_option("base_margin")
         base_size = mpl.rcParams.get("font.size", 11)
         linewidth = mpl.rcParams.get("grid.linewidth", 0.8)
+        half_line = base_size / 2
 
         super().__init__(
             line=element_line(size=linewidth),
@@ -38,16 +46,16 @@ class theme_matplotlib(theme):
                 margin={},
             ),
             aspect_ratio=get_option("aspect_ratio"),
-            axis_text=element_text(margin={"t": 2.4, "r": 2.4, "units": "pt"}),
+            axis_text=element_text(margin=margin(t=2.4, r=2.4, unit="pt")),
             axis_title_x=element_text(
-                va="bottom", ha="center", margin={"t": m, "units": "fig"}
+                va="bottom", ha="center", margin=margin(t=m, unit="fig")
             ),
             axis_line=element_blank(),
             axis_title_y=element_text(
                 angle=90,
                 va="center",
                 ha="left",
-                margin={"r": m, "units": "fig"},
+                margin=margin(r=m, unit="fig"),
             ),
             dpi=get_option("dpi"),
             figure_size=get_option("figure_size"),
@@ -57,31 +65,16 @@ class theme_matplotlib(theme):
             legend_key_spacing_x=6,
             legend_key_spacing_y=2,
             legend_frame=element_rect(color="black"),
-            legend_key=element_blank(),
             legend_key_size=16,
             legend_ticks_length=0.2,
             legend_margin=0,
             legend_position="right",
             legend_spacing=10,
-            legend_text=element_text(
-                margin={
-                    "t": m / 2,
-                    "b": m / 2,
-                    "l": m / 2,
-                    "r": m / 2,
-                    "units": "fig",
-                }
-            ),
+            legend_text=element_text(margin=margin_auto(m / 2, unit="fig")),
             legend_ticks=element_line(color="black"),
             legend_title=element_text(
                 ha="left",
-                margin={
-                    "t": m,
-                    "b": m / 2,
-                    "l": m * 2,
-                    "r": m * 2,
-                    "units": "fig",
-                },
+                margin=margin(t=m, l=m * 2, b=m / 2, r=m * 2, unit="fig"),
             ),
             panel_border=element_rect(color="black"),
             panel_grid=element_blank(),
@@ -90,32 +83,36 @@ class theme_matplotlib(theme):
                 ha="right",
                 va="bottom",
                 ma="left",
-                margin={"t": m, "units": "fig"},
+                margin=margin(t=m, unit="fig"),
             ),
             plot_margin=m,
             plot_subtitle=element_text(
                 size=base_size * 0.9,
                 va="top",
                 ma="left",
-                margin={"b": m, "units": "fig"},
+                margin=margin(b=m, unit="fig"),
             ),
             plot_title=element_text(
                 va="top",
                 ma="left",
-                margin={"b": m, "units": "fig"},
+                margin=margin(b=m, unit="fig"),
+            ),
+            plot_tag=element_text(
+                size=base_size * 1.2,
+                va="center",
+                ha="center",
             ),
+            plot_title_position="panel",
+            plot_caption_position="panel",
+            plot_tag_location="margin",
+            plot_tag_position="topleft",
             strip_align=0,
             strip_background=element_rect(
                 fill="#D9D9D9", color="black", size=linewidth
             ),
             strip_text=element_text(
-                margin={
-                    "t": 1 / 3,
-                    "b": 1 / 3,
-                    "l": 1 / 3,
-                    "r": 1 / 3,
-                    "units": "lines",
-                },
+                linespacing=1.5,
+                margin=margin_auto(half_line * 0.8),
             ),
             strip_text_y=element_text(rotation=-90),
             complete=True,

plotnine/themes/theme_seaborn.py

@@ -1,5 +1,12 @@
 from ..options import get_option
-from .elements import element_blank, element_line, element_rect, element_text
+from .elements import (
+    element_blank,
+    element_line,
+    element_rect,
+    element_text,
+    margin,
+    margin_auto,
+)
 from .theme import theme
 
 
@@ -14,7 +21,7 @@ class theme_seaborn(theme):
 
     Parameters
     ----------
-    style: "whitegrid", "darkgrid", "nogrid", "ticks"
+    style: "white", "dark", "whitegrid", "darkgrid",  "ticks"
         Style of axis background.
     context: "notebook", "talk", "paper", "poster"]``
         Intended context for resulting figures.
@@ -49,22 +56,22 @@ class theme_seaborn(theme):
             text=element_text(size=base_size, rotation=0, margin={}),
             axis_text=element_text(
                 size=base_size * 0.8,
-                margin={
-                    "t": line_margin,
-                    "b": line_margin,
-                    "l": line_margin,
-                    "r": line_margin,
-                    "units": "pt",
-                },
+                margin=margin(
+                    t=line_margin,
+                    b=line_margin,
+                    l=line_margin,
+                    r=line_margin,
+                    unit="pt",
+                ),
             ),
             axis_title_x=element_text(
-                va="bottom", ha="center", margin={"t": m, "units": "fig"}
+                va="bottom", ha="center", margin=margin(t=m, unit="fig")
             ),
             axis_title_y=element_text(
                 angle=90,
                 va="center",
                 ha="left",
-                margin={"r": m, "units": "fig"},
+                margin=margin(r=m, unit="fig"),
             ),
             legend_box_margin=0,
             legend_box_spacing=m * 3,  # figure units
@@ -77,57 +84,50 @@ class theme_seaborn(theme):
             legend_position="right",
             legend_spacing=10,  # points
             legend_text=element_text(
-                margin={
-                    "t": m / 1.5,
-                    "b": m / 1.5,
-                    "l": m / 1.5,
-                    "r": m / 1.5,
-                    "units": "fig",
-                },
+                size=base_size * 0.8,
+                margin=margin_auto(m / 1.5, unit="fig"),
             ),
             legend_ticks=element_line(color="#CCCCCC", size=1),
             legend_title=element_text(
-                margin={
-                    "t": m,
-                    "b": m / 2,
-                    "l": m * 2,
-                    "r": m * 2,
-                    "units": "fig",
-                },
+                margin=margin(t=m, l=m * 2, b=m / 2, r=m * 2, unit="fig")
             ),
             panel_spacing=m,
+            panel_background=element_rect(fill=rcparams["axes.facecolor"]),
             plot_caption=element_text(
                 size=base_size * 0.8,
                 ha="right",
                 va="bottom",
                 ma="left",
-                margin={"t": m, "units": "fig"},
+                margin=margin(t=m, unit="fig"),
             ),
             plot_margin=m,
             plot_subtitle=element_text(
                 size=base_size * 1,
                 va="top",
                 ma="left",
-                margin={"b": m, "units": "fig"},
+                margin=margin(b=m, unit="fig"),
             ),
             plot_title=element_text(
                 size=base_size * 1.2,
                 va="top",
                 ma="left",
-                margin={"b": m, "units": "fig"},
+                margin=margin(b=m, unit="fig"),
+            ),
+            plot_tag=element_text(
+                size=base_size * 1.2,
+                va="center",
+                ha="center",
             ),
+            plot_title_position="panel",
+            plot_caption_position="panel",
+            plot_tag_location="margin",
+            plot_tag_position="topleft",
             strip_align=0,
             strip_background=element_rect(color="none", fill="#D1CDDF"),
             strip_text=element_text(
                 size=base_size * 0.8,
-                linespacing=1.0,
-                margin={
-                    "t": 1 / 3,
-                    "b": 1 / 3,
-                    "l": 1 / 3,
-                    "r": 1 / 3,
-                    "units": "lines",
-                },
+                linespacing=1.5,
+                margin=margin_auto(half_line * 0.8),
             ),
             strip_text_y=element_text(rotation=-90),
             complete=True,

plotnine/themes/theme_void.py

@@ -1,5 +1,11 @@
 from ..options import get_option
-from .elements import element_blank, element_line, element_text
+from .elements import (
+    element_blank,
+    element_line,
+    element_text,
+    margin,
+    margin_auto,
+)
 from .theme import theme
 
 
@@ -19,6 +25,7 @@ class theme_void(theme):
 
     def __init__(self, base_size=11, base_family=None):
         base_family = base_family or get_option("base_family")
+        half_line = base_size / 2
         m = get_option("base_margin")
         # Use only inherited elements and make everything blank
         theme.__init__(
@@ -32,7 +39,7 @@ class theme_void(theme):
                 size=base_size,
                 linespacing=0.9,
                 rotation=0,
-                margin={},
+                margin=margin(),
             ),
             axis_text_x=element_blank(),
             axis_text_y=element_blank(),
@@ -54,23 +61,11 @@ class theme_void(theme):
             legend_spacing=10,
             legend_text=element_text(
                 size=base_size * 0.8,
-                margin={
-                    "t": m / 1.5,
-                    "b": m / 1.5,
-                    "l": m / 1.5,
-                    "r": m / 1.5,
-                    "units": "fig",
-                },
+                margin=margin_auto(m / 1.5, unit="fig"),
             ),
             legend_ticks=element_line(color="#CCCCCC", size=1),
             legend_title=element_text(
-                margin={
-                    "t": m,
-                    "b": m / 2,
-                    "l": m * 2,
-                    "r": m * 2,
-                    "units": "fig",
-                },
+                margin=margin(t=m, l=m * 2, b=m / 2, r=m * 2, unit="fig")
             ),
             panel_spacing=m,
             plot_caption=element_text(
@@ -78,33 +73,36 @@ class theme_void(theme):
                 ha="right",
                 va="bottom",
                 ma="left",
-                margin={"t": m, "units": "fig"},
+                margin=margin(t=m, unit="fig"),
             ),
             plot_margin=0,
             plot_subtitle=element_text(
                 size=base_size * 1,
                 va="top",
                 ma="left",
-                margin={"b": m, "units": "fig"},
+                margin=margin(b=m, unit="fig"),
             ),
             plot_title=element_text(
                 size=base_size * 1.2,
                 va="top",
                 ma="left",
-                margin={"b": m, "units": "fig"},
+                margin=margin(b=m, unit="fig"),
             ),
+            plot_tag=element_text(
+                size=base_size * 1.2,
+                va="center",
+                ha="center",
+            ),
+            plot_title_position="panel",
+            plot_caption_position="panel",
+            plot_tag_location="margin",
+            plot_tag_position="topleft",
             strip_align=0,
             strip_text=element_text(
                 color="#1A1A1A",
                 size=base_size * 0.8,
-                linespacing=1.0,
-                margin={
-                    "t": 1 / 3,
-                    "b": 1 / 3,
-                    "l": 1 / 3,
-                    "r": 1 / 3,
-                    "units": "lines",
-                },
+                linespacing=1.5,
+                margin=margin_auto(half_line * 0.8),
             ),
             complete=True,
         )

plotnine/themes/theme_xkcd.py

@@ -50,7 +50,6 @@ class theme_xkcd(theme_gray):
             legend_background=element_rect(color="black"),
             legend_box_margin=2,
             legend_margin=5,
-            legend_key=element_rect(fill="none"),
             panel_border=element_rect(color="black", size=1),
             panel_grid=element_blank(),
             panel_background=element_rect(fill="white"),