Supporting <text> tags from SVG files

* introduce TextRendererMixin

Author: Lucas-C

fpdf/__init__.py

@@ -24,12 +24,12 @@
 from .fpdf import (
     FPDF,
     TitleStyle,
-    FPDF_FONT_DIR as _FPDF_FONT_DIR,
     FPDF_VERSION as _FPDF_VERSION,
 )
 from .html import HTMLMixin, HTML2FPDF
 from .prefs import ViewerPreferences
 from .template import Template, FlexTemplate
+from .text_renderer import FPDF_FONT_DIR as _FPDF_FONT_DIR
 from .util import get_scale_factor
 
 try:

fpdf/drawing.py

@@ -2800,14 +2800,14 @@ def __init__(self):
     def add_item(
         self,
         item: Union["GraphicsContext", "PaintedPath", "PaintComposite"],
-        _copy: bool = True,
+        clone: bool = True,
     ) -> None:
         """
         Append an item to this drawing context
 
         Args:
             item (GraphicsContext, PaintedPath): the item to be appended.
-            _copy (bool): if true (the default), the item will be copied before being
+            clone (bool): if true (the default), the item will be copied before being
                 appended. This prevents modifications to a referenced object from
                 "retroactively" altering its style/shape and should be disabled with
                 caution.
@@ -2816,7 +2816,7 @@ def add_item(
         if not isinstance(item, (GraphicsContext, PaintedPath, PaintComposite)):
             raise TypeError(f"{item} doesn't belong in a DrawingContext")
 
-        if _copy:
+        if clone:
             item = deepcopy(item)
 
         self._subitems.append(item)
@@ -3097,24 +3097,24 @@ def transform_group(self, transform):
             ctxt.transform = transform
             yield self
 
-    def add_path_element(self, item, _copy=True):
+    def add_path_element(self, item, clone=True):
         """
         Add the given element as a path item of this path.
 
         Args:
             item: the item to add to this path.
-            _copy (bool): if true (the default), the item will be copied before being
+            clone (bool): if true (the default), the item will be copied before being
                 appended. This prevents modifications to a referenced object from
                 "retroactively" altering its style/shape and should be disabled with
                 caution.
         """
         if self._starter_move is not None:
             self._closed = False
-            self._graphics_context.add_item(self._starter_move, _copy=False)
+            self._graphics_context.add_item(self._starter_move, clone=False)
             self._close_context = self._graphics_context
             self._starter_move = None
 
-        self._graphics_context.add_item(item, _copy=_copy)
+        self._graphics_context.add_item(item, clone=clone)
 
     def remove_last_path_element(self):
         self._graphics_context.remove_last_item()
@@ -3144,7 +3144,7 @@ def rectangle(self, x, y, w, h, rx=0, ry=0):
 
         self._insert_implicit_close_if_open()
         self.add_path_element(
-            RoundedRectangle(Point(x, y), Point(w, h), Point(rx, ry)), _copy=False
+            RoundedRectangle(Point(x, y), Point(w, h), Point(rx, ry)), clone=False
         )
         self._closed = True
         self.move_to(x, y)
@@ -3179,7 +3179,7 @@ def ellipse(self, cx, cy, rx, ry):
             The path, to allow chaining method calls.
         """
         self._insert_implicit_close_if_open()
-        self.add_path_element(Ellipse(Point(rx, ry), Point(cx, cy)), _copy=False)
+        self.add_path_element(Ellipse(Point(rx, ry), Point(cx, cy)), clone=False)
         self._closed = True
         self.move_to(cx, cy)
 
@@ -3223,7 +3223,7 @@ def move_relative(self, x, y):
         self._insert_implicit_close_if_open()
         if self._starter_move is not None:
             self._closed = False
-            self._graphics_context.add_item(self._starter_move, _copy=False)
+            self._graphics_context.add_item(self._starter_move, clone=False)
             self._close_context = self._graphics_context
         self._starter_move = RelativeMove(Point(x, y))
         return self
@@ -3239,7 +3239,7 @@ def line_to(self, x, y):
         Returns:
             The path, to allow chaining method calls.
         """
-        self.add_path_element(Line(Point(x, y)), _copy=False)
+        self.add_path_element(Line(Point(x, y)), clone=False)
         return self
 
     def line_relative(self, dx, dy):
@@ -3256,7 +3256,7 @@ def line_relative(self, dx, dy):
         Returns:
             The path, to allow chaining method calls.
         """
