kerykeion 5.0.0b1__py3-none-any.whl → 5.0.0b2__py3-none-any.whl

kerykeion/charts/chart_drawer.py

@@ -161,6 +161,21 @@ class ChartDrawer:
     _DEFAULT_FULL_WIDTH_WITH_TABLE = 1250
     _DEFAULT_ULTRA_WIDE_WIDTH = 1320
 
+    _BASE_VERTICAL_OFFSETS = {
+        "wheel": 50,
+        "grid": 0,
+        "aspect_grid": 50,
+        "aspect_list": 50,
+        "title": 0,
+        "elements": 0,
+        "qualities": 0,
+        "lunar_phase": 518,
+        "bottom_left": 0,
+    }
+    _MAX_TOP_SHIFT = 80
+    _TOP_SHIFT_FACTOR = 2
+    _ROW_HEIGHT = 8
+
     _BASIC_CHART_VIEWBOX = f"0 0 {_DEFAULT_NATAL_WIDTH} {_DEFAULT_HEIGHT}"
     _WIDE_CHART_VIEWBOX = f"0 0 {_DEFAULT_FULL_WIDTH} 546.0"
     _ULTRA_WIDE_CHART_VIEWBOX = f"0 0 {_DEFAULT_ULTRA_WIDE_WIDTH} 546.0"
@@ -253,6 +268,7 @@ class ChartDrawer:
         self.custom_title = custom_title
         self.auto_size = auto_size
         self._padding = padding
+        self._vertical_offsets: dict[str, int] = self._BASE_VERTICAL_OFFSETS.copy()
 
         # Extract data from ChartDataModel
         self.chart_data = chart_data
@@ -265,6 +281,7 @@ class ChartDrawer:
             # SingleChartDataModel
             self.first_obj = getattr(chart_data, 'subject')
             self.second_obj = None
+
         else:  # DualChartDataModel for Transit, Synastry, DualReturnChart
             self.first_obj = getattr(chart_data, 'first_subject')
             self.second_obj = getattr(chart_data, 'second_subject')
@@ -282,6 +299,13 @@ class ChartDrawer:
                 body["is_active"] = True
                 self.available_planets_setting.append(body)  # type: ignore[arg-type]
 
+        active_points_count = len(self.available_planets_setting)
+        if active_points_count > 24:
+            logging.warning(
+                "ChartDrawer detected %s active celestial points; rendering may look crowded beyond 24.",
+                active_points_count,
+            )
+
         # Set available celestial points
         available_celestial_points_names = [body["name"].lower() for body in self.available_planets_setting]
         self.available_kerykeion_celestial_points = []
@@ -448,10 +472,49 @@ class ChartDrawer:
                 # Keep default on any unexpected issue; do not break rendering
                 logging.debug(f"Auto-size width calculation failed: {e}")
 
+        self._apply_dynamic_height_adjustment()
+
     def _count_active_planets(self) -> int:
         """Return number of active celestial points in the current chart."""
         return len([p for p in self.available_planets_setting if p.get("is_active")])
 
+    def _apply_dynamic_height_adjustment(self) -> None:
+        """Adjust chart height and vertical offsets based on active points."""
+        active_points_count = self._count_active_planets()
+
+        offsets = self._BASE_VERTICAL_OFFSETS.copy()
+
+        minimum_height = self._DEFAULT_HEIGHT
+        if active_points_count <= 20:
+            self.height = max(self.height, minimum_height)
+            self._vertical_offsets = offsets
+            return
+
+        extra_points = active_points_count - 20
+        extra_height = extra_points * self._ROW_HEIGHT
+
+        self.height = max(self.height, minimum_height + extra_height)
+
+        delta_height = max(self.height - minimum_height, 0)
+
+        # Anchor wheel, aspect grid/list, and lunar phase to the bottom
+        offsets["wheel"] += delta_height
+        offsets["aspect_grid"] += delta_height
+        offsets["aspect_list"] += delta_height
+        offsets["lunar_phase"] += delta_height
+        offsets["bottom_left"] += delta_height
+
+        # Smooth top offsets to keep breathing room near the title and grids
+        shift = min(extra_points * self._TOP_SHIFT_FACTOR, self._MAX_TOP_SHIFT)
+        top_shift = shift // 2
+
+        offsets["grid"] += shift
+        offsets["title"] += top_shift
+        offsets["elements"] += top_shift
+        offsets["qualities"] += top_shift
+
+        self._vertical_offsets = offsets
+
     def _dynamic_viewbox(self) -> str:
         """Return the viewBox string based on current width/height."""
         return f"0 0 {int(self.width)} {int(self.height)}"
@@ -476,7 +539,7 @@ class ChartDrawer:
           uses `x_indent=50`, `y_indent=250`, `box_size=14` and draws:
             • a header row to the right of `x_indent`
             • a left header column at `x_indent - box_size`
-            • an N×N grid of cells above `y_indent`
+            • an NxN grid of cells above `y_indent`
 
         - For Natal/Composite/SingleReturn charts, `draw_aspect_grid` uses
           `x_start=50`, `y_start=250`, `box_size=14` and draws a triangular grid
@@ -534,8 +597,8 @@ class ChartDrawer:
         extents.extend([main_planet_grid_right, main_houses_grid_right])
 
         if self.chart_type in ("Natal", "Composite", "SingleReturnChart"):
