prefig 0.4.0.dev20250801054919__tar.gz → 0.4.1__tar.gz

{prefig-0.4.0.dev20250801054919 → prefig-0.4.1}/PKG-INFO

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

{prefig-0.4.0.dev20250801054919 → prefig-0.4.1}/prefig/core/axes.py

@@ -528,8 +528,7 @@ class Axes():
                 log.error(f"Error in <axes> parsing hlabels={hlabels}")
                 return
             if self.h_pi_format:
-                hlabels = 1/math.pi * hlabels
-
+                h_positions = 1/math.pi * h_positions
         h_scale = 1
         if self.h_pi_format:
             h_scale = math.pi
@@ -636,7 +635,7 @@ class Axes():
                 return
 
             if self.v_pi_format:
-                vlabels = 1/math.pi * vlabels
+                v_positions = 1/math.pi * v_positions
             
         v_scale = 1
         if self.v_pi_format:

{prefig-0.4.0.dev20250801054919 → prefig-0.4.1}/prefig/core/point.py

@@ -1,5 +1,7 @@
 import lxml.etree as ET
 import logging
+import numpy as np
+import math
 from . import user_namespace as un
 from . import math_utilities as math_util
 from . import utilities as util
@@ -18,7 +20,15 @@ def point(element, diagram, parent, outline_status = None):
 
     # determine the location and size of the point from the XML element
     try:
-        p = diagram.transform(un.valid_eval(element.get('p')))
+        p = un.valid_eval(element.get('p'))
+        if element.get('coordinates', 'cartesian') == 'polar':
+            radial = p[0]
+            angle = p[1]
+            if element.get('degrees', 'no') == 'yes':
+                angle = math.radians(angle)
+            p = radial * np.array([math.cos(angle), math.sin(angle)])
+            element.set('p', util.pt2long_str(p, spacer=','))
+        p = diagram.transform(p)
     except:
         log.error(f"Error in <point> defining p={element.get('p')}")
         return

{prefig-0.4.0.dev20250801054919 → prefig-0.4.1}/prefig/core/utilities.py

@@ -2,6 +2,9 @@ import numpy as np
 from . import user_namespace as un
 from . import label
 
+import logging
+logger = logging.getLogger('prefigure')
+
 import warnings
 with warnings.catch_warnings():
     warnings.filterwarnings('ignore', 'legacy print')
@@ -25,7 +28,7 @@ def get_attr(element, attr, default):
     try:
         attribute = un.valid_eval(element.get(attr, default))
         if isinstance(attribute, np.ndarray):
-            return np.array2string(attribute, separator=',')
+            return ','.join([float2longstr(a) for a in attribute])
         return str(attribute)
     except (TypeError, SyntaxError):  # this is a string that's not in the namespace
         return element.get(attr, default)

{prefig-0.4.0.dev20250801054919 → prefig-0.4.1}/prefig/resources/schema/pf_schema.rnc

@@ -685,6 +685,8 @@ Point = element point {
     attribute at {text}?,
     attribute style {text}?,
     attribute size {text}?,
+    attribute coordinates {"cartesian"|"polar"}?,
+    attribute degrees {"yes"|"no"}?,
     LabelAttributes,
     FillAttributes,
     CommonAttributes,

{prefig-0.4.0.dev20250801054919 → prefig-0.4.1}/prefig/resources/schema/pf_schema.rng

@@ -1886,6 +1886,22 @@
       <optional>
         <attribute name="size"/>
       </optional>
+      <optional>
+        <attribute name="coordinates">
+          <choice>
+            <value>cartesian</value>
+            <value>polar</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="degrees">
+          <choice>
+            <value>yes</value>
+            <value>no</value>
+          </choice>
+        </attribute>
+      </optional>
       <ref name="LabelAttributes"/>
       <ref name="FillAttributes"/>
       <ref name="CommonAttributes"/>

{prefig-0.4.0.dev20250801054919 → prefig-0.4.1}/pyproject.toml

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