tikzplot42 0.4.5__tar.gz → 0.4.6__tar.gz

{tikzplot42-0.4.5 → tikzplot42-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tikzplot42
-Version: 0.4.5
+Version: 0.4.6
 Summary: TikzPlot to make TikZ/PGFPlots plots with matplotlib.pyplot-like syntax.
 Author-email: Zan Ambrozic <zan.ambrozic7@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{tikzplot42-0.4.5 → tikzplot42-0.4.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tikzplot42"
-version = "0.4.5"
+version = "0.4.6"
 description = "TikzPlot to make TikZ/PGFPlots plots with matplotlib.pyplot-like syntax."
 authors = [
     { name = "Zan Ambrozic", email = "zan.ambrozic7@gmail.com" }

{tikzplot42-0.4.5 → tikzplot42-0.4.6}/src/tikzplot/axes.py

@@ -138,7 +138,7 @@ class BaseAxes:
             return self._plot(y,x,settings={"xcomb": None}, **kwargs)
 
     def fill_between(self, x, y1, y2=None, **kwargs):
-        kws = {"fmt", "alpha", "color", "c", "label"}
+        kws = {"fmt", "alpha", "color", "c", "label", "hatch", "hatch_color", "hatch_linewidth", "hatch_distance"}
         kwargs = self._check_kwargs("fill_between", kws, **kwargs)
         def _check_instance(xs, ys, pname):
             for el in self._elements:
@@ -222,7 +222,7 @@ class BaseAxes:
                 self._plot([xs[i]]*2, [ymins[i], ymaxs[i]], None, None, None, c=colorss[i], ls=lss[i])
 
     def hist(self, x, bins=10, density=False,**kwargs):
-        kws = {"alpha", "color", "c", "label", "facecolor", "fc", "edgecolor", "ec", "orientation", "rwidth", "cumulative", "range", "histtype", "weights", "cumulative", "align", "stacked", "fill"}
+        kws = {"alpha", "color", "c", "label", "facecolor", "fc", "edgecolor", "ec", "orientation", "rwidth", "cumulative", "range", "histtype", "weights", "cumulative", "align", "stacked", "fill", "hatch", "hatch_color", "hatch_linewidth", "hatch_distance"}
         kwargs = self._check_kwargs("hist", kws, **kwargs)
         if isinstance(x, (list, tuple)) and len(x) > 0 and isinstance(x[0], (list, tuple, _np.ndarray)):
             try:
@@ -246,7 +246,7 @@ class BaseAxes:
 
         stack = kwargs.pop("stacked", False)
         datas = {}
-        for kw in ["color", "c", "facecolor", "fc", "edgecolor", "ec", "label"]:
+        for kw in ["color", "c", "facecolor", "fc", "edgecolor", "ec", "label", "hatch", "hatch_color", "hatch_linewidth", "hatch_distance"]:
             if kw in kwargs:
                 if isinstance(kwargs[kw], (list)):
                     if len(kwargs[kw]) != len(datasets):
@@ -299,17 +299,29 @@ class BaseAxes:
         old_counts = _np.zeros(len(edges), dtype=_np.float64)
         totals, _ = _np.histogram(all_data, edges, density=False, weights=kwargs.get("weights", None), range=kwargs.get("range", None))
         tot_sum = totals.sum()
+        align_offset = 0
+        if "align" in kwargs:
+            if kwargs["align"] not in ["left", "mid", "right"]:
+                raise Warning(f"Invalid align value: {kwargs['align']}. Must be 'left', 'mid', or 'right'.")
+            if kwargs["align"] == "left":
+                align_offset = -widths.mean()/2
+            elif kwargs["align"] == "mid":
+                align_offset = 0
+            elif kwargs["align"] == "right":
+                align_offset = widths.mean()/2
         for i in range(len(datasets)):
             data = datasets[i]
             settings = base_settings.copy()
             kws = datas.get(i, {})
             if "label" in kws:
-                if "xbar" in settings or "xbar interval" in settings:
+                if "xbar" in settings:
                     settings["xbar legend"] = None
-                else:
+                elif "xbar interval" in settings:
+                    settings["xbar interval legend"] = None
+                elif "ybar" in settings:
                     settings["ybar legend"] = None
-            else:
-                settings["forget plot"] = None
+                else:
+                    settings["ybar interval legend"] = None
             fill = kws.pop("facecolor", kws.pop("fc", kws.pop("color", kws.pop("c", None))))
             draw = kws.pop("edgecolor", kws.pop("ec", None))
             if fill:
@@ -325,7 +337,7 @@ class BaseAxes:
                 if "rwidth" in kwargs:
                     xs = [edges[0] + widths[0]*(1-kwargs["rwidth"])/2]
                     new_counts = []
-                    for j in range(len(widths)):  # Changed 'i' to 'j' to avoid overwriting dataset index 'i'
+                    for j in range(len(widths)):
                         xs.append(xs[-1] + widths[j]*kwargs["rwidth"])
                         new_counts.append(counts[j])
                         if j < len(counts)-1:
@@ -339,6 +351,7 @@ class BaseAxes:
                 xs = (edges[:-1] + edges[1:]) / 2
                 if offset > 0:
                     settings["bar shift"] = f"{offset*(i - len(datasets)/2 + 0.5)}"
+            xs = xs + align_offset * _np.ones_like(xs)
             if "cumulative" in kwargs and kwargs["cumulative"]:
                 counts = _np.cumsum(counts)
             if stack:
@@ -386,7 +399,7 @@ class BaseAxes:
         self._plot((xmin, xmax), y, settings={"axhline": None}, **kwargs)
 
     def axvspan(self, xmin, xmax, ymin=0, ymax=1, **kwargs):
-        kws = {"c", "color", "alpha", "label"}
+        kws = {"c", "color", "alpha", "label", "hatch", "hatch_color", "hatch_linewidth", "hatch_distance"}
         kwargs = self._check_kwargs("axvspan", kws, **kwargs)
         self._ext_ymin = self._ext_ymax = True
         if TikzConfig.USE_GROUPPLOTS:
@@ -394,7 +407,7 @@ class BaseAxes:
         self._plot([xmin, xmax], [ymin, ymax], settings={"axvspan": None}, **kwargs)
 
     def axhspan(self, ymin, ymax, xmin=0, xmax=1, **kwargs):
-        kws = {"c", "color", "alpha", "label"}
+        kws = {"c", "color", "alpha", "label", "hatch", "hatch_color", "hatch_linewidth", "hatch_distance"}
         kwargs = self._check_kwargs("axhspan", kws, **kwargs)
         if isinstance(self, Secondary):
             self._primary._ext_xmin = self._primary._ext_xmax = True

{tikzplot42-0.4.5 → tikzplot42-0.4.6}/src/tikzplot/axes.pyi

@@ -7,6 +7,7 @@ ColorLike = Union[str, Sequence[float], Sequence[Sequence[float] | ArrayLike], n
 LineStyle = Literal["-", "--", "-.", ":", "solid", "dashed", "dashdot", "none", ""]
 MarkerStyle = Literal["o", "s", "^", "v", "x", "+", ".", "*", "None", ""]
 FontSize = Literal["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"]
+HatchStyle = Literal["/", "\\", "|", "-", "+", "x", ".", "*"]
 
 
 class BaseAxes:   
@@ -190,7 +191,12 @@ class BaseAxes:
         y2: Optional[ArrayLike] = ...,
         alpha: Optional[float] = ...,
         color: Optional[ColorLike] = ...,
-        c: Optional[ColorLike] = ...
+        c: Optional[ColorLike] = ...,
+        label: Optional[str] = ...,
+        hatch: Optional[str] = ...,
+        hatch_color: Optional[ColorLike] = ...,
+        hatch_linewidth: Optional[float] = ...,
+        hatch_distance: Optional[float] = ...,
     ) -> None: 
         """
         Fill space between two plots (or a single plot and x-axis).
@@ -209,6 +215,17 @@ class BaseAxes:
         label: str, optional
             Legend entry
 
+        hatch: str, optional
+            The hatch pattern to use for filling the bars. Can be a string of characters that define the hatch pattern (e.g., '/', '\\', '|', '-', '+', 'x', '.', '*'). If not provided, no hatching is applied.
+
+        hatch_color: ColorLike, optional
+            The color of the hatch pattern. If not provided, the default color cycle is used.
+
+        hatch_linewidth: float, optional
+            The line width of the hatch pattern in points. If not provided, the default line width is used.
+
+        hatch_distance: float, optional
+            The distance between hatch lines in points. If not provided, the default distance is used.
         """
         ...
 
@@ -293,10 +310,64 @@ class BaseAxes:
         align: Literal["left", "mid", "right"] = ...,
         stacked: bool = False,
         fill: bool = True,
+        hatch: str = ...,
+        hatch_color: ColorLike = ...,
+        hatch_linewidth: float = ...,
+        hatch_distance: float = ...,
         #**kwargs: Any
     ) -> None: 
         """
         Draw histogram to the selected axis.
+
+        Parameters
+        ----------
+        x: ArrayLike or sequence of ArrayLike
+            Data to be histogrammed. If a sequence of arrays is given, each array is histogrammed separately and the result is stacked (if stacked=True) or overlaid.
+        
+        bins: int or sequence of float, optional
+            Number of bins or bin edges. If an integer is given, it defines the number of equal-width bins in the given range (10 by default). If a sequence is given, it defines the bin edges, including the rightmost edge.
+        
+        density: bool, optional
+            If True, the histogram is normalized to form a probability density, i.e., the area under the histogram will sum to 1. Default is False.
+        
+        cumulative: bool, optional
+            If True, the histogram is cumulative, i.e., each bin will contain the sum of all previous bins. Default is False.
+
+        histtype: {"bar", "barstacked", "step", "stepfilled"}, optional
+            The type of histogram to draw. "bar" (default) draws a traditional bar histogram, "barstacked" draws a stacked bar histogram, "step" draws a line plot that represents the histogram, and "stepfilled" draws a filled step plot.
+
+        orientation: {"horizontal", "vertical"}, optional
+            The orientation of the histogram. "vertical" (default) draws vertical bars, while "horizontal" draws horizontal bars.
+
+        rwidth: float, optional
+            The relative width of the bars as a fraction of the bin width. If None (default), the bars will be drawn with full width.
+
+        range: tuple of float, optional
+            The lower and upper range of the bins. If not provided, the range is automatically determined from the data.
+
+        color, facecolor, fc, edgecolor, ec: ColorLike, optional
+            The color of the bars. Can be a single color or a sequence of colors for multiple datasets. If not provided, the default color cycle is used.
+
+        align: {"left", "mid", "right"}, optional
+            The alignment of the bars. "mid" (default) centers the bars on the bin edges, "left" aligns the left edge of the bars with the bin edges, and "right" aligns the right edge of the bars with the bin edges.
+
+        stacked: bool, optional
+            If True, multiple datasets are stacked on top of each other. Default is False.
+
+        fill: bool, optional
+            If True (default), the bars are filled. If False, only the edges of the bars are drawn.
+
+        hatch: str, optional
+            The hatch pattern to use for filling the bars. Can be a string of characters that define the hatch pattern (e.g., '/', '\\', '|', '-', '+', 'x', '.', '*'). If not provided, no hatching is applied.
+
+        hatch_color: ColorLike, optional
+            The color of the hatch pattern. If not provided, the default color cycle is used.
+
+        hatch_linewidth: float, optional
+            The line width of the hatch pattern in points. If not provided, the default line width is used.
+
+        hatch_distance: float, optional
+            The distance between hatch lines in points. If not provided, the default distance is used.
         """
         ...
 
@@ -394,7 +465,7 @@ class BaseAxes:
             Legend entry
         """
 
-    def axvspan(self, xmin:float, xmax:float, ymin:float=0, ymax:float=1, alpha:Optional[float] = ..., color:Optional[ColorLike] = ..., label:Optional[str] = ...) -> None:
+    def axvspan(self, xmin:float, xmax:float, ymin:float=0, ymax:float=1, alpha:Optional[float] = ..., color:Optional[ColorLike] = ..., label:Optional[str] = ..., hatch:Optional[str] = ..., hatch_color:Optional[ColorLike] = ..., hatch_linewidth:Optional[float] = ..., hatch_distance:Optional[float] = ...) -> None:
         """
         Draw a background vertical span to the selected axis between given x coordinates.
 
@@ -414,9 +485,21 @@ class BaseAxes:
 
         label: str, optional
             Legend entry
+
+        hatch: str, optional
+            The hatch pattern to use for filling the bars. Can be a string of characters that define the hatch pattern (e.g., '/', '\\', '|', '-', '+', 'x', '.', '*'). If not provided, no hatching is applied.
+
+        hatch_color: ColorLike, optional
+            The color of the hatch pattern. If not provided, the default color cycle is used.
+
+        hatch_linewidth: float, optional
+            The line width of the hatch pattern in points. If not provided, the default line width is used.
+
+        hatch_distance: float, optional
+            The distance between hatch lines in points. If not provided, the default distance is used.
         """
 
-    def axhspan(self, ymin:float, ymax:float, xmin:float=0, xmax:float=1, alpha:Optional[float] = ..., color:Optional[ColorLike] = ..., label:Optional[str] = ...) -> None:
+    def axhspan(self, ymin:float, ymax:float, xmin:float=0, xmax:float=1, alpha:Optional[float] = ..., color:Optional[ColorLike] = ..., label:Optional[str] = ..., hatch:Optional[str] = ..., hatch_color:Optional[ColorLike] = ..., hatch_linewidth:Optional[float] = ..., hatch_distance:Optional[float] = ...) -> None:
         """
         Draw a background horizontal span to the selected axis between given y coordinates.
 
@@ -436,6 +519,19 @@ class BaseAxes:
 
         label: str, optional
             Legend entry
+        
+        hatch: str, optional
+            The hatch pattern to use for filling the bars. Can be a string of characters that define the hatch pattern (e.g., '/', '\\', '|', '-', '+', 'x', '.', '*'). If not provided, no hatching is applied.
+
+        hatch_color: ColorLike, optional
+            The color of the hatch pattern. If not provided, the default color cycle is used.
+
+        hatch_linewidth: float, optional
+            The line width of the hatch pattern in points. If not provided, the default line width is used.
+
+        hatch_distance: float, optional
+            The distance between hatch lines in points. If not provided, the default distance is used.
+        
         """
 
     def magnify(self, x_p: float, y_p: float, x_m: float, y_m: float, zoom: float, size: float, **kwargs) -> int:

{tikzplot42-0.4.5 → tikzplot42-0.4.6}/src/tikzplot/elements.py

@@ -13,6 +13,7 @@ class BaseGraph:
     _COLOR_MAP = {'b':'blue', 'g':'teal', 'r':'red', 'c':'cyan', 'm':'magenta', 'y':'yellow', 'k':'black', 'w':'white', "orange":"orange", "green": "green", "cyan":"cyan", "peru": "brown", "lime": "lime", "gray": "gray", "magenta": "magetna", "purple": "violet"}
     _LINE_MAP = {"--": "dashed", ":": "dotted", "-.": "dashdotted", "-":"solid"}
     _MARKER_MAP = {'o':'*', ".": "*", 's':'square*', '^':'triangle', 'v':'triangle*', 'd':'diamond', '+':'+', 'x':'x', '*':'star'}
+    _HATCH_MAP = {"-": {"Lines": {"angle": 0}}, "|": {"Lines": {"angle": 90}}, "+": {"Hatch": {}}, "x": {"Hatch": {"angle": 45}}, "/": {"Lines": {"angle": 45}}, "\\": {"Lines": {"angle": 135}}, ".": {"Dots": {"angle": 45}}, "*": {"Stars": {"angle": 45}}}
 
     _settings: dict[str, Any]
     _style: dict[str, Any]
@@ -119,7 +120,10 @@ class BaseGraph:
                 c = self._style.get("c", self._style.get("color"))
                 sel_col = match_color(c)
                 if sel_col:
-                    opts["color"] = f"{{{sel_col}}}"
+                    if "axhspan" in self._settings or "axvspan" in self._settings:
+                        opts["fill"] = f"{{{sel_col}}}"
+                    else:
+                        opts["color"] = f"{{{sel_col}}}"
 
         if "ls" in self._style or "linestyle" in self._style:
             ls = self._style.get("ls", self._style.get("linestyle"))
@@ -167,6 +171,49 @@ class BaseGraph:
             opts["opacity"] = self._opacity
         if not self._has_color and self._classic:
             opts["color"] = f"{{{match_color(f'C{self._axes._get_defcol()}')}}}"
+
+        if "hatch" in self._style:
+            def match_hatch(input):
+                chars = list(input)
+                hatches = []
+                while chars:
+                    if chars[0] in self._HATCH_MAP.keys():
+                        hatches.append(self._HATCH_MAP[chars[0]])
+                        chars.pop(0)
+                    elif len(chars) > 1 and chars[0] + chars[1] in self._HATCH_MAP.keys():
+                        hatches.append(self._HATCH_MAP[chars[0] + chars[1]])
+                        chars.pop(0)
+                        chars.pop(0)
+                    else:
+                        raise ValueError(f"Unrecognized hatch pattern {input}")
+                return hatches
+            hatch = match_hatch(self._style["hatch"])
+            hatch_args = {}
+            hatch_color = match_color(self._style.get("hatch_color", "black"))
+            if "hatch_linewidth" in self._style:
+                hatch_args["line width"] = f"{self._style['hatch_linewidth']}pt"
+            if "hatch_distance" in self._style:
+                hatch_args["distance"] = f"{self._style['hatch_distance']}"
+            opts["postaction"] = []
+            types = [list(h.keys())[0] for h in hatch]
+            duplicated_hatchs = set(k for k in types if types.count(k) > 1)
+            dhs = duplicated_hatchs.copy()
+            hatch = [h for h in hatch if list(h.keys())[0] not in duplicated_hatchs or duplicated_hatchs.remove(list(h.keys())[0])]
+            for i in range(len(hatch)):  
+                h = hatch[i]
+                h_type = list(h.keys())[0]
+                h_args = {"distance": 3.0} | h[h_type] | hatch_args
+                if h_type in dhs:
+                    h_args["distance"] = f"{h_args.get('distance', 3.0)/2}"
+                if h_type in ["Dots", "Stars", "Hatch"]:
+                    if h_type in ["Dots", "Stars"] and "line width" in h_args:
+                        h_args["radius"] = f"{h_args.pop('line width')}"
+                    if h_args.get("angle", 0) != 0:
+                        h_args["xshift"] = f"{0.5 * float(h_args.get('distance', 0)) / np.sin(np.radians(h_args.get('angle', 0)))}"
+                    else:
+                        h_args["yshift"] = f"{0.5 * float(h_args.get('distance', 0)) / np.cos(np.radians(h_args.get('angle', 0)))}"
+                opts["postaction"].append(f"pattern={{{h_type}[{', '.join(f'{k}={v}' for k,v in h_args.items())}]}}, pattern color={hatch_color}")
+            
         if self._classic:
             if isinstance(self, Graph) and (self._xerr is not None or self._yerr is not None) or (isinstance(self, Graph3) and self._zerr is not None):
                 opts["error bars/.cd"] = None
@@ -206,7 +253,16 @@ class BaseGraph:
                     self._p_dict[i] = self._st_dict[st]
                 opts["point meta"] = "explicit symbolic"
                 opts["scatter/classes"] = f"{{\n" + ',\n'.join(f"{v}={{{k}}}" for k,v in self._st_dict.items()) + "\n}"
-        self._style_str = ",\n".join(o if opts[o] is None else f"{o}={opts[o]}" for o in opts)
+        self._style_str = ""
+        for o in opts:
+            if opts[o] is None:
+                self._style_str += f"{o},\n"
+            elif isinstance(opts[o], list):
+                for q in opts[o]:
+                    self._style_str += f"{o}={{{q}}},\n"
+            else:
+                self._style_str += f"{o}={opts[o]},\n"
+        self._style_str.removesuffix(",\n")
         return self._style_str
     
     def _save_data(self, points, filename):
@@ -378,9 +434,9 @@ class Graph(BaseGraph):
             rect = f"\\fill[{style}] (axis cs:{self._x[0]}, {lower}) rectangle (axis cs:{self._x[1]}, {upper});"
             if self._label and self._axes._legend_on:
                 if label_opts:
-                    rect += f"\\addlegendentry[{label_opts}]{{{self._label}}}"
+                    rect += f"\\addlegendimage{{area legend, {style}}}\\addlegendentry[{label_opts}]{{{self._label}}}"
                 else:
-                    rect += f"\\addlegendentry{{{self._label}}}"
+                    rect += f"\\addlegendimage{{area legend, {style}}}\\addlegendentry{{{self._label}}}"
             if TikzConfig.USE_GROUPPLOTS:
                 return f"\\begin{{pgfonlayer}}{{axis background}}{rect}\\end{{pgfonlayer}}"
             return rect
@@ -393,9 +449,9 @@ class Graph(BaseGraph):
             rect = f"\\fill[{style}] (axis cs:{lower}, {self._y[0]}) rectangle (axis cs:{upper}, {self._y[1]});"
             if self._label and self._axes._legend_on:
                 if label_opts:
-                    rect += f"\\addlegendentry[{label_opts}]{{{self._label}}}"
+                    rect += f"\\addlegendimage{{area legend, {style}}}\\addlegendentry[{label_opts}]{{{self._label}}}"
                 else:
-                    rect += f"\\addlegendentry{{{self._label}}}"
+                    rect += f"\\addlegendimage{{area legend, {style}}}\\addlegendentry{{{self._label}}}"
             if TikzConfig.USE_GROUPPLOTS:
                 return f"\\begin{{pgfonlayer}}{{axis background}}{rect}\\end{{pgfonlayer}}"
             return rect

{tikzplot42-0.4.5 → tikzplot42-0.4.6}/src/tikzplot/plots.pyi

@@ -401,26 +401,43 @@ def fill_between(
     y2: Optional[ArrayLike] = ...,
     alpha: Optional[float] = ...,
     color: Optional[ColorLike] = ...,
-    c: Optional[ColorLike] = ...
+    c: Optional[ColorLike] = ...,
+    label: Optional[str] = ...,
+    hatch: Optional[str] = ...,
+    hatch_color: Optional[ColorLike] = ...,
+    hatch_linewidth: Optional[float] = ...,
+    hatch_distance: Optional[float] = ...,
 ) -> None: 
     """
     Fill space between two plots (or a single plot and x-axis).
+
     Parameters
     ----------
     x,y1, y2 : ArrayLike or float (y2 optional)
         Datapoints, if matched with existing plot, that line will be recycled to save tikz memory.
-    
+
     alpha: float, optional
         Opacity
-    
+
     color or c: all matplotlib color formats (without X11/xkcd), optional
         Fill color: RGB/RGBA (tuple), HEX (str), grayscale (float), single-char (str), name (str), default cycle ("CX", X int), none for invisible
     
     label: str, optional
         Legend entry
+    
+    hatch: str, optional
+        The hatch pattern to use for filling the bars. Can be a string of characters that define the hatch pattern (e.g., '/', '\\', '|', '-', '+', 'x', '.', '*'). If not provided, no hatching is applied.
+    
+    hatch_color: ColorLike, optional
+        The color of the hatch pattern. If not provided, the default color cycle is used.
+
+    hatch_linewidth: float, optional    
+        The line width of the hatch pattern in points. If not provided, the default line width is used.
+
+    hatch_distance: float, optional
+        The distance between hatch lines in points. If not provided, the default distance is used.
     """
     ...
-
 def text(self, x: float, y: float, s: str, color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ..., fontsize: Optional[FontSize] = ..., on_top: Optional[bool] = ..., size: Optional[FontSize] = ..., backgroundcolor: Optional[ColorLike] = ..., horizontalalignment: Optional[str] = ..., ha: Optional[str] = ..., verticalalignment: Optional[str] = ..., va: Optional[str] = ..., rotation: Optional[Union[float, str]] = ..., label: Optional[str] = ...) -> None:
     """
     Add text to the selected axis.
@@ -501,18 +518,81 @@ def loglog(self, x: ArrayLike = ..., y: ArrayLike = ..., base: Optional[float] =
 def hist(
     self,
     x: Union[ArrayLike, Sequence[ArrayLike]],
-    bins: int = ...,
-    density: bool = ...,
+    bins: int | Sequence[float] = 10,
     *,
-    cumulative: bool = ...,
+    weight: ArrayLike | None = None,
+    density: bool = False,
+    cumulative: bool = False,
+    histtype: Literal["bar", "barstacked", "step", "stepfilled"] = "bar",
     orientation: Literal["horizontal","vertical"] = "vertical",
-    rwidth: Optional[float] = ...,
-    range: Optional[Tuple[float,float]] = ...,
-    color: Optional[ColorLike] = ...,
-    **kwargs: Any
-) -> None: 
+    rwidth: float | None = None,
+    range: Tuple[float,float] | None = None,
+    color: ColorLike = ...,
+    facecolor: ColorLike = ...,
+    fc: ColorLike = ...,
+    edgecolor: ColorLike = ...,
+    ec: ColorLike = ...,
+    align: Literal["left", "mid", "right"] = ...,
+    stacked: bool = False,
+    fill: bool = True,
+    hatch: str | None = None,
+    hatch_color: ColorLike | None = None,
+    hatch_linewidth: float | None = None,
+    hatch_distance: float | None = None,
+    #kwargs: Any,
+) -> None:
     """
     Draw histogram to the selected axis.
+
+    Parameters
+    ----------
+    x: ArrayLike or sequence of ArrayLike
+        Data to be histogrammed. If a sequence of arrays is given, each array is histogrammed separately and the result is stacked (if stacked=True) or overlaid.
+    
+    bins: int or sequence of float, optional
+        Number of bins or bin edges. If an integer is given, it defines the number of equal-width bins in the given range (10 by default). If a sequence is given, it defines the bin edges, including the rightmost edge.
+    
+    density: bool, optional
+        If True, the histogram is normalized to form a probability density, i.e., the area under the histogram will sum to 1. Default is False.
+    
+    cumulative: bool, optional
+        If True, the histogram is cumulative, i.e., each bin will contain the sum of all previous bins. Default is False.
+    
+    histtype: {"bar", "barstacked", "step", "stepfilled"}, optional
+        The type of histogram to draw. "bar" (default) draws a traditional bar histogram, "barstacked" draws a stacked bar histogram, "step" draws a line plot that represents the histogram, and "stepfilled" draws a filled step plot.
+    
+    orientation: {"horizontal", "vertical"}, optional
+        The orientation of the histogram. "vertical" (default) draws vertical bars, while "horizontal" draws horizontal bars.
+    
+    rwidth: float, optional
+        The relative width of the bars as a fraction of the bin width. If None (default), the bars will be drawn with full width.
+    
+    range: tuple of float, optional
+        The lower and upper range of the bins. If not provided, the range is automatically determined from the data.
+    
+    color, facecolor, fc, edgecolor, ec: ColorLike, optional
+        The color of the bars. Can be a single color or a sequence of colors for multiple datasets. If not provided, the default color cycle is used.
+    
+    align: {"left", "mid", "right"}, optional
+        The alignment of the bars. "mid" (default) centers the bars on the bin edges, "left" aligns the left edge of the bars with the bin edges, and "right" aligns the right edge of the bars with the bin edges.
+    
+    stacked: bool, optional
+        If True, multiple datasets are stacked on top of each other. Default is False.
+    
+    fill: bool, optional
+        If True (default), the bars are filled. If False, only the edges of the bars are drawn.
+    
+    hatch: str, optional
+        The hatch pattern to use for filling the bars. Can be a string of characters that define the hatch pattern (e.g., '/', '\\', '|', '-', '+', 'x', '.', '*'). If not provided, no hatching is applied.
+    
+    hatch_color: ColorLike, optional
+        The color of the hatch pattern. If not provided, the default color cycle is used.
+    
+    hatch_linewidth: float, optional
+        The line width of the hatch pattern in points. If not provided, the default line width is used.
+    
+    hatch_distance: float, optional
+        The distance between hatch lines in points. If not provided, the default distance is used.
     """
     ...
 
@@ -708,7 +788,7 @@ def axhline(self, y:float, xmin:float=0, xmax:float=1, alpha:Optional[float] = .
     """
     ...
 
-def axvspan(self, xmin:float, xmax:float, ymin:float=0, ymax:float=1, alpha:Optional[float] = ..., color:Optional[ColorLike] = ..., linestyle:Optional[str] = ..., linewidth:Optional[float] = ..., label:Optional[str] = ...) -> None:
+def axvspan(self, xmin:float, xmax:float, ymin:float=0, ymax:float=1, alpha:Optional[float] = ..., color:Optional[ColorLike] = ..., linestyle:Optional[str] = ..., linewidth:Optional[float] = ..., label:Optional[str] = ..., hatch:Optional[str] = ..., hatch_color:Optional[ColorLike] = ..., hatch_linewidth:Optional[float] = ..., hatch_distance:Optional[float] = ...) -> None:
     """
     Draw a vertical span to the selected axis between given x coordinates.
 
@@ -734,10 +814,22 @@ def axvspan(self, xmin:float, xmax:float, ymin:float=0, ymax:float=1, alpha:Opti
 
     label: str, optional
         Legend entry
+    
+    hatch: str, optional
+        The hatch pattern to use for filling the bars. Can be a string of characters that define the hatch pattern (e.g., '/', '\\', '|', '-', '+', 'x', '.', '*'). If not provided, no hatching is applied.
+        
+    hatch_color: ColorLike, optional
+        The color of the hatch pattern. If not provided, the default color cycle is used.
+    
+    hatch_linewidth: float, optional    
+        The line width of the hatch pattern in points. If not provided, the default line width is used.
+    
+    hatch_distance: float, optional
+        The distance between hatch lines in points. If not provided, the default distance is used.
     """
     ...
 
-def axhspan(self, ymin:float, ymax:float, xmin:float=0, xmax:float=1, alpha:Optional[float] = ..., color:Optional[ColorLike] = ..., linestyle:Optional[str] = ..., linewidth:Optional[float] = ..., label:Optional[str] = ...) -> None:
+def axhspan(self, ymin:float, ymax:float, xmin:float=0, xmax:float=1, alpha:Optional[float] = ..., color:Optional[ColorLike] = ..., linestyle:Optional[str] = ..., linewidth:Optional[float] = ..., label:Optional[str] = ..., hatch:Optional[str] = ..., hatch_color:Optional[ColorLike] = ..., hatch_linewidth:Optional[float] = ..., hatch_distance:Optional[float] = ...) -> None:
     """
     Draw a horizontal span to the selected axis between given y coordinates.
 
@@ -763,6 +855,18 @@ def axhspan(self, ymin:float, ymax:float, xmin:float=0, xmax:float=1, alpha:Opti
 
     label: str, optional
         Legend entry
+    
+    hatch: str, optional
+        The hatch pattern to use for filling the bars. Can be a string of characters that define the hatch pattern (e.g., '/', '\\', '|', '-', '+', 'x', '.', '*'). If not provided, no hatching is applied.
+        
+    hatch_color: ColorLike, optional
+        The color of the hatch pattern. If not provided, the default color cycle is used.
+    
+    hatch_linewidth: float, optional    
+        The line width of the hatch pattern in points. If not provided, the default line width is used.
+    
+    hatch_distance: float, optional
+        The distance between hatch lines in points. If not provided, the default distance is used.
     """
     ...
 

{tikzplot42-0.4.5 → tikzplot42-0.4.6}/src/tikzplot42.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tikzplot42
-Version: 0.4.5
+Version: 0.4.6
 Summary: TikzPlot to make TikZ/PGFPlots plots with matplotlib.pyplot-like syntax.
 Author-email: Zan Ambrozic <zan.ambrozic7@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{tikzplot42-0.4.5 → tikzplot42-0.4.6}/tests/test13.py

@@ -13,13 +13,14 @@ ax0.hist(x, n_bins, density=True, histtype='bar', color=colors, label=colors)
 ax0.legend(prop={'size': 10})
 ax0.set_title('bars with legend')
 
-ax1.hist(x, n_bins, density=True, histtype='bar', stacked=True)
+ax1.hist(x, n_bins, density=True, histtype='bar', stacked=True, hatch=['+', '**', '..'], hatch_color='black', hatch_linewidth=0.7, label=["1", "2", "3"])
 ax1.set_title('stacked bar')
+ax1.legend()
 
-ax2.hist(x, n_bins, histtype='step', stacked=True, fill=False)
+ax2.hist(x, n_bins, histtype='step', stacked=True, fill=False, label=["1", "2", "3"])
 ax2.set_title('stack step (unfilled)')
+ax2.legend()
 
-# Make a multiple-histogram of data-sets with different length.
 x_multi = [np.random.randn(n) for n in [10000, 5000, 2000]]
 ax3.hist(x_multi, n_bins, histtype='bar')
 ax3.set_title('different sample sizes')

{tikzplot42-0.4.5 → tikzplot42-0.4.6}/tests/test2.py

@@ -14,7 +14,8 @@ ax2.set_yscale("log")
 ax2.step(x,y,".", ms=1,where="mid")
 ax3.plot(y,y)
 ax3.grid()
-ax3.axvspan(3,50,0.1,0.8,c="b",alpha=0.3)
+ax3.axvspan(3,50,0.1,0.8,c="b",alpha=0.3, label="span", hatch="\\", hatch_color="black")
+ax3.legend()
 ax4.plot(y,x)
 ax1.set_xlabel(r"$x$")
 ax1.set_ylabel(r"$y$")

tikzplot42-0.4.6/tests/test4.py

@@ -0,0 +1,9 @@
+import numpy as np
+import tikzplot.plots as plt
+#import matplotlib.pyplot as plt
+
+xs = np.linspace(0,5,20)
+plt.plot(xs, xs, "b--", lw=2, label="line")
+plt.fill_between(xs, np.sin(xs), xs, hatch=".", hatch_color="white", label="fill")
+plt.legend()
+plt.savefig("figure.tex")

tikzplot42-0.4.5/tests/test4.py

@@ -1,8 +0,0 @@
-import numpy as np
-import tikzplot.plots as plt
-#import matplotlib.pyplot as plt
-
-xs = np.linspace(0,5,20)
-plt.plot(xs, xs, "b--", lw=2)
-plt.fill_between(xs, np.sin(xs), xs)
-plt.savefig("figure.tex")