prefig 0.4.8__tar.gz → 0.5.0__tar.gz

{prefig-0.4.8 → prefig-0.5.0}/PKG-INFO

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

{prefig-0.4.8 → prefig-0.5.0}/prefig/core/diagram.py

@@ -79,6 +79,9 @@ class Diagram:
         # a dictionary for holding shapes
         self.shape_dict = {}
 
+        # dictionary for saving graphical data
+        self.saved_data = {}
+
         # each SVG element will have an id, we'll store a count of ids here
         self.ids = {}
 
@@ -235,6 +238,12 @@ class Diagram:
             log.error(f"Unable to apply inverse coordinate transform to {p}")
             return np.array([0,0])
 
+    def save_data(self, element, data):
+        self.saved_data[element] = data
+
+    def retrieve_data(self, element):
+        return self.saved_data.get(element, None)
+
     def begin_figure(self):
         # set up the dimensions of the diagram in SVG coordinates
         dims = self.diagram_element.get('dimensions')

{prefig-0.4.8 → prefig-0.5.0}/prefig/core/grid_axes.py

@@ -251,12 +251,14 @@ def grid(element, diagram, parent, outline_status):
         if x < bbox[0] or x > bbox[2]:
             continue
         line_el = line.mk_line((x,bbox[1]), (x,bbox[3]), diagram)
+        line_el.attrib.pop('id')
         grid.append(line_el)
 
     for y in y_positions:
         if y < bbox[1] or y > bbox[3]:
             continue
         line_el = line.mk_line((bbox[0], y), (bbox[2], y), diagram)
+        line_el.attrib.pop('id')
         grid.append(line_el)
 
 

{prefig-0.4.8 → prefig-0.5.0}/prefig/core/line.py

@@ -5,7 +5,11 @@ import logging
 from . import utilities as util
 from . import math_utilities as math_util
 from . import user_namespace as un
+import copy
 from . import arrow
+from . import group
+from . import label
+from . import CTM
 
 log = logging.getLogger('prefigure')
 
@@ -50,12 +54,24 @@ def line(element, diagram, parent, outline_status):
 
     line = mk_line(p1, p2, diagram, element.get('id', None), 
                    endpoint_offsets=endpoint_offsets)
+
+    # we need to hold on to the endpoints in case the line is labelled
+    # these are endpoints in SVG coordinates
+    x1 = float(line.get('x1'))
+    x2 = float(line.get('x2'))
+    y1 = float(line.get('y1'))
+    y2 = float(line.get('y2'))
+
+    q1 = np.array((x1, y1))
+    q2 = np.array((x2, y2))
+    diagram.save_data(element, {'q1': q1, 'q2': q2})
+
+    # now add the graphical attributes
     util.set_attr(element, 'stroke', 'black')
     util.set_attr(element, 'thickness', '2')
     if diagram.output_format() == 'tactile':
         element.set('stroke', 'black')
     util.add_attr(line, util.get_1d_attr(element))
-#    line.set('type', 'line')
 
     arrows = int(element.get('arrows', '0'))
     forward = 'marker-end'
@@ -113,15 +129,38 @@ def line(element, diagram, parent, outline_status):
         diagram.add_outline(element, line, parent)
         finish_outline(element, diagram, parent)
     else:
+        original_parent = parent
+        parent = add_label(element, diagram, parent)
         parent.append(line)
 
+        # if no label has been added, then we're done
+        if original_parent == parent:
+            return
+
+        # if there is a label, then the id is on the outer <g> element
+        # so we need to remove it from the children
+        remove_id(parent)
+
 def finish_outline(element, diagram, parent):
+    original_parent = parent
+    parent = add_label(element, diagram, parent)
+
+    # if we've added a label, remove the id's from element under the parent <g>
+    if original_parent != parent:
+        remove_id(parent)
+
     diagram.finish_outline(element,
                            element.get('stroke'),
                            element.get('thickness'),
                            element.get('fill', 'none'),
                            parent)
 
+def remove_id(el):
+    for child in el:
+        if child.get('id', None) is not None:
+            child.attrib.pop('id')
+        remove_id(child)
+
 # We'll be adding lines in other places so we'll use this more widely
 def mk_line(p0, p1, diagram, id = None, endpoint_offsets = None, user_coords = True):
     line = ET.Element('line')
@@ -176,3 +215,55 @@ def infinite_line(p0, p1, diagram, slope = None):
     if t_min > t_max:
         return None, None
     return [p + t * v for t in [t_min, t_max]]
+
+def add_label(element, diagram, parent):
+    # Is there a label associated with point?
+    text = element.text
+
+    # is there a label here?
+    has_text = text is not None and len(text.strip()) > 0
+    all_comments = all([subel.tag is ET.Comment for subel in element])
+    if has_text or not all_comments:
+        # If there's a label, we'll bundle the label and point in a group
+        parent_group = ET.SubElement(parent, 'g')
+        diagram.add_id(parent_group, element.get('id'))
+
+        # Now we'll create a new XML element describing the label
+        el = copy.deepcopy(element)
+        el.tag = 'label'
+
+        data = diagram.retrieve_data(element)
+        q1 = data['q1']
+        q2 = data['q2']
+
+        label_location = un.valid_eval(element.get("label-location", "0.5"))
+        if label_location < 0:
+            label_location = -label_location
+            q1, q2 = q2, q1
+
+        el.set('user-coords', 'no')
+        diff = q2 - q1
+        d = math_util.length(diff)
+        angle = math.degrees(math.atan2(diff[1], diff[0]))
+        if diagram.output_format() == "tactile":
+            anchor = q1 + label_location * diff
+            el.set("anchor", f"({anchor[0]}, {anchor[1]})")
+            direction = (diff[1], diff[0])
+            alignment = label.get_alignment_from_direction(direction)
+            el.set("alignment", alignment)
+            label.label(el, diagram, parent_group)
+        else:
+            tform = CTM.translatestr(*q1)
+            tform += ' ' + CTM.rotatestr(-angle)
+            distance = d * label_location
+            g = ET.SubElement(parent_group, "g")
+            g.set("transform", tform)
+            el.set("anchor", f"({distance},0)")
+            el.set("alignment", "north")
+            label.label(el, diagram, g)
+
+        return parent_group
+
+    else:
+        return parent
+

{prefig-0.4.8 → prefig-0.5.0}/prefig/resources/schema/pf_schema.rnc

@@ -584,7 +584,9 @@ Line = element line {
     attribute reverse {"yes"|"no"}?,
     attribute additional-arrows {"yes"|"no"}?,
     StrokeAttributes,
-    CommonAttributes    
+    CommonAttributes,
+    LabelAttributes,
+    LabelText?
 }
 
 Network = element network {

{prefig-0.4.8 → prefig-0.5.0}/prefig/resources/schema/pf_schema.rng

@@ -1613,6 +1613,10 @@
       </optional>
       <ref name="StrokeAttributes"/>
       <ref name="CommonAttributes"/>
+      <ref name="LabelAttributes"/>
+      <optional>
+        <ref name="LabelText"/>
+      </optional>
     </element>
   </define>
   <define name="Network">

{prefig-0.4.8 → prefig-0.5.0}/pyproject.toml

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