From a705ec6401be821f25147470c668f5de2d273ef8 Mon Sep 17 00:00:00 2001 From: U-BRIAN-X60\Brian Silverman Date: Mon, 03 Dec 2007 20:47:15 +0000 Subject: Improved graphics --- diff --git a/NEWS b/NEWS index eb5027d..c2b72f7 100755 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +6 + +* Graphics changes + 5 * Multi instance happy diff --git a/activity/activity.info b/activity/activity.info index 23d9be0..637fd86 100755 --- a/activity/activity.info +++ b/activity/activity.info @@ -3,5 +3,5 @@ name = TurtleArt service_name = org.laptop.TurtleArtActivity class = TurtleArtActivity.TurtleArtActivity icon = activity-turtleart -activity_version = 5 +activity_version = 6 show_launcher = yes diff --git a/flow/flowgroup.gif b/flow/flowgroup.gif index caeb659..516859a 100755 --- a/flow/flowgroup.gif +++ b/flow/flowgroup.gif Binary files differ diff --git a/flow/flowmask.gif b/flow/flowmask.gif index 3369f1d..3ae8e5f 100755 --- a/flow/flowmask.gif +++ b/flow/flowmask.gif Binary files differ diff --git a/flow/myblocksgroup.gif b/flow/myblocksgroup.gif new file mode 100755 index 0000000..e4ad8ca --- /dev/null +++ b/flow/myblocksgroup.gif Binary files differ diff --git a/myblocks/myblocksgroup.gif b/myblocks/myblocksgroup.gif index 51df41e..049ff85 100755 --- a/myblocks/myblocksgroup.gif +++ b/myblocks/myblocksgroup.gif Binary files differ diff --git a/myblocks/myblocksmask.gif b/myblocks/myblocksmask.gif index 5905411..c09da1c 100755 --- a/myblocks/myblocksmask.gif +++ b/myblocks/myblocksmask.gif Binary files differ diff --git a/numbers/numbersgroup.gif b/numbers/numbersgroup.gif index fc6d458..3108073 100755 --- a/numbers/numbersgroup.gif +++ b/numbers/numbersgroup.gif Binary files differ diff --git a/numbers/numbersmask.gif b/numbers/numbersmask.gif index 7df1fc6..9509618 100755 --- a/numbers/numbersmask.gif +++ b/numbers/numbersmask.gif Binary files differ diff --git a/palette/flowoff.gif b/palette/flowoff.gif index d6c5313..c5c970d 100755 --- a/palette/flowoff.gif +++ b/palette/flowoff.gif Binary files differ diff --git a/palette/flowon.gif b/palette/flowon.gif index c3e4c20..7cc8228 100755 --- a/palette/flowon.gif +++ b/palette/flowon.gif Binary files differ diff --git a/palette/myblocksoff.gif b/palette/myblocksoff.gif index 4caf057..b2fc719 100755 --- a/palette/myblocksoff.gif +++ b/palette/myblocksoff.gif Binary files differ diff --git a/palette/myblockson.gif b/palette/myblockson.gif index 8c19095..a42ce92 100755 --- a/palette/myblockson.gif +++ b/palette/myblockson.gif Binary files differ diff --git a/palette/numbersoff.gif b/palette/numbersoff.gif index 4e1f2c1..1762ace 100755 --- a/palette/numbersoff.gif +++ b/palette/numbersoff.gif Binary files differ diff --git a/palette/numberson.gif b/palette/numberson.gif index ac66ef3..08b278e 100755 --- a/palette/numberson.gif +++ b/palette/numberson.gif Binary files differ diff --git a/palette/penoff.gif b/palette/penoff.gif index 165af4c..12776c2 100755 --- a/palette/penoff.gif +++ b/palette/penoff.gif Binary files differ diff --git a/palette/penon.gif b/palette/penon.gif index 25a4829..bab1b7e 100755 --- a/palette/penon.gif +++ b/palette/penon.gif Binary files differ diff --git a/palette/turtleoff.gif b/palette/turtleoff.gif index 7aa8fe4..856a3a3 100755 --- a/palette/turtleoff.gif +++ b/palette/turtleoff.gif Binary files differ diff --git a/palette/turtleon.gif b/palette/turtleon.gif index 7b660c9..0656d62 100755 --- a/palette/turtleon.gif +++ b/palette/turtleon.gif Binary files differ diff --git a/pen/pengroup.gif b/pen/pengroup.gif index dfc270f..662e67c 100755 --- a/pen/pengroup.gif +++ b/pen/pengroup.gif Binary files differ diff --git a/pen/penmask.gif b/pen/penmask.gif index 1031adb..d35282d 100755 --- a/pen/penmask.gif +++ b/pen/penmask.gif Binary files differ diff --git a/samples/birds.ta b/samples/birds.ta index 4144a07..f485463 100755 --- a/samples/birds.ta +++ b/samples/birds.ta @@ -274,15 +274,15 @@ aNatp94 a(I28 S'clean' p95 -I150 -I122 +I232 +I138 (lp96 NaI29 atp97 a(I29 g36 -I150 -I161 +I232 +I177 (lp98 I28 aI30 @@ -293,16 +293,16 @@ a(I30 S'30' p100 tp101 -I236 -I170 +I318 +I186 (lp102 I29 aNatp103 a(I31 S'stack1' p104 -I245 -I210 +I327 +I226 (lp105 I29 aNatp106 diff --git a/samples/bubbles.ta b/samples/bubbles.ta index 2583b7a..dd60345 100755 --- a/samples/bubbles.ta +++ b/samples/bubbles.ta @@ -2,10 +2,11 @@ (I0 S'setcolor' p1 -I128 -I60 +I219 +I125 (lp2 -NaI1 +I25 +aI1 aI2 atp3 a(I1 @@ -14,16 +15,16 @@ p4 S'60' p5 tp6 -I202 -I77 +I293 +I142 (lp7 I0 aNatp8 a(I2 S'repeat' p9 -I128 -I114 +I219 +I179 (lp10 I0 aI3 @@ -34,16 +35,16 @@ a(I3 S'5000' p12 tp13 -I214 -I123 +I305 +I188 (lp14 I2 aNatp15 a(I4 S'setxy' p16 -I223 -I163 +I314 +I228 (lp17 I2 aI5 @@ -53,8 +54,8 @@ atp18 a(I5 S'random' p19 -I297 -I153 +I388 +I218 (lp20 I4 aI6 @@ -65,8 +66,8 @@ a(I6 S'-600' p22 tp23 -I325 -I172 +I416 +I237 (lp24 I5 aNatp25 @@ -75,15 +76,15 @@ a(I7 S'600' p26 tp27 -I447 -I172 +I538 +I237 (lp28 I5 aNatp29 a(I8 g19 -I297 -I190 +I388 +I255 (lp30 I4 aI9 @@ -94,8 +95,8 @@ a(I9 S'-450' p32 tp33 -I325 -I209 +I416 +I274 (lp34 I8 aNatp35 @@ -104,16 +105,16 @@ a(I10 S'450' p36 tp37 -I447 -I209 +I538 +I274 (lp38 I8 aNatp39 a(I11 S'storeinbox1' p40 -I223 -I239 +I314 +I304 (lp41 I4 aI12 @@ -122,8 +123,8 @@ atp42 a(I12 S'ycor' p43 -I297 -I256 +I388 +I321 (lp44 I11 aI13 @@ -131,8 +132,8 @@ atp45 a(I13 S'plus' p46 -I390 -I248 +I481 +I313 (lp47 I12 aI14 @@ -142,16 +143,16 @@ a(I14 S'900' p49 tp50 -I429 -I256 +I520 +I321 (lp51 I13 aNatp52 a(I15 S'setpensize' p53 -I223 -I293 +I314 +I358 (lp54 I11 aI16 @@ -160,8 +161,8 @@ atp55 a(I16 S'box1' p56 -I297 -I310 +I388 +I375 (lp57 I15 aI17 @@ -169,8 +170,8 @@ atp58 a(I17 S'division' p59 -I390 -I302 +I481 +I367 (lp60 I16 aI18 @@ -180,16 +181,16 @@ a(I18 S'9' p62 tp63 -I429 -I310 +I520 +I375 (lp64 I17 aNatp65 a(I19 S'setshade' p66 -I223 -I347 +I314 +I412 (lp67 I15 aI20 @@ -197,16 +198,16 @@ aI23 atp68 a(I20 g56 -I297 -I364 +I388 +I429 (lp69 I19 aI21 atp70 a(I21 g59 -I390 -I356 +I481 +I421 (lp71 I20 aI22 @@ -216,16 +217,16 @@ a(I22 S'12' p73 tp74 +I520 I429 -I364 (lp75 I21 aNatp76 a(I23 S'forward' p77 -I223 -I401 +I314 +I466 (lp78 I19 aI24 @@ -235,19 +236,27 @@ a(I24 S'1' p80 tp81 -I297 -I410 +I388 +I475 (lp82 I23 aNatp83 +a(I25 +S'clean' +p84 +I219 +I86 +(lp85 +NaI0 +atp86 a(I-1 S'turtle' -p84 +p87 I-204 I-436 I0 F60.0 F38.666666666666664 F51.555555555555557 -tp85 +tp88 a. \ No newline at end of file diff --git a/samples/candyvortex.ta b/samples/candyvortex.ta index 9060fef..c399cee 100755 --- a/samples/candyvortex.ta +++ b/samples/candyvortex.ta @@ -1,143 +1,152 @@ (lp0 (I0 -S'repeat' +S'clean' p1 I212 -I116 +I77 (lp2 NaI1 -aI2 -aNatp3 +atp3 a(I1 -(S'number' +S'repeat' p4 +I212 +I116 +(lp5 +I0 +aI2 +aI3 +aNatp6 +a(I2 +(S'number' +p7 I350 -tp5 +tp8 I298 I125 -(lp6 -I0 -aNatp7 -a(I2 +(lp9 +I1 +aNatp10 +a(I3 S'setpensize' -p8 +p11 I307 I165 -(lp9 -I0 -aI3 +(lp12 +I1 aI4 -atp10 -a(I3 +aI5 +atp13 +a(I4 S'heading' -p11 +p14 I381 I182 -(lp12 -I2 -aNatp13 -a(I4 +(lp15 +I3 +aNatp16 +a(I5 S'forward' -p14 +p17 I307 I219 -(lp15 -I2 -aI5 +(lp18 +I3 aI6 -atp16 -a(I5 -(g4 +aI7 +atp19 +a(I6 +(g7 S'1000' -p17 -tp18 +p20 +tp21 I381 I228 -(lp19 -I4 -aNatp20 -a(I6 +(lp22 +I5 +aNatp23 +a(I7 S'setcolor' -p21 +p24 I307 I258 -(lp22 -I4 -aI7 +(lp25 +I5 aI8 -atp23 -a(I7 +aI9 +atp26 +a(I8 S'xcor' -p24 +p27 I381 I275 -(lp25 -I6 -aNatp26 -a(I8 +(lp28 +I7 +aNatp29 +a(I9 S'setshade' -p27 +p30 I307 I312 -(lp28 -I6 -aI9 +(lp31 +I7 aI10 -atp29 -a(I9 +aI11 +atp32 +a(I10 S'ycor' -p30 +p33 I381 I329 -(lp31 -I8 -aNatp32 -a(I10 +(lp34 +I9 +aNatp35 +a(I11 S'back' -p33 +p36 I307 I366 -(lp34 -I8 -aI11 +(lp37 +I9 aI12 -atp35 -a(I11 -(g4 +aI13 +atp38 +a(I12 +(g7 S'1000' -p36 -tp37 +p39 +tp40 I381 I375 -(lp38 -I10 -aNatp39 -a(I12 -S'left' -p40 -I307 -I405 (lp41 -I10 -aI13 +I11 aNatp42 a(I13 -(g4 +S'left' +p43 +I307 +I405 +(lp44 +I11 +aI14 +aNatp45 +a(I14 +(g7 I1 -tp43 +tp46 I381 I414 -(lp44 -I12 -aNatp45 +(lp47 +I13 +aNatp48 a(I-1 S'turtle' -p46 -F0.0 -F0.0 +p49 +I-524 +I384 F10.0 F190.8089953765448 F981.62718344766392 F11.0 -tp47 +tp50 a. \ No newline at end of file diff --git a/samples/colors.ta b/samples/colors.ta index 5819d26..c7b7c16 100755 --- a/samples/colors.ta +++ b/samples/colors.ta @@ -5,8 +5,9 @@ p1 I202 I114 (lp2 -NaI1 -aI2 +I2 +aI1 +aI3 atp3 a(I1 (S'number' @@ -20,106 +21,114 @@ I131 I0 aNatp8 a(I2 -S'repeat' +S'clean' p9 I202 -I168 +I75 (lp10 +NaI0 +atp11 +a(I3 +S'repeat' +p12 +I202 +I168 +(lp13 I0 -aI3 aI4 -aNatp11 -a(I3 +aI5 +aNatp14 +a(I4 (g4 I360 -tp12 +tp15 I288 I177 -(lp13 -I2 -aNatp14 -a(I4 +(lp16 +I3 +aNatp17 +a(I5 S'setcolor' -p15 +p18 I297 I217 -(lp16 -I2 -aI5 +(lp19 +I3 aI6 -atp17 -a(I5 +aI7 +atp20 +a(I6 S'heading' -p18 +p21 I371 I234 -(lp19 -I4 -aNatp20 -a(I6 +(lp22 +I5 +aNatp23 +a(I7 S'forward' -p21 +p24 I297 I271 -(lp22 -I4 -aI7 +(lp25 +I5 aI8 -atp23 -a(I7 +aI9 +atp26 +a(I8 (g4 I1000 -tp24 +tp27 I371 I280 -(lp25 -I6 -aNatp26 -a(I8 +(lp28 +I7 +aNatp29 +a(I9 S'back' -p27 +p30 I297 I310 -(lp28 -I6 -aI9 +(lp31 +I7 aI10 -atp29 -a(I9 +aI11 +atp32 +a(I10 (g4 I1000 -tp30 +tp33 I371 I319 -(lp31 -I8 -aNatp32 -a(I10 -S'right' -p33 -I297 -I349 (lp34 -I8 -aI11 +I9 aNatp35 a(I11 +S'right' +p36 +I297 +I349 +(lp37 +I9 +aI12 +aNatp38 +a(I12 (g4 I1 -tp36 +tp39 I371 I358 -(lp37 -I10 -aNatp38 +(lp40 +I11 +aNatp41 a(I-1 S'turtle' -p39 +p42 F0.0 F0.0 F0.0 F359.0 I50 F15.0 -tp40 +tp43 a. \ No newline at end of file diff --git a/samples/csquiral.ta b/samples/csquiral.ta index 6682f0d..647b5b2 100755 --- a/samples/csquiral.ta +++ b/samples/csquiral.ta @@ -1,201 +1,210 @@ (lp0 (I0 -S'setpensize' +S'clean' p1 -I163 -I114 +I207 +I67 (lp2 NaI1 -aI2 atp3 a(I1 -(S'number' +S'setpensize' p4 -S'25' -p5 -tp6 -I237 -I131 -(lp7 +I207 +I106 +(lp5 I0 -aNatp8 +aI2 +aI3 +atp6 a(I2 -S'storeinbox1' -p9 -I163 -I168 +(S'number' +p7 +S'25' +p8 +tp9 +I281 +I123 (lp10 -I0 -aI3 -aI4 -atp11 +I1 +aNatp11 a(I3 -(g4 -S'0' +S'storeinbox1' p12 -tp13 -I237 -I185 -(lp14 -I2 -aNatp15 +I207 +I160 +(lp13 +I1 +aI4 +aI5 +atp14 a(I4 -S'repeat' -p16 -I163 -I222 +(g7 +S'0' +p15 +tp16 +I281 +I177 (lp17 -I2 -aI5 -aI6 +I3 aNatp18 a(I5 -(g4 -S'1300' +S'repeat' p19 -tp20 -I249 -I231 -(lp21 -I4 -aNatp22 +I207 +I214 +(lp20 +I3 +aI6 +aI7 +aNatp21 a(I6 -S'setcolor' -p23 -I258 -I271 +(g7 +S'1300' +p22 +tp23 +I293 +I223 (lp24 -I4 -aI7 -aI10 -atp25 +I5 +aNatp25 a(I7 -S'xcor' +S'setcolor' p26 -I332 -I288 +I302 +I263 (lp27 -I6 +I5 aI8 +aI11 atp28 a(I8 -S'division' +S'xcor' p29 -I425 +I376 I280 (lp30 I7 aI9 atp31 a(I9 -(g4 -S'6' +S'division' p32 -tp33 -I464 -I288 -(lp34 +I469 +I272 +(lp33 I8 -aNatp35 +aI10 +atp34 a(I10 -S'setshade' -p36 -I258 -I325 +(g7 +S'6' +p35 +tp36 +I508 +I280 (lp37 -I6 -aI11 -aI12 -atp38 +I9 +aNatp38 a(I11 -S'heading' +S'setshade' p39 -I332 -I342 +I302 +I317 (lp40 -I10 -aNatp41 +I7 +aI12 +aI13 +atp41 a(I12 -S'forward' +S'heading' p42 -I258 -I379 +I376 +I334 (lp43 -I10 -aI13 -aI14 -atp44 +I11 +aNatp44 a(I13 -S'box1' +S'forward' p45 -I332 -I388 +I302 +I371 (lp46 -I12 -aNatp47 +I11 +aI14 +aI15 +atp47 a(I14 -S'right' +S'box1' p48 -I258 -I418 +I376 +I380 (lp49 -I12 -aI15 -aI16 -atp50 +I13 +aNatp50 a(I15 -(g4 -S'91' +S'right' p51 -tp52 -I332 -I427 -(lp53 -I14 -aNatp54 -a(I16 -g9 -I258 -I457 -(lp55 -I14 +I302 +I410 +(lp52 +I13 +aI16 aI17 -aNatp56 +atp53 +a(I16 +(g7 +S'91' +p54 +tp55 +I376 +I419 +(lp56 +I15 +aNatp57 a(I17 -g45 -I332 -I474 -(lp57 -I16 +g12 +I302 +I449 +(lp58 +I15 aI18 -atp58 +aNatp59 a(I18 -S'plus' -p59 -I425 +g48 +I376 I466 (lp60 I17 aI19 atp61 a(I19 -(g4 -S'1' +S'plus' p62 -tp63 -I464 -I474 -(lp64 +I469 +I458 +(lp63 I18 -aNatp65 +aI20 +atp64 +a(I20 +(g7 +S'1' +p65 +tp66 +I508 +I466 +(lp67 +I19 +aNatp68 a(I-1 S'turtle' -p66 +p69 F906.80942086435073 F86.478356202884811 F220.0 F-17.117197178042431 F129.0 F25.0 -tp67 +tp70 a. \ No newline at end of file diff --git a/samples/curlygates.png b/samples/curlygates.png index 15ca901..cc18802 100755 --- a/samples/curlygates.png +++ b/samples/curlygates.png Binary files differ diff --git a/samples/curlygates.ta b/samples/curlygates.ta index 53b1c6f..b739008 100755 --- a/samples/curlygates.ta +++ b/samples/curlygates.ta @@ -1,469 +1,469 @@ (lp0 (I0 -S'fillscreen' +S'hat1' p1 -I137 -I130 +I752 +I51 (lp2 NaI1 -aI2 -aI3 atp3 a(I1 -(S'number' +S'repeat' p4 -S'50' -p5 -tp6 -I211 -I139 -(lp7 +I764 +I101 +(lp5 I0 -aNatp8 +aI2 +aI3 +aNatp6 a(I2 -(g4 -S'30' -p9 -tp10 -I211 -I176 -(lp11 -I0 -aNatp12 +(S'number' +p7 +S'3' +p8 +tp9 +I850 +I110 +(lp10 +I1 +aNatp11 a(I3 -S'repeat' -p13 -I137 -I206 -(lp14 -I0 +S'storeinbox1' +p12 +I859 +I150 +(lp13 +I1 aI4 aI5 -aNatp15 +atp14 a(I4 -(g4 -S'20' -p16 -tp17 -I223 -I215 -(lp18 +(g7 +S'200' +p15 +tp16 +I933 +I167 +(lp17 I3 -aNatp19 +aNatp18 a(I5 -S'setxy' -p20 -I232 -I255 -(lp21 +g4 +I859 +I204 +(lp19 I3 aI6 -aI9 -aI12 -atp22 +aI7 +aNatp20 a(I6 -S'random' -p23 -I306 -I245 -(lp24 +(g7 +S'20' +p21 +tp22 +I945 +I213 +(lp23 I5 -aI7 -aI8 -aNatp25 +aNatp24 a(I7 -(g4 -S'-570' -p26 -tp27 -I334 -I264 -(lp28 -I6 -aNatp29 -a(I8 -(g4 -S'570' -p30 -tp31 -I456 -I264 -(lp32 -I6 -aNatp33 -a(I9 -g23 -I306 -I282 -(lp34 +S'arc' +p25 +I954 +I253 +(lp26 I5 +aI8 +aI9 aI10 -aI11 -aNatp35 +atp27 +a(I8 +(g7 +S'30' +p28 +tp29 +I1028 +I262 +(lp30 +I7 +aNatp31 +a(I9 +S'box1' +p32 +I1028 +I299 +(lp33 +I7 +aNatp34 a(I10 -(g4 -S'-440' -p36 -tp37 -I334 -I301 -(lp38 -I9 -aNatp39 +g12 +I954 +I329 +(lp35 +I7 +aI11 +aNatp36 a(I11 -(g4 -S'440' -p40 -tp41 -I456 -I301 -(lp42 -I9 -aNatp43 +g32 +I1028 +I346 +(lp37 +I10 +aI12 +atp38 a(I12 -S'seth' -p44 -I232 -I331 -(lp45 -I5 +S'division' +p39 +I1121 +I338 +(lp40 +I11 aI13 -aI16 -atp46 +atp41 a(I13 -g23 -I306 -I321 -(lp47 +(g7 +S'1.2' +p42 +tp43 +I1160 +I346 +(lp44 I12 -aI14 -aI15 -aNatp48 +aNatp45 a(I14 -(g4 -S'0' -p49 -tp50 -I334 -I340 -(lp51 -I13 -aNatp52 +S'hat2' +p46 +I708 +I263 +(lp47 +NaI15 +atp48 a(I15 -(g4 -S'360' -p53 -tp54 -I456 -I340 -(lp55 -I13 -aNatp56 +S'setcolor' +p49 +I720 +I313 +(lp50 +I14 +aI16 +aI17 +atp51 a(I16 -S'stack2' -p57 -I232 -I370 -(lp58 -I12 -aNatp59 +(g7 +S'20' +p52 +tp53 +I794 +I330 +(lp54 +I15 +aNatp55 a(I17 -S'hat2' -p60 -I647 -I304 -(lp61 -NaI18 -atp62 +S'setshade' +p56 +I720 +I367 +(lp57 +I15 +aI18 +aI19 +atp58 a(I18 -S'setcolor' +(g7 +S'60' +p59 +tp60 +I794 +I384 +(lp61 +I17 +aNatp62 +a(I19 +S'setpensize' p63 -I659 -I354 +I720 +I421 (lp64 I17 -aI19 aI20 +aI21 atp65 -a(I19 -(g4 +a(I20 +(g7 S'20' p66 tp67 -I733 -I371 +I794 +I438 (lp68 -I18 +I19 aNatp69 -a(I20 -S'setshade' +a(I21 +S'stack1' p70 -I659 -I408 +I720 +I475 (lp71 -I18 -aI21 +I19 aI22 atp72 -a(I21 -(g4 -S'60' -p73 -tp74 -I733 -I425 -(lp75 -I20 -aNatp76 a(I22 -S'setpensize' -p77 -I659 -I462 -(lp78 -I20 +g49 +I720 +I514 +(lp73 +I21 aI23 aI24 -atp79 +atp74 a(I23 -(g4 -S'20' -p80 -tp81 -I733 -I479 -(lp82 +(g7 +S'0' +p75 +tp76 +I794 +I531 +(lp77 I22 -aNatp83 +aNatp78 a(I24 -S'stack1' -p84 -I659 -I516 -(lp85 +g56 +I720 +I568 +(lp79 I22 aI25 -atp86 +aI28 +atp80 a(I25 -g63 -I659 -I555 -(lp87 +S'random' +p81 +I794 +I566 +(lp82 I24 aI26 aI27 -atp88 +aNatp83 a(I26 -(g4 -g49 +(g7 +S'60' +p84 +tp85 +I822 +I585 +(lp86 +I25 +aNatp87 +a(I27 +(g7 +S'80' +p88 tp89 -I733 -I572 +I944 +I585 (lp90 I25 aNatp91 -a(I27 -g70 -I659 -I609 -(lp92 -I25 -aI28 -aI31 -atp93 a(I28 -g23 -I733 -I607 -(lp94 -I27 +g63 +I720 +I622 +(lp92 +I24 aI29 aI30 -aNatp95 +atp93 a(I29 -(g4 -S'60' -p96 -tp97 -I761 -I626 -(lp98 +(g7 +S'12' +p94 +tp95 +I794 +I639 +(lp96 I28 -aNatp99 +aNatp97 a(I30 -(g4 -S'80' -p100 -tp101 -I883 -I626 -(lp102 +g70 +I720 +I676 +(lp98 I28 -aNatp103 +aNatp99 a(I31 -g77 -I659 -I663 -(lp104 -I27 -aI32 +S'fillscreen' +p100 +I224 +I113 +(lp101 +NaI32 aI33 -atp105 +aI34 +atp102 a(I32 -(g4 -S'12' -p106 -tp107 -I733 -I680 -(lp108 +(g7 +S'50' +p103 +tp104 +I298 +I122 +(lp105 I31 -aNatp109 +aNatp106 a(I33 -g84 -I659 -I717 -(lp110 +(g7 +S'30' +p107 +tp108 +I298 +I159 +(lp109 I31 -aNatp111 +aNatp110 a(I34 -S'hat1' -p112 -I670 -I65 -(lp113 -NaI35 -atp114 +g4 +I224 +I189 +(lp111 +I31 +aI35 +aI36 +aNatp112 a(I35 -g13 -I682 -I115 +(g7 +S'20' +p113 +tp114 +I310 +I198 (lp115 I34 -aI36 -aI37 aNatp116 a(I36 -(g4 -S'3' +S'setxy' p117 -tp118 -I768 -I124 -(lp119 -I35 -aNatp120 +I319 +I238 +(lp118 +I34 +aI37 +aI40 +aI43 +atp119 a(I37 -S'storeinbox1' -p121 -I777 -I164 -(lp122 -I35 +g81 +I393 +I228 +(lp120 +I36 aI38 aI39 -atp123 +aNatp121 a(I38 -(g4 -S'200' -p124 -tp125 -I851 -I181 -(lp126 +(g7 +S'-570' +p122 +tp123 +I421 +I247 +(lp124 I37 -aNatp127 +aNatp125 a(I39 -g13 -I777 -I218 +(g7 +S'570' +p126 +tp127 +I543 +I247 (lp128 I37 -aI40 -aI41 aNatp129 a(I40 -(g4 -S'20' -p130 -tp131 -I863 -I227 -(lp132 -I39 -aNatp133 -a(I41 -S'arc' -p134 -I872 -I267 -(lp135 -I39 +g81 +I393 +I265 +(lp130 +I36 +aI41 aI42 -aI43 -aI44 -atp136 +aNatp131 +a(I41 +(g7 +S'-440' +p132 +tp133 +I421 +I284 +(lp134 +I40 +aNatp135 a(I42 -(g4 -S'30' -p137 -tp138 -I946 -I276 -(lp139 -I41 -aNatp140 +(g7 +S'440' +p136 +tp137 +I543 +I284 +(lp138 +I40 +aNatp139 a(I43 -S'box1' -p141 -I946 -I313 -(lp142 -I41 -aNatp143 +S'seth' +p140 +I319 +I314 +(lp141 +I36 +aI44 +aI47 +atp142 a(I44 -g121 -I872 -I343 -(lp144 -I41 +g81 +I393 +I304 +(lp143 +I43 aI45 -aNatp145 +aI46 +aNatp144 a(I45 -g141 -I946 -I360 +(g7 +g75 +tp145 +I421 +I323 (lp146 I44 -aI46 -atp147 +aNatp147 a(I46 -S'division' +(g7 +S'360' p148 -I1039 -I352 -(lp149 -I45 -aI47 -atp150 +tp149 +I543 +I323 +(lp150 +I44 +aNatp151 a(I47 -(g4 -S'1.2' -p151 -tp152 -I1078 -I360 +S'stack2' +p152 +I319 +I353 (lp153 -I46 +I43 aNatp154 a(I-1 S'turtle' p155 -F-54.000000000000028 -F-435.00000000000006 -F251.0 +F397.99999999999983 +F-386.00000000000097 +F115.0 F0.0 -I71 +I74 F12.0 tp156 a. \ No newline at end of file diff --git a/samples/dots.ta b/samples/dots.ta index c5abca9..6c35cdc 100755 --- a/samples/dots.ta +++ b/samples/dots.ta @@ -1,225 +1,233 @@ (lp0 (I0 -S'setcolor' +S'clean' p1 I241 -I101 +I62 (lp2 NaI1 -aI2 atp3 a(I1 -(S'number' +S'setcolor' p4 +I241 +I101 +(lp5 +I0 +aI2 +aI3 +atp6 +a(I2 +(S'number' +p7 S'0' -p5 -tp6 +p8 +tp9 I315 I118 -(lp7 -I0 -aNatp8 -a(I2 -S'clean' -p9 -I241 -I155 (lp10 -I0 -aI3 -atp11 +I1 +aNatp11 a(I3 +g1 +I241 +I155 +(lp12 +I1 +aI4 +atp13 +a(I4 S'setpensize' -p12 +p14 I241 I194 -(lp13 -I2 -aI4 +(lp15 +I3 aI5 -atp14 -a(I4 -(g4 +aI6 +atp16 +a(I5 +(g7 S'20' -p15 -tp16 +p17 +tp18 I315 I211 -(lp17 -I3 -aNatp18 -a(I5 +(lp19 +I4 +aNatp20 +a(I6 S'storeinbox1' -p19 +p21 I241 I248 -(lp20 -I3 -aI6 +(lp22 +I4 aI7 -atp21 -a(I6 -(g4 -g5 -tp22 +aI8 +atp23 +a(I7 +(g7 +g8 +tp24 I315 I265 -(lp23 -I5 -aNatp24 -a(I7 +(lp25 +I6 +aNatp26 +a(I8 S'repeat' -p25 +p27 I241 I302 -(lp26 -I5 -aI8 +(lp28 +I6 aI9 -aNatp27 -a(I8 -(g4 +aI10 +aNatp29 +a(I9 +(g7 S'1000' -p28 -tp29 +p30 +tp31 I327 I311 -(lp30 -I7 -aNatp31 -a(I9 +(lp32 +I8 +aNatp33 +a(I10 S'pendown' -p32 +p34 I336 I351 -(lp33 -I7 -aI10 -atp34 -a(I10 +(lp35 +I8 +aI11 +atp36 +a(I11 S'forward' -p35 +p37 I336 I390 -(lp36 -I9 -aI11 +(lp38 +I10 aI12 -atp37 -a(I11 -(g4 +aI13 +atp39 +a(I12 +(g7 S'1' -p38 -tp39 +p40 +tp41 I410 I399 -(lp40 -I10 -aNatp41 -a(I12 +(lp42 +I11 +aNatp43 +a(I13 S'penup' -p42 +p44 I336 I429 -(lp43 -I10 -aI13 -atp44 -a(I13 -g35 -I336 -I468 (lp45 -I12 +I11 aI14 -aI15 atp46 a(I14 +g37 +I336 +I468 +(lp47 +I13 +aI15 +aI16 +atp48 +a(I15 S'box1' -p47 +p49 I410 I477 -(lp48 -I13 -aNatp49 -a(I15 +(lp50 +I14 +aNatp51 +a(I16 S'right' -p50 +p52 I336 I507 -(lp51 -I13 -aI16 +(lp53 +I14 aI17 -atp52 -a(I16 -(g4 +aI18 +atp54 +a(I17 +(g7 S'93' -p53 -tp54 +p55 +tp56 I410 I516 -(lp55 -I15 -aNatp56 -a(I17 -g19 -I336 -I546 (lp57 -I15 -aI18 -aI21 -atp58 +I16 +aNatp58 a(I18 -g47 -I410 -I563 +g21 +I336 +I546 (lp59 -I17 +I16 aI19 +aI22 atp60 a(I19 -S'plus' -p61 -I503 -I555 -(lp62 +g49 +I410 +I563 +(lp61 I18 aI20 -atp63 +atp62 a(I20 -(g4 -g38 -tp64 -I542 -I563 -(lp65 +S'plus' +p63 +I503 +I555 +(lp64 I19 -aNatp66 +aI21 +atp65 a(I21 -g1 -I336 -I600 +(g7 +g40 +tp66 +I542 +I563 (lp67 -I17 -aI22 +I20 aNatp68 a(I22 -g47 -I410 -I617 +g4 +I336 +I600 (lp69 -I21 +I18 +aI23 aNatp70 +a(I23 +g49 +I410 +I617 +(lp71 +I22 +aNatp72 a(I-1 S'turtle' -p71 +p73 F-195.08137186354315 F661.36192458837445 F120.0 F1000.0 I50 F20.0 -tp72 +tp74 a. \ No newline at end of file diff --git a/samples/flower.ta b/samples/flower.ta index 1f45e42..0f6ce72 100755 --- a/samples/flower.ta +++ b/samples/flower.ta @@ -125,8 +125,9 @@ p43 I206 I69 (lp44 -NaI14 -aI15 +I15 +aI14 +aI16 atp45 a(I14 (g7 @@ -139,150 +140,158 @@ I86 I13 aNatp49 a(I15 +S'clean' +p50 +I206 +I30 +(lp51 +NaI13 +atp52 +a(I16 g4 I206 I123 -(lp50 +(lp53 I13 -aI16 aI17 -aNatp51 -a(I16 +aI18 +aNatp54 +a(I17 (g7 S'300' -p52 -tp53 +p55 +tp56 I292 I132 -(lp54 -I15 -aNatp55 -a(I17 +(lp57 +I16 +aNatp58 +a(I18 S'setshade' -p56 +p59 I301 I172 -(lp57 -I15 -aI18 -aI21 -atp58 -a(I18 +(lp60 +I16 +aI19 +aI22 +atp61 +a(I19 (g7 S'100' -p59 -tp60 +p62 +tp63 I375 I189 -(lp61 -I17 -aI19 -atp62 -a(I19 -S'minus' -p63 -I468 -I181 (lp64 I18 aI20 atp65 a(I20 +S'minus' +p66 +I468 +I181 +(lp67 +I19 +aI21 +atp68 +a(I21 g15 I507 I189 -(lp66 -I19 -aNatp67 -a(I21 +(lp69 +I20 +aNatp70 +a(I22 S'setcolor' -p68 +p71 I301 I226 -(lp69 -I17 -aI22 -aI25 -atp70 -a(I22 +(lp72 +I18 +aI23 +aI26 +atp73 +a(I23 g15 I375 I243 -(lp71 -I21 -aI23 -atp72 -a(I23 -S'division' -p73 -I468 -I235 (lp74 I22 aI24 atp75 a(I24 +S'division' +p76 +I468 +I235 +(lp77 +I23 +aI25 +atp78 +a(I25 (g7 S'3' -p76 -tp77 +p79 +tp80 I507 I243 -(lp78 -I23 -aNatp79 -a(I25 +(lp81 +I24 +aNatp82 +a(I26 S'stack2' -p80 +p83 I301 I280 -(lp81 -I21 -aI26 -atp82 -a(I26 +(lp84 +I22 +aI27 +atp85 +a(I27 g43 I301 I319 -(lp83 -I25 -aI27 -aNatp84 -a(I27 -g15 -I375 -I336 -(lp85 +(lp86 I26 aI28 -atp86 +aNatp87 a(I28 -S'plus' -p87 -I468 -I328 +g15 +I375 +I336 (lp88 I27 aI29 atp89 a(I29 +S'plus' +p90 +I468 +I328 +(lp91 +I28 +aI30 +atp92 +a(I30 (g7 S'1' -p90 -tp91 +p93 +tp94 I507 I336 -(lp92 -I28 -aNatp93 +(lp95 +I29 +aNatp96 a(I-1 S'turtle' -p94 +p97 F1.3812950783176348e-11 F-7.4464878707658499e-11 F0.0 F99.666666666666671 F-199.0 I5 -tp95 +tp98 a. \ No newline at end of file diff --git a/samples/fountain.png b/samples/fountain.png index 6f4d424..687919e 100755 --- a/samples/fountain.png +++ b/samples/fountain.png Binary files differ diff --git a/samples/fountain.ta b/samples/fountain.ta index 00a9626..f6ca625 100755 --- a/samples/fountain.ta +++ b/samples/fountain.ta @@ -412,7 +412,7 @@ p137 F609.99999999906686 F-450.00000000254568 F40.000000000009074 -I21 +I22 F85.0 F3.0 tp138 diff --git a/samples/rainbow.ta b/samples/rainbow.ta index bf36d27..6ceaf12 100755 --- a/samples/rainbow.ta +++ b/samples/rainbow.ta @@ -2,16 +2,16 @@ (I0 S'clean' p1 -I191 -I35 +I227 +I63 (lp2 NaI1 atp3 a(I1 S'setcolor' p4 -I191 -I74 +I227 +I102 (lp5 I0 aI2 @@ -23,16 +23,16 @@ p7 S'50' p8 tp9 -I265 -I91 +I301 +I119 (lp10 I1 aNatp11 a(I3 S'setpensize' p12 -I191 -I128 +I227 +I156 (lp13 I1 aI4 @@ -43,16 +43,16 @@ a(I4 S'15' p15 tp16 -I265 -I145 +I301 +I173 (lp17 I3 aNatp18 a(I5 S'repeat' p19 -I191 -I182 +I227 +I210 (lp20 I3 aI6 @@ -62,15 +62,15 @@ a(I6 (g7 I360 tp22 -I277 -I191 +I313 +I219 (lp23 I5 aNatp24 a(I7 g4 -I286 -I231 +I322 +I259 (lp25 I5 aI8 @@ -79,8 +79,8 @@ atp26 a(I8 S'heading' p27 -I360 -I248 +I396 +I276 (lp28 I7 aI9 @@ -88,8 +88,8 @@ atp29 a(I9 S'product' p30 -I453 -I240 +I489 +I268 (lp31 I8 aI10 @@ -99,8 +99,8 @@ a(I10 S'100' p33 tp34 -I492 -I248 +I528 +I276 (lp35 I9 aI11 @@ -108,8 +108,8 @@ atp36 a(I11 S'division' p37 -I585 -I240 +I621 +I268 (lp38 I10 aI12 @@ -118,16 +118,16 @@ a(I12 (g7 I360 tp40 -I624 -I248 +I660 +I276 (lp41 I11 aNatp42 a(I13 S'forward' p43 -I286 -I285 +I322 +I313 (lp44 I7 aI14 @@ -138,16 +138,16 @@ a(I14 S'1000' p46 tp47 -I360 -I294 +I396 +I322 (lp48 I13 aNatp49 a(I15 S'back' p50 -I286 -I324 +I322 +I352 (lp51 I13 aI16 @@ -158,16 +158,16 @@ a(I16 S'1000' p53 tp54 -I360 -I333 +I396 +I361 (lp55 I15 aNatp56 a(I17 S'right' p57 -I286 -I363 +I322 +I391 (lp58 I15 aI18 @@ -176,8 +176,8 @@ a(I18 (g7 I1 tp60 -I360 -I372 +I396 +I400 (lp61 I17 aNatp62 diff --git a/samples/redwisp.ta b/samples/redwisp.ta index 3158a7d..497d3a6 100755 --- a/samples/redwisp.ta +++ b/samples/redwisp.ta @@ -222,133 +222,142 @@ aNatp73 a(I23 S'setpensize' p74 -I162 -I124 +I228 +I140 (lp75 -NaI24 -aI25 +I25 +aI24 +aI26 atp76 a(I24 (g7 S'15' p77 tp78 -I236 -I141 +I302 +I157 (lp79 I23 aNatp80 a(I25 +S'clean' +p81 +I228 +I101 +(lp82 +NaI23 +atp83 +a(I26 g4 -I162 -I178 -(lp81 +I228 +I194 +(lp84 I23 -aI26 aI27 -aNatp82 -a(I26 +aI28 +aNatp85 +a(I27 (g7 S'360' -p83 -tp84 -I248 -I187 -(lp85 -I25 -aNatp86 -a(I27 -S'storeinbox1' -p87 -I257 -I227 +p86 +tp87 +I314 +I203 (lp88 -I25 -aI28 -aI31 -atp89 +I26 +aNatp89 a(I28 -S'heading' +S'storeinbox1' p90 -I331 -I244 +I323 +I243 (lp91 -I27 +I26 aI29 +aI32 atp92 a(I29 -S'product' +S'heading' p93 -I424 -I236 +I397 +I260 (lp94 I28 aI30 atp95 a(I30 -(g7 -S'600' +S'product' p96 -tp97 -I463 -I244 -(lp98 +I490 +I252 +(lp97 I29 -aNatp99 +aI31 +atp98 a(I31 -S'setshade' -p100 -I257 -I281 +(g7 +S'600' +p99 +tp100 +I529 +I260 (lp101 -I27 -aI32 -aI35 -atp102 +I30 +aNatp102 a(I32 -S'box1' +S'setshade' p103 -I331 -I298 +I323 +I297 (lp104 -I31 +I28 aI33 +aI36 atp105 a(I33 -S'division' +S'box1' p106 -I424 -I290 +I397 +I314 (lp107 I32 aI34 atp108 a(I34 -(g7 -S'360' +S'division' p109 -tp110 -I463 -I298 -(lp111 +I490 +I306 +(lp110 I33 -aNatp112 +aI35 +atp111 a(I35 -S'stack1' -p113 -I257 -I335 +(g7 +S'360' +p112 +tp113 +I529 +I314 (lp114 -I31 +I34 aNatp115 +a(I36 +S'stack1' +p116 +I323 +I351 +(lp117 +I32 +aNatp118 a(I-1 S'turtle' -p116 -I-552 -I376 +p119 +I-559 +I403 F0.0 I0 F598.33333333333337 F15.0 -tp117 +tp120 a. \ No newline at end of file diff --git a/samples/reflections.ta b/samples/reflections.ta index e112aa3..77c6a7e 100755 --- a/samples/reflections.ta +++ b/samples/reflections.ta @@ -2,16 +2,16 @@ (I0 S'clean' p1 -I119 -I61 +I243 +I63 (lp2 NaI1 atp3 a(I1 S'setpensize' p4 -I119 -I100 +I243 +I102 (lp5 I0 aI2 @@ -23,16 +23,16 @@ p7 S'15' p8 tp9 -I193 -I117 +I317 +I119 (lp10 I1 aNatp11 a(I3 S'storeinbox1' p12 -I119 -I154 +I243 +I156 (lp13 I1 aI4 @@ -43,16 +43,16 @@ a(I4 S'6200' p15 tp16 -I193 -I171 +I317 +I173 (lp17 I3 aNatp18 a(I5 S'repeat' p19 -I119 -I208 +I243 +I210 (lp20 I3 aI6 @@ -63,16 +63,16 @@ a(I6 S'6200' p22 tp23 -I205 -I217 +I329 +I219 (lp24 I5 aNatp25 a(I7 S'storeinbox2' p26 -I214 -I257 +I338 +I259 (lp27 I5 aI8 @@ -81,8 +81,8 @@ atp28 a(I8 S'box1' p29 -I288 -I274 +I412 +I276 (lp30 I7 aI9 @@ -90,8 +90,8 @@ atp31 a(I9 S'division' p32 -I381 -I266 +I505 +I268 (lp33 I8 aI10 @@ -101,16 +101,16 @@ a(I10 S'50' p35 tp36 -I420 -I274 +I544 +I276 (lp37 I9 aNatp38 a(I11 S'setshade' p39 -I214 -I311 +I338 +I313 (lp40 I7 aI12 @@ -121,8 +121,8 @@ a(I12 S'100' p42 tp43 -I288 -I328 +I412 +I330 (lp44 I11 aI13 @@ -130,8 +130,8 @@ atp45 a(I13 S'minus' p46 -I381 -I320 +I505 +I322 (lp47 I12 aI14 @@ -139,16 +139,16 @@ atp48 a(I14 S'box2' p49 -I420 -I328 +I544 +I330 (lp50 I13 aNatp51 a(I15 S'forward' p52 -I214 -I365 +I338 +I367 (lp53 I11 aI16 @@ -156,16 +156,16 @@ aI19 atp54 a(I16 g29 -I288 -I374 +I412 +I376 (lp55 I15 aI17 atp56 a(I17 g32 -I381 -I366 +I505 +I368 (lp57 I16 aI18 @@ -175,16 +175,16 @@ a(I18 S'8' p59 tp60 -I420 -I374 +I544 +I376 (lp61 I17 aNatp62 a(I19 S'back' p63 -I214 -I404 +I338 +I406 (lp64 I15 aI20 @@ -192,16 +192,16 @@ aI23 atp65 a(I20 g29 -I288 -I413 +I412 +I415 (lp66 I19 aI21 atp67 a(I21 g32 -I381 -I405 +I505 +I407 (lp68 I20 aI22 @@ -210,16 +210,16 @@ a(I22 (g7 g59 tp70 -I420 -I413 +I544 +I415 (lp71 I21 aNatp72 a(I23 S'right' p73 -I214 -I443 +I338 +I445 (lp74 I19 aI24 @@ -230,15 +230,15 @@ a(I24 S'1' p76 tp77 -I288 -I452 +I412 +I454 (lp78 I23 aNatp79 a(I25 g12 -I214 -I482 +I338 +I484 (lp80 I23 aI26 @@ -246,16 +246,16 @@ aI29 atp81 a(I26 g29 -I288 -I499 +I412 +I501 (lp82 I25 aI27 atp83 a(I27 g46 -I381 -I491 +I505 +I493 (lp84 I26 aI28 @@ -264,24 +264,24 @@ a(I28 (g7 g76 tp86 -I420 -I499 +I544 +I501 (lp87 I27 aNatp88 a(I29 S'setcolor' p89 -I214 -I536 +I338 +I538 (lp90 I25 aI30 aNatp91 a(I30 g29 -I288 -I553 +I412 +I555 (lp92 I29 aNatp93 diff --git a/samples/smoothcandy.ta b/samples/smoothcandy.ta index c65a175..5002195 100755 --- a/samples/smoothcandy.ta +++ b/samples/smoothcandy.ta @@ -233,8 +233,8 @@ aNatp75 a(I-1 S'turtle' p76 -I-558 -I383 +I-563 +I412 F10.0 F3.6666666666666665 F94.5 diff --git a/samples/square.ta b/samples/square.ta index 7cc3252..6f394b2 100755 --- a/samples/square.ta +++ b/samples/square.ta @@ -2,8 +2,8 @@ (I0 S'repeat' p1 -I853 -I277 +I245 +I139 (lp2 NaI1 aI2 @@ -13,16 +13,16 @@ a(I1 p4 I4 tp5 -I939 -I286 +I331 +I148 (lp6 I0 aNatp7 a(I2 S'forward' p8 -I948 -I326 +I340 +I188 (lp9 I0 aI3 @@ -32,16 +32,16 @@ a(I3 (g4 I200 tp11 -I1022 -I335 +I414 +I197 (lp12 I2 aNatp13 a(I4 S'right' p14 -I948 -I365 +I340 +I227 (lp15 I2 aI5 @@ -50,8 +50,8 @@ a(I5 (g4 I90 tp17 -I1022 -I374 +I414 +I236 (lp18 I4 aNatp19 diff --git a/samples/squares.ta b/samples/squares.ta index 4886245..e8e86f0 100755 --- a/samples/squares.ta +++ b/samples/squares.ta @@ -1,114 +1,123 @@ (lp0 (I0 -S'repeat' +S'clean' p1 -I765 -I94 +I261 +I118 (lp2 NaI1 -aI2 -aNatp3 +atp3 a(I1 -(S'number' +S'repeat' p4 -I36 -tp5 -I851 -I103 -(lp6 -I0 -aNatp7 -a(I2 -g1 -I860 -I143 -(lp8 +I261 +I157 +(lp5 I0 +aI2 aI3 -aI4 -aI8 -atp9 +aNatp6 +a(I2 +(S'number' +p7 +I36 +tp8 +I347 +I166 +(lp9 +I1 +aNatp10 a(I3 -(g4 -I4 -tp10 -I946 -I152 +g4 +I356 +I206 (lp11 -I2 -aNatp12 +I1 +aI4 +aI5 +aI9 +atp12 a(I4 -S'forward' -p13 -I955 -I192 +(g7 +I4 +tp13 +I442 +I215 (lp14 -I2 -aI5 -aI6 -atp15 +I3 +aNatp15 a(I5 -(g4 -S'300' +S'forward' p16 -tp17 -I1029 -I201 -(lp18 -I4 -aNatp19 +I451 +I255 +(lp17 +I3 +aI6 +aI7 +atp18 a(I6 -S'right' -p20 -I955 -I231 +(g7 +S'300' +p19 +tp20 +I525 +I264 (lp21 -I4 -aI7 +I5 aNatp22 a(I7 -(g4 -I90 -tp23 -I1029 -I240 +S'right' +p23 +I451 +I294 (lp24 -I6 +I5 +aI8 aNatp25 a(I8 -S'vspace' -p26 -I860 -I233 +(g7 +I90 +tp26 +I525 +I303 (lp27 -I2 -aI9 -atp28 +I7 +aNatp28 a(I9 -g20 -I860 -I302 -(lp29 -I8 +S'vspace' +p29 +I356 +I296 +(lp30 +I3 aI10 -aNatp30 +atp31 a(I10 -(g4 -I10 -tp31 -I934 -I311 +g23 +I356 +I365 (lp32 I9 +aI11 aNatp33 +a(I11 +(g7 +I10 +tp34 +I430 +I374 +(lp35 +I10 +aNatp36 a(I-1 S'turtle' -p34 +p37 F-2.8421709430404007e-13 F-1.0587086762825493e-12 F0.0 I0 I50 I5 -tp35 +tp38 a. \ No newline at end of file diff --git a/samples/squiral.ta b/samples/squiral.ta index 2881645..0dda1a5 100755 --- a/samples/squiral.ta +++ b/samples/squiral.ta @@ -2,16 +2,16 @@ (I0 S'clean' p1 -I714 -I181 +I258 +I72 (lp2 NaI1 atp3 a(I1 S'storeinbox1' p4 -I714 -I220 +I258 +I111 (lp5 I0 aI2 @@ -22,16 +22,16 @@ a(I2 p7 I0 tp8 -I788 -I237 +I332 +I128 (lp9 I1 aNatp10 a(I3 S'repeat' p11 -I714 -I274 +I258 +I165 (lp12 I1 aI4 @@ -42,16 +42,16 @@ a(I4 S'300' p14 tp15 -I800 -I283 +I344 +I174 (lp16 I3 aNatp17 a(I5 S'forward' p18 -I809 -I323 +I353 +I214 (lp19 I3 aI6 @@ -60,16 +60,16 @@ atp20 a(I6 S'box1' p21 -I883 -I332 +I427 +I223 (lp22 I5 aNatp23 a(I7 S'right' p24 -I809 -I362 +I353 +I253 (lp25 I5 aI8 @@ -79,23 +79,23 @@ a(I8 (g7 I91 tp27 -I883 -I371 +I427 +I262 (lp28 I7 aNatp29 a(I9 g4 -I809 -I401 +I353 +I292 (lp30 I7 aI10 aNatp31 a(I10 g21 -I883 -I418 +I427 +I309 (lp32 I9 aI11 @@ -103,8 +103,8 @@ atp33 a(I11 S'plus' p34 -I976 -I410 +I520 +I301 (lp35 I10 aI12 @@ -113,8 +113,8 @@ a(I12 (g7 I5 tp37 -I1015 -I418 +I559 +I309 (lp38 I11 aNatp39 diff --git a/samples/sunrise.png b/samples/sunrise.png index b796f24..6dd091e 100755 --- a/samples/sunrise.png +++ b/samples/sunrise.png Binary files differ diff --git a/samples/sunrise.ta b/samples/sunrise.ta index 90467a2..d42ec63 100755 --- a/samples/sunrise.ta +++ b/samples/sunrise.ta @@ -2,16 +2,16 @@ (I0 S'hat1' p1 -I224 -I79 +I714 +I94 (lp2 NaI1 atp3 a(I1 S'setxy' p4 -I236 -I129 +I726 +I144 (lp5 I0 aI2 @@ -24,8 +24,8 @@ p7 S'0' p8 tp9 -I310 -I138 +I800 +I153 (lp10 I1 aNatp11 @@ -33,16 +33,16 @@ a(I3 (g7 g8 tp12 -I310 -I175 +I800 +I190 (lp13 I1 aNatp14 a(I4 S'seth' p15 -I236 -I205 +I726 +I220 (lp16 I1 aI5 @@ -51,8 +51,8 @@ atp17 a(I5 S'random' p18 -I310 -I195 +I800 +I210 (lp19 I4 aI6 @@ -62,8 +62,8 @@ a(I6 (g7 g8 tp21 -I338 -I214 +I828 +I229 (lp22 I5 aNatp23 @@ -72,257 +72,257 @@ a(I7 S'360' p24 tp25 -I460 -I214 +I950 +I229 (lp26 I5 aNatp27 a(I8 S'repeat' p28 -I236 -I244 +I726 +I259 (lp29 I4 -aI33 aI9 +aI10 aNatp30 a(I9 -S'setcolor' +(g7 +S'20' p31 -I331 -I293 -(lp32 +tp32 +I812 +I268 +(lp33 I8 -aI15 -aI10 -atp33 +aNatp34 a(I10 -S'forward' -p34 -I331 -I347 -(lp35 -I9 -aI20 +S'setcolor' +p35 +I821 +I308 +(lp36 +I8 aI11 -atp36 +aI14 +atp37 a(I11 -S'right' -p37 -I331 -I386 +g18 +I895 +I306 (lp38 I10 -aI17 aI12 -atp39 +aI13 +aNatp39 a(I12 -g31 -I331 -I425 -(lp40 +S'box1' +p40 +I923 +I325 +(lp41 I11 -aI16 -aI13 -atp41 +aNatp42 a(I13 -g34 -I331 -I479 -(lp42 -I12 -aI18 -aI14 -atp43 +S'box2' +p43 +I1045 +I325 +(lp44 +I11 +aNatp45 a(I14 -S'left' -p44 -I331 -I518 -(lp45 -I13 -aI19 -aNatp46 -a(I15 -g18 -I405 -I291 +S'forward' +p46 +I821 +I362 (lp47 -I9 -aI29 -aI30 -aNatp48 -a(I16 +I10 +aI15 +aI18 +atp48 +a(I15 g18 -I405 -I423 +I895 +I352 (lp49 -I12 -aI31 -aI32 +I14 +aI16 +aI17 aNatp50 -a(I17 -g18 -I405 -I376 -(lp51 -I11 -aI23 -aI24 -aNatp52 -a(I18 -g18 -I405 -I469 +a(I16 +(g7 +S'10' +p51 +tp52 +I923 +I371 (lp53 -I13 -aI25 -aI26 +I15 aNatp54 -a(I19 -g18 -I405 -I508 -(lp55 +a(I17 +(g7 +S'30' +p55 +tp56 +I1045 +I371 +(lp57 +I15 +aNatp58 +a(I18 +S'right' +p59 +I821 +I401 +(lp60 I14 -aI27 -aI28 -aNatp56 -a(I20 +aI19 +aI22 +atp61 +a(I19 g18 -I405 -I337 -(lp57 -I10 +I895 +I391 +(lp62 +I18 +aI20 aI21 -aI22 -aNatp58 +aNatp63 +a(I20 +(g7 +S'30' +p64 +tp65 +I923 +I410 +(lp66 +I19 +aNatp67 a(I21 (g7 -S'10' -p59 -tp60 -I433 -I356 -(lp61 -I20 -aNatp62 +S'40' +p68 +tp69 +I1045 +I410 +(lp70 +I19 +aNatp71 a(I22 -(g7 -S'30' -p63 -tp64 -I555 -I356 -(lp65 -I20 -aNatp66 +g35 +I821 +I440 +(lp72 +I18 +aI23 +aI26 +atp73 a(I23 -(g7 -S'30' -p67 -tp68 -I433 -I395 -(lp69 -I17 -aNatp70 +g18 +I895 +I438 +(lp74 +I22 +aI24 +aI25 +aNatp75 a(I24 -(g7 -S'40' -p71 -tp72 -I555 -I395 -(lp73 -I17 -aNatp74 +g40 +I923 +I457 +(lp76 +I23 +aNatp77 a(I25 -(g7 -S'10' -p75 -tp76 -I433 -I488 -(lp77 -I18 -aNatp78 +g43 +I1045 +I457 +(lp78 +I23 +aNatp79 a(I26 -(g7 -S'30' -p79 -tp80 -I555 -I488 -(lp81 -I18 -aNatp82 +g46 +I821 +I494 +(lp80 +I22 +aI27 +aI30 +atp81 a(I27 -(g7 -S'30' -p83 -tp84 -I433 -I527 -(lp85 -I19 -aNatp86 +g18 +I895 +I484 +(lp82 +I26 +aI28 +aI29 +aNatp83 a(I28 (g7 -S'40' -p87 -tp88 -I555 -I527 -(lp89 -I19 -aNatp90 +S'10' +p84 +tp85 +I923 +I503 +(lp86 +I27 +aNatp87 a(I29 -S'box1' -p91 -I433 -I310 -(lp92 -I15 -aNatp93 +(g7 +S'30' +p88 +tp89 +I1045 +I503 +(lp90 +I27 +aNatp91 a(I30 -S'box2' -p94 -I555 -I310 +S'left' +p92 +I821 +I533 +(lp93 +I26 +aI31 +aNatp94 +a(I31 +g18 +I895 +I523 (lp95 -I15 +I30 +aI32 +aI33 aNatp96 -a(I31 -g91 -I433 -I442 -(lp97 -I16 -aNatp98 a(I32 -g94 -I555 -I442 +(g7 +S'30' +p97 +tp98 +I923 +I542 (lp99 -I16 +I31 aNatp100 a(I33 (g7 -S'20' +S'40' p101 tp102 -I322 -I253 +I1045 +I542 (lp103 -I8 +I31 aNatp104 a(I34 S'fillscreen' p105 -I791 -I52 +I232 +I98 (lp106 NaI35 aI36 @@ -332,8 +332,8 @@ a(I35 (g7 g8 tp108 -I865 -I61 +I306 +I107 (lp109 I34 aNatp110 @@ -341,16 +341,16 @@ a(I36 (g7 g8 tp111 -I865 -I98 +I306 +I144 (lp112 I34 aNatp113 a(I37 S'setpensize' p114 -I791 -I128 +I232 +I174 (lp115 I34 aI38 @@ -361,15 +361,15 @@ a(I38 S'6' p117 tp118 -I865 -I145 +I306 +I191 (lp119 I37 aNatp120 a(I39 g28 -I791 -I182 +I232 +I228 (lp121 I37 aI40 @@ -380,16 +380,16 @@ a(I40 S'300' p123 tp124 -I877 -I191 +I318 +I237 (lp125 I39 aNatp126 a(I41 S'storeinbox1' p127 -I886 -I231 +I327 +I277 (lp128 I39 aI42 @@ -400,16 +400,16 @@ a(I42 S'15' p130 tp131 -I960 -I248 +I401 +I294 (lp132 I41 aNatp133 a(I43 S'storeinbox2' p134 -I886 -I285 +I327 +I331 (lp135 I41 aI44 @@ -420,24 +420,24 @@ a(I44 S'20' p137 tp138 -I960 -I302 +I401 +I348 (lp139 I43 aNatp140 a(I45 S'stack1' p141 -I886 -I339 +I327 +I385 (lp142 I43 aI46 atp143 a(I46 g127 -I886 -I378 +I327 +I424 (lp144 I45 aI47 @@ -447,15 +447,15 @@ a(I47 (g7 g8 tp146 -I960 -I395 +I401 +I441 (lp147 I46 aNatp148 a(I48 g134 -I886 -I432 +I327 +I478 (lp149 I46 aI49 @@ -466,25 +466,25 @@ a(I49 S'10' p151 tp152 -I960 -I449 +I401 +I495 (lp153 I48 aNatp154 a(I50 g141 -I886 -I486 +I327 +I532 (lp155 I48 aNatp156 a(I-1 S'turtle' p157 -F666.32380685191617 -F230.72600351500273 -I60 -I3 +F-235.93079498629464 +F738.84933308777579 +I325 +I4 I50 F6.0 tp158 diff --git a/samples/xo-man.ta b/samples/xo-man.ta index 967bf24..2e684b5 100755 --- a/samples/xo-man.ta +++ b/samples/xo-man.ta @@ -1,498 +1,498 @@ (lp0 (I0 -S'hat2' +S'hat1' p1 -I66 -I315 +I768 +I28 (lp2 NaI1 atp3 a(I1 -S'setcolor' +S'left' p4 +I780 I78 -I365 (lp5 I0 aI2 -aI7 +aI3 atp6 a(I2 (S'number' p7 -S'0' +S'45' p8 tp9 -I152 -I382 +I854 +I87 (lp10 I1 -aI3 -atp11 +aNatp11 a(I3 -S'plus' +S'repeat' p12 -I245 -I374 +I780 +I117 (lp13 -I2 +I1 aI4 +aI5 +aI11 atp14 a(I4 -S'random' +(g7 +S'4' p15 -I284 -I363 -(lp16 +tp16 +I866 +I126 +(lp17 I3 -aI5 -aI6 -aNatp17 +aNatp18 a(I5 -(g7 -g8 -tp18 -I312 -I382 -(lp19 -I4 -aNatp20 +S'forward' +p19 +I875 +I166 +(lp20 +I3 +aI6 +aI7 +atp21 a(I6 (g7 -S'100' -p21 -tp22 -I434 -I382 -(lp23 -I4 -aNatp24 +S'75' +p22 +tp23 +I949 +I175 +(lp24 +I5 +aNatp25 a(I7 -S'setpensize' -p25 -I78 -I419 -(lp26 -I1 +S'back' +p26 +I875 +I205 +(lp27 +I5 aI8 aI9 -atp27 +atp28 a(I8 (g7 -S'40' -p28 -tp29 -I152 -I436 -(lp30 +S'75' +p29 +tp30 +I949 +I214 +(lp31 I7 -aNatp31 +aNatp32 a(I9 -S'stack1' -p32 -I78 -I473 +g4 +I875 +I244 (lp33 I7 aI10 -atp34 +aNatp34 a(I10 -g4 -I78 -I512 -(lp35 +(g7 +S'90' +p35 +tp36 +I949 +I253 +(lp37 I9 -aI11 -aI14 -atp36 +aNatp38 a(I11 -S'color' -p37 -I152 -I529 -(lp38 -I10 +S'vspace' +p39 +I780 +I207 +(lp40 +I3 aI12 -atp39 +atp41 a(I12 -g12 -I245 -I521 -(lp40 +S'right' +p42 +I780 +I276 +(lp43 I11 aI13 -atp41 +aI14 +atp44 a(I13 (g7 -S'10' -p42 -tp43 -I284 -I529 -(lp44 +S'45' +p45 +tp46 +I854 +I285 +(lp47 I12 -aNatp45 +aNatp48 a(I14 -g25 -I78 -I566 -(lp46 -I10 +S'penup' +p49 +I780 +I315 +(lp50 +I12 aI15 -aI18 -atp47 +atp51 a(I15 -S'pensize' -p48 -I152 -I583 -(lp49 +g19 +I780 +I354 +(lp52 I14 aI16 -atp50 -a(I16 -S'minus' -p51 -I245 -I575 -(lp52 -I15 aI17 atp53 -a(I17 +a(I16 (g7 -S'25' +S'90' p54 tp55 -I284 -I583 +I854 +I363 (lp56 -I16 +I15 aNatp57 +a(I17 +S'pendown' +p58 +I780 +I393 +(lp59 +I15 +aI18 +atp60 a(I18 -g32 -I78 -I620 -(lp58 -I14 -aNatp59 +S'setpensize' +p61 +I780 +I432 +(lp62 +I17 +aI19 +aI22 +atp63 a(I19 -S'hat1' -p60 -I768 -I28 -(lp61 -NaI20 -atp62 +S'pensize' +p64 +I854 +I449 +(lp65 +I18 +aI20 +atp66 a(I20 -S'left' -p63 -I780 -I78 -(lp64 +S'plus' +p67 +I947 +I441 +(lp68 I19 aI21 -aI22 -atp65 +atp69 a(I21 (g7 -S'45' -p66 -tp67 -I854 -I87 -(lp68 +S'35' +p70 +tp71 +I986 +I449 +(lp72 I20 -aNatp69 +aNatp73 a(I22 -S'repeat' -p70 +g19 I780 -I117 -(lp71 -I20 +I486 +(lp74 +I18 aI23 aI24 -aI30 -atp72 +atp75 a(I23 (g7 -S'4' -p73 -tp74 -I866 -I126 -(lp75 +S'1' +p76 +tp77 +I854 +I495 +(lp78 I22 -aNatp76 +aNatp79 a(I24 -S'forward' -p77 -I875 -I166 -(lp78 +g49 +I780 +I525 +(lp80 I22 aI25 -aI26 -atp79 +atp81 a(I25 -(g7 -S'75' -p80 -tp81 -I949 -I175 +g26 +I780 +I564 (lp82 I24 -aNatp83 +aI26 +aI27 +atp83 a(I26 -S'back' +(g7 +S'91' p84 -I875 -I205 -(lp85 -I24 -aI27 -aI28 -atp86 +tp85 +I854 +I573 +(lp86 +I25 +aNatp87 a(I27 -(g7 -S'75' -p87 -tp88 -I949 -I214 -(lp89 -I26 -aNatp90 +g58 +I780 +I603 +(lp88 +I25 +aI28 +atp89 a(I28 -g63 -I875 -I244 -(lp91 -I26 +g61 +I780 +I642 +(lp90 +I27 aI29 -aNatp92 +aNatp91 a(I29 -(g7 -S'90' -p93 -tp94 -I949 -I253 -(lp95 +g64 +I854 +I659 +(lp92 I28 -aNatp96 +aI30 +atp93 a(I30 -S'vspace' -p97 -I780 -I207 -(lp98 -I22 +S'minus' +p94 +I947 +I651 +(lp95 +I29 aI31 -atp99 +atp96 a(I31 -S'right' -p100 -I780 -I276 -(lp101 +(g7 +S'35' +p97 +tp98 +I986 +I659 +(lp99 I30 -aI32 -aI33 -atp102 +aNatp100 a(I32 -(g7 -S'45' -p103 -tp104 -I854 +S'hat2' +p101 +I273 +I353 +(lp102 +NaI33 +atp103 +a(I33 +S'setcolor' +p104 I285 +I403 (lp105 -I31 -aNatp106 -a(I33 -S'penup' -p107 -I780 -I315 -(lp108 -I31 +I32 aI34 -atp109 +aI39 +atp106 a(I34 -g77 -I780 -I354 -(lp110 +(g7 +S'0' +p107 +tp108 +I359 +I420 +(lp109 I33 aI35 -aI36 -atp111 +atp110 a(I35 -(g7 -S'90' -p112 -tp113 -I854 -I363 -(lp114 +g67 +I452 +I412 +(lp111 I34 -aNatp115 +aI36 +atp112 a(I36 -S'pendown' -p116 -I780 -I393 -(lp117 -I34 +S'random' +p113 +I491 +I401 +(lp114 +I35 aI37 -atp118 +aI38 +aNatp115 a(I37 -g25 -I780 -I432 -(lp119 +(g7 +g107 +tp116 +I519 +I420 +(lp117 I36 -aI38 -aI41 -atp120 +aNatp118 a(I38 -g48 -I854 -I449 +(g7 +S'100' +p119 +tp120 +I641 +I420 (lp121 -I37 -aI39 -atp122 +I36 +aNatp122 a(I39 -g12 -I947 -I441 +g61 +I285 +I457 (lp123 -I38 +I33 aI40 +aI41 atp124 a(I40 (g7 -S'35' +S'40' p125 tp126 -I986 -I449 +I359 +I474 (lp127 I39 aNatp128 a(I41 -g77 -I780 -I486 -(lp129 -I37 +S'stack1' +p129 +I285 +I511 +(lp130 +I39 aI42 -aI43 -atp130 +atp131 a(I42 -(g7 -S'1' -p131 -tp132 -I854 -I495 -(lp133 +g104 +I285 +I550 +(lp132 I41 -aNatp134 +aI43 +aI46 +atp133 a(I43 -g107 -I780 -I525 +S'color' +p134 +I359 +I567 (lp135 -I41 +I42 aI44 atp136 a(I44 -g84 -I780 -I564 +g67 +I452 +I559 (lp137 I43 aI45 -aI46 atp138 a(I45 (g7 -S'91' +S'10' p139 tp140 -I854 -I573 +I491 +I567 (lp141 I44 aNatp142 a(I46 -g116 -I780 -I603 +g61 +I285 +I604 (lp143 -I44 +I42 aI47 +aI50 atp144 a(I47 -g25 -I780 -I642 +g64 +I359 +I621 (lp145 I46 aI48 -aNatp146 +atp146 a(I48 -g48 -I854 -I659 +g94 +I452 +I613 (lp147 I47 aI49 atp148 a(I49 -g51 -I947 -I651 -(lp149 +(g7 +S'25' +p149 +tp150 +I491 +I621 +(lp151 I48 -aI50 -atp150 +aNatp152 a(I50 -(g7 -S'35' -p151 -tp152 -I986 -I659 +g129 +I285 +I658 (lp153 -I49 +I46 aNatp154 a(I51 S'clean' p155 -I192 -I25 +I227 +I73 (lp156 NaI52 atp157 a(I52 S'forever' p158 -I192 -I64 +I227 +I112 (lp159 I51 aI53 aNatp160 a(I53 -g107 -I273 -I78 +g49 +I308 +I126 (lp161 I52 aI54 @@ -500,8 +500,8 @@ atp162 a(I54 S'setxy' p163 -I273 -I117 +I308 +I165 (lp164 I53 aI55 @@ -509,9 +509,9 @@ aI58 aI61 atp165 a(I55 -g15 -I347 -I107 +g113 +I382 +I155 (lp166 I54 aI56 @@ -522,8 +522,8 @@ a(I56 S'-600' p168 tp169 -I375 -I126 +I410 +I174 (lp170 I55 aNatp171 @@ -532,15 +532,15 @@ a(I57 S'600' p172 tp173 -I497 -I126 +I532 +I174 (lp174 I55 aNatp175 a(I58 -g15 -I347 -I144 +g113 +I382 +I192 (lp176 I54 aI59 @@ -551,8 +551,8 @@ a(I59 S'-450' p178 tp179 -I375 -I163 +I410 +I211 (lp180 I58 aNatp181 @@ -561,15 +561,15 @@ a(I60 S'450' p182 tp183 -I497 -I163 +I532 +I211 (lp184 I58 aNatp185 a(I61 -g116 -I273 -I193 +g58 +I308 +I241 (lp186 I54 aI62 @@ -577,8 +577,8 @@ atp187 a(I62 S'stack2' p188 -I273 -I232 +I308 +I280 (lp189 I61 aNatp190 diff --git a/talogo.pyc b/talogo.pyc index 40f12ae..ea2b369 100755 --- a/talogo.pyc +++ b/talogo.pyc Binary files differ diff --git a/taproject.pyc b/taproject.pyc index a4b1f40..8a4beb0 100755 --- a/taproject.pyc +++ b/taproject.pyc Binary files differ diff --git a/tasetup.py b/tasetup.py index c06003c..7939bfc 100755 --- a/tasetup.py +++ b/tasetup.py @@ -20,7 +20,7 @@ selectors = ( ('xcor','xcor','num'), ('ycor','ycor','num'), ('heading','heading','num'))), - ('pen', 45, + ('pen', 55, (('penup','penup','noarg'), ('pendown','pendown','noarg'), ('setpensize','setpensize','1arg',5), @@ -30,7 +30,7 @@ selectors = ( ('pensize','pensize','num'), ('color','color','num'), ('shade','shade','num'))), - ('numbers', 77, + ('numbers', 55, (('number','','num'), ('plus','+','ari'), ('minus','-','ari'), @@ -44,7 +44,7 @@ selectors = ( ('and','and','and'), ('or','or','and'), ('not','not','not'), ('print','print','onearg'))), - ('flow', 45, + ('flow', 55, (('wait','wait','onearg',10), ('forever','forever','forever'), ('repeat','repeat','repeat',4), @@ -53,7 +53,7 @@ selectors = ( ('ifelse','ifelse','ifelse'), ('hspace','nop','hspace'), ('vspace','nop','vspace'))), - ('myblocks', 69, + ('myblocks', 55, (('hat1','nop','start'), ('stack1','stack1','noarg'), ('hat2','nop','start'), @@ -64,7 +64,7 @@ selectors = ( ('box2','box2','num')))) toolbaritems = ( - ('hideshow',1050),('eraser',50), ('stopit',50)) + ('hideshow',990),('eraser',75), ('stopit',75)) dockdetails = { 'noarg': (('flow',True,37,5),('flow',False,37,44)), @@ -91,7 +91,7 @@ dockdetails = { def setup_selectors(tw): tw.protodict = {} - y = 25 + y = 30 tw.selbuttons = [] for s in selectors: name,dy,blockdescriptions = s @@ -111,7 +111,7 @@ def setup_selectors(tw): def setup_selector(tw,name,y,blockdescriptions): offshape = load_image(tw.path,'palette',name+'off') onshape = load_image(tw.path,'palette',name+'on') - who = sprNew(tw,140,y,offshape) + who = sprNew(tw,143,y,offshape) setlayer(who,800) who.offshape = offshape who.onshape = onshape @@ -136,7 +136,7 @@ def setup_selector(tw,name,y,blockdescriptions): def setup_toolbar(tw): tw.toolsprs = {} - x,y = 0,20 + x,y = 0,10 for s in toolbaritems: name,dx= s x += dx diff --git a/tasetup.pyc b/tasetup.pyc index c5a3c71..5347093 100755 --- a/tasetup.pyc +++ b/tasetup.pyc Binary files differ diff --git a/tasprites.pyc b/tasprites.pyc index 02a97eb..745778f 100755 --- a/tasprites.pyc +++ b/tasprites.pyc Binary files differ diff --git a/taturtle.pyc b/taturtle.pyc index 912dad6..2c593b6 100755 --- a/taturtle.pyc +++ b/taturtle.pyc Binary files differ diff --git a/tawindow.py b/tawindow.py index 0ab026e..c30cc26 100755 --- a/tawindow.py +++ b/tawindow.py @@ -216,7 +216,7 @@ def buttonrelease_cb(win, event, tw): if tw.block_operation=='click': if spr.proto.name=='number': tw.selected_block = spr - move(tw.select_mask, (spr.x-6,spr.y-6)) + move(tw.select_mask, (spr.x-5,spr.y-5)) setlayer(tw.select_mask, 660) tw.firstkey = True else: run_stack(tw, spr) diff --git a/tawindow.pyc b/tawindow.pyc index b18d858..059d418 100755 --- a/tawindow.pyc +++ b/tawindow.pyc Binary files differ diff --git a/toolbar/blocks-.gif b/toolbar/blocks-.gif index d8347ed..3d40f80 100755 --- a/toolbar/blocks-.gif +++ b/toolbar/blocks-.gif Binary files differ diff --git a/toolbar/eraseroff.gif b/toolbar/eraseroff.gif index 9da2c2e..79a3706 100755 --- a/toolbar/eraseroff.gif +++ b/toolbar/eraseroff.gif Binary files differ diff --git a/toolbar/eraseron.gif b/toolbar/eraseron.gif index a3db3cc..39a92d5 100755 --- a/toolbar/eraseron.gif +++ b/toolbar/eraseron.gif Binary files differ diff --git a/toolbar/hideshowoff.gif b/toolbar/hideshowoff.gif index 25a5d7d..0fb409a 100755 --- a/toolbar/hideshowoff.gif +++ b/toolbar/hideshowoff.gif Binary files differ diff --git a/toolbar/hideshowon.gif b/toolbar/hideshowon.gif index f727380..71d7e8b 100755 --- a/toolbar/hideshowon.gif +++ b/toolbar/hideshowon.gif Binary files differ diff --git a/toolbar/stopitoff.gif b/toolbar/stopitoff.gif index c559ee5..3fa040c 100755 --- a/toolbar/stopitoff.gif +++ b/toolbar/stopitoff.gif Binary files differ diff --git a/toolbar/stopiton.gif b/toolbar/stopiton.gif index 4b79aef..ae0988d 100755 --- a/toolbar/stopiton.gif +++ b/toolbar/stopiton.gif Binary files differ diff --git a/turtle/turtlegroup.gif b/turtle/turtlegroup.gif index ddc11da..5dbb7c9 100755 --- a/turtle/turtlegroup.gif +++ b/turtle/turtlegroup.gif Binary files differ diff --git a/turtle/turtlemask.gif b/turtle/turtlemask.gif index 7a5dda3..9555175 100755 --- a/turtle/turtlemask.gif +++ b/turtle/turtlemask.gif Binary files differ -- cgit v0.9.1