-            # Triangular aspect grid at x_start=510, width ~ 14 * n_active
-            aspect_grid_right = 510 + 14 * n_active
+            # Triangular aspect grid at x_start=540, width ~ 14 * n_active
+            aspect_grid_right = 560 + 14 * n_active
             extents.append(aspect_grid_right)
 
         if self.chart_type in ("Transit", "Synastry", "DualReturnChart"):
@@ -815,6 +878,17 @@ class ChartDrawer:
         template_dict["chart_height"] = self.height
         template_dict["chart_width"] = self.width
 
+        offsets = self._vertical_offsets
+        template_dict["full_wheel_translate_y"] = offsets["wheel"]
+        template_dict["houses_and_planets_translate_y"] = offsets["grid"]
+        template_dict["aspect_grid_translate_y"] = offsets["aspect_grid"]
+        template_dict["aspect_list_translate_y"] = offsets["aspect_list"]
+        template_dict["title_translate_y"] = offsets["title"]
+        template_dict["elements_translate_y"] = offsets["elements"]
+        template_dict["qualities_translate_y"] = offsets["qualities"]
+        template_dict["lunar_phase_translate_y"] = offsets["lunar_phase"]
+        template_dict["bottom_left_translate_y"] = offsets["bottom_left"]
+
         # Set paper colors
         template_dict["paper_color_0"] = self.chart_colors_settings["paper_0"]
 
@@ -1223,8 +1297,8 @@ class ChartDrawer:
                     self.chart_colors_settings["paper_0"],
                     self.available_planets_setting,
                     self.aspects_list,
-                    550,
-                    450,
+                    600,
+                    520,
                 )
 
             template_dict["makeAspects"] = self._draw_all_transit_aspects_lines(self.main_radius, self.main_radius - 160)

kerykeion/charts/charts_utils.py

@@ -7,6 +7,31 @@ from kerykeion.schemas.kr_models import AspectModel, KerykeionPointModel, Compos
 from kerykeion.schemas.settings_models import KerykeionLanguageCelestialPointModel, KerykeionSettingsCelestialPointModel
 
 
