clean up portfolio block macros

1 files changed, 18 insertions, 24 deletions

diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index 43ae9bc..1cedaa3 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -344,7 +344,7 @@ MACROS = {
      [5, ['number', '0.1'], 0, 0, [4, None]],
      [6, 'kbinput', 0, 0, [4, None]]],
     'picturelist':
-    [[0, 'sandwichtop_no_label', 0, 0, [None, 1]],
+    [[0, ['sandwichclamp', 252], 0, 0, [None, 1, None]],
      [1, 'penup', 0, 0, [0, 2]],
      [2, 'setxy2', 0, 0, [1, 3, 4, 5]],
      [3, 'titlex', 0, 0, [2, None]],
@@ -361,12 +361,11 @@ MACROS = {
      [14, 'pendown', 0, 0, [11, 15]],
      [15, 'setscale', 0, 0, [14, 16, 17]],
      [16, ['number', '67'], 0, 0, [15, None]],
-     [17, 'list', 0, 0, [15, 18, 19, 20]],
+     [17, 'list', 0, 0, [15, 18, 19, None]],
      [18, ['string', '∙ '], 0, 0, [17, None]],
-     [19, ['string', '∙ '], 0, 0, [17, None]],
-     [20, 'sandwichbottom', 0, 0, [17, None]]],
+     [19, ['string', '∙ '], 0, 0, [17, None]]],
     'picture1x1a':
-    [[0, 'sandwichtop_no_label', 0, 0, [None, 1]],
+    [[0, ['sandwichclamp', 231], 0, 0, [None, 1, None]],
      [1, 'penup', 0, 0, [0, 2]],
      [2, 'setxy2', 0, 0, [1, 3, 4, 5]],
      [3, 'titlex', 0, 0, [2, None]],
@@ -383,11 +382,10 @@ MACROS = {
      [14, 'pendown', 0, 0, [11, 15]],
      [15, 'setscale', 0, 0, [14, 16, 17]],
      [16, ['number', '90'], 0, 0, [15, None]],
-     [17, 'showaligned', 0, 0, [15, 18, 19]],
-     [18, 'journal', 0, 0, [17, None]],
-     [19, 'sandwichbottom', 0, 0, [17, None]]],
+     [17, 'showaligned', 0, 0, [15, 18, None]],
+     [18, 'journal', 0, 0, [17, None]]],
     'picture2x2':
-    [[0, 'sandwichtop_no_label', 0, 0, [None, 1]],
+    [[0, ['sandwichclamp', 546], 0, 0, [None, 1, None]],
      [1, 'penup', 0, 0, [0, 2]],
      [2, 'setxy2', 0, 0, [1, 3, 4, 5]],
      [3, 'titlex', 0, 0, [2, None]],
@@ -425,11 +423,10 @@ MACROS = {
      [35, 'rightx', 0, 0, [34, None]],
      [36, 'bottomy', 0, 0, [34, None]],
      [37, 'pendown', 0, 0, [34, 38]],
-     [38, 'showaligned', 0, 0, [37, 39, 40]],
-     [39, 'journal', 0, 0, [38, None]],
-     [40, 'sandwichbottom', 0, 0, [38, None]]],
+     [38, 'showaligned', 0, 0, [37, 39, None]],
+     [39, 'journal', 0, 0, [38, None]]],
     'picture1x2':
-    [[0, 'sandwichtop_no_label', 0, 0, [None, 1]],
+    [[0, ['sandwichclamp', 546], 0, 0, [None, 1, None]],
      [1, 'penup', 0, 0, [0, 2]],
      [2, 'setxy2', 0, 0, [1, 3, 4, 5]],
      [3, 'titlex', 0, 0, [2, None]],
@@ -467,11 +464,10 @@ MACROS = {
      [35, 'rightx', 0, 0, [34, None]],
      [36, 'bottomy', 0, 0, [34, None]],
      [37, 'pendown', 0, 0, [34, 38]],
-     [38, 'showaligned', 0, 0, [37, 39, 40]],
-     [39, 'description', 0, 0, [38, None]],
-     [40, 'sandwichbottom', 0, 0, [38, None]]],
+     [38, 'showaligned', 0, 0, [37, 39, None]],
+     [39, 'description', 0, 0, [38, None]]],
     'picture2x1':
-    [[0, 'sandwichtop_no_label', 0, 0, [None, 1]],
+    [[0, ['sandwichclamp', 546], 0, 0, [None, 1, None]],
      [1, 'penup', 0, 0, [0, 2]],
      [2, 'setxy2', 0, 0, [1, 3, 4, 5]],
      [3, 'titlex', 0, 0, [2, None]],
@@ -509,11 +505,10 @@ MACROS = {
      [35, 'rightx', 0, 0, [34, None]],
      [36, 'bottomy', 0, 0, [34, None]],
      [37, 'pendown', 0, 0, [34, 38]],
-     [38, 'showaligned', 0, 0, [37, 39, 40]],
-     [39, 'description', 0, 0, [38, None]],
-     [40, 'sandwichbottom', 0, 0, [38, None]]],
+     [38, 'showaligned', 0, 0, [37, 39, None]],
+     [39, 'description', 0, 0, [38, None]]],
     'picture1x1':
-    [[0, 'sandwichtop_no_label', 0, 0, [None, 1]],
+    [[0, ['sandwichclamp', 336], 0, 0, [None, 1, None]],
      [1, 'penup', 0, 0, [0, 2]],
      [2, 'setxy2', 0, 0, [1, 3, 4, 5]],
      [3, 'titlex', 0, 0, [2, None]],
@@ -537,9 +532,8 @@ MACROS = {
      [21, 'rightx', 0, 0, [20, None]],
      [22, 'topy', 0, 0, [20, None]],
      [23, 'pendown', 0, 0, [20, 24]],
-     [24, 'showaligned', 0, 0, [23, 25, 26]],
-     [25, 'description', 0, 0, [24, None]],
-     [26, 'sandwichbottom', 0, 0, [24, None]]],
+     [24, 'showaligned', 0, 0, [23, 25, None]],
+     [25, 'description', 0, 0, [24, None]]],
     'reskin':
     [[0, 'skin', 0, 0, [None, 1, None]],
      [1, 'journal', 0, 0, [0, None]]]}