python-pptx2 2.16.0__py3-none-any.whl → 2.17.0__py3-none-any.whl

pptx2/__init__.py

@@ -57,7 +57,7 @@ from pptx2.parts.slide import (
 if TYPE_CHECKING:
     from pptx2.opc.package import Part
 
-__version__ = "2.16.0"
+__version__ = "2.17.0"
 
 sys.modules["pptx2.exceptions"] = exceptions
 del sys

pptx2/_textstyle.py

@@ -28,6 +28,7 @@ ALIGN_MAP = {
 ANCHOR_MAP = {
     "top": MSO_VERTICAL_ANCHOR.TOP,
     "middle": MSO_VERTICAL_ANCHOR.MIDDLE,
+    "mid": MSO_VERTICAL_ANCHOR.MIDDLE,
     "center": MSO_VERTICAL_ANCHOR.MIDDLE,
     "centre": MSO_VERTICAL_ANCHOR.MIDDLE,
     "bottom": MSO_VERTICAL_ANCHOR.BOTTOM,

pptx2/audit.py

@@ -41,7 +41,8 @@ __all__ = ["AuditReport", "audit"]
 
 
 # Fonts that ship with stock Windows / macOS / Office installs.  Used as
-# a (very conservative) safe-list for the font_warnings probe.
+# a (very conservative) safe-list for the font_warnings probe.  Aptos and
+# family are the Microsoft 365 default theme fonts since 2024.
 _COMMON_FONTS = frozenset(
     name.lower()
     for name in (
@@ -51,9 +52,17 @@ _COMMON_FONTS = frozenset(
         "Lucida Console", "Palatino", "Palatino Linotype", "Symbol",
         "Wingdings", "Wingdings 2", "Wingdings 3", "Webdings",
         "Inter", "Roboto", "Open Sans", "Lato", "Noto Sans",
+        "Aptos", "Aptos Display", "Aptos Narrow", "Aptos Serif", "Aptos Mono",
+        "Aptos Symbols",
     )
 )
 
+# Environment variable merged into the safe-list on every audit() call, so
+# rendering environments (sandboxes, CI) can declare their font inventory
+# once instead of every caller passing ``extra_safe_fonts``.  Comma- or
+# semicolon-separated font names.
+_SAFE_FONTS_ENV_VAR = "PPTX2_SAFE_FONTS"
+
 
 @dataclass
 class AuditReport:
@@ -188,12 +197,24 @@ def audit(
     environment genuinely ships the font — e.g. ``DejaVu Sans`` in a
     sandbox whose font policy standardizes on it, or a corporate font
     you embed in every deck.
+
+    The ``PPTX2_SAFE_FONTS`` environment variable (comma- or
+    semicolon-separated font names) is merged into the safe-list on
+    every call, so an environment can declare its font inventory once
+    for all callers.
     """
+    import os
+
     from pptx2.shapes.picture import Picture
 
     safe_fonts = _COMMON_FONTS
-    if extra_safe_fonts is not None:
-        safe_fonts = _COMMON_FONTS | frozenset(f.lower() for f in extra_safe_fonts)
+    extra_names = list(extra_safe_fonts) if extra_safe_fonts else []
+    for env_raw in os.environ.get(_SAFE_FONTS_ENV_VAR, "").replace(";", ",").split(","):
+        env_name = env_raw.strip()
+        if env_name:
+            extra_names.append(env_name)
+    if extra_names:
+        safe_fonts = _COMMON_FONTS | frozenset(f.lower() for f in extra_names)
 
     report = AuditReport()
     slides = list(prs.slides)

pptx2/shapes/shapetree.py

@@ -557,6 +557,24 @@ class _BaseShapes(ParentedElementProxy):
         return BaseShapeFactory(shape_elm, self)
 
 
+def _resolve_alias(method: str, arg: str, canonical, alias):
+    """Return *canonical*, falling back to its *alias* kwarg (both nullable).
+
+    Code generators (matplotlib-trained models among them) habitually spell
+    ``font`` as ``font_family`` and ``anchor`` as ``valign``; accepting the
+    alias removes a whole class of one-keyword-away TypeErrors. Passing
+    both with different values is a genuine caller bug and still raises.
+    """
+    if canonical is not None:
+        if alias is not None and alias != canonical:
+            raise TypeError(
+                f"{method}(): pass either {arg}= or its alias, not two "
+                f"different values ({canonical!r} vs {alias!r})"
+            )
+        return canonical
+    return alias
+
+
 class _BaseGroupShapes(_BaseShapes):
     """Base class for shape-trees that can add shapes."""
 
@@ -900,12 +918,14 @@ class _BaseGroupShapes(_BaseShapes):
         *bbox_or_positional,
         text: str = "",
         font: str | None = None,
+        font_family: str | None = None,
         size_pt: float | None = None,
         bold: bool | None = None,
         italic: bool | None = None,
         color=None,
         align: str | None = None,
         anchor: str | None = None,
+        valign: str | None = None,
         margin_pt: float | tuple[float, float, float, float] | None = None,
         word_wrap: bool | None = True,
     ) -> Shape:
@@ -922,14 +942,17 @@ class _BaseGroupShapes(_BaseShapes):
         Keyword args:
 
         * ``font`` — typeface name (e.g. ``"Inter"``); ``None`` inherits.
+          ``font_family`` is accepted as an alias (matplotlib habits die
+          hard).
         * ``size_pt`` — font size in points; ``None`` inherits.
         * ``bold`` / ``italic`` — ``True``/``False``/``None``.
         * ``color`` — any "color-like" (``"#RRGGBB"``, ``RGBColor``,
           ``(r, g, b)``).
         * ``align`` — ``"left"`` / ``"center"`` / ``"right"`` /
           ``"justify"``; ``None`` inherits.
-        * ``anchor`` — vertical anchor: ``"top"`` / ``"middle"`` /
-          ``"bottom"``; ``None`` inherits.
+        * ``anchor`` — vertical anchor: ``"top"`` / ``"middle"`` (also
+          ``"mid"`` / ``"center"``) / ``"bottom"``; ``None`` inherits.
+          ``valign`` is accepted as an alias.
         * ``margin_pt`` — uniform margin in points, or a 4-tuple
           ``(top, right, bottom, left)``.
         * ``word_wrap`` — defaults to ``True``.
@@ -940,6 +963,9 @@ class _BaseGroupShapes(_BaseShapes):
         from pptx2._textstyle import apply_margins, apply_text_style, coerce_anchor
         from pptx2.geometry import BBox
 
+        font = _resolve_alias("add_text", "font", font, font_family)
+        anchor = _resolve_alias("add_text", "anchor", anchor, valign)
+
         if len(bbox_or_positional) == 1 and isinstance(bbox_or_positional[0], BBox):
             box = bbox_or_positional[0]
             left, top, width, height = box.left, box.top, box.width, box.height
@@ -986,10 +1012,12 @@ class _BaseGroupShapes(_BaseShapes):
         latex: str,
         display: bool = True,
         font: str | None = None,
+        font_family: str | None = None,
         size_pt: float | None = None,
         color=None,
         align: str | None = "center",
         anchor: str | None = "middle",
+        valign: str | None = None,
         margin_pt: float | tuple[float, float, float, float] | None = None,
     ) -> Shape:
         """Add a text box containing a native PowerPoint equation from LaTeX.
@@ -1008,13 +1036,17 @@ class _BaseGroupShapes(_BaseShapes):
         equation editor.
 
         Keyword args match :meth:`add_text` for *font* / *size_pt* /
-        *color* / *align* / *anchor* / *margin_pt*. *display* (default
+        *color* / *align* / *anchor* / *margin_pt* (including the
+        ``font_family`` / ``valign`` aliases). *display* (default
         |True|) emits a display-math paragraph; set |False| for inline
         OMML.
         """
         from pptx2._textstyle import apply_margins, coerce_align, coerce_anchor
         from pptx2.geometry import BBox
 
+        font = _resolve_alias("add_equation", "font", font, font_family)
+        anchor = _resolve_alias("add_equation", "anchor", anchor, valign)
+
         if len(bbox_or_positional) == 1 and isinstance(bbox_or_positional[0], BBox):
             box = bbox_or_positional[0]
             left, top, width, height = box.left, box.top, box.width, box.height

pptx2/skill/references/lint.md

@@ -187,6 +187,13 @@ drown in noise:
 report = audit(prs, extra_safe_fonts=["DejaVu Sans", "Noto Sans CJK JP"])
 ```
 
+Or declare the inventory once for every caller via the environment
+(merged into the safe-list on each `audit()`):
+
+```bash
+export PPTX2_SAFE_FONTS="DejaVu Sans; Noto Sans CJK JP"
+```
+
 ## Save-time hooks (via `from_spec`)
 
 If you build the deck through `pptx2.compose.from_spec`, the spec dict

{python_pptx2-2.16.0.dist-info → python_pptx2-2.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-pptx2
-Version: 2.16.0
+Version: 2.17.0
 Summary: Create, read, and update PowerPoint 2007+ (.pptx) files. Fork of power-pptx / python-pptx, published as python-pptx2.
 Author: Matěj Štágl
 Author-email: stagl@wattlescript.org

{python_pptx2-2.16.0.dist-info → python_pptx2-2.17.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-pptx2/__init__.py,sha256=oll9FR8kNjyIlQOq779hfSOGTze8MSlZKQCJypny4zk,4076
+pptx2/__init__.py,sha256=lLf03V_PykqZkDfLk7wwFUMFnN9JnqDoW3ziwibWXfE,4076
 pptx2/_color.py,sha256=Ureg4dSEdHbwpVZ5eJIyt0kLx_W3mGftmznejth_oLQ,2889
 pptx2/_slide_importer.py,sha256=Ot3lW20eS7fMKsaGaeqPyeS9zVzt5D1WkovwozWwbYY,27033
 pptx2/_svg.py,sha256=pMURsUQaJ9-dqRl4nEZKt1VECNpA8Ghp4EwNRWcBG-c,5973
 pptx2/_template_applier.py,sha256=H1pu7bgUMUhJzTvABuQFT7zkjSWas5NfdJIipamCvXw,12699
-pptx2/_textstyle.py,sha256=ysxPcW9LNuimD83Vjg7dc35SYMdGRdCmuib5Zm7Xcns,6315
+pptx2/_textstyle.py,sha256=INb0JvqeHwP7cmlxoRe65ImV3vR_AbUKMFKEWOUfAr4,6354
 pptx2/accessibility.py,sha256=SDVPX6FK77B3OXBMvr65qowzJFVzcRsnMybjVMQ0oi4,11981
 pptx2/action.py,sha256=BiDtM80P6oFsNOtLIT1nX82LXEvaGOg4Usaf5CA7kNY,9648
 pptx2/animation.py,sha256=g0OxAkCoGu0QEx3QB9Yu4BOnGLjD3tcLpKoYBAtUW6s,83756
 pptx2/api.py,sha256=n98a5qUhVxSwZ_yG_aXxtDCxtnEp37LPsSIsYsbwsfA,1841
-pptx2/audit.py,sha256=jXNZgHTY8B1zrDPFigvr2QVFvzXMEJOL-vk5UyeJoIk,10332
+pptx2/audit.py,sha256=xg1QAs-ByW3xwBEcJ-Y9ptYe2WHKmVuVWAgRKQZfcr8,11276
 pptx2/diagrams.py,sha256=5NqGg-CMj6ZYoEsI9pBD1UHmwQhSAK8oAFYD89NPsVg,24654
 pptx2/exc.py,sha256=k6p-e9h5cKal09-sAv3E1QTXmVDuF8FqewW1CKFQmfw,1276
 pptx2/formats.py,sha256=w0b8YXBjBbPhDu1UV9-1iUJdL62d9_gcQSp9sHKVr_s,5081
@@ -136,7 +136,7 @@ pptx2/shapes/graphfrm.py,sha256=mwA9Wb4WRKBy6sA7KzOZFl3aHlpN-TmWRcE-kiMoqRI,1189
 pptx2/shapes/group.py,sha256=xlcGi3MAzBHX2IM16IATxRgw8NwsPFzTMVbRPYQ7OKg,11036
 pptx2/shapes/picture.py,sha256=U7rwiy7OXn0RgFSEdh07bdhIplWsI82OjFk-mt975J0,14938
 pptx2/shapes/placeholder.py,sha256=9tIeNscnV46hWyMr8ZSiZO3TZr-tt4kZgx6BRB0tCvc,17838
-pptx2/shapes/shapetree.py,sha256=dTUwD0inXLHV0P6woJZFeF_BGE0YmgKfAt35hzKOoqA,81431
+pptx2/shapes/shapetree.py,sha256=bbrwutelMOcRX8pT88qRLvPyE3x6avIhripnUGalH1I,82851
 pptx2/skill/SKILL.md,sha256=6w7sWflZvhYYIzBsXLjx2uVKqB0793ZTvoZ_SUfzQxg,23668
 pptx2/skill/__init__.py,sha256=bUkfMETwf3K6J7GSE-tLQjdNziS_JceunComLiLIeGI,2665
 pptx2/skill/__main__.py,sha256=ohMLGy1jbjKV5_FqY6aGj4tm_isJ6fznvqUKiE1H6s8,1777
@@ -148,7 +148,7 @@ pptx2/skill/references/design.md,sha256=ne3xVyIwqpkhEkd8XK74QEija040eHve5zBHBx9L
 pptx2/skill/references/effects.md,sha256=B4Z_rbxm5CjVeLt8rJZ-UydLPq62FgcDP32CZ1KUrvY,7668
 pptx2/skill/references/end-to-end-deck.md,sha256=6ApwoK1wJ--Oeadyjy4Iq3E0czyPBME6RYAAWQijhNU,8021
 pptx2/skill/references/geometry-and-arrows.md,sha256=kiy2KIpzcrWbfUH0tWgfdaHRH4k0QPNu0SEkk7JAKNE,10163
-pptx2/skill/references/lint.md,sha256=AbSkRYNrqqurpWs1BDAjzEZd8y4TsyLU3xfc4ifuhe8,10160
+pptx2/skill/references/lint.md,sha256=VAWhb9hlump9Fkw3JGZQEODGc13HhthJuigu-bvC-lA,10344
 pptx2/skill/references/math.md,sha256=C8j5FcjpJgBacKwetL6HfdM2d3zRaTAcLrkyYVP-9H8,2572
 pptx2/skill/references/picture-effects.md,sha256=NCGIqICQOd7DfEif8m_OY5teS75NVQU_micGysgsi1w,3735
 pptx2/skill/references/render.md,sha256=4mUI5sYbkY5sT_oCA5YEcuQG2ddzvs_gPe4XEiSL3WQ,4671
@@ -170,9 +170,9 @@ pptx2/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pptx2/text/fonts.py,sha256=ECa9HuBfeTqOi-uJTz_bu7eurC7e1_64RTwDatxmkpk,16498
 pptx2/text/layout.py,sha256=k8bqod6GyshHJtfoqFtH9W-eHTI43IB0e6SLT1ibSUU,12815
 pptx2/text/text.py,sha256=LPqF1B4GSQNSnSlVMm1v7pgtHCymOJPTUG_Kdt5_ou4,55039
-python_pptx2-2.16.0.dist-info/licenses/LICENSE,sha256=hLdud18ZPS9iSG3kBCBLiGYzj4A6zedCHiDejIDBXNg,1230
-python_pptx2-2.16.0.dist-info/METADATA,sha256=mu4Raf9xAgpmy7-ZoBz_Vw0-jWSV7b2yTHJzb2Vn4xQ,14374
-python_pptx2-2.16.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-python_pptx2-2.16.0.dist-info/entry_points.txt,sha256=UpD1_pA-2BPeN0iDeD-u4NZ_yC78TvBdWu3V1xLsSRE,105
-python_pptx2-2.16.0.dist-info/top_level.txt,sha256=NDdhJ4rOySlDU-cw4g-bQMoZCiy41WszlRXmIiReSRs,6
-python_pptx2-2.16.0.dist-info/RECORD,,
+python_pptx2-2.17.0.dist-info/licenses/LICENSE,sha256=hLdud18ZPS9iSG3kBCBLiGYzj4A6zedCHiDejIDBXNg,1230
+python_pptx2-2.17.0.dist-info/METADATA,sha256=mx9AhEC2xmYL-p2zCSn6iHbmj4GaBnNVBBg81sHNg88,14374
+python_pptx2-2.17.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+python_pptx2-2.17.0.dist-info/entry_points.txt,sha256=UpD1_pA-2BPeN0iDeD-u4NZ_yC78TvBdWu3V1xLsSRE,105
+python_pptx2-2.17.0.dist-info/top_level.txt,sha256=NDdhJ4rOySlDU-cw4g-bQMoZCiy41WszlRXmIiReSRs,6
+python_pptx2-2.17.0.dist-info/RECORD,,