kerykeion 4.14.11__py3-none-any.whl → 4.15.0__py3-none-any.whl

kerykeion/charts/charts_utils.py

@@ -1,7 +1,7 @@
 import math
 import datetime
 from kerykeion.kr_types import KerykeionException, ChartType
-from typing import Union
+from typing import Union, Literal
 from kerykeion.kr_types.kr_models import AspectModel, KerykeionPointModel
 from kerykeion.kr_types.settings_models import KerykeionLanguageCelestialPointModel, KerykeionSettingsAspectModel
 
@@ -314,46 +314,43 @@ def draw_elements_percentages(
 
     return (
         f'<g transform="translate(-30,79)">'
-        f'<text y="0" style="fill:#ff6600; font-size: 10px;">{fire_label}  {str(fire_percentage)}%</text>'
-        f'<text y="12" style="fill:#6a2d04; font-size: 10px;">{earth_label} {str(earth_percentage)}%</text>'
-        f'<text y="24" style="fill:#6f76d1; font-size: 10px;">{air_label}   {str(air_percentage)}%</text>'
-        f'<text y="36" style="fill:#630e73; font-size: 10px;">{water_label} {str(water_percentage)}%</text>'
+        f'<text y="0" style="fill: var(--kerykeion-chart-color-fire-percentage); font-size: 10px;">{fire_label}  {str(fire_percentage)}%</text>'
+        f'<text y="12" style="fill: var(--kerykeion-chart-color-earth-percentage); font-size: 10px;">{earth_label} {str(earth_percentage)}%</text>'
+        f'<text y="24" style="fill: var(--kerykeion-chart-color-air-percentage); font-size: 10px;">{air_label}   {str(air_percentage)}%</text>'
+        f'<text y="36" style="fill: var(--kerykeion-chart-color-water-percentage); font-size: 10px;">{water_label} {str(water_percentage)}%</text>'
         f"</g>"
     )
 
 
-def convert_decimal_to_degree_string(dec: float, type="3") -> str:
+def convert_decimal_to_degree_string(dec: float, format_type: Literal["1", "2", "3"] = "3") -> str:
     """
-    Coverts decimal float to degrees in format a°b'c".
+    Converts a decimal float to a degrees string in the specified format.
 
     Args:
-        - dec (float): decimal float
-        - type (str): type of format:
-            - 1: a°
-            - 2: a°b'
-            - 3: a°b'c"
+        dec (float): The decimal float to convert.
+        format_type (str): The format type:
+            - "1": a°
+            - "2": a°b'
+            - "3": a°b'c" (default)
 
     Returns:
-        str: degrees in format a°b'c"
+        str: The degrees string in the specified format.
     """
-
+    # Ensure the input is a float
     dec = float(dec)
-    a = int(dec)
-    a_new = (dec - float(a)) * 60.0
-    b_rounded = int(round(a_new))
-    b = int(a_new)
-    c = int(round((a_new - float(b)) * 60.0))
-
-    if type == "3":
-        out = f"{a:02d}&#176;{b:02d}&#39;{c:02d}&#34;"
-    elif type == "2":
-        out = f"{a:02d}&#176;{b_rounded:02d}&#39;"
-    elif type == "1":
-        out = f"{a:02d}&#176;"
-    else:
-        raise KerykeionException(f"Wrong type: {type}, it must be 1, 2 or 3.")
 
-    return str(out)
+    # Calculate degrees, minutes, and seconds
+    degrees = int(dec)
+    minutes = int((dec - degrees) * 60)
+    seconds = int(round((dec - degrees - minutes / 60) * 3600))
+
+    # Format the output based on the specified type
+    if format_type == "1":
+        return f"{degrees}°"
+    elif format_type == "2":
+        return f"{degrees}°{minutes:02d}'"
+    elif format_type == "3":
+        return f"{degrees}°{minutes:02d}'{seconds:02d}\""
 
 
 def draw_transit_ring_degree_steps(r: Union[int, float], seventh_house_degree_ut: Union[int, float]) -> str:
@@ -675,7 +672,7 @@ def draw_houses_cusps_and_text_number(
 
         # Add the house number text for the first subject
         path += f'<g kr:node="HouseNumber">'
-        path += f'<text style="fill: #f00; fill-opacity: .6; font-size: 14px"><tspan x="{xtext - 3}" y="{ytext + 3}">{i + 1}</tspan></text>'
+        path += f'<text style="fill: var(--kerykeion-chart-color-house-number); fill-opacity: .6; font-size: 14px"><tspan x="{xtext - 3}" y="{ytext + 3}">{i + 1}</tspan></text>'
         path += f"</g>"
 
     return path
@@ -765,10 +762,7 @@ def draw_aspect_transit_grid(
 
 def draw_moon_phase(
     degrees_between_sun_and_moon: float,
-    latitude: float,
-    lunar_phase_outline_color: str = "#000000",
-    dark_color: str = "#000000",
-    light_color: str = "#ffffff",
+    latitude: float
 ) -> str:
     """
     Draws the moon phase based on the degrees between the sun and the moon.
@@ -786,8 +780,6 @@ def draw_moon_phase(
     deg = degrees_between_sun_and_moon
 
     # Initialize variables for lunar phase properties
-    fill_color_foreground = None
-    fill_color_background = None
     circle_center_x = None
     circle_radius = None
 
@@ -798,8 +790,6 @@ def draw_moon_phase(
             max_radius = max_radius * max_radius
         circle_center_x = 20.0 + (deg / 90.0) * (max_radius + 10.0)
         circle_radius = 10.0 + (deg / 90.0) * max_radius
-        fill_color_foreground = dark_color
-        fill_color_background = light_color
 
     elif deg < 180.0:
         max_radius = 180.0 - deg
@@ -807,8 +797,6 @@ def draw_moon_phase(
             max_radius = max_radius * max_radius
         circle_center_x = 20.0 + ((deg - 90.0) / 90.0 * (max_radius + 10.0)) - (max_radius + 10.0)
         circle_radius = 10.0 + max_radius - ((deg - 90.0) / 90.0 * max_radius)
-        fill_color_foreground = light_color
-        fill_color_background = dark_color
 
     elif deg < 270.0:
         max_radius = deg - 180.0
@@ -816,8 +804,6 @@ def draw_moon_phase(
             max_radius = max_radius * max_radius
         circle_center_x = 20.0 + ((deg - 180.0) / 90.0 * (max_radius + 10.0))
         circle_radius = 10.0 + ((deg - 180.0) / 90.0 * max_radius)
-        fill_color_foreground = light_color
-        fill_color_background = dark_color
 
     elif deg < 361.0:
         max_radius = 360.0 - deg
@@ -825,8 +811,6 @@ def draw_moon_phase(
             max_radius = max_radius * max_radius
         circle_center_x = 20.0 + ((deg - 270.0) / 90.0 * (max_radius + 10.0)) - (max_radius + 10.0)
         circle_radius = 10.0 + max_radius - ((deg - 270.0) / 90.0 * max_radius)
-        fill_color_foreground = dark_color
-        fill_color_background = light_color
 
     else:
         raise KerykeionException(f"Invalid degree value: {deg}")
@@ -843,9 +827,9 @@ def draw_moon_phase(
         f'        <circle cx="20" cy="10" r="10" />'
         f'        </clipPath>'
         f'    </defs>'
-        f'    <circle cx="20" cy="10" r="10" style="fill: {fill_color_background}" />'
-        f'    <circle cx="{circle_center_x}" cy="10" r="{circle_radius}" style="fill: {fill_color_foreground}" clip-path="url(#moonPhaseCutOffCircle)" />'
-        f'    <circle cx="20" cy="10" r="10" style="fill: none; stroke: {lunar_phase_outline_color}; stroke-width: 0.5px; stroke-opacity: 0.5" />'
+        f'    <circle cx="20" cy="10" r="10" style="fill: var(--kerykeion-chart-color-lunar-phase-0)" />'
+        f'    <circle cx="{circle_center_x}" cy="10" r="{circle_radius}" style="fill: var(--kerykeion-chart-color-lunar-phase-1)" clip-path="url(#moonPhaseCutOffCircle)" />'
+        f'    <circle cx="20" cy="10" r="10" style="fill: none; stroke: var(--kerykeion-chart-color-lunar-phase-0); stroke-width: 0.5px; stroke-opacity: 0.5" />'
         f'</g>'
     )
 

kerykeion/charts/color_style_tags.py

@@ -0,0 +1,86 @@
+DEFAULT_COLOR_STYLE_TAG = """
+<style>
+    :root {
+        /* Main Colors */
+        --kerykeion-chart-color-paper-0: #000000;
+        --kerykeion-chart-color-paper-1: #ffffff;
+        --kerykeion-chart-color-zodiac-bg-0: #ff7200;
+        --kerykeion-chart-color-zodiac-bg-1: #6b3d00;
+        --kerykeion-chart-color-zodiac-bg-2: #69acf1;
+        --kerykeion-chart-color-zodiac-bg-3: #2b4972;
+        --kerykeion-chart-color-zodiac-bg-4: #ff7200;
+        --kerykeion-chart-color-zodiac-bg-5: #6b3d00;
+        --kerykeion-chart-color-zodiac-bg-6: #69acf1;
+        --kerykeion-chart-color-zodiac-bg-7: #2b4972;
+        --kerykeion-chart-color-zodiac-bg-8: #ff7200;
+        --kerykeion-chart-color-zodiac-bg-9: #6b3d00;
+        --kerykeion-chart-color-zodiac-bg-10: #69acf1;
+        --kerykeion-chart-color-zodiac-bg-11: #2b4972;
+        --kerykeion-chart-color-zodiac-icon-0: #ff7200;
+        --kerykeion-chart-color-zodiac-icon-1: #6b3d00;
+        --kerykeion-chart-color-zodiac-icon-2: #69acf1;
+        --kerykeion-chart-color-zodiac-icon-3: #2b4972;
+        --kerykeion-chart-color-zodiac-icon-4: #ff7200;
+        --kerykeion-chart-color-zodiac-icon-5: #6b3d00;
+        --kerykeion-chart-color-zodiac-icon-6: #69acf1;
+        --kerykeion-chart-color-zodiac-icon-7: #2b4972;
+        --kerykeion-chart-color-zodiac-icon-8: #ff7200;
+        --kerykeion-chart-color-zodiac-icon-9: #6b3d00;
+        --kerykeion-chart-color-zodiac-icon-10: #69acf1;
+        --kerykeion-chart-color-zodiac-icon-11: #2b4972;
+        --kerykeion-chart-color-zodiac-radix-ring-0: #ff0000;
+        --kerykeion-chart-color-zodiac-radix-ring-1: #ff0000;
+        --kerykeion-chart-color-zodiac-radix-ring-2: #ff0000;
+        --kerykeion-chart-color-zodiac-transit-ring-0: #ff0000;
+        --kerykeion-chart-color-zodiac-transit-ring-1: #ff0000;
+        --kerykeion-chart-color-zodiac-transit-ring-2: #0000ff;
+        --kerykeion-chart-color-zodiac-transit-ring-3: #0000ff;
+        --kerykeion-chart-color-houses-radix-line: #ff0000;
+        --kerykeion-chart-color-houses-transit-line: #0000ff;
+        --kerykeion-chart-color-lunar-phase-0: #000000;
+        --kerykeion-chart-color-lunar-phase-1: #ffffff;
+
+        /* Aspects */
+        --kerykeion-chart-color-conjunction: #5757e2;
+        --kerykeion-chart-color-semi-sextile: #810757;
+        --kerykeion-chart-color-semi-square: #b14e58;
+        --kerykeion-chart-color-sextile: #d59e28;
+        --kerykeion-chart-color-quintile: #1f99b3;
+        --kerykeion-chart-color-square: #dc0000;
+        --kerykeion-chart-color-trine: #36d100;
+        --kerykeion-chart-color-sesquiquadrate: #985a10;
+        --kerykeion-chart-color-biquintile: #7a9810;
+        --kerykeion-chart-color-quincunx: #26bbcf;
+        --kerykeion-chart-color-opposition: #510060;
+
+        /* Planets */
+        --kerykeion-chart-color-sun: #984b00;
+        --kerykeion-chart-color-moon: #150052;
+        --kerykeion-chart-color-mercury: #520800;
+        --kerykeion-chart-color-venus: #400052;
+        --kerykeion-chart-color-mars: #540000;
+        --kerykeion-chart-color-jupiter: #47133d;
+        --kerykeion-chart-color-saturn: #124500;
+        --kerykeion-chart-color-uranus: #6f0766;
+        --kerykeion-chart-color-neptune: #06537f;
+        --kerykeion-chart-color-pluto: #713f04;
+        --kerykeion-chart-color-mean-node: #4c1541;
+        --kerykeion-chart-color-true-node: #4c1541;
+        --kerykeion-chart-color-chiron: #666f06;
+        --kerykeion-chart-color-first-house: #ff7e00;
+        --kerykeion-chart-color-tenth-house: #ff0000;
+        --kerykeion-chart-color-seventh-house: #0000ff;
+        --kerykeion-chart-color-fourth-house: #000000;
+        --kerykeion-chart-color-mean-lilith: #000000;
+
+        /* Elements Percentage */
+        --kerykeion-chart-color-air-percentage: #6f76d1;
+        --kerykeion-chart-color-earth-percentage: #6a2d04;
+        --kerykeion-chart-color-fire-percentage: #ff6600;
+        --kerykeion-chart-color-water-percentage: #630e73;
+
+        /* Other */
+        --kerykeion-chart-color-house-number: #f00;
+    }
+</style>
+"""

kerykeion/charts/draw_planets.py

@@ -375,7 +375,7 @@ def draw_planets(
             degree = int(t_offset)
             output += f'<g transform="translate({deg_x},{deg_y})">'
             output += f'<text transform="rotate({rotate})" text-anchor="{textanchor}'
-            output += f'" style="fill: {available_planets_setting[i]["color"]}; font-size: 10px;">{convert_decimal_to_degree_string(t_points_deg[i], type="1")}'
+            output += f'" style="fill: {available_planets_setting[i]["color"]}; font-size: 10px;">{convert_decimal_to_degree_string(t_points_deg[i], format_type="1")}'
             output += "</text></g>"
 
         # check transit

kerykeion/charts/kerykeion_chart_svg.py

@@ -36,6 +36,7 @@ from kerykeion.charts.charts_utils import (
 )
 from kerykeion.charts.draw_planets import draw_planets # type: ignore
 from kerykeion.utilities import get_houses_list
+from kerykeion.charts.color_style_tags import DEFAULT_COLOR_STYLE_TAG
 from pathlib import Path
 from scour.scour import scourString
 from string import Template
@@ -103,6 +104,7 @@ class KerykeionChartSVG:
         second_obj: Union[AstrologicalSubject, AstrologicalSubjectModel, None] = None,
         new_output_directory: Union[str, None] = None,
         new_settings_file: Union[Path, None] = None,
+        color_style_tag: str = DEFAULT_COLOR_STYLE_TAG
     ):
         # Directories:
         self.homedir = Path.home()
@@ -184,6 +186,9 @@ class KerykeionChartSVG:
         self.air = 0.0
         self.water = 0.0
 
+        # Color style tag
+        self.color_style_tag = color_style_tag
+
         # Calculate element points from planets
         self._calculate_elements_points_from_planets()
 
@@ -325,6 +330,9 @@ class KerykeionChartSVG:
         # Initialize template dictionary
         template_dict: ChartTemplateDictionary = dict()  # type: ignore
 
+        # Set the color style tag
+        template_dict["color_style_tag"] = self.color_style_tag
+
         # Set chart dimensions
         template_dict["chart_height"] = self.height
         template_dict["chart_width"] = self.width
@@ -376,7 +384,10 @@ class KerykeionChartSVG:
             template_dict["bottomLeft4"] = f'{self.t_user.perspective_type}'
 
         # Draw moon phase
-        template_dict['moon_phase'] = draw_moon_phase(self.user.lunar_phase["degrees_between_s_m"], self.geolat)
+        template_dict['moon_phase'] = draw_moon_phase(
+            self.user.lunar_phase["degrees_between_s_m"], 
+            self.geolat
+        )
 
         # Set location string
         if len(self.location) > 35:

kerykeion/charts/templates/chart.xml

@@ -10,6 +10,10 @@
     preserveAspectRatio="xMidYMid"
 >
     <title>$stringTitle | Kerykeion</title>
+
+    <!-- Colors -->
+    $color_style_tag
+
     <!--- Main Chart -->
     <g kr:node="Main_Chart">
 
@@ -29,73 +33,73 @@
             <text x="20" y="508" style="fill: $paper_color_0; font-size: 10px">$bottomLeft4</text>
         </g>
 
-        <!-- Lunar Phase -->
+            <!-- Lunar Phase -->
         <g kr:node="Lunar_Phase" transform="translate(20,518)">
             $moon_phase
         </g>
 
         <g kr:node="Main_Content" transform="translate(50,50)">
-            <!-- Zodiac -->
+                <!-- Zodiac -->
             <g kr:node="Zodiac">
                 $makeZodiac 
             </g>
 
-            <!-- First Circle -->
+                <!-- First Circle -->
             <g kr:node="First_Circle">
                 $first_circle
             </g>
 
-            <!-- Second Circle -->
+                <!-- Second Circle -->
             <g kr:node="Second_Circle">
                 $second_circle
             </g>
 
-            <!-- Third Circle -->
+                <!-- Third Circle -->
             <g kr:node="Third_Circle">
                 $third_circle
             </g>
 
-            <!-- Transit_Ring -->
+                <!-- Transit_Ring -->
             <g kr:node="Transint_Ring">
                 $transitRing 
             </g>
 
-            <!-- Degree Ring -->
+                <!-- Degree Ring -->
             <g kr:node="Degree_Ring">
                 $degreeRing
             </g>
 
-            <!-- Houses -->
+                <!-- Houses -->
             <g kr:node="Houses_Wheel">
                 $makeHouses
             </g>
 
-            <!-- Planets -->
+                <!-- Planets -->
             <g kr:node="Planets_Wheel">
                 $makePlanets
             </g>
 
-            <!-- Aspects -->
+                <!-- Aspects -->
             <g kr:node="Aspects_Wheel">
                 $makeAspects
             </g>
 
-            <!-- AspectGrid -->
+                <!-- AspectGrid -->
             <g kr:node="Aspect_Grid">
                 $makeAspectGrid
             </g>
 
-            <!-- Elements -->
+                <!-- Elements -->
             <g kr:node="Elements_Percentages">
                 $elements_percentages 
             </g>
 
-            <!-- Planet Grid -->
+                <!-- Planet Grid -->
             <g kr:node="Planet_Grid">
                 $makePlanetGrid
             </g>
 
-            <!-- Houses Grid -->
+                <!-- Houses Grid -->
             <g kr:node="Houses_Grid">
                 $makeHousesGrid
             </g>
@@ -103,9 +107,9 @@
         
     </g>
 
-    <!-- Symbols Definitions -->
+        <!-- Symbols Definitions -->
     <defs>
-        <!-- Planets (24x24) -->
+            <!-- Planets (24x24) -->
         <symbol id="Sun">
             <g transform="translate(1,4)">
                 <circle cx="10" cy="10" r="9"
@@ -251,7 +255,7 @@
         <symbol id="Fourth_House">
             <text y="20" style="font-size: 22px; fill: $planets_color_15">Ic</text>
         </symbol>
-        <!-- Zodiac -->
+            <!-- Zodiac -->
         <symbol id="Ari">
             <path
                 d="M 14.833536,31 C 14.832186,29.72825 14.845936,28.45584 14.780346,27.18523 C 14.640926,24.23046 14.271927,21.28979 13.761657,18.3776 C 13.321987,15.91911 12.787787,13.46983 11.990517,11.10075 C 11.530267,9.76243 10.992887,8.44912 10.357087,7.1849 C 9.7764065,6.054 9.1143465,4.94296 8.2160065,4.03494 C 7.6282465,3.4465 6.9007265,2.94535 6.0649765,2.81624 C 5.3237266,2.70142 4.5304666,2.87571 3.9356966,3.34384 C 3.2136565,3.90519 2.7654365,4.75625 2.5438365,5.63289 C 2.3053765,6.59995 2.2959765,7.61358 2.4292165,8.5973 C 2.6464465,10.15587 3.2689665,11.63258 4.0815466,12.96908 C 3.2924465,12.96908 2.5033465,12.96908 1.7142465,12.96908 C 0.89724651,11.48481 0.25799651,9.87299 0.060256514,8.17899 C -0.071203486,7.00695 0.0037165138,5.79903 0.37149651,4.67421 C 0.76442651,3.47499 1.5195865,2.3932 2.5232565,1.6304 C 3.2809665,1.05478 4.2059366,0.71268 5.1519466,0.63781 C 6.1938265,0.54496 7.2610465,0.74619 8.1909265,1.22976 C 9.3998665,1.85021 10.363677,2.85944 11.145277,3.95766 C 12.190347,5.44147 12.965067,7.10101 13.584287,8.80382 C 14.630766,11.7176 15.212626,14.77861 15.575146,17.84795 C 15.664836,18.61648 15.739556,19.38675 15.801446,20.15803 C 15.933606,20.15803 16.065776,20.15803 16.197936,20.15803 C 16.431516,16.78332 16.919066,13.40761 17.920236,10.17029 C 18.536746,8.19886 19.343216,6.2733 20.460106,4.53209 C 21.232966,3.34246 22.178396,2.22691 23.393236,1.47473 C 24.303946,0.906 25.375406,0.59315 26.449836,0.61744 C 27.406076,0.6265 28.366336,0.88414 29.173386,1.40571 C 29.918276,1.88417 30.536726,2.54825 31.007306,3.29688 C 31.640376,4.30981 31.942786,5.5036 31.990526,6.69149 C 32.064366,8.24898 31.700306,9.79841 31.118136,11.23409 C 30.878056,11.82774 30.600746,12.40584 30.296796,12.96908 C 29.503806,12.96908 28.710826,12.96908 27.917836,12.96908 C 28.695646,11.56825 29.330906,10.06044 29.565756,8.46485 C 29.705436,7.49053 29.689976,6.48739 29.469736,5.52616 C 29.266586,4.67296 28.870956,3.83354 28.201276,3.25079 C 27.718386,2.82263 27.078466,2.59021 26.436216,2.58446 C 25.680306,2.56059 24.950086,2.87303 24.358336,3.32879 C 23.494556,3.99307 22.844986,4.89198 22.282956,5.81679 C 21.451756,7.21072 20.811436,8.71018 20.250396,10.23124 C 19.437586,12.49802 18.893326,14.85166 18.440286,17.21432 C 17.839016,20.40325 17.413216,23.6291 17.246136,26.8715 C 17.183796,28.01857 17.173966,29.16745 17.177516,30.31595 C 17.177516,30.54397 17.177516,30.77198 17.177516,31 C 16.396186,31 15.614856,31 14.833536,31 z"
@@ -324,7 +328,7 @@
                 style="fill: $zodiac_color_11"
             />
         </symbol>
-        <!-- Aspects 12x12 -->
+            <!-- Aspects 12x12 -->
         <symbol id="orb0">
             <path
                 d="M 6.0697539,7.3234852 C 6.0697539,8.7354882 4.9173651,9.8801442 3.4958214,9.8801442 C 2.0742775,9.8801442 0.92188857,8.7354882 0.92188857,7.3234852 C 0.92188857,5.9114822 2.0742775,4.7668272 3.4958214,4.7668272 C 4.9173651,4.7668272 6.0697539,5.9114822 6.0697539,7.3234852 L 6.0697539,7.3234852 z M 5.6252609,5.2113202 C 10.07019,0.76639018 10.07019,0.76639018 10.07019,0.76639018"
@@ -522,7 +526,7 @@
                         "
             />
         </symbol>
-        <!-- retrograde symbol (12x12) -->
+            <!-- retrograde symbol (12x12) -->
         <symbol id="retrograde">
             <path
                 d="M 5.1695089,0.06514307 C 3.7597989,0.21597207 2.3317349,0.33149007 0.91358191,0.23513107 C 1.5490329,0.81902207 1.4024849,1.7100011 1.4228379,2.4700431 C 1.4174159,5.2174481 1.4337709,7.9652731 1.4145019,10.712411 C 1.5149409,11.170848 0.96799791,11.834471 0.90284691,11.964302 C 1.9976889,11.964302 3.0925299,11.964302 4.1873719,11.964302 C 3.6018439,11.577975 3.6510929,10.820034 3.6417399,10.219838 C 3.6417399,8.8974601 3.6417399,7.5750831 3.6417399,6.2527051 C 4.5026259,7.3972911 5.3635109,8.5418771 6.2243959,9.6864631 C 5.6030699,10.013049 5.0721439,10.497354 4.3692489,10.672393 C 4.5753769,10.955706 4.7815039,11.23902 4.9876319,11.522333 C 5.4939219,11.018036 6.1426389,10.672218 6.7336529,10.264421 C 7.3897039,11.216912 8.4697479,12.048392 9.7419399,12.011579 C 10.143603,12.002199 11.067691,11.885824 11.063775,11.676075 C 9.9004969,11.128054 9.0018849,10.179085 8.4069229,9.1085041 C 8.9670439,8.6756641 9.5056289,8.1870051 10.177382,7.9086731 C 10.419881,7.8661501 10.031668,7.5763571 9.9815039,7.4190951 C 9.7896089,6.9062931 9.6214379,7.4694661 9.2950839,7.6239451 C 8.8453989,7.8927681 8.3078839,8.3646011 7.8614459,8.4454351 C 7.2551369,7.5898671 6.6488279,6.7342991 6.0425199,5.8787321 C 7.2451939,5.6174351 8.5827839,5.0853891 9.0704409,3.9368981 C 9.4063139,3.1120211 9.2637339,2.1667931 8.9107889,1.3734701 C 8.1684869,0.41091107 6.8692049,-0.072451931 5.6199729,0.02510607 C 5.4693279,0.03287207 5.3190519,0.04651007 5.1695089,0.06514307 L 5.1695089,0.06514307 z M 4.0054949,0.98307806 C 4.9274209,0.87516007 6.0752839,0.95659406 6.6119469,1.7769821 C 7.1995489,2.7436231 6.9771779,4.0277241 6.2388859,4.8694001 C 5.6053289,5.5549031 4.5521059,5.6780771 3.6417399,5.5727531 C 3.6417399,4.0655271 3.6417399,2.5583001 3.6417399,1.0510731 C 3.7629919,1.0284081 3.8842429,1.0057431 4.0054949,0.98307806 z"

kerykeion/kr_types/chart_types.py

@@ -84,3 +84,5 @@ class ChartTemplateDictionary(TypedDict):
     elements_percentages: str
     makePlanetGrid: str
     makeHousesGrid: str
+
+    color_style_tag: str

kerykeion/kr_types/settings_models.py

@@ -68,7 +68,6 @@ class KerykeionSettingsChartColorsModel(SubscriptableBaseModel):
     # Deprecated: Not used anymore
     lunar_phase_0: str = Field(title="Lunar Phase Color 0", description="Lunar Phase Color 0")
     lunar_phase_1: str = Field(title="Lunar Phase Color 1", description="Lunar Phase Color 1")
-    lunar_phase_2: str = Field(title="Lunar Phase Color 2", description="Lunar Phase Color 2")
 
 
 # Aspect Settings

kerykeion/settings/kr.config.json

@@ -220,7 +220,7 @@
       "is_major": 1,
       "is_minor": 0,
       "orb": 10,
-      "color": "#5757e2"
+      "color": "var(--kerykeion-chart-color-conjunction)"
     },
     {
       "degree": 30,
@@ -230,7 +230,7 @@
       "is_major": 0,
       "is_minor": 1,
       "orb": 1,
-      "color": "#810757"
+      "color": "var(--kerykeion-chart-color-semi-sextile)"
     },
     {
       "degree": 45,
@@ -240,7 +240,7 @@
       "is_major": 0,
       "is_minor": 1,
       "orb": 1,
-      "color": "#b14e58"
+      "color": "var(--kerykeion-chart-color-semi-square)"
     },
     {
       "degree": 60,
@@ -250,7 +250,7 @@
       "is_major": 1,
       "is_minor": 0,
       "orb": 6,
-      "color": "#d59e28"
+      "color": "var(--kerykeion-chart-color-sextile)"
     },
     {
       "degree": 72,
@@ -260,7 +260,7 @@
       "is_major": 0,
       "is_minor": 1,
       "orb": 1,
-      "color": "#1f99b3"
+      "color": "var(--kerykeion-chart-color-quintile)"
     },
     {
       "degree": 90,
@@ -270,7 +270,7 @@
       "is_major": 1,
       "is_minor": 0,
       "orb": 5,
-      "color": "#dc0000"
+      "color": "var(--kerykeion-chart-color-square)"
     },
     {
       "degree": 120,
@@ -280,7 +280,7 @@
       "is_major": 1,
       "is_minor": 0,
       "orb": 8,
-      "color": "#36d100"
+      "color": "var(--kerykeion-chart-color-trine)"
     },
     {
       "degree": 135,
@@ -290,7 +290,7 @@
       "is_major": 0,
       "is_minor": 1,
       "orb": 1,
-      "color": "#985a10"
+      "color": "var(--kerykeion-chart-color-sesquiquadrate)"
     },
     {
       "degree": 144,
@@ -300,7 +300,7 @@
       "is_major": 0,
       "is_minor": 1,
       "orb": 1,
-      "color": "#7a9810"
+      "color": "var(--kerykeion-chart-color-biquintile)"
     },
     {
       "degree": 150,
@@ -310,7 +310,7 @@
       "is_major": 0,
       "is_minor": 0,
       "orb": 1,
-      "color": "#26bbcf"
+      "color": "var(--kerykeion-chart-color-quincunx)"
     },
     {
       "degree": 180,
@@ -320,14 +320,14 @@
       "is_major": 1,
       "is_minor": 0,
       "orb": 10,
-      "color": "#510060"
+      "color": "var(--kerykeion-chart-color-opposition)"
     }
   ],
   "celestial_points": [
     {
       "id": 0,
       "name": "Sun",
-      "color": "#984b00",
+      "color": "var(--kerykeion-chart-color-sun)",
       "is_active": true,
       "element_points": 40,
       "related_zodiac_signs": ["4"],
@@ -336,7 +336,7 @@
     {
       "id": 1,
       "name": "Moon",
-      "color": "#150052",
+      "color": "var(--kerykeion-chart-color-moon)",
       "is_active": true,
       "element_points": 40,
       "related_zodiac_signs": ["3"],
@@ -345,7 +345,7 @@
     {
       "id": 2,
       "name": "Mercury",
-      "color": "#520800",
+      "color": "var(--kerykeion-chart-color-mercury)",
       "is_active": true,
       "element_points": 15,
       "related_zodiac_signs": ["2", "5"],
@@ -354,7 +354,7 @@
     {
       "id": 3,
       "name": "Venus",
-      "color": "#400052",
+      "color": "var(--kerykeion-chart-color-venus)",
       "is_active": true,
       "element_points": 15,
       "related_zodiac_signs": ["1", "6"],
@@ -363,7 +363,7 @@
     {
       "id": 4,
       "name": "Mars",
-      "color": "#540000",
+      "color": "var(--kerykeion-chart-color-mars)",
       "is_active": true,
       "element_points": 15,
       "related_zodiac_signs": ["0"],
@@ -372,7 +372,7 @@
     {
       "id": 5,
       "name": "Jupiter",
-      "color": "#47133d",
+      "color": "var(--kerykeion-chart-color-jupiter)",
       "is_active": true,
       "element_points": 10,
       "related_zodiac_signs": ["8"],
@@ -381,7 +381,7 @@
     {
       "id": 6,
       "name": "Saturn",
-      "color": "#124500",
+      "color": "var(--kerykeion-chart-color-saturn)",
       "is_active": true,
       "element_points": 10,
       "related_zodiac_signs": ["9"],
@@ -390,7 +390,7 @@
     {
       "id": 7,
       "name": "Uranus",
-      "color": "#6f0766",
+      "color": "var(--kerykeion-chart-color-uranus)",
       "is_active": true,
       "element_points": 10,
       "related_zodiac_signs": ["10"],
@@ -399,7 +399,7 @@
     {
       "id": 8,
       "name": "Neptune",
-      "color": "#06537f",
+      "color": "var(--kerykeion-chart-color-neptune)",
       "is_active": true,
       "element_points": 10,
       "related_zodiac_signs": ["11"],
@@ -408,7 +408,7 @@
     {
       "id": 9,
       "name": "Pluto",
-      "color": "#713f04",
+      "color": "var(--kerykeion-chart-color-pluto)",
       "is_active": true,
       "element_points": 10,
       "related_zodiac_signs": ["7"],
@@ -417,7 +417,7 @@
     {
       "id": 10,
       "name": "Mean_Node",
-      "color": "#4c1541",
+      "color": "var(--kerykeion-chart-color-mean-node)",
       "is_active": false,
       "element_points": 0,
       "related_zodiac_signs": [],
@@ -426,7 +426,7 @@
     {
       "id": 11,
       "name": "True_Node",
-      "color": "#4c1541",
+      "color": "var(--kerykeion-chart-color-true-node)",
       "is_active": true,
       "element_points": 20,
       "related_zodiac_signs": [],
@@ -435,7 +435,7 @@
     {
       "id": 12,
       "name": "Chiron",
-      "color": "#666f06",
+      "color": "var(--kerykeion-chart-color-chiron)",
       "is_active": true,
       "element_points": 0,
       "related_zodiac_signs": [],
@@ -444,7 +444,7 @@
     {
       "id": 13,
       "name": "First_House",
-      "color": "#ff7e00",
+      "color": "var(--kerykeion-chart-color-first-house)",
       "is_active": true,
       "element_points": 40,
       "related_zodiac_signs": [],
@@ -453,7 +453,7 @@
     {
       "id": 14,
       "name": "Tenth_House",
-      "color": "#FF0000",
+      "color": "var(--kerykeion-chart-color-tenth-house)",
       "is_active": true,
       "element_points": 20,
       "related_zodiac_signs": [],
@@ -462,7 +462,7 @@
     {
       "id": 15,
       "name": "Seventh_House",
-      "color": "#0000FF",
+      "color": "var(--kerykeion-chart-color-seventh-house)",
       "is_active": false,
       "element_points": 0,
       "related_zodiac_signs": [],
@@ -471,7 +471,7 @@
     {
       "id": 16,
       "name": "Fourth_House",
-      "color": "#000000",
+      "color": "var(--kerykeion-chart-color-fourth-house)",
       "is_active": false,
       "element_points": 0,
       "related_zodiac_signs": [],
@@ -480,52 +480,52 @@
     {
       "id": 17,
       "name": "Mean_Lilith",
-      "color": "#000",
+      "color": "var(--kerykeion-chart-color-mean-lilith)",
       "is_active": true,
       "element_points": 0,
       "related_zodiac_signs": [],
       "label": "Mean_Lilith"
     }
   ],
+
   "chart_colors": {
-    "paper_0": "#000000",
-    "paper_1": "#ffffff",
-    "zodiac_bg_0": "#ff7200",
-    "zodiac_bg_1": "#6b3d00",
-    "zodiac_bg_2": "#69acf1",
-    "zodiac_bg_3": "#2b4972",
-    "zodiac_bg_4": "#ff7200",
-    "zodiac_bg_5": "#6b3d00",
-    "zodiac_bg_6": "#69acf1",
-    "zodiac_bg_7": "#2b4972",
-    "zodiac_bg_8": "#ff7200",
-    "zodiac_bg_9": "#6b3d00",
-    "zodiac_bg_10": "#69acf1",
-    "zodiac_bg_11": "#2b4972",
-    "zodiac_icon_0": "#ff7200",
-    "zodiac_icon_1": "#6b3d00",
-    "zodiac_icon_2": "#69acf1",
-    "zodiac_icon_3": "#2b4972",
-    "zodiac_icon_4": "#ff7200",
-    "zodiac_icon_5": "#6b3d00",
-    "zodiac_icon_6": "#69acf1",
-    "zodiac_icon_7": "#2b4972",
-    "zodiac_icon_8": "#ff7200",
-    "zodiac_icon_9": "#6b3d00",
-    "zodiac_icon_10": "#69acf1",
-    "zodiac_icon_11": "#2b4972",
-    "zodiac_radix_ring_0": "#ff0000",
-    "zodiac_radix_ring_1": "#ff0000",
-    "zodiac_radix_ring_2": "#ff0000",
-    "zodiac_transit_ring_0": "#ff0000",
-    "zodiac_transit_ring_1": "#ff0000",
-    "zodiac_transit_ring_2": "#0000ff",
-    "zodiac_transit_ring_3": "#0000ff",
-    "houses_radix_line": "#ff0000",
-    "houses_transit_line": "#0000ff",
-    "lunar_phase_0": "#000000",
-    "lunar_phase_1": "#FFFFFF",
-    "lunar_phase_2": "#CCCCCC"
+    "paper_0": "var(--kerykeion-chart-color-paper-0)",
+    "paper_1": "var(--kerykeion-chart-color-paper-1)",
+    "zodiac_bg_0": "var(--kerykeion-chart-color-zodiac-bg-0)",
+    "zodiac_bg_1": "var(--kerykeion-chart-color-zodiac-bg-1)",
+    "zodiac_bg_2": "var(--kerykeion-chart-color-zodiac-bg-2)",
+    "zodiac_bg_3": "var(--kerykeion-chart-color-zodiac-bg-3)",
+    "zodiac_bg_4": "var(--kerykeion-chart-color-zodiac-bg-4)",
+    "zodiac_bg_5": "var(--kerykeion-chart-color-zodiac-bg-5)",
+    "zodiac_bg_6": "var(--kerykeion-chart-color-zodiac-bg-6)",
+    "zodiac_bg_7": "var(--kerykeion-chart-color-zodiac-bg-7)",
+    "zodiac_bg_8": "var(--kerykeion-chart-color-zodiac-bg-8)",
+    "zodiac_bg_9": "var(--kerykeion-chart-color-zodiac-bg-9)",
+    "zodiac_bg_10": "var(--kerykeion-chart-color-zodiac-bg-10)",
+    "zodiac_bg_11": "var(--kerykeion-chart-color-zodiac-bg-11)",
+    "zodiac_icon_0": "var(--kerykeion-chart-color-zodiac-icon-0)",
+    "zodiac_icon_1": "var(--kerykeion-chart-color-zodiac-icon-1)",
+    "zodiac_icon_2": "var(--kerykeion-chart-color-zodiac-icon-2)",
+    "zodiac_icon_3": "var(--kerykeion-chart-color-zodiac-icon-3)",
+    "zodiac_icon_4": "var(--kerykeion-chart-color-zodiac-icon-4)",
+    "zodiac_icon_5": "var(--kerykeion-chart-color-zodiac-icon-5)",
+    "zodiac_icon_6": "var(--kerykeion-chart-color-zodiac-icon-6)",
+    "zodiac_icon_7": "var(--kerykeion-chart-color-zodiac-icon-7)",
+    "zodiac_icon_8": "var(--kerykeion-chart-color-zodiac-icon-8)",
+    "zodiac_icon_9": "var(--kerykeion-chart-color-zodiac-icon-9)",
+    "zodiac_icon_10": "var(--kerykeion-chart-color-zodiac-icon-10)",
+    "zodiac_icon_11": "var(--kerykeion-chart-color-zodiac-icon-11)",
+    "zodiac_radix_ring_0": "var(--kerykeion-chart-color-zodiac-radix-ring-0)",
+    "zodiac_radix_ring_1": "var(--kerykeion-chart-color-zodiac-radix-ring-1)",
+    "zodiac_radix_ring_2": "var(--kerykeion-chart-color-zodiac-radix-ring-2)",
+    "zodiac_transit_ring_0": "var(--kerykeion-chart-color-zodiac-transit-ring-0)",
+    "zodiac_transit_ring_1": "var(--kerykeion-chart-color-zodiac-transit-ring-1)",
+    "zodiac_transit_ring_2": "var(--kerykeion-chart-color-zodiac-transit-ring-2)",
+    "zodiac_transit_ring_3": "var(--kerykeion-chart-color-zodiac-transit-ring-3)",
+    "houses_radix_line": "var(--kerykeion-chart-color-houses-radix-line)",
+    "houses_transit_line": "var(--kerykeion-chart-color-houses-transit-line)",
+    "lunar_phase_0": "var(--kerykeion-chart-color-lunar-phase-0)",
+    "lunar_phase_1": "var(--kerykeion-chart-color-lunar-phase-1)"
   },
   "general_settings": {
     "axes_orbit": 1,

{kerykeion-4.14.11.dist-info → kerykeion-4.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.14.11
+Version: 4.15.0
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0

{kerykeion-4.14.11.dist-info → kerykeion-4.15.0.dist-info}/RECORD

@@ -6,29 +6,30 @@ kerykeion/aspects/natal_aspects.py,sha256=KnrHt8AvEE66RWLXXAMv-srm8x077AHLtoNabj
 kerykeion/aspects/synastry_aspects.py,sha256=_qrsdzxtZ8nl_f4k3q2iRFL10GNp7zM5sJEEz2XBWhg,4324
 kerykeion/astrological_subject.py,sha256=CFrg9eY_-ihN2idTyqLw3lmGcBV7OJlAw2kse_t8woM,34828
 kerykeion/charts/__init__.py,sha256=Juxkduy2TaagWblh_7CE8Acrg3dHL27-WEddJhau_eQ,127
-kerykeion/charts/charts_utils.py,sha256=VqY9r2g3QrKKB8fxnaLazP3p14DE_CuuItqRED71aeY,38683
-kerykeion/charts/draw_planets.py,sha256=-EO_fD1gmkdokT5MUp0iVUlSDpoCVV4ry2FeKWhO0Lk,17386
-kerykeion/charts/kerykeion_chart_svg.py,sha256=na2xrJVYuR2kLnI0s9X3tqTse9kgINJg3LfmuSAn09k,30156
-kerykeion/charts/templates/chart.xml,sha256=tNOGyugpObF164ydR6gg9gBm9mDiLsAa9-VBDW6MKqc,68163
+kerykeion/charts/charts_utils.py,sha256=jQngriIhrnGRwxAbAtIkI5dxSEyKeumnxufT5EsB2iA,38524
+kerykeion/charts/color_style_tags.py,sha256=6p2lhL8LzPFxr_G9siR_hvo8XKov-OoVgUlvguK54gc,4066
+kerykeion/charts/draw_planets.py,sha256=Uty3zpWYMQZvvK7ZHhlmynCHeL8DIN3qL2ifnBXVciM,17393
+kerykeion/charts/kerykeion_chart_svg.py,sha256=wOIj3GmN7goSegR66Mt3EbkSTao5nE8sT131jPw1xaM,30489
+kerykeion/charts/templates/chart.xml,sha256=7l1whVk8OPdXZYlRU_zfNWVDuXopLTu2ftw4ix4-HIU,68282
 kerykeion/enums.py,sha256=Xp_0A6jBSW7SZvB5LlKfBObg0xTqB6hTq1IXjz-UWl4,997
 kerykeion/ephemeris_data.py,sha256=AL9yilyRAL2e6L6hqxDkzSOqmKlHKgxhBDRS4wZd5HE,8309
 kerykeion/fetch_geonames.py,sha256=NmyTErvKISjJCAxvRB1H35aVZI8_-_U-Cqb_rmqRseA,4563
 kerykeion/kr_types/__init__.py,sha256=-qhGQikurdoHnGtuT1bsaEeZ-IwmZtIHMjGOPC9_oqQ,295
-kerykeion/kr_types/chart_types.py,sha256=89Z2RVoLVWvYSEbMlb910M-7nVV-Azc8nzK0TC23TJk,1957
+kerykeion/kr_types/chart_types.py,sha256=OlDvjCra7acaBT--B_gqsqOcAwbuKCXmQQyDTDNfy4o,1983
 kerykeion/kr_types/kerykeion_exception.py,sha256=G-7VFta78qBt10l54JZWvwH-3lUNKmDwuILXaVGVu9A,314
 kerykeion/kr_types/kr_literals.py,sha256=G7yoDQ7bUJNllZaNXR9_Zlwwtzv6t2XKoLb5go_Al68,3295
 kerykeion/kr_types/kr_models.py,sha256=x6s-OOim5DRxtbH8t4Rk4sO26RMj7-aJgydZoslRiKw,3805
-kerykeion/kr_types/settings_models.py,sha256=Zpa_SYY46HPpup1oDnBCw-eELxSQVA8my2Vk_wKMESI,12605
+kerykeion/kr_types/settings_models.py,sha256=hDDoJBz1arIsBySKUeqpmW9mw4aOaoUQo6icMfI1sgQ,12510
 kerykeion/relationship_score.py,sha256=LzEA2JXb_GeUinjfEtce_eQ97jxXFGfK3B97fODHIOE,6992
 kerykeion/report.py,sha256=QEZfadIxmqIugoLHMW0KBhOqCwTywGSDDfpX4NJD6qg,2785
 kerykeion/settings/__init__.py,sha256=QQNFCl7sgN27MKaVscqtpPk10HGz4wZS3I_7KEGMaVA,69
 kerykeion/settings/kerykeion_settings.py,sha256=uRAbhJ0ZXAbGBPGJjhh5u8YX2phcXobEwJA646wMHcM,2347
-kerykeion/settings/kr.config.json,sha256=3BNbPBfF-hCMx-LWtQxWCE7npf7lOrJ-AIOzowLwdgs,12646
+kerykeion/settings/kr.config.json,sha256=OT_aqKDiWIGGufGyl4qRLWgz6_br0-VYuVAf_Jpf8vY,14817
 kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
 kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
 kerykeion/utilities.py,sha256=wJdjksXZlMWyvFnEe_1HQuCxYAtAWg-p8lqe2aO2zpE,9046
-kerykeion-4.14.11.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-4.14.11.dist-info/METADATA,sha256=_ce5uqKDhfCmEGH08TSK1wmZAPWeB5q_AofuziVAmEA,14426
-kerykeion-4.14.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-kerykeion-4.14.11.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-4.14.11.dist-info/RECORD,,
+kerykeion-4.15.0.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-4.15.0.dist-info/METADATA,sha256=uf9pRYwXcFsX5RTdwPbsyZCIg6PYQoHhjadwfT0H0t8,14425
+kerykeion-4.15.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+kerykeion-4.15.0.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-4.15.0.dist-info/RECORD,,