prefig 0.4.6.dev20250926053320__py3-none-any.whl → 0.4.6.dev20250928053207__py3-none-any.whl

prefig/core/annotations.py

@@ -1,5 +1,6 @@
 import lxml.etree as ET
 import logging
+import copy
 
 log = logging.getLogger('prefigure')
 
@@ -122,3 +123,109 @@ def annotate(element, diagram, parent = None):
         ACTIVE = ET.Element('ACTIVE')
         ACTIVE.text = element.get('id')
         sonification.append(ACTIVE)
+
+pronounciations = {
+    'de-solve': 'D E solve',
+    'define-shapes': 'define shapes',
+    'angle-marker': 'angle marker',
+    'area-between-curves': 'area between curves',
+    'area-under-curve': 'area under curve',
+    'grid-axes': 'grid axes',
+    'implicit-curve': 'implicit curve',
+    'parametric-curve': 'parametric curve',
+    'plot-de-solution': 'plot D E solution',
+    'riemann-sum': 'Riemann sum',
+    'slope-field': 'slope field',
+    'tick-mark': 'tick mark',
+    'tangent-line': 'tangent line',
+    'vector-field': 'vector field'
+}
+
+labeled_elements = {
+    'label',
+    'point',
+    'xlabel',
+    'ylabel',
+    'angle-marker',
+    'tick-mark',
+    'item',
+    'node',
+    'edge'
+}
+
+label_subelements = {
+    'm': 'math',
+    'b': 'bold',
+    'it': 'italics',
+    'plain': 'plain',
+    'newline': 'new line'
+}
+
+def diagram_to_speech(diagram):
+    diagram = copy.deepcopy(diagram)
+
+    element_num = 0
+    for element in diagram.getiterator():
+        if element.tag in label_subelements.keys():
+            element.getparent().remove(element)
+            continue
+        attribs = copy.deepcopy(element.attrib)
+        for attrib_name in list(element.attrib.keys()):
+            element.attrib.pop(attrib_name)
+
+        if element.tag == "diagram":
+            element.set('ref', 'figure')
+            intro = "This prefigure source file begins with a diagram having these attributes: "
+        elif element.tag == "definition":
+            element.set('ref', 'element-'+str(element_num))
+            tag_speech = 'definition'
+            intro = "A definition element defining " + element.text.strip()
+        elif element.tag in labeled_elements:
+            element.set('ref', 'element-'+str(element_num))
+            tag_speech = pronounciations.get(element.tag, element.tag)
+            label_text = label_to_speech(element)
+            if len(label_text) > 0:
+                if len(attribs) == 0:
+                    intro = f"A {tag_speech} element with label {label_text}.  The element has no attributes."
+                else:
+                    intro = f"A {tag_speech} element with label {label_text}.  There are these attributes: "
+            else:
+                if len(attribs) == 0:
+                    intro = f"A {tag_speech} element with no attributes."
+                else:
+                    intro = f"A {tag_speech} element with these attributes: "
+            element.text = None
+        else:
+            element.set('ref', 'element-'+str(element_num))
+            tag_speech = pronounciations.get(element.tag, element.tag)
+            if len(attribs) == 0:
+                intro = f"A {tag_speech} element with no attributes"
+            else:
+                intro = f"A {tag_speech} element with these attributes: "
+        element.set("text", intro + attributes_to_speech(attribs))
+        element_num += 1
+        element.tag = "annotation"
+
+    log.error(ET.tostring(diagram, pretty_print=True))
+    return diagram
+
+def attributes_to_speech(attribs):
+    strings = []
+    for key, value in attribs.items():
+        strings.append(f"{key} has value {value}")
+    return ', '.join(strings)
+
+def label_to_speech(element):
+    strings = []
+    if (element.text is not None and
+        len(element.text.strip()) > 0):
+        strings.append(element.text.strip())
+    for child in element:
+        child_speech = label_subelements.get(child.tag, child.tag)
+        strings.append('begin ' + child_speech)
+        strings.append(child.text.strip())
+        strings.append('end ' + child_speech)
+        if (child.tail is not None and
+            child.tail.strip() is not None):
+            strings.append(child.tail.strip())
+    return ' '.join(strings)

