prefig 0.4.3.dev20250823053253__tar.gz → 0.4.5.dev20250915053406__tar.gz

{prefig-0.4.3.dev20250823053253 → prefig-0.4.5.dev20250915053406}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefig
-Version: 0.4.3.dev20250823053253
+Version: 0.4.5.dev20250915053406
 Summary: An authoring system for mathematical diagrams
 Home-page: https://prefigure.org
 License: GPL-3.0-or-later

{prefig-0.4.3.dev20250823053253 → prefig-0.4.5.dev20250915053406}/prefig/core/circle.py

@@ -47,7 +47,10 @@ def circle(element, diagram, parent, outline_status):
         if element.get('stroke') is not None:
             element.set('stroke', 'black')
         if element.get('fill') is not None:
-            element.set('fill', 'lightgray')
+            if element.get('fill').strip().lower() != 'none':
+                element.set('fill', 'lightgray')
+            else:
+                element.set('fill', 'none')
     else:
         element.set('stroke', element.get('stroke', 'none'))
         element.set('fill', element.get('fill', 'none'))
@@ -120,7 +123,10 @@ def ellipse(element, diagram, parent, outline_status):
         if element.get('stroke') is not None:
             element.set('stroke', 'black')
         if element.get('fill') is not None:
-            element.set('fill', 'lightgray')
+            if elementl.get('fill').strip().lower() != 'none':
+                element.set('fill', 'lightgray')
+            else:
+                element.set('fill', 'none')
     else:
         element.set('stroke', element.get('stroke', 'none'))
         element.set('fill', element.get('fill', 'none'))
@@ -283,7 +289,10 @@ def angle(element, diagram, parent, outline_status):
     element.set('stroke', element.get('stroke', 'black'))
     if diagram.output_format() == 'tactile':
         if element.get('fill') is not None:
-            element.set('fill', 'lightgray')
+            if element.get('fill').strip().lower() != 'none':
+                element.set('fill', 'lightgray')
+            else:
+                element.set('fill', 'none')
     else:
         element.set('fill', element.get('fill', 'none'))
     element.set('thickness', element.get('thickness','2'))

{prefig-0.4.3.dev20250823053253 → prefig-0.4.5.dev20250915053406}/prefig/core/point.py

@@ -34,7 +34,13 @@ def point(element, diagram, parent, outline_status = None):
         return
 
     if diagram.output_format() == 'tactile':
-        element.set('size', element.get('size', '9'))
+        if element.get('size', None) is not None:
+            size = un.valid_eval(element.get('size'))
+            size = max(size, 9)
+            size = str(size)
+        else:
+            size = '9'
+        element.set('size', size)
     else:
         element.set('size', element.get('size', '4'))
     size = util.get_attr(element, 'size', '1')

{prefig-0.4.3.dev20250823053253 → prefig-0.4.5.dev20250915053406}/prefig/core/polygon.py

@@ -53,7 +53,10 @@ def polygon(element, diagram, parent,
         if element.get('stroke') is not None:
             element.set('stroke', 'black')
         if element.get('fill') is not None:
-            element.set('fill', 'lightgray')
+            if element.get('fill').strip().lower() != 'none':
+                element.set('fill', 'lightgray')
+            else:
+                element.set('fill', 'none')
     util.set_attr(element, 'stroke', 'none')
     util.set_attr(element, 'fill', 'none')
     util.set_attr(element, 'thickness', '2')

{prefig-0.4.3.dev20250823053253 → prefig-0.4.5.dev20250915053406}/prefig/core/rectangle.py

@@ -75,8 +75,11 @@ def rectangle(element, diagram, parent, outline_status):
         fill   = element.get('fill')
         if stroke is not None and stroke != 'none':
             element.set('stroke', 'black')
-        if fill is not None and fill != 'none':
-            element.set('fill', 'lightgray')
+        if fill is not None:
+            if fill.strip().lower() != 'none':
+                element.set('fill', 'lightgray')
+            else:
+                element.set('fill', 'none')
     else:
         util.set_attr(element, 'stroke', 'none')
         util.set_attr(element, 'fill', 'none')

{prefig-0.4.3.dev20250823053253 → prefig-0.4.5.dev20250915053406}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prefig"
-version = "0.4.3.dev20250823053253"
+version = "0.4.5.dev20250915053406"
 description = "An authoring system for mathematical diagrams"
 readme = "README.md"
 homepage = "https://prefigure.org"