Reset svg to an older version as well

svg/__init__.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 """
 
 """
 
 import wx
 
-def AddEllipticalArc(self, x, y, w, h, startAngle, endAngle, clockwise = False):
-    """ Draws an arc of an ellipse within bounding rect (x, y, w, h)
+def AddEllipticalArc(self, x, y, w, h, startAngle, endAngle, clockwise=False):
+    """ Draws an arc of an ellipse within bounding rect (x,y,w,h) 
     from startArc to endArc (in radians, relative to the horizontal line of the eclipse)"""
     
     if True:
@@ -55,3 +40,4 @@ if not hasattr(wx.GraphicsPath, "AddEllipticalArc"):
     wx.GraphicsPath.AddEllipticalArc = AddEllipticalArc
 
 del AddEllipticalArc
+    
\ No newline at end of file

svg/attributes.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 """
     Parsers for specific attributes
 """
@@ -37,7 +22,7 @@ colorDeclaration = none | currentColor | colourValue
 
 urlEnd = (
     Literal(")").suppress() + 
-    Optional(Group(colorDeclaration), default = ()) +
+    Optional(Group(colorDeclaration), default=()) + 
     StringEnd()
 )
 
@@ -45,12 +30,12 @@ url = (
     CaselessLiteral("URL")
     + 
     Literal("(").suppress()+
-    Group(SkipTo(urlEnd, include = True).setParseAction(parsePossibleURL))
+    Group(SkipTo(urlEnd, include=True).setParseAction(parsePossibleURL))
 )
 
 #paint value will parse into a (type, details) tuple.
 #For none and currentColor, the details tuple will be the empty tuple
-#for CSS color declarations, it will be (type, (R, G, B))
+#for CSS color declarations, it will be (type, (R,G,B))
 #for URLs, it will be ("URL", ((url tuple), fallback))
 #The url tuple will be as returned by urlparse.urlsplit, and can be 
 #an empty tuple if the parser has an error

svg/css/__init__.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 from __future__ import absolute_import
 from .transform import transformList
 from .inline import inlineStyle

svg/css/atrule.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 """ CSS at-rules"""
 
 from pyparsing import Literal, Combine

svg/css/block.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 """
     CSS blocks
 """
@@ -20,3 +5,4 @@
 from pyparsing import nestedExpr
 
 block = nestedExpr(opener="{", closer="}")
+

svg/css/colour.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 """
     Parsing for CSS colour values.
     Supported formats:

svg/css/identifier.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 """ Parse CSS identifiers. More complicated than it sounds"""
 
 from pyparsing import Word, Literal, Regex, Combine, Optional, White, oneOf, ZeroOrMore

svg/css/inline.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 """ Parser for inline CSS in style attributes """
 
 def inlineStyle(styleString):

svg/css/transform.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 """
     Parsing for CSS and CSS-style values, such as transform and filter attributes.
 """

svg/css/values.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 """
 Parser for various kinds of CSS values as per CSS2 spec section 4.3
 """

svg/document.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 """
     SVGDocument
 """
@@ -25,26 +10,26 @@ from functools import wraps
 
 import pathdata
 import css
-from css.colour import colourValue
-from css import values
+from svg.css.colour import colourValue
+from svg.css import values
 from attributes import paintValue
 
-document = """<?xml version = "1.0" standalone = "no"?>
+document = """<?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width = "4cm" height = "4cm" viewBox = "0 0 400 400"
-     xmlns = "http://www.w3.org/2000/svg" version = "1.1">
+<svg width="4cm" height="4cm" viewBox="0 0 400 400"
+     xmlns="http://www.w3.org/2000/svg" version="1.1">
   <title>Example triangle01- simple example of a 'path'</title>
   <desc>A path that draws a triangle</desc>
