prefig 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

prefig/core/annotations.py

@@ -33,14 +33,20 @@ def annotate(element, diagram, parent = None):
         parent = diagram.get_annotations_root()
 
     if element.get('ref', None) is not None:
-        element.set('id', element.get('ref'))
+        ref = element.get('ref')
+        if not ref.startswith('pf__'):
+            ref = 'pf__' + ref
+        element.set('id', ref)
         element.attrib.pop('ref')
     else:
         log.info(f"An annotation has an empty attribute ref")
     element.attrib.pop('annotate', None)
 
     # let's check to see if this is a reference to an annotation branch
-    annotation = diagram.get_annotation_branch(element.get('id'))
+    id = element.get('id')
+    if not id.startswith('pf__'):
+        id = 'pf__' + id
+    annotation = diagram.get_annotation_branch(id)
     if annotation is not None:
         annotate(annotation, diagram, parent)
         return

prefig/core/arrow.py

@@ -22,7 +22,7 @@ def add_tactile_arrowhead_marker(diagram, path, mid=False):
     # get the stroke width from the graphical component
     stroke_width_str = path.get('stroke-width', '1')
     stroke_width = int(stroke_width_str)
-    id = 'arrow-head-'+stroke_width_str
+    id = 'pf__arrow-head-'+stroke_width_str
 
     # if we've seen this already, there's no need to create it again
     if diagram.has_reusable(id):
