prefig 0.3.9.dev20250728054658__tar.gz → 0.3.9.dev20250730054824__tar.gz

{prefig-0.3.9.dev20250728054658 → prefig-0.3.9.dev20250730054824}/PKG-INFO

@@ -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 → prefig-0.3.9.dev20250730054824}/prefig/core/__init__.py

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

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

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