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

prefig/core/__init__.py

@@ -13,6 +13,7 @@ from . import (
     graph,
     grid_axes,
     group,
+    image,
     implicit,
     label,
     label_tools,

prefig/core/axes.py

@@ -787,8 +787,8 @@ def tick_mark(element, diagram, parent, outline_status):
         size = un.valid_eval(element.get('size'))
         if not isinstance(size, np.ndarray):
             size = (size, size)
-        else:
-            size = (3,3)
+    else:
+        size = (3,3)
 
     if tactile:
         size = (18,0)
@@ -869,8 +869,8 @@ def tick_mark(element, diagram, parent, outline_status):
 
         if el_copy.get('alignment', None) is None:
             el_copy.set('alignment', align)
-        if el_copy.get('offset', None) is None:
-            el_copy.set('offset', off)
+            if el_copy.get('offset', None) is None:
+                el_copy.set('offset', off)
         el_copy.set("user-coords", "no")
         el_copy.set("anchor", util.pt2str(p, spacer=","))
         label.label(el_copy, diagram, parent, outline_status)

prefig/core/graph.py

@@ -29,6 +29,10 @@ def graph(element, diagram, parent, outline_status = None):
             domain = [bbox[0], bbox[2]]
     else:
         domain = un.valid_eval(domain)
+        if domain[0] == -np.inf:
+            domain[0] = bbox[0]
+        if domain[1] == np.inf:
+            domain[1] = bbox[2]
 
     # if there are arrows, we need to pull the domain in by two pixels
     # so that the arrows don't go outside the domain

prefig/core/image.py

@@ -0,0 +1,127 @@
+import lxml.etree as ET
+import logging
+import numpy as np
+import base64
+import lxml.etree as ET
+from . import user_namespace as un
+from . import group
+from . import utilities as util
+from . import CTM
+
+log = logging.getLogger('prefigure')
+
+type_dict = {'jpg':'jpeg',
+             'jpeg':'jpeg',
+             'png':'png',
+             'gif':'gif',
+             'svg':'svg'}
+
+# Allows a block of XML to repeat with a changing parameter
+
+def image(element, diagram, parent, outline_status):
+    if len(element) == 0:
+        log.error("An <image> must contain content to replace the image in a tactile build")
+        return;
+    
+    if diagram.output_format() == 'tactile':
+        element.tag = 'group'
+        group.group(element, diagram, parent, outline_status)
+        return
+        
+    source = element.get('source', None)
+    if source is None:
+        log.error("An <image> needs a @source attribute")
+        return
+    try:
+        ll = un.valid_eval(element.get('lower-left', '(0,0)'))
+        dims = un.valid_eval(element.get('dimensions', '(1,1)'))
+        center = element.get('center', None)
+        if center is not None:
+            center = un.valid_eval(center)
+            ll = center - 0.5 * dims
+        else:
+            center = ll + 0.5*dims
+        rotation = un.valid_eval(element.get('rotate', '0'))
+        scale = un.valid_eval(element.get('scale', '1'))
+    except:
+        log.error("Error parsing placement data in an <image>")
+        return
+
+    file_type = None
+    if element.get('filetype', None) is not None:
+        file_type = type_dict.get(element.get('filetype'), None)
+    if file_type is None:
+        suffix = source.split('.')[-1]
+        file_type = type_dict.get(suffix, None)
+    if file_type is None:
+        log.error(f"Cannot determine the type of image in {source}")
+        return
+
+    ll_svg = diagram.transform(ll)
+    ur_svg = diagram.transform(ll + dims)
+    center_svg = diagram.transform(center)
+    width, height = ur_svg - ll_svg
+    height = -height
+
+    if diagram.get_environment() == 'pretext':
+        source = 'data/' + source
+    else:
+        assets_dir = diagram.get_external()
+        if assets_dir is not None:
+            assets_dir = assets_dir.strip()
+            if assets_dir[-1] != '/':
+                assets_dir += '/'
+            source = assets_dir + source
+
+    opacity = element.get('opacity', None)
+    if opacity is not None:
+        opacity = un.valid_eval(opacity)
+    if file_type == 'svg':
+        svg_tree = ET.parse(source)
+        svg_root = svg_tree.getroot()
+        svg_width = svg_root.get('width', None)
+        svg_height = svg_root.get('height', None)
+
+        object = ET.SubElement(parent, 'foreignObject')
+        object.set('x', util.float2str(center_svg[0]-width/2))
+        object.set('y', util.float2str(center_svg[1]-height/2))
+        object.set('width', util.float2str(width))
+        object.set('height', util.float2str(height))
+        svg_root.set('width', '100%')
+        svg_root.set('height', '100%')
+        if svg_root.get('viewBox', None) is None:
+            svg_root.set('viewBox', f"0 0 {svg_width} {svg_height}")
+        object.append(svg_root)
+        diagram.add_id(object, element.get('id'))
+        svg_root.attrib.pop('id', None)
+        if opacity is not None:
+            object.set('opacity', util.float2str(opacity))
+        return
+
+    image_el = ET.SubElement(parent, 'image')
+    image_el.set('x', util.float2str(-width/2))
+    image_el.set('y', util.float2str(-height/2))
+    image_el.set('width', util.float2str(width))
+    image_el.set('height', util.float2str(height))
+    if opacity is not None:
+        image_el.set('opacity', util.float2str(opacity))
+    diagram.add_id(image_el, element.get('id'))
+
+    with open(source, "rb") as image_file:
+        encoded_string = base64.b64encode(image_file.read())
+        encoded_string = encoded_string.decode('utf-8')
+    ref = f"data:image/{file_type};base64,{encoded_string}"
+    image_el.set('href', ref)
+
+    transform_pieces = [CTM.translatestr(*center_svg)]
+
+    if isinstance(scale, np.ndarray):
+        transform_pieces.append(CTM.scalestr(*scale))
+    elif scale != '1':
+        transform_pieces.append(f"scale({scale})")
+            
+    if rotation != 0:
+        transform_pieces.append(f"rotate({-rotation})")
+
+    image_el.set('transform', ' '.join(transform_pieces))
+    

prefig/core/path.py

@@ -480,6 +480,31 @@ def decorate(child, diagram, current_point, cmds):
         cmds += ['L', util.pt2str(ctm.transform((x_pos,0)))]
         cmds += ['L', util.pt2str(ctm.transform((length, 0)))]
 
+    if decoration_data[0] == 'ragged':
+        # offset, step
+        try:
+            data = [d.split('=') for d in decoration_data[1:]]
+            data = {k:v for k, v in data}
+        except:
+            log.error("Error in wave decoration data")
+            return
+        try:
+            offset = un.valid_eval(data['offset'])
+            step = un.valid_eval(data['step'])
+        except:
+            log.error("Error in retrieving the step and an offset in a ragged decoration")
+
+        np.random.seed(int(data.get('seed','1')))
+        x_pos = 0
+        y_pos = 0
+        p = ctm.transform((0,0))
+        cmds += ['L', util.pt2str(ctm.transform((0,0)))]
+        while x_pos < length-step:
+            y_pos = 2 * offset * (np.random.random()-0.5)
+            x_pos += (0.5*np.random.random()+0.75)*step
+            cmds += ['L', util.pt2str(ctm.transform((x_pos,y_pos)))]
+        cmds += ['L', util.pt2str(ctm.transform((length, 0)))]
+
     if decoration_data[0] == 'capacitor':
         try:
             data = [d.split('=') for d in decoration_data[1:]]

prefig/core/rectangle.py

@@ -71,9 +71,11 @@ def rectangle(element, diagram, parent, outline_status):
     path.set('d', ' '.join(cmds))
 
     if diagram.output_format() == 'tactile':
-        if element.get('stroke') is not None:
+        stroke = element.get('stroke')
+        fill   = element.get('fill')
+        if stroke is not None and stroke != 'none':
             element.set('stroke', 'black')
-        if element.get('fill') is not None:
+        if fill is not None and fill != 'none':
             element.set('fill', 'lightgray')
     else:
         util.set_attr(element, 'stroke', 'none')

prefig/core/tags.py

@@ -11,6 +11,7 @@ from . import definition
 from . import graph
 from . import grid_axes
 from . import group
+from . import image
 from . import implicit
 from . import label
 from . import legend
@@ -51,6 +52,7 @@ tag_dict = {
     'grid-axes': grid_axes.grid_axes,
     'group': group.group,
     'histogram': statistics.histogram,
+    'image': image.image,
     'implicit-curve': implicit.implicit_curve,
     'label': label.label,
     'legend': legend.legend,

prefig/resources/schema/pf_schema.rnc

@@ -319,6 +319,7 @@ GraphicalElements =
         Grid* &
         Grid-Axes* &
         Histogram* &
+        Image*&
         Implicit-Curve* &
         Label* &
         Legend* &
@@ -520,6 +521,18 @@ Graph = element graph {
     CommonAttributes
 }
 
+Image = element image {
+    attribute at {text}?,
+    attribute source{text},
+    attribute lower-left {text}?,
+    attribute center {text}?,
+    attribute dimensions {text}?,
+    attribute opacity {text}?,
+    attribute filetype {"svg"|"png"|"gif"|"jpeg"|"jpg"}?,
+    attribute rotate {text}?,
+    attribute scale {text}?
+}
+
 Histogram = element histogram {
     attribute at {text}?,
     attribute data {text},

prefig/resources/schema/pf_schema.rng

@@ -780,6 +780,9 @@
       <zeroOrMore>
         <ref name="Histogram"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="Image"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="Implicit-Curve"/>
       </zeroOrMore>
@@ -1430,6 +1433,43 @@
       <ref name="CommonAttributes"/>
     </element>
   </define>
+  <define name="Image">
+    <element name="image">
+      <optional>
+        <attribute name="at"/>
+      </optional>
+      <attribute name="source"/>
+      <optional>
+        <attribute name="lower-left"/>
+      </optional>
+      <optional>
+        <attribute name="center"/>
+      </optional>
+      <optional>
+        <attribute name="dimensions"/>
+      </optional>
+      <optional>
+        <attribute name="opacity"/>
+      </optional>
+      <optional>
+        <attribute name="filetype">
+          <choice>
+            <value>svg</value>
+            <value>png</value>
+            <value>gif</value>
+            <value>jpeg</value>
+            <value>jpg</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="rotate"/>
+      </optional>
+      <optional>
+        <attribute name="scale"/>
+      </optional>
+    </element>
+  </define>
   <define name="Histogram">
     <element name="histogram">
       <optional>

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

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

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

@@ -1,11 +1,11 @@
 prefig/__init__.py,sha256=tAf78JkO5kBvFM23RmchK8TEDYO6v8AXqzOv-kq7TR0,53
 prefig/cli.py,sha256=-jbXTVb2Vao4uefq3ia69DDh7ZQivIO-H1grzCVPg0I,12495
 prefig/core/CTM.py,sha256=P32b5rfJD_8QwMNCHRAS6lIB5ellBi1gaSdhxTV4a00,5781
-prefig/core/__init__.py,sha256=1EoRwLI_BVkLiO5ulkKNd7MlEuAiLW7wnM_3KO92LCA,717
+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=hTvw8uAuTlVaFFfOAv5xlhk0ol0TyZZTktsM_R_4wn0,31677
+prefig/core/axes.py,sha256=-EIWIIfU8VFN2WLlPUQZFIO13PLXWvfja3wUlSbthQk,31677
 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
@@ -14,9 +14,10 @@ prefig/core/coordinates.py,sha256=vEAJ8kL9S1VylxWysqY5qW2WyCMyHj42yFkuAzjfqFs,35
 prefig/core/definition.py,sha256=7LiaCxQwwEPdcnMpcMgrkZEfAoTc5ng8LO6Nf50Htwg,1033
 prefig/core/diagram.py,sha256=7Hsa8xOpGmLnln2Chl-ofVl_bG6ZOEJPGV2vE1V8RnI,22599
 prefig/core/diffeqs.py,sha256=aLXcmTsnfTG6L2-RiNfSaijzwmJF6xJcQpNQdDAWTQo,7127
-prefig/core/graph.py,sha256=DSgvfJdk-dsBX0yHwjHhI1nkD-yU9gfKAGjFwAQIoWk,9935
+prefig/core/graph.py,sha256=q81dyJy3CxMWvMNhm74SZ9yjfltatdckmajxegA0z0A,10064
 prefig/core/grid_axes.py,sha256=v98C5tb9knNViGYGDrWL_ULb7Y78vMSQ6OJO7Xd0DXY,12165
 prefig/core/group.py,sha256=KByOibuslP9TqSygNfPSaN4zU5oSRYaH2CPnR21ogTg,5825
+prefig/core/image.py,sha256=eQKy0mNvCE6J8EA1S5Y08YF3lrb7kCeGG4wrjBQ_-pI,4373
 prefig/core/implicit.py,sha256=JyFKpKj6Xi1PF-3BeZpd7t0aNe8jH9Wf_E2rghvt-Ug,6179
 prefig/core/label.py,sha256=e_gOd2kcdOtcJay1VyRstP66SiDNxK2UK2-obkxQnOc,24746
 prefig/core/label_tools.py,sha256=jOawiyrKC5iQs0vq7133xNXqrkJbMqDZVHflT-hOruo,9167
@@ -26,17 +27,17 @@ prefig/core/math_utilities.py,sha256=sMm3U9rcYKY8oZZWeJjcBokCDO4CxUkvmaX55auR4Eo
 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=ZWKUNgVU4qeU98Vp4WKpQoy7DehH1UmnyXA4DKRhpGo,19365
+prefig/core/path.py,sha256=8BbWAUzZqe1YD0gO4QtDENaINavAAC1mlU-y3UV-vu0,20312
 prefig/core/point.py,sha256=a97N1soBcmYn3StZ60HBmaBi3pB1abA7sL0LNJ2nxR0,8341
 prefig/core/polygon.py,sha256=8NVdWSUVXuNE4GiPQ4MySSmLy8aCNwKUqCcfHukizME,11301
 prefig/core/read.py,sha256=Q1Nsluwysg3M5wtUmwIirfNo-Rw9-dFJPEeM4pDCpyo,1988
-prefig/core/rectangle.py,sha256=T0EMtRdLtmG1uY7Bu8kXmxQ81IGG_102g5fLCg9RuzE,3387
+prefig/core/rectangle.py,sha256=b_ki7yqA4-mke1_0khvKqSKBRToB667mZc-xZhhPIBA,3473
 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=e396uznWNaCUmOIIf70lsxvy9g_SGRFZlpxsIpy4ajE,8640
 prefig/core/statistics.py,sha256=5qN_-ABN0EFVG12ZP95uSPk82INbWRqI3w2fUdR3wsw,3458
-prefig/core/tags.py,sha256=fj86TjSkSpo0cAYmp0OQ83ULX9B8Nz4PRsNyZsR2JMk,4088
+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
@@ -55,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=KAmcFfhLpVRVG9nFzdHcPOMdEj62aUOMs6BXqiXy7jc,19824
-prefig/resources/schema/pf_schema.rng,sha256=OfOY7Pgd_G6V07v6kqRVJlvyAbyclWBSX9Q8Br97CKo,53495
+prefig/resources/schema/pf_schema.rnc,sha256=WORhF-dRkNY8aeiNQvZIaPTE5QGCMzbrXqttXCjtOJY,20166
+prefig/resources/schema/pf_schema.rng,sha256=TmZQLgyK2wntXDXOiQXYcVQedlPuPh8IWrtttK0iCQY,54454
 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.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,,
+prefig-0.3.9.dev20250730054824.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+prefig-0.3.9.dev20250730054824.dist-info/METADATA,sha256=FZsmOvFwrgQuC2gNmrd283Sq0qRzWP4sWSoQurCHUqg,8728
+prefig-0.3.9.dev20250730054824.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prefig-0.3.9.dev20250730054824.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
+prefig-0.3.9.dev20250730054824.dist-info/RECORD,,