From: mjwybrow <mjwybrow@users.sourceforge.net>
Date: Thu, 15 Mar 2007 03:34:35 +0000 (+0000)
Subject:   * Makefile.am, packaging/macosx/inkscape_python.ds_store,
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3890ae27a0e3b764353c8674c65ba2ae5a365cfa;p=inkscape.git

  * Makefile.am, packaging/macosx/inkscape_python.ds_store,
    packaging/macosx/osx-build.sh, packaging/macosx/osx-app.sh,
    packaging/macosx/dmg_background.svg, packaging/macosx/osx-dmg.sh,
    packaging/macosx/dmg_background.png, packaging/macosx/dmg_set_style.scpt,
    packaging/macosx/inkscape.ds_store:

    Updates to the Mac OS X packaging scripts by Jean-Olivier Irisson to
    improve support for building DMGs with python bundled, as well as
    making everything less Fink-centric so DarwinPorts can be used as
    an alternative.  Submitted as patch #1673087.
---

diff --git a/Makefile.am b/Makefile.am
index 90b00606c..b91a7f4b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,10 +87,12 @@ EXTRA_DIST = \
 	cxxtest/cxxtest/X11Gui.h \
 	cxxtest/cxxtest/YesNoRunner.h \
 	packaging/autopackage/default.apspec.in	\
-	packaging/osx-app.sh	\
 	packaging/macosx/dmg_background.png	\
 	packaging/macosx/inkscape.ds_store	\
+	packaging/macosx/inkscape_python.ds_store	\
+	packaging/macosx/osx-app.sh	\
 	packaging/macosx/osx-dmg.sh	\
+	packaging/macosx/osx-build.sh	\
 	packaging/macosx/Resources/MenuBar.nib/classes.nib	\
 	packaging/macosx/Resources/MenuBar.nib/info.nib	\
 	packaging/macosx/Resources/MenuBar.nib/objects.xib	\
diff --git a/packaging/macosx/dmg_background.png b/packaging/macosx/dmg_background.png
index 66d532f6d..65b7964f8 100644
Binary files a/packaging/macosx/dmg_background.png and b/packaging/macosx/dmg_background.png differ
diff --git a/packaging/macosx/dmg_background.svg b/packaging/macosx/dmg_background.svg
index 6c69e511b..8bd97119e 100644
--- a/packaging/macosx/dmg_background.svg
+++ b/packaging/macosx/dmg_background.svg
@@ -10,37 +10,20 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="624.54108"
-   height="297.78"
+   height="350"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44+devel"
+   inkscape:version="0.45"
    sodipodi:docname="dmg_background.svg"
-   sodipodi:docbase="/Volumes/files/softwares/inkscape/packaging/macosx"
+   sodipodi:docbase="/Volumes/files/softwares/inkscape/trunk_devel/packaging/macosx"
    version="1.0"
-   inkscape:export-filename="/Volumes/files/softwares/inkscape/packaging/macosx/dmg_background.png"
+   inkscape:export-filename="/Volumes/files/softwares/inkscape/trunk_devel/packaging/macosx/dmg_background.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="TRUE">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient4556">
-      <stop
-         style="stop-color:#62ba00;stop-opacity:1"
-         offset="0.00000000"
-         id="stop4558" />
-      <stop
-         style="stop-color:#62ba00;stop-opacity:0.49803922;"
-         offset="0.34999999"
-         id="stop4560" />
-      <stop
-         style="stop-color:#62ba00;stop-opacity:0.21960784;"
-         offset="0.63"
-         id="stop4562" />
-      <stop
-         style="stop-color:#62ba00;stop-opacity:0"
-         offset="1.00000000"
-         id="stop4564" />
-    </linearGradient>
     <linearGradient
        id="linearGradient841">
       <stop
@@ -52,627 +35,107 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       y2="-611.52551"
-       x2="25.800924"
-       y1="-663.37408"
-       x1="25.800924"
-       id="linearGradient1657"
-       xlink:href="#linearGradient841"
-       gradientTransform="matrix(4.195695,0,0,0.908545,-135.8507,922.7717)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient666">
-      <stop
-         id="stop667"
-         offset="0.00000000"
-         style="stop-color:#ffffff;stop-opacity:0.336;" />
-      <stop
-         id="stop668"
-         offset="1.00000000"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       fy="1036.4888"
-       fx="233.92319"
-       r="98.260414"
-       cy="1036.4888"
-       cx="233.92319"
-       id="radialGradient669"
-       xlink:href="#linearGradient666"
-       gradientTransform="scale(1.825742,0.547723)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4160"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414"
-       gradientTransform="scale(1.825742,0.547723)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4162"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414"
-       gradientTransform="scale(1.825742,0.547723)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4164"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414"
-       gradientTransform="scale(1.825742,0.547723)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4166"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414"
-       gradientTransform="scale(1.825742,0.547723)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4168"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414"
-       gradientTransform="scale(1.825742,0.547723)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4170"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414"
-       gradientTransform="scale(1.825742,0.547723)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4172"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414"
-       gradientTransform="scale(1.825742,0.547723)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4174"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414"
-       gradientTransform="scale(1.825742,0.547723)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4176"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414"
-       gradientTransform="scale(1.825742,0.547723)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4223"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4229"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient841"
-       id="linearGradient4010"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.195695,0,0,0.908545,48.59896,132.9459)"
-       x1="76.911163"
-       y1="25.401896"
-       x2="76.911163"
-       y2="137.02844" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4014"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4016"
+       id="linearGradient4989"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4022"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4026"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4028"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4030"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4556"
-       id="linearGradient4094"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.195695,0,0,0.908545,48.59896,509.9688)"
+       gradientTransform="matrix(4.195695,0,0,1.0590609,48.598964,114.17717)"
        x1="76.911163"
        y1="25.401896"
        x2="76.911163"
        y2="137.02844" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4096"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4098"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4100"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4102"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4104"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4106"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4108"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4112"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4114"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient5658"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient5660"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient5662"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient5664"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient5666"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient5668"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient5670"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient5672"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient5674"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient841"
-       id="linearGradient3988"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.195695,0,0,0.908545,48.59896,132.9459)"
-       x1="76.911163"
-       y1="25.401896"
-       x2="76.911163"
-       y2="137.02844" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient3990"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient3992"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient3994"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient3996"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient3998"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4000"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4004"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4006"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient666"
-       id="radialGradient4008"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.825742,0.547723)"
-       cx="233.92319"
-       cy="1036.4888"
-       fx="233.92319"
-       fy="1036.4888"
-       r="98.260414" />
+    <filter
+       inkscape:collect="always"
+       x="-1.0928679"
+       width="3.1857358"
+       y="-1.212016"
+       height="3.424032"
+       id="filter6362">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="6.9435145"
+         id="feGaussianBlur6364" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       x="-0.27738996"
+       width="1.5547799"
+       y="-0.28560414"
+       height="1.5712083"
+       id="filter6366">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="6.9435145"
+         id="feGaussianBlur6368" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       x="-0.9599201"
+       width="2.9198402"
+       y="-1.2584231"
+       height="3.5168462"
+       id="filter6370">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="6.9435145"
+         id="feGaussianBlur6372" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       x="-1.2436028"
+       width="3.4872055"
+       y="-1.2664239"
+       height="3.5328478"
+       id="filter6374">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="6.9435145"
+         id="feGaussianBlur6376" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       x="-0.016262574"
+       width="1.0325251"
+       y="-0.19320738"
+       height="1.3864148"
+       id="filter6402">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.8499877"
+         id="feGaussianBlur6404" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       x="-0.024713467"
+       width="1.0494269"
+       y="-0.10486322"
+       height="1.2097264"
+       id="filter6548">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.79584663"
+         id="feGaussianBlur6550" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter6556">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.64344392"
+         id="feGaussianBlur6558" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4442605"
-     inkscape:cx="312.27054"
-     inkscape:cy="148.89"
+     inkscape:zoom="1.041626"
+     inkscape:cx="302.42894"
+     inkscape:cy="159.47539"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -687,10 +150,11 @@
      inkscape:guide-bbox="false"
      inkscape:window-width="988"
      inkscape:window-height="724"
-     inkscape:window-x="33"
+     inkscape:window-x="18"
      inkscape:window-y="22"
-     height="297.78px"
-     width="624.54108px" />
+     height="350px"
+     width="624.54108px"
+     units="px" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -708,204 +172,194 @@
      id="layer1"
      transform="translate(-48.8794,-125.0409)">
     <g
-       id="g3955"
-       transform="translate(1.654053e-6,-8.777719)">
-      <rect
-         inkscape:export-filename="/Volumes/files/softwares/inkscape/packaging/background.png"
-         style="opacity:1;color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect3956"
-         width="624.45496"
-         height="297.77597"
-         x="48.879398"
-         y="133.82265"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
+       id="g4050"
+       transform="matrix(0.8110502,0,0,0.8110502,325.88989,77.589726)">
       <path
-         style="font-size:12px;fill:white;fill-rule:evenodd;stroke:none;stroke-width:0.05508278pt"
-         d="M 559.78162,387.96198 L 453.91725,353.8796 L 427.14696,211.46402 L 512.32518,125.04088 L 556.13112,140.86484 L 637.65884,221.20184 L 559.78162,387.96198 z "
-         id="path3958" />
+         id="path572"
+         d="M 248.84375,54.96875 C 237.742,54.96875 226.66325,59.21175 218.15625,67.71875 L 66.96875,218.90625 C 58.630237,227.24477 54.41517,238.08767 54.25,248.96875 L 54.1875,248.96875 C 54.1875,249.01083 54.247774,249.05157 54.25,249.09375 C 54.247803,249.27213 54.1875,249.44661 54.1875,249.625 L 54.46875,249.625 C 57.375,260.6352 132.09566,274.68942 140.4375,283.03125 C 153.0365,295.63025 92.1512,304.86976 104.75,317.46875 C 117.349,330.06775 180.9,341.8385 193.5,354.4375 C 206.099,367.0365 167.74476,380.46351 180.34375,393.0625 C 192.94275,405.6615 235.25875,389.88699 227.59375,422.75 C 244.60775,439.764 280.10701,431.67026 303.875,414.65625 C 316.474,402.05725 279.71349,403.16149 292.3125,390.5625 C 304.9115,377.9635 336.703,377.888 363.5,347.75 C 352.714,330.975 317.40101,323.81774 330,311.21875 C 342.599,298.61975 367.0855,305.03324 419.9375,281.03125 C 445.74027,269.3126 443.5984,260.41677 443.5,249.625 C 443.49794,249.39905 443.5,249.19642 443.5,248.96875 L 443.4375,248.96875 C 443.27232,238.08775 439.08845,227.2447 430.75,218.90625 L 279.5625,67.71875 C 271.05549,59.211749 259.9455,54.96875 248.84375,54.96875 z "
+         style="font-size:12px;fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
       <path
-         id="path3960"
-         d="M 492.8125,133.8125 L 357.75,268.875 C 350.07828,276.54909 346.21502,286.54837 346.0625,296.5625 L 346.03125,296.5625 C 346.03223,296.5647 346.03005,296.59155 346.03125,296.59375 C 346.0345,296.59812 346.05942,296.62062 346.0625,296.625 C 346.06354,296.62721 346.06172,296.65404 346.0625,296.65625 C 346.06039,296.82433 346,296.98817 346,297.15625 L 346.25,297.15625 C 348.91271,307.29037 417.73021,320.2279 425.40625,327.90625 C 436.99845,339.50235 380.93919,347.99763 392.53125,359.59375 C 404.12344,371.18971 462.59419,382.02887 474.1875,393.625 C 485.77971,405.22098 450.50138,417.59151 462.09375,429.1875 C 463.07486,430.16894 464.23407,430.94315 465.5625,431.59375 L 562.65625,431.59375 C 562.55587,430.28024 563.23717,428.73217 565.09375,426.875 C 576.68597,415.27888 605.93798,415.20746 630.59375,387.46875 C 620.66957,372.02913 588.18895,365.47109 599.78125,353.875 C 610.61694,343.0358 631.0116,347.4792 673.34375,330.0625 L 673.34375,249.75 L 557.4375,133.8125 L 492.8125,133.8125 z M 523.53125,136.09375 C 523.66039,136.09175 523.77853,136.12167 523.90625,136.125 C 528.4473,136.24333 532.12133,139.6808 539.3125,144.34375 L 605.03125,193.09375 C 605.75067,193.56044 606.43316,194.06273 607.0625,194.5625 C 607.69183,195.06221 608.27333,195.59572 608.8125,196.125 C 609.35173,196.65331 609.83134,197.16551 610.28125,197.71875 C 610.73024,198.27189 611.14128,198.83375 611.5,199.40625 C 611.85976,199.97967 612.19929,200.56821 612.46875,201.15625 C 612.73843,201.74537 612.9457,202.36868 613.125,202.96875 C 613.30534,203.56791 613.44115,204.14445 613.53125,204.75 C 613.62139,205.35662 613.6875,205.98546 613.6875,206.59375 L 574.75,187.78125 L 570.84375,217.1875 L 549.4375,207.125 L 516.375,229.21875 L 503.71875,185.5625 L 487.40625,223.75 L 441.90625,228.3125 L 442.40625,208.03125 C 442.40624,203.16336 468.64942,169.08201 484.625,160.96875 L 513.84375,139.96875 C 517.95615,137.30213 520.90543,136.13446 523.53125,136.09375 z M 463.4375,335 C 484.15339,340.37421 507.19556,347.43643 525.6875,347.5625 L 526.46875,355.875 C 510.63382,354.24225 477.15001,346.59931 469.25,342.5625 L 463.4375,335 z "
-         style="font-size:12px;opacity:1;fill:silver;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
+         id="path580"
+         d="M 364.356,366.845 C 382.828,370.539 386.524,383.47 382.828,387.164 C 379.135,390.859 369.899,394.553 362.51,389.011 C 355.119,383.47 355.119,370.539 364.356,366.845 z "
+         style="font-size:12px;fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
       <path
