prefig 0.4.3.dev20250823053253__tar.gz → 0.4.5__tar.gz

{prefig-0.4.3.dev20250823053253 → prefig-0.4.5}/PKG-INFO

@@ -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 → prefig-0.4.5}/README.md

@@ -64,7 +64,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 → prefig-0.4.5}/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-0.4.3.dev20250823053253 → prefig-0.4.5}/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-0.4.3.dev20250823053253 → prefig-0.4.5}/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.3.dev20250823053253 → prefig-0.4.5}/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-0.4.3.dev20250823053253 → prefig-0.4.5}/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-0.4.3.dev20250823053253 → prefig-0.4.5}/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 → prefig-0.4.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prefig"
-version = "0.4.3.dev20250823053253"
+version = "0.4.5"
 description = "An authoring system for mathematical diagrams"
 readme = "README.md"
 homepage = "https://prefigure.org"