From 3464166b849338f928bd684e572aa8729d759d86 Mon Sep 17 00:00:00 2001
From: MaZderMind <git@mazdermind.de>
Date: Mon, 20 Jun 2016 16:47:58 +0200
Subject: [PATCH] homogenize filters and fading across files

---
 fossgis16/__init__.py       |  10 +--
 fossgis16/artwork/intro.svg | 146 ++++++++++--------------------------
 fossgis16/artwork/outro.svg |  27 +++----
 fossgis16/artwork/pause.svg |  31 --------
 4 files changed, 59 insertions(+), 155 deletions(-)

diff --git a/fossgis16/__init__.py b/fossgis16/__init__.py
index aed9181..ba886d1 100644
--- a/fossgis16/__init__.py
+++ b/fossgis16/__init__.py
@@ -47,9 +47,9 @@ def introFrames(params):
 	frames = 2*fps
 	for i in range(0, frames):
 		yield (
-			('box',   'style', 'opacity', "%.4f" % easeOutCubic(i, 0, 1, frames)),
+			('box-und-text1',   'style', 'opacity', "%.4f" % easeOutCubic(i, 0, 1, frames)),
 			('url',   'style', 'opacity', "%.4f" % easeOutCubic(i, 0, 1, frames)),
-			('text1', 'style', 'opacity', "%.4f" % easeOutCubic(i, 0, 1, frames)),
+			('text1', 'style', 'opacity', "%.4f" % 1),
 			('text2', 'style', 'opacity', 0)
 		)
 
