prefig 0.4.0.dev20250801054919__py3-none-any.whl → 0.4.1__py3-none-any.whl

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/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/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/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/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.dist-info → prefig-0.4.1.dist-info}/METADATA

@@ -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.dist-info → prefig-0.4.1.dist-info}/RECORD

@@ -5,7 +5,7 @@ prefig/core/__init__.py,sha256=roT0a8-iBrp8WXTbPN5RzMWFiCXfpKrEXa2xE-F-yBo,728
 prefig/core/annotations.py,sha256=9wStnLhEHFmkIocufHLiBcUZ3NSce7ZESor5kjj-vzg,3998
 prefig/core/area.py,sha256=U-AxXvaZJWgVccpLlh-aaRfM_QtTa09NR2TqAd8Yk0o,3710
 prefig/core/arrow.py,sha256=h8lFm1rMdpiZRyQu5kvAiptBmMYr5aKCZuB5JypAGDM,11283
-prefig/core/axes.py,sha256=xMO_X6PbKZ5ptEdaQJk0iZ1iV5mGyZ3Apq0eBrGUoCk,31679
+prefig/core/axes.py,sha256=T-n0P-Sk2e1cD3upzHtJCrh4CH8Kus7GduEF_yMRzZ4,31694
 prefig/core/calculus.py,sha256=Q4kSGTTTeQYEEVKgmYWpFP0JLHmCsBchB5OF9qSclQk,498
 prefig/core/circle.py,sha256=_v1eMVhl4nnD4WXCz-Boa_SAdQg_kKeU3NhP42z2Yzw,15668
 prefig/core/clip.py,sha256=X3TcFYPuZwjZ9SFBWMc1MYY__6XTJqLafPeOLFNOdIE,806
@@ -28,7 +28,7 @@ prefig/core/network.py,sha256=1izAX2AKvnj2knElrdLeojE_0Q0zO0aQM-EsEwor0Os,27217
 prefig/core/parametric_curve.py,sha256=ftxdg3gs0M0ME5iPJo3iEX7jT8PHQEMYpx8psr8Cm-w,3046
 prefig/core/parse.py,sha256=plLmR0KKrUjYx0PmHHo5HZonaaT3tW4qjiDOtzuhSkQ,4542
 prefig/core/path.py,sha256=8BbWAUzZqe1YD0gO4QtDENaINavAAC1mlU-y3UV-vu0,20312
-prefig/core/point.py,sha256=a97N1soBcmYn3StZ60HBmaBi3pB1abA7sL0LNJ2nxR0,8341
+prefig/core/point.py,sha256=JhybSrEqxTWwXQVYQWw1_knBcWrttOuRUwKIlU8IshE,8730
 prefig/core/polygon.py,sha256=8NVdWSUVXuNE4GiPQ4MySSmLy8aCNwKUqCcfHukizME,11301
 prefig/core/read.py,sha256=Q1Nsluwysg3M5wtUmwIirfNo-Rw9-dFJPEeM4pDCpyo,1988
 prefig/core/rectangle.py,sha256=b_ki7yqA4-mke1_0khvKqSKBRToB667mZc-xZhhPIBA,3473
@@ -40,7 +40,7 @@ prefig/core/statistics.py,sha256=5qN_-ABN0EFVG12ZP95uSPk82INbWRqI3w2fUdR3wsw,345
 prefig/core/tags.py,sha256=7w6E3960o_ZgZl4xYJLVJ1eLttt0vVlB4IgMZGTMyyE,4134
 prefig/core/tangent_line.py,sha256=I9wf9VAqhnmmsh8Lzynwi7_Z1DonHXqHf8ym7eO40tk,3400
 prefig/core/user_namespace.py,sha256=6xlkYd2g9dSiDPH0vmYj93oPzm1BFZdgyMGQ9ipKOgU,7059
-prefig/core/utilities.py,sha256=R1fBrzj-abXHG4Bh-sS0pZNC8vc9fIt6yJBcuztCVho,2905
+prefig/core/utilities.py,sha256=ndbB43tDDMj-RFUCCJAFgfdVb1gxYyr9WuHZoHEPC6c,2967
 prefig/core/vector.py,sha256=lTw-y9mt6jqmbFxdPwQB4PYBQ9y4pGrQRcpRp9lBIbY,2917
 prefig/engine.py,sha256=Zz7j2sFxeMwPN1f3GFTpaBihqguzMNJD5iBONOVL7eQ,11972
 prefig/resources/diagcess/diagcess.html,sha256=_JOwYjDRftpXN50J5na2Ck3TRffF4qUEcjCicjHF2Vw,6067
@@ -56,13 +56,13 @@ prefig/resources/examples/tangent.xml,sha256=FLZaNz0iFoTLX6gB4pfLZFtu_TWeCug4Dda
 prefig/resources/fonts/Braille29.ttf,sha256=T4hosDvaUGMVK0Wh0BmBgWeT7sQQmLXyA3gRUR-a0oE,55880
 prefig/resources/js/mj-sre-page.js,sha256=LHVeI4dCH13bTv56nz3SKNo3JGRXa6joPM3D3wpKV40,9251
 prefig/resources/js/package.json,sha256=hwKDg76_GzkhX72T7DRiF3FoMLokCv9PSLQvnW5Ovok,116
-prefig/resources/schema/pf_schema.rnc,sha256=WORhF-dRkNY8aeiNQvZIaPTE5QGCMzbrXqttXCjtOJY,20166
-prefig/resources/schema/pf_schema.rng,sha256=TmZQLgyK2wntXDXOiQXYcVQedlPuPh8IWrtttK0iCQY,54454
+prefig/resources/schema/pf_schema.rnc,sha256=00ja-tlc6jgDrnjNJ0QkYM8D4MJbdeB7j-DKCJ_AMYU,20253
+prefig/resources/schema/pf_schema.rng,sha256=NURxWLPuw_T5sRR_OSwupH02E83W0KoixsLCc12R-IE,54849
 prefig/resources/template/pf_publication.xml,sha256=eEv8HACv610Apw5DSVNy0reLfELYqHlNy9Oq0GH7C_c,200
 prefig/scripts/__init__.py,sha256=qJcPi1WRh9UAwu4zIFJbmxWalAMilMYqgi6LxRkF7bI,25
 prefig/scripts/install_mj.py,sha256=5A6-oc1xbIXka5mkFE70vlp9-Rh_QoxOxGMrQi9Hkio,1219
-prefig-0.4.0.dev20250801054919.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-prefig-0.4.0.dev20250801054919.dist-info/METADATA,sha256=erYt9LDSSjSVJf44Jr9Qx8mt-jGDLl34NGQ6NlHLOiM,8728
-prefig-0.4.0.dev20250801054919.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prefig-0.4.0.dev20250801054919.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
-prefig-0.4.0.dev20250801054919.dist-info/RECORD,,
+prefig-0.4.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+prefig-0.4.1.dist-info/METADATA,sha256=X9OfVj6iGYX69UIXlbIP7yk-aupen4jhubVxPr5R82A,8710
+prefig-0.4.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prefig-0.4.1.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
+prefig-0.4.1.dist-info/RECORD,,