diff --git a/crunch.sh b/crunch.sh index 5f053b2..86006a3 100755 --- a/crunch.sh +++ b/crunch.sh @@ -2,6 +2,7 @@ mkdir $1 for FILE in `ls fulltests` do + echo Doing $FILE: ./scour.py -i fulltests/$FILE -o $1/$FILE >> $1/report.txt done \ No newline at end of file diff --git a/fulltests/Web20Map.svg b/fulltests/Web20Map.svg new file mode 100644 index 0000000..1067cca --- /dev/null +++ b/fulltests/Web20Map.svg @@ -0,0 +1,1100 @@ + + + + + + + image/svg+xml + + + + Web 2.0 Map + 25/12/2006 + + + Luca Cremonini + + + + + + + + + English + + + + Web 2.0 + Web 2.0 Map + Web 2.0 Cloudview + Web 2.0 Tags + + + + + + Markus Angermeier, http://kosmar.de/wp-content/web20map.png + + + + + + + + + + + + + + + + + + Usability + + + Economy + + + + Design + + + Standardization + + + + Remixability + + + Convergence + + + Participation + + + + + + Widgets + + + Collaboration + + + + Sharing + + + Pagerank + + + + User Centered + + + Perpetual Beta + + + Trust + + + + FOAF + + + Six Degrees + + + + XFN + + + Aggregators + + + VC + + + + Pay Per Click + + + Modularity + + + + Ruby on Rails + + + Syndication + + + SOAP + + + + REST + + + SEO + + + + IM + + + XHTML + + + Accessibility + + + + Semantic + + + XML + + + + UMTS + + + Videocasting + + + Podcasting + + + + SVG + + + Atom + + + + Browser + + + OpenID + + + + + + Wikis + + + Simplicity + + + Joy of Use + + + + AJAX + + + The Long Tail + + + + Affiliation + + + CSS + + + Web Standards + + + + Microformats + + + DataDriven + + + + OpenAPIs + + + RSS + + + Mobility + + + + Video + + + Audio + + + + Blogs + + + Social Software + + + Recommendation + + + + Folksonomy + + + + + Web 2.0 + + + + diff --git a/fulltests/poster3.svg b/fulltests/poster3.svg new file mode 100644 index 0000000..e65e0bd --- /dev/null +++ b/fulltests/poster3.svg @@ -0,0 +1,555 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SVG Open 2009 + + + + + + + + + + + + + + October 2-4, 2009 Mountainview, CA + Registration + Venue + The SVG Open 2009 conference will be held October 2-4, 2009, in Mountain View, California, hosted by Google at their Crittenden Lane campus. + Registration and more information at http://svgopen.org + Register online at http://svgopen.org + + + + + SVG coming of age + + + + + + Hosted by + Sponsored by + + At the SVG Open Conference you will learn to use SVG to create effective and compelling web content and learn techniques for using SVG in software. You can meet creators of SVG applications in person as well as the authors of the SVG specifications.The conference will be of interest to: • Software developers • Web and UI designers • Web application developers • Graphic artists • Creators of mobile computing solutions • GIS, CAD, and modeling specialists • Data visualization creators and users + + \ No newline at end of file diff --git a/package.sh b/package.sh index 1c5d8ac..c034118 100755 --- a/package.sh +++ b/package.sh @@ -1,5 +1,5 @@ #!/bin/bash -SCOURVER="0.12" +SCOURVER="0.13" cd .. tar cvf scour/tarballs/scour-$SCOURVER.tar scour/scour.py scour/svg_regex.py scour/LICENSE scour/NOTICE scour/README.txt scour/release-notes.html gzip scour/tarballs/scour-$SCOURVER.tar diff --git a/release-notes.html b/release-notes.html index c78e4da..a5b3a16 100644 --- a/release-notes.html +++ b/release-notes.html @@ -9,6 +9,16 @@

Copyright 2009, Jeff Schiller

+
+
+

Version 0.13

+
+ + +
+

Version 0.12

diff --git a/scour.py b/scour.py index f0b37d9..a8f9120 100755 --- a/scour.py +++ b/scour.py @@ -41,6 +41,7 @@ # * Put id attributes first in the serialization (or make the d attribute last) # Next Up: +# + recognize that fill="url("#grd1")" is legal and do not remove grd1 gradient # - prevent elements from being stripped if they are referenced in a + + + +

