refactor: rename to_rgb_color function to to_color for clarity

Author: ya7010

src/tppt/pptx/converter.py

@@ -19,7 +19,7 @@
 from pptx.util import Pt as PptxPt
 
 from tppt.types._angle import Angle, Degrees, LiteralAngle
-from tppt.types._color import Color, LiteralColor, to_rgb_color
+from tppt.types._color import Color, LiteralColor, to_color
 from tppt.types._length import (
     CentiMeters,
     EnglishMetricUnits,
@@ -49,14 +49,18 @@ def from_pptx(cls, pptx_obj: PT) -> Self:
 
 
 @overload
-def to_pptx_length(length: Length | LiteralLength) -> PptxLength: ...
+def to_pptx_length(length: Length | LiteralLength | PptxLength) -> PptxLength: ...
 
 
 @overload
-def to_pptx_length(length: Length | LiteralLength | None) -> PptxLength | None: ...
+def to_pptx_length(
+    length: Length | LiteralLength | PptxLength | None,
+) -> PptxLength | None: ...
 
 
-def to_pptx_length(length: Length | LiteralLength | None) -> PptxLength | None:
+def to_pptx_length(
+    length: Length | LiteralLength | PptxLength | None,
+) -> PptxLength | None:
     if isinstance(length, tuple):
         length = to_length(length)
 
@@ -71,6 +75,8 @@ def to_pptx_length(length: Length | LiteralLength | None) -> PptxLength | None:
             return PptxMm(length.value)
         case EnglishMetricUnits():
             return PptxEmu(length.value)
+        case PptxLength():
+            return length
         case None:
             return None
         case _:
@@ -113,7 +119,7 @@ def to_pptx_rgb_color(
     if color is None:
         return None
 
-    color = to_rgb_color(color)
+    color = to_color(color)
 
     return PptxRGBColor(color.r, color.g, color.b), color.a
 

src/tppt/pptx/dml/color.py

@@ -1,8 +1,10 @@
 from typing import Self, cast
 
+from lxml.etree import _Element
 from pptx.dml.color import ColorFormat as PptxColorFormat
 from pptx.dml.color import RGBColor as PptxRGBColor
 from pptx.enum.dml import MSO_THEME_COLOR
+from pptx.oxml.xmlchemy import OxmlElement
 
 from tppt.pptx.converter import PptxConvertible, to_pptx_rgb_color, to_tppt_rgb_color
 from tppt.types import Color, LiteralColor
@@ -27,12 +29,25 @@ def brightness(self, value: float) -> None:
 
     @property
     def rgb(self) -> Color:
-        return to_tppt_rgb_color(cast(PptxRGBColor, self._pptx.rgb), alpha=None)
+        solid_fill = cast(
+            _Element, self._pptx._xFill.solidFill.get_or_change_to_srgbClr()
+        )
+        alpha = solid_fill.find("a:alpha", None)
+        if alpha is not None:
+            alpha = alpha.attrib["val"]
+        return to_tppt_rgb_color(cast(PptxRGBColor, self._pptx.rgb), alpha=alpha)
 
     @rgb.setter
     def rgb(self, color: Color | LiteralColor):
-        pptx_color, _ = to_pptx_rgb_color(color)
+        pptx_color, alpha = to_pptx_rgb_color(color)
         self._pptx.rgb = pptx_color
+        if alpha:
+            solid_fill = cast(
+                _Element, self._pptx._xFill.solidFill.get_or_change_to_srgbClr()
+            )
+            element = OxmlElement("a:alpha")
+            element.attrib["val"] = str(alpha)
+            solid_fill.append(element)
 
     @property
     def theme_color(self) -> MSO_THEME_COLOR:

src/tppt/pptx/presentation.py

@@ -5,7 +5,7 @@
 
 from pptx.presentation import Presentation as PptxPresentation
 
-from tppt.pptx.tree import ppt2dict
+from tppt.pptx.tree import ppt2tree
 from tppt.template.default import DefaultSlideMaster
 from tppt.template.slide_layout import SlideLayout, SlideLayoutProxy
 from tppt.template.slide_master import (
@@ -72,7 +72,7 @@ def slide_height(self, value: Length | LiteralLength) -> None:
     @property
     def tree(self) -> dict[str, Any]:
         """Get the node tree of the presentation."""
-        return ppt2dict(self._pptx)
+        return ppt2tree(self._pptx)
 
     @overload
     @classmethod

src/tppt/pptx/shape/__init__.py

@@ -2,6 +2,8 @@
 
 from typing import TYPE_CHECKING, Self, TypedDict
 
+from pptx.opc.package import XmlPart
+from pptx.shapes import Subshape as PptxSubshape
 from pptx.shapes.autoshape import Shape as PptxShape
 from pptx.shapes.base import BaseShape as PptxBaseShape
 from typing_extensions import TypeVar
@@ -56,6 +58,22 @@ def text_frame(self) -> "TextFrame":
         return TextFrame(self._pptx.text_frame)
 
 
+class SubShape(PptxConvertible[PptxSubshape]):
+    def __init__(self, pptx_shape: PptxSubshape) -> None:
+        self._pptx: PptxSubshape = pptx_shape
+
+    @property
+    def part(self) -> XmlPart:
+        return self._pptx.part
+
+    def to_pptx(self) -> PptxSubshape:
+        return self._pptx
+
+    @classmethod
+    def from_pptx(cls, pptx_obj: PptxSubshape) -> Self:
+        return cls(pptx_obj)
+
+
 class RangeProps(TypedDict):
     """Range properties."""
 

src/tppt/pptx/shape/text.py

@@ -3,9 +3,9 @@
 from pptx.enum.text import MSO_ANCHOR, MSO_AUTO_SIZE, PP_ALIGN
 from pptx.shapes.autoshape import Shape as PptxShape
 
-from tppt.pptx.converter import to_pptx_length, to_pptx_rgb_color
+from tppt.pptx.converter import to_pptx_length
 from tppt.pptx.text.text_frame import TextFrame
-from tppt.types._color import Color, LiteralColor
+from tppt.types._color import Color, LiteralColor, to_color
 from tppt.types._length import Length, LiteralLength
 
 from . import RangeProps, Shape
@@ -52,7 +52,7 @@ def __init__(self, pptx_obj: PptxShape, data: TextData | None = None, /) -> None
             if (italic := data.get("italic")) is not None:
                 font.italic = italic
             if (color := data.get("color")) is not None:
-                font.color.rgb = to_pptx_rgb_color(color)
+                font.color.rgb = to_color(color)
             if (margin_bottom := data.get("margin_bottom")) is not None:
                 p.space_after = to_pptx_length(margin_bottom)
             if (margin_left := data.get("margin_left")) is not None:

src/tppt/pptx/text/paragraph.py

@@ -1,22 +1,108 @@
 from typing import Self
 
+from pptx.enum.text import PP_PARAGRAPH_ALIGNMENT
 from pptx.text.text import _Paragraph as PptxParagraph
+from pptx.util import Length as PptxLength
 
-from tppt.pptx.converter import PptxConvertible
+from tppt.pptx.converter import PptxConvertible, to_pptx_length
+from tppt.pptx.text.font import Font
 from tppt.pptx.text.run import Run
+from tppt.types._length import Length, to_length
 
 
 class Paragraph(PptxConvertible[PptxParagraph]):
     def __init__(self, pptx_obj: PptxParagraph) -> None:
         self._pptx = pptx_obj
 
-    @property
-    def runs(self) -> list[Run]:
-        return [Run(run) for run in self._pptx.runs]
+    def add_line_break(self) -> None:
+        self._pptx.add_line_break()
 
     def add_run(self) -> Run:
         return Run(self._pptx.add_run())
 
+    @property
+    def alignment(self) -> PP_PARAGRAPH_ALIGNMENT | None:
+        return self._pptx.alignment
+
+    @alignment.setter
+    def alignment(self, value: PP_PARAGRAPH_ALIGNMENT | None) -> None:
+        self._pptx.alignment = value
+
+    def clear(self) -> None:
+        self._pptx.clear()
+
+    @property
+    def font(self) -> Font:
+        return Font(self._pptx.font)
+
+    @property
+    def level(self) -> int:
+        return self._pptx.level
+
+    @level.setter
+    def level(self, value: int) -> None:
+        self._pptx.level = value
+
+    @property
+    def line_spacing(self) -> int | float | Length | None:
+        match self._pptx.line_spacing:
+            case PptxLength():
+                return to_length(self._pptx.line_spacing)
+            case _:
+                return self._pptx.line_spacing
+
+    @line_spacing.setter
+    def line_spacing(self, value: int | float | Length | PptxLength | None) -> None:
+        match value:
+            case int() | float() | PptxLength() | None:
+                self._pptx.line_spacing = value
+            case _:
+                self._pptx.line_spacing = to_pptx_length(value)
+
+    @property
+    def runs(self) -> tuple[Run, ...]:
+        return tuple(Run(run) for run in self._pptx.runs)
+
+    @property
+    def space_after(self) -> Length | None:
+        match self._pptx.space_after:
+            case PptxLength():
+                return to_length(self._pptx.space_after)
+            case _:
+                return self._pptx.space_after
+
+    @space_after.setter
+    def space_after(self, value: Length | PptxLength | None) -> None:
+        match value:
+            case PptxLength() | None:
+                self._pptx.space_after = value
+            case _:
+                self._pptx.space_after = to_pptx_length(value)
+
+    @property
+    def space_before(self) -> Length | None:
+        match self._pptx.space_before:
+            case PptxLength():
+                return to_length(self._pptx.space_before)
+            case _:
+                return self._pptx.space_before
+
+    @space_before.setter
+    def space_before(self, value: Length | PptxLength | None) -> None:
+        match value:
+            case PptxLength() | None:
+                self._pptx.space_before = value
+            case _:
+                self._pptx.space_before = to_pptx_length(value)
+
+    @property
+    def text(self) -> str:
+        return self._pptx.text
+
+    @text.setter
+    def text(self, value: str) -> None:
+        self._pptx.text = value
+
     def to_pptx(self) -> PptxParagraph:
         return self._pptx
 

src/tppt/pptx/text/run.py

@@ -11,14 +11,6 @@ class Run(PptxConvertible[PptxRun]):
     def __init__(self, pptx_obj: PptxRun) -> None:
         self._pptx = pptx_obj
 
-    @property
-    def text(self) -> str:
-        return self._pptx.text
-
-    @text.setter
-    def text(self, text: str) -> None:
-        self._pptx.text = text
-
     @property
     def font(self) -> Font:
         return Font(self._pptx.font)
@@ -27,6 +19,14 @@ def font(self) -> Font:
     def hyperlink(self) -> Hyperlink:
         return Hyperlink(self._pptx.hyperlink)
 
+    @property
+    def text(self) -> str:
+        return self._pptx.text
+
+    @text.setter
+    def text(self, text: str) -> None:
+        self._pptx.text = text
+
     def to_pptx(self) -> PptxRun:
         return self._pptx