@@ -180,12 +180,12 @@ def add_arrowhead_marker(diagram,
     # end or in the middle of a path
     id_data = f"_{arrow_width}_{arrow_angles[0]}_{arrow_angles[1]}"
     if not mid:
-        id = 'arrow-head-end-'+stroke_width_str+id_data+'-'+stroke_color
+        id = 'pf__arrow-head-end-'+stroke_width_str+id_data+'-'+stroke_color
         if arrow_width is None:
             arrow_width = 4
         dims = (1, arrow_width)
     else:
-        id = 'arrow-head-mid-'+stroke_width_str+id_data+'-'+stroke_color
+        id = 'pf__arrow-head-mid-'+stroke_width_str+id_data+'-'+stroke_color
         if arrow_width is None:
             arrow_width = 13/3
         dims = (1, arrow_width) #11/3)

prefig/core/axes.py

@@ -147,7 +147,7 @@ class Axes():
 
         self.axes = ET.SubElement(parent, 'g',
                                   attrib={
-                                      'id': element.get('id', 'axes'),
+                                      'id': element.get('id', 'pf__axes'),
                                       'stroke': self.stroke,
                                       'stroke-width': self.thickness
                                   }

prefig/core/clip.py

@@ -18,7 +18,7 @@ def clip(element, diagram, parent, outline_status):
 
     clip = ET.Element('clipPath')
     clip.append(shape)
-    clip_id = 'clip-'+shape_ref
+    clip_id = shape_ref + '-clip'
     clip.set('id', clip_id)
 
     diagram.add_reusable(clip)

prefig/core/diagram.py

@@ -60,7 +60,7 @@ class Diagram:
         self.root = ET.Element("svg", nsmap = nsmap)
 
         self.id_suffix = ['']
-        self.add_id(self.root, diagram_element.get('id', 'diagram'))
+        self.add_id(self.root, diagram_element.get('id', 'pf__figure'))
 
         # prepare the XML tree for annotations, if there are any
         self.annotations_root = None
@@ -195,9 +195,12 @@ class Diagram:
         suffix = ''.join(self.id_suffix)
         if id is None:
             self.ids[element.tag] = self.ids.get(element.tag, -1) + 1
-            return element.tag+'-'+str(self.ids[element.tag])+suffix
+            result_id = element.tag+'-'+str(self.ids[element.tag])+suffix
         else:
-            return id + suffix
+            result_id = id + suffix
+        if result_id.startswith('pf__'):
+            return result_id
+        return 'pf__' + result_id
 
     def append_id_suffix(self, element):
         return self.find_id(element, element.get('id', None))
@@ -671,10 +674,16 @@ class Diagram:
 
     def add_annotation_to_branch(self, annotation):
         if len(self.annotation_branch_stack) == 0:
-            self.annotation_branches[annotation.get('id')] = annotation
+            id = annotation.get('id')
+            if not id.startswith('pf__'):
+                id = 'pf__' + id
+            self.annotation_branches[id] = annotation
             return
         self.annotation_branch_stack[-1].append(annotation)
-        annotation.set('id', self.append_id_suffix(annotation))
+        id = self.append_id_suffix(annotation)
+        if not id.startswith('pf__'):
+            id = 'pf__' + id
+        annotation.set('id', id)
 
     def get_annotation_branch(self, id):
         return self.annotation_branches.pop(id, None)

prefig/core/grid_axes.py

@@ -120,9 +120,14 @@ def grid(element, diagram, parent, outline_status):
 
     thickness = element.get('thickness', '1')
     stroke = element.get('stroke', r'#ccc')
+    id = element.get('id')
+    if id is None:
+        id = 'pf__grid'
+    if not id.startswith('pf__'):
+        id = 'pf__' + id
     grid = ET.SubElement(parent, 'g',
                          attrib={
-                             'id': element.get('id', 'grid'),
+                             'id': id,
                              'stroke': stroke,
                              'stroke-width': thickness
                          }
@@ -268,27 +273,27 @@ def grid_axes(element, diagram, parent, outline_status):
     group = ET.SubElement(parent, 'g',
                           attrib=
                           {
-                              'id': 'grid-axes'
+                              'id': 'pf__grid-axes'
                           }
     )
 
     group_annotation = ET.Element('annotation')
-    group_annotation.set('ref', 'grid-axes')
+    group_annotation.set('ref', 'pf__grid-axes')
     group_annotation.set('text', 'The coordinate grid and axes')
     diagram. add_default_annotation(group_annotation)
 
     grid(element, diagram, group, outline_status)
 
     annotation = ET.Element('annotation')
-    annotation.set('ref', 'grid')
+    annotation.set('ref', 'pf__grid')
     annotation.set('text', 'The coordinate grid')
     group_annotation.append(annotation)
 
-    element.set('id', 'axes')
+    element.set('id', 'pf__axes')
     axes.axes(element, diagram, group, outline_status)
 
     annotation = ET.Element('annotation')
-    annotation.set('ref', 'axes')
+    annotation.set('ref', 'pf__axes')
     annotation.set('text', 'The coordinate axes')
     group_annotation.append(annotation)
 

prefig/core/legend.py

@@ -64,7 +64,7 @@ class Legend:
             # first we'll create the label
             label_el = copy.deepcopy(li)
             label_el.tag = 'label'
-            label_el.set('id', f"legend-label-{num}")
+            label_el.set('id', f"pf__legend-label-{num}")
             label_el.set('alignment', 'se')
             label_el.set('anchor', element.get('anchor', anchor_str))
             label_el.set('abs-offset', '(0,0)')
@@ -87,7 +87,7 @@ class Legend:
                 key = copy.deepcopy(key)
                 key.set('p', anchor_str)
                 key.set('size', '4')
-                key.set('id', f"legend-point-{num}")
+                key.set('id', f"pf__legend-point-{num}")
                 key_width = max(key_width, point_width)
             else:
                 fill =  key.get('fill')
@@ -219,11 +219,11 @@ class Legend:
             id = group.get('id', 'none')
             if id == 'background-group':
                 for rectangle in group:
-                    if rectangle.get('id', 'none').startswith('legend-label'):
+                    if rectangle.get('id', 'none').startswith('pf__legend-label'):
                         group.remove(rectangle)
             if id == 'braille-group':
                 for label in group:
-                    if label.get('id','none').startswith('legend-label'):
+                    if label.get('id','none').startswith('pf__legend-label'):
                         label_groups.append(label)
                         group.remove(label)
 

prefig/core/repeat.py

@@ -60,7 +60,10 @@ def repeat(element, diagram, parent, outline_status):
     if outline is not None:
         element.set('outline', outline)
     if id is not None:
+        if not id.startswith('pf__'):
+            id = 'pf__' + id
         element.set('id', id)
+        element_cp.set('id', id)
 
     for num, k in enumerate(iterator):
         if isinstance(k, np.ndarray):

prefig/core/shape.py

@@ -36,7 +36,10 @@ def define(element, diagram, parent, outline_status):
             log.error(f"In <define-shapes>, {child.tag} does not define a shape")
             continue
         if child.get('at', None) is not None:
-            child.set('id', child.get('at'))
+            id = child.get('at')
+            if not id.startswith('pf__'):
+                id = 'pf__' + id
+            child.set('id', id)
         dummy_parent = ET.Element('group')
         # this is kind of a hack, but we only need to construct the shape
         # so we stash the format temporarily in case we're building a
@@ -69,6 +72,12 @@ def shape(element, diagram, parent, outline_status):
             return
 
     shape_refs = [r.strip() for r in reference.split(',')]
+    shape_edit = []
+    for shape_ref in shape_refs:
+        if not shape_ref.startswith('pf__'):
+            shape_ref = 'pf__' + shape_ref
+        shape_edit.append(shape_ref)
+    shape_refs = shape_edit
     shapes = []
     for ref in shape_refs:
         shapes.append(diagram.recall_shape(ref))
@@ -82,6 +91,8 @@ def shape(element, diagram, parent, outline_status):
             operation = 'union'
         else:
             path = ET.SubElement(parent, 'use')
+            if not reference.startswith('pf__'):
+                reference = 'pf__' + reference
             path.set('href', r'#' + reference)
 
     if operation is not None:

{prefig-0.5.0.dist-info → prefig-0.5.2.dist-info}/METADATA

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

{prefig-0.5.0.dist-info → prefig-0.5.2.dist-info}/RECORD

@@ -2,26 +2,26 @@ 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=roT0a8-iBrp8WXTbPN5RzMWFiCXfpKrEXa2xE-F-yBo,728
-prefig/core/annotations.py,sha256=YYt7xVVVTbsuxGx7cSaW7KMMDa52STLEhTwAlDkBfoA,7710
+prefig/core/annotations.py,sha256=0vNxWkSAIDIs2L6pTJT0vGgL7qn0yBRw0to6kUeWcTw,7869
 prefig/core/area.py,sha256=U-AxXvaZJWgVccpLlh-aaRfM_QtTa09NR2TqAd8Yk0o,3710
-prefig/core/arrow.py,sha256=D5JWKt3Va13f1tNeiyvpohwm6en0EA3KSFODbiE_bio,11498
-prefig/core/axes.py,sha256=3J6eWNXRWTlbFVNfWkv_-Hyq4L7UP54EQ5u1r82Cfy0,31830
+prefig/core/arrow.py,sha256=NJIh6E1W7NDfyw0BK9mhIrdF1s0Z8iKI0Ut8cM0qvDA,11510
+prefig/core/axes.py,sha256=8cvN0R_-dd6F11tTzGZU9sFy0qUPseJc8jsRFQUenSk,31834
 prefig/core/calculus.py,sha256=Q4kSGTTTeQYEEVKgmYWpFP0JLHmCsBchB5OF9qSclQk,498
 prefig/core/circle.py,sha256=zWm0emJ2YzH4EcaOqgxMgg-_t4Qcrd2Itfo6_s_61uo,16054
-prefig/core/clip.py,sha256=X3TcFYPuZwjZ9SFBWMc1MYY__6XTJqLafPeOLFNOdIE,806
+prefig/core/clip.py,sha256=G4bg7jTGWCd284yzhCwOBbXdxgKvokYbEr2ITA4febI,808
 prefig/core/compat.py,sha256=_dI4aGtDrfhcw33r1SQS6kMwwgJj8dJ2A2GcLmtwX7o,729
 prefig/core/coordinates.py,sha256=vEAJ8kL9S1VylxWysqY5qW2WyCMyHj42yFkuAzjfqFs,3518
 prefig/core/definition.py,sha256=7LiaCxQwwEPdcnMpcMgrkZEfAoTc5ng8LO6Nf50Htwg,1033
-prefig/core/diagram.py,sha256=q9BbSm6bSbjnXdWUOvJWVu7zICc077CWext1g2iYing,26219
+prefig/core/diagram.py,sha256=PwUoJ0s3sIdTgFxGir_scQvAI5E_uGnLbRONBXIxofs,26514
 prefig/core/diffeqs.py,sha256=aLXcmTsnfTG6L2-RiNfSaijzwmJF6xJcQpNQdDAWTQo,7127
 prefig/core/graph.py,sha256=q81dyJy3CxMWvMNhm74SZ9yjfltatdckmajxegA0z0A,10064
-prefig/core/grid_axes.py,sha256=Lb0uqkDkLlsiWOz5UeaY61zYnl_Tbh3FZXtvl-KawZA,12231
+prefig/core/grid_axes.py,sha256=ASzFksHN317l0S0DcJvrA8io7i9Gl_s8lh5az9t8BJM,12357
 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=iIL0QXyNOGbWSA8xLoPgkkxghTcyHRmdDQw07mvBGjY,25100
 prefig/core/label_tools.py,sha256=jOawiyrKC5iQs0vq7133xNXqrkJbMqDZVHflT-hOruo,9167
-prefig/core/legend.py,sha256=0mVfyU3LvqgDCYUOlCeBD04maV-rj2h0fs1aOEBBt6c,13340
+prefig/core/legend.py,sha256=S8r0M-nfoQL6tMpeq79xTgDQen9c13NAzMX5au1x47Q,13356
 prefig/core/line.py,sha256=3Q0bIYoKkKlTfdM-wMh9xXSQgEpMAwyWPAmJZgzDFzc,9038
 prefig/core/math_utilities.py,sha256=sMm3U9rcYKY8oZZWeJjcBokCDO4CxUkvmaX55auR4Eo,5927
 prefig/core/network.py,sha256=1izAX2AKvnj2knElrdLeojE_0Q0zO0aQM-EsEwor0Os,27217
@@ -32,9 +32,9 @@ prefig/core/point.py,sha256=n95dHgEjynMauBzfSXbQPnZqyUEWRm4HA9fUTh-e_8M,8912
 prefig/core/polygon.py,sha256=BJ-n9XnxSHb3UFu7lCqOEb48uyGvGGwsA_65dR8_6X4,11429
 prefig/core/read.py,sha256=Q1Nsluwysg3M5wtUmwIirfNo-Rw9-dFJPEeM4pDCpyo,1988
 prefig/core/rectangle.py,sha256=TzdVckcPfNV8fI1xs8FgHadx06wn2P6A504oyDO3xGY,3567
-prefig/core/repeat.py,sha256=6HtCMzIT0r3bndeVn2oyp_FrBillN3HtJnhATLV_a-I,3700
+prefig/core/repeat.py,sha256=iQHJWhhx6hih1SPFBTk-BSyWSyxDvlOikuKb2F6iHSY,3800
 prefig/core/riemann_sum.py,sha256=T2dQgJIY17QuuPDOB8XWIP8HYmg5jOQ-LroFH7tiGAU,3012
-prefig/core/shape.py,sha256=Qb_-upbSHwEoYrrAnbCoFFFuVIb3JgJLdyP9ckD5evc,8675
+prefig/core/shape.py,sha256=JUy6etGGYzlx5d_CzKpIcK4vmx9BTpJixbCQ3-q87QE,9072
 prefig/core/slope_field.py,sha256=KThnVBuO_3QK7k6xxCWnsbiv-X9P8oS1SgFPLoynA-E,8797
 prefig/core/statistics.py,sha256=5qN_-ABN0EFVG12ZP95uSPk82INbWRqI3w2fUdR3wsw,3458
 prefig/core/tags.py,sha256=7w6E3960o_ZgZl4xYJLVJ1eLttt0vVlB4IgMZGTMyyE,4134
@@ -61,8 +61,8 @@ prefig/resources/schema/pf_schema.rng,sha256=6U72-HDhdS9drcKoTBVyBxo1XLXxMnPJvrQ
 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.5.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-prefig-0.5.0.dist-info/METADATA,sha256=ujTSJNU9DH_xEBxY_tK1h9Yvc6xqvjhm4RWLAybmlEg,8690
-prefig-0.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prefig-0.5.0.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
-prefig-0.5.0.dist-info/RECORD,,
+prefig-0.5.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+prefig-0.5.2.dist-info/METADATA,sha256=oD2Es0nmEh7uG4sAJxe6baO7uz698TCGr2QQbnmz_Jw,8690
+prefig-0.5.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prefig-0.5.2.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
+prefig-0.5.2.dist-info/RECORD,,