figrecipe 0.6.0__py3-none-any.whl → 0.9.0__py3-none-any.whl

figrecipe/styles/_style_loader.py

@@ -21,10 +21,12 @@ __all__ = [
     "load_preset",
     "unload_style",
     "get_style",
+    "get_current_style_dict",
     "reload_style",
     "list_presets",
     "STYLE",
     "to_subplots_kwargs",
+    "DotDict",
 ]
 
 from pathlib import Path
@@ -32,6 +34,9 @@ from typing import Any, Dict, List, Optional, Union
 
 from ruamel.yaml import YAML
 
+from ._dotdict import DotDict
+from ._kwargs_converter import to_subplots_kwargs
+
 # Path to presets directory
 _PRESETS_DIR = Path(__file__).parent / "presets"
 
@@ -44,7 +49,7 @@ _PRESET_ALIASES = {
 }
 
 # Global style cache
-_STYLE_CACHE: Optional["DotDict"] = None
+_STYLE_CACHE: Optional[DotDict] = None
 _CURRENT_STYLE_NAME: Optional[str] = None
 
 
@@ -70,52 +75,6 @@ def list_presets() -> List[str]:
     return ["MATPLOTLIB", "SCITEX"]
 
 
-class DotDict(dict):
-    """Dictionary with dot-notation access to nested keys.
-
-    Examples
-    --------
-    >>> d = DotDict({"axes": {"width_mm": 40}})
-    >>> d.axes.width_mm
-    40
-    """
-
-    def __getattr__(self, key: str) -> Any:
-        # Handle special methods first
-        if key == "to_subplots_kwargs":
-            return lambda: to_subplots_kwargs(self)
-        try:
-            value = self[key]
-            if isinstance(value, dict) and not isinstance(value, DotDict):
-                value = DotDict(value)
-                self[key] = value
-            return value
-        except KeyError:
-            raise AttributeError(f"'{type(self).__name__}' has no attribute '{key}'")
-
-    def __setattr__(self, key: str, value: Any) -> None:
-        self[key] = value
-
-    def __delattr__(self, key: str) -> None:
-        try:
-            del self[key]
-        except KeyError:
-            raise AttributeError(f"'{type(self).__name__}' has no attribute '{key}'")
-
-    def get(self, key: str, default: Any = None) -> Any:
-        """Get value with default, supporting nested keys with dots."""
-        if "." in key:
-            parts = key.split(".")
-            value = self
-            for part in parts:
-                if isinstance(value, dict) and part in value:
-                    value = value[part]
-                else:
-                    return default
-            return value
-        return super().get(key, default)
-
-
 def _deep_merge(base: Dict, override: Dict) -> Dict:
     """Deep merge two dictionaries, with override taking precedence."""
     result = base.copy()
@@ -391,156 +350,19 @@ def get_style() -> DotDict:
     return _STYLE_CACHE
 
 
-def to_subplots_kwargs(style: Optional[DotDict] = None) -> Dict[str, Any]:
-    """Convert style DotDict to kwargs for ps.subplots().
-
-    Uses YAML-compatible flattened key names as the single source of truth.
-    For example, YAML `fonts.axis_label_pt` becomes `fonts_axis_label_pt`.
-
-    Parameters
-    ----------
-    style : DotDict, optional
-        Style configuration. If None, uses current loaded style.
+def get_current_style_dict() -> Dict[str, Any]:
+    """Get current style as a flat dictionary for style applier functions.
 
     Returns
     -------
     dict
