Update to trunk r13690

(bzr r13341.5.22)

23 files changed, 222 insertions, 52 deletions

diff --git a/share/extensions/dimension.inx b/share/extensions/dimension.inx
index 343ad27bf..d89e5afa4 100644
--- a/share/extensions/dimension.inx
+++ b/share/extensions/dimension.inx
@@ -7,7 +7,7 @@
 	<dependency type="executable" location="extensions">pathmodifier.py</dependency>
 	<param name="xoffset" type="float" min="0" max="1000" _gui-text="X Offset:">50</param>
 	<param name="yoffset" type="float" min="0" max="1000" _gui-text="Y Offset:">50</param>
-	<param name="type" type="enum" _gui-text="Bounding box type :">
+	<param name="type" type="enum" _gui-text="Bounding box type:">
 		<_item value="geometric">Geometric</_item>
 		<_item value="visual">Visual</_item>
 	</param>
diff --git a/share/extensions/dpiswitcher.inx b/share/extensions/dpiswitcher.inx
new file mode 100644
index 000000000..145fd9357
--- /dev/null
+++ b/share/extensions/dpiswitcher.inx
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>  
+    <inkscape-extension xmlns=  
+       "http://www.inkscape.org/namespace/inkscape/extension">  
+      <_name>DPI Switcher</_name>  
+      <id>org.inkscape.dpiswitcher</id> 
+      <dependency type="executable" location="extensions">dpiswitcher.py</dependency>
+      <dependency type="executable" location="extensions">inkex.py</dependency>
+      <param name="switcher" type="enum" _gui-text="Type of convert:">
+                    <_item value="0">DPI Switch from 90 to 96</_item>
+                    <_item value="1">DPI Switch from 96 to 90</_item>
+      </param>
+      <effect needs-live-preview="false" needs-document="no">  
+        <object-type>all</object-type>  
+        <effects-menu>  
+          <submenu _name="Document"/>  
+        </effects-menu>  
+      </effect>  
+      <script>  
+        <command reldir="extensions" interpreter="python">dpiswitcher.py</command> 
+      </script>  
+</inkscape-extension>
diff --git a/share/extensions/dpiswitcher.py b/share/extensions/dpiswitcher.py
new file mode 100644
index 000000000..b4630ae4c
--- /dev/null
+++ b/share/extensions/dpiswitcher.py
@@ -0,0 +1,148 @@
+#!/usr/bin/env python 
+'''
+This extension scale or reduce a document to fit diferent SVG DPI -90/96-
+
+Copyright (C) 2012 Jabiertxo Arraiza, jabier.arraiza@marker.es
+
+Version 0.4 - DPI Switcher
+
+TODO:
+Comment Better!!!
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+'''
+
+import inkex, sys, re, string
+from lxml import etree
+
+class DPISwitcher(inkex.Effect):
+
+    def __init__(self):
+        inkex.Effect.__init__(self)
+        self.OptionParser.add_option("--switcher", action="store", 
+            type="string", dest="switcher", default="0", 
+            help="Select the DPI switch you want")
+        self.factor = 90.0/96.0
+        self.unit = "px"
+
+    def scaleRoot(self, svg):
+        widthNumber = re.sub("[a-zA-Z]", "", svg.get('width'))
+        heightNumber = re.sub("[a-zA-Z]", "", svg.get('height'))
+        if svg.get('viewBox'):
+            widthNumber = svg.get('viewBox').split(" ")[2]
+            heightNumber = svg.get('viewBox').split(" ")[3]
+        widthDoc = str(float(widthNumber) * self.factor)
+        heightDoc = str(float(heightNumber) * self.factor)
+        if svg.get('height'):
+            svg.set('height', heightDoc)
+        if svg.get('width'):
+            svg.set('width', widthDoc)
+        svg.set('viewBox',"0 0 " + widthDoc + " " + heightDoc)
+        xpathStr = '//svg:rect | //svg:image | //svg:path | //svg:circle | //svg:ellipse | //svg:text'
+        elements = svg.xpath(xpathStr, namespaces=inkex.NSS)
+        for element in elements:
+            box3DSide = element.get(inkex.addNS('box3dsidetype', 'inkscape'))
+            if box3DSide:
+                continue
+            if element.get('transform'):
+                if "matrix" in str(element.get('transform')):
+                    result = re.sub(r".*?((matrix).*?\))", self.scaleMatrixElement, str(element.get('transform')))
+                    element.set('transform', result)
+                if "scale" in str(element.get('transform')):
+                    result = re.sub(r".*?((scale).*?\))", self.scaleElement, str(element.get('transform')))
+                    element.set('transform', result)
+                if "scale" not in str(element.get('transform')) and "matrix" not in str(element.get('transform')):
+                    element.set('transform', str(element.get('transform')) + "scale(" + str(self.factor) + ", " + str(self.factor) + ")")
+            else:
+                element.set('transform', "scale(" + str(self.factor) + ", " + str(self.factor) + ")")
+        xpathStr = '//svg:g'
+        elements = svg.xpath(xpathStr, namespaces=inkex.NSS)
+        for element in elements:
+            if element.get('transform'):
+                if "matrix" in str(element.get('transform')):
+                    result = re.sub(r".*?((matrix).*?\))", self.translateMatrixElement, str(element.get('transform')))
+                    element.set('transform', result)
+                if "translate" in str(element.get('transform')):
+                    result = re.sub(r".*?((translate).*?\))", self.translateElement, str(element.get('transform')))
+                    element.set('transform', result)
+        self.scaleGuides(svg)
+        self.scaleGrid(svg)
+    
+    def scaleGrid(self, svg):
+        xpathStr = '//inkscape:grid'
+        grids = svg.xpath(xpathStr, namespaces=inkex.NSS)
+        for grid in grids:
+            empspacingNumber = float(grid.get("empspacing")) * self.factor
+            spacingxNumber = float(grid.get("spacingx").replace("px", "")) * self.factor
+            spacingyNumber = float(grid.get("spacingy").replace("px", "")) * self.factor
+            originxNumber = float(grid.get("originx").replace("px", "")) * self.factor
+            originyNumber = float(grid.get("originy").replace("px", "")) * self.factor
+            grid.set("empspacing", str(empspacingNumber))
+            grid.set("spacingx", str(spacingxNumber) + "px")
+            grid.set("spacingy", str(spacingyNumber) + "px")
+            grid.set("originx", str(originxNumber) + "px")
+            grid.set("originy", str(originyNumber) + "px")
+   
+    def scaleGuides(self, svg):
+        xpathStr = '//sodipodi:guide'
+        guides = svg.xpath(xpathStr, namespaces=inkex.NSS)
+        for guide in guides:
+            point = string.split(guide.get("position"), ",")
+            guide.set("position", str(float(point[0].strip()) * self.factor) + "," + str(float(point[1].strip()) * self.factor))
+
+    #a dictionary of unit to user unit conversion factors
+    __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}
+    
+    __uuconvLegazy = {'in':90.0, 'pt':1.25, 'px':1, 'mm':3.5433070866, 'cm':35.433070866, 'm':3543.3070866,
+                      'km':3543307.0866, 'pc':15.0, 'yd':3240 , 'ft':1080}
+
+    def scaleElement(self, m):
+      scaleVal = m.group(1).replace("scale","").replace(" ","").replace("(","").replace(")","").split(",")
+      return "scale(" + str(float(scaleVal[0]) * self.factor) + "," + str(float(scaleVal[1]) * self.factor) + ")"
+
+    def scaleMatrixElement(self, m):
+      scaleMatrixVal = m.group(1).replace("matrix","").replace(" ","").replace("(","").replace(")","").split(",")
+      return "matrix(" + str(float(scaleMatrixVal[0]) * self.factor) + "," + scaleMatrixVal[1] + "," + scaleMatrixVal[2] + "," + str(float(scaleMatrixVal[3]) * self.factor) + "," + scaleMatrixVal[4] + "," + scaleMatrixVal[5] + ")"
+
+    def translateElement(self, m):
+      translateVal = m.group(1).replace("translate","").replace(" ","").replace("(","").replace(")","").split(",")
+      return "translate(" + str(float(translateVal[0]) * self.factor)  + "," + str(float(translateVal[1]) * self.factor) + ")"
+
+    def translateMatrixElement(self, m):
+      translateMatrixVal = m.group(1).replace("matrix","").replace(" ","").replace("(","").replace(")","").split(",")
+      return "matrix(" + translateMatrixVal[0] + "," + translateMatrixVal[1] + "," + translateMatrixVal[2] + "," + translateMatrixVal[3] + "," + str(float(translateMatrixVal[4]) * self.factor) + "," + str(float(translateMatrixVal[5]) * self.factor) + ")"
+
+    def effect(self):
+        if self.options.switcher == "0":
+            self.factor = 96.0/90.0
+        saveout = sys.stdout
+        sys.stdout = sys.stderr
+        svg = self.document.getroot()
+        namedview = svg.find(inkex.addNS('namedview', 'sodipodi'))
+        self.unit = namedview.get(inkex.addNS('document-units', 'inkscape'))
+        if self.unit and self.unit <> "px":
+            unitExponent = 0.0
+            if self.options.switcher == "0":
+                unitExponent = 1.0/(self.factor/self.__uuconv[self.unit])
+            else:
+                unitExponent = 1.0/(self.factor/self.__uuconvLegazy[self.unit])
+            namedview.set(inkex.addNS('document-units', 'inkscape'), "px")
+            self.factor = self.factor * unitExponent
+        self.scaleRoot(svg);
+        sys.stdout = saveout
+
+effect = DPISwitcher()
+effect.affect()
diff --git a/share/extensions/dxf_input.inx b/share/extensions/dxf_input.inx
index 0ba38252a..d51a07c39 100644
--- a/share/extensions/dxf_input.inx
+++ b/share/extensions/dxf_input.inx
@@ -23,7 +23,7 @@
 		<page name="help" _gui-text="Help">
 			<_param name="inputhelp" type="description" xml:space="preserve">- AutoCAD Release 13 and newer.
 - assume dxf drawing is in mm.
