From cf4c82ef4ac6e67492ecce2b92a3758adcde6053 Mon Sep 17 00:00:00 2001
From: neauoire <aliceffekt@gmail.com>
Date: Sat, 28 Mar 2020 09:47:58 +0900
Subject: [PATCH] Fixed elementary desktop script

---
 examples/basics/spiral.lisp             |  3 +--
 examples/basics/stars.lisp              | 20 ++++++++++++++++++--
 examples/projects/elementary-theme.lisp | 18 +++++++++---------
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/examples/basics/spiral.lisp b/examples/basics/spiral.lisp
index 8a940eb..dc8af66 100644
--- a/examples/basics/spiral.lisp
+++ b/examples/basics/spiral.lisp
@@ -34,8 +34,7 @@
         (sub v 0.3)))))
  
 ;
-(defn redraw 
-  () 
+(defn redraw () 
   (
     (clear) 
     (rec 300)))
diff --git a/examples/basics/stars.lisp b/examples/basics/stars.lisp
index 7819a30..67d0e3a 100644
--- a/examples/basics/stars.lisp
+++ b/examples/basics/stars.lisp
@@ -1,6 +1,10 @@
 ; stars
+
 (clear)
+
+
 ; times
+
 (defn times 
   (v f) 
   (
@@ -9,12 +13,18 @@
       (gt v 1) 
       (times 
         (sub v 1) f))))
+
+
 ; convert deg to radians
+
 (defn deg-rad 
   (deg) 
   (mul deg 
     (div PI 180)))
+
+
 ; position on a circle from angle
+
 (defn circle-pos 
   (cx cy r a) {:x 
   (add cx 
@@ -23,7 +33,10 @@
   (add cy 
     (mul r 
       (sin a)))})
+
+
 ; draw
+
 (defn draw-spoke 
   (cx cy r a) 
   (
@@ -33,6 +46,7 @@
           (circle-pos cx cy r a)) 
         (:y 
           (circle-pos cx cy r a))) "white" 2)))
+
 ;
 (defn draw-star 
   (cx cy r c) 
@@ -45,10 +59,12 @@
             (deg-rad 
               (mul i 
                 (div 360 c)))))))))
+
+
 ; main
+
 (times 100 
-  (λ 
-    () 
+  (λ () 
     (
       (draw-star 
         (random 100 frame:w) 
diff --git a/examples/projects/elementary-theme.lisp b/examples/projects/elementary-theme.lisp
index 8509562..b879346 100644
--- a/examples/projects/elementary-theme.lisp
+++ b/examples/projects/elementary-theme.lisp
@@ -17,35 +17,35 @@
 (def color-1 
   (pick 
     (guide 
-      (rect 846 220 unit unit))))
+      (rect $xy unit unit))))
 (def color-2 
   (pick 
     (guide 
-      (rect 584 364 unit unit))))
+      (rect $xy unit unit))))
 (def color-3 
   (pick 
     (guide 
-      (rect 70 538 unit unit))))
+      (rect $xy unit unit))))
 (def color-4 
   (pick 
     (guide 
-      (rect 468 650 unit unit))))
+      (rect $xy unit unit))))
 (def color-5 
   (pick 
     (guide 
-      (rect 254 246 unit unit))))
+      (rect $xy unit unit))))
 (def color-6 
   (pick 
     (guide 
-      (rect 190 502 unit unit))))
+      (rect $xy unit unit))))
 (def color-7 
   (pick 
     (guide 
-      (rect 1084 446 unit unit))))
+      (rect $xy unit unit))))
 (def color-8 
   (pick 
     (guide 
-      (rect 1068 730 unit unit))))
+      (rect $xy unit unit))))
 
 ; display
 
@@ -77,4 +77,4 @@
 (def res 
   (add color-1:hex ":" color-2:hex ":" color-3:hex ":" color-4:hex ":" color-5:hex ":" color-6:hex ":" color-7:hex ":" color-8:hex))
 (echo 
-  (add res res))
\ No newline at end of file
+  (add res ":" res))
\ No newline at end of file