-         id="path3962"
-         d="M 667.5,375.15625 C 665.27105,375.23443 663.22339,375.52207 661.5625,375.9375 C 657.20591,377.02644 636.05051,377.61623 637.75,391.21875 C 648.50766,395.12986 662.63376,398.482 673.34375,398.03125 L 673.34375,375.40625 C 671.34953,375.1841 669.37112,375.09062 667.5,375.15625 z "
-         style="font-size:12px;opacity:1;fill:silver;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
+         id="path582"
+         d="M 177.423,368.079 C 175.623,368.559 160.586,355.601 148.678,361.607 C 136.773,367.612 128.781,381.059 139.903,386.577 C 151.026,392.095 158.977,385.732 168.728,378.885 C 178.48,372.039 178.128,370.72 177.423,368.079 z "
+         style="font-size:12px;fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
       <path
-         style="font-size:12px;opacity:1;fill:silver;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt"
-         d="M 631.39383,405.04892 C 648.3898,408.44884 651.79048,420.35052 648.3898,423.75046 C 644.99187,427.15128 636.49385,430.5512 629.69525,425.45035 C 622.89485,420.35052 622.89485,408.44884 631.39383,405.04892 z "
-         id="path3964" />
+         id="path583"
+         d="M 397.131,335.205 C 407.177,332.693 430.383,335.205 426.687,349.981 C 422.994,364.761 391.592,359.217 371.27,351.831 C 369.423,337.052 392.396,336.388 397.131,335.205 z "
+         style="font-size:12px;fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
       <path