-        Keyword arguments for ps.subplots() with YAML-compatible flattened keys.
-
-    Examples
-    --------
-    >>> style = load_style()
-    >>> kwargs = to_subplots_kwargs(style)
-    >>> fig, ax = ps.subplots(**kwargs)
+        Flattened style dictionary with keys like 'pie_show_axes', 'imshow_show_axes'.
+        Returns empty dict if no style is loaded.
     """
-    if style is None:
-        style = get_style()
-
-    # YAML-compatible flattened keys (single source of truth)
-    result = {
-        # Axes (axes.* in YAML)
-        "axes_width_mm": style.axes.width_mm,
-        "axes_height_mm": style.axes.height_mm,
-        "axes_thickness_mm": style.axes.thickness_mm,
-        # Margins (margins.* in YAML)
-        "margins_left_mm": style.margins.left_mm,
-        "margins_right_mm": style.margins.right_mm,
-        "margins_bottom_mm": style.margins.bottom_mm,
-        "margins_top_mm": style.margins.top_mm,
-        # Spacing (spacing.* in YAML)
-        "spacing_horizontal_mm": style.spacing.horizontal_mm,
-        "spacing_vertical_mm": style.spacing.vertical_mm,
-        # Ticks (ticks.* in YAML)
-        "ticks_length_mm": style.ticks.length_mm,
-        "ticks_thickness_mm": style.ticks.thickness_mm,
-        "ticks_direction": style.ticks.get("direction", "out"),
-        "ticks_n_ticks": style.ticks.n_ticks,
-        # Lines (lines.* in YAML)
-        "lines_trace_mm": style.lines.trace_mm,
-        "lines_errorbar_mm": style.lines.get("errorbar_mm", 0.2),
-        "lines_errorbar_cap_mm": style.lines.get("errorbar_cap_mm", 0.8),
-        # Markers (markers.* in YAML)
-        "markers_size_mm": style.markers.size_mm,
-        "markers_scatter_mm": style.markers.get("scatter_mm", style.markers.size_mm),
-        "markers_flier_mm": style.markers.get("flier_mm", style.markers.size_mm),
-        "markers_edge_width_mm": style.markers.get("edge_width_mm"),
-        # Boxplot (boxplot.* in YAML)
-        "boxplot_line_mm": style.get("boxplot", {}).get("line_mm", 0.2),
-        "boxplot_whisker_mm": style.get("boxplot", {}).get("whisker_mm", 0.2),
-        "boxplot_cap_mm": style.get("boxplot", {}).get("cap_mm", 0.2),
-        "boxplot_median_mm": style.get("boxplot", {}).get("median_mm", 0.2),
-        "boxplot_median_color": style.get("boxplot", {}).get("median_color", "black"),
-        "boxplot_flier_edge_mm": style.get("boxplot", {}).get("flier_edge_mm", 0.2),
-        # Violinplot (violinplot.* in YAML)
-        "violinplot_line_mm": style.get("violinplot", {}).get("line_mm", 0.2),
-        "violinplot_inner": style.get("violinplot", {}).get("inner", "box"),
-        "violinplot_box_width_mm": style.get("violinplot", {}).get("box_width_mm", 1.5),
-        "violinplot_whisker_mm": style.get("violinplot", {}).get("whisker_mm", 0.2),
-        "violinplot_median_mm": style.get("violinplot", {}).get("median_mm", 0.8),
-        # Barplot (barplot.* in YAML)
-        "barplot_edge_mm": style.get("barplot", {}).get("edge_mm", 0.2),
-        # Histogram (histogram.* in YAML)
-        "histogram_edge_mm": style.get("histogram", {}).get("edge_mm", 0.2),
-        # Pie chart (pie.* in YAML)
-        "pie_text_pt": style.get("pie", {}).get("text_pt", 6),
-        "pie_show_axes": style.get("pie", {}).get("show_axes", False),
-        # Imshow (imshow.* in YAML)
-        "imshow_show_axes": style.get("imshow", {}).get("show_axes", False),
-        "imshow_show_labels": style.get("imshow", {}).get("show_labels", False),
-        # Fonts (fonts.* in YAML)
-        "fonts_family": style.fonts.family,
-        "fonts_axis_label_pt": style.fonts.axis_label_pt,
-        "fonts_tick_label_pt": style.fonts.tick_label_pt,
-        "fonts_title_pt": style.fonts.title_pt,
-        "fonts_suptitle_pt": style.fonts.suptitle_pt,
-        "fonts_legend_pt": style.fonts.legend_pt,
-        "fonts_annotation_pt": style.fonts.get("annotation_pt", 6),
-        # Padding (padding.* in YAML)
-        "padding_label_pt": style.padding.label_pt,
-        "padding_tick_pt": style.padding.tick_pt,
-        "padding_title_pt": style.padding.title_pt,
-        # Output (output.* in YAML)
-        "output_dpi": style.output.dpi,
-        "output_transparent": style.output.get("transparent", True),
-        "output_format": style.output.get("format", "pdf"),
-        # Theme (theme.* in YAML)
-        "theme_mode": style.theme.mode,
-    }
-
-    # Add theme colors from preset if available
-    theme_mode = style.theme.mode
-    if "theme" in style and theme_mode in style.theme:
-        result["theme_colors"] = dict(style.theme[theme_mode])
-
-    # Add color palette if available
-    if "colors" in style and "palette" in style.colors:
-        result["color_palette"] = list(style.colors.palette)
-
-    # Add behavior settings (behavior.* in YAML)
-    if "behavior" in style:
-        behavior = style.behavior
-        if hasattr(behavior, "hide_top_spine"):
-            result["behavior_hide_top_spine"] = behavior.hide_top_spine
-        if hasattr(behavior, "hide_right_spine"):
-            result["behavior_hide_right_spine"] = behavior.hide_right_spine
-        if hasattr(behavior, "grid"):
-            result["behavior_grid"] = behavior.grid
-        if hasattr(behavior, "auto_scale_axes"):
-            result["behavior_auto_scale_axes"] = behavior.auto_scale_axes
-        if hasattr(behavior, "constrained_layout"):
-            result["behavior_constrained_layout"] = behavior.constrained_layout
-
-    # Legacy key aliases for backwards compatibility
-    # (These allow existing code using old keys to still work)
-    result["margin_left_mm"] = result["margins_left_mm"]
-    result["margin_right_mm"] = result["margins_right_mm"]
-    result["margin_bottom_mm"] = result["margins_bottom_mm"]
-    result["margin_top_mm"] = result["margins_top_mm"]
-    result["space_w_mm"] = result["spacing_horizontal_mm"]
-    result["space_h_mm"] = result["spacing_vertical_mm"]
-    result["tick_length_mm"] = result["ticks_length_mm"]
-    result["tick_thickness_mm"] = result["ticks_thickness_mm"]
-    result["n_ticks"] = result["ticks_n_ticks"]
-    result["trace_thickness_mm"] = result["lines_trace_mm"]
-    result["marker_size_mm"] = result["markers_size_mm"]
-    result["font_family"] = result["fonts_family"]
-    result["axis_font_size_pt"] = result["fonts_axis_label_pt"]
-    result["tick_font_size_pt"] = result["fonts_tick_label_pt"]
-    result["title_font_size_pt"] = result["fonts_title_pt"]
-    result["suptitle_font_size_pt"] = result["fonts_suptitle_pt"]
-    result["legend_font_size_pt"] = result["fonts_legend_pt"]
-    result["label_pad_pt"] = result["padding_label_pt"]
-    result["tick_pad_pt"] = result["padding_tick_pt"]
-    result["title_pad_pt"] = result["padding_title_pt"]
-    result["dpi"] = result["output_dpi"]
-    result["theme"] = result["theme_mode"]
-    result["hide_top_spine"] = result.get("behavior_hide_top_spine", True)
-    result["hide_right_spine"] = result.get("behavior_hide_right_spine", True)
-    result["grid"] = result.get("behavior_grid", False)
-    result["auto_scale_axes"] = result.get("behavior_auto_scale_axes", True)
-    result["constrained_layout"] = result.get("behavior_constrained_layout", False)
-
-    return result
+    global _STYLE_CACHE
+    if _STYLE_CACHE is None:
+        return {}
+    return to_subplots_kwargs(_STYLE_CACHE)
 
 
 # Lazy-loaded global STYLE object
@@ -576,3 +398,5 @@ if __name__ == "__main__":
 
     print("\nUsing STYLE proxy...")
     print(f"  STYLE.fonts.family: {STYLE.fonts.family}")
+
+# EOF

figrecipe/styles/_themes.py

@@ -0,0 +1,151 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""Theme color utilities for figrecipe styles."""
+
+from typing import Dict, Optional
+
+from matplotlib.axes import Axes
+
+# Default theme color palettes (Monaco/VS Code style for dark)
+THEME_COLORS = {
+    "dark": {
+        "figure_bg": "#1e1e1e",  # VS Code main background
+        "axes_bg": "#252526",  # VS Code panel background
+        "legend_bg": "#252526",  # Same as axes
+        "text": "#d4d4d4",  # VS Code default text
+        "spine": "#3c3c3c",  # Subtle border color
+        "tick": "#d4d4d4",  # Match text
+        "grid": "#3a3a3a",  # Subtle grid
+    },
+    "light": {
+        "figure_bg": "none",  # Transparent
+        "axes_bg": "none",  # Transparent
+        "legend_bg": "none",  # Transparent
+        "text": "black",
+        "spine": "black",
+        "tick": "black",
+        "grid": "#cccccc",
+    },
+}
+
+
+def apply_theme_colors(
+    ax: Axes,
+    theme: str = "light",
+    custom_colors: Optional[Dict[str, str]] = None,
+) -> None:
+    """Apply theme colors to axes for dark/light mode support.
+
+    Parameters
+    ----------
+    ax : matplotlib.axes.Axes
+        Target axes to apply theme to
+    theme : str or dict
+        Color theme: "light" or "dark" (default: "light")
+        If dict, extracts 'mode' key (for YAML-style theme dicts)
+    custom_colors : dict, optional
+        Custom color overrides. Keys: figure_bg, axes_bg, legend_bg, text, spine, tick, grid
+
+    Examples
+    --------
+    >>> fig, ax = plt.subplots()
+    >>> apply_theme_colors(ax, theme="dark")  # Eye-friendly dark mode
+    """
+    # Handle dict-style theme (from YAML: {mode: "light", dark: {...}})
+    if isinstance(theme, dict):
+        theme = theme.get("mode", "light")
+
+    # Ensure theme is a string
+    if not isinstance(theme, str):
+        theme = "light"
+
+    # Get base theme colors
+    colors = THEME_COLORS.get(theme, THEME_COLORS["light"]).copy()
+
+    # Apply custom overrides
+    if custom_colors:
+        # Handle legacy key name (background -> figure_bg)
+        if "background" in custom_colors and "figure_bg" not in custom_colors:
+            custom_colors["figure_bg"] = custom_colors.pop("background")
+        colors.update(custom_colors)
+
+    # Helper to check for transparent/none
+    def is_transparent(color):
+        if color is None:
+            return False
+        return str(color).lower() in ("none", "transparent")
+
+    # Apply axes background (handle "none"/"transparent" for transparency)
+    axes_bg = colors.get("axes_bg", "none")
+    if is_transparent(axes_bg):
+        ax.set_facecolor("none")
+        ax.patch.set_alpha(0)
+    else:
+        ax.set_facecolor(axes_bg)
+
+    # Apply figure background if accessible
+    fig = ax.get_figure()
+    if fig is not None:
+        fig_bg = colors.get("figure_bg", "none")
+        if is_transparent(fig_bg):
+            fig.patch.set_facecolor("none")
+            fig.patch.set_alpha(0)
+        else:
+            fig.patch.set_facecolor(fig_bg)
+
+        # Apply text colors to figure-level text elements
+        if hasattr(fig, "_suptitle") and fig._suptitle is not None:
+            fig._suptitle.set_color(colors["text"])
+        if hasattr(fig, "_supxlabel") and fig._supxlabel is not None:
+            fig._supxlabel.set_color(colors["text"])
+        if hasattr(fig, "_supylabel") and fig._supylabel is not None:
+            fig._supylabel.set_color(colors["text"])
+
+    # Apply text colors (labels, titles)
+    ax.xaxis.label.set_color(colors["text"])
+    ax.yaxis.label.set_color(colors["text"])
+    ax.title.set_color(colors["text"])
+
+    # Update rcParams for dark mode support (pie charts, panel labels)
+    import matplotlib as mpl
+
+    mpl.rcParams["text.color"] = colors["text"]
+    mpl.rcParams["axes.labelcolor"] = colors["text"]
+    mpl.rcParams["xtick.color"] = colors["tick"]
+    mpl.rcParams["ytick.color"] = colors["tick"]
+
+    # Apply spine colors
+    for spine in ax.spines.values():
+        spine.set_color(colors["spine"])
+
+    # Apply tick colors (both marks and labels)
+    ax.tick_params(colors=colors["tick"], which="both")
+    for label in ax.get_xticklabels() + ax.get_yticklabels():
+        label.set_color(colors["tick"])
+
+    # Apply text colors to all text objects (panel labels, pie labels, annotations)
+    for text in ax.texts:
+        text.set_color(colors["text"])
+
+    # Apply legend colors if legend exists
+    legend = ax.get_legend()
+    if legend is not None:
+        for text in legend.get_texts():
+            text.set_color(colors["text"])
+        title = legend.get_title()
+        if title:
+            title.set_color(colors["text"])
+        frame = legend.get_frame()
+        if frame:
+            legend_bg = colors.get("legend_bg", colors.get("axes_bg", "none"))
+            if is_transparent(legend_bg):
+                frame.set_facecolor("none")
+                frame.set_alpha(0)
+            else:
+                frame.set_facecolor(legend_bg)
+            frame.set_edgecolor(colors["spine"])
+
+
+__all__ = ["THEME_COLORS", "apply_theme_colors"]
+
+# EOF