-  <rect x = "1" y = "1" width = "398" height = "398"
-        fill = "none" stroke = "blue" />
-  <path d = "M 100 100 L 300 100 L 200 300 z"
-        fill = "red" stroke = "blue" stroke-width = "3" />
+  <rect x="1" y="1" width="398" height="398"
+        fill="none" stroke="blue" />
+  <path d="M 100 100 L 300 100 L 200 300 z"
+        fill="red" stroke="blue" stroke-width="3" />
 </svg>"""
 
 makePath = lambda: wx.GraphicsRenderer_GetDefaultRenderer().CreatePath()
 
-def attrAsFloat(node, attr, defaultValue = "0"):
+def attrAsFloat(node, attr, defaultValue="0"):
     val = node.get(attr, defaultValue)
     #TODO: process stuff like "inherit" by walking back up the nodes
     #fast path optimization - if it's a valid float, don't
@@ -54,7 +39,7 @@ def attrAsFloat(node, attr, defaultValue = "0"):
     except ValueError:
         return valueToPixels(val)
     
-def valueToPixels(val, defaultUnits = "px"):
+def valueToPixels(val, defaultUnits="px"):
     #TODO manage default units
     from pyparsing import ParseException
     try:
@@ -190,14 +175,14 @@ class SVGDocument(object):
                     )
                 if transform == 'skewX':
                     matrix = wx.GraphicsRenderer_GetDefaultRenderer().CreateMatrix(
-                        1, 0, math.tan(math.radians(args[0])), 1, 0, 0
+                        1,0,math.tan(math.radians(args[0])),1,0,0
                     )
                     ops.append(
                         (wx.GraphicsContext.ConcatTransform, (matrix,))
                     )
                 if transform == 'skewY':
                     matrix = wx.GraphicsRenderer_GetDefaultRenderer().CreateMatrix(
-                        1, math.tan(math.radians(args[0])), 0, 1, 0, 0
+                        1,math.tan(math.radians(args[0])),0,1,0,0
                     )
                     ops.append(
                         (wx.GraphicsContext.ConcatTransform, (matrix,))
@@ -246,7 +231,7 @@ class SVGDocument(object):
     def addTextToDocument(self, node):
         x, y = [attrAsFloat(node, attr) for attr in ('x', 'y')]
         
-        def DoDrawText(context, text, x, y, brush = wx.NullGraphicsBrush):
+        def DoDrawText(context, text, x, y, brush=wx.NullGraphicsBrush):
             #SVG spec appears to originate text from the bottom
             #rather than the top as with our API. This function
             #will measure and then re-orient the text as needed.
@@ -274,7 +259,7 @@ class SVGDocument(object):
         rx = node.get('rx')
         ry = node.get('ry')
         if not (w and h):
-            path.MoveToPoint(x, y) #keep the current point correct
+            path.MoveToPoint(x,y) #keep the current point correct
             return
         if rx or ry:
             if rx and ry:
@@ -464,7 +449,7 @@ class SVGDocument(object):
         pen.SetJoin(joinmap.get(self.state.get('stroke-linejoin', None), wx.JOIN_MITER))
         return wx.GraphicsRenderer_GetDefaultRenderer().CreatePen(pen)
 
-    def getBrushFromState(self, path = None):
+    def getBrushFromState(self, path=None):
         brushcolour = self.state.get('fill', 'black').strip()
         type, details = paintValue.parseString(brushcolour)
         if type == "URL":
@@ -480,29 +465,29 @@ class SVGDocument(object):
                     box = path.GetBox()
                     x, y, w, h = box.Get()
                     return wx.GraphicsRenderer.GetDefaultRenderer().CreateLinearGradientBrush(
-                        x, y, x+w, y+h, wx.Colour(0, 0, 255, 128), wx.RED
+                        x,y,x+w,y+h,wx.Colour(0,0,255,128), wx.RED
                     )
                 elif element.tag == '{http://www.w3.org/2000/svg}radialGradient':
                     box = path.GetBox()
                     x, y, w, h = box.Get()
                     #print w
-                    mx = wx.GraphicsRenderer.GetDefaultRenderer().CreateMatrix(x, y, w, h)
+                    mx = wx.GraphicsRenderer.GetDefaultRenderer().CreateMatrix(x,y,w,h)
                     cx, cy = mx.TransformPoint(0.5, 0.5)
                     fx, fy = cx, cy
                     return wx.GraphicsRenderer.GetDefaultRenderer().CreateRadialGradientBrush(
-                        cx, cy,
-                        fx, fy,
-                        (max(w, h))/2,
-                        wx.Colour(0, 0, 255, 128), wx.RED
+                        cx,cy,
+                        fx,fy,
+                        (max(w,h))/2,
+                        wx.Colour(0,0,255,128), wx.RED
                     )
                 else:
                     #invlid gradient specified
                     return wx.NullBrush
-            r, g, b  = 0, 0, 0
+            r,g,b  = 0,0,0
         if type == 'CURRENTCOLOR':
             type, details = paintValue.parseString(self.state.get('color', 'none'))
         if type == 'RGB':
-            r, g, b = details
+            r,g,b = details
         elif type == "NONE":
             return wx.NullBrush
         opacity = self.state.get('fill-opacity', self.state.get('opacity', '1'))
@@ -514,9 +499,9 @@ class SVGDocument(object):
         #be created every time anyway in order to pass them,
         #defeating the purpose of the cache
         try:
-            return SVGDocument.brushCache[(r, g, b, a)]
+            return SVGDocument.brushCache[(r,g,b,a)]
         except KeyError:
-            return SVGDocument.brushCache.setdefault((r, g, b, a), wx.Brush(wx.Colour(r, g, b, a)))
+            return SVGDocument.brushCache.setdefault((r,g,b,a), wx.Brush(wx.Colour(r,g,b,a)))
         
         
     def resolveURL(self, urlData):
@@ -586,7 +571,7 @@ class SVGDocument(object):
             #~ cp = path.GetCurrentPoint()
             #~ path.AddCircle(c1x, c1y, 5)
             #~ path.AddCircle(c2x, c2y, 3)
-            #~ path.AddCircle(x, y, 7)
+            #~ path.AddCircle(x,y, 7)
             #~ path.MoveToPoint(cp)
             #~ print "C", control1, control2, endpoint
         
@@ -599,7 +584,7 @@ class SVGDocument(object):
                 control1 = reflectPoint(self.lastControl, path.GetCurrentPoint())
             else:
                 control1 = path.GetCurrentPoint()
-            #~ print "S", self.lastControl, ":", control1, control2, endpoint
+            #~ print "S", self.lastControl,":",control1, control2, endpoint    
             self.lastControl = control2
             path.AddCurveToPoint(
                 control1, 
@@ -607,7 +592,7 @@ class SVGDocument(object):
                 endpoint
             )
         elif type == "Q":
-            (cx, cy), (x, y) = map(normalizePoint, arg)
+            (cx, cy), (x,y) = map(normalizePoint, arg)
             self.lastControlQ = (cx, cy)
             path.AddQuadCurveToPoint(cx, cy, x, y)
         elif type == "T":
@@ -622,12 +607,12 @@ class SVGDocument(object):
         elif type == "V":
             _, y = normalizePoint((0, arg))
             x, _ = path.GetCurrentPoint()
-            path.AddLineToPoint(x, y)
+            path.AddLineToPoint(x,y)
         
         elif type == "H":
             x, _ = normalizePoint((arg, 0))
             _, y = path.GetCurrentPoint()
-            path.AddLineToPoint(x, y)
+            path.AddLineToPoint(x,y)
             
         elif type == "A":
             #wxGC currently only supports circular arcs,
@@ -640,14 +625,14 @@ class SVGDocument(object):
             (x, y) #endpoint on the arc
             ) = arg 
             
-            x, y = normalizePoint((x, y))
+            x, y = normalizePoint((x,y))
             cx, cy = path.GetCurrentPoint()
             if (cx, cy) == (x, y):
                 return #noop
                 
             if (rx == 0 or ry == 0):
                 #no radius is effectively a line
-                path.AddLineToPoint(x, y)
+                path.AddLineToPoint(x,y)
                 return
             
             #find the center point for the ellipse
@@ -700,7 +685,7 @@ class SVGDocument(object):
             path.MoveToPoint(x, y)
             #~ npath = makePath()
             #~ npath.AddEllipticalArc(cnx-rx, cny-ry, rx*2, ry*2, firstArc, lastArc, False)
-            #~ npath.MoveToPoint(x, y)
+            #~ npath.MoveToPoint(x,y)
             #~ path.AddPath(npath)
             
         elif type == 'Z':

svg/pathdata.py

-# This file is part of the Printrun suite.
-#
-# Printrun 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 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun 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 Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
 """
     SVG path data parser
     
@@ -42,12 +27,12 @@ class CaselessPreservingLiteral(CaselessLiteral):
         instead of as defined.
     """
     def __init__( self, matchString ):
-        super(CaselessPreservingLiteral, self).__init__( matchString.upper() )
+        super(CaselessPreservingLiteral,self).__init__( matchString.upper() )
         self.name = "'%s'" % matchString
         self.errmsg = "Expected " + self.name
         self.myException.msg = self.errmsg
 
-    def parseImpl( self, instring, loc, doActions = True ):
+    def parseImpl( self, instring, loc, doActions=True ):
         test = instring[ loc:loc+self.matchLen ]
         if test.upper() == self.match:
             return loc+self.matchLen, test
@@ -132,7 +117,7 @@ ellipticalArcArgument = Group(
     arcRadius + maybeComma + #rx, ry
     number + maybeComma +#rotation
     arcFlags + #large-arc-flag, sweep-flag
-    coordinatePair #(x, y)
+    coordinatePair #(x,y)
 )
 
  
@@ -204,3 +189,5 @@ if __name__ == '__main__':
     #~ from tests.test_pathdata import *
     #~ unittest.main()
     profile()
+
+