From 81ba8fd9fa0e2fbbee1ef3534a96104de4cd7079 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Wed, 17 Mar 2010 18:39:20 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/turtleart/refactoring

Conflicts:
	NEWS
	activity/activity.info
	tagplay.py
	tawindow.py
---
(limited to 'images/Cartesian_labeled.svg')

diff --git a/images/Cartesian_labeled.svg b/images/Cartesian_labeled.svg
new file mode 100644
index 0000000..e70bb9b
--- /dev/null
+++ b/images/Cartesian_labeled.svg
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="1200"
+   height="900"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <g
+     id="layer1">
+    <path
+       d="m 0,850 1200,0"
+       id="path5"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 0,750 1200,0"
+       id="path7"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 0,650 1200,0"
+       id="path9"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 0,550 1200,0"
+       id="path11"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 0,350 1200,0"
+       id="path13"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 0,250 1200,0"
+       id="path15"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 0,150 1200,0"
+       id="path17"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 0,50 1200,0"
+       id="path19"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 1100,0 0,900"
+       id="path21"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 1000,0 0,900"
+       id="path23"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 900,0 0,900"
+       id="path25"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 800,0 0,900"
+       id="path27"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 700,0 0,900"
+       id="path29"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 500,0 0,900"
+       id="path31"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 400,0 0,900"
+       id="path33"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 300,0 0,900"
+       id="path35"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 200,0 0,900"
+       id="path37"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 100,0 0,900"
+       id="path39"
+       style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 590,850 20,0"
+       id="path41"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 590,750 20,0"
+       id="path43"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 590,650 20,0"
+       id="path45"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 590,550 20,0"
+       id="path47"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 0,450 1200,0"
+       id="path49"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 590,350 20,0"
+       id="path51"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 590,250 20,0"
+       id="path53"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 590,150 20,0"
+       id="path55"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 590,50 20,0"
+       id="path57"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 1100,440 0,20"
+       id="path59"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 1000,440 0,20"
+       id="path61"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 900,440 0,20"
+       id="path63"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 800,440 0,20"
+       id="path65"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 700,440 0,20"
+       id="path67"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 600,0 0,900"
+       id="path69"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 500,440 0,20"
+       id="path71"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 400,440 0,20"
+       id="path73"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 300,440 0,20"
+       id="path75"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 200,440 0,20"
+       id="path77"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="m 100,440 0,20"
+       id="path79"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+  </g>
+  <text
+     x="603.90137"
+     y="344.8584"
+     id="text3218"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="603.90137"
+       y="344.8584"
+       id="tspan3220">100</tspan></text>
+  <text
+     x="604.26758"
+     y="244.8584"
+     id="text3218-8"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="604.26758"
+       y="244.8584"
+       id="tspan3220-7">200</tspan></text>
+  <text
+     x="604.23828"
+     y="144.8584"
+     id="text3218-7"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="604.23828"
+       y="144.8584"
+       id="tspan3220-2">300</tspan></text>
+  <text
+     x="604.51172"
+     y="44.858398"
+     id="text3218-2"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="604.51172"
+       y="44.858398"
+       id="tspan3220-26">400</tspan></text>
+  <text
+     x="1104.2285"
+     y="444.8584"
+     id="text3218-6"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="1104.2285"
+       y="444.8584"
+       id="tspan3220-1">500</tspan></text>
+  <text
+     x="1004.5117"
+     y="444.8584"
+     id="text3218-9"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="1004.5117"
+       y="444.8584"
+       id="tspan3220-4">400</tspan></text>
+  <text
+     x="904.23828"
+     y="444.8584"
+     id="text3218-0"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="904.23828"
+       y="444.8584"
+       id="tspan3220-9">300</tspan></text>
+  <text
+     x="804.26758"
+     y="444.8584"
+     id="text3218-71"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="804.26758"
+       y="444.8584"
+       id="tspan3220-15">200</tspan></text>
+  <text
+     x="703.90137"
+     y="444.8584"
+     id="text3218-76"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="703.90137"
+       y="444.8584"
+       id="tspan3220-73">100</tspan></text>
+  <text
+     x="469.51172"
+     y="444.8584"
+     id="text3218-5"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="469.51172"
+       y="444.8584"
+       id="tspan3220-6">–100</tspan></text>
+  <text
+     x="369.51172"
+     y="444.8584"
+     id="text3218-94"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="369.51172"
+       y="444.8584"
+       id="tspan3220-8">–200</tspan></text>
+  <text
+     x="269.51172"
+     y="444.8584"
+     id="text3218-93"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="269.51172"
+       y="444.8584"
+       id="tspan3220-90">–300</tspan></text>
+  <text
+     x="169.51172"
+     y="444.8584"
+     id="text3218-85"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="169.51172"
+       y="444.8584"
+       id="tspan3220-0">–400</tspan></text>
+  <text
+     x="69.511719"
+     y="444.8584"
+     id="text3218-3"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="69.511719"
+       y="444.8584"
+       id="tspan3220-85">–500</tspan></text>
+  <text
+     x="571.51172"
+     y="544.8584"
+     id="text3218-1"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="571.51172"
+       y="544.8584"
+       id="tspan3220-5">–100</tspan></text>
+  <text
+     x="571.51172"
+     y="644.8584"
+     id="text3218-4"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="571.51172"
+       y="644.8584"
+       id="tspan3220-81">–200</tspan></text>
+  <text
+     x="571.51172"
+     y="744.8584"
+     id="text3218-30"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="571.51172"
+       y="744.8584"
+       id="tspan3220-44">–300</tspan></text>
+  <text
+     x="571.51172"
+     y="844.8584"
+     id="text3218-47"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="571.51172"
+       y="844.8584"
+       id="tspan3220-63">–400</tspan></text>
+  <text
+     x="604.34082"
+     y="444.8584"
+     id="text3218-96"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="604.34082"
+       y="444.8584"
+       id="tspan3220-21">0</tspan></text>
+  <text
+     x="69.140625"
+     y="43.681641"
+     id="text3218-2-7"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="69.140625"
+       y="43.681641"
+       id="tspan3220-26-8">(–500, 400)</tspan></text>
+  <text
+     x="1074.1406"
+     y="43.681641"
+     id="text3218-2-7-5"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="1074.1406"
+       y="43.681641"
+       id="tspan3220-26-8-7">(500, 400)</tspan></text>
+  <text
+     x="1074.1406"
+     y="843.68164"
+     id="text3218-2-7-1"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="1074.1406"
+       y="843.68164"
+       id="tspan3220-26-8-8">(500, –400)</tspan></text>
+  <text
+     x="69.140625"
+     y="843.68164"
+     id="text3218-2-7-1-5"
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+       x="69.140625"
+       y="843.68164"
+       id="tspan3220-26-8-8-9">(–500, –400)</tspan></text>
+</svg>
--
cgit v0.9.1