prefig 0.4.5.dev20250925053340__py3-none-any.whl → 0.4.6.dev20250926053320__py3-none-any.whl

prefig/core/diagram.py

@@ -109,6 +109,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 +496,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):

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.dev20250925053340.dist-info → prefig-0.4.6.dev20250926053320.dist-info}/METADATA

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

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

@@ -12,14 +12,14 @@ 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=7Hsa8xOpGmLnln2Chl-ofVl_bG6ZOEJPGV2vE1V8RnI,22599
+prefig/core/diagram.py,sha256=-8zjo6FgDs74OLMkd3rgncBHrEue3S86hwQ3ISh-nj4,23253
 prefig/core/diffeqs.py,sha256=aLXcmTsnfTG6L2-RiNfSaijzwmJF6xJcQpNQdDAWTQo,7127
 prefig/core/graph.py,sha256=q81dyJy3CxMWvMNhm74SZ9yjfltatdckmajxegA0z0A,10064
 prefig/core/grid_axes.py,sha256=v98C5tb9knNViGYGDrWL_ULb7Y78vMSQ6OJO7Xd0DXY,12165
 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=e_gOd2kcdOtcJay1VyRstP66SiDNxK2UK2-obkxQnOc,24746
+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/line.py,sha256=HBB9cvJawKAtdubISn5maRrzFFzV0NQuBgwoQoxeXcw,6055
@@ -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.5.dev20250925053340.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-prefig-0.4.5.dev20250925053340.dist-info/METADATA,sha256=q5VfacH1V_EJbQvaNe8weBWa2pMoG83UGp1Nx1_kv6g,8716
-prefig-0.4.5.dev20250925053340.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prefig-0.4.5.dev20250925053340.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
-prefig-0.4.5.dev20250925053340.dist-info/RECORD,,
+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,,