prezo 2026.1.2__py3-none-any.whl → 2026.1.3__py3-none-any.whl

prezo/layout.py

@@ -11,6 +11,13 @@ Supports Pandoc-style fenced div syntax:
     :::
     :::
 
+Additional layout blocks:
+    ::: center          - Horizontally centered content
+    ::: right           - Right-aligned content
+    ::: spacer [n]      - Vertical space (default 1 line)
+    ::: box [title]     - Bordered panel with optional title
+    ::: divider [style] - Horizontal rule (single/double/thick/dashed)
+
 """
 
 from __future__ import annotations
@@ -20,9 +27,12 @@ from dataclasses import dataclass, field
 from io import StringIO
 from typing import TYPE_CHECKING, Literal
 
+from rich.cells import cell_len
 from rich.console import Console, ConsoleOptions, Group, RenderResult
 from rich.markdown import Markdown
 from rich.measure import Measurement
+from rich.panel import Panel
+from rich.rule import Rule
 from rich.text import Text
 
 if TYPE_CHECKING:
@@ -33,22 +43,30 @@ if TYPE_CHECKING:
 # -----------------------------------------------------------------------------
 
 
+BlockType = Literal[
+    "plain", "columns", "column", "center", "right", "spacer", "box", "divider"
+]
+
+
 @dataclass
 class LayoutBlock:
     """A block of content with layout information."""
 
-    type: Literal["plain", "columns", "column", "center"]
+    type: BlockType
     content: str = ""  # Raw markdown content (for leaf blocks)
     children: list[LayoutBlock] = field(default_factory=list)
     width_percent: int = 0  # For column blocks (0 = auto/equal)
+    title: str = ""  # For box blocks
+    style: str = ""  # For divider blocks (single/double/thick/dashed)
 
 
 # -----------------------------------------------------------------------------
 # Parser
 # -----------------------------------------------------------------------------
 
-# Pattern for opening fenced div: ::: type [width]
-OPEN_PATTERN = re.compile(r"^:::\s*(\w+)(?:\s+(\d+))?\s*$")
+# Pattern for opening fenced div: ::: type [arg]
+# arg can be: a number (width %), a quoted string (title), or a word (style)
+OPEN_PATTERN = re.compile(r'^:::\s*(\w+)(?:\s+"([^"]+)"|\s+(\S+))?\s*$')
 # Pattern for closing fenced div: :::
 CLOSE_PATTERN = re.compile(r"^:::\s*$")
 
@@ -76,10 +94,14 @@ def parse_layout(content: str) -> list[LayoutBlock]:
 
         if match:
             block_type = match.group(1).lower()
-            width = int(match.group(2)) if match.group(2) else 0
+            # Group 2 is quoted string, Group 3 is unquoted arg
+            quoted_arg = match.group(2)  # For "title"
+            unquoted_arg = match.group(3)  # For width or style
 
             # Find matching close and nested content
-            block, end_idx = _parse_fenced_block(lines, i, block_type, width)
+            block, end_idx = _parse_fenced_block(
+                lines, i, block_type, quoted_arg, unquoted_arg
+            )
             if block:
                 blocks.append(block)
                 i = end_idx + 1
@@ -104,8 +126,59 @@ def parse_layout(content: str) -> list[LayoutBlock]:
     return blocks
 
 
+def _create_block(
+    block_type: str,
+    inner_content: str,
+    quoted_arg: str | None,
+    unquoted_arg: str | None,
+) -> LayoutBlock:
+    """Create a LayoutBlock from parsed fenced div content.
+
+    Args:
+        block_type: The type from ::: type.
+        inner_content: Content inside the fenced div.
+        quoted_arg: Quoted argument (e.g., title for box).
+        unquoted_arg: Unquoted argument (e.g., width or style).
+
+    Returns:
+        A LayoutBlock of the appropriate type.
+
+    """
+    content = inner_content.strip()
+    width = int(unquoted_arg) if unquoted_arg and unquoted_arg.isdigit() else 0
+
+    # Use a dispatch table for simple content blocks
+    simple_types = {"center", "right", "plain"}
+
+    if block_type == "columns":
+        block = LayoutBlock(type="columns")
+        block.children = parse_layout(inner_content)
+    elif block_type == "column":
+        block = LayoutBlock(type="column", content=content, width_percent=width)
+    elif block_type == "spacer":
+        lines_count = width if width > 0 else 1
+        block = LayoutBlock(type="spacer", width_percent=lines_count)
+    elif block_type == "box":
+        title = quoted_arg or unquoted_arg or ""
+        block = LayoutBlock(type="box", content=content, title=title)
+    elif block_type == "divider":
+        style = unquoted_arg if unquoted_arg else "single"
+        block = LayoutBlock(type="divider", style=style)
+    elif block_type in simple_types:
+        block = LayoutBlock(type=block_type, content=content)
+    else:
+        # Unknown block type - treat as plain
+        block = LayoutBlock(type="plain", content=content)
+
+    return block
+
+
 def _parse_fenced_block(
-    lines: list[str], start: int, block_type: str, width: int
+    lines: list[str],
+    start: int,
+    block_type: str,
+    quoted_arg: str | None,
+    unquoted_arg: str | None,
 ) -> tuple[LayoutBlock | None, int]:
     """Parse a fenced div block starting at the given line.
 
