figquilt 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

figquilt/compose_pdf.py

@@ -1,7 +1,7 @@
 import fitz
 from pathlib import Path
 from .layout import Layout, Panel
-from .units import mm_to_pt, to_pt
+from .units import to_pt
 from .errors import FigQuiltError
 
 
@@ -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,
@@ -155,8 +155,8 @@ class PDFComposer:
         # PyMuPDF insert_text uses 'baseline', so (0,0) is bottom-left of text char.
         # We need to shift Y down by approximately the font sizing to match SVG visual.
 
-        pos_x = rect.x0 + mm_to_pt(style.offset_x_mm)
-        raw_y = rect.y0 + mm_to_pt(style.offset_y_mm)
+        pos_x = rect.x0 + to_pt(style.offset_x, self.units)
+        raw_y = rect.y0 + to_pt(style.offset_y, self.units)
 
         # Approximate baseline shift: font_size
         # (A more precise way uses font.ascender, but for basic standard fonts, size is decent proxy for visual top->baseline)

figquilt/compose_svg.py

@@ -2,7 +2,7 @@ from pathlib import Path
 import base64
 from lxml import etree
 from .layout import Layout, Panel
-from .units import mm_to_pt, to_pt
+from .units import to_pt
 from .errors import FigQuiltError
 import fitz
 
@@ -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
@@ -179,8 +179,8 @@ class SVGComposer:
             text_str = text_str.upper()
 
         # Offset relative to the content position
-        x = offset_x + mm_to_pt(style.offset_x_mm)
-        y = offset_y + mm_to_pt(style.offset_y_mm)
+        x = offset_x + to_pt(style.offset_x, self.units)
+        y = offset_y + to_pt(style.offset_y, self.units)
 
         # Create text element
         txt = etree.SubElement(parent, "text")

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/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):
@@ -13,10 +24,12 @@ class LabelStyle(BaseModel):
     auto_sequence: bool = Field(True, description="Auto-generate labels A, B, C...")
     font_family: str = Field("Helvetica", description="Font family for labels")
     font_size_pt: float = Field(8.0, description="Font size in points")
-    offset_x_mm: float = Field(
-        2.0, description="Horizontal offset from panel edge (mm)"
+    offset_x: float = Field(
+        2.0, description="Horizontal offset from panel edge (in page units)"
+    )
+    offset_y: float = Field(
+        2.0, description="Vertical offset from panel edge (in page units)"
     )
-    offset_y_mm: float = Field(2.0, description="Vertical offset from panel edge (mm)")
     bold: bool = Field(True, description="Use bold font")
     uppercase: bool = Field(True, description="Use uppercase letters")
 
@@ -36,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"
     )
@@ -74,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/units.py

@@ -3,11 +3,6 @@ def mm_to_pt(mm: float) -> float:
     return mm * 72 / 25.4
 
 
-def pt_to_mm(pt: float) -> float:
-    """Converts points to millimeters."""
-    return pt * 25.4 / 72
-
-
 def inches_to_pt(inches: float) -> float:
     """Converts inches to points (1 inch = 72 pts)."""
     return inches * 72
@@ -26,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)
@@ -63,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

{figquilt-0.1.5.dist-info → figquilt-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: figquilt
-Version: 0.1.5
+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.7.dist-info/RECORD

@@ -0,0 +1,14 @@
+figquilt/__init__.py,sha256=91447944015cec709e8aa7655f7e9d64e1e4508e7023a57fe3746911c0fc6fed,22
+figquilt/cli.py,sha256=04af949a9e93cc7fdc2ded5c892cf06356d44903c1c4fbfdea2a4a10429616de,7062
+figquilt/compose_pdf.py,sha256=d593a009863abab96dfef54602407e3e73d318ce141277dcc3efaf2324a1c96b,6428
+figquilt/compose_svg.py,sha256=690feedc5788451ed8d30d32a92680956fcb86b7bc9eae7a7ffbf6b5958c3a0c,7683
+figquilt/errors.py,sha256=6f4001dcae85d2171f7aa7df4161926771dbe8c21068ccb70a7865298f05cf2b,298
+figquilt/grid.py,sha256=e977fbf92e3e2a0860f598c89e2f23071d51e66d2c8c1e7d6fab34bd75925631,3084
+figquilt/images.py,sha256=c613655fb3a0790fca98182c558c584e632a8822225220a5feb6080c7c68eb9e,815
+figquilt/layout.py,sha256=e3dd82c1feec18d84cb21bd8bb62c5dd0fc282e45adf5fb64cba2dab87d43422,6449
+figquilt/parser.py,sha256=9658c73e9964f2060afd01da4123aa0063c8062d382443c1e1caac79e7ebf648,4029
+figquilt/units.py,sha256=2b38d5d7a474211e64588c075943fbcdfc29c98ab7db7dc1c727ea5946351f0e,3093
+figquilt-0.1.7.dist-info/WHEEL,sha256=76443c98c0efcfdd1191eac5fa1d8223dba1c474dbd47676674a255e7ca48770,79
+figquilt-0.1.7.dist-info/entry_points.txt,sha256=8f70ce07f585bed28aca569052c7f0029384ac67c5e738faeb0daeb31695bc85,48
+figquilt-0.1.7.dist-info/METADATA,sha256=267f47988e7304d05eb89698bf9989b95971763159df4d0cf9877f1cdbb53905,6217
+figquilt-0.1.7.dist-info/RECORD,,

figquilt-0.1.5.dist-info/RECORD

@@ -1,14 +0,0 @@
-figquilt/__init__.py,sha256=91447944015cec709e8aa7655f7e9d64e1e4508e7023a57fe3746911c0fc6fed,22
-figquilt/cli.py,sha256=04af949a9e93cc7fdc2ded5c892cf06356d44903c1c4fbfdea2a4a10429616de,7062
-figquilt/compose_pdf.py,sha256=d1b3003597a0b549e60671aa06c7ea2d0a84fd94590240c6e63f3dcb9f4c0d77,6399
-figquilt/compose_svg.py,sha256=f61f1b43e252f77b54e40bd7b34dc55f729e8c954414aa74e2d8404c9a004f9a,7654
-figquilt/errors.py,sha256=6f4001dcae85d2171f7aa7df4161926771dbe8c21068ccb70a7865298f05cf2b,298
-figquilt/grid.py,sha256=b56aa9fabe023e9c9447d4d13c573a7ad64a60a1de38435fceb4429ecfaed00f,3050
-figquilt/images.py,sha256=c613655fb3a0790fca98182c558c584e632a8822225220a5feb6080c7c68eb9e,815
-figquilt/layout.py,sha256=5bd09ce23678b0e12dc21c32a0234dc143265dcd5a2c5d1512225d0b7958172b,5998
-figquilt/parser.py,sha256=9658c73e9964f2060afd01da4123aa0063c8062d382443c1e1caac79e7ebf648,4029
-figquilt/units.py,sha256=25098b6d7559cb78214fe1a9889fd38ce88633993d0c92819cc609510654275d,2124
-figquilt-0.1.5.dist-info/WHEEL,sha256=76443c98c0efcfdd1191eac5fa1d8223dba1c474dbd47676674a255e7ca48770,79
-figquilt-0.1.5.dist-info/entry_points.txt,sha256=8f70ce07f585bed28aca569052c7f0029384ac67c5e738faeb0daeb31695bc85,48
-figquilt-0.1.5.dist-info/METADATA,sha256=fb3252c7991719d2112a9cf1e09ebd4c95f46aa4914e3892f3ab46efa08b29bb,6217
-figquilt-0.1.5.dist-info/RECORD,,