prefig 0.3.9.dev20250726054209__tar.gz → 0.3.9.dev20250727054417__tar.gz

{prefig-0.3.9.dev20250726054209 → prefig-0.3.9.dev20250727054417}/PKG-INFO

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

{prefig-0.3.9.dev20250726054209 → prefig-0.3.9.dev20250727054417}/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-0.3.9.dev20250726054209 → prefig-0.3.9.dev20250727054417}/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-0.3.9.dev20250726054209 → prefig-0.3.9.dev20250727054417}/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-0.3.9.dev20250726054209 → prefig-0.3.9.dev20250727054417}/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-0.3.9.dev20250726054209 → prefig-0.3.9.dev20250727054417}/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-0.3.9.dev20250726054209 → prefig-0.3.9.dev20250727054417}/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 → prefig-0.3.9.dev20250727054417}/pyproject.toml

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