picolisp

commit 3f916f541712b54b0d7d14a25e807d0ad125b497
parent 9e13ecc9af95516664315655a62ee799916ba08a
Author: Alexander Burger <abu@software-lab.de>
Date:   Fri, 27 Jan 2012 17:33:17 +0100

Slight GUI simplifications
Diffstat:
M
app/main.l
 | 
4
++--
M
doc/app.html
 | 
2
+-
M
doc/refA.html
 | 
4
++--
M
doc/tinymce
 | 
2
+-
M
ersatz/picolisp.jar
 | 
0

M
lib/form.l
 | 
26
+++++++++++++-------------
M
src/vers.h
 | 
2
+-
M
src64/version.l
 | 
4
++--
M
test/lib/misc.l
 | 
8
++++----

9 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/app/main.l b/app/main.l
@@ -1,7 +1,7 @@
-# 14may11abu
+# 27jan12abu
 # (c) Software Lab. Alexander Burger
 
-(allowed ("app/" "@img/")
+(allowed ("app/")
    "!start" "!stop" "@lib.css" "!psh" )
 
 (load "@lib/http.l" "@lib/xhtml.l" "@lib/form.l" "@lib/ps.l" "@lib/adm.l")
diff --git a/doc/app.html b/doc/app.html
@@ -262,7 +262,7 @@ contents.
 href="refA.html#allow">allow</a></code> functions
 
 <pre><code>
-(allowed ("img/")
+(allowed ("app/")
    "!start" "@lib.css" "customer.l" "article.l" )
 </code></pre>
 
diff --git a/doc/refA.html b/doc/refA.html
@@ -48,7 +48,7 @@ prefix strings. See also <code><a href="refA.html#allow">allow</a></code>,
 href="refP.html#pre?">pre?</a></code>.
 
 <pre><code>
-: (allowed ("app/" "img/")  # Initialize
+: (allowed ("app/")  # Initialize
    "!start" "!stop" "lib.css" "!psh" )
 -> NIL
 : (allow "!myFoo")  # additional item
@@ -258,7 +258,7 @@ should specify the initially allowed items. See also <code><a
 href="refA.html#allow">allow</a></code>.
 
 <pre><code>
-: (allowed ("app/" "img/")  # allowed prefixes
+: (allowed ("app/")  # allowed prefixes
    "!start" "!stop" "lib.css" "!psh" )  # allowed items
 -> NIL
 </code></pre>
diff --git a/doc/tinymce b/doc/tinymce
@@ -11,7 +11,7 @@ Using the TinyMCE Javascript/HTML WYSIWYG editor in PicoLisp applications
 
 3. In your application, 'allow' the tinymce installation directory:
 
-   (allowed ("myApp/" "img/" "tinymce/")
+   (allowed ("myApp/" "tinymce/")
       ... )
 
 4. On each page where you want to use tinymce in textareas, insert two calls to
diff --git a/ersatz/picolisp.jar b/ersatz/picolisp.jar
Binary files differ.
diff --git a/lib/form.l b/lib/form.l
@@ -1,11 +1,11 @@
-# 20jan12abu
+# 27jan12abu
 # (c) Software Lab. Alexander Burger
 
 # *PRG *Top *Gui *Btn *Get *Got *Form *Evt *Lock *Spans
 # "*Cnt" "*Lst" "*App" "*Err" "*Foc" "*Post2" "*Stat" "*Ix" "*Chart" "*Cho"
 
-(allow (path "@img/") T)
-(push1 '*JS (allow (path "@lib/form.js")))
+(allow "@img/" T)
+(push1 '*JS (allow "@lib/form.js"))
 (mapc allow '(*Gui *Get *Got *Form *Evt *Drop "!jsForm" *JsHint "!jsHint"))
 
 (one "*Cnt")
@@ -1464,11 +1464,11 @@
    (super) )
 
 (dm js> ()
-   (ht:Fmt (sesId (or (eval (: img)) `(path "@img/no.png")))) )
+   (ht:Fmt (sesId (or (eval (: img)) "@img/no.png"))) )
 
 (dm show> ("Var")
    (showFld
-      (<img> (or (eval (: img)) `(path "@img/no.png")) (eval (: alt))) ) )
+      (<img> (or (eval (: img)) "@img/no.png") (eval (: alt))) ) )
 
 
 (class +Icon)
@@ -1524,8 +1524,8 @@
 
 (dm js> ()
    (if2 (or (: dx) (: lst)) (txt> This (val> This))
-      (pack (extra) "&*" (ht:Fmt (sesId `(path "@img/go.png"))) '& (ht:Fmt (sesId ((: url) @))))
-      (pack (extra) "&*" (ht:Fmt (sesId `(path "@img/no.png"))) '&)
+      (pack (extra) "&*" (ht:Fmt (sesId "@img/go.png")) '& (ht:Fmt (sesId ((: url) @))))
+      (pack (extra) "&*" (ht:Fmt (sesId "@img/no.png")) '&)
       (pack @ "&+" (ht:Fmt (sesId ((: url) @))))
       (extra) ) )
 
@@ -1536,8 +1536,8 @@
          (extra "Var")
          (prin "</td><td title=\"-->\">")
          (if (val> This)
-            (<img> `(path "@img/go.png") 'url ((: url) (txt> This @)))
-            (<img> `(path "@img/no.png")) )
+            (<img> "@img/go.png" 'url ((: url) (txt> This @)))
+            (<img> "@img/no.png") )
          (prinl "</td></table>") )
       ((val> This)
          (showFld (<href> @ ((: url) (txt> This @)))) )
@@ -2002,8 +2002,8 @@
    (if (=T (: msg))
       (extra)
       (if2 (or (: dx) (: lst)) (try (: msg) (: obj) 1)
-         (pack (extra) "&*" (ht:Fmt (sesId `(path "@img/go.png"))) '& (ht:Fmt (sesId (mkUrl @))))
-         (pack (extra) "&*" (ht:Fmt (sesId `(path "@img/no.png"))) '&)
+         (pack (extra) "&*" (ht:Fmt (sesId "@img/go.png")) '& (ht:Fmt (sesId (mkUrl @))))
+         (pack (extra) "&*" (ht:Fmt (sesId "@img/no.png")) '&)
          (pack (ht:Fmt (nonblank (str> This))) "&+" (ht:Fmt (sesId (mkUrl @))))
          (extra) ) ) )
 
@@ -2015,8 +2015,8 @@
          (extra "Var")
          (prin "</td><td title=\"-->\">")
          (if (try (: msg) (: obj) 1)
-            (<img> `(path "@img/go.png") 'obj (mkUrl @))
-            (<img> `(path "@img/no.png")) )
+            (<img> "@img/go.png" 'obj (mkUrl @))
+            (<img> "@img/no.png") )
          (prinl "</td></table>") )
       ((try (: msg) (: obj) 1)
          (showFld (<href> (nonblank (str> This)) (mkUrl @))) )
diff --git a/src/vers.h b/src/vers.h
@@ -1 +1 @@
-static byte Version[4] = {3,0,9,2};
+static byte Version[4] = {3,0,9,3};
diff --git a/src64/version.l b/src64/version.l
@@ -1,6 +1,6 @@
-# 05jan12abu
+# 27jan12abu
 # (c) Software Lab. Alexander Burger
 
-(de *Version 3 0 9 2)
+(de *Version 3 0 9 3)
 
 # vi:et:ts=3:sw=3
diff --git a/test/lib/misc.l b/test/lib/misc.l
@@ -1,4 +1,4 @@
-# 11jul11abu
+# 27jan12abu
 # (c) Software Lab. Alexander Burger
 
 ### locale ###
@@ -91,18 +91,18 @@
 
 
 ### *Allow allowed allow ###
-(allowed ("app/" "img/")
+(allowed ("app/")
    "start" "stop" "lib.css" "psh" )
 (allow "myFoo")
 (allow "myDir/" T)
 
-(test '(("psh" ("lib.css" NIL "myFoo") "start" NIL "stop") "app/" "img/" "myDir/")
+(test '(("psh" ("lib.css" NIL "myFoo") "start" NIL "stop") "app/" "myDir/")
    *Allow )
 
 (test '("lib.css" "myFoo" "psh" "start" "stop")
    (idx *Allow) )
 
-(test '("app/" "img/" "myDir/")
+(test '("app/" "myDir/")
    (cdr *Allow) )