feat: enhance text formatting options in presentation builder

Author: ya7010

examples/simple_example.py

@@ -21,6 +21,9 @@ def main():
                 top=(50, "pt"),
                 width=(400, "pt"),
                 height=(50, "pt"),
+                size=(60, "pt"),
+                bold=True,
+                italic=True,
             )
             .text(
                 "Example of using tppt library",  # Subtitle

src/tppt/_pptx/converter.py

@@ -2,10 +2,13 @@
 
 from typing import Protocol, Self, TypeVar, assert_never, overload, runtime_checkable
 
+from pptx.dml.color import RGBColor as PptxRGBColor
 from pptx.util import Cm as PptxCm
 from pptx.util import Inches as PptxInches
 from pptx.util import Length as PptxLength
 from pptx.util import Pt as PptxPt
+
+from tppt.types._color import Color
 from tppt.types._length import (
     Centimeter,
     Inch,
@@ -55,3 +58,7 @@ def to_pptx_length(length: Length | LiteralLength | None) -> PptxLength | None:
             return None
         case _:
             assert_never(length)
+
+
+def to_pptx_color(color: Color) -> PptxRGBColor:
+    return PptxRGBColor(color.r, color.g, color.b)

src/tppt/_pptx/converters.py

@@ -1,6 +1,10 @@
-from typing import Literal, Self, TypedDict
+from typing import Literal, NotRequired, Self, TypedDict
 
+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_color, to_pptx_length
+from tppt.types._color import Color
 from tppt.types._length import Length, LiteralLength
 
 from . import Shape
@@ -13,6 +17,17 @@ class TextProps(TypedDict):
     top: Length | LiteralLength
     width: Length | LiteralLength
     height: Length | LiteralLength
+    size: NotRequired[Length | LiteralLength]
+    bold: NotRequired[bool]
+    italic: NotRequired[bool]
+    color: NotRequired[Color]
+    margin_bottom: NotRequired[Length | LiteralLength]
+    margin_left: NotRequired[Length | LiteralLength]
+    vertical_anchor: NotRequired[MSO_ANCHOR]
+    word_wrap: NotRequired[bool]
+    auto_size: NotRequired[MSO_AUTO_SIZE]
+    alignment: NotRequired[PP_ALIGN]
+    level: NotRequired[int]
 
 
 class TextData(TextProps):
@@ -28,7 +43,33 @@ class Text(Shape[PptxShape]):
 
     def __init__(self, pptx_obj: PptxShape, data: TextData | None = None, /) -> None:
         if data:
-            pptx_obj.text = data["text"]
+            text_frame = pptx_obj.text_frame
+            p = text_frame.paragraphs[0]
+            run = p.add_run()
+            run.text = data["text"]
+            font = run.font
+            if size := data.get("size"):
+                font.size = to_pptx_length(size)
+            if (bold := data.get("bold")) is not None:
+                font.bold = bold
+            if (italic := data.get("italic")) is not None:
+                font.italic = italic
+            if (color := data.get("color")) is not None:
+                font.color.rgb = to_pptx_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:
+                p.space_before = to_pptx_length(margin_left)
+            if (vertical_anchor := data.get("vertical_anchor")) is not None:
+                text_frame.vertical_anchor = vertical_anchor
+            if (word_wrap := data.get("word_wrap")) is not None:
+                text_frame.word_wrap = word_wrap
+            if (auto_size := data.get("auto_size")) is not None:
+                text_frame.auto_size = auto_size
+            if (alignment := data.get("alignment")) is not None:
+                p.alignment = alignment
+            if (level := data.get("level")) is not None:
+                p.level = level
 
         self._pptx = pptx_obj
 

src/tppt/_pptx/shape/text.py

@@ -1,6 +1,7 @@
 """Color types for tppt."""
 
 from pptx.dml.color import RGBColor
+
 from tppt.exception import ColorInvalidFormatError
 
 
@@ -31,21 +32,10 @@ def __init__(self, value: str | tuple[int, int, int]):
 
         else:
             r, g, b = value
-            self.value = RGBColor(r, g, b)
-
-    @property
-    def is_rgb(self) -> bool:
-        """Check if the color is defined as RGB."""
-        return isinstance(self.value, tuple)
-
-    @property
-    def is_named(self) -> bool:
-        """Check if the color is defined as a named color."""
-        return isinstance(self.value, str)
+            self.r = r
+            self.g = g
+            self.b = b
 
     def __repr__(self) -> str:
         """Return string representation."""
-        if self.is_rgb:
-            r, g, b = self.value
-            return "Color())"
-        return f"Color({self.value})"
+        return f"Color({self.r}, {self.g}, {self.b})"

src/tppt/types/_color.py

@@ -0,0 +1,66 @@
+"""Tests for text module."""
+
+from pptx.enum.text import MSO_ANCHOR, MSO_AUTO_SIZE, PP_ALIGN
+
+import tppt
+from tppt.types._color import Color
+
+
+def test_text_with_options(output) -> None:
+    """Test creating text with various formatting options."""
+    # テキストとその書式設定オプション
+    text_content = "サンプルテキスト"
+
+    # プレゼンテーションの作成
+    presentation = (
+        tppt.Presentation.builder()
+        .slide(
+            tppt.SlideBuilder().text(
+                text_content,
+                left=(100, "pt"),
+                top=(100, "pt"),
+                width=(400, "pt"),
+                height=(200, "pt"),
+                size=(24, "pt"),
+                bold=True,
+                italic=True,
+                color=Color((255, 0, 0)),  # 赤色
+                margin_bottom=(10, "pt"),
+                margin_left=(10, "pt"),
+                vertical_anchor=MSO_ANCHOR.MIDDLE,
+                word_wrap=True,
+                auto_size=MSO_AUTO_SIZE.TEXT_TO_FIT_SHAPE,
+                alignment=PP_ALIGN.CENTER,
+                level=1,
+            )
+        )
+        .build()
+    )
+
+    # プレゼンテーションを保存
+    pptx_path = output / "text_with_options.pptx"
+    presentation.save(pptx_path)
+
+
+def test_text_default_options(output) -> None:
+    """Test creating text with default options."""
+    text_content = "デフォルト設定のテキスト"
+
+    # デフォルト設定でテキストを作成
+    presentation = (
+        tppt.Presentation.builder()
+        .slide(
+            tppt.SlideBuilder().text(
+                text_content,
+                left=(100, "pt"),
+                top=(100, "pt"),
+                width=(300, "pt"),
+                height=(100, "pt"),
+            )
+        )
+        .build()
+    )
+
+    # プレゼンテーションを保存
+    pptx_path = output / "text_default_options.pptx"
+    presentation.save(pptx_path)