-         style="font-size:12px;opacity:1;fill:silver;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt"
-         d="M 459.39773,406.18463 C 457.74163,406.62647 443.90613,394.70002 432.94964,400.22786 C 421.99594,405.75492 414.64243,418.13145 424.87573,423.21018 C 435.11002,428.2889 442.42564,422.4324 451.39744,416.13049 C 460.37022,409.82953 460.04648,408.6155 459.39773,406.18463 z "
-         id="path3966" />
-      <rect
-         rx="0"
-         ry="6.1828303"
-         y="133.48793"
-         x="48.954857"
-         height="135.22321"
-         width="624.46564"
-         id="rect3968"
-         style="font-size:12px;fill:url(#linearGradient3988);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.06115007" />
+         id="path568"
+         d="M 204.84,101.661 C 187.477,110.476 158.953,147.511 158.953,152.8 L 158.412,174.823 L 207.87,169.863 L 225.583,128.395 L 239.327,175.816 L 275.293,151.808 L 298.561,162.72 L 302.782,130.776 L 345.097,151.212 C 345.097,150.551 345.049,149.89 344.951,149.231 C 344.853,148.573 344.707,147.916 344.511,147.265 C 344.316,146.613 344.072,145.967 343.779,145.327 C 343.486,144.688 343.144,144.056 342.753,143.433 C 342.363,142.811 341.923,142.198 341.435,141.597 C 340.946,140.996 340.409,140.408 339.823,139.834 C 339.237,139.259 338.602,138.7 337.918,138.157 C 337.234,137.614 336.501,137.088 335.719,136.581 L 264.28,83.5998 C 251.775,75.4938 249.101,70.7318 236.596,78.8378 L 204.84,101.661 z "
+         style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
+      <path
+         id="path574"
+         d="M 181.808,290.745 C 204.323,296.584 229.361,304.23 249.459,304.367 L 250.328,313.421 C 233.118,311.647 196.696,303.347 188.11,298.961 L 181.808,290.745 z "
+         style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
+    </g>
+    <rect
+       style="font-size:12px;fill:url(#linearGradient4989);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.06115007"
+       id="rect3968"
+       width="624.46564"
+       height="157.62523"
+       x="48.954857"
+       y="125.0409"
+       ry="7.2071209"
+       rx="0" />
+    <path
+       style="fill:#b0e088;fill-opacity:1;stroke-width:1pt;filter:url(#filter6402)"
+       d="M 211.90625,131.50353 C 205.98536,131.00651 201.16447,138.64884 205.65625,143.19103 C 201.58111,142.39402 202.59325,154.72266 205.53125,154.44103 C 207.92857,154.12103 209.07578,153.09201 211.53125,154.31603 C 217.32456,156.22034 225.89226,152.12727 223.9375,145.15978 C 223.58426,143.30954 221.58678,142.21903 223.25378,141.31776 C 223.20533,136.85003 223.7185,128.54828 217.71875,132.50353 C 215.92538,131.64528 213.88943,131.39446 211.90625,131.50353 z M 242.78125,131.53478 C 233.79442,131.686 227.75459,143.4366 234,150.31603 C 239.43304,157.21146 253.6084,155.92987 254.8125,146.25353 C 256.34217,142.79208 248.19412,142.52195 249.09375,146.47228 C 247.74986,150.93304 239.3353,150.35814 239.6875,145.06603 C 237.97761,140.6411 241.81797,134.16096 246.71875,137.50353 C 249.41376,139.53503 248.68222,144.7773 253.40625,143.03478 C 254.93997,141.69772 255.77025,130.19743 250.78125,131.69103 C 248.48983,133.58272 245.86063,130.6504 242.78125,131.53478 z M 271.8125,132.62853 C 268.88476,137.81053 266.95595,144.19233 263.65625,148.90978 C 259.67153,147.59894 259.59949,156.11933 263.9375,154.25353 C 269.48656,156.75387 278.01244,151.20147 270.5625,149.03478 C 278.56123,146.20513 273.12299,149.82125 275.28125,154.25353 C 280.36022,153.37416 290.27534,157.33095 287.9375,149.03478 C 282.68218,150.73712 283.23236,143.06976 280.63766,140.45052 C 278.39554,137.2537 276.7707,127.60112 271.8125,132.62853 z M 114.8125,133.84728 C 116.77004,137.44183 119.84252,139.92143 118.25,147.06603 C 115.30109,149.26327 111.78292,155.87408 120.8125,154.25353 C 126.85204,157.33159 133.71667,149.54431 125.75,149.03478 C 126.22284,144.18114 123.68261,136.05584 129.125,136.06603 C 130.82877,128.51851 120.43737,133.06616 115.8125,131.84728 C 113.97917,131.01395 115.14583,133.18061 114.8125,133.84728 z M 135.53125,133.84728 C 137.13794,137.51626 141.13623,138.88004 139.1875,146.09728 C 139.90014,148.78088 138.23701,149.77742 135.5625,149.15978 C 133.27286,157.439 143.41425,153.28719 148.4375,154.25353 C 149.06032,150.62414 148.38609,148.80032 145,148.69103 C 144.37781,144.20288 144.67524,140.37677 148.22983,146.14847 C 151.10869,149.12544 157.66223,158.95016 160.03125,152.59728 C 160.56723,147.67323 159.08446,141.633 160.53125,137.15978 C 166.78949,137.51713 163.38644,128.79621 157.65625,131.84728 C 151.96161,128.87124 147.11594,136.8081 153.71875,137.12853 C 155.08393,137.90612 154.71504,144.55646 153.02099,140.78157 C 148.74449,136.84367 145.84142,129.79243 138.9375,131.84728 C 137.12804,132.15832 134.61732,130.69848 135.53125,133.84728 z M 169.90625,133.84728 C 171.85329,137.42108 174.78089,140.0143 173.25,147.06603 C 170.35185,149.32204 166.94881,155.89193 175.90625,154.25353 C 183.25,154.25353 190.59375,154.25353 197.9375,154.25353 C 198.4412,150.73398 198.06744,148.19277 194.25,148.94103 C 192.35148,145.50722 184.29985,141.35591 190.71875,138.62853 C 192.79995,135.96358 198.2411,138.61479 196.65625,133.84728 C 195.14564,129.51414 185.9343,132.88173 181.125,131.84728 C 178.05306,132.8288 169.62024,129.69565 169.90625,133.84728 z M 293.15625,133.84728 C 295.10692,137.42786 298.08265,139.98338 296.53125,147.06603 C 293.61604,149.30232 290.17477,155.88606 299.15625,154.25353 C 305.32284,157.37796 312.34688,149.41219 304.0625,149.03478 C 302.86465,143.8835 309.81747,147.32631 312.71875,144.81603 C 318.59404,142.36193 317.05771,133.06727 310.8125,132.37853 C 305.03715,131.23236 299.02318,132.1357 293.15625,131.84728 L 293.15625,132.84728 L 293.15625,133.84728 z M 322.59375,133.84728 C 324.54442,137.42786 327.52015,139.98338 325.96875,147.06603 C 323.05354,149.30232 319.61227,155.88606 328.59375,154.25353 C 333.93497,153.54619 341.80986,155.64814 345.63415,153.25884 C 346.95428,148.40113 347.18135,139.81716 341.15596,144.41675 C 340.57513,147.60682 339.42531,148.62524 340.03125,144.00353 C 339.41481,135.19467 340.19038,144.69295 345.875,142.37853 C 345.72495,136.36636 346.55912,129.23076 338.3125,131.84728 C 333.91933,133.01706 323.53366,129.40617 322.59375,133.84728 z M 212.90625,136.69103 C 214.7956,136.2583 217.80683,138.96345 217.03125,139.75353 C 216.4244,139.17109 208.72475,139.11563 211,137.03478 C 211.62008,136.69307 212.21398,136.72524 212.90625,136.69103 z M 180.78125,137.06603 C 187.89935,134.91758 178.66084,142.82534 180.78125,137.06603 z M 305.90625,137.06603 C 309.23663,135.96017 309.72242,141.54509 306.25,140.84728 C 303.03028,142.603 303.02031,135.62858 305.90625,137.06603 z M 334.75,137.06603 C 335.39873,138.82924 332.76238,142.0438 333.4375,138.06603 C 332.71875,136.57645 334.04753,137.13439 334.75,137.06603 z M 273.71875,142.90978 C 272.32791,143.69153 273.8227,141.08737 273.71875,142.90978 z M 209.25,145.19103 C 211.70195,146.62318 216.25481,145.47391 217.75,147.90978 C 216.06,151.3315 208.46858,148.82989 209.25,145.19103 z M 333.46875,145.37853 C 335.93079,145.66665 333.11094,150.51246 336.75,149.00353 C 332.80474,149.66943 333.29657,148.87152 333.46875,145.37853 z M 184.875,149.03478 C 177.62334,151.44995 181.19956,141.37917 184.875,149.03478 z "
+       id="path6392" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke-width:1pt"
+       d="M 343.30616,142.63289 L 324.60589,142.63289 L 324.60589,143.82976 L 325.16596,143.82976 C 327.68633,143.82976 327.96625,143.95712 327.96625,145.02666 L 327.96625,145.76519 L 327.96625,157.88691 L 327.96625,158.62541 C 327.96625,159.69498 327.68633,159.8223 325.16596,159.8223 L 324.60589,159.8223 L 324.60589,161.0192 L 343.71062,161.0192 L 344.33297,154.21984 L 342.96375,154.21984 C 342.55928,156.00241 341.84362,157.58132 341.09694,158.31983 C 340.13242,159.33846 338.35872,159.8223 335.74504,159.8223 L 333.69141,159.8223 C 332.75812,159.8223 331.9802,159.66952 331.70007,159.44031 C 331.4824,159.28754 331.45117,159.13474 331.45117,158.59995 L 331.45117,152.10617 L 332.0735,152.10617 C 333.97154,152.10617 334.74946,152.25896 335.37178,152.79375 C 336.18074,153.45587 336.49191,154.27077 336.55419,155.77325 L 338.01651,155.77325 L 338.01651,147.42046 L 336.55419,147.42046 C 336.3986,149.9161 335.15394,150.90926 332.19804,150.90926 L 331.45117,150.90926 L 331.45117,145.10308 C 331.45117,144.00805 331.7313,143.82976 333.41149,143.82976 L 335.0294,143.82976 C 337.76763,143.82976 339.1056,144.05898 340.16345,144.77203 C 341.19025,145.43413 341.93693,146.8602 342.4037,149.15213 L 343.74167,149.15213 L 343.30616,142.63289 z M 302.01626,152.84468 L 305.5322,152.84468 C 308.3325,152.84468 309.79502,152.66641 311.0397,152.18256 C 313.2489,151.31673 314.49337,149.68694 314.49337,147.67511 C 314.49337,145.7397 313.40429,144.26269 311.35086,143.42233 C 310.13724,142.913 308.20815,142.63289 306.06122,142.63289 L 295.17078,142.63289 L 295.17078,143.82976 L 295.73084,143.82976 C 298.25121,143.82976 298.53134,143.95712 298.53134,145.02666 L 298.53134,145.76519 L 298.53134,157.88691 L 298.53134,158.62541 C 298.53134,159.69498 298.25121,159.8223 295.73084,159.8223 L 295.17078,159.8223 L 295.17078,161.0192 L 305.62551,161.0192 L 305.62551,159.8223 L 304.81654,159.8223 C 302.29618,159.8223 302.01626,159.69498 302.01626,158.62541 L 302.01626,157.88691 L 302.01626,152.84468 z M 302.01626,151.64778 L 302.01626,145.12853 C 302.01626,143.95712 302.20288,143.82976 303.9143,143.82976 L 305.90564,143.82976 C 309.14164,143.82976 310.66624,145.0776 310.66624,147.77698 C 310.66624,150.39996 309.07938,151.64778 305.7811,151.64778 L 302.01626,151.64778 z M 274.94593,142.27638 L 273.63917,142.27638 L 266.48254,157.12293 C 265.8602,158.44714 265.73586,158.62541 265.26911,159.03287 C 264.77133,159.51672 263.90009,159.8223 263.0599,159.8223 L 262.93555,159.8223 L 262.93555,161.0192 L 271.18107,161.0192 L 271.18107,159.8223 L 270.55874,159.8223 C 268.87856,159.8223 268.03838,159.33846 268.03838,158.37078 C 268.03838,158.06517 268.13169,157.70865 268.31831,157.3012 L 269.34512,155.0602 L 277.59085,155.0602 L 279.27103,158.47264 C 279.45764,158.85461 279.51992,159.03287 279.51992,159.16018 C 279.51992,159.56766 278.742,159.8223 277.59085,159.8223 L 276.2839,159.8223 L 276.2839,161.0192 L 285.92967,161.0192 L 285.92967,159.8223 L 285.49397,159.8223 C 283.93833,159.8223 283.59593,159.61858 282.88028,158.19249 L 274.94593,142.27638 z M 273.42133,146.45276 L 276.93727,153.68506 L 269.96747,153.68506 L 273.42133,146.45276 z M 251.95181,142.45463 L 250.76941,142.45463 L 249.52474,143.95712 C 247.31554,142.63289 246.10212,142.2509 244.01745,142.2509 C 240.99929,142.2509 238.50996,143.24409 236.39425,145.30677 C 234.40272,147.24222 233.46941,149.38133 233.46941,152.00431 C 233.46941,157.47944 237.85659,161.40118 243.98621,161.40118 C 248.96468,161.40118 252.13843,159.00738 252.85408,154.72915 L 251.39174,154.5254 C 251.08059,155.8751 250.70715,156.79188 250.14708,157.55585 C 248.87137,159.31299 246.88004,160.20428 244.35966,160.20428 C 239.75462,160.20428 237.57646,157.58132 237.57646,152.10617 C 237.57646,149.22852 238.0432,147.29313 239.10125,145.76519 C 240.06578,144.33911 241.99486,143.44779 243.98621,143.44779 C 246.16439,143.44779 248.09345,144.39004 249.27586,146.01985 C 249.86715,146.8602 250.3339,147.85338 251.04954,149.81425 L 252.41855,149.81425 L 251.95181,142.45463 z M 220.80547,142.4801 L 219.65412,142.4801 L 218.40964,144.00805 C 216.94712,142.86207 214.95577,142.2509 212.74657,142.2509 C 208.67055,142.2509 205.93233,144.39004 205.93233,147.57326 C 205.93233,150.34903 207.61252,151.72419 212.18651,152.6919 L 215.14239,153.30306 C 217.44512,153.78692 217.66277,153.83785 218.31634,154.24529 C 219.24964,154.83101 219.74762,155.67137 219.74762,156.66454 C 219.74762,157.68318 219.28086,158.52356 218.34736,159.21113 C 217.32056,159.94965 216.29375,160.22976 214.58234,160.22976 C 212.27982,160.22976 210.63087,159.64404 209.16834,158.31983 C 207.8616,157.12293 207.20804,155.92603 206.74129,153.96518 L 205.4035,153.96518 L 205.52785,161.22295 L 206.74129,161.22295 L 208.14155,159.49126 C 210.22619,160.89187 211.96865,161.40118 214.67584,161.40118 C 219.24964,161.40118 222.17449,159.21113 222.17449,155.79871 C 222.17449,154.21984 221.52111,152.87015 220.30769,151.90244 C 219.46749,151.24032 218.25407,150.80742 215.76472,150.2981 L 212.4354,149.61051 C 209.66615,149.02482 208.35939,148.03163 208.35939,146.47823 C 208.35939,144.69561 210.13288,143.47325 212.7778,143.47325 C 214.95577,143.47325 216.72926,144.23725 217.97394,145.68879 C 218.8764,146.73289 219.43646,147.80246 219.84094,149.10121 L 221.17891,149.10121 L 220.80547,142.4801 z M 178.73765,152.6919 L 178.73765,145.76519 L 178.73765,145.02666 C 178.73765,143.95712 179.01778,143.82976 181.53796,143.82976 L 182.12925,143.82976 L 182.12925,142.63289 L 171.89239,142.63289 L 171.89239,143.82976 L 172.45245,143.82976 C 174.97262,143.82976 175.25275,143.95712 175.25275,145.02666 L 175.25275,145.76519 L 175.25275,157.88691 L 175.25275,158.62541 C 175.25275,159.69498 174.97262,159.8223 172.45245,159.8223 L 171.89239,159.8223 L 171.89239,161.0192 L 182.12925,161.0192 L 182.12925,159.8223 L 181.53796,159.8223 C 179.01778,159.8223 178.73765,159.69498 178.73765,158.62541 L 178.73765,157.88691 L 178.73765,154.65275 L 182.34711,151.67324 L 187.76109,158.16702 C 188.25889,158.77822 188.38343,158.98195 188.38343,159.2366 C 188.38343,159.64404 187.79213,159.8223 186.26754,159.8223 L 185.30299,159.8223 L 185.30299,161.0192 L 195.94434,161.0192 L 195.94434,159.8223 L 195.35324,159.8223 C 193.64183,159.8223 193.20631,159.64404 192.30385,158.54901 L 184.77398,149.66144 L 189.41023,145.86704 C 190.9038,144.56829 192.80183,143.82976 194.66865,143.82976 L 194.66865,142.63289 L 185.08515,142.63289 L 185.08515,143.82976 L 185.86307,143.82976 C 187.29436,143.82976 187.88563,144.05898 187.88563,144.59375 C 187.88563,144.95028 187.2633,145.68879 186.36084,146.42729 L 178.73765,152.6919 z M 143.95082,142.63289 L 137.54106,142.63289 L 137.54106,143.82976 L 138.31879,143.82976 C 139.90566,143.82976 140.62151,144.0335 141.18157,144.67015 L 141.18157,155.49312 C 141.18157,158.98195 140.55924,159.72043 137.57211,159.8223 L 137.57211,161.0192 L 146.43996,161.0192 L 146.43996,159.8223 C 143.48408,159.72043 142.86175,158.98195 142.86175,155.49312 L 142.86175,146.04531 L 156.73912,161.37574 L 158.04604,161.37574 L 158.04604,148.15896 C 158.04604,144.67015 158.66839,143.93164 161.65532,143.82976 L 161.65532,142.63289 L 152.78745,142.63289 L 152.78745,143.82976 C 155.74353,143.93164 156.36587,144.67015 156.36587,148.15896 L 156.36587,156.15522 L 143.95082,142.63289 z M 123.72578,145.76519 L 123.72578,145.02666 C 123.72578,143.95712 124.00592,143.82976 126.49504,143.82976 L 127.11738,143.82976 L 127.11738,142.63289 L 116.81822,142.63289 L 116.81822,143.82976 L 117.44055,143.82976 C 119.96093,143.82976 120.24088,143.95712 120.24088,145.02666 L 120.24088,145.76519 L 120.24088,157.88691 L 120.24088,158.62541 C 120.24088,159.69498 119.96093,159.8223 117.44055,159.8223 L 116.81822,159.8223 L 116.81822,161.0192 L 127.11738,161.0192 L 127.11738,159.8223 L 126.49504,159.8223 C 124.00592,159.8223 123.72578,159.69498 123.72578,158.62541 L 123.72578,157.88691 L 123.72578,145.76519 z "
+       id="path3970"
+       transform="translate(1.654053e-6,-8.777719)" />
+    <path
+       style="opacity:0.18000004;fill:#ffffff;fill-opacity:1;stroke-width:1pt"
+       d="M 590.28004,118.44468 L 545.50486,118.44468 L 545.50486,121.23484 L 546.84587,121.23484 C 552.88054,121.23484 553.55077,121.53175 553.55077,124.02508 L 553.55077,125.74675 L 553.55077,154.00514 L 553.55077,155.72674 C 553.55077,158.22014 552.88054,158.51696 546.84587,158.51696 L 545.50486,158.51696 L 545.50486,161.30719 L 591.24846,161.30719 L 592.73859,145.45639 L 589.46018,145.45639 C 588.49174,149.61196 586.77819,153.29274 584.99037,155.01437 C 582.68096,157.38902 578.43408,158.51696 572.17599,158.51696 L 567.25886,158.51696 C 565.02423,158.51696 563.16161,158.16079 562.49088,157.62645 C 561.9697,157.27031 561.89492,156.9141 561.89492,155.66739 L 561.89492,140.52897 L 563.38501,140.52897 C 567.9296,140.52897 569.79222,140.88515 571.28228,142.13187 C 573.21922,143.67541 573.96427,145.57512 574.11339,149.07773 L 577.61471,149.07773 L 577.61471,129.60555 L 574.11339,129.60555 C 573.74085,135.42343 570.76069,137.73871 563.6832,137.73871 L 561.89492,137.73871 L 561.89492,124.20323 C 561.89492,121.65048 562.56566,121.23484 566.58864,121.23484 L 570.46249,121.23484 C 577.0188,121.23484 580.22238,121.7692 582.75526,123.43148 C 585.21379,124.97498 587.00161,128.29946 588.11922,133.64245 L 591.3228,133.64245 L 590.28004,118.44468 z M 491.41715,142.25059 L 499.83558,142.25059 C 506.5405,142.25059 510.0423,141.83501 513.02252,140.70705 C 518.31214,138.68861 521.29185,134.88921 521.29185,130.1992 C 521.29185,125.68733 518.6842,122.2441 513.76755,120.28503 C 510.8617,119.09767 506.24277,118.44468 501.10224,118.44468 L 475.02661,118.44468 L 475.02661,121.23484 L 476.36759,121.23484 C 482.40227,121.23484 483.073,121.53175 483.073,124.02508 L 483.073,125.74675 L 483.073,154.00514 L 483.073,155.72674 C 483.073,158.22014 482.40227,158.51696 476.36759,158.51696 L 475.02661,158.51696 L 475.02661,161.30719 L 500.059,161.30719 L 500.059,158.51696 L 498.12203,158.51696 C 492.08738,158.51696 491.41715,158.22014 491.41715,155.72674 L 491.41715,154.00514 L 491.41715,142.25059 z M 491.41715,139.46036 L 491.41715,124.26256 C 491.41715,121.53175 491.86399,121.23484 495.96174,121.23484 L 500.72973,121.23484 C 508.47788,121.23484 512.12832,124.14383 512.12832,130.43668 C 512.12832,136.55142 508.3288,139.46036 500.43153,139.46036 L 491.41715,139.46036 z M 426.60104,117.61357 L 423.47218,117.61357 L 406.33663,152.22413 C 404.84653,155.31116 404.54881,155.72674 403.43125,156.67662 C 402.23938,157.80458 400.15332,158.51696 398.1416,158.51696 L 397.84386,158.51696 L 397.84386,161.30719 L 417.58661,161.30719 L 417.58661,158.51696 L 416.09652,158.51696 C 412.07357,158.51696 410.06188,157.38902 410.06188,155.13314 C 410.06188,154.4207 410.28529,153.58957 410.73213,152.63972 L 413.19068,147.41546 L 432.93393,147.41546 L 436.95688,155.3706 C 437.40369,156.26106 437.55282,156.67662 437.55282,156.97341 C 437.55282,157.92333 435.6902,158.51696 432.93393,158.51696 L 429.80462,158.51696 L 429.80462,161.30719 L 452.90006,161.30719 L 452.90006,158.51696 L 451.85684,158.51696 C 448.13208,158.51696 447.31225,158.04204 445.59873,154.71751 L 426.60104,117.61357 z M 422.9506,127.34963 L 431.36902,144.2097 L 414.68081,144.2097 L 422.9506,127.34963 z M 371.54484,118.02911 L 368.71374,118.02911 L 365.73356,121.53175 C 360.44394,118.44468 357.53857,117.55417 352.54712,117.55417 C 345.32056,117.55417 339.36021,119.86952 334.29444,124.67808 C 329.526,129.19003 327.29132,134.17677 327.29132,140.29151 C 327.29132,153.05524 337.7958,162.19767 352.47232,162.19767 C 364.39257,162.19767 371.99167,156.6172 373.70519,146.64371 L 370.20383,146.16872 C 369.45882,149.31517 368.56467,151.45238 367.22366,153.23336 C 364.16915,157.32964 359.40119,159.40743 353.3665,159.40743 C 342.34037,159.40743 337.12507,153.29274 337.12507,140.52897 C 337.12507,133.82053 338.24262,129.30872 340.77597,125.74675 C 343.0854,122.42225 347.70431,120.34439 352.47232,120.34439 C 357.68767,120.34439 362.30653,122.54098 365.13765,126.34042 C 366.55341,128.29946 367.67098,130.61478 369.38448,135.186 L 372.66238,135.186 L 371.54484,118.02911 z M 296.96929,118.08849 L 294.21254,118.08849 L 291.23281,121.65048 C 287.73101,118.97894 282.963,117.55417 277.67338,117.55417 C 267.91392,117.55417 261.35763,122.54098 261.35763,129.96176 C 261.35763,136.43269 265.38061,139.63849 276.33239,141.89443 L 283.40983,143.31918 C 288.9234,144.44716 289.44453,144.56589 291.00941,145.51572 C 293.24407,146.88117 294.43641,148.84023 294.43641,151.15553 C 294.43641,153.5302 293.31882,155.48931 291.08368,157.09218 C 288.62516,158.81384 286.1666,159.46683 282.06887,159.46683 C 276.55581,159.46683 272.60763,158.10139 269.10581,155.01437 C 265.977,152.22413 264.41214,149.4339 263.29458,144.86273 L 260.09142,144.86273 L 260.38916,161.78218 L 263.29458,161.78218 L 266.6473,157.74523 C 271.63868,161.01036 275.81076,162.19767 282.29274,162.19767 C 293.24407,162.19767 300.24721,157.09218 300.24721,149.13709 C 300.24721,145.45639 298.68278,142.30997 295.77742,140.05403 C 293.76568,138.51048 290.86032,137.5013 284.89991,136.31396 L 276.92832,134.71104 C 270.29774,133.34566 267.16889,131.03032 267.16889,127.40901 C 267.16889,123.25333 271.41526,120.40374 277.74815,120.40374 C 282.963,120.40374 287.20937,122.18479 290.18958,125.56865 C 292.3504,128.00267 293.69138,130.49608 294.65985,133.52375 L 297.86343,133.52375 L 296.96929,118.08849 z M 196.24378,141.89443 L 196.24378,125.74675 L 196.24378,124.02508 C 196.24378,121.53175 196.91451,121.23484 202.94873,121.23484 L 204.36449,121.23484 L 204.36449,118.44468 L 179.85376,118.44468 L 179.85376,121.23484 L 181.19475,121.23484 C 187.22894,121.23484 187.89967,121.53175 187.89967,124.02508 L 187.89967,125.74675 L 187.89967,154.00514 L 187.89967,155.72674 C 187.89967,158.22014 187.22894,158.51696 181.19475,158.51696 L 179.85376,158.51696 L 179.85376,161.30719 L 204.36449,161.30719 L 204.36449,158.51696 L 202.94873,158.51696 C 196.91451,158.51696 196.24378,158.22014 196.24378,155.72674 L 196.24378,154.00514 L 196.24378,146.4656 L 204.88613,139.51971 L 217.84914,154.65814 C 219.04106,156.08298 219.33925,156.55792 219.33925,157.15156 C 219.33925,158.10139 217.92346,158.51696 214.27305,158.51696 L 211.96357,158.51696 L 211.96357,161.30719 L 237.44279,161.30719 L 237.44279,158.51696 L 236.02748,158.51696 C 231.92975,158.51696 230.88696,158.10139 228.72615,155.54864 L 210.69693,134.82977 L 221.79778,125.98419 C 225.37392,122.95652 229.91849,121.23484 234.38833,121.23484 L 234.38833,118.44468 L 211.44198,118.44468 L 211.44198,121.23484 L 213.3046,121.23484 C 216.73162,121.23484 218.14734,121.7692 218.14734,123.01587 C 218.14734,123.84702 216.65725,125.56865 214.49644,127.29025 L 196.24378,141.89443 z M 112.95159,118.44468 L 97.604314,118.44468 L 97.604314,121.23484 L 99.46648,121.23484 C 103.26602,121.23484 104.98002,121.7098 106.321,123.19398 L 106.321,148.42469 C 106.321,156.55792 104.83092,158.27947 97.678659,158.51696 L 97.678659,161.30719 L 118.91148,161.30719 L 118.91148,158.51696 C 111.83404,158.27947 110.34396,156.55792 110.34396,148.42469 L 110.34396,126.39977 L 143.57138,162.13836 L 146.70062,162.13836 L 146.70062,131.32716 C 146.70062,123.19398 148.19075,121.47235 155.34253,121.23484 L 155.34253,118.44468 L 134.10966,118.44468 L 134.10966,121.23484 C 141.18758,121.47235 142.67768,123.19398 142.67768,131.32716 L 142.67768,149.96819 L 112.95159,118.44468 z M 64.525561,125.74675 L 64.525561,124.02508 C 64.525561,121.53175 65.196317,121.23484 71.156166,121.23484 L 72.646272,121.23484 L 72.646272,118.44468 L 47.986375,118.44468 L 47.986375,121.23484 L 49.476457,121.23484 C 55.511154,121.23484 56.181455,121.53175 56.181455,124.02508 L 56.181455,125.74675 L 56.181455,154.00514 L 56.181455,155.72674 C 56.181455,158.22014 55.511154,158.51696 49.476457,158.51696 L 47.986375,158.51696 L 47.986375,161.30719 L 72.646272,161.30719 L 72.646272,158.51696 L 71.156166,158.51696 C 65.196317,158.51696 64.525561,158.22014 64.525561,155.72674 L 64.525561,154.00514 L 64.525561,125.74675 z "
+       id="use3972" />
+    <g
+       id="g6386">
+      <path
+         id="path4997"
+         d="M 92.59375,164.875 C 88.113243,165.75634 90.444126,172.33966 94.3125,171.78125 C 98.790176,171.10793 97.488032,164.81708 93.3125,164.84375 C 93.077807,164.87205 92.819915,164.79564 92.59375,164.875 z "
+         style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6374)" />
+      <path
+         id="path4999"
+         d="M 68.0625,164 C 63.389338,163.68801 62.994345,172.30386 67.96875,171.40625 C 72.00245,171.56715 75.618715,164.7074 69.84375,164.1875 C 69.28382,163.9933 68.657906,163.92536 68.0625,164 z "
+         style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6362)" />
       <path
