decksmith 0.1.11__tar.gz → 0.1.12__tar.gz

{decksmith-0.1.11 → decksmith-0.1.12}/PKG-INFO

@@ -1,16 +1,16 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: decksmith
-Version: 0.1.11
+Version: 0.1.12
 Summary: A command-line application to dynamically generate decks of cards from a JSON specification and a CSV data file, inspired by nandeck.
-License: GPL-2.0-only
+License-Expression: GPL-2.0-only
 Author: Julio Cabria
 Author-email: juliocabria@tutanota.com
 Requires-Python: >=3.11
-Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Provides-Extra: dev
 Requires-Dist: click
 Requires-Dist: jval (==1.0.6)

{decksmith-0.1.11 → decksmith-0.1.12}/decksmith/card_builder.py

@@ -321,8 +321,12 @@ class CardBuilder:
         # The center of the circle is the top-left position + radius
         center_pos = (absolute_pos[0] + radius, absolute_pos[1] + radius)
 
-        # Draw the circle
-        self.draw.circle(
+        # Create a temporary layer for proper alpha compositing
+        layer = Image.new("RGBA", self.card.size, (0, 0, 0, 0))
+        layer_draw = ImageDraw.Draw(layer, "RGBA")
+
+        # Draw the circle on the temporary layer
+        layer_draw.circle(
             center_pos,
             radius,
             fill=element.get("fill", None),
@@ -330,6 +334,10 @@ class CardBuilder:
             width=element.get("outline_width", 1),
         )
 
+        # Composite the layer onto the card
+        self.card = Image.alpha_composite(self.card, layer)
+        self.draw = ImageDraw.Draw(self.card, "RGBA")
+
         # Store position if id is provided
         if "id" in element:
             # The stored bbox is based on the top-left position
@@ -377,14 +385,22 @@ class CardBuilder:
             position[1] + size[1],
         )
 
-        # Draw the ellipse
-        self.draw.ellipse(
+        # Create a temporary layer for proper alpha compositing
+        layer = Image.new("RGBA", self.card.size, (0, 0, 0, 0))
+        layer_draw = ImageDraw.Draw(layer, "RGBA")
+
+        # Draw the ellipse on the temporary layer
+        layer_draw.ellipse(
             bounding_box,
             fill=element.get("fill", None),
             outline=element.get("outline_color", None),
             width=element.get("outline_width", 1),
         )
 
+        # Composite the layer onto the card
+        self.card = Image.alpha_composite(self.card, layer)
+        self.draw = ImageDraw.Draw(self.card, "RGBA")
+
         # Store position if id is provided
         if "id" in element:
             self.element_positions[element["id"]] = bounding_box
@@ -432,14 +448,22 @@ class CardBuilder:
         # Translate points by the final offset
         final_points = [(p[0] + offset[0], p[1] + offset[1]) for p in points]
 
-        # Draw the polygon
-        self.draw.polygon(
+        # Create a temporary layer for proper alpha compositing
+        layer = Image.new("RGBA", self.card.size, (0, 0, 0, 0))
+        layer_draw = ImageDraw.Draw(layer, "RGBA")
+
+        # Draw the polygon on the temporary layer
+        layer_draw.polygon(
             final_points,
             fill=element.get("fill", None),
             outline=element.get("outline_color", None),
             width=element.get("outline_width", 1),
         )
 
+        # Composite the layer onto the card
+        self.card = Image.alpha_composite(self.card, layer)
+        self.draw = ImageDraw.Draw(self.card, "RGBA")
+
         # Store position if id is provided
         if "id" in element:
             # The stored bbox is the relative bbox translated by the offset
@@ -482,8 +506,12 @@ class CardBuilder:
         # The center of the polygon is the top-left position + radius
         center_pos = (absolute_pos[0] + radius, absolute_pos[1] + radius)
 
-        # Draw the regular polygon
-        self.draw.regular_polygon(
+        # Create a temporary layer for proper alpha compositing
+        layer = Image.new("RGBA", self.card.size, (0, 0, 0, 0))
+        layer_draw = ImageDraw.Draw(layer, "RGBA")
+
+        # Draw the regular polygon on the temporary layer
+        layer_draw.regular_polygon(
             (center_pos[0], center_pos[1], radius),
             n_sides=element["sides"],
             rotation=element.get("rotation", 0),
@@ -492,6 +520,10 @@ class CardBuilder:
             width=element.get("outline_width", 1),
         )
 
+        # Composite the layer onto the card
+        self.card = Image.alpha_composite(self.card, layer)
+        self.draw = ImageDraw.Draw(self.card, "RGBA")
+
         # Store position if id is provided
         if "id" in element:
             # The stored bbox is based on the top-left position
@@ -545,8 +577,12 @@ class CardBuilder:
 
         # print(f"DEBUG: Transformed {element=}")
 
-        # Draw the rectangle
-        self.draw.rounded_rectangle(
+        # Create a temporary layer for proper alpha compositing
+        layer = Image.new("RGBA", self.card.size, (0, 0, 0, 0))
+        layer_draw = ImageDraw.Draw(layer, "RGBA")
+
+        # Draw the rectangle on the temporary layer
+        layer_draw.rounded_rectangle(
             bounding_box,
             radius=element.get("corner_radius", 0),
             fill=element.get("fill", None),
@@ -555,6 +591,10 @@ class CardBuilder:
             corners=element.get("corners", None),
         )
 
+        # Composite the layer onto the card
+        self.card = Image.alpha_composite(self.card, layer)
+        self.draw = ImageDraw.Draw(self.card, "RGBA")
+
         # Store position if id is provided
         if "id" in element:
             self.element_positions[element["id"]] = bounding_box

{decksmith-0.1.11 → decksmith-0.1.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "decksmith"
-version = "0.1.11"
+version = "0.1.12"
 description = "A command-line application to dynamically generate decks of cards from a JSON specification and a CSV data file, inspired by nandeck."
 authors = [
     {name = "Julio Cabria", email = "juliocabria@tutanota.com"},
@@ -24,7 +24,7 @@ dev = [
 
 [tool.poetry]
 name = "decksmith"
-version = "0.1.11"
+version = "0.1.12"
 description = "A command-line application to dynamically generate decks of cards from a JSON specification and a CSV data file, inspired by nandeck."
 authors = ["Julio Cabria <juliocabria@tutanota.com>"]
 license = "GPL-2.0-only"