update to trunk

(bzr r13645.1.103)

10 files changed, 35 insertions, 5 deletions

diff --git a/share/extensions/CMakeLists.txt b/share/extensions/CMakeLists.txt
index c167a156a..280abd0a7 100644
--- a/share/extensions/CMakeLists.txt
+++ b/share/extensions/CMakeLists.txt
@@ -42,5 +42,8 @@ install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/Poly3DO
 file(GLOB _FILES "ink2canvas/*.py")
 install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/ink2canvas)
 
+file(GLOB _FILES "scour/*.py")
+install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/scour)
+
 file(GLOB _FILES "xaml2svg/*.xsl")
 install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/xaml2svg)
diff --git a/share/extensions/Makefile.am b/share/extensions/Makefile.am
index 130ed6e40..765f18a02 100644
--- a/share/extensions/Makefile.am
+++ b/share/extensions/Makefile.am
@@ -2,9 +2,10 @@
 SUBDIRS = \
 	alphabet_soup \
 	Barcode \
+	ink2canvas \
 	Poly3DObjects \
+	scour \
 	test \
-	ink2canvas \
 	xaml2svg
 
 extensiondir = $(datadir)/inkscape/extensions
diff --git a/share/extensions/scour.inx b/share/extensions/scour.inx
index 45719deeb..c97eec502 100644
--- a/share/extensions/scour.inx
+++ b/share/extensions/scour.inx
@@ -2,9 +2,9 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>Optimized SVG Output</_name>
     <id>org.inkscape.output.scour</id>
-    <dependency type="executable" location="extensions">scour.py</dependency>
-    <dependency type="executable" location="extensions">svg_regex.py</dependency>
-    <dependency type="executable" location="extensions">yocto_css.py</dependency>
+    <dependency type="executable" location="extensions">scour/scour.py</dependency>
+    <dependency type="executable" location="extensions">scour/svg_regex.py</dependency>
+    <dependency type="executable" location="extensions">scour/yocto_css.py</dependency>
     <param name="tab" type="notebook">
         <page name="Options" _gui-text="Options">            
             <param name="simplify-colors"  type="boolean" _gui-text="Shorten color values">true</param>
@@ -63,6 +63,6 @@
         <_filetypetooltip>Scalable Vector Graphics</_filetypetooltip>
     </output>
     <script>
-        <command reldir="extensions" interpreter="python">scour.inkscape.py</command>
+        <command reldir="extensions" interpreter="python">scour/scour.inkscape.py</command>
     </script>
 </inkscape-extension>
diff --git a/share/extensions/scour/Makefile.am b/share/extensions/scour/Makefile.am
new file mode 100644
index 000000000..8a6f42544
--- /dev/null
+++ b/share/extensions/scour/Makefile.am
@@ -0,0 +1,13 @@
+
+scourdir = $(datadir)/inkscape/extensions/scour
+
+scour_DATA = \
+	scour.py \
+	scour.inkscape.py \
+	svg_regex.py \
+	svg_transform.py \
+	yocto_css.py
+
+EXTRA_DIST = \
+	$(scour_DATA)
+
diff --git a/share/extensions/scour.inkscape.py b/share/extensions/scour/scour.inkscape.py
index f161a09c2..f161a09c2 100755
--- a/share/extensions/scour.inkscape.py
+++ b/share/extensions/scour/scour.inkscape.py
diff --git a/share/extensions/scour.py b/share/extensions/scour/scour.py
index 236529daa..236529daa 100644
--- a/share/extensions/scour.py
+++ b/share/extensions/scour/scour.py
diff --git a/share/extensions/svg_regex.py b/share/extensions/scour/svg_regex.py
index 6321bff0e..6321bff0e 100755
--- a/share/extensions/svg_regex.py
+++ b/share/extensions/scour/svg_regex.py
diff --git a/share/extensions/svg_transform.py b/share/extensions/scour/svg_transform.py
index 860c1df5d..860c1df5d 100755
--- a/share/extensions/svg_transform.py
+++ b/share/extensions/scour/svg_transform.py
diff --git a/share/extensions/yocto_css.py b/share/extensions/scour/yocto_css.py
index c6bd0c37e..c6bd0c37e 100755
--- a/share/extensions/yocto_css.py
+++ b/share/extensions/scour/yocto_css.py
diff --git a/share/icons/icons.svg b/share/icons/icons.svg
index 78ae37681..35ef6ab8c 100644
--- a/share/icons/icons.svg
+++ b/share/icons/icons.svg
@@ -861,6 +861,11 @@
 <stop id="stop1014-7" offset="0.0000000" style="stop-color:#e4ffa6;stop-opacity:1" />
 <stop id="stop1015-3" offset="1.0000000" style="stop-color:#3a7801;stop-opacity:1" />
 </linearGradient>