-- assume svg drawing is in pixels, at 90 dpi.
+- assume svg drawing is in pixels, at 96 dpi.
 - scale factor and origin apply only to manual scaling.
 - layers are preserved only on File->Open, not Import.
 - limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed.</_param>
diff --git a/share/extensions/dxf_input.py b/share/extensions/dxf_input.py
index 7ca176c92..972895cb8 100755
--- a/share/extensions/dxf_input.py
+++ b/share/extensions/dxf_input.py
@@ -354,7 +354,7 @@ parser.add_option("--font", action="store", type="string", dest="font", default=
 parser.add_option("--tab", action="store", type="string", dest="tab", default="Options")
 parser.add_option("--inputhelp", action="store", type="string", dest="inputhelp", default="")
 (options, args) = parser.parse_args(inkex.sys.argv[1:])
-doc = inkex.etree.parse(StringIO('<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="%s" height="%s"></svg>' % (210*90/25.4, 297*90/25.4)))
+doc = inkex.etree.parse(StringIO('<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="%s" height="%s"></svg>' % (210*96/25.4, 297*96/25.4)))
 desc = inkex.etree.SubElement(doc.getroot(), 'desc', {})
 defs = inkex.etree.SubElement(doc.getroot(), 'defs', {})
 marker = inkex.etree.SubElement(defs, 'marker', {'id': 'DistanceX', 'orient': 'auto', 'refX': '0.0', 'refY': '0.0', 'style': 'overflow:visible'})
@@ -365,7 +365,7 @@ inkex.etree.SubElement(pattern, 'path', {'d': 'M6 2 l-4,4', 'stroke': '#000000',
 inkex.etree.SubElement(pattern, 'path', {'d': 'M4 0 l-4,4', 'stroke': '#000000', 'stroke-width': '0.25', 'linecap': 'square'})
 stream = open(args[0], 'r')
 xmax = xmin = ymin = 0.0
-height = 297.0*90.0/25.4                            # default A4 height in pixels
+height = 297.0*96.0/25.4                            # default A4 height in pixels
 line = get_line()
 polylines = 0
 flag = 0                                            # (0, 1, 2, 3) = (none, LAYER, LTYPE, DIMTXT)
@@ -415,7 +415,7 @@ else:
     xmin = float(options.xmin)
     ymin = float(options.ymin)
 desc.text = '%s - scale = %f, origin = (%f, %f), auto = %s' % (unicode(args[0], options.input_encode), scale, xmin, ymin, options.auto)
-scale *= 90.0/25.4                                  # convert from mm to pixels
+scale *= 96.0/25.4                                  # convert from mm to pixels
 
 if not layer_nodes.has_key('0'):
     attribs = {inkex.addNS('groupmode','inkscape'): 'layer', inkex.addNS('label','inkscape'): '0'}
@@ -487,7 +487,7 @@ while line[0] and (line[1] != 'ENDSEC' or not inENTITIES):
             w = 0.5                                 # default lineweight for POINT
             if vals[groups['370']]:                 # Common Lineweight
                 if vals[groups['370']][0] > 0:
-                    w = 90.0/25.4*vals[groups['370']][0]/100.0
+                    w = 96.0/25.4*vals[groups['370']][0]/100.0
                     if w < 0.5:
                         w = 0.5
                     style = simplestyle.formatStyle({'stroke': '%s' % color, 'fill': 'none', 'stroke-width': '%.1f' % w})
diff --git a/share/extensions/dxf_outlines.inx b/share/extensions/dxf_outlines.inx
index ad3aef17f..c6f71d269 100644
--- a/share/extensions/dxf_outlines.inx
+++ b/share/extensions/dxf_outlines.inx
@@ -10,14 +10,14 @@
 			<param name="ROBO" type="boolean" _gui-text="use ROBO-Master type of spline output">false</param>
 			<param name="POLY" type="boolean" _gui-text="use LWPOLYLINE type of line output">true</param>
 			<param name="units" type="enum" _gui-text="Base unit">
-				<_item value="72./90">pt</_item>
-				<_item value="1./15">pc</_item>
+				<_item value="72./96">pt</_item>
+				<_item value="1./16">pc</_item>
 				<_item value="1.">px</_item>
-				<_item value="25.4/90">mm</_item>
-				<_item value="2.54/90">cm</_item>
-				<_item value=".0254/90">m</_item>
-				<_item value="1./90">in</_item>
-				<_item value="1./1080">ft</_item>
+				<_item value="25.4/96">mm</_item>
+				<_item value="2.54/96">cm</_item>
+				<_item value=".0254/96">m</_item>
+				<_item value="1./96">in</_item>
+				<_item value="1./1152">ft</_item>
 			</param>
 			<param name="encoding" type="enum" _gui-text="Character Encoding">
 				<_item value="latin_1">Latin 1</_item>
@@ -34,7 +34,7 @@
 		</page>
 		<page name="help" _gui-text="Help">
 			<_param name="inputhelp" type="description" xml:space="preserve">- AutoCAD Release 14 DXF format.
-- The base unit parameter specifies in what unit the coordinates are output (90 px = 1 in).
+- The base unit parameter specifies in what unit the coordinates are output (96 px = 1 in).
 - Supported element types
     - paths (lines and splines)
     - rectangles
diff --git a/share/extensions/dxf_outlines.py b/share/extensions/dxf_outlines.py
index f5cf37aff..f7e57c32e 100755
--- a/share/extensions/dxf_outlines.py
+++ b/share/extensions/dxf_outlines.py
@@ -76,7 +76,7 @@ class MyEffect(inkex.Effect):
                                      default=True)
         self.OptionParser.add_option("--units", action="store",
                                      type="string", dest="units",
-                                     default="72./90") # Points
+                                     default="72./96") # Points
         self.OptionParser.add_option("--encoding", action="store",
                                      type="string", dest="char_encode",
                                      default="latin_1")
@@ -324,7 +324,7 @@ class MyEffect(inkex.Effect):
 
         scale = eval(self.options.units)
         if not scale:
-            scale = 25.4/90     # if no scale is specified, assume inch as baseunit
+            scale = 25.4/96     # if no scale is specified, assume inch as baseunit
         h = self.unittouu(self.document.getroot().xpath('@height', namespaces=inkex.NSS)[0])
         self.groupmat = [[[scale, 0.0, 0.0], [0.0, -scale, h*scale]]]
         doc = self.document.getroot()
diff --git a/share/extensions/gimp_xcf.inx b/share/extensions/gimp_xcf.inx
index 10bcef627..30406b62d 100644
--- a/share/extensions/gimp_xcf.inx
+++ b/share/extensions/gimp_xcf.inx
@@ -11,7 +11,7 @@
         <param name="guides" type="boolean" _gui-text="Save Guides">false</param>
         <param name="grid" type="boolean" _gui-text="Save Grid">false</param>
         <param name="background" type="boolean" _gui-text="Save Background">false</param>
-        <param name="dpi" type="int" min="1" max="3000" _gui-text="File Resolution:">90</param>
+        <param name="dpi" type="int" min="1" max="3000" _gui-text="File Resolution:">96</param>
         </page>
         <page name="Help" _gui-text="Help">
             <_param name="instructions" type="description" xml:space="preserve">This extension exports the document to Gimp XCF format according to the following options:
diff --git a/share/extensions/gimp_xcf.py b/share/extensions/gimp_xcf.py
index c2a8cb274..11c9d041f 100755
--- a/share/extensions/gimp_xcf.py
+++ b/share/extensions/gimp_xcf.py
@@ -63,7 +63,7 @@ class MyEffect(inkex.Effect):
                                      help="Add background color to each layer")
         self.OptionParser.add_option("-i", "--dpi",
                                      action="store", type="string",
-                                     dest="resolution", default="90",
+                                     dest="resolution", default="96",
                                      help="File resolution")
 
     def output(self):