-        self.add_path_element(RelativeLine(Point(dx, dy)), _copy=False)
+        self.add_path_element(RelativeLine(Point(dx, dy)), clone=False)
         return self
 
     def horizontal_line_to(self, x):
@@ -3270,7 +3270,7 @@ def horizontal_line_to(self, x):
         Returns:
             The path, to allow chaining method calls.
         """
-        self.add_path_element(HorizontalLine(x), _copy=False)
+        self.add_path_element(HorizontalLine(x), clone=False)
         return self
 
     def horizontal_line_relative(self, dx):
@@ -3286,7 +3286,7 @@ def horizontal_line_relative(self, dx):
         Returns:
             The path, to allow chaining method calls.
         """
-        self.add_path_element(RelativeHorizontalLine(dx), _copy=False)
+        self.add_path_element(RelativeHorizontalLine(dx), clone=False)
         return self
 
     def vertical_line_to(self, y):
@@ -3300,7 +3300,7 @@ def vertical_line_to(self, y):
         Returns:
             The path, to allow chaining method calls.
         """
-        self.add_path_element(VerticalLine(y), _copy=False)
+        self.add_path_element(VerticalLine(y), clone=False)
         return self
 
     def vertical_line_relative(self, dy):
@@ -3316,7 +3316,7 @@ def vertical_line_relative(self, dy):
         Returns:
             The path, to allow chaining method calls.
         """
-        self.add_path_element(RelativeVerticalLine(dy), _copy=False)
+        self.add_path_element(RelativeVerticalLine(dy), clone=False)
         return self
 
     def curve_to(self, x1, y1, x2, y2, x3, y3):
@@ -3338,7 +3338,7 @@ def curve_to(self, x1, y1, x2, y2, x3, y3):
         ctrl2 = Point(x2, y2)
         end = Point(x3, y3)
 
-        self.add_path_element(BezierCurve(ctrl1, ctrl2, end), _copy=False)
+        self.add_path_element(BezierCurve(ctrl1, ctrl2, end), clone=False)
         return self
 
     def curve_relative(self, dx1, dy1, dx2, dy2, dx3, dy3):
@@ -3372,7 +3372,7 @@ def curve_relative(self, dx1, dy1, dx2, dy2, dx3, dy3):
         c2d = Point(dx2, dy2)
         end = Point(dx3, dy3)
 
-        self.add_path_element(RelativeBezierCurve(c1d, c2d, end), _copy=False)
+        self.add_path_element(RelativeBezierCurve(c1d, c2d, end), clone=False)
         return self
 
     def quadratic_curve_to(self, x1, y1, x2, y2):
@@ -3390,7 +3390,7 @@ def quadratic_curve_to(self, x1, y1, x2, y2):
         """
         ctrl = Point(x1, y1)
         end = Point(x2, y2)
-        self.add_path_element(QuadraticBezierCurve(ctrl, end), _copy=False)
+        self.add_path_element(QuadraticBezierCurve(ctrl, end), clone=False)
         return self
 
     def quadratic_curve_relative(self, dx1, dy1, dx2, dy2):
@@ -3412,7 +3412,7 @@ def quadratic_curve_relative(self, dx1, dy1, dx2, dy2):
         """
         ctrl = Point(dx1, dy1)
         end = Point(dx2, dy2)
-        self.add_path_element(RelativeQuadraticBezierCurve(ctrl, end), _copy=False)
+        self.add_path_element(RelativeQuadraticBezierCurve(ctrl, end), clone=False)
         return self
 
     def arc_to(self, rx, ry, rotation, large_arc, positive_sweep, x, y):
@@ -3459,7 +3459,7 @@ def arc_to(self, rx, ry, rotation, large_arc, positive_sweep, x, y):
         end = Point(x, y)
 
         self.add_path_element(
-            Arc(radii, rotation, large_arc, positive_sweep, end), _copy=False
+            Arc(radii, rotation, large_arc, positive_sweep, end), clone=False
         )
         return self
 
@@ -3508,21 +3508,21 @@ def arc_relative(self, rx, ry, rotation, large_arc, positive_sweep, dx, dy):
         end = Point(dx, dy)
 
         self.add_path_element(
-            RelativeArc(radii, rotation, large_arc, positive_sweep, end), _copy=False
+            RelativeArc(radii, rotation, large_arc, positive_sweep, end), clone=False
         )
         return self
 
     def close(self):
         """
         Explicitly close the current (sub)path.
         """
-        self.add_path_element(Close(), _copy=False)
+        self.add_path_element(Close(), clone=False)
         self._closed = True
         self.move_relative(0, 0)
 
     def _insert_implicit_close_if_open(self):
         if not self._closed:
