From 61a7265ecfafc522ce3808e9b3c2912deadb10bd Mon Sep 17 00:00:00 2001
From: JSCHILL1 <jschill1@Lithium-3.local>
Date: Wed, 5 Aug 2009 17:05:27 -0500
Subject: [PATCH] Add unit tests to reduce to shorthand curve path segments. 
 Updated test script

---
 scour.py                         | 11 ++++++++++-
 testscour.py                     | 12 ++++++++++++
 unittests/path-bez-optimize.svg  |  4 ++++
 unittests/path-quad-optimize.svg |  4 ++++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 unittests/path-bez-optimize.svg
 create mode 100644 unittests/path-quad-optimize.svg

diff --git a/scour.py b/scour.py
index 01c01a8..80b9522 100755
--- a/scour.py
+++ b/scour.py
@@ -65,6 +65,8 @@
 # - prevent elements from being stripped if they are referenced in a <style> element
 #   (for instance, filter, marker, pattern) - need a crude CSS parser
 # - Remove any unused glyphs from font elements?
+# - Convert path segment c into s where possible: http://www.w3.org/TR/SVG11/paths.html#PathDataCubicBezierCommands
+# - Convert path segment q into t where possible: http://www.w3.org/TR/SVG11/paths.html#PathDataQuadraticBezierCommands
 
 # necessary to get true division
 from __future__ import division
@@ -1500,9 +1502,10 @@ def cleanPath(element) :
 		newPath.append( (prevCmd, prevData) )
 	path = newPath
 
-	# convert line segments into h,v where possible	
+	# convert to shorthand path segments where possible
 	newPath = [path[0]]
 	for (cmd,data) in path[1:]:
+		# convert line segments into h,v where possible	
 		if cmd == 'l':
 			i = 0
 			lineTuples = []
@@ -1529,6 +1532,12 @@ def cleanPath(element) :
 				i += 2
 			if lineTuples:
 				newPath.append( ('l', lineTuples) )
+		# convert Bézier curve segments into s where possible	
+		elif cmd == 'c':
+			newPath.append( (cmd, data) )
+		# convert quadratic curve segments into t where possible	
+		elif cmd == 'q':
+			newPath.append( (cmd, data) )
 		else:
 			newPath.append( (cmd, data) )
 	path = newPath
diff --git a/testscour.py b/testscour.py
index d6f43d9..d428711 100755
--- a/testscour.py
+++ b/testscour.py
@@ -548,6 +548,18 @@ class ChangeLineToVerticalLineSegmentInPath(unittest.TestCase):
 		self.assertEquals(path[2][1][0], 100.0,
 			'Did not calculate vertical line segment in path correctly' )
 
+class ChangeBezierToShorthandInPath(unittest.TestCase):
+	def runTest(self):
+		path = scour.scourXmlFile('unittests/path-bez-optimize.svg').getElementsByTagNameNS(SVGNS, 'path')[0]
+		self.assertEquals(path.getAttribute('d'), 'm10,100c50-50,50,50,100,0s50,50,100,0',
+			'Did not change bezier curves into shorthand curve segments in path')
+
+class ChangeQuadToShorthandInPath(unittest.TestCase):
+	def runTest(self):
+		path = scour.scourXmlFile('unittests/path-quad-optimize.svg').getElementsByTagNameNS(SVGNS, 'path')[0]
+		self.assertEquals(path.getAttribute('d'), 'm10,100q50-50,100,0t100,0',
+			'Did not change quadratic curves into shorthand curve segments in path')
+
 class HandleNonAsciiUtf8(unittest.TestCase):
 	def runTest(self):
 		doc = scour.scourXmlFile('unittests/utf8.svg')
diff --git a/unittests/path-bez-optimize.svg b/unittests/path-bez-optimize.svg
new file mode 100644
index 0000000..8d3cc93
--- /dev/null
+++ b/unittests/path-bez-optimize.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" viewBox="0 0 400 400" xmlns="http://www.w3.org/2000/svg">
+  <path d="m10,100c50-50,50,50,100,0,50-50,50,50,100,0" fill="none" stroke="blue" stroke-width="5"/>
+</svg>
\ No newline at end of file
diff --git a/unittests/path-quad-optimize.svg b/unittests/path-quad-optimize.svg
new file mode 100644
index 0000000..097a631
--- /dev/null
+++ b/unittests/path-quad-optimize.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" viewBox="0 0 400 400" xmlns="http://www.w3.org/2000/svg">
+  <path d="m10,100q50-50,100,0,50,50,100,0" fill="none" stroke="blue" stroke-width="5"/>
+</svg>
\ No newline at end of file