From dc857861e87a224dacb3ff4f3712e2bd50b37395 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Sun, 27 Feb 2011 18:34:42 +0000
Subject: clean up block names and alignments

---
(limited to 'TurtleArt')

diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py
index 7ccfba3..c52a096 100644
--- a/TurtleArt/tablock.py
+++ b/TurtleArt/tablock.py
@@ -385,10 +385,12 @@ class Block:
                              self.tw.running_sugar)
                 n = 0
         for i in range(n):
-            if self.name in COMPARE_PORCH_STYLE or \
-               self.name in NUMBER_STYLE_PORCH:  # special case
+            if self.name in COMPARE_PORCH_STYLE:
                 self.spr.set_label_attributes(int(self._font_size[0] + 0.5),
                                               True, 'center', 'bottom', i)
+            elif self.name in NUMBER_STYLE_PORCH:
+                self.spr.set_label_attributes(int(self._font_size[0] + 0.5),
+                                              True, 'right', 'bottom', i)
             elif i == 1:  # top
                 self.spr.set_label_attributes(int(self._font_size[1] + 0.5),
                                               True, 'right', 'top', i)
diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index 886bfa3..80738fa 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -358,7 +358,7 @@ BLOCK_NAMES = {
     'comment': [_('comment')],
     'cyan': [_('cyan')],
     'decription': [' '],
-    'division2': ['   /'],
+    'division2': ['/'],
     'empty': [_('empty trash')],
     'equal2': ['='],
     'extras': [_('extras')],
@@ -390,7 +390,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)', ' '],
@@ -412,7 +412,7 @@ BLOCK_NAMES = {
     'picture2x1': [' '],
     'picture1x2': [' '],
     'pitch': [_('pitch')],
-    'plus2': [' + '],
+    'plus2': ['+'],
     'polar': [_('polar')],
     'pop': [_('pop')],
     'portfolio': [_('portfolio')],
@@ -424,7 +424,7 @@ BLOCK_NAMES = {
     'random': [_('random'), _('min'), _('max')],
     'readpixel': [_('read pixel')],
     'red': [_('red')],
-    'remainder2': ['   ' + _('mod')],
+    'remainder2': [_('mod')],
     'repeat': [' ', _('repeat')],
     'reskin': [_('turtle shell')],
     'resistance': [_('resistance')],
@@ -804,6 +804,7 @@ SPECIAL_NAMES = {
     'number': _('number'),
     'plus2': _('plus'),
     'product2': _('multiply'),
+    'remainder2': _('mod'),
     'repeat': _('repeat'),
     'sandwichtop_no_label': _('top of a collapsible stack'),
     'sandwichbottom': _('bottom of a collapsible stack'),
--
cgit v0.9.1