prefig 0.3.9.dev20250726054209__py3-none-any.whl → 0.3.9.dev20250728054658__py3-none-any.whl

prefig/core/math_utilities.py

@@ -15,6 +15,9 @@ def set_diagram(d):
 # introduce some useful mathematical operations
 #   that are meant to be available to authors
 
+def ln(x):
+    return math.log(x)
+
 def dot(u, v):
     return np.dot(np.array(u), np.array(v))
 

prefig/core/slope_field.py

@@ -196,6 +196,7 @@ def vector_field(element, diagram, parent, outline_status):
         # we will go through and generate the vectors first
         # since we'll need to scale them
         max_scale = 0
+        exponent = un.valid_eval(element.get('exponent', '1'))
         x = rx[0]
         while x <= rx[2]:
             y = ry[0]
@@ -211,6 +212,13 @@ def vector_field(element, diagram, parent, outline_status):
                         return;
                 except:
                     pass
+                norm = math_util.length(f_value)
+                if norm < 1e-10:
+                    f_value = np.array((0,0))
+                else:
+                    # we will scale the length by length**exponent
+                    # to promote the length of shorter vectors
+                    f_value = norm**exponent * (1/norm * f_value)
                 max_scale = max(max_scale,
                                 abs((f_value[0])/rx[1]),
                                 abs((f_value[1])/ry[1]))

prefig/core/tags.py