-         id="path3970"
-         d="M 343.30616,142.63289 L 324.60589,142.63289 L 324.60589,143.82976 L 325.16596,143.82976 C 327.68633,143.82976 327.96625,143.95712 327.96625,145.02666 L 327.96625,145.76519 L 327.96625,157.88691 L 327.96625,158.62541 C 327.96625,159.69498 327.68633,159.8223 325.16596,159.8223 L 324.60589,159.8223 L 324.60589,161.0192 L 343.71062,161.0192 L 344.33297,154.21984 L 342.96375,154.21984 C 342.55928,156.00241 341.84362,157.58132 341.09694,158.31983 C 340.13242,159.33846 338.35872,159.8223 335.74504,159.8223 L 333.69141,159.8223 C 332.75812,159.8223 331.9802,159.66952 331.70007,159.44031 C 331.4824,159.28754 331.45117,159.13474 331.45117,158.59995 L 331.45117,152.10617 L 332.0735,152.10617 C 333.97154,152.10617 334.74946,152.25896 335.37178,152.79375 C 336.18074,153.45587 336.49191,154.27077 336.55419,155.77325 L 338.01651,155.77325 L 338.01651,147.42046 L 336.55419,147.42046 C 336.3986,149.9161 335.15394,150.90926 332.19804,150.90926 L 331.45117,150.90926 L 331.45117,145.10308 C 331.45117,144.00805 331.7313,143.82976 333.41149,143.82976 L 335.0294,143.82976 C 337.76763,143.82976 339.1056,144.05898 340.16345,144.77203 C 341.19025,145.43413 341.93693,146.8602 342.4037,149.15213 L 343.74167,149.15213 L 343.30616,142.63289 z M 302.01626,152.84468 L 305.5322,152.84468 C 308.3325,152.84468 309.79502,152.66641 311.0397,152.18256 C 313.2489,151.31673 314.49337,149.68694 314.49337,147.67511 C 314.49337,145.7397 313.40429,144.26269 311.35086,143.42233 C 310.13724,142.913 308.20815,142.63289 306.06122,142.63289 L 295.17078,142.63289 L 295.17078,143.82976 L 295.73084,143.82976 C 298.25121,143.82976 298.53134,143.95712 298.53134,145.02666 L 298.53134,145.76519 L 298.53134,157.88691 L 298.53134,158.62541 C 298.53134,159.69498 298.25121,159.8223 295.73084,159.8223 L 295.17078,159.8223 L 295.17078,161.0192 L 305.62551,161.0192 L 305.62551,159.8223 L 304.81654,159.8223 C 302.29618,159.8223 302.01626,159.69498 302.01626,158.62541 L 302.01626,157.88691 L 302.01626,152.84468 z M 302.01626,151.64778 L 302.01626,145.12853 C 302.01626,143.95712 302.20288,143.82976 303.9143,143.82976 L 305.90564,143.82976 C 309.14164,143.82976 310.66624,145.0776 310.66624,147.77698 C 310.66624,150.39996 309.07938,151.64778 305.7811,151.64778 L 302.01626,151.64778 z M 274.94593,142.27638 L 273.63917,142.27638 L 266.48254,157.12293 C 265.8602,158.44714 265.73586,158.62541 265.26911,159.03287 C 264.77133,159.51672 263.90009,159.8223 263.0599,159.8223 L 262.93555,159.8223 L 262.93555,161.0192 L 271.18107,161.0192 L 271.18107,159.8223 L 270.55874,159.8223 C 268.87856,159.8223 268.03838,159.33846 268.03838,158.37078 C 268.03838,158.06517 268.13169,157.70865 268.31831,157.3012 L 269.34512,155.0602 L 277.59085,155.0602 L 279.27103,158.47264 C 279.45764,158.85461 279.51992,159.03287 279.51992,159.16018 C 279.51992,159.56766 278.742,159.8223 277.59085,159.8223 L 276.2839,159.8223 L 276.2839,161.0192 L 285.92967,161.0192 L 285.92967,159.8223 L 285.49397,159.8223 C 283.93833,159.8223 283.59593,159.61858 282.88028,158.19249 L 274.94593,142.27638 z M 273.42133,146.45276 L 276.93727,153.68506 L 269.96747,153.68506 L 273.42133,146.45276 z M 251.95181,142.45463 L 250.76941,142.45463 L 249.52474,143.95712 C 247.31554,142.63289 246.10212,142.2509 244.01745,142.2509 C 240.99929,142.2509 238.50996,143.24409 236.39425,145.30677 C 234.40272,147.24222 233.46941,149.38133 233.46941,152.00431 C 233.46941,157.47944 237.85659,161.40118 243.98621,161.40118 C 248.96468,161.40118 252.13843,159.00738 252.85408,154.72915 L 251.39174,154.5254 C 251.08059,155.8751 250.70715,156.79188 250.14708,157.55585 C 248.87137,159.31299 246.88004,160.20428 244.35966,160.20428 C 239.75462,160.20428 237.57646,157.58132 237.57646,152.10617 C 237.57646,149.22852 238.0432,147.29313 239.10125,145.76519 C 240.06578,144.33911 241.99486,143.44779 243.98621,143.44779 C 246.16439,143.44779 248.09345,144.39004 249.27586,146.01985 C 249.86715,146.8602 250.3339,147.85338 251.04954,149.81425 L 252.41855,149.81425 L 251.95181,142.45463 z M 220.80547,142.4801 L 219.65412,142.4801 L 218.40964,144.00805 C 216.94712,142.86207 214.95577,142.2509 212.74657,142.2509 C 208.67055,142.2509 205.93233,144.39004 205.93233,147.57326 C 205.93233,150.34903 207.61252,151.72419 212.18651,152.6919 L 215.14239,153.30306 C 217.44512,153.78692 217.66277,153.83785 218.31634,154.24529 C 219.24964,154.83101 219.74762,155.67137 219.74762,156.66454 C 219.74762,157.68318 219.28086,158.52356 218.34736,159.21113 C 217.32056,159.94965 216.29375,160.22976 214.58234,160.22976 C 212.27982,160.22976 210.63087,159.64404 209.16834,158.31983 C 207.8616,157.12293 207.20804,155.92603 206.74129,153.96518 L 205.4035,153.96518 L 205.52785,161.22295 L 206.74129,161.22295 L 208.14155,159.49126 C 210.22619,160.89187 211.96865,161.40118 214.67584,161.40118 C 219.24964,161.40118 222.17449,159.21113 222.17449,155.79871 C 222.17449,154.21984 221.52111,152.87015 220.30769,151.90244 C 219.46749,151.24032 218.25407,150.80742 215.76472,150.2981 L 212.4354,149.61051 C 209.66615,149.02482 208.35939,148.03163 208.35939,146.47823 C 208.35939,144.69561 210.13288,143.47325 212.7778,143.47325 C 214.95577,143.47325 216.72926,144.23725 217.97394,145.68879 C 218.8764,146.73289 219.43646,147.80246 219.84094,149.10121 L 221.17891,149.10121 L 220.80547,142.4801 z M 178.73765,152.6919 L 178.73765,145.76519 L 178.73765,145.02666 C 178.73765,143.95712 179.01778,143.82976 181.53796,143.82976 L 182.12925,143.82976 L 182.12925,142.63289 L 171.89239,142.63289 L 171.89239,143.82976 L 172.45245,143.82976 C 174.97262,143.82976 175.25275,143.95712 175.25275,145.02666 L 175.25275,145.76519 L 175.25275,157.88691 L 175.25275,158.62541 C 175.25275,159.69498 174.97262,159.8223 172.45245,159.8223 L 171.89239,159.8223 L 171.89239,161.0192 L 182.12925,161.0192 L 182.12925,159.8223 L 181.53796,159.8223 C 179.01778,159.8223 178.73765,159.69498 178.73765,158.62541 L 178.73765,157.88691 L 178.73765,154.65275 L 182.34711,151.67324 L 187.76109,158.16702 C 188.25889,158.77822 188.38343,158.98195 188.38343,159.2366 C 188.38343,159.64404 187.79213,159.8223 186.26754,159.8223 L 185.30299,159.8223 L 185.30299,161.0192 L 195.94434,161.0192 L 195.94434,159.8223 L 195.35324,159.8223 C 193.64183,159.8223 193.20631,159.64404 192.30385,158.54901 L 184.77398,149.66144 L 189.41023,145.86704 C 190.9038,144.56829 192.80183,143.82976 194.66865,143.82976 L 194.66865,142.63289 L 185.08515,142.63289 L 185.08515,143.82976 L 185.86307,143.82976 C 187.29436,143.82976 187.88563,144.05898 187.88563,144.59375 C 187.88563,144.95028 187.2633,145.68879 186.36084,146.42729 L 178.73765,152.6919 z M 143.95082,142.63289 L 137.54106,142.63289 L 137.54106,143.82976 L 138.31879,143.82976 C 139.90566,143.82976 140.62151,144.0335 141.18157,144.67015 L 141.18157,155.49312 C 141.18157,158.98195 140.55924,159.72043 137.57211,159.8223 L 137.57211,161.0192 L 146.43996,161.0192 L 146.43996,159.8223 C 143.48408,159.72043 142.86175,158.98195 142.86175,155.49312 L 142.86175,146.04531 L 156.73912,161.37574 L 158.04604,161.37574 L 158.04604,148.15896 C 158.04604,144.67015 158.66839,143.93164 161.65532,143.82976 L 161.65532,142.63289 L 152.78745,142.63289 L 152.78745,143.82976 C 155.74353,143.93164 156.36587,144.67015 156.36587,148.15896 L 156.36587,156.15522 L 143.95082,142.63289 z M 123.72578,145.76519 L 123.72578,145.02666 C 123.72578,143.95712 124.00592,143.82976 126.49504,143.82976 L 127.11738,143.82976 L 127.11738,142.63289 L 116.81822,142.63289 L 116.81822,143.82976 L 117.44055,143.82976 C 119.96093,143.82976 120.24088,143.95712 120.24088,145.02666 L 120.24088,145.76519 L 120.24088,157.88691 L 120.24088,158.62541 C 120.24088,159.69498 119.96093,159.8223 117.44055,159.8223 L 116.81822,159.8223 L 116.81822,161.0192 L 127.11738,161.0192 L 127.11738,159.8223 L 126.49504,159.8223 C 124.00592,159.8223 123.72578,159.69498 123.72578,158.62541 L 123.72578,157.88691 L 123.72578,145.76519 z "
-         style="fill:white;fill-opacity:1;stroke-width:1pt" />
+         id="path5001"
+         d="M 96.6875,160.96875 C 92.787255,160.12272 89.338676,166.71986 94.4375,167.625 C 98.127844,169.64513 105.11906,165.50747 100.90625,161.84375 C 99.656522,161.05111 98.140071,160.87759 96.6875,160.96875 z "
+         style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6370)" />
       <path
