marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reduce precision of lengths in viewBox

Browse source 
This fixes #127.
Also simplify splitting of viewBox lengths and avoiding a "FutureWarning: split() requires a non-empty pattern match" at the same time
This commit is contained in:
Eduard Braun 2017-02-19 15:22:50 +01:00
parent 3e4c8d793f
commit 512bcc1737
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scour/scour.py
View file

@ -3037,7 +3037,7 @@ def properlySizeDoc(docElement, options):
# else we have a statically sized image and we should try to remedy that # else we have a statically sized image and we should try to remedy that
# parse viewBox attribute # parse viewBox attribute
vbSep = re.split("\\s*\\,?\\s*", docElement.getAttribute('viewBox'), 3) vbSep = re.split('[, ]+', docElement.getAttribute('viewBox'))
# if we have a valid viewBox we need to check it # if we have a valid viewBox we need to check it
vbWidth, vbHeight = 0, 0 vbWidth, vbHeight = 0, 0
if len(vbSep) == 4: if len(vbSep) == 4:
@ -3471,6 +3471,11 @@ def scourString(in_string, options=None):
'x1', 'y1', 'x2', 'y2', 'fx', 'fy', 'offset']: 'x1', 'y1', 'x2', 'y2', 'fx', 'fy', 'offset']:
if elem.getAttribute(attr) != '': if elem.getAttribute(attr) != '':
elem.setAttribute(attr, scourLength(elem.getAttribute(attr))) elem.setAttribute(attr, scourLength(elem.getAttribute(attr)))
viewBox = doc.documentElement.getAttribute('viewBox')
if viewBox:
lengths = re.split('[, ]+', viewBox)
lengths = [scourUnitlessLength(lenght) for lenght in lengths]
doc.documentElement.setAttribute('viewBox', ' '.join(lengths))
# more length scouring in this function # more length scouring in this function
_num_bytes_saved_in_lengths = reducePrecision(doc.documentElement) _num_bytes_saved_in_lengths = reducePrecision(doc.documentElement)