fix tutorial

diff --git a/README.txt b/README.txt
index bffc3da206160c9ce9824802ad1d551a1b3caf16..cbe8d632ce6b457ef167438302d6c64123119fb3 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -136,7 +136,6 @@ as, and issue a command similar to the following to bootstrap Factor:
     generic/ - generic words, for object oriented programming style
     help/ - online help system
     httpd/ - HTTP client, server, and web application framework
-    icons/ - images used by web framework and UI
     inference/ - stack effect inference, used by compiler, as well as a
       useful development tool of its own
     io/ - input and output streams

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 60867117820eeb8b8cdd3b5adb4869a705f6e733..e02c592c5254ce456a389937e5fa92ac9b01276a 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -12,7 +12,6 @@
 - theme abstraction in ui\r
 - menu dragging\r
 - find out why so many small bignums get consed\r
-- icons\r
 - use incremental strategy for all pack layouts where possible\r
 - multiline editing in listener\r
 - get stuff in examples dir running in the ui\r
@@ -39,6 +38,7 @@
 \r
 + ffi:\r
 \r
+- C structs, enums, unions: use new-style string mode parsing\r
 - alien/c-types.factor is ugly\r
 - smarter out parameter handling\r
 - clarify powerpc passing of value struct parameters\r
@@ -82,6 +82,17 @@
 - instances: do not use make-list\r
 - vectors: ensure its ok with bignum indices\r
 - code gc\r
+- set-path: iterative\r
+- parse-command-line: no unswons of cli args\r
+- >c/c>: vector stack\r
+- tag: move from kernel-internals to kernel\r
+- word: when bootstrapping, 'word' var is not cleared\r
+- search: slow\r
+- investigate if rehashing on startup is really necessary\r
+- vectorize >n, n>, (get)\r
+- mutable strings simplifying string operarations\r
+- 2each, find*, subset are ugly\r
+- map and 2map duplicate logic\r
 \r
 + i/o:\r
 \r

diff --git a/doc/handbook.tex b/doc/handbook.tex
index 7e0e2492731f4c49488b7257644310e63acdf000..250b42439f21e2ad1181b8846decd27106f94c82 100644 (file)
--- a/doc/handbook.tex
+++ b/doc/handbook.tex
@@ -5377,10 +5377,8 @@ Static content may be served by setting the \verb|"doc-root"| variable to a dire
 "/var/www/" "doc-root" set
 \end{verbatim}
 
-If a directory holds an \verb|index.html| file, the file is served when the directory is requested, otherwise a directory listing is produced. The directory listing references icons sent via the resource responder. The icons are located in the Factor source tree, and the \verb|"resource-path"| variable may be set to the root of the source tree in order for the icons to be located:
-\begin{verbatim}
-"/home/slava/work/Factor/" "resource-path" set
-\end{verbatim}
+If a directory holds an \verb|index.html| file, the file is served when the directory is requested, otherwise a directory listing is produced.
+
 A facility for ad-hoc server-side scripting exists. If a file with the \verb|.factsp| filename extension is requested, the file is run with \verb|run-file| and any output it sends to the default stream is sent to the client (\ref{stdio}). These ``Factor server pages'' are slower and less powerful than responders, so it is recommended that responders be used instead.
 
 A different static site can be associated with each virtual host by setting the \verb|"doc-root"| variable in each virtual host (\ref{vhosts}).

diff --git a/library/help/tutorial.factor b/library/help/tutorial.factor
index c3c4dab42f4acd1594f5827d0c2cd11b6f6938df..ec4dc12811d4ec1a8cada014b16ac1abeec1d920 100644 (file)
--- a/library/help/tutorial.factor
+++ b/library/help/tutorial.factor
@@ -33,7 +33,7 @@ M: general-list tutorial-line
 \r
 : <page> ( list -- gadget )\r
     [ tutorial-line ] map\r
-    <pile> dup 1 over set-pack-fill [ add-gadgets ] keep\r
+    <pile> 1 over set-pack-fill [ add-gadgets ] keep\r
     empty-border ;\r
 \r
 : tutorial-pages\r
@@ -361,13 +361,15 @@ M: general-list tutorial-line
         ]\r
     ] ;\r
 \r
-: <tutorial> ( pages -- browser )\r
-    tutorial-pages [ <page> ] map <book>\r
+: tutorial-theme\r
     dup { 204 204 255 } background set-paint-prop\r
     dup << gradient f { 0 1 0 } { 204 204 255 } { 255 204 255 } >> interior set-paint-prop\r
     dup "Sans Serif" font set-paint-prop\r
-    dup 18 font-size set-paint-prop\r
-    <book-browser> ;\r
+    18 font-size set-paint-prop ;\r
+\r
+: <tutorial> ( pages -- browser )\r
+    tutorial-pages [ <page> ] map <book>\r
+    dup tutorial-theme <book-browser> ;\r
 \r
 : tutorial ( -- )\r
     <tutorial> gadget. ;\r

diff --git a/library/icons/File.png b/library/icons/File.png
deleted file mode 100644 (file)
index dd1124b..0000000
Binary files a/library/icons/File.png and /dev/null differ

diff --git a/library/icons/Folder.png b/library/icons/Folder.png
deleted file mode 100644 (file)
index 2de866a..0000000
Binary files a/library/icons/Folder.png and /dev/null differ