figquilt 0.1.6__tar.gz → 0.1.7__tar.gz

{figquilt-0.1.6 → figquilt-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: figquilt
-Version: 0.1.6
+Version: 0.1.7
 Summary: figquilt is a small, language-agnostic CLI tool that composes multiple figures (PDF/SVG/PNG) into a single publication-ready figure, based on a simple layout file (YAML/JSON). The key function is creating a PDF by composing multiple PDFs and adding subfigure labels and minimal annotations.
 Author: YY Ahn
 Author-email: YY Ahn <yongyeol@gmail.com>

{figquilt-0.1.6 → figquilt-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "figquilt"
-version = "0.1.6"
+version = "0.1.7"
 description = "figquilt is a small, language-agnostic CLI tool that composes multiple figures (PDF/SVG/PNG) into a single publication-ready figure, based on a simple layout file (YAML/JSON). The key function is creating a PDF by composing multiple PDFs and adding subfigure labels and minimal annotations."
 readme = "README.md"
 authors = [

{figquilt-0.1.6 → figquilt-0.1.7}/src/figquilt/compose_pdf.py

@@ -100,11 +100,11 @@ class PDFComposer:
                 # No height specified: use source aspect ratio
                 h = w * src_aspect
 
-            # Calculate content rect using fit mode
+            # Calculate content rect using fit mode and alignment
             from .units import calculate_fit
 
             content_w, content_h, offset_x, offset_y = calculate_fit(
-                src_aspect, w, h, panel.fit
+                src_aspect, w, h, panel.fit, panel.align
             )
             rect = fitz.Rect(
                 x + offset_x,

{figquilt-0.1.6 → figquilt-0.1.7}/src/figquilt/compose_svg.py

@@ -71,11 +71,11 @@ class SVGComposer:
             else:
                 h = w * src_aspect
 
-            # Calculate content dimensions using fit mode
+            # Calculate content dimensions using fit mode and alignment
             from .units import calculate_fit
 
             content_w, content_h, offset_x, offset_y = calculate_fit(
-                src_aspect, w, h, panel.fit
+                src_aspect, w, h, panel.fit, panel.align
             )
 
             # Group for the panel

{figquilt-0.1.6 → figquilt-0.1.7}/src/figquilt/grid.py

@@ -58,6 +58,7 @@ def _resolve_node(
                 width=width,
                 height=height,
                 fit=node.fit,
+                align=node.align,
                 label=node.label,
                 label_style=node.label_style,
             )

{figquilt-0.1.6 → figquilt-0.1.7}/src/figquilt/layout.py

@@ -4,6 +4,17 @@ from pathlib import Path
 from pydantic import BaseModel, Field, field_validator, model_validator
 
 FitMode = Literal["contain", "cover"]
+Alignment = Literal[
+    "center",
+    "top",
+    "bottom",
+    "left",
+    "right",
+    "top-left",
+    "top-right",
+    "bottom-left",
+    "bottom-right",
+]
 
 
 class LabelStyle(BaseModel):
@@ -38,6 +49,10 @@ class Panel(BaseModel):
         "contain",
         description="How to fit the figure: contain (preserve aspect) or cover (fill and clip)",
     )
+    align: Alignment = Field(
+        "center",
+        description="How to align content within cell when using contain fit mode",
+    )
     label: Optional[str] = Field(
         None, description="Override the auto-generated label text"
     )
@@ -76,6 +91,9 @@ class LayoutNode(BaseModel):
         None, description="Path to source file (PDF, SVG, or PNG)"
     )
     fit: FitMode = Field("contain", description="How to fit the figure in its cell")
+    align: Alignment = Field(
+        "center", description="How to align content within cell when using contain fit"
+    )
     label: Optional[str] = Field(
         None, description="Override the auto-generated label text"
     )

{figquilt-0.1.6 → figquilt-0.1.7}/src/figquilt/units.py

@@ -21,16 +21,22 @@ def to_pt(value: float, units: str) -> float:
 
 
 def calculate_fit(
-    src_aspect: float, cell_w: float, cell_h: float, fit_mode: str
+    src_aspect: float,
+    cell_w: float,
+    cell_h: float,
+    fit_mode: str,
+    align: str = "center",
 ) -> tuple[float, float, float, float]:
     """
-    Calculate content dimensions and offset based on fit mode.
+    Calculate content dimensions and offset based on fit mode and alignment.
 
     Args:
         src_aspect: Source aspect ratio (height / width)
         cell_w: Cell width in points
         cell_h: Cell height in points
         fit_mode: "contain" or "cover"
+        align: Alignment within cell (center, top, bottom, left, right,
+               top-left, top-right, bottom-left, bottom-right)
 
     Returns:
         Tuple of (content_w, content_h, offset_x, offset_y)
@@ -58,8 +64,41 @@ def calculate_fit(
             content_w = cell_w
             content_h = cell_w * src_aspect
 
-    # Center in cell
-    offset_x = (cell_w - content_w) / 2
-    offset_y = (cell_h - content_h) / 2
+    # Calculate offsets based on alignment
+    space_x = cell_w - content_w
+    space_y = cell_h - content_h
+
+    # Parse alignment
+    if align == "center":
+        offset_x = space_x / 2
+        offset_y = space_y / 2
+    elif align == "top":
+        offset_x = space_x / 2
+        offset_y = 0
+    elif align == "bottom":
+        offset_x = space_x / 2
+        offset_y = space_y
+    elif align == "left":
+        offset_x = 0
+        offset_y = space_y / 2
+    elif align == "right":
+        offset_x = space_x
+        offset_y = space_y / 2
+    elif align == "top-left":
+        offset_x = 0
+        offset_y = 0
+    elif align == "top-right":
+        offset_x = space_x
+        offset_y = 0
+    elif align == "bottom-left":
+        offset_x = 0
+        offset_y = space_y
+    elif align == "bottom-right":
+        offset_x = space_x
+        offset_y = space_y
+    else:
+        # Unknown alignment, default to center
+        offset_x = space_x / 2
+        offset_y = space_y / 2
 
     return content_w, content_h, offset_x, offset_y