Final 0.14: --disable-embed-rasters and fix embedding raster bug caused by restructuring of command-line option parser

release-notes.html

@@ -19,6 +19,8 @@
 		<li>Convert straight curves into line commands</li>
 		<li>Eliminate last segment in a polygon</li>
 		<li>Rework command-line argument parsing</li>
+		<li>Fix bug in embedRasters() caused by new command-line parsing</li>
+		<li>added --disable-embed-rasters command-line option</li>
 	</ul>
 </section>
 

scour.py

@@ -1378,7 +1378,7 @@ def serializePath(pathObj):
 				c += 1
 	return pathStr
 
-def embedRasters(element) :
+def embedRasters(element, options) :
 	"""
 		Converts raster references to inline images.
 		NOTE: there are size limits to base64-encoding handling in browsers 
@@ -1400,7 +1400,9 @@ def embedRasters(element) :
 				if href[:7] != 'http://' and os.path.isfile(href) == False :
 						# if this is not an absolute path, set path relative
 						# to script file based on input arg 
-						href = os.path.join(os.path.dirname(args[1]), href)				
+						infilename = '.'
+						if options.infilename: infilename = options.infilename
+						href = os.path.join(os.path.dirname(infilename), href)				
 			
 			rasterdata = ''
 			# test if file exists locally
@@ -1558,8 +1560,9 @@ def scourString(in_string, options=None):
 		cleanPolygon(polygon)
 
 	# convert rasters references to base64-encoded strings 
-	for elem in doc.documentElement.getElementsByTagNameNS(NS['SVG'], 'image') :
+	if options.embed_rasters:
-		embedRasters(elem)		
+		for elem in doc.documentElement.getElementsByTagNameNS(NS['SVG'], 'image') :
+			embedRasters(elem, options)		
 
 	# properly size the SVG document (ideally width/height should be 100% with a viewBox)
 	properlySizeDoc(doc.documentElement)
@@ -1621,6 +1624,10 @@ _options_parser.add_option("--disable-group-collapsing",
 _options_parser.add_option("--enable-id-stripping",
 	action="store_true", dest="strip_ids", default=False,
 	help="remove all un-referenced ID attributes")
+_options_parser.add_option("--disable-embed-rasters",
+	action="store_false", dest="embed_rasters", default=True,
+	help="won't embed rasters as base64-encoded data")
+
 # GZ: this is confusing, most people will be thinking in terms of
 #     decimal places, which is not what decimal precision is doing
 _options_parser.add_option("-p", "--set-precision",

scra.py

@@ -81,6 +81,7 @@ def fetch(req, indoc,**params):
 	if not params.has_key('simplifyColors'):
 		options.simple_colors = False
 	options.digits = int(params['digits'])
+	options.embed_rasters = False
 
 	req.write(scourString(indoc,options))
 

testscour.py

@@ -588,5 +588,8 @@ class DoNotRemovePolgonLastPoint(unittest.TestCase):
 		self.assertEquals(p.getAttribute('points'), '200,50 300,50 300,150 200,150',
 			'Last point of polygon removed' )
 
+# TODO; write a test for embedding rasters
+# TODO: write a test for --disable-embed-rasters
+
 if __name__ == '__main__':
     unittest.main()