@@ -113,7 +186,8 @@ def _parse_fenced_block(
         lines: All lines of content.
         start: Starting line index (the opening :::).
         block_type: The type from ::: type.
-        width: Width percentage if specified.
+        quoted_arg: Quoted argument (e.g., title for box).
+        unquoted_arg: Unquoted argument (e.g., width or style).
 
     Returns:
         Tuple of (LayoutBlock or None, end line index).
@@ -143,28 +217,8 @@ def _parse_fenced_block(
         return None, start
 
     inner_content = "\n".join(content_lines)
-
-    # For columns/column types, parse children
-    if block_type in ("columns", "column", "center"):
-        block = LayoutBlock(
-            type=block_type,  # type: ignore[arg-type]
-            width_percent=width,
-        )
-
-        if block_type == "columns":
-            # Parse children (should be column blocks)
-            block.children = parse_layout(inner_content)
-        elif block_type == "column":
-            # Column contains markdown content, but might have nested structure
-            # For now, treat as plain content
-            block.content = inner_content.strip()
-        elif block_type == "center":
-            block.content = inner_content.strip()
-
-        return block, i
-
-    # Unknown block type - treat content as plain
-    return LayoutBlock(type="plain", content=inner_content.strip()), i
+    block = _create_block(block_type, inner_content, quoted_arg, unquoted_arg)
+    return block, i
 
 
 def has_layout_blocks(content: str) -> bool:
@@ -303,10 +357,17 @@ class ColumnsRenderable:
             file=StringIO(),
         )
 
-        # Render markdown content
+        # Render content - check for nested layout blocks
         if column.content:
-            md = Markdown(column.content)
-            col_console.print(md)
+            if has_layout_blocks(column.content):
+                # Parse and render nested layout blocks
+                blocks = parse_layout(column.content)
+                renderable = render_layout(blocks)
+                col_console.print(renderable)
+            else:
+                # Plain markdown
+                md = Markdown(column.content)
+                col_console.print(md)
 
         # Get rendered lines
         output = col_console.export_text(styles=True)
@@ -405,6 +466,170 @@ class CenterRenderable:
         return Measurement(1, options.max_width)
 
 
+class RightRenderable:
+    """Rich renderable that right-aligns content."""
+
+    def __init__(self, content: str) -> None:
+        """Initialize right-align renderable.
+
+        Args:
+            content: Markdown content to right-align.
+
+        """
+        self.content = content
+
+    def __rich_console__(
+        self, console: Console, options: ConsoleOptions
+    ) -> RenderResult:
+        """Render right-aligned content."""
+        yield Text("")
+        md = Markdown(self.content, justify="right")
+        yield md
+        yield Text("")
+
+    def __rich_measure__(
+        self, console: Console, options: ConsoleOptions
+    ) -> Measurement:
+        """Return the measurement of this renderable."""
+        return Measurement(1, options.max_width)
+
+
+class SpacerRenderable:
+    """Rich renderable that creates vertical space."""
+
+    def __init__(self, lines: int = 1) -> None:
+        """Initialize spacer renderable.
+
+        Args:
+            lines: Number of blank lines to insert.
+
+        """
+        self.lines = max(1, lines)
+
+    def __rich_console__(
+        self, console: Console, options: ConsoleOptions
+    ) -> RenderResult:
+        """Render vertical space."""
+        for _ in range(self.lines):
+            yield Text("")
+
+    def __rich_measure__(
+        self, console: Console, options: ConsoleOptions
+    ) -> Measurement:
+        """Return the measurement of this renderable."""
+        return Measurement(0, 0)
+
+
+class BoxRenderable:
+    """Rich renderable that displays content in a bordered panel."""
+
+    def __init__(self, content: str, title: str = "") -> None:
+        """Initialize box renderable.
+
+        Args:
+            content: Markdown content to display in the box.
+            title: Optional title for the box.
+
+        """
+        self.content = content
+        self.title = title
+
+    def __rich_console__(
+        self, console: Console, options: ConsoleOptions
+    ) -> RenderResult:
+        """Render content in a bordered panel."""
+        yield Text("")
+        md = Markdown(self.content)
+        panel = Panel(md, title=self.title if self.title else None)
+        yield panel
+        yield Text("")
+
+    def __rich_measure__(
+        self, console: Console, options: ConsoleOptions
+    ) -> Measurement:
+        """Return the measurement of this renderable."""
+        return Measurement(1, options.max_width)
+
+
+# Divider style characters
+DIVIDER_STYLES = {
+    "single": "─",
+    "double": "═",
+    "thick": "━",
+    "dashed": "╌",
+}
+
+
+class DividerRenderable:
+    """Rich renderable that displays a horizontal rule."""
+
+    def __init__(self, style: str = "single") -> None:
+        """Initialize divider renderable.
+
+        Args:
+            style: Style of the divider (single, double, thick, dashed).
+
+        """
+        self.style = style if style in DIVIDER_STYLES else "single"
+
+    def __rich_console__(
+        self, console: Console, options: ConsoleOptions
+    ) -> RenderResult:
+        """Render horizontal rule."""
+        yield Text("")
+        char = DIVIDER_STYLES[self.style]
+        yield Rule(characters=char)
+        yield Text("")
+
+    def __rich_measure__(
+        self, console: Console, options: ConsoleOptions
+    ) -> Measurement:
+        """Return the measurement of this renderable."""
+        return Measurement(1, options.max_width)
+
+
+def _render_block(block: LayoutBlock) -> list[RenderableType]:
+    """Render a single block to Rich renderables.
+
+    Args:
+        block: A LayoutBlock to render.
+
+    Returns:
+        List of Rich renderables for this block.
+
+    """
+    if block.type == "columns":
+        result: list[RenderableType] = []
+        columns = [c for c in block.children if c.type == "column"]
+        if columns:
+            result.append(ColumnsRenderable(columns))
+        # Also render any non-column children (plain text between columns)
+        for child in block.children:
+            if child.type == "plain":
+                result.append(Markdown(child.content))
+        return result
+
+    if block.type == "spacer":
+        return [SpacerRenderable(block.width_percent)]
+
+    if block.type == "box":
+        return [BoxRenderable(block.content, block.title)]
+
+    if block.type == "divider":
+        return [DividerRenderable(block.style)]
+
+    # Simple content blocks: plain, center, right, column
+    renderable_map: dict[str, type] = {
+        "center": CenterRenderable,
+        "right": RightRenderable,
+    }
+    if block.type in renderable_map:
+        return [renderable_map[block.type](block.content)]
+
+    # Default: plain markdown (for "plain" and standalone "column")
+    return [Markdown(block.content)]
+
+
 def render_layout(
     blocks: list[LayoutBlock],
 ) -> RenderableType:
@@ -420,23 +645,7 @@ def render_layout(
     renderables: list[RenderableType] = []
 
     for block in blocks:
-        match block.type:
-            case "plain":
-                renderables.append(Markdown(block.content))
-            case "columns":
-                # Filter to only column children
-                columns = [c for c in block.children if c.type == "column"]
-                if columns:
-                    renderables.append(ColumnsRenderable(columns))
-                # Also render any non-column children (plain text between columns)
-                for child in block.children:
-                    if child.type == "plain":
-                        renderables.append(Markdown(child.content))
-            case "center":
-                renderables.append(CenterRenderable(block.content))
-            case "column":
-                # Standalone column (shouldn't happen normally)
-                renderables.append(Markdown(block.content))
+        renderables.extend(_render_block(block))
 
     if len(renderables) == 1:
         return renderables[0]
@@ -452,13 +661,20 @@ _ANSI_PATTERN = re.compile(r"\x1b\[[0-9;]*m")
 
 
 def _visible_length(text: str) -> int:
-    """Calculate visible length of text, excluding ANSI codes.
+    """Calculate visible cell width of text, excluding ANSI codes.
+
+    Uses Rich's cell_len for proper Unicode width handling:
+    - Regular ASCII characters = 1 cell
+    - Wide characters (CJK, emoji) = 2 cells
+    - Zero-width characters = 0 cells
 
     Args:
         text: Text possibly containing ANSI escape codes.
 
     Returns:
-        Visible character count.
+        Visible cell width (terminal columns).
 
     """
-    return len(_ANSI_PATTERN.sub("", text))
+    # Strip ANSI codes first, then calculate cell width
+    clean_text = _ANSI_PATTERN.sub("", text)
+    return cell_len(clean_text)

{prezo-2026.1.2.dist-info → prezo-2026.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: prezo
-Version: 2026.1.2
+Version: 2026.1.3
 Summary: A TUI-based presentation tool for the terminal, built with Textual.
 Author: Stefane Fermigier
 Author-email: Stefane Fermigier <sf@fermigier.com>

{prezo-2026.1.2.dist-info → prezo-2026.1.3.dist-info}/RECORD

@@ -1,7 +1,12 @@
-prezo/__init__.py,sha256=blmZoW_bPndFLVT4UZzrfAp8IaGuvmFhtNGUs0nHpFQ,6434
-prezo/app.py,sha256=Uk4Wn8Q9_lJVMwHhGvBLrZ_ARCvtwUpX9X_KDyJ-OXs,32144
-prezo/config.py,sha256=byBBFHZU3fkq3dRfg5h4zG_eihbi7lHZkriSv-g-ogY,6672
-prezo/export.py,sha256=BNqN3a9XXlh22ELJAXnxw_fp0VMas_t-7DWLqyg1kbc,24430
+prezo/__init__.py,sha256=RDpFh0F3DGdMB08n7G3HM-c14JAoqvElq4DyXLSPDQg,6740
+prezo/app.py,sha256=3RPSx56hjyyG55ueNWHvuUNe-KkQ3ZzidNgBRc3I2WQ,31713
+prezo/config.py,sha256=DLHUQkThxhmYXQE1AgpWkPvtNlDwOxQRSNjRrfJJEew,6646
+prezo/export/__init__.py,sha256=jdf4Xu71aUKPBXUt8k8TEUzgMee4bfEh71iJGZXtVKE,1010
+prezo/export/common.py,sha256=W9Gn2_wjd3EPuenAECrs6pqsJEWFBJHtGs8y6-4VEKQ,2451
+prezo/export/html.py,sha256=GLRjTvZUEmvee6F2NlU3sn94H47PqLTLpaC3Ab_kxo8,8787
+prezo/export/images.py,sha256=TNTGIYNRTxwVjbHqZXYjIj0gouV_Dy1_DtenMlxsquE,7410
+prezo/export/pdf.py,sha256=9rzybk8o1vEu_JwvKB2abzrYoKfpEA8IP5pEFJHF5WM,13942
+prezo/export/svg.py,sha256=gxhRXpLiKcVr4NSF8nwaid74p8f9dvj4RwXwvMP0EbU,5698
 prezo/images/__init__.py,sha256=xrWSR3z0SXYpLtjIvR2VOMxiJGkxEsls5-EOs9GecFA,324
 prezo/images/ascii.py,sha256=aNz02jN4rkDw0WzmkGDrAGw1R1dY5QGREvIIPI6jwow,7613
 prezo/images/base.py,sha256=STuS57AVSJ2lzwyn0QrIceGaSd2IWEiLGN-elT3u3AM,2749
@@ -11,7 +16,7 @@ prezo/images/kitty.py,sha256=mWR-tIE_WDP5BjOkQydPpxWBBGNaZL8PkMICesWQid8,10883
 prezo/images/overlay.py,sha256=lWIAvINxZrKembtB0gzWWaUoedNt7beFU4OhErfwWaw,9600
 prezo/images/processor.py,sha256=zMcfwltecup_AX2FhUIlPdO7c87a9jw7P9tLTIkr54U,4069
 prezo/images/sixel.py,sha256=2IeKDiMsWU1Tn3HYI3PC972ygxKGqpfz6tnhQcM_sVM,5604
-prezo/layout.py,sha256=dQHp-9TV-vCp1yqt3WeiS1mrghAh9HPw3aap5DKOeoE,13551
+prezo/layout.py,sha256=xy-UaZvU2ZDe0H7XjMCDb30tog4LRdZKB5OUh_r0aqo,19929
 prezo/parser.py,sha256=f1eJtr9xVnxa35jgQ3GvKwNa6TvaXrIKQWgBB_geVAI,15058
 prezo/screens/__init__.py,sha256=xHG9jNJz4vi1tpneSEVlD0D9I0M2U4gAGk6-R9xbUf4,508
 prezo/screens/base.py,sha256=2n6Uj8evfIbcpn4AVYNG5iM_k7rIJ3Vwmor_xrQPU9E,2057
@@ -28,7 +33,7 @@ prezo/widgets/image_display.py,sha256=8IKncaoC2iWebmJQp_QomF7UVgRxD4WThOshN1Nht2
 prezo/widgets/slide_button.py,sha256=g5mvtCZSorTIZp_PXgHYeYeeCSNFy0pW3K7iDlZu7yA,2012
 prezo/widgets/slide_content.py,sha256=AO3doIuPBSo5vec_d1xE5F8YMJWxzOq5IFO7gSYSWNw,2300
 prezo/widgets/status_bar.py,sha256=Wcun71kg2Q4s5aduPwTvS4kDHZj5p-zDmD7Cx3_ZFP4,8136
-prezo-2026.1.2.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-prezo-2026.1.2.dist-info/entry_points.txt,sha256=74ShZJ_EKjzi63JyPynVnc0uCHGNjIWjAVs8vU_qTyA,38
-prezo-2026.1.2.dist-info/METADATA,sha256=EVYgqxUj2L3lvUNia9MKC6RjKQXFAaijrnfSD7WRwDg,5320
-prezo-2026.1.2.dist-info/RECORD,,
+prezo-2026.1.3.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+prezo-2026.1.3.dist-info/entry_points.txt,sha256=74ShZJ_EKjzi63JyPynVnc0uCHGNjIWjAVs8vU_qTyA,38
+prezo-2026.1.3.dist-info/METADATA,sha256=mv3i3_l0Rq03cmGDQzwBeZ9FiUIJ6enFmJNSvm83v2I,5320
+prezo-2026.1.3.dist-info/RECORD,,