@@ -57,7 +57,7 @@ def introFrames(params):
 	frames = 1*fps
 	for i in range(0, frames):
 		yield (
-			('box',   'style', 'opacity', 1),
+			('box-und-text1',   'style', 'opacity', 1),
 			('url',   'style', 'opacity', 1),
 			('text1', 'style', 'opacity', "%.4f" % (1-(float(i)/frames))),
 			('text2', 'style', 'opacity', 0)
@@ -67,7 +67,7 @@ def introFrames(params):
 	frames = 2*fps
 	for i in range(0, frames):
 		yield (
-			('box',   'style', 'opacity', 1),
+			('box-und-text1',   'style', 'opacity', 1),
 			('url',   'style', 'opacity', 1),
 			('text1', 'style', 'opacity', 0),
 			('text2', 'style', 'opacity', "%.4f" % easeOutCubic(i, 0, 1, frames))
@@ -77,7 +77,7 @@ def introFrames(params):
 	frames = 2*fps
 	for i in range(0, frames):
 		yield (
-			('box',   'style', 'opacity', 1),
+			('box-und-text1',   'style', 'opacity', 1),
 			('url',   'style', 'opacity', 1),
 			('text1', 'style', 'opacity', 0),
 			('text2', 'style', 'opacity', 1)
diff --git a/fossgis16/artwork/intro.svg b/fossgis16/artwork/intro.svg
index b0a44e2..9014ed5 100644
--- a/fossgis16/artwork/intro.svg
+++ b/fossgis16/artwork/intro.svg
@@ -20,7 +20,7 @@
      id="defs20">
     <filter
        id="filter3772"
-       style="color-interpolation-filters:sRGB"
+       style="color-interpolation-filters:sRGB;"
        inkscape:label="Drop Shadow">
       <feFlood
          id="feFlood3774"
@@ -35,6 +35,7 @@
          result="composite1" />
       <feGaussianBlur
          id="feGaussianBlur3778"
+         in="composite"
          stdDeviation="3"
          result="blur" />
       <feOffset
@@ -49,68 +50,6 @@
          operator="over"
          result="composite2" />
     </filter>
-    <filter
-       id="filter3772-5"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         id="feFlood3774-9"
-         flood-opacity="0.5"
-         flood-color="rgb(255,255,255)"
-         result="flood" />
-      <feComposite
-         id="feComposite3776-9"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur3778-3"
-         stdDeviation="3"
-         result="blur" />
-      <feOffset
-         id="feOffset3780-4"
-         dx="1"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite3782-9"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter3772-3"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         id="feFlood3774-94"
-         flood-opacity="0.5"
-         flood-color="rgb(255,255,255)"
-         result="flood" />
-      <feComposite
-         id="feComposite3776-2"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur3778-5"
-         stdDeviation="3"
-         result="blur" />
-      <feOffset
-         id="feOffset3780-9"
-         dx="1"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite3782-4"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -119,9 +58,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="1824.4707"
-     inkscape:cy="-45.447147"
+     inkscape:zoom="0.70000001"
+     inkscape:cx="908.42612"
+     inkscape:cy="173.47986"
      inkscape:document-units="px"
      inkscape:current-layer="layer_background"
      showgrid="false"
@@ -188,19 +127,19 @@
       <image
          sodipodi:absref="/home/peter/VOC/intro-outro-generator/fossgis16/artwork/P1000778-gaussblur-75.JPG"
          xlink:href="P1000778-gaussblur-75.JPG"
-         width="1920"
-         height="1440"
-         id="image_background"
+         y="-1135.3215"
          x="162.78572"
-         y="-1135.3215" />
+         id="image_background"
+         height="1440"
+         width="1920" />
       <image
          sodipodi:absref="/home/peter/VOC/intro-outro-generator/fossgis16/artwork/logo_ohne_rand.png"
          xlink:href="logo_ohne_rand.png"
-         width="249"
-         height="249"
-         id="image_logo"
+         y="-743.32147"
          x="1801.7858"
-         y="-743.32147" />
+         id="image_logo"
+         height="249"
+         width="249" />
     </g>
     <text
        xml:space="preserve"
@@ -215,22 +154,18 @@
          id="url"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16px;line-height:80.00000119%;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';text-align:end;text-anchor:end;fill:#f2f4f5;fill-opacity:1;stroke:none">frab.fossgis-konferenz.de/de/2016/public/events/$id</tspan></text>
     <g
-       id="g4177"
-       transform="matrix(1.3478261,0,0,1.3478261,0,-350.26087)">
-      <g
-         transform="scale(1.875,1)"
-         id="box"
-         style="opacity:1">
-        <rect
-           id="rect_banderole_1"
-           width="759.74194"
-           height="230"
-           x="0"
-           y="777"
-           ry="0.0062701544"
-           style="fill:#ffffff;fill-opacity:0.50196078" />
-      </g>
+       id="box-und-text1"
+       inkscape:label="#g4270">
+      <rect
+         style="fill:#ffffff;fill-opacity:0.50196078"
+         ry="0.0084510781"
+         y="697"
+         x="0"
+         height="310"
+         width="1920"
+         id="rect_banderole_1" />
       <g
+         transform="matrix(1.3478261,0,0,1.3478261,0,-350.26087)"
          style="opacity:0.25"
          id="text1">
         <text
@@ -268,21 +203,20 @@
              id="tspan2998-1"
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:48px;line-height:80.00000119%;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:#f2f4f5;fill-opacity:1;stroke:none">2016</tspan></text>
       </g>
-      <flowRoot
-         inkscape:label="#text2"
-         transform="translate(31.857143,489.71429)"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-         id="text2"
-         xml:space="preserve"><flowRegion
-           id="flowRegion3041"><rect
-             y="318.14285"
-             x="46.42857"
-             height="184.0062"
-             width="1322.4885"
-             id="rect3043" /></flowRegion><flowPara
-           id="flowPara3025"
-           style="font-weight:bold;font-size:48px;line-height:89.99999762%;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:#7b9199;fill-opacity:1">$personnames</flowPara><flowPara
-           style="font-weight:bold;font-size:48px;line-height:89.99999762%;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:#f2f4f5;fill-opacity:1"
-           id="flowPara3048">$title</flowPara></flowRoot>    </g>
-  </g>
+    </g>
+    <flowRoot
+       xml:space="preserve"
+       id="text2"
+       style="font-style:normal;font-weight:normal;font-size:53.91304398px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:label="#text2"><flowRegion
+         id="flowRegion3041"><rect
+           id="rect3043"
+           width="1782.4845"
+           height="248.00835"
+           x="105.51553"
+           y="738.59009" /></flowRegion><flowPara
+         style="font-weight:bold;font-size:64.69565582px;line-height:89.99999762%;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:#7b9199;fill-opacity:1;filter:url(#filter3772)"
+         id="flowPara3025">$personnames</flowPara><flowPara
+         id="flowPara3048"
+         style="font-weight:bold;font-size:64.69565582px;line-height:89.99999762%;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:#f2f4f5;fill-opacity:1">$title</flowPara></flowRoot>  </g>
 </svg>
diff --git a/fossgis16/artwork/outro.svg b/fossgis16/artwork/outro.svg
index d2ba4d3..b19a84f 100644
--- a/fossgis16/artwork/outro.svg
+++ b/fossgis16/artwork/outro.svg
@@ -89,9 +89,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="1807.7317"
-     inkscape:cy="178.89877"
+     inkscape:zoom="0.35"
+     inkscape:cx="180.46983"
+     inkscape:cy="-63.258514"
      inkscape:document-units="px"
      inkscape:current-layer="layer_background"
      showgrid="false"
@@ -162,19 +162,19 @@
       <image
          sodipodi:absref="/home/peter/VOC/intro-outro-generator/fossgis16/artwork/P1000778-gaussblur-75.JPG"
          xlink:href="P1000778-gaussblur-75.JPG"
-         y="-1135.3215"
-         x="162.78572"
-         id="image_background"
+         width="1920"
          height="1440"
-         width="1920" />
+         id="image_background"
+         x="162.78572"
+         y="-1135.3215" />
       <image
          sodipodi:absref="/home/peter/VOC/intro-outro-generator/fossgis16/artwork/logo_ohne_rand.png"
          xlink:href="logo_ohne_rand.png"
-         y="-743.32147"
-         x="1801.7858"
-         id="image_logo"
+         width="249"
          height="249"
-         width="249" />
+         id="image_logo"
+         x="1801.7858"
+         y="-743.32147" />
     </g>
     <g
        style="opacity:1"
@@ -235,10 +235,11 @@
     </g>
     <g
        transform="matrix(1.9786883,0,0,1.9784667,1294.4604,1263.9383)"
-       id="g287"
+       id="license"
        inkscape:export-filename="/mnt/hgfs/Bov/Documents/Work/2007/cc/identity/srr buttons/big/by-sa.png"
        inkscape:export-xdpi="300.23013"
-       inkscape:export-ydpi="300.23013">
+       inkscape:export-ydpi="300.23013"
+       inkscape:label="#g287">
       <path
          inkscape:connector-curvature="0"
          id="path3817_2_"
diff --git a/fossgis16/artwork/pause.svg b/fossgis16/artwork/pause.svg
index 8a5830a..87bbed0 100644
--- a/fossgis16/artwork/pause.svg
+++ b/fossgis16/artwork/pause.svg
@@ -50,37 +50,6 @@
          operator="over"
          result="composite2" />
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter3772-5"
-       inkscape:label="Drop Shadow">
-      <feFlood
-         id="feFlood3774-9"
-         flood-opacity="0.5"
-         flood-color="rgb(255,255,255)"
-         result="flood" />
-      <feComposite
-         id="feComposite3776-9"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur3778-3"
-         stdDeviation="3"
-         result="blur" />
-      <feOffset
-         id="feOffset3780-4"
-         dx="1"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite3782-9"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"