shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2471 from fonttools/svg-pen-round

Browse Source 
svgPathPen: add option to customize number formatting (e.g. rounding)
This commit is contained in:
Cosimo Lupo 2021-12-15 16:39:48 +00:00 committed by GitHub
commit 5af9c74cad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Lib/fontTools/pens/svgPathPen.py
View File

@ -1,18 +1,36 @@
from typing import Callable
from fontTools.pens.basePen import BasePen from fontTools.pens.basePen import BasePen
def pointToString(pt): def pointToString(pt, ntos=str):
return " ".join([str(i) for i in pt]) return " ".join(ntos(i) for i in pt)
class SVGPathPen(BasePen): class SVGPathPen(BasePen):
""" Pen to draw SVG path d commands.
def __init__(self, glyphSet): Example::
>>> pen = SVGPathPen(None)
>>> pen.moveTo((0, 0))
>>> pen.lineTo((1, 1))
>>> pen.curveTo((2, 2), (3, 3), (4, 4))
>>> pen.closePath()
>>> pen.getCommands()
'M0 0 1 1C2 2 3 3 4 4Z'
Args:
glyphSet: a dictionary of drawable glyph objects keyed by name
used to resolve component references in composite glyphs.
ntos: a callable that takes a number and returns a string, to
customize how numbers are formatted (default: str).
"""
def __init__(self, glyphSet, ntos: Callable[[float], str] = str):
BasePen.__init__(self, glyphSet) BasePen.__init__(self, glyphSet)
self._commands = [] self._commands = []
self._lastCommand = None self._lastCommand = None
self._lastX = None self._lastX = None
self._lastY = None self._lastY = None
self._ntos = ntos
def _handleAnchor(self): def _handleAnchor(self):
""" """
@ -43,7 +61,7 @@ class SVGPathPen(BasePen):
['M0 10'] ['M0 10']
""" """
self._handleAnchor() self._handleAnchor()
t = "M%s" % (pointToString(pt)) t = "M%s" % (pointToString(pt, self._ntos))
self._commands.append(t) self._commands.append(t)
self._lastCommand = "M" self._lastCommand = "M"
self._lastX, self._lastY = pt self._lastX, self._lastY = pt
@ -99,11 +117,11 @@ class SVGPathPen(BasePen):
# previous was a moveto # previous was a moveto
elif self._lastCommand == "M": elif self._lastCommand == "M":
cmd = None cmd = None
pts = " " + pointToString(pt) pts = " " + pointToString(pt, self._ntos)
# basic # basic
else: else:
cmd = "L" cmd = "L"
pts = pointToString(pt) pts = pointToString(pt, self._ntos)
# write the string # write the string
t = "" t = ""
if cmd: if cmd:
@ -122,9 +140,9 @@ class SVGPathPen(BasePen):
['C10 20 30 40 50 60'] ['C10 20 30 40 50 60']
""" """
t = "C" t = "C"
t += pointToString(pt1) + " " t += pointToString(pt1, self._ntos) + " "
t += pointToString(pt2) + " " t += pointToString(pt2, self._ntos) + " "
t += pointToString(pt3) t += pointToString(pt3, self._ntos)
self._commands.append(t) self._commands.append(t)
self._lastCommand = "C" self._lastCommand = "C"
self._lastX, self._lastY = pt3 self._lastX, self._lastY = pt3
@ -135,11 +153,16 @@ class SVGPathPen(BasePen):
>>> pen.qCurveTo((10, 20), (30, 40)) >>> pen.qCurveTo((10, 20), (30, 40))
>>> pen._commands >>> pen._commands
['Q10 20 30 40'] ['Q10 20 30 40']
>>> from fontTools.misc.roundTools import otRound
>>> pen = SVGPathPen(None, ntos=lambda v: str(otRound(v)))
>>> pen.qCurveTo((3, 3), (7, 5), (11, 4))
>>> pen._commands
['Q3 3 5 4', 'Q7 5 11 4']
""" """
assert pt2 is not None assert pt2 is not None
t = "Q" t = "Q"
t += pointToString(pt1) + " " t += pointToString(pt1, self._ntos) + " "
t += pointToString(pt2) t += pointToString(pt2, self._ntos)
self._commands.append(t) self._commands.append(t)
self._lastCommand = "Q" self._lastCommand = "Q"
self._lastX, self._lastY = pt2 self._lastX, self._lastY = pt2