summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-11-26 01:10:30 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-11-26 01:10:30 +0000
commit6c87088ed548a3da4388ea95bba82aea798c901a (patch)
treee4269aab0a32957163935ec6b828b25d00613d68 /share
parentUpdate to trunk r13750 (diff)
parentAdd CMake file to find LCMS2 (diff)
downloadinkscape-6c87088ed548a3da4388ea95bba82aea798c901a.tar.gz
inkscape-6c87088ed548a3da4388ea95bba82aea798c901a.zip
Update to trunk r13766
(bzr r13341.5.24)
Diffstat (limited to 'share')
-rwxr-xr-xshare/extensions/inkex.py2
-rw-r--r--share/ui/units.xml16
2 files changed, 9 insertions, 9 deletions
diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py
index a564b5c8d..19e860b9a 100755
--- a/share/extensions/inkex.py
+++ b/share/extensions/inkex.py
@@ -321,7 +321,7 @@ class Effect:
except ValueError:
pass
if len(viewboxnumbers) == 4: #check for correct number of numbers
- viewboxwidth = viewboxnumbers[2] - viewboxnumbers[0]
+ viewboxwidth = viewboxnumbers[2]
svgunitfactor = self.__uuconv[svgwidthunit] * width / viewboxwidth
diff --git a/share/ui/units.xml b/share/ui/units.xml
index bdfe27919..364515679 100644
--- a/share/ui/units.xml
+++ b/share/ui/units.xml
@@ -18,7 +18,7 @@
<name>point</name>
<plural>points</plural>
<abbr>pt</abbr>
- <factor>1.3333333333</factor>
+ <factor>1.333333333333333</factor>
<description>PostScript points (72/inch)</description>
</unit>
<unit type="LINEAR" pri="n">
@@ -39,21 +39,21 @@
<name>millimeter</name>
<plural>millimeters</plural>
<abbr>mm</abbr>
- <factor>3.77952755913</factor>
+ <factor>3.779527559055119</factor>
<description>Millimeters (25.4 mm/in)</description>
</unit>
<unit type="LINEAR" pri="n">
<name>centimeter</name>
<plural>centimeters</plural>
<abbr>cm</abbr>
- <factor>37.7952755913</factor>
+ <factor>37.79527559055119</factor>
<description>Centimeters (10 mm/cm)</description>
</unit>
<unit type="LINEAR" pri="n">
<name>meter</name>
<plural>meters</plural>
<abbr>m</abbr>
- <factor>3779.52755913</factor>
+ <factor>3779.527559055119</factor>
<description>Meters (100 cm/m)</description>
</unit>
<unit type="LINEAR" pri="n">
@@ -74,15 +74,15 @@
<name>radian</name>
<plural>radians</plural>
<abbr>rad</abbr>
- <factor>57.296</factor>
- <description>Radians (57.296 deg/rad)</description>
+ <factor>57.29577951308232</factor>
+ <description>Radians (180/pi deg/rad)</description>
</unit>
<unit type="RADIAL" pri="n">
<name>gradian</name>
<plural>gradians</plural>
<abbr>grad</abbr>
- <factor>1.111</factor>
- <description>Gradians (1.111 deg/grad)</description>
+ <factor>0.9</factor>
+ <description>Gradians (360/400 deg/grad)</description>
</unit>
<unit type="RADIAL" pri="n">
<name>turn</name>