rgrid-python 4.5.3__tar.gz → 4.5.3.post1__tar.gz

{rgrid_python-4.5.3 → rgrid_python-4.5.3.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rgrid-python
-Version: 4.5.3
+Version: 4.5.3.post1
 Summary: Python port of the R grid package (tracks R grid 4.5.3)
 Project-URL: Homepage, https://github.com/Bio-Babel/grid_py
 Project-URL: Repository, https://github.com/Bio-Babel/grid_py
@@ -41,6 +41,8 @@ Description-Content-Type: text/markdown
 
 # grid_py
 
+[![PyPI](https://img.shields.io/pypi/v/rgrid-python)](https://pypi.org/project/rgrid-python/)
+
 Python port of the R **grid** package.
 
 ## Installation

{rgrid_python-4.5.3 → rgrid_python-4.5.3.post1}/README.md

@@ -1,5 +1,7 @@
 # grid_py
 
+[![PyPI](https://img.shields.io/pypi/v/rgrid-python)](https://pypi.org/project/rgrid-python/)
+
 Python port of the R **grid** package.
 
 ## Installation

{rgrid_python-4.5.3 → rgrid_python-4.5.3.post1}/grid_py/__init__.py

@@ -6,7 +6,7 @@ units, viewports, grobs (graphical objects), layouts, and rendering via
 Cairo (pycairo).
 """
 
-__version__ = "4.5.3"
+__version__ = "4.5.3.post1"
 
 # --- Utilities ---
 from grid_py._utils import depth, explode, grid_pretty, n2mfrow
@@ -18,6 +18,7 @@ from grid_py._just import valid_just, resolve_hjust, resolve_vjust, resolve_rast
 from grid_py._units import (
     Unit, is_unit, unit_type, unit_c, unit_length,
     unit_pmax, unit_pmin, unit_psum, unit_rep,
+    unit_summary_sum, unit_summary_min, unit_summary_max,
     string_width, string_height, string_ascent, string_descent,
     absolute_size,
     convert_unit, convert_x, convert_y, convert_width, convert_height,
@@ -226,6 +227,7 @@ __all__ = [
     # Units
     "Unit", "is_unit", "unit_type", "unit_c", "unit_length",
     "unit_pmax", "unit_pmin", "unit_psum", "unit_rep",
+    "unit_summary_sum", "unit_summary_min", "unit_summary_max",
     "string_width", "string_height", "string_ascent", "string_descent",
     "absolute_size",
     "convert_unit", "convert_x", "convert_y", "convert_width", "convert_height",

{rgrid_python-4.5.3 → rgrid_python-4.5.3.post1}/grid_py/_draw.py

@@ -109,6 +109,12 @@ def _subset_gpar(gp: Optional[Gpar], i: int) -> Optional[Gpar]:
             picked = val[i % len(val)]
         elif isinstance(val, (list, tuple)) and len(val) > 1:
             picked = val[i % len(val)]
+        elif isinstance(val, (list, tuple)) and len(val) == 1 \
+                and val[0] is None and key in ("col", "fill"):
+            # Length-1 [None] NA sentinel from Gpar(col=None)/Gpar(fill=None).
+            # Preserve the NA intent across subset — emit "transparent" so
+            # the renderer's scalar-colour path parses to (0,0,0,0).
+            picked = "transparent"
         else:
             picked = val
 

{rgrid_python-4.5.3 → rgrid_python-4.5.3.post1}/grid_py/_gpar.py

@@ -199,6 +199,14 @@ class Gpar:
         # -- process remaining parameters ----------------------------------
         for name, value in kwargs.items():
             if value is None:
+                # Colour parameters: preserve explicit None as a one-element
+                # NA sentinel so the renderer can tell "col absent (inherit,
+                # default black)" apart from "col explicitly NA (transparent)".
+                # Mirrors R's ``gpar(col=NA)`` / ``gpar(fill=NA)`` semantics
+                # (see R grid src/gpar.c gpCol(): isNull(col) → R_TRANWHITE).
+                # Other parameters have no NA semantic; drop silently.
+                if name in ("col", "fill"):
+                    params[name] = [None]
                 continue
 
             vals = _as_list(value)
@@ -283,8 +291,16 @@ class Gpar:
                 # backend, matching R's behaviour).
                 pass
 
-            # Store single-element lists as scalars for cleaner repr.
-            params[name] = vals[0] if len(vals) == 1 else vals
+            # Store single-element lists as scalars for cleaner repr,
+            # except for the colour NA sentinel [None] which must stay a
+            # sequence so the renderer treats it as R's gpar(col=NA).
+            if len(vals) == 1:
+                if name in ("col", "fill") and vals[0] is None:
+                    params[name] = [None]
+                else:
+                    params[name] = vals[0]
+            else:
+                params[name] = vals
 
         self._params = params
 

{rgrid_python-4.5.3 → rgrid_python-4.5.3.post1}/grid_py/_units.py

@@ -1574,6 +1574,56 @@ def convert_unit(
             )
             if resolved is not None:
                 result_vals[i] = resolved
+            elif src_unit in ("sum", "min", "max"):
+                # R ``grid/src/unit.c: L_convert`` dispatches ``sum.unit`` /
+                # ``min.unit`` / ``max.unit`` via ``L_sumUnits`` /
+                # ``L_minUnits`` / ``L_maxUnits``, each of which calls
+                # ``convertUnit`` recursively on every child in the
+                # compound's list and combines the resulting absolute
+                # lengths. Without this branch the fallback at the end of
+                # this loop returns the outer scalar (1.0) unchanged —
+                # which is why ``convertWidth(unit(1,'grobwidth',g) +
+                # unit(0.05,'inches'),'cm')`` returned 1.0 regardless of
+                # the text's actual rendered width.
+                child = x._data[i]
+                if (
+                    child is not None
+                    and isinstance(child, Unit)
+                    and len(child) > 0
+                ):
+                    child_inches: List[float] = []
+                    for j in range(len(child)):
+                        sub = Unit.__new__(Unit)
+                        sub._values = np.array(
+                            [child._values[j]], dtype=np.float64,
+                        )
+                        sub._units = [child._units[j]]
+                        sub._data = [child._data[j]]
+                        sub._is_absolute = (
+                            child._units[j] in _ABSOLUTE_UNIT_TYPES
+                        )
+                        inches_arr = convert_unit(
+                            sub, "inches",
+                            axisFrom=axisFrom, typeFrom=typeFrom,
+                            axisTo=axisTo, typeTo=typeTo,
+                            valueOnly=True,
+                        )
+                        child_inches.append(float(inches_arr[0]))
+                    if src_unit == "sum":
+                        combined = float(np.sum(child_inches))
+                    elif src_unit == "min":
+                        combined = float(np.min(child_inches))
+                    else:
+                        combined = float(np.max(child_inches))
+                    combined *= float(x._values[i])
+                    if target in _ABSOLUTE_UNIT_TYPES:
+                        result_vals[i] = combined / _INCHES_PER[target]
+                    else:
+                        result_vals[i] = combined
+                        converted = False
+                else:
+                    result_vals[i] = x._values[i]
+                    converted = False
             elif src_unit in _STR_METRIC_TYPES:
                 # Fallback without renderer: string metric → inches → target
                 inches_val = _eval_str_metric(src_unit, x._data[i], x._values[i])
@@ -1583,18 +1633,34 @@ def convert_unit(
                     result_vals[i] = inches_val
                     converted = False
             elif src_unit in _GROB_METRIC_TYPES:
-                # Fallback: grob metric → inches → target
+                # Fallback: grob metric → inches → target.
+                # Mirrors R ``grid/src/unit.c``:
+                #   evaluateGrobUnit(..., evalType=2)
+                #     unitx <- widthDetails(grob)
+                #     result = transformWidthtoINCHES(unitx, 0, ...)
+                # R takes *only index 0* of ``widthDetails``'s return,
+                # relying on its methods (e.g. ``widthDetails.titleGrob``
+                # ``<- sum(x$widths)``) to wrap multi-element units as
+                # a single sum.unit. The recursive ``transformWidthtoINCHES``
+                # then unwraps L_SUM via the compound branch above.
                 metric_unit = _eval_grob_metric(src_unit, x._data[i])
-                if (
-                    metric_unit is not None
-                    and len(metric_unit) > 0
-                    and metric_unit._units[0] in _ABSOLUTE_UNIT_TYPES
-                ):
-                    src_inches = (
-                        metric_unit._values[0]
-                        * _INCHES_PER[metric_unit._units[0]]
+                if metric_unit is not None and len(metric_unit) > 0:
+                    head = Unit.__new__(Unit)
+                    head._values = np.array(
+                        [metric_unit._values[0]], dtype=np.float64,
+                    )
+                    head._units = [metric_unit._units[0]]
+                    head._data = [metric_unit._data[0]]
+                    head._is_absolute = (
+                        metric_unit._units[0] in _ABSOLUTE_UNIT_TYPES
+                    )
+                    inches_arr = convert_unit(
+                        head, "inches",
+                        axisFrom=axisFrom, typeFrom=typeFrom,
+                        axisTo=axisTo, typeTo=typeTo,
+                        valueOnly=True,
                     )
-                    src_inches *= x._values[i]
+                    src_inches = float(inches_arr[0]) * float(x._values[i])
                     if target in _ABSOLUTE_UNIT_TYPES:
                         result_vals[i] = src_inches / _INCHES_PER[target]
                     else:

{rgrid_python-4.5.3 → rgrid_python-4.5.3.post1}/grid_py/renderer.py

@@ -336,12 +336,14 @@ class CairoRenderer(GridRenderer):
 
         col = gp.get("col", None)
         # R semantics:
-        #   * col=NULL (unset)      → inherit parent, default "black"
-        #   * col=NA (explicit)     → no stroke (transparent)
-        # In Python Gpar, None-scalar is dropped at construction, so
-        # ``gp.get("col") is None`` ≡ NULL.  A sequence whose entries
-        # are None (coming from ggplot2 ``colour=NA`` data) must be
-        # treated as NA, matching R's ``gpar(col=NA)``.
+        #   * col absent from gp          → inherit parent, default "black"
+        #   * Gpar(col=None)              → stored as [None] (NA sentinel)
+        #                                    → transparent (≡ R gpar(col=NA))
+        #   * sequence with first=None    → transparent (ggplot2 colour=NA)
+        #   * scalar string "NA"/"none"/  → transparent (resolved by
+        #     "transparent"                  _parse_colour)
+        # The [None] sentinel is produced by Gpar(col=None) — see
+        # _gpar.py Gpar.__init__.
         _is_seq = hasattr(col, "__len__") and not isinstance(col, str)
         if _is_seq:
             col_val = col[0]

{rgrid_python-4.5.3 → rgrid_python-4.5.3.post1}/pyproject.toml

@@ -12,7 +12,7 @@ name = "rgrid-python"
 # a corresponding R update, bump a PEP 440 post-release suffix:
 #   "4.5.3"  → "4.5.3.post1"  → "4.5.3.post2"  → ...
 # When R grid itself ships a new upstream version, move to e.g. "4.5.4".
-version = "4.5.3"
+version = "4.5.3.post1"
 description = "Python port of the R grid package (tracks R grid 4.5.3)"
 readme = "README.md"
 requires-python = ">=3.10"