marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added --enable-viewboxing option and stop setting width/height to 100% by default

Browse source
This commit is contained in:
JSCHILL1 2009-12-31 13:59:54 -06:00
parent 8caa66edf9
commit 22fd47ab23
4 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crunch.sh
View file

@ -3,5 +3,5 @@ mkdir $1
for FILE in `ls fulltests` for FILE in `ls fulltests`
do do
echo Doing $FILE: echo Doing $FILE:
./scour.py -i fulltests/$FILE -o $1/$FILE 2>> $1/report.txt python ./scour.py -i fulltests/$FILE -o $1/$FILE 2>> $1/report.txt
done done

2
release-notes.html
View file

@ -16,6 +16,8 @@
<p>TBD</p> <p>TBD</p>
<ul> <ul>
<li>Fix <a href="https://bugs.launchpad.net/scour/+bug/482215">Bug 482215</a> by using os.linesep to end lines</li> <li>Fix <a href="https://bugs.launchpad.net/scour/+bug/482215">Bug 482215</a> by using os.linesep to end lines</li>
<li>Fix unittests to run properly in Windows</li>
<li>Removed default scaling of image to 100%/100% and creating a viewBox. Added --enable-viewboxing option to explicitly turn that on</li>
</ul> </ul>
</section> </section>

15
scour.py
View file

@ -63,8 +63,15 @@ except ImportError:
from fixedpoint import * from fixedpoint import *
Decimal = FixedPoint Decimal = FixedPoint
# Import Psyco if available
try:
import psyco
psyco.full()
except ImportError:
pass
APP = 'scour' APP = 'scour'
VER = '0.22' VER = '0.23'
COPYRIGHT = 'Copyright Jeff Schiller, 2009' COPYRIGHT = 'Copyright Jeff Schiller, 2009'
NS = { 'SVG': 'http://www.w3.org/2000/svg', NS = { 'SVG': 'http://www.w3.org/2000/svg',
@ -2266,7 +2273,8 @@ def scourString(in_string, options=None):
embedRasters(elem, options) embedRasters(elem, options)
# properly size the SVG document (ideally width/height should be 100% with a viewBox) # properly size the SVG document (ideally width/height should be 100% with a viewBox)
properlySizeDoc(doc.documentElement) if options.viewboxing:
properlySizeDoc(doc.documentElement)
# output the document as a pretty string with a single space for indent # output the document as a pretty string with a single space for indent
# NOTE: removed pretty printing because of this problem: # NOTE: removed pretty printing because of this problem:
@ -2340,6 +2348,9 @@ _options_parser.add_option("--keep-editor-data",
_options_parser.add_option("--strip-xml-prolog", _options_parser.add_option("--strip-xml-prolog",
action="store_true", dest="strip_xml_prolog", default=False, action="store_true", dest="strip_xml_prolog", default=False,
help="won't output the <?xml ?> prolog") help="won't output the <?xml ?> prolog")
_options_parser.add_option("--enable-viewboxing",
action="store_true", dest="viewboxing", default=False,
help="changes document width/height to 100%/100% and creates viewbox coordinates")
# GZ: this is confusing, most people will be thinking in terms of # GZ: this is confusing, most people will be thinking in terms of
# decimal places, which is not what decimal precision is doing # decimal places, which is not what decimal precision is doing

2
testscour.py
View file

@ -47,6 +47,7 @@ class ScourOptions:
keep_editor_data = False keep_editor_data = False
strip_xml_prolog = False strip_xml_prolog = False
indent_type = "space" indent_type = "space"
viewboxing = False
class NoInkscapeElements(unittest.TestCase): class NoInkscapeElements(unittest.TestCase):
def runTest(self): def runTest(self):
@ -829,7 +830,6 @@ class RemoveDefaultGradFYValue(unittest.TestCase):
class CDATAInXml(unittest.TestCase): class CDATAInXml(unittest.TestCase):
def runTest(self): def runTest(self):
lines = scour.scourString(open('unittests/cdata.svg').read()).splitlines() lines = scour.scourString(open('unittests/cdata.svg').read()).splitlines()
print lines[4]
self.assertEquals( lines[3], self.assertEquals( lines[3],
" alert('pb&j');", " alert('pb&j');",
'CDATA did not come out correctly') 'CDATA did not come out correctly')