Make watermark consistently translucent Use fill for dung outline Fix text locations

5 files changed, 42 insertions, 55 deletions

diff --git a/doc/tutorial/slides/cairo-code.svg b/doc/tutorial/slides/cairo-code.svg
index dc5fa9538..09e26bf3a 100644
--- a/doc/tutorial/slides/cairo-code.svg
+++ b/doc/tutorial/slides/cairo-code.svg
@@ -869,7 +869,7 @@ C 42.942871662459936,	-24.939379331448624,
 	</defs>
 
   <g id="watermark" transform="translate(200, 185), rotate(-50), scale(2.5)">
-    <use xlink:href="#scarab" x="0" y="170" fill-opacity="0.08"/>
+    <use xlink:href="#scarab" x="0" y="170" fill-opacity="0.2"/>
   </g>
 
 
@@ -903,7 +903,7 @@ C 42.942871662459936,	-24.939379331448624,
     <g ss:region="default" font-family="Mono">
       <rect x="112" y="170" width="800" height="480" fill="none" stroke="blue"/>
       <text font-size="20" fill="black"
-	    x="112" y="203">Slide content</text>
+	    x="112" y="190">Slide content</text>
     </g>
     
     <!-- Footer -->
diff --git a/doc/tutorial/slides/cairo-large-content.svg b/doc/tutorial/slides/cairo-large-content.svg
index 62d54a4ab..5acf4c937 100644
--- a/doc/tutorial/slides/cairo-large-content.svg
+++ b/doc/tutorial/slides/cairo-large-content.svg
@@ -869,7 +869,7 @@ C 42.942871662459936,	-24.939379331448624,
 	</defs>
 
   <g id="watermark" transform="translate(200, 185), rotate(-50), scale(2.5)">
-    <use xlink:href="#scarab" x="0" y="170" fill-opacity="0.08"/>
+    <use xlink:href="#scarab" x="0" y="170" fill-opacity="0.2"/>
   </g>
 
   <!-- Blue bar at top of slide -->
diff --git a/doc/tutorial/slides/cairo-separator.svg b/doc/tutorial/slides/cairo-separator.svg
index 9b8185b82..8d2c8406d 100644
--- a/doc/tutorial/slides/cairo-separator.svg
+++ b/doc/tutorial/slides/cairo-separator.svg
@@ -869,7 +869,7 @@ C 42.942871662459936,	-24.939379331448624,
 	</defs>
 
   <g id="watermark" transform="translate(200, 185), rotate(-50), scale(2.5)">
-    <use xlink:href="#scarab" x="0" y="170" fill-opacity="0.08"/>
+    <use xlink:href="#scarab" x="0" y="170" fill-opacity="0.2"/>
   </g>
 
   <!-- Blue bar at top of slide -->
@@ -897,9 +897,9 @@ C 42.942871662459936,	-24.939379331448624,
     
     <!-- Slide content -->
     <g ss:region="default">
-      <rect x="112" y="400" width="800" height="280" fill="none" stroke="blue"/>
-      <text font-size="50" fill="black"
-	    x="112" y="232">Slide content</text>
+      <rect x="512" y="400" width="2" height="280" fill="none" stroke="blue"/>
+      <text font-size="50" fill="black" text-anchor="middle"
+	    x="512" y="450">Slide content</text>
     </g>
     
     <!-- Footer -->
diff --git a/doc/tutorial/slides/cairo-title.svg b/doc/tutorial/slides/cairo-title.svg
index a4afc1964..31b14f83b 100644
--- a/doc/tutorial/slides/cairo-title.svg
+++ b/doc/tutorial/slides/cairo-title.svg
@@ -887,9 +887,9 @@ stroke-width="0.2">
     </g>
   
     <g ss:region="default" text-anchor="middle">
-      <rect x="690" y="270" width="2" height="350" fill="none" stroke="blue"/>
+      <rect x="683" y="270" width="2" height="350" fill="none" stroke="blue"/>
       <text font-size="40" fill="black"
-	    x="690" y="310">Slide content</text>
+	    x="683" y="310">Slide content</text>
     </g>
   </g>
 
diff --git a/doc/tutorial/slides/cairo.svg b/doc/tutorial/slides/cairo.svg
index b1691ea98..3d96abc53 100644
--- a/doc/tutorial/slides/cairo.svg
+++ b/doc/tutorial/slides/cairo.svg
@@ -36,7 +36,7 @@
 				<circle cx="2"  cy="2"  r="0.7" />
 			</g>
 		</g>
