prefig 0.4.3.dev20250823053253__py3-none-any.whl → 0.4.5__py3-none-any.whl

prefig/core/circle.py

@@ -47,9 +47,12 @@ def circle(element, diagram, parent, outline_status):
         if element.get('stroke') is not None:
             element.set('stroke', 'black')
         if element.get('fill') is not None:
-            element.set('fill', 'lightgray')
+            if element.get('fill').strip().lower() != 'none':
+                element.set('fill', 'lightgray')
+            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))
@@ -120,7 +123,10 @@ def ellipse(element, diagram, parent, outline_status):
         if element.get('stroke') is not None:
             element.set('stroke', 'black')
         if element.get('fill') is not None:
-            element.set('fill', 'lightgray')
+            if elementl.get('fill').strip().lower() != 'none':
+                element.set('fill', 'lightgray')
+            else:
+                element.set('fill', 'none')
     else:
         element.set('stroke', element.get('stroke', 'none'))
         element.set('fill', element.get('fill', 'none'))
@@ -283,7 +289,10 @@ def angle(element, diagram, parent, outline_status):
     element.set('stroke', element.get('stroke', 'black'))
     if diagram.output_format() == 'tactile':
         if element.get('fill') is not None:
-            element.set('fill', 'lightgray')
+            if element.get('fill').strip().lower() != 'none':
+                element.set('fill', 'lightgray')
+            else:
+                element.set('fill', 'none')
     else:
         element.set('fill', element.get('fill', 'none'))
     element.set('thickness', element.get('thickness','2'))

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/core/point.py

@@ -34,7 +34,13 @@ def point(element, diagram, parent, outline_status = None):
         return
 
     if diagram.output_format() == 'tactile':
-        element.set('size', element.get('size', '9'))
+        if element.get('size', None) is not None:
+            size = un.valid_eval(element.get('size'))
+            size = max(size, 9)
+            size = str(size)
+        else:
+            size = '9'
+        element.set('size', size)
     else:
         element.set('size', element.get('size', '4'))
     size = util.get_attr(element, 'size', '1')

prefig/core/polygon.py

@@ -53,7 +53,10 @@ def polygon(element, diagram, parent,
         if element.get('stroke') is not None:
             element.set('stroke', 'black')
         if element.get('fill') is not None:
-            element.set('fill', 'lightgray')
+            if element.get('fill').strip().lower() != 'none':
+                element.set('fill', 'lightgray')
+            else:
+                element.set('fill', 'none')
     util.set_attr(element, 'stroke', 'none')
     util.set_attr(element, 'fill', 'none')
     util.set_attr(element, 'thickness', '2')

prefig/core/rectangle.py

@@ -75,8 +75,11 @@ def rectangle(element, diagram, parent, outline_status):
         fill   = element.get('fill')
         if stroke is not None and stroke != 'none':
             element.set('stroke', 'black')
-        if fill is not None and fill != 'none':
-            element.set('fill', 'lightgray')
+        if fill is not None:
+            if fill.strip().lower() != 'none':
+                element.set('fill', 'lightgray')
+            else:
+                element.set('fill', 'none')
     else:
         util.set_attr(element, 'stroke', 'none')
         util.set_attr(element, 'fill', 'none')

{prefig-0.4.3.dev20250823053253.dist-info → prefig-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefig
-Version: 0.4.3.dev20250823053253
+Version: 0.4.5
 Summary: An authoring system for mathematical diagrams
 Home-page: https://prefigure.org
 License: GPL-3.0-or-later
@@ -92,7 +92,7 @@ PreFigure may be installed locally as a Python package in the usual way using `p
     apt install nodejs
     ```
 
-6. For creating tactile graphics to be embossed, you are encouraged to install `rsvg-convert`, which PreFigure uses to convert SVGs into PDFs.  On Ubuntu, you can say
+6. For building PDF versions of diagrams, you will need to install `rsvg-convert`, which PreFigure uses to convert SVGs into PDFs.  On Ubuntu, you can say
 
     ```
     apt install librsvg2-bin

{prefig-0.4.3.dev20250823053253.dist-info → prefig-0.4.5.dist-info}/RECORD

@@ -7,19 +7,19 @@ 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
 prefig/core/calculus.py,sha256=Q4kSGTTTeQYEEVKgmYWpFP0JLHmCsBchB5OF9qSclQk,498
-prefig/core/circle.py,sha256=_v1eMVhl4nnD4WXCz-Boa_SAdQg_kKeU3NhP42z2Yzw,15668
+prefig/core/circle.py,sha256=zWm0emJ2YzH4EcaOqgxMgg-_t4Qcrd2Itfo6_s_61uo,16054
 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
@@ -28,10 +28,10 @@ prefig/core/network.py,sha256=1izAX2AKvnj2knElrdLeojE_0Q0zO0aQM-EsEwor0Os,27217
 prefig/core/parametric_curve.py,sha256=WIg6BC4AIx6Hs_1Bl18BJYPY7vaCn80qyDn6OixK3Z0,3431
 prefig/core/parse.py,sha256=plLmR0KKrUjYx0PmHHo5HZonaaT3tW4qjiDOtzuhSkQ,4542
 prefig/core/path.py,sha256=8BbWAUzZqe1YD0gO4QtDENaINavAAC1mlU-y3UV-vu0,20312
-prefig/core/point.py,sha256=JhybSrEqxTWwXQVYQWw1_knBcWrttOuRUwKIlU8IshE,8730
-prefig/core/polygon.py,sha256=8NVdWSUVXuNE4GiPQ4MySSmLy8aCNwKUqCcfHukizME,11301
+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=b_ki7yqA4-mke1_0khvKqSKBRToB667mZc-xZhhPIBA,3473
+prefig/core/rectangle.py,sha256=TzdVckcPfNV8fI1xs8FgHadx06wn2P6A504oyDO3xGY,3567
 prefig/core/repeat.py,sha256=DAO5w4BxUMGU-8ymsv8EwsifI0zPa_cgIRUcWWS8BWU,2755
 prefig/core/riemann_sum.py,sha256=T2dQgJIY17QuuPDOB8XWIP8HYmg5jOQ-LroFH7tiGAU,3012
 prefig/core/shape.py,sha256=Qb_-upbSHwEoYrrAnbCoFFFuVIb3JgJLdyP9ckD5evc,8675
@@ -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.3.dev20250823053253.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-prefig-0.4.3.dev20250823053253.dist-info/METADATA,sha256=YyLbLUoG5kLpKpn5baLEGPohTyM5i3ZakiOmukwj2FI,8728
-prefig-0.4.3.dev20250823053253.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prefig-0.4.3.dev20250823053253.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
-prefig-0.4.3.dev20250823053253.dist-info/RECORD,,
+prefig-0.4.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+prefig-0.4.5.dist-info/METADATA,sha256=O4Lwxg5UK9KRXGZtJwe5-lOEtIyx3svbGQsRDaMhmlo,8698
+prefig-0.4.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prefig-0.4.5.dist-info/entry_points.txt,sha256=OP4ZQT71q2b0Zfbie-oM2Z1HlxpkuX7qaxJnzwsBOVQ,42
+prefig-0.4.5.dist-info/RECORD,,