From c80ae1e4b6ac7faddda3a6a5d128d0a4e27bdb95 Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Sun, 2 Nov 2014 11:54:52 -0500 Subject: update Python extensions from 90 to 96 dpi. (bzr r13659) --- share/extensions/dxf_input.inx | 2 +- share/extensions/dxf_input.py | 8 ++++---- share/extensions/dxf_outlines.inx | 16 ++++++++-------- share/extensions/dxf_outlines.py | 4 ++-- share/extensions/gimp_xcf.inx | 2 +- share/extensions/gimp_xcf.py | 2 +- share/extensions/layout_nup.inx | 4 ++-- share/extensions/layout_nup_pageframe.py | 2 +- share/extensions/perfectboundcover.py | 2 +- share/extensions/print_win32_vector.py | 2 +- share/extensions/svg2fxg.xsl | 12 ++++++------ share/extensions/svg2xaml.xsl | 12 ++++++------ share/extensions/synfig_prepare.py | 10 +++++----- share/extensions/test/svg/default-inkscape-SVG.svg | 4 ++-- share/extensions/test/svg/default-plain-SVG.svg | 4 ++-- share/extensions/test/svg/empty-SVG.svg | 4 ++-- share/extensions/webslicer_create_rect.inx | 2 +- 17 files changed, 46 insertions(+), 46 deletions(-) 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 @@ <_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. 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('' % (210*90/25.4, 297*90/25.4))) +doc = inkex.etree.parse(StringIO('' % (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 @@ false true - <_item value="72./90">pt - <_item value="1./15">pc + <_item value="72./96">pt + <_item value="1./16">pc <_item value="1.">px - <_item value="25.4/90">mm - <_item value="2.54/90">cm - <_item value=".0254/90">m - <_item value="1./90">in - <_item value="1./1080">ft + <_item value="25.4/96">mm + <_item value="2.54/96">cm + <_item value=".0254/96">m + <_item value="1./96">in + <_item value="1./1152">ft <_item value="latin_1">Latin 1 @@ -34,7 +34,7 @@ <_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 @@ false false false - 90 + 96 <_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 @@ cm mm - 765 - 990 + 816 + 1056 <_param name="pgMargin" type="description" appearance="header">Page margins 0 0 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"> - + - + - + - + - + - + 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"> - + - + - + - + - + - + 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"> + width="793.7007874" + height="1122.519685"> + width="793.7007874" + height="1122.519685"> 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 @@ JPG GIF - 90 + 96 Force Dimension must be set as <width>x<height> -- cgit v1.2.3