-         id="use3972"
-         d="M 592.28004,127.2224 L 547.50486,127.2224 L 547.50486,130.01256 L 548.84587,130.01256 C 554.88054,130.01256 555.55077,130.30947 555.55077,132.8028 L 555.55077,134.52447 L 555.55077,162.78286 L 555.55077,164.50446 C 555.55077,166.99786 554.88054,167.29468 548.84587,167.29468 L 547.50486,167.29468 L 547.50486,170.08491 L 593.24846,170.08491 L 594.73859,154.23411 L 591.46018,154.23411 C 590.49174,158.38968 588.77819,162.07046 586.99037,163.79209 C 584.68096,166.16674 580.43408,167.29468 574.17599,167.29468 L 569.25886,167.29468 C 567.02423,167.29468 565.16161,166.93851 564.49088,166.40417 C 563.9697,166.04803 563.89492,165.69182 563.89492,164.44511 L 563.89492,149.30669 L 565.38501,149.30669 C 569.9296,149.30669 571.79222,149.66287 573.28228,150.90959 C 575.21922,152.45313 575.96427,154.35284 576.11339,157.85545 L 579.61471,157.85545 L 579.61471,138.38327 L 576.11339,138.38327 C 575.74085,144.20115 572.76069,146.51643 565.6832,146.51643 L 563.89492,146.51643 L 563.89492,132.98095 C 563.89492,130.4282 564.56566,130.01256 568.58864,130.01256 L 572.46249,130.01256 C 579.0188,130.01256 582.22238,130.54692 584.75526,132.2092 C 587.21379,133.7527 589.00161,137.07718 590.11922,142.42017 L 593.3228,142.42017 L 592.28004,127.2224 z M 493.41715,151.02831 L 501.83558,151.02831 C 508.5405,151.02831 512.0423,150.61273 515.02252,149.48477 C 520.31214,147.46633 523.29185,143.66693 523.29185,138.97692 C 523.29185,134.46505 520.6842,131.02182 515.76755,129.06275 C 512.8617,127.87539 508.24277,127.2224 503.10224,127.2224 L 477.02661,127.2224 L 477.02661,130.01256 L 478.36759,130.01256 C 484.40227,130.01256 485.073,130.30947 485.073,132.8028 L 485.073,134.52447 L 485.073,162.78286 L 485.073,164.50446 C 485.073,166.99786 484.40227,167.29468 478.36759,167.29468 L 477.02661,167.29468 L 477.02661,170.08491 L 502.059,170.08491 L 502.059,167.29468 L 500.12203,167.29468 C 494.08738,167.29468 493.41715,166.99786 493.41715,164.50446 L 493.41715,162.78286 L 493.41715,151.02831 z M 493.41715,148.23808 L 493.41715,133.04028 C 493.41715,130.30947 493.86399,130.01256 497.96174,130.01256 L 502.72973,130.01256 C 510.47788,130.01256 514.12832,132.92155 514.12832,139.2144 C 514.12832,145.32914 510.3288,148.23808 502.43153,148.23808 L 493.41715,148.23808 z M 428.60104,126.39129 L 425.47218,126.39129 L 408.33663,161.00185 C 406.84653,164.08888 406.54881,164.50446 405.43125,165.45434 C 404.23938,166.5823 402.15332,167.29468 400.1416,167.29468 L 399.84386,167.29468 L 399.84386,170.08491 L 419.58661,170.08491 L 419.58661,167.29468 L 418.09652,167.29468 C 414.07357,167.29468 412.06188,166.16674 412.06188,163.91086 C 412.06188,163.19842 412.28529,162.36729 412.73213,161.41744 L 415.19068,156.19318 L 434.93393,156.19318 L 438.95688,164.14832 C 439.40369,165.03878 439.55282,165.45434 439.55282,165.75113 C 439.55282,166.70105 437.6902,167.29468 434.93393,167.29468 L 431.80462,167.29468 L 431.80462,170.08491 L 454.90006,170.08491 L 454.90006,167.29468 L 453.85684,167.29468 C 450.13208,167.29468 449.31225,166.81976 447.59873,163.49523 L 428.60104,126.39129 z M 424.9506,136.12735 L 433.36902,152.98742 L 416.68081,152.98742 L 424.9506,136.12735 z M 373.54484,126.80683 L 370.71374,126.80683 L 367.73356,130.30947 C 362.44394,127.2224 359.53857,126.33189 354.54712,126.33189 C 347.32056,126.33189 341.36021,128.64724 336.29444,133.4558 C 331.526,137.96775 329.29132,142.95449 329.29132,149.06923 C 329.29132,161.83296 339.7958,170.97539 354.47232,170.97539 C 366.39257,170.97539 373.99167,165.39492 375.70519,155.42143 L 372.20383,154.94644 C 371.45882,158.09289 370.56467,160.2301 369.22366,162.01108 C 366.16915,166.10736 361.40119,168.18515 355.3665,168.18515 C 344.34037,168.18515 339.12507,162.07046 339.12507,149.30669 C 339.12507,142.59825 340.24262,138.08644 342.77597,134.52447 C 345.0854,131.19997 349.70431,129.12211 354.47232,129.12211 C 359.68767,129.12211 364.30653,131.3187 367.13765,135.11814 C 368.55341,137.07718 369.67098,139.3925 371.38448,143.96372 L 374.66238,143.96372 L 373.54484,126.80683 z M 298.96929,126.86621 L 296.21254,126.86621 L 293.23281,130.4282 C 289.73101,127.75666 284.963,126.33189 279.67338,126.33189 C 269.91392,126.33189 263.35763,131.3187 263.35763,138.73948 C 263.35763,145.21041 267.38061,148.41621 278.33239,150.67215 L 285.40983,152.0969 C 290.9234,153.22488 291.44453,153.34361 293.00941,154.29344 C 295.24407,155.65889 296.43641,157.61795 296.43641,159.93325 C 296.43641,162.30792 295.31882,164.26703 293.08368,165.8699 C 290.62516,167.59156 288.1666,168.24455 284.06887,168.24455 C 278.55581,168.24455 274.60763,166.87911 271.10581,163.79209 C 267.977,161.00185 266.41214,158.21162 265.29458,153.64045 L 262.09142,153.64045 L 262.38916,170.5599 L 265.29458,170.5599 L 268.6473,166.52295 C 273.63868,169.78808 277.81076,170.97539 284.29274,170.97539 C 295.24407,170.97539 302.24721,165.8699 302.24721,157.91481 C 302.24721,154.23411 300.68278,151.08769 297.77742,148.83175 C 295.76568,147.2882 292.86032,146.27902 286.89991,145.09168 L 278.92832,143.48876 C 272.29774,142.12338 269.16889,139.80804 269.16889,136.18673 C 269.16889,132.03105 273.41526,129.18146 279.74815,129.18146 C 284.963,129.18146 289.20937,130.96251 292.18958,134.34637 C 294.3504,136.78039 295.69138,139.2738 296.65985,142.30147 L 299.86343,142.30147 L 298.96929,126.86621 z M 198.24378,150.67215 L 198.24378,134.52447 L 198.24378,132.8028 C 198.24378,130.30947 198.91451,130.01256 204.94873,130.01256 L 206.36449,130.01256 L 206.36449,127.2224 L 181.85376,127.2224 L 181.85376,130.01256 L 183.19475,130.01256 C 189.22894,130.01256 189.89967,130.30947 189.89967,132.8028 L 189.89967,134.52447 L 189.89967,162.78286 L 189.89967,164.50446 C 189.89967,166.99786 189.22894,167.29468 183.19475,167.29468 L 181.85376,167.29468 L 181.85376,170.08491 L 206.36449,170.08491 L 206.36449,167.29468 L 204.94873,167.29468 C 198.91451,167.29468 198.24378,166.99786 198.24378,164.50446 L 198.24378,162.78286 L 198.24378,155.24332 L 206.88613,148.29743 L 219.84914,163.43586 C 221.04106,164.8607 221.33925,165.33564 221.33925,165.92928 C 221.33925,166.87911 219.92346,167.29468 216.27305,167.29468 L 213.96357,167.29468 L 213.96357,170.08491 L 239.44279,170.08491 L 239.44279,167.29468 L 238.02748,167.29468 C 233.92975,167.29468 232.88696,166.87911 230.72615,164.32636 L 212.69693,143.60749 L 223.79778,134.76191 C 227.37392,131.73424 231.91849,130.01256 236.38833,130.01256 L 236.38833,127.2224 L 213.44198,127.2224 L 213.44198,130.01256 L 215.3046,130.01256 C 218.73162,130.01256 220.14734,130.54692 220.14734,131.79359 C 220.14734,132.62474 218.65725,134.34637 216.49644,136.06797 L 198.24378,150.67215 z M 114.95159,127.2224 L 99.604312,127.2224 L 99.604312,130.01256 L 101.46648,130.01256 C 105.26602,130.01256 106.98002,130.48752 108.321,131.9717 L 108.321,157.20241 C 108.321,165.33564 106.83092,167.05719 99.678657,167.29468 L 99.678657,170.08491 L 120.91148,170.08491 L 120.91148,167.29468 C 113.83404,167.05719 112.34396,165.33564 112.34396,157.20241 L 112.34396,135.17749 L 145.57138,170.91608 L 148.70062,170.91608 L 148.70062,140.10488 C 148.70062,131.9717 150.19075,130.25007 157.34253,130.01256 L 157.34253,127.2224 L 136.10966,127.2224 L 136.10966,130.01256 C 143.18758,130.25007 144.67768,131.9717 144.67768,140.10488 L 144.67768,158.74591 L 114.95159,127.2224 z M 66.525559,134.52447 L 66.525559,132.8028 C 66.525559,130.30947 67.196315,130.01256 73.156164,130.01256 L 74.64627,130.01256 L 74.64627,127.2224 L 49.986373,127.2224 L 49.986373,130.01256 L 51.476455,130.01256 C 57.511152,130.01256 58.181453,130.30947 58.181453,132.8028 L 58.181453,134.52447 L 58.181453,162.78286 L 58.181453,164.50446 C 58.181453,166.99786 57.511152,167.29468 51.476455,167.29468 L 49.986373,167.29468 L 49.986373,170.08491 L 74.64627,170.08491 L 74.64627,167.29468 L 73.156164,167.29468 C 67.196315,167.29468 66.525559,166.99786 66.525559,164.50446 L 66.525559,162.78286 L 66.525559,134.52447 z "
-         style="opacity:0.0786517;fill:white;fill-opacity:1;stroke-width:1pt" />
+         id="path5003"
+         d="M 78.90625,130.0625 C 71.574069,132.72813 68.195911,140.7692 62.0625,145.25 C 60.185026,147.42322 54.784698,150.53213 57.25,153.90625 C 59.730284,154.72534 65.594263,155.98382 63.34061,159.34427 C 59.717471,163.33418 70.334693,162.45891 71.59375,165.46875 C 73.006345,167.48699 68.928159,170.12348 72.71875,170.65625 C 75.274013,170.82156 76.509875,171.42143 77.15625,173.71875 C 79.798879,175.53189 84.935097,174.59678 86.375,171.65625 C 84.032653,167.37236 91.803417,168.05515 93.09375,164.40625 C 90.163883,162.96743 90.537912,158.77419 94.09375,158.75 C 97.839433,158.38307 104.15352,156.07034 102.125,151.15625 C 95.808038,143.61829 88.597124,136.46857 81.03125,130.28125 C 80.359155,130.04775 79.615042,129.96607 78.90625,130.0625 z M 80.375,133.28125 C 82.853723,134.6375 88.132191,138.59859 83.90625,140.96875 C 81.669601,143.5713 77.157842,142.78439 76.6875,139.0625 C 76.528868,140.88754 72.618484,146.33606 70.0625,142.5 C 68.712832,139.23213 74.807932,134.16459 76.5,138.125 C 75.943839,135.93126 77.766171,131.42089 80.375,133.28125 z "
+         style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6366)" />
+    </g>
+    <g
+       id="g3974"
+       transform="matrix(1.952112,0,0,1.952747,47.479862,134.24318)">
       <g