@@ -41,6 +41,7 @@ tag_dict = {
     'caption': label.caption,
     'circle': circle.circle,
     'clip': clip.clip,
+    'contour': implicit.implicit_curve,
     'coordinates': coordinates.coordinates,
     'definition': definition.definition,
     'derivative': definition.derivative,

prefig/core/user_namespace.py

@@ -66,6 +66,8 @@ def validate_node(node, args=None):
         return True
     if isinstance(node, ast.Expression):
         return validate_node(node.body, args)
+    if isinstance(node, ast.Starred):
+        return validate_node(node.value)
     if isinstance(node, ast.Name):
         if node.id in variables:
             return True

prefig/resources/schema/pf_schema.rnc

@@ -313,8 +313,8 @@ GraphicalElements =
         Area-Under-Curve* &
         Axes* &
         Circle* &
+        Contour* &
         Ellipse* &
-        Gradient* &
         Graph* &
         Grid* &
         Grid-Axes* &
@@ -422,34 +422,6 @@ Axes = element axes {
     YLabel?
 }
 
-Gradient = element gradient {
-    attribute at {text}?,
-    attribute function {text}?,
-    attribute spacings {text}?,
-    attribute scale {text}?,
-    attribute curve {text}?,
-    attribute domain {text}?,
-    attribute N {text}?,
-    attribute arrow-width {text}?,
-    attribute arrow-angles {text?}?,
-    StrokeAttributes,
-    CommonAttributes
-}
-
-Vector-Field = element vector-field {
-    attribute at {text}?,
-    attribute function {text}?,
-    attribute spacings {text}?,
-    attribute scale {text}?,
-    attribute curve {text}?,
-    attribute domain {text}?,
-    attribute N {text}?,
-    attribute arrow-width {text}?,
-    attribute arrow-angles {text?}?,
-    StrokeAttributes,
-    CommonAttributes
-}
-
 Grid = element grid {
     attribute at {text}?,
     attribute spacings {text}?,
@@ -506,6 +478,16 @@ Tick-Mark = element tick-mark {
     LabelText?
 }
 
+Contour = element contour {
+    attribute at {text}?,
+    attribute function {text},
+    attribute k {text}?,
+    attribute depth {text}?,
+    attribute initial-depth {text}?,
+    StrokeAttributes,
+    CommonAttributes
+}
+
 Circle = element circle {
     attribute at {text}?,
     attribute center {text},
@@ -815,4 +797,18 @@ Vector = element vector {
     CommonAttributes
 }
 
+Vector-Field = element vector-field {
+    attribute at {text}?,
+    attribute function {text}?,
+    attribute spacings {text}?,
+    attribute scale {text}?,
+    attribute curve {text}?,
+    attribute domain {text}?,
+    attribute N {text}?,
+    attribute arrow-width {text}?,
+    attribute arrow-angles {text?}?,
+    StrokeAttributes,
+    CommonAttributes
+}
+
 }

prefig/resources/schema/pf_schema.rng

@@ -763,10 +763,10 @@
         <ref name="Circle"/>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="Ellipse"/>
+        <ref name="Contour"/>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="Gradient"/>
+        <ref name="Ellipse"/>
       </zeroOrMore>
       <zeroOrMore>
         <ref name="Graph"/>
@@ -1122,80 +1122,6 @@
       </optional>
     </element>
   </define>
-  <define name="Gradient">
-    <element name="gradient">
-      <optional>
-        <attribute name="at"/>
-      </optional>
-      <optional>
-        <attribute name="function"/>
-      </optional>
-      <optional>
-        <attribute name="spacings"/>
-      </optional>
-      <optional>
-        <attribute name="scale"/>
-      </optional>
-      <optional>
-        <attribute name="curve"/>
-      </optional>
-      <optional>
-        <attribute name="domain"/>
-      </optional>
-      <optional>
-        <attribute name="N"/>
-      </optional>
-      <optional>
-        <attribute name="arrow-width"/>
-      </optional>
-      <optional>
-        <attribute name="arrow-angles">
-          <optional>
-            <text/>
-          </optional>
-        </attribute>
-      </optional>
-      <ref name="StrokeAttributes"/>
-      <ref name="CommonAttributes"/>
-    </element>
-  </define>
-  <define name="Vector-Field">
-    <element name="vector-field">
-      <optional>
-        <attribute name="at"/>
-      </optional>
-      <optional>
-        <attribute name="function"/>
-      </optional>
-      <optional>
-        <attribute name="spacings"/>
-      </optional>
-      <optional>
-        <attribute name="scale"/>
-      </optional>
-      <optional>
-        <attribute name="curve"/>
-      </optional>
-      <optional>
-        <attribute name="domain"/>
-      </optional>
-      <optional>
-        <attribute name="N"/>
-      </optional>
-      <optional>
-        <attribute name="arrow-width"/>
-      </optional>
-      <optional>
-        <attribute name="arrow-angles">
-          <optional>
-            <text/>
-          </optional>
-        </attribute>
-      </optional>
-      <ref name="StrokeAttributes"/>
-      <ref name="CommonAttributes"/>
-    </element>
-  </define>
   <define name="Grid">
     <element name="grid">
       <optional>
@@ -1407,6 +1333,25 @@
       </optional>
     </element>
   </define>
+  <define name="Contour">
+    <element name="contour">
+      <optional>
+        <attribute name="at"/>
+      </optional>
+      <attribute name="function"/>
+      <optional>
+        <attribute name="k"/>
+      </optional>
+      <optional>
+        <attribute name="depth"/>
+      </optional>
+      <optional>
+        <attribute name="initial-depth"/>
+      </optional>
+      <ref name="StrokeAttributes"/>
+      <ref name="CommonAttributes"/>
+    </element>
+  </define>
   <define name="Circle">
     <element name="circle">
       <optional>
@@ -2198,4 +2143,41 @@
       <ref name="CommonAttributes"/>
     </element>
   </define>
+  <define name="Vector-Field">
+    <element name="vector-field">
+      <optional>
+        <attribute name="at"/>
+      </optional>
+      <optional>
+        <attribute name="function"/>
+      </optional>
+      <optional>
+        <attribute name="spacings"/>
+      </optional>
+      <optional>
+        <attribute name="scale"/>
+      </optional>
+      <optional>
+        <attribute name="curve"/>
+      </optional>
+      <optional>
+        <attribute name="domain"/>
+      </optional>
+      <optional>
+        <attribute name="N"/>
+      </optional>
+      <optional>
+        <attribute name="arrow-width"/>
+      </optional>
+      <optional>
+        <attribute name="arrow-angles">
+          <optional>
+            <text/>
+          </optional>
+        </attribute>
+      </optional>
+      <ref name="StrokeAttributes"/>
+      <ref name="CommonAttributes"/>
+    </element>
+  </define>
 </grammar>

{prefig-0.3.9.dev20250726054209.dist-info → prefig-0.3.9.dev20250728054658.dist-info}/METADATA

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

{prefig-0.3.9.dev20250726054209.dist-info → prefig-0.3.9.dev20250728054658.dist-info}/RECORD

@@ -22,7 +22,7 @@ prefig/core/label.py,sha256=e_gOd2kcdOtcJay1VyRstP66SiDNxK2UK2-obkxQnOc,24746
 prefig/core/label_tools.py,sha256=jOawiyrKC5iQs0vq7133xNXqrkJbMqDZVHflT-hOruo,9167
 prefig/core/legend.py,sha256=0mVfyU3LvqgDCYUOlCeBD04maV-rj2h0fs1aOEBBt6c,13340
 prefig/core/line.py,sha256=HBB9cvJawKAtdubISn5maRrzFFzV0NQuBgwoQoxeXcw,6055
-prefig/core/math_utilities.py,sha256=nQV8RiZRvGgqAeatWwHKOHb107ZcLRgwa77CaXvUmCg,5892
+prefig/core/math_utilities.py,sha256=sMm3U9rcYKY8oZZWeJjcBokCDO4CxUkvmaX55auR4Eo,5927
 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
@@ -34,11 +34,11 @@ prefig/core/rectangle.py,sha256=T0EMtRdLtmG1uY7Bu8kXmxQ81IGG_102g5fLCg9RuzE,3387
 prefig/core/repeat.py,sha256=DAO5w4BxUMGU-8ymsv8EwsifI0zPa_cgIRUcWWS8BWU,2755
 prefig/core/riemann_sum.py,sha256=T2dQgJIY17QuuPDOB8XWIP8HYmg5jOQ-LroFH7tiGAU,3012
 prefig/core/shape.py,sha256=Qb_-upbSHwEoYrrAnbCoFFFuVIb3JgJLdyP9ckD5evc,8675
-prefig/core/slope_field.py,sha256=MQgqwfsBNL4bZYqcpEif64gj7Xz6a1SSfcJPAYBZAE8,8231
+prefig/core/slope_field.py,sha256=e396uznWNaCUmOIIf70lsxvy9g_SGRFZlpxsIpy4ajE,8640
 prefig/core/statistics.py,sha256=5qN_-ABN0EFVG12ZP95uSPk82INbWRqI3w2fUdR3wsw,3458
-prefig/core/tags.py,sha256=Y3LdH8KSEqIbjTrQLBOV56WMqGbjII-kEhtlEEIKSTQ,4048
+prefig/core/tags.py,sha256=fj86TjSkSpo0cAYmp0OQ83ULX9B8Nz4PRsNyZsR2JMk,4088
 prefig/core/tangent_line.py,sha256=I9wf9VAqhnmmsh8Lzynwi7_Z1DonHXqHf8ym7eO40tk,3400
-prefig/core/user_namespace.py,sha256=73rV4iXICoh84xHCqBMTcIXNXGPQcPvTUEE8qFiSivM,6980
+prefig/core/user_namespace.py,sha256=6xlkYd2g9dSiDPH0vmYj93oPzm1BFZdgyMGQ9ipKOgU,7059
 prefig/core/utilities.py,sha256=R1fBrzj-abXHG4Bh-sS0pZNC8vc9fIt6yJBcuztCVho,2905
 prefig/core/vector.py,sha256=lTw-y9mt6jqmbFxdPwQB4PYBQ9y4pGrQRcpRp9lBIbY,2917
 prefig/engine.py,sha256=Zz7j2sFxeMwPN1f3GFTpaBihqguzMNJD5iBONOVL7eQ,11972
@@ -55,13 +55,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=33E_zj90OVa9xU6QXfBgJZwlPzaoNgtTYrAcp2uBEdk,19954
-prefig/resources/schema/pf_schema.rng,sha256=YC9BYvLNa1OgHs3Y5fV_99NwbQaXTfKnAAhjE3L8tAE,53903
+prefig/resources/schema/pf_schema.rnc,sha256=KAmcFfhLpVRVG9nFzdHcPOMdEj62aUOMs6BXqiXy7jc,19824
+prefig/resources/schema/pf_schema.rng,sha256=OfOY7Pgd_G6V07v6kqRVJlvyAbyclWBSX9Q8Br97CKo,53495
 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.3.9.dev20250726054209.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-prefig-0.3.9.dev20250726054209.dist-info/METADATA,sha256=dagV-ujiU-KtJOZKABw4eolGUmoOyUDvKI5O6uwmTvE,8728
-prefig-0.3.9.dev20250726054209.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prefig-0.3.9.dev20250726054209.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
-prefig-0.3.9.dev20250726054209.dist-info/RECORD,,
+prefig-0.3.9.dev20250728054658.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+prefig-0.3.9.dev20250728054658.dist-info/METADATA,sha256=kqDcIYXexeaIQR_LzQ9tVV7kntpcoTyqFzjSh28PbdQ,8728
+prefig-0.3.9.dev20250728054658.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prefig-0.3.9.dev20250728054658.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
+prefig-0.3.9.dev20250728054658.dist-info/RECORD,,