From 38a5cbecfceaf98f624fbd6cb052423cfb4886d1 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Thu, 24 Feb 2011 23:38:22 +0000
Subject: reposition labels on minus, divide, mod, greater than and less than blocks to make order of arguments less ambiguous

---
diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py
index 463784a..7ccfba3 100644
--- a/TurtleArt/tablock.py
+++ b/TurtleArt/tablock.py
@@ -385,7 +385,11 @@ class Block:
                              self.tw.running_sugar)
                 n = 0
         for i in range(n):
-            if i == 1:  # top
+            if self.name in COMPARE_PORCH_STYLE or \
+               self.name in NUMBER_STYLE_PORCH:  # special case
+                self.spr.set_label_attributes(int(self._font_size[0] + 0.5),
+                                              True, 'center', 'bottom', i)
+            elif i == 1:  # top
                 self.spr.set_label_attributes(int(self._font_size[1] + 0.5),
                                               True, 'right', 'top', i)
             elif i == 2:  # bottom
diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index 40b12f1..61b64a0 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -318,7 +318,7 @@ BLOCK_NAMES = {
     'comment': [_('comment')],
     'cyan': [_('cyan')],
     'decription': [' '],
-    'division2': ['/'],
+    'division2': ['   /'],
     'empty': [_('empty trash')],
     'equal2': ['='],
     'extras': [_('extras')],
@@ -328,7 +328,7 @@ BLOCK_NAMES = {
     'forward': [_('forward')],
     'fullscreen': [_('full screen')],
     'gray': [_('gray')],
-    'greater2': [">"],
+    'greater2': ['>'],
     'green': [_('green')],
     'hat': [_('action')],
     'hat1': [_('action 1')],
@@ -350,7 +350,7 @@ BLOCK_NAMES = {
     'less2': ['<'],
     'list': ['list'],
     'mediawait': [_('media wait')],
-    'minus2': ['–'],
+    'minus2': ['   –'],
     'myfunc': [_('Python'), 'f(x)', 'x'],
     'myfunc1arg': [_('Python'), 'f(x)', 'x'],
     'myfunc2arg': [_('Python'), 'f(x,y)', ' '],
@@ -384,7 +384,7 @@ BLOCK_NAMES = {
     'random': [_('random'), _('min'), _('max')],
     'readpixel': [_('read pixel')],
     'red': [_('red')],
-    'remainder2': [_('mod')],
+    'remainder2': ['   ' + _('mod')],
     'repeat': [' ', _('repeat')],
     'reskin': [_('turtle shell')],
     'resistance': [_('resistance')],
diff --git a/TurtleArt/tasprite_factory.py b/TurtleArt/tasprite_factory.py
index 3e2f708..7dd5b88 100755
--- a/TurtleArt/tasprite_factory.py
+++ b/TurtleArt/tasprite_factory.py
@@ -375,7 +375,6 @@ class SVG:
                                   self._scale)
         self.margins[1] = int(self._stroke_width * self._scale)
         self.margins[2] = int(self._stroke_width * self._scale)
-        self.margins[3] = int(self._stroke_width * self._scale)
         return self.header() + svg
 
     def turtle(self, colors):
--
cgit v0.9.1