figrecipe/styles/presets/MATPLOTLIB.yaml

@@ -43,7 +43,8 @@ ticks:
   length_mm: null
   thickness_mm: null
   direction: null
-  n_ticks: null
+  n_ticks_min: null
+  n_ticks_max: null
 
 markers:
   size_mm: null

figrecipe/styles/presets/SCITEX.yaml

@@ -1,4 +1,4 @@
-# Timestamp: "2025-12-22 13:49:08 (ywatanabe)"
+# Timestamp: "2025-12-24 14:11:46 (ywatanabe)"
 # File: ./src/figrecipe/styles/presets/SCITEX.yaml
 # FIGRECIPE Style Preset
 # ======================
@@ -11,10 +11,10 @@ axes:
   thickness_mm: 0.2
 
 margins:
-  left_mm: 6      # Room for supylabel
+  left_mm: 1      # Minimal - constrained_layout handles labels
   right_mm: 1
-  bottom_mm: 5    # Room for supxlabel
-  top_mm: 5       # Room for suptitle
+  bottom_mm: 1    # Minimal - constrained_layout handles labels
+  top_mm: 1       # Minimal - constrained_layout handles labels
 
 spacing:
   horizontal_mm: 10   # Between columns
@@ -49,7 +49,8 @@ ticks:
   length_mm: 0.8
   thickness_mm: 0.2
   direction: "out"