-         transform="matrix(1.952112,0,0,1.952747,47.47986,143.0209)"
-         id="g3974">
-        <path
-           transform="matrix(3.19805e-2,0,0,0.109292,5.149671,-45.83576)"
-           d="M 606.48149 567.70831 A 179.39815 53.819443 0 1 1  247.6852,567.70831 A 179.39815 53.819443 0 1 1  606.48149 567.70831 z"
-           sodipodi:ry="53.819443"
-           sodipodi:rx="179.39815"
-           sodipodi:cy="567.70831"
-           sodipodi:cx="427.08334"
-           id="path3976"
-           style="fill:url(#radialGradient3990);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-           sodipodi:type="arc" />
-        <path
-           transform="matrix(3.19805e-2,0,0,0.109292,2.022526,-44.58496)"
-           d="M 606.48149 567.70831 A 179.39815 53.819443 0 1 1  247.6852,567.70831 A 179.39815 53.819443 0 1 1  606.48149 567.70831 z"
-           sodipodi:ry="53.819443"
-           sodipodi:rx="179.39815"
-           sodipodi:cy="567.70831"
-           sodipodi:cx="427.08334"
-           id="path3978"
-           style="fill:url(#radialGradient3992);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-           sodipodi:type="arc" />
-        <path
-           transform="matrix(3.19805e-2,0,0,0.109292,-3.397884,-48.75451)"
-           d="M 606.48149 567.70831 A 179.39815 53.819443 0 1 1  247.6852,567.70831 A 179.39815 53.819443 0 1 1  606.48149 567.70831 z"
-           sodipodi:ry="53.819443"
-           sodipodi:rx="179.39815"
-           sodipodi:cy="567.70831"
-           sodipodi:cx="427.08334"
-           id="path3980"
-           style="fill:url(#radialGradient3994);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-           sodipodi:type="arc" />
-        <path
-           transform="matrix(3.19805e-2,0,0,0.109292,8.068429,-48.33756)"
-           d="M 606.48149 567.70831 A 179.39815 53.819443 0 1 1  247.6852,567.70831 A 179.39815 53.819443 0 1 1  606.48149 567.70831 z"
-           sodipodi:ry="53.819443"
-           sodipodi:rx="179.39815"
-           sodipodi:cy="567.70831"
-           sodipodi:cx="427.08334"
-           id="path3982"
-           style="fill:url(#radialGradient3996);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-           sodipodi:type="arc" />
+         id="g3996"
+         transform="matrix(5.8837e-2,0,0,5.8837e-2,-4.768899,-3.296641)">
         <path
-           transform="matrix(3.19805e-2,0,0,0.109292,12.02955,-53.13256)"
-           d="M 606.48149 567.70831 A 179.39815 53.819443 0 1 1  247.6852,567.70831 A 179.39815 53.819443 0 1 1  606.48149 567.70831 z"
-           sodipodi:ry="53.819443"
-           sodipodi:rx="179.39815"
-           sodipodi:cy="567.70831"
-           sodipodi:cx="427.08334"
-           id="path3984"
-           style="fill:url(#radialGradient3998);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-           sodipodi:type="arc" />
+           style="font-size:12px;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.47950168pt"
+           d="M 397.64309,320.25301 L 280.39197,282.517 L 250.74227,124.83447 L 345.08225,29.146783 L 393.59996,46.667064 L 483.89679,135.61619 L 397.64309,320.25301 z "
+           id="path3998" />
         <path
-           transform="matrix(3.19805e-2,0,0,0.109292,9.855679,-58.05951)"
-           d="M 606.48149 567.70831 A 179.39815 53.819443 0 1 1  247.6852,567.70831 A 179.39815 53.819443 0 1 1  606.48149 567.70831 z"
-           sodipodi:ry="53.819443"
-           sodipodi:rx="179.39815"
-           sodipodi:cy="567.70831"
-           sodipodi:cx="427.08334"
-           id="path3986"
-           style="fill:url(#radialGradient4000);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-           sodipodi:type="arc" />
+           style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt"
+           d="M 476.95792,339.17168 C 495.78197,342.93607 499.54842,356.11361 495.78197,359.87802 C 492.01856,363.6434 482.6065,367.40781 475.07663,361.76014 C 467.54478,356.11361 467.54478,342.93607 476.95792,339.17168 z "
+           id="path4000" />
         <path
-           transform="matrix(3.19805e-2,0,0,0.109292,5.269166,-61.39511)"
-           d="M 606.48149 567.70831 A 179.39815 53.819443 0 1 1  247.6852,567.70831 A 179.39815 53.819443 0 1 1  606.48149 567.70831 z"
-           sodipodi:ry="53.819443"
-           sodipodi:rx="179.39815"
-           sodipodi:cy="567.70831"
-           sodipodi:cx="427.08334"
-           id="path3988"
-           style="fill:url(#radialGradient4002);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-           sodipodi:type="arc" />
+           style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt"
+           d="M 286.46194,340.42914 C 284.6277,340.91835 269.30405,327.71337 257.16909,333.8338 C 245.03722,339.95336 236.89276,353.65666 248.22676,359.27982 C 259.56184,364.90298 267.66433,358.41867 277.60113,351.44119 C 287.53903,344.46477 287.18046,343.1206 286.46194,340.42914 z "
+           id="path4002" />
         <path
-           transform="matrix(3.19805e-2,0,0,0.109292,0.265717,-60.76966)"
-           d="M 606.48149 567.70831 A 179.39815 53.819443 0 1 1  247.6852,567.70831 A 179.39815 53.819443 0 1 1  606.48149 567.70831 z"
-           sodipodi:ry="53.819443"
-           sodipodi:rx="179.39815"
-           sodipodi:cy="567.70831"
-           sodipodi:cx="427.08334"
-           id="path3990"
-           style="fill:url(#radialGradient4004);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-           sodipodi:type="arc" />
+           style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt"
+           d="M 510.35756,306.92856 C 520.59494,304.36879 544.24333,306.92856 540.47688,321.98634 C 536.71354,337.04806 504.71297,331.39827 484.00371,323.87156 C 482.12141,308.81083 505.53237,308.13423 510.35756,306.92856 z "
+           id="path4004" />
         <path
-           transform="matrix(3.19805e-2,0,0,0.109292,-3.903834,-56.18316)"
-           d="M 606.48149 567.70831 A 179.39815 53.819443 0 1 1  247.6852,567.70831 A 179.39815 53.819443 0 1 1  606.48149 567.70831 z"
-           sodipodi:ry="53.819443"
-           sodipodi:rx="179.39815"
-           sodipodi:cy="567.70831"
-           sodipodi:cx="427.08334"
-           id="path3992"
-           style="fill:url(#radialGradient4006);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-           sodipodi:type="arc" />
-        <path
-           transform="matrix(3.19805e-2,0,0,0.109292,-6.614049,-53.47301)"
-           d="M 606.48149 567.70831 A 179.39815 53.819443 0 1 1  247.6852,567.70831 A 179.39815 53.819443 0 1 1  606.48149 567.70831 z"
-           sodipodi:ry="53.819443"
-           sodipodi:rx="179.39815"
-           sodipodi:cy="567.70831"
-           sodipodi:cx="427.08334"
-           id="path3994"
-           style="fill:url(#radialGradient4008);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-           sodipodi:type="arc" />
-        <g
-           transform="matrix(5.8837e-2,0,0,5.8837e-2,-4.768899,-3.296641)"
-           id="g3996">
-          <path
-             id="path3998"
-             d="M 397.64309,320.25301 L 280.39197,282.517 L 250.74227,124.83447 L 345.08225,29.146783 L 393.59996,46.667064 L 483.89679,135.61619 L 397.64309,320.25301 z "
-             style="font-size:12px;fill:white;fill-rule:evenodd;stroke:black;stroke-width:0.47950168pt" />
-          <path
-             id="path4000"
-             d="M 476.95792,339.17168 C 495.78197,342.93607 499.54842,356.11361 495.78197,359.87802 C 492.01856,363.6434 482.6065,367.40781 475.07663,361.76014 C 467.54478,356.11361 467.54478,342.93607 476.95792,339.17168 z "
-             style="font-size:12px;fill:black;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
-          <path
-             id="path4002"
-             d="M 286.46194,340.42914 C 284.6277,340.91835 269.30405,327.71337 257.16909,333.8338 C 245.03722,339.95336 236.89276,353.65666 248.22676,359.27982 C 259.56184,364.90298 267.66433,358.41867 277.60113,351.44119 C 287.53903,344.46477 287.18046,343.1206 286.46194,340.42914 z "
-             style="font-size:12px;fill:black;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
-          <path
-             id="path4004"
-             d="M 510.35756,306.92856 C 520.59494,304.36879 544.24333,306.92856 540.47688,321.98634 C 536.71354,337.04806 504.71297,331.39827 484.00371,323.87156 C 482.12141,308.81083 505.53237,308.13423 510.35756,306.92856 z "
-             style="font-size:12px;fill:black;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
-          <path
-             id="path4006"
-             d="M 359.2403,21.362537 C 347.92693,21.362537 336.6347,25.683095 327.96556,34.35223 L 173.87387,188.41466 C 165.37697,196.9114 161.1116,207.95813 160.94269,219.04577 L 160.88418,219.04577 C 160.88418,219.08524 160.94076,219.12322 160.94269,219.16279 C 160.94033,219.34888 160.88418,219.53256 160.88418,219.71865 L 161.14748,219.71865 C 164.0966,230.93917 240.29699,245.24198 248.79866,253.74346 C 261.63771,266.58263 199.5652,276.01151 212.4041,288.85074 C 225.24316,301.68979 289.99433,313.6933 302.8346,326.53254 C 315.67368,339.37161 276.5961,353.04289 289.43532,365.88196 C 302.27439,378.72118 345.40201,362.67257 337.5908,396.16198 C 354.92909,413.50026 391.10302,405.2208 415.32417,387.88252 C 428.16323,375.04345 390.6948,376.17577 403.53397,363.33668 C 416.37304,350.49745 448.78128,350.4282 476.08902,319.71589 C 465.09739,302.62116 429.10801,295.34136 441.94719,282.50217 C 454.78625,269.66311 479.74708,276.18423 533.60644,251.72479 C 559.89837,239.78398 557.72636,230.71459 557.62567,219.71865 C 557.62356,219.48727 557.62567,219.27892 557.62567,219.04577 L 557.56716,219.04577 C 557.3983,207.95812 553.10345,196.9114 544.60673,188.41466 L 390.54428,34.35223 C 381.87515,25.683095 370.55366,21.362537 359.2403,21.362537 z M 357.92378,41.402939 C 362.95327,41.533963 367.01541,45.368018 374.98006,50.530832 L 447.76915,104.50827 C 448.56596,105.02498 449.32484,105.564 450.02187,106.11735 C 450.7189,106.67062 451.3556,107.25745 451.95277,107.84347 C 452.54997,108.42842 453.09281,109.01553 453.59111,109.62808 C 454.08837,110.24052 454.53956,110.86661 454.93688,111.50048 C 455.33532,112.13538 455.69164,112.78029 455.9901,113.43137 C 456.28877,114.08363 456.52291,114.75639 456.7215,115.42078 C 456.92126,116.08419 457.08982,116.73973 457.18961,117.41019 C 457.28949,118.08184 457.33588,118.75535 457.33588,119.42886 L 414.21245,98.598549 L 409.9118,131.16055 L 386.18512,120.04324 L 349.55654,144.50131 L 335.54288,96.1703 L 317.4919,138.4453 L 267.08369,143.47735 L 267.63956,121.03795 C 267.63956,115.64823 296.69685,77.915899 314.39075,68.932902 L 346.77721,45.674327 C 351.55594,42.576634 354.90608,41.324327 357.92378,41.402939 z M 290.92738,261.61333 C 313.87149,267.56365 339.40299,275.37038 359.88393,275.50997 L 360.76161,284.72563 C 343.2235,282.91785 306.11346,274.45012 297.36372,269.98057 L 290.92738,261.61333 z "
-             style="font-size:12px;fill:black;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt" />
-        </g>
+           style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt"
+           d="M 359.2403,21.362537 C 347.92693,21.362537 336.6347,25.683095 327.96556,34.35223 L 173.87387,188.41466 C 165.37697,196.9114 161.1116,207.95813 160.94269,219.04577 L 160.88418,219.04577 C 160.88418,219.08524 160.94076,219.12322 160.94269,219.16279 C 160.94033,219.34888 160.88418,219.53256 160.88418,219.71865 L 161.14748,219.71865 C 164.0966,230.93917 240.29699,245.24198 248.79866,253.74346 C 261.63771,266.58263 199.5652,276.01151 212.4041,288.85074 C 225.24316,301.68979 289.99433,313.6933 302.8346,326.53254 C 315.67368,339.37161 276.5961,353.04289 289.43532,365.88196 C 302.27439,378.72118 345.40201,362.67257 337.5908,396.16198 C 354.92909,413.50026 391.10302,405.2208 415.32417,387.88252 C 428.16323,375.04345 390.6948,376.17577 403.53397,363.33668 C 416.37304,350.49745 448.78128,350.4282 476.08902,319.71589 C 465.09739,302.62116 429.10801,295.34136 441.94719,282.50217 C 454.78625,269.66311 479.74708,276.18423 533.60644,251.72479 C 559.89837,239.78398 557.72636,230.71459 557.62567,219.71865 C 557.62356,219.48727 557.62567,219.27892 557.62567,219.04577 L 557.56716,219.04577 C 557.3983,207.95812 553.10345,196.9114 544.60673,188.41466 L 390.54428,34.35223 C 381.87515,25.683095 370.55366,21.362537 359.2403,21.362537 z M 357.92378,41.402939 C 362.95327,41.533963 367.01541,45.368018 374.98006,50.530832 L 447.76915,104.50827 C 448.56596,105.02498 449.32484,105.564 450.02187,106.11735 C 450.7189,106.67062 451.3556,107.25745 451.95277,107.84347 C 452.54997,108.42842 453.09281,109.01553 453.59111,109.62808 C 454.08837,110.24052 454.53956,110.86661 454.93688,111.50048 C 455.33532,112.13538 455.69164,112.78029 455.9901,113.43137 C 456.28877,114.08363 456.52291,114.75639 456.7215,115.42078 C 456.92126,116.08419 457.08982,116.73973 457.18961,117.41019 C 457.28949,118.08184 457.33588,118.75535 457.33588,119.42886 L 414.21245,98.598549 L 409.9118,131.16055 L 386.18512,120.04324 L 349.55654,144.50131 L 335.54288,96.1703 L 317.4919,138.4453 L 267.08369,143.47735 L 267.63956,121.03795 C 267.63956,115.64823 296.69685,77.915899 314.39075,68.932902 L 346.77721,45.674327 C 351.55594,42.576634 354.90608,41.324327 357.92378,41.402939 z M 290.92738,261.61333 C 313.87149,267.56365 339.40299,275.37038 359.88393,275.50997 L 360.76161,284.72563 C 343.2235,282.91785 306.11346,274.45012 297.36372,269.98057 L 290.92738,261.61333 z "
+           id="path4006" />
       </g>
