From 6c56adbc990b82b25256805cf683ef0dde5b28b8 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Thu, 05 Jul 2012 18:54:38 +0000
Subject: refactoring of sandwich blocks to use clamp

---
(limited to 'TurtleArt/taconstants.py')

diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index e246b03..92ce9eb 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -91,7 +91,8 @@ EXPANDABLE_STYLE = ['boolean-style', 'compare-porch-style', 'compare-style',
                     'number-style-block', 'box-style-media']
 
 # Fixme: this should be based on styles
-EXPANDABLE_FLOW = ['repeat', 'until', 'while', 'if', 'forever', 'ifelse']
+EXPANDABLE_FLOW = ['repeat', 'until', 'while', 'if', 'forever', 'ifelse',
+                   'sandwichclamp']
 
 EXPANDABLE = ['vspace', 'hspace', 'identity2']
 
@@ -99,6 +100,7 @@ EXPANDABLE_ARGS = ['list', 'myfunc1arg', 'myfunc2arg', 'myfunc3arg',
                    'userdefined', 'userdefined2args', 'userdefined3args']
 #
 # Blocks that are 'collapsible'
+# Deprecated
 #
 COLLAPSIBLE = ['sandwichbottom', 'sandwichcollapsed']
 
@@ -221,12 +223,8 @@ VOICES = {'af': 'afrikaans', 'cy': 'welsh-test', 'el': 'greek',
 # Macros (groups of blocks)
 #
 MACROS = {
-    'ifthenelse':
+    'ifthenelse':  # Because it is too big to fit on the palette
               [[0, 'ifelse', 0, 0, [None, None, None, None]]],
-    'clamp':
-              [[0, 'sandwichtop_no_label', 0, 0, [None, 1]],
-               [1, 'vspace', 0, 0, [0, 2]],
-               [2, 'sandwichbottom', 0, 0, [1, None]]],
     'kbinput':
               [[0, 'until', 0, 0, [None, 1, 4, None]],
                [1, 'greater2', 0, 0, [0, 2, 3, None]],
--
cgit v0.9.1