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

Rudimentary decimal support

Browse Source
This commit is contained in:
Rod Sheeter 2019-02-08 14:57:10 -08:00
parent 1e70458679
commit 199aa9e24b
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Lib/fontTools/svgLib/path/shapes.py
View File

@ -2,9 +2,12 @@ def _PreferNonZero(*args):
for arg in args: for arg in args:
if arg != 0: if arg != 0:
return arg return arg
return 0 return 0.
def _ntos(n):
# %f likes to add unnecessary 0's, %g isn't consistent about # decimals
return ('%.3f' % n).rstrip('0').rstrip('.')
# TODO float movement
class PathBuilder(object): class PathBuilder(object):
def __init__(self): def __init__(self):
self.pathes = [] self.pathes = []
@ -24,7 +27,7 @@ class PathBuilder(object):
self.pathes[-1] = path self.pathes[-1] = path
def _move(self, c, x, y): def _move(self, c, x, y):
self._Add('%s%d,%d' % (c, x, y)) self._Add('%s%s,%s' % (c, _ntos(x), _ntos(y)))
def M(self, x, y): def M(self, x, y):
self._move('M', x, y) self._move('M', x, y)
@ -33,7 +36,8 @@ class PathBuilder(object):
self._move('m', x, y) self._move('m', x, y)
def _arc(self, c, rx, ry, x, y, large_arc): def _arc(self, c, rx, ry, x, y, large_arc):
self._Add('%s%d,%d 0 %d 1 %d,%d' % (c, rx, ry, large_arc, x, y)) self._Add('%s%s,%s 0 %d 1 %s,%s' % (c, _ntos(rx), _ntos(ry), large_arc,
_ntos(x), _ntos(y)))
def A(self, rx, ry, x, y, large_arc = 0): def A(self, rx, ry, x, y, large_arc = 0):
self._arc('A', rx, ry, x, y, large_arc) self._arc('A', rx, ry, x, y, large_arc)
@ -42,7 +46,7 @@ class PathBuilder(object):
self._arc('a', rx, ry, x, y, large_arc) self._arc('a', rx, ry, x, y, large_arc)
def _vhline(self, c, x): def _vhline(self, c, x):
self._Add('%s%d' % (c, x)) self._Add('%s%s' % (c, _ntos(x)))
def H(self, x): def H(self, x):
self._vhline('H', x) self._vhline('H', x)
@ -57,16 +61,17 @@ class PathBuilder(object):
self._vhline('v', y) self._vhline('v', y)
def _ParseRect(self, rect): def _ParseRect(self, rect):
# TODO what format(s) do these #s come in?
x = float(rect.attrib.get('x', 0)) x = float(rect.attrib.get('x', 0))
y = float(rect.attrib.get('y', 0)) y = float(rect.attrib.get('y', 0))
w = float(rect.attrib.get('width')) w = float(rect.attrib.get('width'))
h = float(rect.attrib.get('height')) h = float(rect.attrib.get('height'))
rx = float(rect.attrib.get('rx', 0)) rx = float(rect.attrib.get('rx', 0))
ry = float(rect.attrib.get('ry', 0)) ry = float(rect.attrib.get('ry', 0))
rx = _PreferNonZero(rx, ry) rx = _PreferNonZero(rx, ry)
ry = _PreferNonZero(ry, rx) ry = _PreferNonZero(ry, rx)
# TODO there are more rules for adjusting rx, ry # TODO there are more rules for adjusting rx, ry
self.StartPath() self.StartPath()
self.M(x + rx, y) self.M(x + rx, y)
self.H(x + w -rx) self.H(x + w -rx)
@ -108,5 +113,8 @@ class PathBuilder(object):
if '}' in el.tag: if '}' in el.tag:
tag = el.tag.split('}', 1)[1] # from https://bugs.python.org/issue18304 tag = el.tag.split('}', 1)[1] # from https://bugs.python.org/issue18304
parse_fn = getattr(self, '_Parse%s' % tag.lower().capitalize(), None) parse_fn = getattr(self, '_Parse%s' % tag.lower().capitalize(), None)
if callable(parse_fn): if not callable(parse_fn):
return False
parse_fn(el) parse_fn(el)
return True

5
Tests/svgLib/path/shapes_test.py
View File

@ -50,6 +50,11 @@ import pytest
( (
"<circle cx='600' cy='200' r='100'/>", "<circle cx='600' cy='200' r='100'/>",
"M500,200 A100,100 0 1 1 700,200 A100,100 0 1 1 500,200" "M500,200 A100,100 0 1 1 700,200 A100,100 0 1 1 500,200"
),
# circle, decimal positioning
(
"<circle cx='12' cy='6.5' r='1.5'></circle>",
"M10.5,6.5 A1.5,1.5 0 1 1 13.5,6.5 A1.5,1.5 0 1 1 10.5,6.5"
) )
] ]
) )