From 594dbe616ce102ca9d1d2bc2ae15831d70bfb4c0 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 1 Sep 2005 20:45:36 +0000 Subject: [PATCH] fix tutorial --- README.txt | 1 - TODO.FACTOR.txt | 13 ++++++++++++- doc/handbook.tex | 6 ++---- library/help/tutorial.factor | 12 +++++++----- library/icons/File.png | Bin 587 -> 0 bytes library/icons/Folder.png | Bin 499 -> 0 bytes 6 files changed, 21 insertions(+), 11 deletions(-) delete mode 100644 library/icons/File.png delete mode 100644 library/icons/Folder.png diff --git a/README.txt b/README.txt index bffc3da206..cbe8d632ce 100644 --- 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 6086711782..e02c592c52 100644 --- a/TODO.FACTOR.txt +++ b/TODO.FACTOR.txt @@ -12,7 +12,6 @@ - theme abstraction in ui - menu dragging - find out why so many small bignums get consed -- icons - use incremental strategy for all pack layouts where possible - multiline editing in listener - get stuff in examples dir running in the ui @@ -39,6 +38,7 @@ + ffi: +- C structs, enums, unions: use new-style string mode parsing - alien/c-types.factor is ugly - smarter out parameter handling - clarify powerpc passing of value struct parameters @@ -82,6 +82,17 @@ - instances: do not use make-list - vectors: ensure its ok with bignum indices - code gc +- set-path: iterative +- parse-command-line: no unswons of cli args +- >c/c>: vector stack +- tag: move from kernel-internals to kernel +- word: when bootstrapping, 'word' var is not cleared +- search: slow +- investigate if rehashing on startup is really necessary +- vectorize >n, n>, (get) +- mutable strings simplifying string operarations +- 2each, find*, subset are ugly +- map and 2map duplicate logic + i/o: diff --git a/doc/handbook.tex b/doc/handbook.tex index 7e0e249273..250b42439f 100644 --- 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 c3c4dab42f..ec4dc12811 100644 --- a/library/help/tutorial.factor +++ b/library/help/tutorial.factor @@ -33,7 +33,7 @@ M: general-list tutorial-line : ( list -- gadget ) [ tutorial-line ] map - dup 1 over set-pack-fill [ add-gadgets ] keep + 1 over set-pack-fill [ add-gadgets ] keep empty-border ; : tutorial-pages @@ -361,13 +361,15 @@ M: general-list tutorial-line ] ] ; -: ( pages -- browser ) - tutorial-pages [ ] map +: tutorial-theme dup { 204 204 255 } background set-paint-prop dup << gradient f { 0 1 0 } { 204 204 255 } { 255 204 255 } >> interior set-paint-prop dup "Sans Serif" font set-paint-prop - dup 18 font-size set-paint-prop - ; + 18 font-size set-paint-prop ; + +: ( pages -- browser ) + tutorial-pages [ ] map + dup tutorial-theme ; : tutorial ( -- ) gadget. ; diff --git a/library/icons/File.png b/library/icons/File.png deleted file mode 100644 index dd1124b58e1ab58c00c0f70a338e3caad9dde9a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 587 zcmV-R0<`^!P)y#p44*!IVz__*zJFd`-X>%<00G1VW9aDUFlcIMFeoT0 zGKhT!NI}6 z$;rteEhEFAuCC6oYSk*R1%ZKq49}iD>szp3K`~4ZKmakJJDZi2m4S_&9d3xElq6XE z=g*%E8bB9<40-&X*nx&{0uABj6$k(X5KaTYlAu5Zy5j%ee_)sV1=64x z0%Ab{XuP*PGtvO&qo$qWDi Z1^`FLit>`A>?8mH002ovPDHLkV1lu)_1gdd diff --git a/library/icons/Folder.png b/library/icons/Folder.png deleted file mode 100644 index 2de866acb87de767dd6172d9676a4ec6386105f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUfZd~z?Faq)=OI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+AuIMwtBiahE&{2%E`zGNJvQ7asI@K z6AXvq_t&LXe0+2?R^c{-#=llZ{u%c5cFYb88yQ||q@|^?nVOom?XUlDv|+;rgE^MP zZa<%%p1!@YErapt{l~^E3Jo(Fc7*!*^*#Ll{yxwD|Nql}e0?q6ymF;xGm8Mj({=xT ze?QNmv97f*k&S^xfcwnL`hR~KXLBV?-m6^!E1l^vK9a!<>Jgo_3o~uwoN% z&~cEK*p_pX$&5v^A%^)9$EQm`vjd+jm?p<+$jH>;8X7rM(bjfuV`nGlQGp4J3Wpun zF;?e zqK%P7;0D8l$pw{+X$-p*4HyI*5||zS9ZF?5BQQZbu}wi5EK>LHPp2UF4W35H1|9|` zj(1EkYzop$n`LhbG%z%^GwRe$G+lh0O{ZWYqXR=DFM}noyn{K9B+#!n7^j-NfAhj5P*NS3j3^P6}?%