summaryrefslogtreecommitdiffstats
path: root/share/extensions
diff options
context:
space:
mode:
authorLiam P. White <inkscapebronyat-signgmaildotcom>2014-06-06 16:12:41 +0000
committerLiam P. White <inkscapebronyat-signgmaildotcom>2014-06-06 16:12:41 +0000
commitfa06e2deb21ba6d362ebd7d34b0ae59a614b5e3c (patch)
tree84bb8f6071e403525d68a04c6589eb633176e774 /share/extensions
parentUpdate to trunk (r13379) (diff)
parentupdate clang format spec for latest clangformat version (diff)
downloadinkscape-fa06e2deb21ba6d362ebd7d34b0ae59a614b5e3c.tar.gz
inkscape-fa06e2deb21ba6d362ebd7d34b0ae59a614b5e3c.zip
Update to experimental r13389
(bzr r13090.1.81)
Diffstat (limited to 'share/extensions')
-rwxr-xr-xshare/extensions/inkex.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py
index 947cb5b30..a8adfa43d 100755
--- a/share/extensions/inkex.py
+++ b/share/extensions/inkex.py
@@ -285,8 +285,8 @@ class Effect:
return 'px'
#a dictionary of unit to user unit conversion factors
- __uuconv = {'in':90.0, 'pt':1.25, 'px':1.0, 'mm':3.5433070866, 'cm':35.433070866, 'm':3543.3070866,
- 'km':3543307.0866, 'pc':15.0, 'yd':3240.0 , 'ft':1080.0}
+ __uuconv = {'in':96.0, 'pt':1.33333333333, 'px':1.0, 'mm':3.77952755913, 'cm':37.7952755913,
+ 'm':3779.52755913, 'km':3779527.55913, 'pc':16.0, 'yd':3456.0 , 'ft':1152.0}
def unittouu(self, string):
'''Returns userunits given a string representation of units in another system'''
unit = re.compile('(%s)$' % '|'.join(self.__uuconv.keys()))