-            self._close_context.add_item(ImplicitClose(), _copy=False)
+            self._close_context.add_item(ImplicitClose(), clone=False)
             self._close_context = self._graphics_context
             self._closed = True
 
@@ -3744,19 +3744,19 @@ def clipping_path(self) -> Optional[ClippingPath]:
     def clipping_path(self, new_clipath: ClippingPath) -> None:
         self._clipping_path = new_clipath
 
-    def add_item(self, item: Renderable, _copy: bool = True) -> None:
+    def add_item(self, item: Renderable, clone: bool = True):
         """
         Add a path element to this graphics context.
 
         Args:
             item: the path element to add. May be a primitive element or another
                 `GraphicsContext` or a `PaintedPath`.
-            _copy (bool): if true (the default), the item will be copied before being
+            clone (bool): if true (the default), the item will be copied before being
                 appended. This prevents modifications to a referenced object from
                 "retroactively" altering its style/shape and should be disabled with
                 caution.
         """
-        if _copy:
+        if clone:
             item = deepcopy(item)
 
         self.path_items.append(item)

fpdf/font_type_3.py

@@ -283,7 +283,7 @@ def draw_glyph_colrv0(self, layers):
             glyph.draw(pen)
             path.style.fill_color = self.get_color(layer.colorID)
             path.style.stroke_color = self.get_color(layer.colorID)
-            gc.add_item(item=path, _copy=False)
+            gc.add_item(item=path, clone=False)
         return gc
 
     def draw_glyph_colrv1(self, glyph_name):
@@ -318,7 +318,7 @@ def draw_colrv1_paint(
                     parent=group,
                     ctm=ctm,
                 )
-            parent.add_item(item=group, _copy=False)
+            parent.add_item(item=group, clone=False)
             return parent, target_path
 
         if paint.Format in (
@@ -403,8 +403,8 @@ def draw_colrv1_paint(
                 ctm=Transform.identity(),
             )
             if surface_path is not None:
-                group.add_item(item=surface_path, _copy=False)
-            parent.add_item(item=group, _copy=False)
+                group.add_item(item=surface_path, clone=False)
+            parent.add_item(item=group, clone=False)
             return parent, None
 
         if paint.Format == PaintFormat.PaintColrGlyph:
@@ -419,7 +419,7 @@ def draw_colrv1_paint(
 
             group = GraphicsContext()
             self.draw_colrv1_paint(paint=rec.Paint, parent=group, ctm=ctm)
-            parent.add_item(item=group, _copy=False)
+            parent.add_item(item=group, clone=False)
             return parent, target_path
 
         if paint.Format in (
@@ -465,7 +465,7 @@ def draw_colrv1_paint(
                 ctm=ctm,
             )
             if backdrop_path is not None:
-                backdrop_node.add_item(item=backdrop_path, _copy=False)
+                backdrop_node.add_item(item=backdrop_path, clone=False)
 
             source_node = GraphicsContext()
             _, source_path = self.draw_colrv1_paint(
@@ -474,20 +474,20 @@ def draw_colrv1_paint(
                 ctm=ctm,
             )
             if source_path is not None:
-                source_node.add_item(item=source_path, _copy=False)
+                source_node.add_item(item=source_path, clone=False)
 
             composite_type, composite_mode = self.get_composite_mode(
                 paint.CompositeMode
             )
             if composite_type == "Blend":
                 source_node.style.blend_mode = composite_mode
-                parent.add_item(item=backdrop_node, _copy=False)
-                parent.add_item(item=source_node, _copy=False)
+                parent.add_item(item=backdrop_node, clone=False)
+                parent.add_item(item=source_node, clone=False)
             elif composite_type == "Compositing":
                 composite_node = PaintComposite(
                     backdrop=backdrop_node, source=source_node, operation=composite_mode
                 )
-                parent.add_item(item=composite_node, _copy=False)
+                parent.add_item(item=composite_node, clone=False)
             else:
                 raise ValueError(""" Composite operation not supported """)
             return parent, None

fpdf/fonts.py

@@ -224,8 +224,8 @@ class CoreFont:
         "emphasis",
     )
 
-    def __init__(self, fpdf, fontkey, style):
-        self.i = len(fpdf.fonts) + 1
+    def __init__(self, i, fontkey, style):
+        self.i = i
         self.type = "core"
         self.name = CORE_FONTS[fontkey]
         self.sp = 250  # strikethrough horizontal position