Scour Statistics

+ +

Copyright 2009, Jeff Schiller

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FilenameOriginal Size0.010.020.030.040.050.060.070.080.090.100.110.12
Degri_Energy_Saving_Lightbulb.svg13939013730398.50%13513296.95%13310795.49%13297895.40%N/AN/AN/AN/AN/AN/AN/AN/A12621390.55%8340359.83%8269659.33%8269659.33%
GusEinstein_Angel.svg61110960934399.71%60029798.23%58269195.35%58256295.33%55476290.78%58220995.27%58183495.21%58345695.47%58193795.23%34481356.42%34213555.99%34213555.99%
News_Paper.svg2364860236340399.94%232282298.22%231692597.97%231679697.97%N/AN/A231685797.97%231656097.96%231753798.00%231645997.95%132583756.06%131594455.65%131594455.65%
OperaMarketShareEEhover.svg56052455905999.74%55485998.99%55478498.98%55478498.98%55476298.97%55476298.97%55432198.89%N/AN/AN/AN/AN/AN/A30060853.63%30060853.63%
Simon_Printer_on_fire.svg378083687597.53%3438390.94%3140583.06%3127682.72%3127282.71%3127382.72%3103882.09%3182784.18%3132882.86%2473465.42%2395663.36%2395663.36%
Wave.svg964099551399.07%9551399.07%9551399.07%6126563.55%6126563.55%6123463.51%6125263.53%6108863.36%6108863.36%5885861.05%5898561.18%5898561.18%
Web20Map.svg582394831982.97%4537477.91%4029169.18%4016268.96%4206372.22%4206372.22%4272173.35%4505277.36%4425475.99%4425475.99%4313474.06%4313474.06%
acid.svg135141312097.08%1155585.50%967571.59%947670.12%951570.41%951570.41%941069.63%964771.39%949370.25%688350.93%638147.22%638147.22%
dragonfly.svg67901867877299.96%66083997.32%66082697.32%66066697.30%66065997.30%66065697.30%66065197.30%66071397.30%66071397.30%N/AN/A60815189.56%60815189.56%
gimp.svg273792540792.80%1436152.45%1250045.66%1241945.36%1221444.61%1221144.60%1204543.99%1271546.44%1169842.73%1070639.10%1013637.02%1013637.02%
notification-audio-next.svg1029879971696.82%9899196.12%9899996.13%9885595.99%9885595.99%9880795.94%36853.58%39193.81%39193.81%34183.43%34183.32%34183.32%
poster3.svg283647N/AN/AN/AN/AN/AN/AN/AN/AN/AN/AN/AN/AN/AN/AN/AN/AN/AN/AN/AN/A24372685.93%24372685.93%
strawberry.svg25591825088598.03%19000474.24%14895058.20%14882158.15%14760457.68%14760557.68%14618057.12%15106959.03%14692557.41%11222043.85%11170143.65%11170143.65%
wifi.svg149831436895.90%1087272.56%914361.02%901460.16%895159.74%894859.72%879258.68%914961.06%877858.59%704146.99%693046.25%693046.25%
+ + + + diff --git a/testscour.py b/testscour.py index 7a7cba5..b5ff18c 100755 --- a/testscour.py +++ b/testscour.py @@ -537,6 +537,11 @@ class TranslateLongHexColorIntoShortHex(unittest.TestCase): self.assertEquals( elem.getAttribute('fill'), '#FFF', 'Not converting long hex color into short hex') +class AllowQuotEntitiesInUrl(unittest.TestCase): + def runTest(self): + grads = scour.scourXmlFile('unittests/quot-in-url.svg').getElementsByTagNameNS(SVGNS, 'linearGradient') + self.assertEquals( len(grads), 1, + 'Removed referenced gradient when " was in the url') if __name__ == '__main__': unittest.main() diff --git a/unittests/quot-in-url.svg b/unittests/quot-in-url.svg new file mode 100644 index 0000000..5434ba4 --- /dev/null +++ b/unittests/quot-in-url.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file