+_SECOND_COLUMN_THRESHOLD = 20
+_THIRD_COLUMN_THRESHOLD = 28
+_FOURTH_COLUMN_THRESHOLD = 36
+_GRID_COLUMN_WIDTH = 125
+
+
+def _planet_grid_layout_position(index: int) -> tuple[int, int]:
+    """Return horizontal offset and row index for planet grids."""
+    if index < _SECOND_COLUMN_THRESHOLD:
+        column = 0
+        row = index
+    elif index < _THIRD_COLUMN_THRESHOLD:
+        column = 1
+        row = index - _SECOND_COLUMN_THRESHOLD
+    elif index < _FOURTH_COLUMN_THRESHOLD:
+        column = 2
+        row = index - _THIRD_COLUMN_THRESHOLD
+    else:
+        column = 3
+        row = index - _FOURTH_COLUMN_THRESHOLD
+
+    offset = -(_GRID_COLUMN_WIDTH * column)
+    return offset, row
+
+
 
 def get_decoded_kerykeion_celestial_point_name(input_planet_name: str, celestial_point_language: KerykeionLanguageCelestialPointModel) -> str:
     """
@@ -960,16 +985,11 @@ def draw_main_planet_grid(
             f'</g>'
         )
 
-    line_height = LINE_START
-    offset = 0
-
     end_of_line = "</g>"
 
     for i, planet in enumerate(available_kerykeion_celestial_points):
-        # Start a second column at item 23 (index 22)
-        if i == 20:
-            line_height = LINE_START
-            offset = -125
+        offset, row_index = _planet_grid_layout_position(i)
+        line_height = LINE_START + (row_index * LINE_STEP)
 
         decoded_name = get_decoded_kerykeion_celestial_point_name(
             planet["name"],
@@ -988,7 +1008,6 @@ def draw_main_planet_grid(
             svg_output += '<g transform="translate(74,-6)"><use transform="scale(.5)" xlink:href="#retrograde" /></g>'
 
         svg_output += end_of_line
-        line_height += LINE_STEP
 
     # Close the wrapper group
     svg_output += "</g>"
@@ -1051,13 +1070,16 @@ def draw_secondary_planet_grid(
     line_height = LINE_START
     end_of_line = "</g>"
 
-    for t_planet in second_subject_available_kerykeion_celestial_points:
+    for i, t_planet in enumerate(second_subject_available_kerykeion_celestial_points):
+        offset, row_index = _planet_grid_layout_position(i)
+        line_height = LINE_START + (row_index * LINE_STEP)
+
         second_decoded_name = get_decoded_kerykeion_celestial_point_name(
             t_planet["name"],
             celestial_point_language,
         )
         svg_output += (
-            f'<g transform="translate(0,{BASE_Y + line_height})">'
+            f'<g transform="translate({offset},{BASE_Y + line_height})">'
             f'<text text-anchor="end" style="fill:{text_color}; font-size: 10px;">{second_decoded_name}</text>'
             f'<g transform="translate(5,-8)"><use transform="scale(0.4)" xlink:href="#{t_planet["name"]}" /></g>'
             f'<text text-anchor="start" x="19" style="fill:{text_color}; font-size: 10px;">{convert_decimal_to_degree_string(t_planet["position"])}</text>'
@@ -1068,7 +1090,7 @@ def draw_secondary_planet_grid(
             svg_output += '<g transform="translate(74,-6)"><use transform="scale(.5)" xlink:href="#retrograde" /></g>'
 
         svg_output += end_of_line
-        line_height += LINE_STEP
+
 
     # Close wrapper group
     svg_output += "</g>"

kerykeion/charts/templates/chart.xml

@@ -18,7 +18,7 @@
 
     <!--- Main Chart -->
     <g kr:node="Main_Chart">
-        <g kr:node="Top_Left_Text">
+        <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>
@@ -29,7 +29,7 @@
         </g>
 
         <!-- Elements -->
-        <g kr:node="Elements_Percentages">
+        <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" style="fill: var(--kerykeion-chart-color-fire-percentage); font-size: 10px;">$fire_string</text>
             <text x="20" y="156" style="fill: var(--kerykeion-chart-color-earth-percentage); font-size: 10px;">$earth_string</text>
@@ -38,14 +38,14 @@
         </g>
 
         <!-- Qualities -->
-        <g kr:node="Qualities_Percentages">
+        <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" style="fill: var(--kerykeion-chart-color-cardinal-percentage); font-size: 10px;">$cardinal_string</text>
             <text x="20" y="226" style="fill: var(--kerykeion-chart-color-fixed-percentage); font-size: 10px;">$fixed_string</text>
             <text x="20" y="238" style="fill: var(--kerykeion-chart-color-mutable-percentage); font-size: 10px;">$mutable_string</text>
         </g>
 
-        <g kr:node="Bottom_Left_Text">
+        <g kr:node="Bottom_Left_Text" transform="translate(0,$bottom_left_translate_y)">
             <text x="20" y="452" style="fill: $paper_color_0; font-size: 10px">$bottom_left_0</text>
             <text x="20" y="466" style="fill: $paper_color_0; font-size: 10px">$bottom_left_1</text>
             <text x="20" y="480" style="fill: $paper_color_0; font-size: 10px">$bottom_left_2</text>
@@ -54,12 +54,12 @@
         </g>
 
         <!-- Lunar Phase -->
-        <g kr:node="Lunar_Phase" transform="translate(10,518)">
+        <g kr:node="Lunar_Phase" transform="translate(10,$lunar_phase_translate_y)">
             $makeLunarPhase
         </g>
 
         <!-- Full Wheel -->
-        <g kr:node="Full_Wheel" transform="translate(100,50)">
+        <g kr:node="Full_Wheel" transform="translate(100,$full_wheel_translate_y)">
 
             <!-- Background Circle -->
             <g kr:node='Background_Circle'>
@@ -113,7 +113,7 @@
         </g>
 
         <!-- Houses_And_Planets_Grid -->
-        <g kr:node="Houses_And_Planets_Grid">
+        <g kr:node="Houses_And_Planets_Grid" transform="translate(20,$houses_and_planets_translate_y)">
             <!-- Main Subject Grid -->
             <g kr:node="Main_Planet_Grid">
                 $makeMainPlanetGrid
@@ -138,12 +138,12 @@
         </g>
 
         <!-- Single Chart Aspect -->
-        <g kr:node="Aspect_Grid"  transform="translate(0,50)">
+        <g kr:node="Aspect_Grid"  transform="translate(35,$aspect_grid_translate_y)">
             $makeAspectGrid
         </g>
 
         <!-- Double Chart Chart Aspects -->
-        <g kr:node="Aspect_List"  transform="translate(50,50)">
+        <g kr:node="Aspect_List"  transform="translate(50,$aspect_list_translate_y)">
             $makeDoubleChartAspectList
         </g>
     </g>
@@ -158,82 +158,6 @@
                 <circle cx="10" cy="10" r="2" style="fill: $planets_color_0" />
             </g>
         </symbol>
-        <!-- OTHER POINTS -->
-        <symbol id="Earth">
-            <g transform="translate(2,2)">
-                <circle cx="10" cy="10" r="9" style="stroke: $planets_color_21; stroke-width: 2px; fill: none;" />
-                <line x1="10" y1="1" x2="10" y2="19" style="stroke: $planets_color_21; stroke-width: 2px;" />
-                <line x1="1" y1="10" x2="19" y2="10" style="stroke: $planets_color_21; stroke-width: 2px;" />
-            </g>
-        </symbol>
-        <symbol id="Pholus">
-            <g transform="translate(2,2)">
-                <circle cx="10" cy="10" r="9" style="stroke: $planets_color_22; stroke-width: 2px; fill: none;" />
-                <path d="M 6,8 Q 10,4 14,8 Q 10,12 6,8" style="stroke: $planets_color_22; stroke-width: 2px; fill: none;" />
-                <path d="M 10,8 L 10,16" style="stroke: $planets_color_22; stroke-width: 2px;" />
-            </g>
-        </symbol>
-        <symbol id="Sedna">
-            <g transform="translate(2,2)">
-                <circle cx="10" cy="10" r="9" style="stroke: $planets_color_28; stroke-width: 2px; fill: none;" />
-                <path d="M 5,10 Q 10,5 15,10 Q 10,15 5,10" style="stroke: $planets_color_28; stroke-width: 2px; fill: none;" />
-                <circle cx="10" cy="10" r="2" style="fill: $planets_color_28;" />
-            </g>
-        </symbol>
-        <symbol id="Haumea">
-            <g transform="translate(2,2)">
-                <ellipse cx="10" cy="10" rx="9" ry="6" style="stroke: $planets_color_29; stroke-width: 2px; fill: none;" />
-                <path d="M 4,10 L 7,7 M 13,7 L 16,10 M 16,10 L 13,13 M 7,13 L 4,10" style="stroke: $planets_color_29; stroke-width: 2px;" />
-            </g>
-        </symbol>
-        <symbol id="Makemake">
-            <g transform="translate(2,2)">
-                <circle cx="10" cy="10" r="9" style="stroke: $planets_color_30; stroke-width: 2px; fill: none;" />
-                <path d="M 6,6 L 10,10 L 14,6" style="stroke: $planets_color_30; stroke-width: 2px; fill: none;" />
-                <path d="M 6,14 L 10,10 L 14,14" style="stroke: $planets_color_30; stroke-width: 2px; fill: none;" />
-                <circle cx="10" cy="10" r="1.5" style="fill: $planets_color_30;" />
-            </g>
-        </symbol>
-        <symbol id="Ixion">
-            <g transform="translate(2,2)">
-                <circle cx="10" cy="10" r="9" style="stroke: $planets_color_31; stroke-width: 2px; fill: none;" />
-                <path d="M 3,3 L 17,17 M 17,3 L 3,17" style="stroke: $planets_color_31; stroke-width: 2px;" />
-                <circle cx="10" cy="10" r="3" style="stroke: $planets_color_31; stroke-width: 2px; fill: none;" />
-            </g>
-        </symbol>
-        <symbol id="Orcus">
-            <g transform="translate(2,2)">
-                <circle cx="10" cy="10" r="9" style="stroke: $planets_color_32; stroke-width: 2px; fill: none;" />
-                <path d="M 6,6 L 14,14 M 14,6 L 6,14" style="stroke: $planets_color_32; stroke-width: 2px;" />
-                <path d="M 10,3 L 10,17 M 3,10 L 17,10" style="stroke: $planets_color_32; stroke-width: 2px;" />
-            </g>
-        </symbol>
-        <symbol id="Quaoar">
-            <g transform="translate(2,2)">
-                <circle cx="10" cy="10" r="9" style="stroke: $planets_color_33; stroke-width: 2px; fill: none;" />
-                <path d="M 7,7 Q 10,4 13,7 Q 16,10 13,13 Q 10,16 7,13 Q 4,10 7,7" style="stroke: $planets_color_33; stroke-width: 2px; fill: none;" />
-            </g>
-        </symbol>
-        <symbol id="Regulus">
-            <g transform="translate(2,2)">
-                <circle cx="10" cy="10" r="9" style="stroke: $planets_color_34; stroke-width: 2px; fill: none;" />
-                <path d="M 10,3 L 7,7 L 13,7 Z" style="stroke: $planets_color_34; stroke-width: 2px; fill: $planets_color_34;" />
-                <circle cx="10" cy="12" r="3" style="stroke: $planets_color_34; stroke-width: 2px; fill: none;" />
-            </g>
-        </symbol>
-        <symbol id="Spica">
-            <g transform="translate(2,2)">
-                <circle cx="10" cy="10" r="9" style="stroke: $planets_color_35; stroke-width: 2px; fill: none;" />
-                <path d="M 10,4 L 8,8 L 4,8 L 7,11 L 6,15 L 10,13 L 14,15 L 13,11 L 16,8 L 12,8 Z" style="stroke: $planets_color_35; stroke-width: 2px; fill: $planets_color_35;" />
-            </g>
-        </symbol>
-        <symbol id="Anti_Vertex">
-            <g transform="translate(2,2)">
-                <circle cx="10" cy="10" r="9" style="stroke: $planets_color_41; stroke-width: 2px; fill: none;" />
-                <path d="M 6,6 L 14,14 M 14,6 L 6,14" style="stroke: $planets_color_41; stroke-width: 2px;" />
-                <circle cx="10" cy="10" r="3" style="fill: $planets_color_41;" />
-            </g>
-        </symbol>
         <symbol id="Moon">
             <g transform="translate(4,3)">
                 <g transform="scale(.8)">
@@ -391,43 +315,149 @@
             <text y="20" style="font-size: 22px; fill: $planets_color_16">Ic</text>
         </symbol>
 
+        <!-- OTHER POINTS -->
+        <symbol id="Earth">
+            <g transform="translate(2,2)">
+                <circle cx="10" cy="10" r="8" style="stroke: $planets_color_21; stroke-width: 1.8px; fill: none;" />
+                <line x1="10" y1="2" x2="10" y2="18" style="stroke: $planets_color_21; stroke-width: 1.8px;" />
+                <line x1="2" y1="10" x2="18" y2="10" style="stroke: $planets_color_21; stroke-width: 1.8px;" />
+            </g>
+        </symbol>
+        <symbol id="Pholus">
+            <g transform="translate(2,2)">
+                <circle cx="10" cy="6" r="4" style="fill: none; stroke: $planets_color_22; stroke-width: 1.8px;" />
+                <line x1="10" y1="10" x2="10" y2="18" style="stroke: $planets_color_22; stroke-width: 1.8px;" />
+                <line x1="7" y1="18" x2="13" y2="18" style="stroke: $planets_color_22; stroke-width: 1.8px;" />
+                <line x1="13" y1="3" x2="16" y2="3" style="stroke: $planets_color_22; stroke-width: 1.8px;" />
+                <line x1="13" y1="3" x2="13" y2="6" style="stroke: $planets_color_22; stroke-width: 1.8px;" />
+            </g>
+        </symbol>
+        <symbol id="Sedna">
+            <g transform="translate(2,2)">
+                <line x1="10" y1="2" x2="10" y2="18" style="stroke: $planets_color_28; stroke-width: 1.8px;" />
+                <line x1="5" y1="2" x2="10" y2="7" style="stroke: $planets_color_28; stroke-width: 1.8px;" />
+                <line x1="15" y1="2" x2="10" y2="7" style="stroke: $planets_color_28; stroke-width: 1.8px;" />
+                <line x1="10" y1="2" x2="10" y2="7" style="stroke: $planets_color_28; stroke-width: 1.8px;" />
+                <path d="M 7,18 Q 10,16 13,18" style="stroke: $planets_color_28; stroke-width: 1.8px; fill: none;" />
+            </g>
+        </symbol>
+        <symbol id="Haumea">
+            <g transform="translate(2,2)">
+                <ellipse cx="10" cy="10" rx="6" ry="8" style="fill: none; stroke: $planets_color_29; stroke-width: 1.8px;" />
+                <line x1="10" y1="2" x2="10" y2="18" style="stroke: $planets_color_29; stroke-width: 1.8px;" />
+                <line x1="6" y1="10" x2="14" y2="10" style="stroke: $planets_color_29; stroke-width: 1.8px;" />
+                <circle cx="10" cy="6" r="1.5" style="fill: $planets_color_29;" />
+                <circle cx="10" cy="14" r="1.5" style="fill: $planets_color_29;" />
+            </g>
+        </symbol>
+        <symbol id="Makemake">
+            <g transform="translate(2,2)">
+                <circle cx="10" cy="6" r="4" style="fill: none; stroke: $planets_color_30; stroke-width: 1.8px;" />
+                <line x1="10" y1="10" x2="10" y2="18" style="stroke: $planets_color_30; stroke-width: 1.8px;" />
+                <line x1="6" y1="14" x2="14" y2="14" style="stroke: $planets_color_30; stroke-width: 1.8px;" />
+                <path d="M 6,18 L 10,15 L 14,18" style="stroke: $planets_color_30; stroke-width: 1.8px; fill: none;" />
+            </g>
+        </symbol>
+        <symbol id="Ixion">
+            <g transform="translate(2,2)">
+                <line x1="10" y1="2" x2="10" y2="18" style="stroke: $planets_color_31; stroke-width: 1.8px;" />
+                <line x1="3" y1="10" x2="17" y2="10" style="stroke: $planets_color_31; stroke-width: 1.8px;" />
+                <line x1="10" y1="2" x2="7" y2="5" style="stroke: $planets_color_31; stroke-width: 1.8px;" />
+                <line x1="10" y1="2" x2="13" y2="5" style="stroke: $planets_color_31; stroke-width: 1.8px;" />
+                <circle cx="10" cy="14" r="2" style="fill: none; stroke: $planets_color_31; stroke-width: 1.8px;" />
+            </g>
+        </symbol>
+        <symbol id="Orcus">
+            <g transform="translate(2,2)">
+                <line x1="10" y1="2" x2="10" y2="8" style="stroke: $planets_color_32; stroke-width: 1.8px;" />
+                <line x1="6" y1="5" x2="14" y2="5" style="stroke: $planets_color_32; stroke-width: 1.8px;" />
+                <path d="M 5,11 A 5,5 0 0,0 15,11" style="stroke: $planets_color_32; stroke-width: 1.8px; fill: none;" />
+                <line x1="5" y1="11" x2="15" y2="11" style="stroke: $planets_color_32; stroke-width: 1.8px;" />
+            </g>
+        </symbol>
+        <symbol id="Quaoar">
+            <g transform="translate(2,2)">
+                <circle cx="10" cy="7" r="4" style="fill: none; stroke: $planets_color_33; stroke-width: 1.8px;" />
+                <line x1="10" y1="11" x2="10" y2="17" style="stroke: $planets_color_33; stroke-width: 1.8px;" />
+                <path d="M 6,17 L 10,14 L 14,17" style="stroke: $planets_color_33; stroke-width: 1.8px; fill: none;" />
+                <line x1="7" y1="7" x2="4" y2="7" style="stroke: $planets_color_33; stroke-width: 1.8px;" />
+            </g>
+        </symbol>
+        <symbol id="Regulus">
+            <g transform="translate(2,2)">
+                <path d="M 10,2 L 11.5,6.5 L 16,7 L 12.5,10 L 13.5,14.5 L 10,12 L 6.5,14.5 L 7.5,10 L 4,7 L 8.5,6.5 Z" style="stroke: $planets_color_34; stroke-width: 1.5px; fill: none;" />
+                <line x1="10" y1="14.5" x2="10" y2="18" style="stroke: $planets_color_34; stroke-width: 1.8px;" />
+            </g>
+        </symbol>
+        <symbol id="Spica">
+            <g transform="translate(2,2)">
+                <path d="M 10,2 L 11.5,7 L 16.5,7.5 L 12.5,11 L 13.8,16 L 10,13.2 L 6.2,16 L 7.5,11 L 3.5,7.5 L 8.5,7 Z" style="stroke: $planets_color_35; stroke-width: 1.5px; fill: none;" />
+                <path d="M 7,16 Q 10,18 13,16" style="stroke: $planets_color_35; stroke-width: 1.8px; fill: none;" />
+            </g>
+        </symbol>
+        <symbol id="Anti_Vertex">
+            <g transform="translate(2,2)">
+                <circle cx="10" cy="10" r="7" style="fill: none; stroke: $planets_color_41; stroke-width: 1.8px;" />
+                <line x1="6" y1="6" x2="14" y2="14" style="stroke: $planets_color_41; stroke-width: 1.8px;" />
+                <line x1="14" y1="6" x2="6" y2="14" style="stroke: $planets_color_41; stroke-width: 1.8px;" />
+                <line x1="10" y1="17" x2="10" y2="13" style="stroke: $planets_color_41; stroke-width: 1.8px;" />
+                <line x1="10" y1="17" x2="7.5" y2="15" style="stroke: $planets_color_41; stroke-width: 1.8px;" />
+                <line x1="10" y1="17" x2="12.5" y2="15" style="stroke: $planets_color_41; stroke-width: 1.8px;" />
+            </g>
+        </symbol>
+
         <!-- Asteroids and additional points -->
         <symbol id="Ceres">
-            <g transform="translate(1,2)">
-                <path d="M 11.5,0.5 L 11.5,21.5 M 7.5,4 L 15.5,4 M 5,10 L 17,10"
-                    style="stroke: $planets_color_23; stroke-width: 2px; fill: none;" />
-                <circle cx="11.5" cy="15" r="5"
-                    style="stroke: $planets_color_23; stroke-width: 2px; fill: none;" />
+            <g transform="translate(2,1)">
+                <path d="M 6,5 C 6,2.5 8.5,1 11,1 C 13.5,1 16,2.5 16,5 C 16,8.5 12,9.5 11,13" style="stroke: $planets_color_23; stroke-width: 2px; fill: none;" />
+                <line x1="11" y1="13" x2="11" y2="21" style="stroke: $planets_color_23; stroke-width: 2px;" />
+                <line x1="6" y1="17" x2="16" y2="17" style="stroke: $planets_color_23; stroke-width: 2px;" />
+                <line x1="6" y1="21" x2="16" y2="21" style="stroke: $planets_color_23; stroke-width: 2px;" />
             </g>
         </symbol>
 
         <symbol id="Pallas">
-            <g transform="translate(1,2)">
-                <path d="M 11,0.5 L 11,21.5 M 6,6 L 16,6 M 4,12 L 18,12"
-                    style="stroke: $planets_color_24; stroke-width: 2px; fill: none;" />
+            <g transform="translate(2,1)">
+                <path d="M 11,1 L 15,5 L 11,9 L 7,5 Z" style="stroke: $planets_color_24; stroke-width: 2px; fill: none;" />
+                <line x1="11" y1="9" x2="11" y2="23" style="stroke: $planets_color_24; stroke-width: 2px;" />
+                <line x1="7" y1="15" x2="15" y2="15" style="stroke: $planets_color_24; stroke-width: 2px;" />
             </g>
         </symbol>
 
         <symbol id="Juno">
-            <g transform="translate(1,2)">
-                <path d="M 5,5 C 5,2 11,0 11,0 C 11,0 17,2 17,5 C 17,9 13,9 11,15 C 9,9 5,9 5,5 z M 7,18 L 15,18 M 11,15 L 11,21"
-                    style="stroke: $planets_color_25; stroke-width: 2px; fill: none;" />
+            <g transform="translate(2,1)">
+                <path d="M 11,1 L 13,5 L 17,6 L 13,7.5 L 11,12 L 9,7.5 L 5,6 L 9,5 Z" style="stroke: $planets_color_25; stroke-width: 2px; fill: none;" />
+                <line x1="11" y1="12" x2="11" y2="22" style="stroke: $planets_color_25; stroke-width: 2px;" />
+                <line x1="7" y1="18" x2="15" y2="18" style="stroke: $planets_color_25; stroke-width: 2px;" />
+                <line x1="7" y1="22" x2="15" y2="22" style="stroke: $planets_color_25; stroke-width: 2px;" />
             </g>
         </symbol>
 
         <symbol id="Vesta">
-            <g transform="translate(1,2)">
-                <path d="M 7,0.5 L 15,0.5 M 11,0.5 L 11,13 M 6,6 L 16,6 M 7,20 C 7,16 15,16 15,20 C 15,24 7,24 7,20 z"
-                    style="stroke: $planets_color_26; stroke-width: 2px; fill: none;" />
+            <g transform="translate(2,1)">
+                <path d="M 6,5 L 16,5" style="stroke: $planets_color_26; stroke-width: 2px;" />
+                <path d="M 11,1 L 8,5 L 14,5 Z" style="stroke: $planets_color_26; stroke-width: 2px; fill: none;" />
+                <line x1="11" y1="5" x2="11" y2="21" style="stroke: $planets_color_26; stroke-width: 2px;" />
+                <path d="M 6,15 Q 11,19 16,15" style="stroke: $planets_color_26; stroke-width: 2px; fill: none;" />
+                <line x1="6" y1="21" x2="16" y2="21" style="stroke: $planets_color_26; stroke-width: 2px;" />
             </g>
         </symbol>
 
         <symbol id="Vertex">
-            <text y="20" style="font-size: 22px; fill: $planets_color_40">Vx</text>
+            <g transform="translate(2,2)">
+                <circle cx="10" cy="10" r="8" style="fill: none; stroke: $planets_color_40; stroke-width: 2px;" />
+                <path d="M 5,5 L 10,16 L 15,5" style="stroke: $planets_color_40; stroke-width: 2px; fill: none;" />
+            </g>
         </symbol>
 
         <symbol id="East_Point">
-            <text y="20" style="font-size: 22px; fill: $planets_color_23">EP</text>
+            <g transform="translate(2,2)">
+                <circle cx="8" cy="10" r="6" style="fill: none; stroke: $planets_color_23; stroke-width: 2px;" />
+                <line x1="8" y1="6" x2="8" y2="14" style="stroke: $planets_color_23; stroke-width: 2px;" />
+                <line x1="5" y1="10" x2="14" y2="10" style="stroke: $planets_color_23; stroke-width: 2px;" />
+                <line x1="14" y1="10" x2="18" y2="6" style="stroke: $planets_color_23; stroke-width: 2px;" />
+                <line x1="14" y1="10" x2="18" y2="14" style="stroke: $planets_color_23; stroke-width: 2px;" />
+            </g>
         </symbol>
 
         <symbol id="True_Lilith">

kerykeion/schemas/chart_template_model.py

@@ -39,6 +39,33 @@ class ChartTemplateModel(SubscriptableBaseModel):
     makeHouseComparisonGrid: str
     """SVG markup for house comparison grid"""
 
+    full_wheel_translate_y: int
+    """Vertical translation for the full wheel group"""
+
+    houses_and_planets_translate_y: int
+    """Vertical translation for the houses and planets grid group"""
+
+    aspect_grid_translate_y: int
+    """Vertical translation for the aspect grid group"""
+
+    aspect_list_translate_y: int
+    """Vertical translation for the aspect list group"""
+
+    title_translate_y: int
+    """Vertical translation for the title and top-left text block"""
+
+    elements_translate_y: int
+    """Vertical translation for the elements summary block"""
+
+    qualities_translate_y: int
+    """Vertical translation for the qualities summary block"""
+
+    lunar_phase_translate_y: int
+    """Vertical translation for the lunar phase block"""
+
+    bottom_left_translate_y: int
+    """Vertical translation for the bottom-left info block"""
+
     chart_height: float
     """Chart height in pixels"""
 

kerykeion/settings/kr.config.json

@@ -46,7 +46,7 @@
             "last_quarter": "Last Quarter",
             "waning_crescent": "Waning Crescent",
             "houses": "Houses",
-            "domification": "domification",
+            "domification": "Domification",
             "houses_system_A": "Equal",
             "houses_system_B": "Alcabitius",
             "houses_system_C": "Campanus",
@@ -193,7 +193,7 @@
             "last_quarter": "Dernier Quartier",
             "waning_crescent": "Dernier Croissant",
             "houses": "Maisons",
-            "domification": "domification",
+            "domification": "Domification",
             "houses_system_A": "Égales",
             "houses_system_B": "Alcabitius",
             "houses_system_C": "Campanus",

{kerykeion-5.0.0b1.dist-info → kerykeion-5.0.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kerykeion
-Version: 5.0.0b1
+Version: 5.0.0b2
 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.0.0b1.dist-info → kerykeion-5.0.0b2.dist-info}/RECORD

@@ -14,11 +14,11 @@ kerykeion/aspects/__init__.py,sha256=csJmxvLdBu-bHuW676f3dpY__Qyc6LwRyrpWVTh3n1A
 kerykeion/aspects/aspects_factory.py,sha256=kli4YUhAQtnidD4icrmD6EeGnZ_jylDqOsXVkIMvQB4,23487
 kerykeion/aspects/aspects_utils.py,sha256=xIeu6cFsdX_Fbo_c2WPF4hga9YJLWGG5pwCqHX9Z4pU,5809
 kerykeion/charts/__init__.py,sha256=i9NMZ7LdkllPlqQSi1or9gTobHbROGDKmJhBDO4R0mA,128
-kerykeion/charts/chart_drawer.py,sha256=igzRogHJ3arKSa0EXiXhI03LnGnWsHLuM-gO0sdCHj4,108083
-kerykeion/charts/charts_utils.py,sha256=4R2pAa47-TcM7eYxXGri98u5sPJhl6YmmgdQTUUXGi8,64847
+kerykeion/charts/chart_drawer.py,sha256=LBOymQbdfj2JO-f6hDjU5FLZfzqGnUKbt7tDnsihbmc,110889
+kerykeion/charts/charts_utils.py,sha256=6eEIsBp2zTtgwfRiwyudZnACPshrhCHslONddGKQ-Kg,65550
 kerykeion/charts/draw_planets.py,sha256=tIj3FeLLomVSbCaZUxfw_qBEB3pxi4EIEhqaeTgTyTY,29061
 kerykeion/charts/templates/aspect_grid_only.xml,sha256=mSiSDnPmyysG7NzCQLhr1QxWafMNOGZ1R6_ABFaM7Jk,79706
-kerykeion/charts/templates/chart.xml,sha256=Cp8ZBOBrQAafk-H2_HHuxD3Cz7EZ4_l-DJ6_Y5oGAjk,84792
+kerykeion/charts/templates/chart.xml,sha256=Xezku381oaG1wuWeH_-gQ6NDQrR2rUEp0ZMrpDY6d9c,88449
 kerykeion/charts/templates/wheel_only.xml,sha256=NjhkExEZTE_le7002k7ewcCS4FoQij6H07jb5D9HVac,81047
 kerykeion/charts/themes/classic.css,sha256=xvBiI4DtY5fMaA7ilxGl26VEDY1VzkOTWm1XOs9n-ec,5158
 kerykeion/charts/themes/dark-high-contrast.css,sha256=EbmK9sM_ksJ5Fx36cb91nSvSsqC6mzjkRXCpwNTHfCE,8260
@@ -29,7 +29,7 @@ kerykeion/house_comparison/__init__.py,sha256=dnSVpx_pKylYUeaTGxHsSlN15HqQS6eJHp
 kerykeion/house_comparison/house_comparison_factory.py,sha256=YkA7itvkyIcKEf8Ffi53on-gGhsHi_Oeu9Gm4N9aHQs,4588
 kerykeion/house_comparison/house_comparison_utils.py,sha256=vzME6Aw5njCXu6BmPLuhgfEVDI00qfQI7MPH-YujO1g,5071
 kerykeion/schemas/__init__.py,sha256=CU1I1JanyY-0-Uq7oCHQT6wmmkOgfP0zZwHtCvF0W0g,2215
-kerykeion/schemas/chart_template_model.py,sha256=0JJ13jQ6UHvZPlg_6NH57GuL7Z0yXrd8VIWDBQvBnOE,8125
+kerykeion/schemas/chart_template_model.py,sha256=fQ_EZ8ccOgNd4gXu5KilF1dUH9B2RVCDLHc09YkYLyY,8978
 kerykeion/schemas/kerykeion_exception.py,sha256=vTYdwj_mL-Q-MqHJvEzzBXxQ5YI2kAwUC6ImoWxMKXc,454
 kerykeion/schemas/kr_literals.py,sha256=_GrBO9s0lfNDAk4oE4pf7DF7HEgAGTgklvlAn0SePuo,5119
 kerykeion/schemas/kr_models.py,sha256=C8Xo4uPxMfCUbKOBopKrbI8bSZzWVXImYsOJEZIlBjQ,22159
@@ -37,7 +37,7 @@ kerykeion/schemas/settings_models.py,sha256=NlOW9T7T5kD5Dzna1UOdb7XPQeQnzMOu0y4-
 kerykeion/settings/__init__.py,sha256=NYCwcvEfn9qJ498fv1H_Gix8e-crJ3CruV13A-e2CnI,134
 kerykeion/settings/config_constants.py,sha256=mLpWtL46iXFp0pYDaVtKRBzGbl3rZKj3XxjIM88DYRQ,3790
 kerykeion/settings/kerykeion_settings.py,sha256=jesmjfeDU6t-aNyXmzqfMGHBEATk7tenWkQT8cox-FY,2954
-kerykeion/settings/kr.config.json,sha256=Ap_EE98RT957AXNmj2LWr1fmVMf9NO2_jCpAthHPmHs,62094
+kerykeion/settings/kr.config.json,sha256=e8g285TI_ZGu2LfwUhBP4W0TDQkaqflmzUhpTWf9LZE,62094
 kerykeion/settings/legacy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kerykeion/settings/legacy/legacy_celestial_points_settings.py,sha256=RsGmX10cO1jw2W3IwK1OBnzzgaI3nUiFIYHeoYtjapw,6942
 kerykeion/settings/legacy/legacy_chart_aspects_settings.py,sha256=tO4tgPgPP07_wu9f8SXyJQ9WrTh3iWz4YvBS2axCGU8,1650
@@ -52,7 +52,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.0.0b1.dist-info/METADATA,sha256=RNXJbBmkMbDOdmp3tlKu2KPy_b0iYzlJ_t3g9ZGJnck,40219
-kerykeion-5.0.0b1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kerykeion-5.0.0b1.dist-info/licenses/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-5.0.0b1.dist-info/RECORD,,
+kerykeion-5.0.0b2.dist-info/METADATA,sha256=SLIsNoZE6AWBza5G-6CV4_jbxkQBbfPLtDNJThrs848,40219
+kerykeion-5.0.0b2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kerykeion-5.0.0b2.dist-info/licenses/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-5.0.0b2.dist-info/RECORD,,