-		<g id="scarab" fill="#f19a14">
+		<g id="scarab" fill="#f19a14" stroke="none">
 			<g transform="translate(-150, -170)">
 			<path id="scarab_head" d="M205.599,94.567c0-11.668-24.914-21.129-55.628-21.129
 				c-30.723,0-55.624,9.46-55.624,21.129c0,10.203,24.901,7.346,55.624,7.346C180.685,101.913,205.599,104.233,205.599,94.567z"/>
@@ -107,55 +107,42 @@
 			<use xlink:href="#hacker_emblem" x="0" y="0" transform="scale(9)" />
 		</g>
 		<g id="dung_2_color">
-			<!-- This would be simple a circle like so:
-				<circle cx="0" cy="0" r="48" stroke-width="2" fill="none" stroke="white"/>
-			     but there appears to currently be a bug in the cairo
-			     PDF backend that results in an ugly spike in that
-			     case. So we use 8 splines instead.
-			-->
-			<path stroke-width="4" stroke="white" fill="none" d="
-M 48,			0
-C 48,			12.730391512298112, 
-  42.94287166245995,	24.939379331448613
-  33.941125496954285,	33.941125496954278
-C 24.939379331448624,	42.942871662459943
-  12.730391512298114,	48
-  0,			48
-C -12.730391512298109,	48, 
-  -24.939379331448613,	42.94287166245995
-  -33.941125496954278,	33.941125496954285
-C -42.942871662459943,	24.939379331448624,
-  -48,			12.730391512298118,
-  -48,			0,
-C -48,			-12.730391512298105, 
-  -42.94287166245995,	-24.939379331448613,
-  -33.941125496954285,	-33.941125496954278
-C -24.939379331448624,	-42.942871662459943,
-  -12.730391512298119,	-48, 
-  0,			-48
-C 12.730391512298104,	-48, 
-  24.939379331448606,	-42.942871662459943,
-  33.941125496954271,	-33.941125496954285
-C 42.942871662459936,	-24.939379331448624,
-  48,			-12.730391512298123,
-  48,			0" />
-			<g transform="scale(9)" fill="white" stroke="none" stroke-width="0.22222">
-			  	<!-- Hacker emblem grid -->
-				<!--
-				<path stroke="white" fill="none"
+			<path stroke="none" d="
+M -46,			0
+A 46,			46,
+  0,
+  0, 1,
+  46,			0
+A 46,			46,
+  0,
+  0, 1,
+  -46,			0
+M -50,			0
+A 50,			50,
+  0,
+  0, 0,
+  50,			0
+A 50,			50,
+  0,
+  0, 0,
+  -50,			0
+Z" />
+			<g transform="scale(9)">
+				<!-- Hacker emblem grid -->
+				<path fill="none" stroke-width="0.2"
 				      d="M -3,-3 L  3,-3 L 3,3 L-3,3 Z
 					 M -1,-3 L -1, 3
 					 M  1,-3 L  1, 3
 					 M -3,-1 L  3,-1
 					 M -3, 1 L  3, 1"/>
-					 -->
-
-			  	<!-- Hacker emblem dots -->
-				<circle cx="0"  cy="-2" r="0.7" />
-				<circle cx="2"  cy="0"  r="0.7" />
-				<circle cx="-2" cy="2"  r="0.7" />
-				<circle cx="0"  cy="2"  r="0.7" />
-				<circle cx="2"  cy="2"  r="0.7" />
+				<g stroke="none">
+					<!-- Hacker emblem dots -->
+					<circle cx="0"  cy="-2" r="0.7" />
+					<circle cx="2"  cy="0"  r="0.7" />
+					<circle cx="-2" cy="2"  r="0.7" />
+					<circle cx="0"  cy="2"  r="0.7" />
+					<circle cx="2"  cy="2"  r="0.7" />
+				</g>
 			</g>
 		</g>
 
@@ -876,7 +863,7 @@ C 42.942871662459936,	-24.939379331448624,
 
   <!-- Scarab and "cairo" at upper-left -->
   <g transform="translate(10,0)">
-    <use stroke="none" xlink:href="#cairo_logo_text_small"/>
+    <use stroke="none" fill="white" xlink:href="#cairo_logo_text_small"/>
   </g>
 
   <!-- Presentation title at upper-right -->