diff --git a/share/extensions/layout_nup.inx b/share/extensions/layout_nup.inx
index bdf650722..2b7734fc3 100644
--- a/share/extensions/layout_nup.inx
+++ b/share/extensions/layout_nup.inx
@@ -15,8 +15,8 @@
         <item value="cm">cm</item>
         <item value="mm">mm</item>
       </param>
-      <param name="pgSizeX" type="float" min="0.0" max="9999.0" _gui-text="Size X:">765</param>
-      <param name="pgSizeY" type="float" min="0.0" max="9999.0" _gui-text="Size Y:">990</param>
+      <param name="pgSizeX" type="float" min="0.0" max="9999.0" _gui-text="Size X:">816</param>
+      <param name="pgSizeY" type="float" min="0.0" max="9999.0" _gui-text="Size Y:">1056</param>
       <_param name="pgMargin" type="description" appearance="header">Page margins</_param>
       <param name="pgMarginTop" type="float" indent="1" min="0.0" max="9999.0" _gui-text="Top:">0</param>
       <param name="pgMarginBottom" type="float" indent="1" min="0.0" max="9999.0" _gui-text="Bottom:">0</param>
diff --git a/share/extensions/layout_nup_pageframe.py b/share/extensions/layout_nup_pageframe.py
index 59da1f4bb..471a75dd3 100755
--- a/share/extensions/layout_nup_pageframe.py
+++ b/share/extensions/layout_nup_pageframe.py
@@ -38,7 +38,7 @@ def expandTuple(unit, x, length = 4):
 #@-node:tbrown.20070622103716.1:expandTuple
 #@+node:tbrown.20070622103716.2:GenerateNup
 def GenerateNup(unit="px",
-                pgSize=("8.5*90","11*90"),
+                pgSize=("8.5*96","11*96"),
                 pgMargin=(0,0),
                 pgPadding=(0,0),
                 num=(2,2),
diff --git a/share/extensions/perfectboundcover.py b/share/extensions/perfectboundcover.py
index 6cdab7eab..9f81dbb36 100755
--- a/share/extensions/perfectboundcover.py
+++ b/share/extensions/perfectboundcover.py
@@ -135,7 +135,7 @@ class PerfectBoundCover(inkex.Effect):
             for guide in guides:
                 newguide = inkex.etree.Element(inkex.addNS('guide','sodipodi'))
                 newguide.set("orientation", guide[0])
-                newguide.set("position", "%f" % (guide[1] * 90))
+                newguide.set("position", "%f" % (guide[1] * 96))
                 namedview[0].append(newguide)
         
         '''
diff --git a/share/extensions/print_win32_vector.py b/share/extensions/print_win32_vector.py
index ca166d25a..37c2021ac 100644
--- a/share/extensions/print_win32_vector.py
+++ b/share/extensions/print_win32_vector.py
@@ -199,7 +199,7 @@ class MyEffect(inkex.Effect):
         if mygdi.StartDocA(self.hDC, byref(docInfo)) < 0:
             exit()                      # user clicked Cancel
 
-        self.scale = (ord(pDevMode[58]) + 256.0*ord(pDevMode[59]))/90    # use PrintQuality from DEVMODE
+        self.scale = (ord(pDevMode[58]) + 256.0*ord(pDevMode[59]))/96    # use PrintQuality from DEVMODE
         self.groupmat = [[[self.scale, 0.0, 0.0], [0.0, self.scale, 0.0]]]
         doc = self.document.getroot()
         self.process_group(doc)
diff --git a/share/extensions/svg2fxg.xsl b/share/extensions/svg2fxg.xsl
index db9f61f22..3853b4d7b 100755
--- a/share/extensions/svg2fxg.xsl
+++ b/share/extensions/svg2fxg.xsl
@@ -832,22 +832,22 @@ extension-element-prefixes="math">
       <xsl:value-of select="round(translate($convert_value, 'px', ''))" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'pt')">
-      <xsl:value-of select="round(translate($convert_value, 'pt', '') * 1.25)" />
+      <xsl:value-of select="round(translate($convert_value, 'pt', '') * 1.333333)" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'pc')">
-      <xsl:value-of select="round(translate($convert_value, 'pc', '') * 15)" />
+      <xsl:value-of select="round(translate($convert_value, 'pc', '') * 16)" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'mm')">
-      <xsl:value-of select="round(translate($convert_value, 'mm', '') * 3.543307)" />
+      <xsl:value-of select="round(translate($convert_value, 'mm', '') * 3.779527)" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'cm')">
-      <xsl:value-of select="round(translate($convert_value, 'cm', '') * 35.43307)" />
+      <xsl:value-of select="round(translate($convert_value, 'cm', '') * 37.79527)" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'in')">
-      <xsl:value-of select="round(translate($convert_value, 'in', '') * 90)" />
+      <xsl:value-of select="round(translate($convert_value, 'in', '') * 96)" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'ft')">
-      <xsl:value-of select="round(translate($convert_value, 'ft', '') * 1080)" />
+      <xsl:value-of select="round(translate($convert_value, 'ft', '') * 1152)" />
     </xsl:when>
     <xsl:when test="not(string(number($convert_value))='NaN')">
       <xsl:value-of select="round($convert_value)" />
diff --git a/share/extensions/svg2xaml.xsl b/share/extensions/svg2xaml.xsl
index 040e6bcb2..fa785fa4f 100755
--- a/share/extensions/svg2xaml.xsl
+++ b/share/extensions/svg2xaml.xsl
@@ -854,22 +854,22 @@ exclude-result-prefixes="rdf xlink xs exsl libxslt">
       <xsl:value-of select="translate($convert_value, 'px', '')" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'pt')">
-      <xsl:value-of select="translate($convert_value, 'pt', '') * 1.25" />
+      <xsl:value-of select="translate($convert_value, 'pt', '') * 1.333333" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'pc')">
-      <xsl:value-of select="translate($convert_value, 'pc', '') * 15" />
+      <xsl:value-of select="translate($convert_value, 'pc', '') * 16" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'mm')">
-      <xsl:value-of select="translate($convert_value, 'mm', '') * 3.543307" />
+      <xsl:value-of select="translate($convert_value, 'mm', '') * 3.779527" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'cm')">
-      <xsl:value-of select="translate($convert_value, 'cm', '') * 35.43307" />
+      <xsl:value-of select="translate($convert_value, 'cm', '') * 37.79527" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'in')">
-      <xsl:value-of select="translate($convert_value, 'in', '') * 90" />
+      <xsl:value-of select="translate($convert_value, 'in', '') * 96" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'ft')">
-      <xsl:value-of select="translate($convert_value, 'ft', '') * 1080" />
+      <xsl:value-of select="translate($convert_value, 'ft', '') * 1152" />
     </xsl:when>
     <xsl:otherwise>
       <xsl:value-of select="$convert_value" />
diff --git a/share/extensions/synfig_prepare.py b/share/extensions/synfig_prepare.py
index e06efde9b..c6ad48c97 100755
--- a/share/extensions/synfig_prepare.py
+++ b/share/extensions/synfig_prepare.py
@@ -457,17 +457,17 @@ def get_dimension(s="1024"):
     elif s[-2:] == "px":
         return float(s[:-2])
     elif s[-2:] == "pt":
-        return float(s[:-2])*1.25
+        return float(s[:-2])*1.333
     elif s[-2:] == "em":
         return float(s[:-2])*16
     elif s[-2:] == "mm":
-        return float(s[:-2])*3.54
+        return float(s[:-2])*3.779
     elif s[-2:] == "pc":
-        return float(s[:-2])*15
+        return float(s[:-2])*16
     elif s[-2:] == "cm":
-        return float(s[:-2])*35.43
+        return float(s[:-2])*37.79
     elif s[-2:] == "in":
-        return float(s[:-2])*90
+        return float(s[:-2])*96
     else:
         return 1024
 
diff --git a/share/extensions/test/svg/default-inkscape-SVG.svg b/share/extensions/test/svg/default-inkscape-SVG.svg
index a6a610fdb..259e13c0d 100644
--- a/share/extensions/test/svg/default-inkscape-SVG.svg
+++ b/share/extensions/test/svg/default-inkscape-SVG.svg
@@ -8,8 +8,8 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   width="744.09448819"
-   height="1052.3622047">
+   width="793.7007874"
+   height="1122.519685">
   <defs />
   <sodipodi:namedview
      id="base"
diff --git a/share/extensions/test/svg/default-plain-SVG.svg b/share/extensions/test/svg/default-plain-SVG.svg
index 544273366..9c0884789 100644
--- a/share/extensions/test/svg/default-plain-SVG.svg
+++ b/share/extensions/test/svg/default-plain-SVG.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="744.09448819"
-   height="1052.3622047">
+   width="793.7007874"
+   height="1122.519685">
   <defs
      id="defs4" />
   <metadata
diff --git a/share/extensions/test/svg/empty-SVG.svg b/share/extensions/test/svg/empty-SVG.svg
index 475cc856b..d6c680b67 100644
--- a/share/extensions/test/svg/empty-SVG.svg
+++ b/share/extensions/test/svg/empty-SVG.svg
@@ -8,6 +8,6 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="744.09448819"
-   height="1052.3622047">
+   width="793.7007874"
+   height="1122.519685">
 </svg>
diff --git a/share/extensions/webslicer_create_rect.inx b/share/extensions/webslicer_create_rect.inx
index 5b3b447e9..85578e24e 100644
--- a/share/extensions/webslicer_create_rect.inx
+++ b/share/extensions/webslicer_create_rect.inx
@@ -11,7 +11,7 @@
     <item value="jpg">JPG</item>
     <item value="gif">GIF</item>
   </param>
-  <param name="dpi" type="float" min="1" max="9999" _gui-text="DPI:">90</param>
+  <param name="dpi" type="float" min="1" max="9999" _gui-text="DPI:">96</param>
   <param name="dimension" type="string" _gui-text="Force Dimension:"></param>
 <!-- i18n. Description duplicated in a fake value attribute in order to make it translatable -->
   <param name="help-dimension1" type="description" _value="Force Dimension must be set as &lt;width&gt;x&lt;height&gt;">Force Dimension must be set as &lt;width&gt;x&lt;height&gt;</param>
diff --git a/share/symbols/MapSymbolsNPS.svg b/share/symbols/MapSymbolsNPS.svg
index 4a8a4bdba..81b24adde 100644
--- a/share/symbols/MapSymbolsNPS.svg
+++ b/share/symbols/MapSymbolsNPS.svg
@@ -309,7 +309,7 @@
     </symbol>
 
     <symbol id="FourWheelDriveRoad">
-      <title>Four Wheel Drive Road"</title>
+      <title>Four Wheel Drive Road</title>
       <path d="m 64.5,37.75 0,-7.25 c 0,-2 -1.5,-2.5 -2.5,-2.5 l -14.25,0 -5.25,-8.75 -3,0 5.25,8.75 -4,6.75 -9.25,0 c -3,-6.25 -9.5,-6 -9.5,-6 l -17,0 0,15.25 2.5,0 a 10.6,10.6 0 0 1 21,0 l 15,0 a 10.6,10.6 0 0 1 21,0 l 1,0 c 1,0 1.75,-0.75 1.75,-1.75 l 0,-4.5 z" style="stroke:none"/>
       <g style="fill:none;stroke-width:4">
 	<circle cx="18" cy="45.375" r="5"/>
@@ -318,7 +318,7 @@
     </symbol>
 
     <symbol id="FourWheelDriveRoad_Inv">
-      <title>Four Wheel Drive Road"</title>
+      <title>Four Wheel Drive Road</title>
       <rect x="0.5" y="0.5" width="71" height="71" ry="6" style="stroke:white"/>
       <path d="m 64.5,37.75 0,-7.25 c 0,-2 -1.5,-2.5 -2.5,-2.5 l -14.25,0 -5.25,-8.75 -3,0 5.25,8.75 -4,6.75 -9.25,0 c -3,-6.25 -9.5,-6 -9.5,-6 l -17,0 0,15.25 2.5,0 a 10.6,10.6 0 0 1 21,0 l 15,0 a 10.6,10.6 0 0 1 21,0 l 1,0 c 1,0 1.75,-0.75 1.75,-1.75 l 0,-4.5 z" style="fill:white;stroke:none"/>
       <g style="fill:none;stroke:white;stroke-width:4">
diff --git a/share/templates/default_pt.svg b/share/templates/default_pt.svg
index 25cce1917..79cb11dbf 100644
--- a/share/templates/default_pt.svg
+++ b/share/templates/default_pt.svg
@@ -10,7 +10,7 @@
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    width="210mm"
    height="297mm"
-   viewBox="0 0 595.27558 841.88974">
+   viewBox="0 0 595.275591 841.889764">
   <defs />
   <sodipodi:namedview
      id="base"
diff --git a/share/templates/default_px.svg b/share/templates/default_px.svg
index eb1cad0ca..26a1ba4fd 100644
--- a/share/templates/default_px.svg
+++ b/share/templates/default_px.svg
@@ -8,8 +8,9 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   width="793.7007874"
-   height="1122.519688">
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 793.7007874 1122.519685">
   <defs />
   <sodipodi:namedview
      id="base"