prefig 0.4.5.dev20250924053306__tar.gz → 0.4.6__tar.gz

{prefig-0.4.5.dev20250924053306 → prefig-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefig
-Version: 0.4.5.dev20250924053306
+Version: 0.4.6
 Summary: An authoring system for mathematical diagrams
 Home-page: https://prefigure.org
 License: GPL-3.0-or-later
@@ -15,12 +15,12 @@ Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: text
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: click-log (>=0.4.0,<0.5.0)
-Requires-Dist: lxml (>=5.3.0,<6.0.0)
+Requires-Dist: lxml (>=6,<7)
 Requires-Dist: networkx (>=2.5,<3.0)
 Requires-Dist: numpy (>=1.26,<2.0) ; python_version < "3.13"
-Requires-Dist: numpy (>=2.1.0,<3.0.0) ; python_version == "3.13"
+Requires-Dist: numpy (>=2.1.0,<3.0.0) ; python_version >= "3.13"
 Requires-Dist: pycairo (>=1.20,<2.0) ; extra == "text"
-Requires-Dist: scipy (>=1.14.1,<2.0.0) ; python_version == "3.13"
+Requires-Dist: scipy (>=1.14.1,<2.0.0) ; python_version >= "3.13"
 Requires-Dist: scipy (>=1.8,<2.0) ; python_version < "3.13"
 Requires-Dist: shapely (>=2.0.6,<3.0.0)
 Project-URL: Repository, https://github.com/davidaustinm/prefigure

{prefig-0.4.5.dev20250924053306 → prefig-0.4.6}/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-0.4.5.dev20250924053306 → prefig-0.4.6}/prefig/core/circle.py

@@ -52,7 +52,7 @@ def circle(element, diagram, parent, outline_status):
             else:
                 element.set('fill', 'none')
     else:
-        element.set('stroke', element.get('stroke', 'none'))
+        element.set('stroke', element.get('stroke', 'black'))
         element.set('fill', element.get('fill', 'none'))
     element.set('thickness', element.get('thickness', '2'))
     util.add_attr(circle, util.get_2d_attr(element))

{prefig-0.4.5.dev20250924053306 → prefig-0.4.6}/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)
@@ -109,6 +120,15 @@ class Diagram:
                 if data_directory is not None:
                     self.external = data_directory
 
+        templates = self.diagram_element.xpath('.//templates')
+        if len(templates) > 0:
+            templates_element = templates[0]
+            for template in templates:
+                templates_parent = template.getparent()
+                templates_parent.remove(template)
+            for child in templates_element:
+                self.defaults[child.tag] = child
+
         if self.defaults.get('macros', None) is not None:
             label.add_macros(self.defaults.get('macros').text)
 
@@ -487,6 +507,13 @@ class Diagram:
     def get_root(self):
         return self.root
 
+    def apply_defaults(self, tag, element):
+        default = self.defaults.get(tag, None)
+        if default is not None:
+            for attr, value in default.attrib.items():
+                if element.get(attr, None) is None:
+                    element.set(attr, value)
+
     # when a graphical component is outlined, we first add the component's path
     # to <defs> so that it can be reused, then we stroke it with a thick white
     def add_outline(self, element, path, parent, outline_width = None):
@@ -566,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.5.dev20250924053306 → prefig-0.4.6}/prefig/core/label.py

@@ -15,6 +15,8 @@ import tempfile
 
 log = logging.getLogger('prefigure')
 
+allowed_fonts = {'serif','sans-serif','monospace'}
+
 def init(format, environment):
     global math_labels
     global text_measurements
@@ -465,10 +467,18 @@ def position_svg_label(element, diagram, ctm, group):
     # These lists contain: font, size, italics, bold, color
     label_color = element.get("color", None)
 
-    std_font_face = ['sans', 14, False, False, label_color]
-    it_font_face =  ['sans', 14, True, False, label_color]
-    b_font_face  =  ['sans', 14, False, True, label_color]
-    it_b_font_face  =  ['sans', 14, True, True, label_color]
+    diagram.apply_defaults('label', element)
+
+    font_family = element.get('font', 'sans-serif').lower().strip()
+    if font_family not in allowed_fonts:
+        font_family = 'sans-serif'
+
+    font_size = un.valid_eval(element.get('font-size', '14'))
+
+    std_font_face = [font_family, font_size, False, False, label_color]
+    it_font_face =  [font_family, font_size, True, False, label_color]
+    b_font_face  =  [font_family, font_size, False, True, label_color]
+    it_b_font_face  =  [font_family, font_size, True, True, label_color]
 
     label = element
 

{prefig-0.4.5.dev20250924053306 → prefig-0.4.6}/prefig/resources/schema/pf_schema.rnc

@@ -48,7 +48,7 @@ DefinitionElements =
     Derivative?,
     DE-Solution?,
     Define-Shapes?,
-    Read
+    Read?
 
 Definition = element definition {
     text,
@@ -177,7 +177,9 @@ LabelAttributes =
     attribute rotate {text}?,
     attribute clear-background {"yes"|"no"}?,
     attribute background-margin {text}?,
-    attribute color {text}?
+    attribute color {text}?,
+    attribute font {text}?,
+    attribute font-size {text}?
 
 Math = element m {attribute color {text}? & text}
 Bold = element b {attribute color {text}? & text & Italic*}