+<linearGradient inkscape:collect="always" id="linearGradient5799-9" gradientUnits="userSpaceOnUse" gradientTransform="translate(-157.4999,-207.5)" x1="160" y1="213" x2="176" y2="213" xlink:href="#linearGradient3480" />
+<linearGradient y2="218.5416" x2="173.724" y1="209.14059" x1="163.85941" gradientTransform="matrix(1.102855,0,0,1.148517,-174.5451,-237.7814)" gradientUnits="userSpaceOnUse" id="linearGradient20188" xlink:href="#linearGradient1887" inkscape:collect="always" />
+<linearGradient y2="217.2552" x2="173.0313" y1="207.7552" x1="161.2865" gradientTransform="matrix(1.102855,0,0,1.148517,-175.0966,-238.3557)" gradientUnits="userSpaceOnUse" id="linearGradient20190" xlink:href="#linearGradient3480" inkscape:collect="always" />
+<linearGradient y2="218.5416" x2="173.724" y1="209.14059" x1="163.85941" gradientTransform="matrix(1.102855,0,0,1.148517,-174.5451,-237.7814)" gradientUnits="userSpaceOnUse" id="linearGradient20197" xlink:href="#linearGradient1887" inkscape:collect="always" />
+<linearGradient y2="217.2552" x2="173.0313" y1="207.7552" x1="161.2865" gradientTransform="matrix(1.102855,0,0,1.148517,-175.0966,-238.3557)" gradientUnits="userSpaceOnUse" id="linearGradient20199" xlink:href="#linearGradient3480" inkscape:collect="always" />
 </defs>
 <sodipodi:namedview inkscape:guide-bbox="true" inkscape:current-layer="svg1" inkscape:grid-bbox="true" inkscape:pageopacity="1.0000000" pagecolor="#e8e8e4" snaptoguides="true" showguides="true" inkscape:window-y="27" inkscape:window-x="0" inkscape:window-height="958" inkscape:window-width="1280" inkscape:cy="328.8988" inkscape:cx="391.7387" inkscape:zoom="2.736" gridtolerance="6" snaptogrid="false" showgrid="false" id="base" inkscape:document-units="px" inkscape:grid-points="true" guidetolerance="8" fill="#8ab3de" stroke="#646464" inkscape:object-nodes="false" objecttolerance="11" inkscape:snap-bbox="false" inkscape:snap-nodes="true" inkscape:bbox-nodes="false" inkscape:bbox-paths="false" inkscape:snap-global="false" inkscape:snap-center="false" inkscape:snap-midpoints="false" inkscape:snap-intersection-paths="true" inkscape:object-paths="false" inkscape:snap-object-midpoints="true" inkscape:window-maximized="1" inkscape:snap-grids="true" inkscape:snap-smooth-nodes="false" inkscape:snap-text-baseline="false" inkscape:snap-page="true" inkscape:snap-bbox-midpoints="false" inkscape:snap-bbox-edge-midpoints="false">
 <inkscape:grid type="xygrid" id="grid9252" originx="0px" originy="0px" spacingx="0.5px" spacingy="0.5px" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true" />
@@ -3941,4 +3946,12 @@ http://www.inkscape.org/</dc:description>
 <ellipse style="color:#000000;fill:none;stroke:url(#linearGradient33191);stroke-linejoin:round" id="ellipse10324" cx="18.48884" cy="207.5353" rx="6.611154" ry="6.515604" transform="matrix(0.8723531,0,0,0.8723531,2.360048,9.005643)" />
 <rect style="color:#000000;fill:none;stroke-width:0.531496" id="rect9056-0" width="15.99999" height="15.99999" x="10.48885" y="182.0497" />
 </g>
+<g inkscape:label="dialog-templates" id="dialog-templates" transform="translate(10,185)">
+<rect y="0" x="0" height="16" width="16" id="rect20201" style="fill:none;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:1, 1" />
+<path style="fill:url(#linearGradient20197);fill-rule:evenodd;stroke:url(#linearGradient20199);stroke-linejoin:round;stroke-dasharray:1, 1;stroke-dashoffset:0.5" d="M 12.5,15.5 2.5,15.5 2.5,1.5" id="path4679-4" />
+<path style="fill:url(#linearGradient20188);fill-rule:evenodd;stroke:url(#linearGradient20190);stroke-linecap:square;stroke-linejoin:round" d="m 2.5,1.5 0,-1 7,0 4,4 0,11 -1,0" id="path20168" />
+<path style="fill:none;stroke:#c8c8c8;stroke-dasharray:1, 1;stroke-dashoffset:1" d="M 3,14.5 12.5,14.5" id="path20172" />
+<path style="fill:none;stroke:#c8c8c8;stroke-width:1px;stroke-linecap:square" d="m 12.5,14.5 0,-9" id="path5602-7" />
+<path style="fill:#ffffff;fill-rule:evenodd;stroke:url(#linearGradient5799-9);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round" d="m 9.5,0.5 4,4 -4,0 0,-4 z" id="path4681-4" />
+</g>
 </svg>