From 7652fbc76cd7e3de0eeee8c5295a973f852162bf Mon Sep 17 00:00:00 2001 From: JSCHILL1 Date: Thu, 24 Sep 2009 09:54:56 -0500 Subject: [PATCH] Fix removal of common attributes if parent has non-whitespace text nodes --- fulltests/inkscape.svg | 4558 ++++++++++++++--- package.sh | 2 +- release-notes.html | 10 + scour.py | 29 +- testscour.py | 6 + .../move-common-attributes-to-parent.svg | 5 + 6 files changed, 3823 insertions(+), 787 deletions(-) diff --git a/fulltests/inkscape.svg b/fulltests/inkscape.svg index a4daafb..271af62 100644 --- a/fulltests/inkscape.svg +++ b/fulltests/inkscape.svg @@ -1,603 +1,2868 @@ - - Inkscape 0.47 contest entry - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Inkscape 0.47 contest entry + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - - - - - - - + + + + + + + + + - - + + - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - + - + image/svg+xml - + Inkscape 0.47 contest entry 2009-05-14 @@ -607,225 +2872,964 @@ - + - + - - - - + + + + - + - - + + - + - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - jf - - - - - - - - - - - - - - - - - - - + jf + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - \ No newline at end of file + + diff --git a/package.sh b/package.sh index 0b646a6..6f67318 100755 --- a/package.sh +++ b/package.sh @@ -1,5 +1,5 @@ #!/bin/bash -SCOURVER="0.20" +SCOURVER="0.21" cd .. zip scour/tarballs/scour-$SCOURVER.zip scour/scour.py scour/yocto_css.py scour/svg_regex.py scour/LICENSE scour/NOTICE scour/README.txt scour/release-notes.html cd scour diff --git a/release-notes.html b/release-notes.html index 3122217..46b12f4 100644 --- a/release-notes.html +++ b/release-notes.html @@ -9,6 +9,16 @@

Copyright 2009, Jeff Schiller

+
+
+

Version 0.21

+
+

TBD

+ +
+

Version 0.20

diff --git a/scour.py b/scour.py index d032bd6..aac653e 100755 --- a/scour.py +++ b/scour.py @@ -36,6 +36,9 @@ # Next Up: # + remove unused attributes in parent elements # + prevent elements from being stripped if they are referenced in a