+    </g>
+    <flowRoot
+       style="font-size:7.19999981px;font-style:italic;font-weight:normal;line-height:150%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       id="flowRoot4797"
+       transform="translate(-184.4496,300.46138)">
+      <flowRegion
+         id="flowRegion4799">
+        <use
+           xlink:href="#d0e15"
+           y="0"
+           x="0"
+           id="use4801"
+           width="744.09448"
+           height="1052.3622" />
+      </flowRegion>
+      <flowDiv
+         xml:space="preserve"
+         id="flowDiv4803">This tutorial covers copy/paste, node editing, freehand and bezier  drawing, path manipulation, booleans, offsets, simplification, and text tool.  </flowDiv>    </flowRoot>
+    <g
+       id="g3978"
+       transform="translate(0,-6.7202624)">
       <path
-         style="opacity:1;color:black;fill:#949494;fill-opacity:0.62420379;fill-rule:nonzero;stroke:#f5f5f5;stroke-width:2.00000119;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.48407647;visibility:visible;display:inline;overflow:visible"
-         d="M 321.13418,252.93485 L 301.65492,272.91019 L 282.14069,292.88554 L 301.6899,312.68597 L 321.2391,332.48641 L 321.20413,312.54604 L 440.07307,312.54604 L 440.07307,272.87522 L 321.16916,272.87522 L 321.13418,272.87522 L 321.13418,252.93485 z "
+         sodipodi:nodetypes="ccccccccc"
+         style="color:#000000;fill:#949494;fill-opacity:0.62420379;fill-rule:nonzero;stroke:#f5f5f5;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.48407647;visibility:visible;display:inline;overflow:visible"
+         d="M 321.13418,233.56827 L 282.14069,261.2464 L 321.2391,288.63935 L 321.20413,277.27453 L 440.07307,277.27453 L 440.07307,244.93309 L 321.16916,244.93309 L 321.13418,244.93309 L 321.13418,233.56827 z "
          id="path4008" />
-      <flowRoot
-         transform="translate(-184.4496,309.2391)"
-         id="flowRoot4797"
-         style="font-size:7.19999981px;font-style:italic;font-weight:normal;line-height:150%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans">
-        <flowRegion
-           id="flowRegion4799">
-          <use
-             height="1052.3622"
-             width="744.09448"
-             id="use4801"
-             x="0"
-             y="0"
-             xlink:href="#d0e15" />
-        </flowRegion>
-        <flowDiv
-           id="flowDiv4803"
-           xml:space="preserve">This tutorial covers copy/paste, node editing, freehand and bezier  drawing, path manipulation, booleans, offsets, simplification, and text tool.  </flowDiv>      </flowRoot>
+      <text
+         xml:space="preserve"
+         style="font-size:15.74776745px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6548);font-family:Lucida Sans"
+         x="346.12503"
+         y="265.71155"
+         id="text6544"
+         sodipodi:linespacing="100%"><tspan
+           sodipodi:role="line"
+           id="tspan6546"
+           x="346.12503"
+           y="265.71155">Inkscape</tspan></text>
+      <text
+         sodipodi:linespacing="100%"
+         id="text3962"
+         y="265.71155"
+         x="346.12503"
+         style="font-size:15.74776745px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Lucida Sans"
+         xml:space="preserve"><tspan
+           y="265.71155"
+           x="346.12503"
+           id="tspan3964"
+           sodipodi:role="line">Inkscape</tspan></text>
+      <rect
+         y="245.66743"
+         x="320.60944"
+         height="30.984045"
+         width="118.35905"
+         id="rect4939"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       id="g3986"
+       transform="translate(0,-2.8801124)">
+      <path
+         id="path4941"
+         d="M 321.13418,369.69575 L 282.14069,397.37388 L 321.2391,424.76683 L 321.20413,413.40201 L 440.07307,413.40201 L 440.07307,381.06057 L 321.16916,381.06057 L 321.13418,381.06057 L 321.13418,369.69575 z "
+         style="opacity:1;color:#000000;fill:#949494;fill-opacity:0.62420379;fill-rule:nonzero;stroke:#f5f5f5;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.48407647;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:nodetypes="ccccccccc" />
+      <text
+         sodipodi:linespacing="100%"
+         id="text6552"
+         y="401.83905"
+         x="346.12503"
+         style="font-size:15.74776745px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6556);font-family:Lucida Sans"
+         xml:space="preserve"><tspan
+           y="401.83905"
+           x="346.12503"
+           id="tspan6554"
+           sodipodi:role="line">Python</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:15.74776745px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Lucida Sans"
+         x="346.12503"
+         y="401.83905"
+         id="text4943"
+         sodipodi:linespacing="100%"><tspan
+           sodipodi:role="line"
+           id="tspan4945"
+           x="346.12503"
+           y="401.83905">Python</tspan></text>
+      <rect
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4947"
+         width="118.35905"
+         height="30.984045"
+         x="320.60944"
+         y="381.79492" />
     </g>
   </g>
 </svg>
diff --git a/packaging/macosx/dmg_set_style.scpt b/packaging/macosx/dmg_set_style.scpt
index e25279d99..dd2572ae0 100755
Binary files a/packaging/macosx/dmg_set_style.scpt and b/packaging/macosx/dmg_set_style.scpt differ
diff --git a/packaging/macosx/inkscape.ds_store b/packaging/macosx/inkscape.ds_store
index 394b40ec6..2b53ff56d 100644
Binary files a/packaging/macosx/inkscape.ds_store and b/packaging/macosx/inkscape.ds_store differ
diff --git a/packaging/macosx/inkscape_python.ds_store b/packaging/macosx/inkscape_python.ds_store
new file mode 100644
index 000000000..005a13587
Binary files /dev/null and b/packaging/macosx/inkscape_python.ds_store differ
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index e8e597c75..cdd4359cc 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -1,19 +1,27 @@
 #! /bin/bash
-# Copyright 2005, Kees Cook <kees@outflux.net>
-# Licensed under GNU General Public License
 #
 # Usage: osx-app [-s] /path/to/bin/inkscape Info.plist
 #
-# This attempts to build an Inkscape.app package for OSX, resolving
-# Dynamic libraries, etc.  Strips the executable and libraries if
+# This script attempts to build an Inkscape.app package for OS X, resolving
+# dynamic libraries, etc.  It strips the executable and libraries if
 # '-s' is given.
 #
+#
+# Authors:
+#    Kees Cook <kees@outflux.net>
+#    Michael Wybrow <mjwybrow@users.sourceforge.net>
+#    Jean-Olivier Irisson <jo.irisson@gmail.com>
+# 
+# Copyright (C) 2005 Kees Cook
+# Copyright (C) 2005-2007 Michael Wybrow
+# Copyright (C) 2007 Jean-Olivier Irisson
+#
+#
+# Released under GNU GPL, read the file 'COPYING' for more information
+#
 # Thanks to GNUnet's "build_app" script for help with library dep resolution.
 # https://gnunet.org/svn/GNUnet/contrib/OSX/build_app
 # 
-# Fixes and modifications to use Gimp.app style launcher:
-#   Michael Wybrow <mjwybrow@users.sourceforge.net>
-#
 #
 # Notes:
 # The Info.plist file can be found in the base inkscape directory once
@@ -24,8 +32,8 @@
 # files inside the app bundle.
 # 
 # Thus, the usual use of this file would be to run it from the within the
-# inkscape/packaging directory, substituting in the inkscape binary path:
-# 	./osx-app.sh /path/to/bin/inkscape ../Info.plist
+# inkscape/packaging/macosx directory, substituting in the inkscape binary path:
+# 	./osx-app.sh /path/to/bin/inkscape ../../Info.plist
 
 
 
@@ -39,7 +47,10 @@ if [ "$VERSION" -ge "4" ]; then
   # libXinerama.1.dylib is not installed as part of X11 on Panther but
   # is introduced as a dependency if Inkscape is compiled on Tiger or
   # later.  Thus, add the library to the bundle for Panther users
-  EXTRALIBS="/usr/X11R6/lib/libXinerama.1.dylib"
+  # Building on Tiger gives app bundles incompatible with Panther anyway
+  # so we do not need to add this now
+  # EXTRALIBS="/usr/X11R6/lib/libXinerama.1.dylib"
+  EXTRALIBS=""
 else
   # Panther (10.3) or earlier.
   XCODEFLAGS="-buildstyle Deployment"
@@ -47,11 +58,12 @@ else
   EXTRALIBS=""
 fi
 
-
-SW="$HOME/ws-fat"
-
-pangover=1.5.0
-gtkver=2.10.0
+# set LIBPREFIX only if it has not been set before 
+# (by osx-build.sh for example)
+if [ -z $LIBPREFIX ]
+then
+	export LIBPREFIX="$HOME/ws-fat"
+fi
 
 
 # Package always has the same name.  Version information is stored in
@@ -81,6 +93,7 @@ if [ ! -f "$plist" ]; then
 fi
 shift
 
+# Set the 'macosx' directory, usually the current directory.
 resdir=`pwd`
 
 # Fix a given executable or library to be relocatable
@@ -146,9 +159,9 @@ echo "APPLInks" > $package/Contents/PkgInfo
 # Pull in extra requirements.
 pkgetc="$package/Contents/Resources/etc"
 mkdir -p $pkgetc/pango
-cp $SW/etc/pango/pangox.aliases $pkgetc/pango/
+cp $LIBPREFIX/etc/pango/pangox.aliases $pkgetc/pango/
 # Need to adjust path and quote incase of spaces in path.
-sed -e "s,$SW,\"\${CWD},g" -e 's,\.so ,.so" ,g' $SW/etc/pango/pango.modules > $pkgetc/pango/pango.modules
+sed -e "s,$LIBPREFIX,\"\${CWD},g" -e 's,\.so ,.so" ,g' $LIBPREFIX/etc/pango/pango.modules > $pkgetc/pango/pango.modules
 cat > $pkgetc/pango/pangorc <<END_PANGO
 [Pango]
 ModuleFiles=\${HOME}/.inkscape-etc/pango.modules
@@ -158,40 +171,42 @@ END_PANGO
 
 # We use a modified fonts.conf file so only need the dtd
 mkdir -p $pkgetc/fonts
-cp $SW/etc/fonts/fonts.dtd $pkgetc/fonts/
-cp -r $SW/etc/fonts/conf.avail $pkgetc/fonts/
-cp -r $SW/etc/fonts/conf.d $pkgetc/fonts/
+cp $LIBPREFIX/etc/fonts/fonts.dtd $pkgetc/fonts/
+cp -r $LIBPREFIX/etc/fonts/conf.avail $pkgetc/fonts/
+cp -r $LIBPREFIX/etc/fonts/conf.d $pkgetc/fonts/
 
 mkdir -p $pkgetc/gtk-2.0
-sed -e "s,$SW,\${CWD},g" $SW/etc/gtk-2.0/gdk-pixbuf.loaders > $pkgetc/gtk-2.0/gdk-pixbuf.loaders
-sed -e "s,$SW,\${CWD},g" $SW/etc/gtk-2.0/gtk.immodules > $pkgetc/gtk-2.0/gtk.immodules
+sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/etc/gtk-2.0/gdk-pixbuf.loaders > $pkgetc/gtk-2.0/gdk-pixbuf.loaders
+sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/etc/gtk-2.0/gtk.immodules > $pkgetc/gtk-2.0/gtk.immodules
 
 for item in gnome-vfs-mime-magic gnome-vfs-2.0
 do
-  cp -r $SW/etc/$item $pkgetc/
+  cp -r $LIBPREFIX/etc/$item $pkgetc/
 done
 
 
 pkglib="$package/Contents/Resources/lib"
+pangover=`ls $LIBPREFIX/lib/pango/`
 mkdir -p $pkglib/pango/$pangover/modules
