kerykeion 5.1.8__py3-none-any.whl → 5.1.10__py3-none-any.whl

kerykeion/charts/chart_drawer.py

@@ -10,7 +10,7 @@ from math import ceil
 from datetime import datetime
 from pathlib import Path
 from string import Template
-from typing import Any, Mapping, Optional, Union, get_args
+from typing import Any, Mapping, Optional, Sequence, Union, get_args
 
 import swisseph as swe
 from scour.scour import scourString
@@ -173,6 +173,10 @@ class ChartDrawer:
     _DEFAULT_FULL_WIDTH_WITH_TABLE = 1250
     _DEFAULT_ULTRA_WIDE_WIDTH = 1320
 
+    _VERTICAL_PADDING_TOP = 15
+    _VERTICAL_PADDING_BOTTOM = 15
+    _TITLE_SPACING = 8
+
     _ASPECT_LIST_ASPECTS_PER_COLUMN = 14
     _ASPECT_LIST_COLUMN_WIDTH = 105
 
@@ -608,6 +612,9 @@ class ChartDrawer:
 
         delta_height = max(self.height - minimum_height, 0)
 
+        # Move title up for synastry charts
+        offsets["title"] = -10
+        
         offsets["wheel"] += delta_height
         offsets["aspect_grid"] += delta_height
         offsets["aspect_list"] += delta_height
@@ -664,8 +671,10 @@ class ChartDrawer:
         return collected
 
     def _dynamic_viewbox(self) -> str:
