From 6ec8f2360b0aa46097b6bf1e68e1fd51433092d0 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Tue, 25 Nov 2014 14:50:19 +0100
Subject: Increase precision of conversion factors to match that of doubles.
 Fix incorrect gradian/degree factor.

(bzr r13756)
---
 share/ui/units.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'share')

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>
-- 
cgit v1.2.3


From 06d9ddcf5b51228c4d5db339ea8b81dcad45fa04 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Tue, 25 Nov 2014 20:49:28 +0100
Subject: Units, inkex.py: viewbox width is defined by the 3rd number of the
 viewbox spec. (fix calculation)

(bzr r13759)
---
 share/extensions/inkex.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'share')

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
 
-- 
cgit v1.2.3