-cp $SW/lib/pango/$pangover/modules/*.so $pkglib/pango/$pangover/modules/
-
+cp $LIBPREFIX/lib/pango/$pangover/modules/*.so $pkglib/pango/$pangover/modules/
 
+gtkver=`ls $LIBPREFIX/lib/gtk-2.0/ | grep "2\."`
 mkdir -p $pkglib/gtk-2.0/$gtkver/{engines,immodules,loaders}
-cp -r $SW/lib/gtk-2.0/$gtkver/engines/* $pkglib/gtk-2.0/$gtkver/engines/
-cp $SW/lib/gtk-2.0/$gtkver/immodules/*.so $pkglib/gtk-2.0/$gtkver/immodules/
-cp $SW/lib/gtk-2.0/$gtkver/loaders/*.so $pkglib/gtk-2.0/$gtkver/loaders/
+cp -r $LIBPREFIX/lib/gtk-2.0/$gtkver/engines/* $pkglib/gtk-2.0/$gtkver/engines/
+cp $LIBPREFIX/lib/gtk-2.0/$gtkver/immodules/*.so $pkglib/gtk-2.0/$gtkver/immodules/
+cp $LIBPREFIX/lib/gtk-2.0/$gtkver/loaders/*.so $pkglib/gtk-2.0/$gtkver/loaders/
 
 mkdir -p $pkglib/gnome-vfs-2.0/modules
-cp $SW/lib/gnome-vfs-2.0/modules/*.so $pkglib/gnome-vfs-2.0/modules/
+cp $LIBPREFIX/lib/gnome-vfs-2.0/modules/*.so $pkglib/gnome-vfs-2.0/modules/
 
-# Find out libs we need from fink (e.g. $SW) - loop until no changes
+# Find out libs we need from fink, darwinports, or from a custom install
+# (e.g. $LIBPREFIX), then loop until no changes.
 a=1
 nfiles=0
 endl=true
 while $endl; do
   echo "Looking for dependencies. Round " $a
-  libs="`otool -L $pkglib/gtk-2.0/$gtkver/loaders/* $pkglib/gtk-2.0/$gtkver/immodules/* $pkglib/gtk-2.0/$gtkver/engines/*.so $pkglib/pango/$pangover/modules/* $pkglib/gnome-vfs-2.0/modules/* $package/Contents/Resources/lib/* $binary 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $SW | sort | uniq`"
+  libs="`otool -L $pkglib/gtk-2.0/$gtkver/loaders/* $pkglib/gtk-2.0/$gtkver/immodules/* $pkglib/gtk-2.0/$gtkver/engines/*.so $pkglib/pango/$pangover/modules/* $pkglib/gnome-vfs-2.0/modules/* $package/Contents/Resources/lib/* $binary 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq`"
   cp -f $libs $package/Contents/Resources/lib
   let "a+=1"  
   nnfiles=`ls $package/Contents/Resources/lib | wc -l`
@@ -230,7 +245,6 @@ fi
 # Get all the icons and the rest of the script framework
 rsync -av $resdir/Resources/* $package/Contents/Resources/
 
-
 # Make an image
 #/usr/bin/hdiutil create -srcfolder "$pkg.app" "$pkg.dmg"
-./osx-dmg.sh
+# ./osx-dmg.sh
diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh
new file mode 100755
index 000000000..dcbb654db
--- /dev/null
+++ b/packaging/macosx/osx-build.sh
@@ -0,0 +1,231 @@
+#!/bin/bash
+#
+#  Inkscape compilation and packaging script for Mac OS X
+#
+# Please see
+#  http://wiki.inkscape.org/wiki/index.php?title=CompilingMacOsX
+# for more complete information
+#
+# Author:
+#	Jean-Olivier Irisson <jo.irisson@gmail.com>
+# with information from
+#	Kees Cook
+#	Michael Wybrow
+#
+# Copyright 2006
+# Licensed under GNU General Public License
+#
+
+############################################################
+
+# User modifiable parameters
+#----------------------------------------------------------
+#	Configure flags
+CONFFLAGS="--disable-static --enable-shared --enable-osxapp"
+# Libraries prefix
+LIBPREFIX="/opt/local"
+
+############################################################
+
+# Help message
+#----------------------------------------------------------
+help()
+{
+
+echo -e "
+Compilation script for Inkscape on Mac OS X.
+
+\033[1mUSAGE\033[0m
+  $0 [options] action[s]
+
+\033[1mACTIONS & OPTIONS\033[0m
+  \033[1mh,help\033[0m	
+    display this help message
+  \033[1mu,up,update\033[0m
+    update an existing checkout from svn (run svn up)
+  \033[1ma,auto,autogen\033[0m
+    prepare configure script (run autogen.sh). This is only necessary
+    for a fresh svn checkout or after make distclean.
+  \033[1mc,conf,configure\033[0m
+    configure the build (run configure). Edit your configuration
+    options in $0
+    \033[1m-p,--prefix\033[0m	specify install prefix (configure step only)
+  \033[1mb,build\033[0m
+    build Inkscape (run make)
+  \033[1mi,install\033[0m
+    install the build products locally, inside the source
+    directory (run make install)
+  \033[1mp,pack,package\033[0m
+    package Inkscape in a double clickable .app bundle and
+    store it in a .dmg image for distribution
+    \033[1m-s,--strip\033[0m	remove debugging information in Inkscape package
+    \033[1m-py,--with-python\033[0m	specify python packages path for inclusion into the dmg image
+	
+\033[1mEXAMPLES\033[0m
+  \033[1m$0 conf build install\033[0m
+    configure, build and install a dowloaded version of Inkscape in the default
+    directory, keeping debugging information.	
+  \033[1m$0 -p ~ -s -py ~/pyxml/ u a c b i p\033[0m
+    update an svn checkout, prepare configure script, configure,
+    build and install Inkscape in the user home directory. 	
+    Then package Inkscape withouth debugging information,
+    with python packages from ~/pyxml/ and prepare it for   
+    distribution."
+}
+
+# Parameters
+#----------------------------------------------------------
+# Paths
+HERE=`pwd`
+SRCROOT=$HERE/../..		# we are currently in packaging/macosx
+
+# Defaults
+INSTALLPREFIX=$SRCROOT/Build/
+SVNUPDATE="f"
+AUTOGEN="f"
+CONFIGURE="f"
+BUILD="f"
+INSTALL="f"
+PACKAGE="f"
+
+STRIP="f"
+PYTHON="f"
+
+# Parse command line options
+#----------------------------------------------------------
+while [ "$1" != "" ]
+do
+	case $1 in
+	  	h|help)
+	   	help 
+			exit 1 ;;
+   	u|up|update)
+      	SVNUPDATE="t" ;;
+   	a|auto|autogen)
+      	AUTOGEN="t" ;;
+	  	c|conf|configure)
+      	CONFIGURE="t" ;;
+	  	b|build)
+      	BUILD="t" ;;
+	  	i|install)
+      	INSTALL="t" ;;
+	  	p|pack|package)
+      	PACKAGE="t" ;;
+	  	# -p|--prefix)
+	  	# 	      INSTALLPREFIX=$2
+	  	# 	 		shift 1 ;;
+	  	-s|-strip)
+	     	STRIP="t" ;;
+	  	-py|--with-python)
+      	PYTHON="t" 
+			PYTHONDIR=$2
+			shift 1 ;;
+	esac
+   shift 1
+done
+
+
+# Set environment variables
+# ----------------------------------------------------------
+export LIBPREFIX
+
+# Specific environment variables
+#  automake seach path
+export CPATH="$LIBPREFIX/include"
+#  configure search path
+export CPPFLAGS="-I$LIBPREFIX/include"
+export LDFLAGS="-L$LIBPREFIX/lib"
+#  compiler arguments
+export CFLAGS="-O3 -Wall"
+export CXXFLAGS="$CFLAGS"
+# add X11 executables and libraries [does not seem to be required now]
+# export PATH="/usr/X11R6/bin:$PATH"
+# export LIBRARY_PATH="/usr/X11R6/lib:$LIBPREFIX/lib"
+# pkgconfig path [does not seem to be required either]
+# export PKG_CONFIG_PATH="$LIBPREFIX/lib/pkgconfig"
+
+
+# Actions
+# ----------------------------------------------------------
+if [[ "$SVNUPDATE" == "t" ]]
+then
+	cd $SRCROOT
+	svn up
+	cd $HERE
+fi
+
+if [[ "$AUTOGEN" == "t" ]]
+then
+	cd $SRCROOT
+	./autogen.sh
+	cd $HERE
+fi
+
+if [[ "$CONFIGURE" == "t" ]]
+then
+	ALLCONFFLAGS=`echo "$CONFFLAGS --prefix=$INSTALLPREFIX"`
+	cd $SRCROOT
+	./configure $ALLCONFFLAGS
+	cd $HERE
+fi
+
+if [[ "$BUILD" == "t" ]]
+then
+	cd $SRCROOT
+	make
+	cd $HERE
+fi
+
+if [[ "$INSTALL" == "t" ]] 
+then
+	cd $SRCROOT
+	make install
+	cd $HERE
+fi
+
+if [[ "$PACKAGE" == "t" ]]; then
+	if [[ "$STRIP" == "t" ]]; then
+		STRIPPARAM="-s"
+	else
+		STRIPPARAM=""
+	fi
+	./osx-app.sh $STRIPPARAM $INSTALLPREFIX/bin/inkscape $SRCROOT/Info.plist
+
+	if [[ "PYTHON" == "t" ]]; then
+		./osx-dmg.sh -py "$PYTHONDIR"
+	else
+		./osx-dmg.sh
+	fi
+
+	DATE=`date "+%Y%m%d"`
+	mv Inkscape.dmg Inkscape_$DATE.dmg
+	
+	# Prepare information file
+	INFOFILE=Inkscape_$DATE-info.txt
+	echo "Version information on $DATE for `whoami`:
+	OS X      `/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \:`
+	DarwinPorts  `port version | cut -f2 -d \ `
+	GCC          `gcc --version | grep GCC`
+	GTK          `pkg-config --modversion gtk+-2.0`
+	GTKmm        `pkg-config --modversion gtkmm-2.4`
+	Cairo        `pkg-config --modversion cairo`
+	Cairomm      `pkg-config --modversion cairomm-1.0`
+	CairoPDF     `pkg-config --modversion cairo-pdf`
+	Pango        `pkg-config --modversion pango`
+Configure options:
+	$CONFFLAGS" > $INFOFILE
+
+	if [[ "$STRIP" == "t" ]]; then
+		echo "Debug info
+	no" >> $INFOFILE
+	else
+		echo "Debug info
+	yes" >> $INFOFILE
+	fi
+	
+	# open a Finder window here
+	open .
+fi
+
+exit 0
+
diff --git a/packaging/macosx/osx-dmg.sh b/packaging/macosx/osx-dmg.sh
index b89a0fc91..d1645344d 100755
--- a/packaging/macosx/osx-dmg.sh
+++ b/packaging/macosx/osx-dmg.sh
@@ -3,8 +3,9 @@
 # Inkscape packaging script for Mac OS X
 #
 # The script creates a read-write disk image, 
-# copies Inkscape in it, customizes its appearance using a 
-# previously created .DS_Store file (inkscape.ds_store),
+# copies Inkscape in it, copies additional python packages
+# if needed, customizes its appearance using a 
+# previously created .DS_Store file (inkscape*.ds_store),
 # and then compresses the disk image for distribution.
 #
 # Authors:
@@ -25,16 +26,35 @@
 #
 # Run this script with the '-s' option.  It will apply the
 # 'dmg_set_style.scpt' AppleScript file, and then prompt the
-# user to check the window size # and position before writing
+# user to check the window size and position before writing
 # a new 'inkscape.ds_store' file to work around a bug in Finder
 # and AppleScript.  The updated 'inkscape.ds_store' will need 
 # to be commited to the repository when this is done.
 #
 
+# Defaults
 set_ds_store=false
-if [ "$1" = "-s" ]; then
-	set_ds_store=true
-	shift
+add_python=false
+ds_store_file="inkscape.ds_store"
+
+# Parse command line arguments
+while [ "$1" != "" ]
+do
+	case $1 in
+	  	-s)
+			set_ds_store=true ;;
+   		-py|--with-python)
+			add_python=true 
+			python_dir=$2 
+			ds_store_file="inkscape_python.ds_store"
+			shift 1 ;;
+	esac
+	shift 1
+done
+# some checks
+if [ ! -e $python_dir ]; then
+	echo "Cannot find your python packages directory"
+	exit 1
 fi
 
 RWNAME="RWinkscape.dmg"
@@ -48,11 +68,18 @@ mkdir "$TMPDIR"
 
 echo "Copying files to temp directory..."
 # Copy Inkscape.app folder.
-cp -rf ../Inkscape.app "$TMPDIR"/
+cp -rf Inkscape.app "$TMPDIR"/
 
 # link to Applications in order to drag and drop inkscape onto it.
 ln -sf /Applications "$TMPDIR"/
 	
+if [ ${add_python} = "true" ]; then
+	# Copy python libraries
+	cp -rf $python_dir/* "$TMPDIR"/
+	# link python environment in order to drag and drop inkscape onto it
+	ln -sf /Library/Python/2.3/site-packages "$TMPDIR"/Python\ site-packages
+fi
+
 # Copy a background image inside a hidden directory so the image
 # file itself won't be shown.
 mkdir "$TMPDIR/.background"
@@ -62,9 +89,9 @@ AUTOOPENOPT=
 if [ ${set_ds_store} = "false" ]; then
 	# Copy the .DS_Store file which contains information about
 	# window size, appearance, etc.  Most of this can be set
-	# with Apple script but involves # user intervention so we
+	# with Apple script but involves user intervention so we
 	# just keep a copy of the correct settings and use that instead.
-	cp inkscape.ds_store "$TMPDIR/.DS_Store"
+	cp $ds_store_file "$TMPDIR/.DS_Store"
 	AUTOOPENOPT=-noautoopen
 fi
 
@@ -105,8 +132,9 @@ if [ ${set_ds_store} = "true" ]; then
 	AUTOOPENOPT=-noautoopen
 	DEV_NAME=`/usr/bin/hdiutil attach -readwrite -noverify $AUTOOPENOPT  "$RWNAME" | egrep '^/dev/' | sed 1q | awk '{print $1}'`
 	echo
-	echo "New inkscape.ds_store file written."
-	cp /Volumes/$VOLNAME/.DS_Store ./inkscape.ds_store
+	echo "New $ds_store_file file written."
+	cp /Volumes/$VOLNAME/.DS_Store ./$ds_store_file
+	SetFile -a v ./$ds_store_file
 
 	# Unmount the disk image.
 	hdiutil detach "$DEV_NAME"
@@ -119,7 +147,6 @@ fi
 hdiutil detach "$DEV_NAME"
 
 # Create the offical release image by compressing the RW one.
-DATE=`date "+%Y%m%d"`
-/usr/bin/hdiutil convert "$RWNAME" -format UDZO -imagekey zlib-level=9 -o "../Inkscape_$DATE.dmg"
+/usr/bin/hdiutil convert "$RWNAME" -format UDZO -imagekey zlib-level=9 -o "Inkscape.dmg"
 rm -f "$RWNAME"