diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-07-24 23:31:44 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-07-24 23:31:44 +0000 |
| commit | fae4db6d2c975173a6768bd4984eb707265f4e43 (patch) | |
| tree | 5f2a213743a58ba45d47aeb5e49f67d3e0b78981 /share | |
| parent | astyle (diff) | |
| parent | 3D box tool: the shift key must not prevent snapping of the vanishing point. ... (diff) | |
| download | inkscape-fae4db6d2c975173a6768bd4984eb707265f4e43.tar.gz inkscape-fae4db6d2c975173a6768bd4984eb707265f4e43.zip | |
update to trunk
(bzr r13645.1.106)
Diffstat (limited to 'share')
| -rwxr-xr-x | share/extensions/inkex.py | 31 | ||||
| -rw-r--r--[-rwxr-xr-x] | share/extensions/scour/scour.inkscape.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | share/extensions/scour/svg_regex.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | share/extensions/scour/svg_transform.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | share/extensions/scour/yocto_css.py | 0 |
5 files changed, 17 insertions, 14 deletions
diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index 19e860b9a..6eb229885 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -207,7 +207,7 @@ class Effect: x = self.unittouu( xattr[0] + 'px' ) y = self.unittouu( yattr[0] + 'px') doc_height = self.unittouu(self.document.getroot().get('height')) - if x and y: + if x and y and doc_height is not None: self.view_center = (float(x), doc_height - float(y)) # FIXME: y-coordinate flip, eliminate it when it's gone in Inkscape def getselected(self): @@ -297,7 +297,7 @@ class Effect: svgwidth = self.document.getroot().get('width') viewboxstr = self.document.getroot().get('viewBox') - if viewboxstr: + if viewboxstr and svgwidth is not None: unitmatch = re.compile('(%s)$' % '|'.join(self.__uuconv.keys())) param = re.compile(r'(([-+]?[0-9]+(\.[0-9]*)?|[-+]?\.[0-9]+)([eE][-+]?[0-9]+)?)') @@ -340,19 +340,22 @@ class Effect: unit = re.compile('(%s)$' % '|'.join(self.__uuconv.keys())) param = re.compile(r'(([-+]?[0-9]+(\.[0-9]*)?|[-+]?\.[0-9]+)([eE][-+]?[0-9]+)?)') - p = param.match(string) - u = unit.search(string) - if p: - retval = float(p.string[p.start():p.end()]) + if string is not None: + p = param.match(string) + u = unit.search(string) + if p: + retval = float(p.string[p.start():p.end()]) + else: + retval = 0.0 + if u: + try: + return retval * (self.__uuconv[u.string[u.start():u.end()]] / self.__uuconv[self.getDocumentUnit()]) + except KeyError: + pass + else: # default assume 'px' unit + return retval / self.__uuconv[self.getDocumentUnit()] else: - retval = 0.0 - if u: - try: - return retval * (self.__uuconv[u.string[u.start():u.end()]] / self.__uuconv[self.getDocumentUnit()]) - except KeyError: - pass - else: # default assume 'px' unit - return retval / self.__uuconv[self.getDocumentUnit()] + retval = None return retval diff --git a/share/extensions/scour/scour.inkscape.py b/share/extensions/scour/scour.inkscape.py index f161a09c2..f161a09c2 100755..100644 --- a/share/extensions/scour/scour.inkscape.py +++ b/share/extensions/scour/scour.inkscape.py diff --git a/share/extensions/scour/svg_regex.py b/share/extensions/scour/svg_regex.py index 6321bff0e..6321bff0e 100755..100644 --- a/share/extensions/scour/svg_regex.py +++ b/share/extensions/scour/svg_regex.py diff --git a/share/extensions/scour/svg_transform.py b/share/extensions/scour/svg_transform.py index 860c1df5d..860c1df5d 100755..100644 --- a/share/extensions/scour/svg_transform.py +++ b/share/extensions/scour/svg_transform.py diff --git a/share/extensions/scour/yocto_css.py b/share/extensions/scour/yocto_css.py index c6bd0c37e..c6bd0c37e 100755..100644 --- a/share/extensions/scour/yocto_css.py +++ b/share/extensions/scour/yocto_css.py |