Hi Phil et al,
here are some minor svgviewer fixes:
* the bubbles animation looks fine (again?!?)
* highQualityAntialiasingAction handling fixed
* wheel zooming works now (instead of throwing exceptions)
Could somebody explain, what the background option/action is supposed to do?
To me, it looks like it is trying to fill the backgound with a white rect,
which is then superseeded by setBackgroundBrush()/SvgView.drawBackground().
Also reimplementing SvgView.drawBackground() with what I consider default
functionality seems superfluous.
But anyway, it's en par with the Qt one now.
Pete
diff -up -r svgviewer.orig/files/bubbles.svg svgviewer/files/bubbles.svg
--- svgviewer.orig/files/bubbles.svg 2010-07-12 12:41:21.000000000 +0200
+++ svgviewer/files/bubbles.svg 2010-09-13 15:25:53.673421375 +0200
@@ -72,7 +72,7 @@
<radialGradient id="shadowGrad" gradientUnits="userSpaceOnUse"
cx="0" cy="0" r="100" fx="-50" fy="50">
<stop offset="0%" stop-color="black" stop-opacity="1.0" />
- <stop offset="100%" stop-color="white" stop-opacity="0.0" />
+ <stop offset="100%" stop-color="black" stop-opacity="0.0" />
</radialGradient>
<!-- Define a shadow for each sphere. -->
@@ -91,56 +91,56 @@
<g transform="translate(200,700)">
<use xlink:href="#bubble" fill="url(#blueBubble)" />
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="1s" dur="10s" fill="freeze" repeatCount="indefinite" />
</g>
<g transform="translate(315,700)">
<g transform="scale(0.5,0.5)">
<use xlink:href="#bubble" fill="url(#redBubble)" />
</g>
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="3s" dur="7s" fill="freeze" repeatCount="indefinite" />
</g>
<g transform="translate(80,700)">
<g transform="scale(0.65,0.65)">
<use xlink:href="#bubble" fill="url(#greenBubble)" />
</g>
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="5s" dur="9s" fill="freeze" repeatCount="indefinite" />
</g>
<g transform="translate(255,700)">
<g transform="scale(0.3,0.3)">
<use xlink:href="#bubble" fill="url(#yellowBubble)" />
</g>
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="2s" dur="6s" fill="freeze" repeatCount="indefinite" />
</g>
<g transform="translate(565,700)">
<g transform="scale(0.4,0.4)">
<use xlink:href="#bubble" fill="url(#blueBubble)" />
</g>
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="4s" dur="8s" fill="freeze" repeatCount="indefinite" />
</g>
<g transform="translate(715,700)">
<g transform="scale(0.6,0.6)">
<use xlink:href="#bubble" fill="url(#redBubble)" />
</g>
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="1s" dur="4s" fill="freeze" repeatCount="indefinite" />
</g>
<g transform="translate(645,700)">
<g transform="scale(0.375,0.375)">
<use xlink:href="#bubble" fill="url(#greenBubble)" />
</g>
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="0s" dur="11s" fill="freeze" repeatCount="indefinite" />
</g>
<g transform="translate(555,700)">
<g transform="scale(0.9,0.9)">
<use xlink:href="#bubble" fill="url(#yellowBubble)" />
</g>
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="3s" dur="7.5s" fill="freeze" repeatCount="indefinite" />
</g>
@@ -148,28 +148,28 @@
<g transform="scale(0.5,0.5)">
<use xlink:href="#bubble" fill="url(#blueBubble)" />
</g>
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="3s" dur="6s" fill="freeze" repeatCount="indefinite" />
</g>
<g transform="translate(215,700)">
<g transform="scale(0.45,0.45)">
<use xlink:href="#bubble" fill="url(#redBubble)" />
</g>
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="5.5s" dur="7s" fill="freeze" repeatCount="indefinite" />
</g>
<g transform="translate(420,700)">
<g transform="scale(0.75,0.75)">
<use xlink:href="#bubble" fill="url(#greenBubble)" />
</g>
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="1s" dur="9s" fill="freeze" repeatCount="indefinite" />
</g>
<g transform="translate(815,700)">
<g transform="scale(0.6,0.6)">
<use xlink:href="#bubble" fill="url(#yellowBubble)" />
</g>
- <animateTransform attributeName="transform" type="translate"
+ <animateTransform attributeName="transform" type="translate" additive="sum"
values="0,0; 0,-800" begin="2s" dur="9.5s" fill="freeze" repeatCount="indefinite" />
</g>
@@ -186,7 +186,7 @@
<circle fill="#a6ce39" cx="0" cy="0" r="33" />
<path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
L -11,22 L -1,12 Z" />
- <animateTransform attributeName="transform" type="rotate" values="0; 360"
+ <animateTransform attributeName="transform" type="rotate" additive="sum" values="0; 360"
begin="0s" dur="10s" fill="freeze" repeatCount="indefinite" />
</g>
<g transform="translate(200,375)">
diff -up -r svgviewer.orig/svgviewer.py svgviewer/svgviewer.py
--- svgviewer.orig/svgviewer.py 2010-07-12 12:41:21.000000000 +0200
+++ svgviewer/svgviewer.py 2010-09-13 20:40:15.433398898 +0200
@@ -106,6 +106,9 @@ class MainWindow(QtGui.QMainWindow):
self.resize(self.view.sizeHint() + QtCore.QSize(80, 80 + self.menuBar().height()))
def setRenderer(self, action):
+ if QtOpenGL.QGLFormat.hasOpenGL():
+ self.highQualityAntialiasingAction.setEnabled(False)
+
if action == self.nativeAction:
self.view.setRenderer(SvgView.Native)
elif action == self.glAction:
@@ -131,6 +134,7 @@ class SvgView(QtGui.QGraphicsView):
self.setScene(QtGui.QGraphicsScene(self))
self.setTransformationAnchor(QtGui.QGraphicsView.AnchorUnderMouse)
self.setDragMode(QtGui.QGraphicsView.ScrollHandDrag)
+ self.setViewportUpdateMode(QtGui.QGraphicsView.FullViewportUpdate)
# Prepare background check-board pattern.
tilePixmap = QtGui.QPixmap(64, 64)
@@ -232,7 +236,7 @@ class SvgView(QtGui.QGraphicsView):
super(SvgView, self).paintEvent(event)
def wheelEvent(self, event):
- factor = QtCore.qPow(1.2, event.delta() / 240.0)
+ factor = pow(1.2, event.delta() / 240.0)
self.scale(factor, factor)
event.accept()
diff -up -r svgviewer.orig/svgviewer_rc.py svgviewer/svgviewer_rc.py
--- svgviewer.orig/svgviewer_rc.py 2010-08-26 21:55:21.000000000 +0200
+++ svgviewer/svgviewer_rc.py 2010-09-13 15:27:09.017840468 +0200
@@ -2,7 +2,7 @@
# Resource object code
#
-# Created: Thu Aug 26 19:55:21 2010
+# Created: Mo. Sep 13 15:27:09 2010
# by: The Resource Compiler for PyQt (Qt v4.6.3)
#
# WARNING! All changes made in this file will be lost!
@@ -540,7 +540,7 @@ qt_resource_data = "\
\x30\x22\x20\x72\x3d\x22\x31\x30\x30\x22\x20\x2f\x3e\x0a\x20\x20\
\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x3c\x2f\
\x73\x76\x67\x3e\x0a\
-\x00\x00\x26\xb0\
+\x00\x00\x27\x73\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x73\x74\x61\x6e\x64\x61\x6c\x6f\x6e\x65\x3d\x22\x6e\
@@ -791,8 +791,8 @@ qt_resource_data = "\
\x74\x6f\x70\x2d\x6f\x70\x61\x63\x69\x74\x79\x3d\x22\x31\x2e\x30\
\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x73\x74\
\x6f\x70\x20\x6f\x66\x66\x73\x65\x74\x3d\x22\x31\x30\x30\x25\x22\
-\x20\x73\x74\x6f\x70\x2d\x63\x6f\x6c\x6f\x72\x3d\x22\x77\x68\x69\
-\x74\x65\x22\x20\x73\x74\x6f\x70\x2d\x6f\x70\x61\x63\x69\x74\x79\
+\x20\x73\x74\x6f\x70\x2d\x63\x6f\x6c\x6f\x72\x3d\x22\x62\x6c\x61\
+\x63\x6b\x22\x20\x73\x74\x6f\x70\x2d\x6f\x70\x61\x63\x69\x74\x79\
\x3d\x22\x30\x2e\x30\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\
\x3c\x2f\x72\x61\x64\x69\x61\x6c\x47\x72\x61\x64\x69\x65\x6e\x74\
\x3e\x0a\x0a\x20\x20\x20\x20\x20\x20\x3c\x21\x2d\x2d\x20\x44\x65\
@@ -838,94 +838,19 @@ qt_resource_data = "\
\x3c\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\
\x6d\x20\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\
\x22\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\
-\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x0a\x20\x20\x20\
-\x20\x20\x20\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\
-\x3b\x20\x30\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\
-\x22\x31\x73\x22\x20\x64\x75\x72\x3d\x22\x31\x30\x73\x22\x20\x66\
-\x69\x6c\x6c\x3d\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\
-\x65\x61\x74\x43\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\
-\x6e\x69\x74\x65\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\
-\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\
-\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x33\x31\x35\x2c\x37\x30\
-\x30\x29\x22\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\
-\x73\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x35\
-\x2c\x30\x2e\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\
-\x73\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\
-\x62\x75\x62\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\
-\x6c\x28\x23\x72\x65\x64\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\
-\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\
-\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\
-\x20\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\
-\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\
-\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x0a\x20\x20\x20\x20\
+\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x20\x61\x64\x64\
+\x69\x74\x69\x76\x65\x3d\x22\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\
\x20\x20\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\
\x20\x30\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\
-\x33\x73\x22\x20\x64\x75\x72\x3d\x22\x37\x73\x22\x20\x66\x69\x6c\
-\x6c\x3d\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\
-\x74\x43\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\
-\x74\x65\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\
-\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\
-\x61\x6e\x73\x6c\x61\x74\x65\x28\x38\x30\x2c\x37\x30\x30\x29\x22\
-\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\
-\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x36\x35\x2c\x30\
-\x2e\x36\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\
-\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\
-\x75\x62\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\
-\x28\x23\x67\x72\x65\x65\x6e\x42\x75\x62\x62\x6c\x65\x29\x22\x20\
-\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\
-\x3c\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\
-\x6d\x20\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\
-\x22\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\
-\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x0a\x20\x20\x20\
-\x20\x20\x20\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\
-\x3b\x20\x30\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\
-\x22\x35\x73\x22\x20\x64\x75\x72\x3d\x22\x39\x73\x22\x20\x66\x69\
+\x31\x73\x22\x20\x64\x75\x72\x3d\x22\x31\x30\x73\x22\x20\x66\x69\
\x6c\x6c\x3d\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\
\x61\x74\x43\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\
\x69\x74\x65\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\
\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\
-\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\x35\x35\x2c\x37\x30\x30\
+\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x33\x31\x35\x2c\x37\x30\x30\
\x29\x22\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\
-\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x33\x2c\
-\x30\x2e\x33\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\
-\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\
-\x75\x62\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\
-\x28\x23\x79\x65\x6c\x6c\x6f\x77\x42\x75\x62\x62\x6c\x65\x29\x22\
-\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\
-\x20\x3c\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\
-\x72\x6d\x20\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\
-\x3d\x22\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\
-\x65\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x0a\x20\x20\
-\x20\x20\x20\x20\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\
-\x30\x3b\x20\x30\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\
-\x3d\x22\x32\x73\x22\x20\x64\x75\x72\x3d\x22\x36\x73\x22\x20\x66\
-\x69\x6c\x6c\x3d\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\
-\x65\x61\x74\x43\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\
-\x6e\x69\x74\x65\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\
-\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\
-\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x35\x2c\x37\x30\
-\x30\x29\x22\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\
-\x73\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x34\
-\x2c\x30\x2e\x34\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\
-\x73\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\
-\x62\x75\x62\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\
-\x6c\x28\x23\x62\x6c\x75\x65\x42\x75\x62\x62\x6c\x65\x29\x22\x20\
-\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\
-\x3c\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\
-\x6d\x20\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\
-\x22\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\
-\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x0a\x20\x20\x20\
-\x20\x20\x20\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\
-\x3b\x20\x30\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\
-\x22\x34\x73\x22\x20\x64\x75\x72\x3d\x22\x38\x73\x22\x20\x66\x69\
-\x6c\x6c\x3d\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\
-\x61\x74\x43\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\
-\x69\x74\x65\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\
-\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\
-\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x37\x31\x35\x2c\x37\x30\x30\
-\x29\x22\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\
-\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x36\x2c\
-\x30\x2e\x36\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\
+\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x35\x2c\
+\x30\x2e\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\
\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\
\x75\x62\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\
\x28\x23\x72\x65\x64\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\x3e\
@@ -933,234 +858,322 @@ qt_resource_data = "\
\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\x20\
\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\x74\
\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\x22\
-\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x0a\x20\x20\x20\x20\x20\
-\x20\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\x20\
-\x30\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x31\
-\x73\x22\x20\x64\x75\x72\x3d\x22\x34\x73\x22\x20\x66\x69\x6c\x6c\
-\x3d\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\
-\x43\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\
-\x65\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\
-\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x36\x34\x35\x2c\x37\x30\x30\x29\x22\
-\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\
-\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x33\x37\x35\x2c\
-\x30\x2e\x33\x37\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\
-\x75\x73\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\
-\x23\x62\x75\x62\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\
-\x72\x6c\x28\x23\x67\x72\x65\x65\x6e\x42\x75\x62\x62\x6c\x65\x29\
-\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\
-\x20\x20\x3c\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\
-\x6f\x72\x6d\x20\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\
-\x65\x3d\x22\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\
-\x70\x65\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x0a\x20\
-\x20\x20\x20\x20\x20\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\
-\x2c\x30\x3b\x20\x30\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\
-\x6e\x3d\x22\x30\x73\x22\x20\x64\x75\x72\x3d\x22\x31\x31\x73\x22\
-\x20\x66\x69\x6c\x6c\x3d\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\
-\x65\x70\x65\x61\x74\x43\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\
-\x66\x69\x6e\x69\x74\x65\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\
-\x3e\x0a\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\
-\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x35\x35\x2c\
-\x37\x30\x30\x29\x22\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\
-\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\
-\x2e\x39\x2c\x30\x2e\x39\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\
-\x3c\x75\x73\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\
-\x22\x23\x62\x75\x62\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\
-\x75\x72\x6c\x28\x23\x79\x65\x6c\x6c\x6f\x77\x42\x75\x62\x62\x6c\
-\x65\x29\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\
-\x20\x20\x20\x20\x3c\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\
-\x73\x66\x6f\x72\x6d\x20\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\
-\x61\x6d\x65\x3d\x22\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\
-\x74\x79\x70\x65\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\
-\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\
-\x22\x30\x2c\x30\x3b\x20\x30\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\
-\x67\x69\x6e\x3d\x22\x33\x73\x22\x20\x64\x75\x72\x3d\x22\x37\x2e\
-\x35\x73\x22\x20\x66\x69\x6c\x6c\x3d\x22\x66\x72\x65\x65\x7a\x65\
-\x22\x20\x72\x65\x70\x65\x61\x74\x43\x6f\x75\x6e\x74\x3d\x22\x69\
-\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\x22\x20\x2f\x3e\x0a\x20\x20\
-\x3c\x2f\x67\x3e\x0a\x0a\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\
-\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\
-\x33\x36\x30\x2c\x37\x30\x30\x29\x22\x3e\x0a\x20\x20\x20\x20\x3c\
-\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\
-\x6c\x65\x28\x30\x2e\x35\x2c\x30\x2e\x35\x29\x22\x3e\x0a\x20\x20\
-\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\
-\x72\x65\x66\x3d\x22\x23\x62\x75\x62\x62\x6c\x65\x22\x20\x66\x69\
-\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\x62\x6c\x75\x65\x42\x75\x62\
-\x62\x6c\x65\x29\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\
-\x3e\x0a\x20\x20\x20\x20\x3c\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\
-\x61\x6e\x73\x66\x6f\x72\x6d\x20\x61\x74\x74\x72\x69\x62\x75\x74\
-\x65\x4e\x61\x6d\x65\x3d\x22\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\
-\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\
-\x65\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x76\x61\x6c\x75\x65\
-\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\x2c\x2d\x38\x30\x30\x22\x20\
-\x62\x65\x67\x69\x6e\x3d\x22\x33\x73\x22\x20\x64\x75\x72\x3d\x22\
-\x36\x73\x22\x20\x66\x69\x6c\x6c\x3d\x22\x66\x72\x65\x65\x7a\x65\
-\x22\x20\x72\x65\x70\x65\x61\x74\x43\x6f\x75\x6e\x74\x3d\x22\x69\
-\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\x22\x20\x2f\x3e\x0a\x20\x20\
-\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\
-\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\
-\x31\x35\x2c\x37\x30\x30\x29\x22\x3e\x0a\x20\x20\x20\x20\x3c\x67\
-\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\
-\x65\x28\x30\x2e\x34\x35\x2c\x30\x2e\x34\x35\x29\x22\x3e\x0a\x20\
-\x20\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\x6c\x69\x6e\x6b\x3a\
-\x68\x72\x65\x66\x3d\x22\x23\x62\x75\x62\x62\x6c\x65\x22\x20\x66\
-\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\x72\x65\x64\x42\x75\x62\
-\x62\x6c\x65\x29\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\
-\x3e\x0a\x20\x20\x20\x20\x3c\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\
-\x61\x6e\x73\x66\x6f\x72\x6d\x20\x61\x74\x74\x72\x69\x62\x75\x74\
-\x65\x4e\x61\x6d\x65\x3d\x22\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\
-\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\
-\x65\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x76\x61\x6c\x75\x65\
-\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\x2c\x2d\x38\x30\x30\x22\x20\
-\x62\x65\x67\x69\x6e\x3d\x22\x35\x2e\x35\x73\x22\x20\x64\x75\x72\
-\x3d\x22\x37\x73\x22\x20\x66\x69\x6c\x6c\x3d\x22\x66\x72\x65\x65\
+\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x20\x61\x64\x64\x69\x74\
+\x69\x76\x65\x3d\x22\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\x20\x20\
+\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\
+\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x33\x73\
+\x22\x20\x64\x75\x72\x3d\x22\x37\x73\x22\x20\x66\x69\x6c\x6c\x3d\
+\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\x43\
+\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\
+\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x67\
+\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\
+\x73\x6c\x61\x74\x65\x28\x38\x30\x2c\x37\x30\x30\x29\x22\x3e\x0a\
+\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\
+\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x36\x35\x2c\x30\x2e\x36\
+\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\x20\
+\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\x75\x62\
+\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\
+\x67\x72\x65\x65\x6e\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\x3e\
+\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x61\
+\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\x20\
+\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\x74\
+\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\x22\
+\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x20\x61\x64\x64\x69\x74\
+\x69\x76\x65\x3d\x22\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\x20\x20\
+\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\
+\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x35\x73\
+\x22\x20\x64\x75\x72\x3d\x22\x39\x73\x22\x20\x66\x69\x6c\x6c\x3d\
+\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\x43\
+\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\
+\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x67\
+\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\
+\x73\x6c\x61\x74\x65\x28\x32\x35\x35\x2c\x37\x30\x30\x29\x22\x3e\
+\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
+\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x33\x2c\x30\x2e\x33\
+\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\
+\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\x75\x62\x62\
+\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\x79\
+\x65\x6c\x6c\x6f\x77\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\x3e\
+\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x61\
+\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\x20\
+\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\x74\
+\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\x22\
+\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x20\x61\x64\x64\x69\x74\
+\x69\x76\x65\x3d\x22\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\x20\x20\
+\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\
+\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x32\x73\
+\x22\x20\x64\x75\x72\x3d\x22\x36\x73\x22\x20\x66\x69\x6c\x6c\x3d\
+\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\x43\
+\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\
+\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x67\
+\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\
+\x73\x6c\x61\x74\x65\x28\x35\x36\x35\x2c\x37\x30\x30\x29\x22\x3e\
+\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
+\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x34\x2c\x30\x2e\x34\
+\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\
+\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\x75\x62\x62\
+\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\x62\
+\x6c\x75\x65\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\x3e\x0a\x20\
+\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x61\x6e\x69\
+\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\x20\x61\x74\
+\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\x74\x72\x61\
+\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x72\
+\x61\x6e\x73\x6c\x61\x74\x65\x22\x20\x61\x64\x64\x69\x74\x69\x76\
+\x65\x3d\x22\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\x2c\x2d\
+\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x34\x73\x22\x20\
+\x64\x75\x72\x3d\x22\x38\x73\x22\x20\x66\x69\x6c\x6c\x3d\x22\x66\
+\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\x43\x6f\x75\
+\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\x22\x20\
+\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x67\x20\x74\
+\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\
+\x61\x74\x65\x28\x37\x31\x35\x2c\x37\x30\x30\x29\x22\x3e\x0a\x20\
+\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\
+\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x36\x2c\x30\x2e\x36\x29\x22\
+\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\x6c\x69\
+\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\x75\x62\x62\x6c\x65\
+\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\x72\x65\x64\
+\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\
+\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x61\x6e\x69\x6d\x61\x74\
+\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\x20\x61\x74\x74\x72\x69\
+\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\x74\x72\x61\x6e\x73\x66\
+\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x72\x61\x6e\x73\
+\x6c\x61\x74\x65\x22\x20\x61\x64\x64\x69\x74\x69\x76\x65\x3d\x22\
+\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x76\x61\x6c\
+\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\x2c\x2d\x38\x30\x30\
+\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x31\x73\x22\x20\x64\x75\x72\
+\x3d\x22\x34\x73\x22\x20\x66\x69\x6c\x6c\x3d\x22\x66\x72\x65\x65\
\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\x43\x6f\x75\x6e\x74\x3d\
\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\x22\x20\x2f\x3e\x0a\
\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\
\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\
-\x28\x34\x32\x30\x2c\x37\x30\x30\x29\x22\x3e\x0a\x20\x20\x20\x20\
+\x28\x36\x34\x35\x2c\x37\x30\x30\x29\x22\x3e\x0a\x20\x20\x20\x20\
\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x73\x63\
-\x61\x6c\x65\x28\x30\x2e\x37\x35\x2c\x30\x2e\x37\x35\x29\x22\x3e\
-\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\x6c\x69\x6e\
-\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\x75\x62\x62\x6c\x65\x22\
-\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\x67\x72\x65\x65\
-\x6e\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\x3e\x0a\x20\x20\x20\
-\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x61\x6e\x69\x6d\x61\
-\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\x20\x61\x74\x74\x72\
-\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\x74\x72\x61\x6e\x73\
-\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x72\x61\x6e\
-\x73\x6c\x61\x74\x65\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x76\
-\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\x2c\x2d\x38\
-\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x31\x73\x22\x20\x64\
-\x75\x72\x3d\x22\x39\x73\x22\x20\x66\x69\x6c\x6c\x3d\x22\x66\x72\
-\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\x43\x6f\x75\x6e\
-\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\x22\x20\x2f\
-\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x67\x20\x74\x72\
-\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\
-\x74\x65\x28\x38\x31\x35\x2c\x37\x30\x30\x29\x22\x3e\x0a\x20\x20\
-\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\
-\x73\x63\x61\x6c\x65\x28\x30\x2e\x36\x2c\x30\x2e\x36\x29\x22\x3e\
-\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\x6c\x69\x6e\
-\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\x75\x62\x62\x6c\x65\x22\
-\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\x79\x65\x6c\x6c\
-\x6f\x77\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\x3e\x0a\x20\x20\
-\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x61\x6e\x69\x6d\
-\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\x20\x61\x74\x74\
-\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\x74\x72\x61\x6e\
-\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x61\x6c\x65\x28\x30\x2e\x33\x37\x35\x2c\x30\x2e\x33\x37\x35\x29\
+\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\x6c\
+\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\x75\x62\x62\x6c\
+\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\x67\x72\
+\x65\x65\x6e\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\x3e\x0a\x20\
+\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x61\x6e\x69\
+\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\x20\x61\x74\
+\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\x74\x72\x61\
+\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x72\
+\x61\x6e\x73\x6c\x61\x74\x65\x22\x20\x61\x64\x64\x69\x74\x69\x76\
+\x65\x3d\x22\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\x2c\x2d\
-\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x32\x73\x22\x20\
-\x64\x75\x72\x3d\x22\x39\x2e\x35\x73\x22\x20\x66\x69\x6c\x6c\x3d\
+\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x30\x73\x22\x20\
+\x64\x75\x72\x3d\x22\x31\x31\x73\x22\x20\x66\x69\x6c\x6c\x3d\x22\
+\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\x43\x6f\
+\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\x22\
+\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x67\x20\
+\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\
+\x6c\x61\x74\x65\x28\x35\x35\x35\x2c\x37\x30\x30\x29\x22\x3e\x0a\
+\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\
+\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x39\x2c\x30\x2e\x39\x29\
+\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\x6c\
+\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\x75\x62\x62\x6c\
+\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\x79\x65\
+\x6c\x6c\x6f\x77\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\x3e\x0a\
+\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x61\x6e\
+\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\x20\x61\
+\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\x74\x72\
+\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\x22\x74\
+\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x20\x61\x64\x64\x69\x74\x69\
+\x76\x65\x3d\x22\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\x20\x20\x20\
+\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\x2c\
+\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x33\x73\x22\
+\x20\x64\x75\x72\x3d\x22\x37\x2e\x35\x73\x22\x20\x66\x69\x6c\x6c\
+\x3d\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\
+\x43\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\
+\x65\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x0a\x20\x20\
+\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\
+\x61\x6e\x73\x6c\x61\x74\x65\x28\x33\x36\x30\x2c\x37\x30\x30\x29\
+\x22\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\
+\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x35\x2c\x30\
+\x2e\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\
+\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\x75\
+\x62\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\
+\x23\x62\x6c\x75\x65\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\x3e\
+\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x61\
+\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\x20\
+\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\x74\
+\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\x22\
+\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x20\x61\x64\x64\x69\x74\
+\x69\x76\x65\x3d\x22\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\x20\x20\
+\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\
+\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x33\x73\
+\x22\x20\x64\x75\x72\x3d\x22\x36\x73\x22\x20\x66\x69\x6c\x6c\x3d\
\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\x43\
\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\
-\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x0a\x20\x20\x3c\
-\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x32\x32\x35\x2c\x33\x37\x35\x29\x22\
-\x20\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\
-\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x31\x2e\x30\x2c\x30\
-\x2e\x35\x29\x22\x20\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x70\x61\
-\x74\x68\x20\x64\x3d\x22\x4d\x20\x30\x20\x30\x20\x4c\x20\x33\x35\
-\x30\x20\x30\x20\x4c\x20\x34\x35\x30\x20\x34\x35\x30\x20\x4c\x20\
-\x2d\x31\x30\x30\x20\x34\x35\x30\x20\x7a\x22\x0a\x20\x20\x20\x20\
-\x20\x20\x20\x20\x20\x20\x20\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\
-\x6c\x28\x23\x73\x75\x72\x66\x61\x63\x65\x29\x22\x20\x73\x74\x72\
-\x6f\x6b\x65\x3d\x22\x6e\x6f\x6e\x65\x22\x20\x2f\x3e\x0a\x20\x20\
-\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\
-\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\
-\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\x30\x30\x2c\x30\x29\
-\x22\x20\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\
-\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\
-\x32\x30\x30\x2c\x34\x39\x30\x29\x20\x73\x63\x61\x6c\x65\x28\x32\
-\x2e\x30\x2c\x31\x2e\x30\x29\x20\x72\x6f\x74\x61\x74\x65\x28\x34\
-\x35\x29\x22\x20\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x72\x65\x63\
-\x74\x20\x66\x69\x6c\x6c\x3d\x22\x23\x61\x36\x63\x65\x33\x39\x22\
-\x20\x78\x3d\x22\x2d\x36\x39\x22\x20\x79\x3d\x22\x2d\x36\x39\x22\
-\x20\x77\x69\x64\x74\x68\x3d\x22\x31\x33\x38\x22\x20\x68\x65\x69\
-\x67\x68\x74\x3d\x22\x31\x33\x38\x22\x20\x2f\x3e\x0a\x20\x20\x20\
-\x20\x20\x20\x3c\x63\x69\x72\x63\x6c\x65\x20\x66\x69\x6c\x6c\x3d\
-\x22\x62\x6c\x61\x63\x6b\x22\x20\x63\x78\x3d\x22\x30\x22\x20\x63\
-\x79\x3d\x22\x30\x22\x20\x72\x3d\x22\x35\x30\x22\x20\x2f\x3e\x0a\
-\x20\x20\x20\x20\x20\x20\x3c\x63\x69\x72\x63\x6c\x65\x20\x66\x69\
-\x6c\x6c\x3d\x22\x23\x61\x36\x63\x65\x33\x39\x22\x20\x63\x78\x3d\
-\x22\x30\x22\x20\x63\x79\x3d\x22\x30\x22\x20\x72\x3d\x22\x33\x33\
-\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x70\x61\x74\x68\
-\x20\x66\x69\x6c\x6c\x3d\x22\x62\x6c\x61\x63\x6b\x22\x20\x64\x3d\
-\x22\x4d\x20\x33\x37\x2c\x35\x30\x20\x4c\x20\x35\x30\x2c\x33\x37\
-\x20\x4c\x20\x31\x32\x2c\x2d\x31\x20\x4c\x20\x32\x32\x2c\x2d\x31\
-\x31\x20\x4c\x20\x31\x30\x2c\x2d\x32\x34\x20\x4c\x20\x2d\x32\x34\
-\x2c\x31\x30\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
-\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
-\x4c\x20\x2d\x31\x31\x2c\x32\x32\x20\x4c\x20\x2d\x31\x2c\x31\x32\
-\x20\x5a\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x61\x6e\
+\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x67\
+\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\
+\x73\x6c\x61\x74\x65\x28\x32\x31\x35\x2c\x37\x30\x30\x29\x22\x3e\
+\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
+\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x34\x35\x2c\x30\x2e\
+\x34\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\
+\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\x75\
+\x62\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\
+\x23\x72\x65\x64\x42\x75\x62\x62\x6c\x65\x29\x22\x20\x2f\x3e\x0a\
+\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x61\x6e\
\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\x6d\x20\x61\
\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\x22\x74\x72\
-\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x20\x74\x79\x70\x65\x3d\x22\
-\x72\x6f\x74\x61\x74\x65\x22\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\
-\x30\x3b\x20\x33\x36\x30\x22\x0a\x09\x20\x20\x20\x20\x20\x20\x20\
-\x20\x20\x62\x65\x67\x69\x6e\x3d\x22\x30\x73\x22\x20\x64\x75\x72\
-\x3d\x22\x31\x30\x73\x22\x20\x66\x69\x6c\x6c\x3d\x22\x66\x72\x65\
-\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\x43\x6f\x75\x6e\x74\
-\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\x22\x20\x2f\x3e\
-\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x67\
-\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\
-\x73\x6c\x61\x74\x65\x28\x32\x30\x30\x2c\x33\x37\x35\x29\x22\x3e\
-\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\x6c\x69\x6e\
-\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x73\x68\x61\x64\x6f\x77\x22\
-\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\
-\x73\x6c\x61\x74\x65\x28\x32\x35\x2c\x35\x35\x29\x20\x73\x63\x61\
-\x6c\x65\x28\x31\x2e\x30\x2c\x30\x2e\x35\x29\x22\x20\x2f\x3e\x0a\
-\x20\x20\x20\x20\x20\x20\x3c\x63\x69\x72\x63\x6c\x65\x20\x66\x69\
-\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\x62\x6c\x75\x65\x53\x70\x68\
-\x65\x72\x65\x29\x22\x20\x63\x78\x3d\x22\x30\x22\x20\x63\x79\x3d\
-\x22\x30\x22\x20\x72\x3d\x22\x31\x30\x30\x22\x20\x2f\x3e\x0a\x20\
-\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\
+\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\x3d\x22\x74\
+\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x20\x61\x64\x64\x69\x74\x69\
+\x76\x65\x3d\x22\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\x20\x20\x20\
+\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\x20\x30\x2c\
+\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\x35\x2e\x35\
+\x73\x22\x20\x64\x75\x72\x3d\x22\x37\x73\x22\x20\x66\x69\x6c\x6c\
+\x3d\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\
+\x43\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\
+\x65\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\
+\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\
+\x6e\x73\x6c\x61\x74\x65\x28\x34\x32\x30\x2c\x37\x30\x30\x29\x22\
+\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\
+\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x37\x35\x2c\x30\
+\x2e\x37\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\
+\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\
+\x75\x62\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\
+\x28\x23\x67\x72\x65\x65\x6e\x42\x75\x62\x62\x6c\x65\x29\x22\x20\
+\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\
+\x3c\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\
+\x6d\x20\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\
+\x22\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\
+\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x20\x61\x64\x64\
+\x69\x74\x69\x76\x65\x3d\x22\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\
+\x20\x20\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\
+\x20\x30\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\
+\x31\x73\x22\x20\x64\x75\x72\x3d\x22\x39\x73\x22\x20\x66\x69\x6c\
+\x6c\x3d\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\
+\x74\x43\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\
+\x74\x65\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\
+\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\
+\x61\x6e\x73\x6c\x61\x74\x65\x28\x38\x31\x35\x2c\x37\x30\x30\x29\
+\x22\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\
+\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x36\x2c\x30\
+\x2e\x36\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\
+\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x62\x75\
+\x62\x62\x6c\x65\x22\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\
+\x23\x79\x65\x6c\x6c\x6f\x77\x42\x75\x62\x62\x6c\x65\x29\x22\x20\
+\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\
+\x3c\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\x72\
+\x6d\x20\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\x3d\
+\x22\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x74\x79\x70\x65\
+\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x22\x20\x61\x64\x64\
+\x69\x74\x69\x76\x65\x3d\x22\x73\x75\x6d\x22\x0a\x20\x20\x20\x20\
+\x20\x20\x20\x20\x76\x61\x6c\x75\x65\x73\x3d\x22\x30\x2c\x30\x3b\
+\x20\x30\x2c\x2d\x38\x30\x30\x22\x20\x62\x65\x67\x69\x6e\x3d\x22\
+\x32\x73\x22\x20\x64\x75\x72\x3d\x22\x39\x2e\x35\x73\x22\x20\x66\
+\x69\x6c\x6c\x3d\x22\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\
+\x65\x61\x74\x43\x6f\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\
+\x6e\x69\x74\x65\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\
+\x0a\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\
+\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\x32\x35\x2c\x33\
+\x37\x35\x29\x22\x20\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\
+\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x31\
+\x2e\x30\x2c\x30\x2e\x35\x29\x22\x20\x3e\x0a\x20\x20\x20\x20\x20\
+\x20\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x20\x30\x20\x30\x20\
+\x4c\x20\x33\x35\x30\x20\x30\x20\x4c\x20\x34\x35\x30\x20\x34\x35\
+\x30\x20\x4c\x20\x2d\x31\x30\x30\x20\x34\x35\x30\x20\x7a\x22\x0a\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x66\x69\x6c\x6c\
+\x3d\x22\x75\x72\x6c\x28\x23\x73\x75\x72\x66\x61\x63\x65\x29\x22\
+\x20\x73\x74\x72\x6f\x6b\x65\x3d\x22\x6e\x6f\x6e\x65\x22\x20\x2f\
+\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x2f\x67\
+\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\
+\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\x30\
+\x30\x2c\x30\x29\x22\x20\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\x74\
\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\
-\x61\x74\x65\x28\x33\x31\x35\x2c\x34\x34\x30\x29\x22\x3e\x0a\x20\
-\x20\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
-\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x35\x2c\x30\x2e\x35\
-\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\
-\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x73\x68\
-\x61\x64\x6f\x77\x22\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\
-\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\x35\x2c\x35\x35\
-\x29\x20\x73\x63\x61\x6c\x65\x28\x31\x2e\x30\x2c\x30\x2e\x35\x29\
-\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x63\x69\
-\x72\x63\x6c\x65\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\
-\x72\x65\x64\x53\x70\x68\x65\x72\x65\x29\x22\x20\x63\x78\x3d\x22\
-\x30\x22\x20\x63\x79\x3d\x22\x30\x22\x20\x72\x3d\x22\x31\x30\x30\
-\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\
-\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x67\x20\
-\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\
-\x6c\x61\x74\x65\x28\x38\x30\x2c\x34\x37\x35\x29\x22\x3e\x0a\x20\
-\x20\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
-\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x36\x35\x2c\x30\x2e\
-\x36\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x75\
-\x73\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\
-\x73\x68\x61\x64\x6f\x77\x22\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
-\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\x35\x2c\
-\x35\x35\x29\x20\x73\x63\x61\x6c\x65\x28\x31\x2e\x30\x2c\x30\x2e\
-\x35\x29\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\
-\x63\x69\x72\x63\x6c\x65\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\
-\x28\x23\x67\x72\x65\x65\x6e\x53\x70\x68\x65\x72\x65\x29\x22\x20\
-\x63\x78\x3d\x22\x30\x22\x20\x63\x79\x3d\x22\x30\x22\x20\x72\x3d\
-\x22\x31\x30\x30\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\
-\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\
+\x61\x74\x65\x28\x32\x30\x30\x2c\x34\x39\x30\x29\x20\x73\x63\x61\
+\x6c\x65\x28\x32\x2e\x30\x2c\x31\x2e\x30\x29\x20\x72\x6f\x74\x61\
+\x74\x65\x28\x34\x35\x29\x22\x20\x3e\x0a\x20\x20\x20\x20\x20\x20\
+\x3c\x72\x65\x63\x74\x20\x66\x69\x6c\x6c\x3d\x22\x23\x61\x36\x63\
+\x65\x33\x39\x22\x20\x78\x3d\x22\x2d\x36\x39\x22\x20\x79\x3d\x22\
+\x2d\x36\x39\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x31\x33\x38\x22\
+\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x31\x33\x38\x22\x20\x2f\x3e\
+\x0a\x20\x20\x20\x20\x20\x20\x3c\x63\x69\x72\x63\x6c\x65\x20\x66\
+\x69\x6c\x6c\x3d\x22\x62\x6c\x61\x63\x6b\x22\x20\x63\x78\x3d\x22\
+\x30\x22\x20\x63\x79\x3d\x22\x30\x22\x20\x72\x3d\x22\x35\x30\x22\
+\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x63\x69\x72\x63\x6c\
+\x65\x20\x66\x69\x6c\x6c\x3d\x22\x23\x61\x36\x63\x65\x33\x39\x22\
+\x20\x63\x78\x3d\x22\x30\x22\x20\x63\x79\x3d\x22\x30\x22\x20\x72\
+\x3d\x22\x33\x33\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\
+\x70\x61\x74\x68\x20\x66\x69\x6c\x6c\x3d\x22\x62\x6c\x61\x63\x6b\
+\x22\x20\x64\x3d\x22\x4d\x20\x33\x37\x2c\x35\x30\x20\x4c\x20\x35\
+\x30\x2c\x33\x37\x20\x4c\x20\x31\x32\x2c\x2d\x31\x20\x4c\x20\x32\
+\x32\x2c\x2d\x31\x31\x20\x4c\x20\x31\x30\x2c\x2d\x32\x34\x20\x4c\
+\x20\x2d\x32\x34\x2c\x31\x30\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x4c\x20\x2d\x31\x31\x2c\x32\x32\x20\x4c\x20\x2d\
+\x31\x2c\x31\x32\x20\x5a\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\
+\x20\x3c\x61\x6e\x69\x6d\x61\x74\x65\x54\x72\x61\x6e\x73\x66\x6f\
+\x72\x6d\x20\x61\x74\x74\x72\x69\x62\x75\x74\x65\x4e\x61\x6d\x65\
+\x3d\x22\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x22\x20\x20\x74\x79\
+\x70\x65\x3d\x22\x72\x6f\x74\x61\x74\x65\x22\x20\x61\x64\x64\x69\
+\x74\x69\x76\x65\x3d\x22\x73\x75\x6d\x22\x20\x76\x61\x6c\x75\x65\
+\x73\x3d\x22\x30\x3b\x20\x33\x36\x30\x22\x0a\x09\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x62\x65\x67\x69\x6e\x3d\x22\x30\x73\x22\x20\
+\x64\x75\x72\x3d\x22\x31\x30\x73\x22\x20\x66\x69\x6c\x6c\x3d\x22\
+\x66\x72\x65\x65\x7a\x65\x22\x20\x72\x65\x70\x65\x61\x74\x43\x6f\
+\x75\x6e\x74\x3d\x22\x69\x6e\x64\x65\x66\x69\x6e\x69\x74\x65\x22\
+\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\
\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\
-\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\x35\x35\x2c\x35\x32\x35\
-\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\
-\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\
-\x33\x2c\x30\x2e\x33\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\
+\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\x30\x30\x2c\x33\x37\x35\
+\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\
+\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\x23\x73\x68\x61\x64\
+\x6f\x77\x22\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\
+\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\x35\x2c\x35\x35\x29\x20\
+\x73\x63\x61\x6c\x65\x28\x31\x2e\x30\x2c\x30\x2e\x35\x29\x22\x20\
+\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x63\x69\x72\x63\x6c\x65\
+\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\x6c\x28\x23\x62\x6c\x75\x65\
+\x53\x70\x68\x65\x72\x65\x29\x22\x20\x63\x78\x3d\x22\x30\x22\x20\
+\x63\x79\x3d\x22\x30\x22\x20\x72\x3d\x22\x31\x30\x30\x22\x20\x2f\
+\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\
+\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\
+\x6e\x73\x6c\x61\x74\x65\x28\x33\x31\x35\x2c\x34\x34\x30\x29\x22\
+\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\
+\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x35\x2c\
+\x30\x2e\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\
+\x75\x73\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\x3d\x22\
+\x23\x73\x68\x61\x64\x6f\x77\x22\x20\x74\x72\x61\x6e\x73\x66\x6f\
+\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\x35\
+\x2c\x35\x35\x29\x20\x73\x63\x61\x6c\x65\x28\x31\x2e\x30\x2c\x30\
+\x2e\x35\x29\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x3c\x63\x69\x72\x63\x6c\x65\x20\x66\x69\x6c\x6c\x3d\x22\x75\x72\
+\x6c\x28\x23\x72\x65\x64\x53\x70\x68\x65\x72\x65\x29\x22\x20\x63\
+\x78\x3d\x22\x30\x22\x20\x63\x79\x3d\x22\x30\x22\x20\x72\x3d\x22\
+\x31\x30\x30\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\
+\x67\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\
+\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\
+\x61\x6e\x73\x6c\x61\x74\x65\x28\x38\x30\x2c\x34\x37\x35\x29\x22\
+\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\
+\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\x28\x30\x2e\x36\x35\
+\x2c\x30\x2e\x36\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\
\x20\x3c\x75\x73\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\x72\x65\x66\
\x3d\x22\x23\x73\x68\x61\x64\x6f\x77\x22\x20\x74\x72\x61\x6e\x73\
\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\
\x32\x35\x2c\x35\x35\x29\x20\x73\x63\x61\x6c\x65\x28\x31\x2e\x30\
\x2c\x30\x2e\x35\x29\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\
\x20\x20\x3c\x63\x69\x72\x63\x6c\x65\x20\x66\x69\x6c\x6c\x3d\x22\
-\x75\x72\x6c\x28\x23\x79\x65\x6c\x6c\x6f\x77\x53\x70\x68\x65\x72\
-\x65\x29\x22\x20\x63\x78\x3d\x22\x30\x22\x20\x63\x79\x3d\x22\x30\
-\x22\x20\x72\x3d\x22\x31\x30\x30\x22\x20\x2f\x3e\x0a\x20\x20\x20\
-\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\
-\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x75\x72\x6c\x28\x23\x67\x72\x65\x65\x6e\x53\x70\x68\x65\x72\x65\
+\x29\x22\x20\x63\x78\x3d\x22\x30\x22\x20\x63\x79\x3d\x22\x30\x22\
+\x20\x72\x3d\x22\x31\x30\x30\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\
+\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\
+\x20\x20\x20\x20\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\
+\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x32\x35\x35\x2c\
+\x35\x32\x35\x29\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x67\x20\
+\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x73\x63\x61\x6c\x65\
+\x28\x30\x2e\x33\x2c\x30\x2e\x33\x29\x22\x3e\x0a\x20\x20\x20\x20\
+\x20\x20\x20\x20\x3c\x75\x73\x65\x20\x78\x6c\x69\x6e\x6b\x3a\x68\
+\x72\x65\x66\x3d\x22\x23\x73\x68\x61\x64\x6f\x77\x22\x20\x74\x72\
+\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\
+\x74\x65\x28\x32\x35\x2c\x35\x35\x29\x20\x73\x63\x61\x6c\x65\x28\
+\x31\x2e\x30\x2c\x30\x2e\x35\x29\x22\x20\x2f\x3e\x0a\x20\x20\x20\
+\x20\x20\x20\x20\x20\x3c\x63\x69\x72\x63\x6c\x65\x20\x66\x69\x6c\
+\x6c\x3d\x22\x75\x72\x6c\x28\x23\x79\x65\x6c\x6c\x6f\x77\x53\x70\
+\x68\x65\x72\x65\x29\x22\x20\x63\x78\x3d\x22\x30\x22\x20\x63\x79\
+\x3d\x22\x30\x22\x20\x72\x3d\x22\x31\x30\x30\x22\x20\x2f\x3e\x0a\
+\x20\x20\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\x3c\
+\x2f\x67\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\
+\x3e\x0a\
"
qt_resource_name = "\
_______________________________________________
PyQt mailing list PyQt@riverbankcomputing.com
http://www.riverbankcomputing.com/mailman/listinfo/pyqt