-        """Return the viewBox string based on current width/height."""
-        return f"0 0 {int(self.width)} {int(self.height)}"
+        """Return the viewBox string based on current width/height with vertical padding."""
+        min_y = -self._VERTICAL_PADDING_TOP
+        viewbox_height = int(self.height) + self._VERTICAL_PADDING_TOP + self._VERTICAL_PADDING_BOTTOM
+        return f"0 {min_y} {int(self.width)} {viewbox_height}"
 
     def _wheel_only_viewbox(self, margin: int = 20) -> str:
         """Return a tight viewBox for the wheel-only template.
@@ -770,18 +779,65 @@ class ChartDrawer:
                 # Secondary houses grid default x ~ 1015
                 secondary_houses_grid_right = 1015 + 120
                 extents.append(secondary_houses_grid_right)
-                first_house_comparison_grid_right = 1090 + 180
-                second_house_comparison_grid_right = 1290 + 180
-                extents.extend([first_house_comparison_grid_right, second_house_comparison_grid_right])
+                if self.second_obj is not None:
+                    point_column_label = self._translate("point", "Point")
+                    first_subject_label = self._truncate_name(self.first_obj.name, 8, "…", True)  # type: ignore[union-attr]
+                    second_subject_label = self._truncate_name(self.second_obj.name, 8, "…", True)  # type: ignore[union-attr]
+
+                    first_columns = [
+                        f"{first_subject_label} {point_column_label}",
+                        first_subject_label,
+                        second_subject_label,
+                    ]
+                    second_columns = [
+                        f"{second_subject_label} {point_column_label}",
+                        second_subject_label,
+                        first_subject_label,
+                    ]
+
+                    first_grid_width = self._estimate_house_comparison_grid_width(
+                        column_labels=first_columns,
+                        include_radix_column=True,
+                        include_title=True,
+                    )
+                    second_grid_width = self._estimate_house_comparison_grid_width(
+                        column_labels=second_columns,
+                        include_radix_column=True,
+                        include_title=False,
+                    )
+
+                    first_house_comparison_grid_right = 1090 + first_grid_width
+                    second_house_comparison_grid_right = 1290 + second_grid_width
+                    extents.extend([first_house_comparison_grid_right, second_house_comparison_grid_right])
 
             if self.chart_type == "Transit":
                 # House comparison grid at x ~ 1030
-                house_comparison_grid_right = 1030 + 180
+                transit_columns = [
+                    self._translate("transit_point", "Transit Point"),
+                    self._translate("house_position", "Natal House"),
+                ]
+                transit_grid_width = self._estimate_house_comparison_grid_width(
+                    column_labels=transit_columns,
+                    include_radix_column=False,
+                    include_title=True,
+                    minimum_width=170.0,
+                )
+                house_comparison_grid_right = 980 + transit_grid_width
                 extents.append(house_comparison_grid_right)
 
             if self.chart_type == "DualReturnChart":
-                # House comparison grid at x ~ 1030
-                house_comparison_grid_right = 1030 + 320
+                # House comparison grid translated to x ~ 1100
+                dual_return_columns = [
+                    self._translate("return_point", "Return Point"),
+                    self._translate("Return", "DualReturnChart"),
+                    self._translate("Natal", "Natal"),
+                ]
+                dual_return_grid_width = self._estimate_house_comparison_grid_width(
+                    column_labels=dual_return_columns,
+                    include_radix_column=True,
+                    include_title=True,
+                )
+                house_comparison_grid_right = 1100 + dual_return_grid_width
                 extents.append(house_comparison_grid_right)
 
         # Conservative safety padding
@@ -839,6 +895,86 @@ class ChartDrawer:
         # imposed by the title area.
         return max(per_column, min(allowed_capacity, max_capacity_by_top))
 
+    @staticmethod
+    def _estimate_text_width(text: str, font_size: int) -> float:
+        """Very rough text width estimation in pixels based on font size."""
+        if not text:
+            return 0.0
+        average_char_width = float(font_size)
+        return max(float(font_size), len(text) * average_char_width)
+
+    def _get_active_point_display_names(self) -> list[str]:
+        """Return localized labels for the currently active celestial points."""
+        language_map = {}
+        fallback_map = {}
+
+        if hasattr(self, "_language_model"):
+            language_map = self._language_model.celestial_points.model_dump()
+        if hasattr(self, "_fallback_language_model"):
+            fallback_map = self._fallback_language_model.celestial_points.model_dump()
+
+        display_names: list[str] = []
+        for point in self.active_points:
+            key = str(point)
+            label = language_map.get(key) or fallback_map.get(key) or key
+            display_names.append(str(label))
+        return display_names
+
+    def _estimate_house_comparison_grid_width(
+        self,
+        *,
+        column_labels: Sequence[str],
+        include_radix_column: bool,
+        include_title: bool,
+        minimum_width: float = 250.0,
+    ) -> int:
+        """
+        Approximate the rendered width for a house comparison grid in the current locale.
+
+        Args:
+            column_labels: Ordered labels for the header row.
+            include_radix_column: Whether a third numeric column is rendered.
+            include_title: Include the localized title in the width estimation.
+            minimum_width: Absolute lower bound to prevent extreme shrinking.
+        """
+        font_size_body = 10
+        font_size_title = 14
+        minimum_grid_width = float(minimum_width)
+
+        active_names = self._get_active_point_display_names()
+        max_name_width = max(
+            (self._estimate_text_width(name, font_size_body) for name in active_names),
+            default=self._estimate_text_width("Sun", font_size_body),
+        )
+        width_candidates: list[float] = []
+
+        name_start = 15
+        width_candidates.append(name_start + max_name_width)
+
+        value_offsets = [90]
+        if include_radix_column:
+            value_offsets.append(140)
+        value_samples = ("12", "-", "0")
+        max_value_width = max((self._estimate_text_width(sample, font_size_body) for sample in value_samples))
+        for offset in value_offsets:
+            width_candidates.append(offset + max_value_width)
+
+        header_offsets = [0, 77]
+        if include_radix_column:
+            header_offsets.append(132)
+        for idx, offset in enumerate(header_offsets):
+            label = column_labels[idx] if idx < len(column_labels) else ""
+            if not label:
+                continue
+            width_candidates.append(offset + self._estimate_text_width(label, font_size_body))
+
+        if include_title:
+            title_label = self._translate("house_position_comparison", "House Position Comparison")
+            width_candidates.append(self._estimate_text_width(title_label, font_size_title))
+
+        grid_width = max(width_candidates, default=minimum_grid_width)
+        return int(max(grid_width, minimum_grid_width))
+
     def _minimum_width_for_chart_type(self) -> int:
         """Baseline width to avoid compressing core groups too tightly."""
         wheel_right = 100 + (2 * self.main_radius)
@@ -851,7 +987,7 @@ class ChartDrawer:
         if self.chart_type == "DualReturnChart":
             return max(int(baseline), self._DEFAULT_ULTRA_WIDE_WIDTH // 2)
         if self.chart_type == "Transit":
-            return max(int(baseline), self._DEFAULT_FULL_WIDTH // 2)
+            return max(int(baseline), 450)
         return max(int(baseline), self._DEFAULT_NATAL_WIDTH)
 
     def _update_width_to_content(self) -> None:

kerykeion/charts/templates/chart.xml

@@ -21,41 +21,41 @@
     <g kr:node="Main_Chart">
         <g kr:node="Top_Left_Text" transform="translate(0,$title_translate_y)">
             <text x="20" y="22" style="fill: $paper_color_0; font-size: 24px">$stringTitle</text>
-            <text x="20" y="50" style="fill: $paper_color_0; font-size: 10px">$top_left_0</text>
-            <text x="20" y="62" style="fill: $paper_color_0; font-size: 10px">$top_left_1</text>
-            <text x="20" y="74" style="fill: $paper_color_0; font-size: 10px">$top_left_2</text>
-            <text x="20" y="86" style="fill: $paper_color_0; font-size: 10px">$top_left_3</text>
-            <text x="20" y="98" style="fill: $paper_color_0; font-size: 10px">$top_left_4</text>
-            <text x="20" y="110" style="fill: $paper_color_0; font-size: 10px">$top_left_5</text>
+            <text x="20" y="58" style="fill: $paper_color_0; font-size: 10px">$top_left_0</text>
+            <text x="20" y="70" style="fill: $paper_color_0; font-size: 10px">$top_left_1</text>
+            <text x="20" y="82" style="fill: $paper_color_0; font-size: 10px">$top_left_2</text>
+            <text x="20" y="94" style="fill: $paper_color_0; font-size: 10px">$top_left_3</text>
+            <text x="20" y="106" style="fill: $paper_color_0; font-size: 10px">$top_left_4</text>
+            <text x="20" y="118" style="fill: $paper_color_0; font-size: 10px">$top_left_5</text>
         </g>
 
         <!-- Elements -->
         <g kr:node="Elements_Percentages" transform="translate(0,$elements_translate_y)">
-            <text x="20" y="130" style="fill: $paper_color_0; font-size: 10px;">$elements_string</text>
-            <text x="20" y="144"
+            <text x="20" y="138" style="fill: $paper_color_0; font-size: 10px;">$elements_string</text>
+            <text x="20" y="152"
                 style="fill: var(--kerykeion-chart-color-fire-percentage); font-size: 10px;">
                 $fire_string</text>
-            <text x="20" y="156"
+            <text x="20" y="164"
                 style="fill: var(--kerykeion-chart-color-earth-percentage); font-size: 10px;">
                 $earth_string</text>
-            <text x="20" y="168"
+            <text x="20" y="176"
                 style="fill: var(--kerykeion-chart-color-air-percentage); font-size: 10px;">
                 $air_string</text>
-            <text x="20" y="180"
+            <text x="20" y="188"
                 style="fill: var(--kerykeion-chart-color-water-percentage); font-size: 10px;">
                 $water_string</text>
         </g>
 
         <!-- Qualities -->
         <g kr:node="Qualities_Percentages" transform="translate(0,$qualities_translate_y)">
-            <text x="20" y="200" style="fill: $paper_color_0; font-size: 10px;">$qualities_string</text>
-            <text x="20" y="214"
+            <text x="20" y="208" style="fill: $paper_color_0; font-size: 10px;">$qualities_string</text>
+            <text x="20" y="222"
                 style="fill: var(--kerykeion-chart-color-cardinal-percentage); font-size: 10px;">
                 $cardinal_string</text>
-            <text x="20" y="226"
+            <text x="20" y="234"
                 style="fill: var(--kerykeion-chart-color-fixed-percentage); font-size: 10px;">
                 $fixed_string</text>
-            <text x="20" y="238"
+            <text x="20" y="246"
                 style="fill: var(--kerykeion-chart-color-mutable-percentage); font-size: 10px;">
                 $mutable_string</text>
         </g>

{kerykeion-5.1.8.dist-info → kerykeion-5.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kerykeion
-Version: 5.1.8
+Version: 5.1.10
 Summary: A Python library for astrological calculations, including natal charts, houses, planetary aspects, and SVG chart generation.
 Project-URL: Homepage, https://www.kerykeion.net/
 Project-URL: Repository, https://github.com/g-battaglia/kerykeion

{kerykeion-5.1.8.dist-info → kerykeion-5.1.10.dist-info}/RECORD

@@ -14,11 +14,11 @@ kerykeion/aspects/__init__.py,sha256=csJmxvLdBu-bHuW676f3dpY__Qyc6LwRyrpWVTh3n1A
 kerykeion/aspects/aspects_factory.py,sha256=XCuOOpo0ZW7sihYT2f50bLVpebEk19b9EtEjXonwte0,24156
 kerykeion/aspects/aspects_utils.py,sha256=2YloOKOmN0h2d6J8A1vCe-y4A2mWNoOUYCGDVwGl4gA,5794
 kerykeion/charts/__init__.py,sha256=i9NMZ7LdkllPlqQSi1or9gTobHbROGDKmJhBDO4R0mA,128
-kerykeion/charts/chart_drawer.py,sha256=C3NI-_2UugD9YWnakq3asICJolX9gsQLM2aP3n6hOq4,124658
+kerykeion/charts/chart_drawer.py,sha256=AQGtJsUWRm_D-RH1w1Q9GRD6cRtgmjDQN1e-UMOtO3Y,130645
 kerykeion/charts/charts_utils.py,sha256=iwgDhVc_GwKuQBZ6JNmn6RWVILD5KIcjbrnDTR3wrAc,70911
 kerykeion/charts/draw_planets.py,sha256=tIj3FeLLomVSbCaZUxfw_qBEB3pxi4EIEhqaeTgTyTY,29061
 kerykeion/charts/templates/aspect_grid_only.xml,sha256=v3QtNMjk-kBdUTfB0r6thg--Ta_tNFdRQCzdk5PAycY,86429
-kerykeion/charts/templates/chart.xml,sha256=oUI9hV--4rdsVFqZJ8ChpgC2ZgfnqlL2Tl2vco1vlOc,92095
+kerykeion/charts/templates/chart.xml,sha256=QhCSkORLw61cXycF2fMmCLsSailPyIxLbVtsR-CXsKI,92096
 kerykeion/charts/templates/wheel_only.xml,sha256=05k2KiVMP-5NW0e8PZrTX-VPn5x-SaNzEYPgU1_OKa0,87775
 kerykeion/charts/themes/black-and-white.css,sha256=IIoy9wyB4znrvPvmallKmgDW4HMJPywTv5IZsolaEp4,6543
 kerykeion/charts/themes/classic.css,sha256=xvBiI4DtY5fMaA7ilxGl26VEDY1VzkOTWm1XOs9n-ec,5158
@@ -57,7 +57,7 @@ kerykeion/sweph/ast28/se28978s.se1,sha256=nU2Qp-ELc_tzFnRc1QT6uVueWXEipvhYDgfQRX
 kerykeion/sweph/ast50/se50000s.se1,sha256=9jTrPlIrZMOBWC9cNgwzcfz0KBHdXFZoY9-NZ_HtECo,15748
 kerykeion/sweph/ast90/se90377s.se1,sha256=bto2x4LtBv8b1ej1XhVFYq-kfHO9cczbKV9U1f9UVu4,10288
 kerykeion/sweph/ast90/se90482s.se1,sha256=uHxz6bP4K8zgtQFrlWFwxrYfmqm5kXxsg6OYhAIUbAA,16173
-kerykeion-5.1.8.dist-info/METADATA,sha256=l4rJD4aLJrCesNRr_LmF9RDRMSQP7uKrV6hA6DxLvAs,61802
-kerykeion-5.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kerykeion-5.1.8.dist-info/licenses/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-5.1.8.dist-info/RECORD,,
+kerykeion-5.1.10.dist-info/METADATA,sha256=KMaQJSdjbOrF-W6uowiZUDoN-WHDAMy3oCH7PO3kS1I,61803
+kerykeion-5.1.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kerykeion-5.1.10.dist-info/licenses/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-5.1.10.dist-info/RECORD,,