-  n_ticks: 4
+  n_ticks_min: 3
+  n_ticks_max: 4
 
 markers:
   size_mm: 0.8
@@ -85,6 +86,8 @@ histogram:
 pie:
   text_pt: 6             # Pie chart text size (labels, autopct)
   show_axes: false       # Hide axes for pie charts
+  edge_color: "black"    # Wedge edge color (black for contrast)
+  edge_mm: 0.2           # Wedge edge thickness
 
 imshow:
   show_axes: false       # Hide ticks, ticklabels, spines for imshow
@@ -109,6 +112,13 @@ legend:
   alpha: 1.0             # Transparency
   loc: "best"
 
+stat_annotation:
+  bracket_height: 0.03   # Height of bracket tips as fraction of y-range
+  text_offset: 0.01      # Text offset above bracket as fraction of y-range
+  linewidth_mm: 0.2      # Bracket line width in mm
+  fontsize_pt: 6         # Font size for annotation text (stars and p-values)
+  stars_fontweight: "bold"  # Font weight for stars
+
 output:
   dpi: 300
   transparent: true
@@ -119,7 +129,8 @@ behavior:
   hide_top_spine: true
   hide_right_spine: true
   grid: false
-  constrained_layout: true  # Auto-spacing for suptitle/supxlabel/supylabel
+  constrained_layout: true  # Auto-fits content; spacing controls disabled
+  panel_labels: true        # Auto-add A, B, C labels to multi-panel figures
 
 theme:
   mode: "light"