prefig/core/diagram.py

@@ -9,6 +9,7 @@ from . import utilities as util
 from . import CTM
 from . import label
 from . import math_utilities as math_util
+from . import annotations
 
 log = logging.getLogger('prefigure')
 
@@ -31,6 +32,16 @@ class Diagram:
         self.environment = environment
         self.caption = ""
 
+        self.add_default_annotations = True
+        if (self.environment == 'pyodide' and
+            len(self.diagram_element.xpath('.//annotations')) == 0
+            ):
+            diagram_annotations = annotations.diagram_to_speech(diagram_element)
+            annotations_tree = ET.SubElement(self.diagram_element,
+                                             'annotations')
+            annotations_tree.append(diagram_annotations)
+            self.add_default_annotations = False
+
         math_util.set_diagram(self)
 
         label.init(self.format, self.environment)
@@ -582,6 +593,8 @@ class Diagram:
         self.annotations_root = ET.Element('annotations')
 
     def add_default_annotation(self, annotation):
+        if not self.add_default_annotations:
+            return
         self.default_annotations.append(annotation)
 
     def get_default_annotations(self):

{prefig-0.4.6.dev20250926053320.dist-info → prefig-0.4.6.dev20250928053207.dist-info}/METADATA

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

{prefig-0.4.6.dev20250926053320.dist-info → prefig-0.4.6.dev20250928053207.dist-info}/RECORD

@@ -2,7 +2,7 @@ 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=9wStnLhEHFmkIocufHLiBcUZ3NSce7ZESor5kjj-vzg,3998
+prefig/core/annotations.py,sha256=YYt7xVVVTbsuxGx7cSaW7KMMDa52STLEhTwAlDkBfoA,7710
 prefig/core/area.py,sha256=U-AxXvaZJWgVccpLlh-aaRfM_QtTa09NR2TqAd8Yk0o,3710
 prefig/core/arrow.py,sha256=h8lFm1rMdpiZRyQu5kvAiptBmMYr5aKCZuB5JypAGDM,11283
 prefig/core/axes.py,sha256=3J6eWNXRWTlbFVNfWkv_-Hyq4L7UP54EQ5u1r82Cfy0,31830
@@ -12,7 +12,7 @@ prefig/core/clip.py,sha256=X3TcFYPuZwjZ9SFBWMc1MYY__6XTJqLafPeOLFNOdIE,806
 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=-8zjo6FgDs74OLMkd3rgncBHrEue3S86hwQ3ISh-nj4,23253
+prefig/core/diagram.py,sha256=ncCTt61xmtEo9J9NP0pk0tZbfHCgN2lW-palUsfEVAs,23830
 prefig/core/diffeqs.py,sha256=aLXcmTsnfTG6L2-RiNfSaijzwmJF6xJcQpNQdDAWTQo,7127
 prefig/core/graph.py,sha256=q81dyJy3CxMWvMNhm74SZ9yjfltatdckmajxegA0z0A,10064
 prefig/core/grid_axes.py,sha256=v98C5tb9knNViGYGDrWL_ULb7Y78vMSQ6OJO7Xd0DXY,12165
@@ -61,8 +61,8 @@ prefig/resources/schema/pf_schema.rng,sha256=SmYGLT9X6w6LEWulHHz2RgD6Q2v1sV24Wjc
 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.4.6.dev20250926053320.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-prefig-0.4.6.dev20250926053320.dist-info/METADATA,sha256=RgRq4-AY-jczI_Oerm5z1n8rGbJjGypR3ed90pJTwz8,8716
-prefig-0.4.6.dev20250926053320.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prefig-0.4.6.dev20250926053320.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
-prefig-0.4.6.dev20250926053320.dist-info/RECORD,,
+prefig-0.4.6.dev20250928053207.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+prefig-0.4.6.dev20250928053207.dist-info/METADATA,sha256=gAGpzI4DznW_MCRQXQubi3n9L1iOrNBc4FB6zorBrOM,8716
+prefig-0.4.6.dev20250928053207.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prefig-0.4.6.dev20250928053207.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
+prefig-0.4.6.dev20250928053207.dist-info/RECORD,,