@@ -152,25 +163,26 @@ colors:
     - [228, 94, 50]      # orange
     - [255, 150, 200]    # pink
 
-  # Named colors
-  white: [255, 255, 255]
-  black: [0, 0, 0]
-  blue: [0, 128, 192]
-  red: [255, 70, 50]
-  pink: [255, 150, 200]
-  green: [20, 180, 20]
-  yellow: [230, 160, 20]
-  gray: [128, 128, 128]
-  grey: [128, 128, 128]
-  purple: [200, 50, 255]
-  lightblue: [20, 200, 200]
-  brown: [128, 0, 0]
-  navy: [0, 0, 100]
-  orange: [228, 94, 50]
-
-  # Semantic
-  primary: [0, 128, 192]
-  secondary: [255, 70, 50]
-  accent: [20, 180, 20]
-
-# EOF
+  rgb:
+    # Named colors
+    - white: [255, 255, 255]
+    - black: [0, 0, 0]
+    - blue: [0, 128, 192]
+    - red: [255, 70, 50]
+    - pink: [255, 150, 200]
+    - green: [20, 180, 20]
+    - yellow: [230, 160, 20]
+    - gray: [128, 128, 128]
+    - grey: [128, 128, 128]
+    - purple: [200, 50, 255]
+    - lightblue: [20, 200, 200]
+    - brown: [128, 0, 0]
+    - navy: [0, 0, 100]
+    - orange: [228, 94, 50]
+
+    # Semantic
+    - primary: [0, 128, 192]
+    - secondary: [255, 70, 50]
+    - accent: [20, 180, 20]
+
+# EOF