From a6b9113d17b4d14def0a726f54dac15deb26d491 Mon Sep 17 00:00:00 2001 From: Erick Gallesio Date: Sun, 5 Sep 1999 13:16:41 +0200 Subject: [PATCH] Commit of 4.0.0 version --- CHANGES | 18 +- COPYRIGHTS | 42 +- ChangeLog | 505 + Contrib/Stetris/stetris.stk | 2 +- Demos/%README | 17 +- Demos/Html-Demos/animate.stk | 23 +- Demos/Html-Demos/puzzle.stk | 20 +- Demos/Makefile | 17 +- Demos/README.html | 23 +- Demos/S-scape.stklos | 22 +- Demos/Widget/Wmenu.stklos | 18 +- Demos/amib.stklos | 29 +- Demos/browse.stk | 15 +- Demos/browse.stklos | 15 +- Demos/calc.stklos | 20 +- Demos/classbrowse.stklos | 20 +- Demos/colormap.stk | 17 +- Demos/console-demo.stk | 25 + Demos/filebox.stklos | 22 +- Demos/hanoi.stk | 27 +- Demos/hello.stk | 16 + Demos/hello.stklos | 16 + Demos/inspector.stk | 19 +- Demos/mc-server.stk | 27 +- Demos/server.stk | 25 +- Demos/showvars.stk | 36 +- Demos/small-ed.stk | 22 +- Demos/stkfontsel.stk | 23 + Demos/stklos-demo.stklos | 17 +- Demos/stklos-demo2.stklos | 17 +- Demos/stklos-widgets.stklos | 84 +- Demos/term.stk | 21 +- Demos/tkcolor.stklos | 17 +- Demos/turtle.stk | 35 +- Demos/widget.stk | 47 +- Doc/Extension/Extending.dvi | Bin 69676 -> 63760 bytes Doc/Extension/Extending.ps | 10428 +++++++------------ Doc/Extension/Extending.tex | 20 +- Doc/Isotas96/Isotas96.dvi | Bin 64392 -> 64404 bytes Doc/Isotas96/Isotas96.ps | 739 +- Doc/Makefile | 19 +- Doc/Manual/Makefile | 21 +- Doc/Manual/ed.n | 47 + Doc/Manual/ftp.n | 19 +- Doc/Manual/listener.n | 19 +- Doc/Manual/make-console.n | 52 + Doc/Manual/posix.n | 19 +- Doc/Manual/stk.1 | 5 +- Doc/Manual/stk.ps | 245 +- Doc/Manual/stk.txt | 160 +- Doc/Manual/text.n | 10 +- Doc/Reference/Appendix-C.tex | 10 +- Doc/Reference/Appendix-E.tex | 10 +- Doc/Reference/Reference1.tex | 256 +- Doc/Reference/Reference2.tex | 15 +- Doc/Reference/Reference3.tex | 9 +- Doc/Reference/manual.dvi | Bin 403188 -> 414300 bytes Doc/Reference/manual.ps | 10679 ++++++++++---------- Doc/Reference/manual.tex | 24 +- Doc/STklos+Tk/STklos+Tk.dvi | Bin 67592 -> 68100 bytes Doc/STklos+Tk/STklos+Tk.ps | 11636 +++++++--------------- Extensions/Makefile.in | 19 +- Extensions/base64.c | 21 +- Extensions/hash.c | 69 +- Extensions/html.c | 21 +- Extensions/locale.c | 22 +- Extensions/pixmap.c | 2 +- Extensions/posix.c | 23 +- Extensions/process.c | 596 +- Extensions/socket.c | 181 +- Extensions/stk-genmake.in | 21 +- Help/GreenIndex.html | 12 +- Help/STk-hlp.html | 35 +- Help/ed.n.html | 28 + Help/make-console.n.html | 32 + Help/stk.1.html | 39 +- Help/text.n.html | 10 +- INSTALL | 15 +- INSTALL.win32 | 22 +- Lib/Images/border.gif | Bin 105 -> 0 bytes Lib/Images/clipboard.gif | Bin 233 -> 0 bytes Lib/Images/console.gif | Bin 233 -> 0 bytes Lib/Images/copy.gif | Bin 204 -> 0 bytes Lib/Images/customize.gif | Bin 204 -> 0 bytes Lib/Images/cut.gif | Bin 204 -> 0 bytes Lib/Images/edit.gif | Bin 233 -> 0 bytes Lib/Images/error.gif | Bin 1681 -> 259 bytes Lib/Images/evalbuf.gif | Bin 233 -> 0 bytes Lib/Images/evalreg.gif | Bin 233 -> 0 bytes Lib/Images/floppy.gif | Bin 233 -> 0 bytes Lib/Images/hborder.gif | Bin 78 -> 0 bytes Lib/Images/hourglass.gif | Bin 0 -> 211 bytes Lib/Images/info.gif | Bin 2478 -> 256 bytes Lib/Images/qmark.gif | Bin 215 -> 0 bytes Lib/Images/question.gif | Bin 1433 -> 265 bytes Lib/Images/tb_back.gif | Bin 0 -> 321 bytes Lib/Images/tb_console.gif | Bin 0 -> 343 bytes Lib/Images/tb_copy.gif | Bin 0 -> 321 bytes Lib/Images/tb_customize.gif | Bin 0 -> 343 bytes Lib/Images/tb_cut.gif | Bin 0 -> 343 bytes Lib/Images/tb_edit.gif | Bin 0 -> 343 bytes Lib/Images/tb_evalbuf.gif | Bin 0 -> 343 bytes Lib/Images/tb_evalreg.gif | Bin 0 -> 343 bytes Lib/Images/tb_exit.gif | Bin 0 -> 343 bytes Lib/Images/tb_fileopen.gif | Bin 0 -> 343 bytes Lib/Images/tb_floppy.gif | Bin 0 -> 343 bytes Lib/Images/tb_forward.gif | Bin 0 -> 321 bytes Lib/Images/tb_hborder.gif | Bin 0 -> 250 bytes Lib/Images/tb_info.gif | Bin 0 -> 343 bytes Lib/Images/tb_paste.gif | Bin 0 -> 321 bytes Lib/Images/tb_reload.gif | Bin 0 -> 321 bytes Lib/Images/tb_stop.gif | Bin 0 -> 343 bytes Lib/Images/tb_vborder.gif | Bin 0 -> 250 bytes Lib/Images/up_arrow_8.bm | 4 + Lib/Images/warning.gif | Bin 1433 -> 254 bytes Lib/Makefile | 20 +- Lib/balloon.stk | 54 +- Lib/base64.stk | 21 +- Lib/bigloo.stk | 21 +- Lib/butbar.stk | 29 +- Lib/button.stk | 17 +- Lib/class-browser.stklos | 21 +- Lib/compatibility.stk | 19 +- Lib/console-customize.stk | 21 +- Lib/console.stk | 118 +- Lib/defsyntax.stk | 395 + Lib/dialog.stk | 32 +- Lib/edit.stk | 55 +- Lib/editor.stk | 19 +- Lib/entry.stk | 19 +- Lib/error.stk | 19 +- Lib/extset.stk | 20 +- Lib/ffi.stk | 19 +- Lib/fileevent.stk | 19 +- Lib/focus.stk | 19 +- Lib/font-chooser.stklos | 256 +- Lib/font-lock.stk | 19 +- Lib/fs.stk | 24 + Lib/ftp.stklos | 19 +- Lib/hash.stk | 20 +- Lib/help.stk | 28 +- Lib/image.stk | 39 +- Lib/init.stk | 108 +- Lib/jpeg.stk | 19 +- Lib/listbox.stk | 21 +- Lib/listener.stk | 19 +- Lib/locale.stk | 21 +- Lib/match.stk | 19 +- Lib/menu.stk | 66 +- Lib/method-editor.stklos | 21 +- Lib/palette.stk | 118 +- Lib/pixmap.stk | 19 +- Lib/posix.stk | 19 +- Lib/process.stk | 20 +- Lib/regexp.stk | 20 +- Lib/scale.stk | 19 +- Lib/scrollbar.stk | 17 +- Lib/security.stk | 19 +- Lib/slib.stk | 19 +- Lib/socket.stk | 25 +- Lib/srfi-0.stk | 68 + Lib/srfi-2.stk | 184 + Lib/srfi-7.stk | 38 + Lib/sterm.stk | 21 +- Lib/text.stk | 21 +- Lib/tk-init.stk | 28 +- Lib/tk-unix.stk | 21 +- Lib/trace.stk | 45 +- Lib/unix.stk | 64 +- Lib/win32.stk | 40 + Lib/winsocket.stklos | 408 + Lib/www-browser.stklos | 82 +- Lib/www-file.stk | 17 +- Lib/www-html.stk | 19 +- Lib/www-http.stk | 19 +- Lib/www-img.stk | 18 +- Lib/www-snd.stk | 19 +- Lib/www-txt.stk | 19 +- Lib/www-url.stk | 15 +- Lib/www.stk | 17 +- Makefile.in | 81 +- README | 15 +- STk.prj | 1627 +-- STklos/Examples/E0.stklos | 19 +- STklos/Examples/E1.stklos | 19 +- STklos/Examples/E2.stklos | 17 +- STklos/Examples/E3.stklos | 19 +- STklos/Examples/complex.stklos | 21 +- STklos/Makefile | 19 +- STklos/Tk/Basics.stklos | 39 +- STklos/Tk/Button.stklos | 21 +- STklos/Tk/Canvas.stklos | 21 +- STklos/Tk/Canvitem.stklos | 21 +- STklos/Tk/Composite/Balloon.stklos | 21 +- STklos/Tk/Composite/Choicebox.stklos | 21 +- STklos/Tk/Composite/Colorbox.stklos | 23 +- STklos/Tk/Composite/Combobox.stklos | 213 + STklos/Tk/Composite/Defbutton.stklos | 21 +- STklos/Tk/Composite/Filebox.stklos | 22 +- STklos/Tk/Composite/Gauge.stklos | 25 +- STklos/Tk/Composite/Hierarchy.stklos | 36 +- STklos/Tk/Composite/Lentry.stklos | 19 +- STklos/Tk/Composite/Lframe.stklos | 19 +- STklos/Tk/Composite/Msgbox.stklos | 26 +- STklos/Tk/Composite/Multipaned.stklos | 17 +- STklos/Tk/Composite/Multiwin.stklos | 21 +- STklos/Tk/Composite/Notepad.stklos | 29 +- STklos/Tk/Composite/Paned.stklos | 38 +- STklos/Tk/Composite/Schemetext.stklos | 21 +- STklos/Tk/Composite/Scrollbox.stklos | 21 +- STklos/Tk/Composite/Scrollcanvas.stklos | 25 +- STklos/Tk/Composite/Scrollframe.stklos | 120 + STklos/Tk/Composite/Scrolltext.stklos | 25 +- STklos/Tk/Composite/Toolbar.stklos | 420 + STklos/Tk/Entry.stklos | 21 +- STklos/Tk/Font.stklos | 96 + STklos/Tk/Frame.stklos | 21 +- STklos/Tk/Image.stklos | 33 +- STklos/Tk/Listbox.stklos | 21 +- STklos/Tk/Menu.stklos | 81 +- STklos/Tk/Message.stklos | 21 +- STklos/Tk/STF.stklos | 19 +- STklos/Tk/Scale.stklos | 24 +- STklos/Tk/Scrollbar.stklos | 21 +- STklos/Tk/Text.stklos | 23 +- STklos/Tk/Tk-active.stklos | 25 +- STklos/Tk/Tk-classes.stklos | 37 +- STklos/Tk/Tk-meta.stklos | 36 +- STklos/Tk/Toplevel.stklos | 31 +- STklos/active-slot.stklos | 21 +- STklos/composite-slot.stklos | 21 +- STklos/describe.stklos | 31 +- STklos/stklos.stk | 49 +- STklos/trace-gf.stklos | 21 +- Snow/Makefile | 1 - Snow/stkvers.h | 1 + Src/Makefile.in | 75 +- Src/address.c | 24 +- Src/argv.c | 59 +- Src/boolean.c | 31 +- Src/char.c | 22 +- Src/configure | 302 +- Src/console.c | 26 +- Src/cont.c | 55 +- Src/dummy.c | 22 +- Src/dump.c | 24 +- Src/dynload.c | 150 +- Src/env.c | 26 +- Src/error.c | 33 +- Src/eval.c | 174 +- Src/extend.c | 24 +- Src/extend.h | 22 +- Src/gc.c | 22 +- Src/gc.h | 35 +- Src/io.c | 62 +- Src/keyword.c | 24 +- Src/list.c | 32 +- Src/macros.c | 22 +- Src/module.c | 43 +- Src/module.h | 22 +- Src/number.c | 22 +- Src/port.c | 103 +- Src/primitives.c | 31 +- Src/print.c | 31 +- Src/proc.c | 40 +- Src/promise.c | 22 +- Src/read.c | 24 +- Src/signal.c | 21 +- Src/slib.c | 23 +- Src/sport.c | 22 +- Src/sport.h | 22 +- Src/stk.c | 22 +- Src/stk.h | 112 +- Src/stklos.c | 47 +- Src/stklos.h | 24 +- Src/stkvers.h | 1 + Src/str.c | 24 +- Src/symbol.c | 47 +- Src/syntax.c | 63 +- Src/tcl-glue.c | 24 +- Src/tcl-glue.h | 22 +- Src/tcl-lib.c | 39 +- Src/tcl-obj.c | 72 +- Src/tcl-util.c | 22 +- Src/tk-glue.c | 36 +- Src/tk-glue.h | 22 +- Src/tk-main.c | 29 +- Src/tk-util.c | 22 +- Src/toplevel.c | 58 +- Src/trace.c | 32 +- Src/unix.c | 71 +- Src/userinit.c | 25 +- Src/vector.c | 41 +- Src/vport.c | 26 +- Src/vport.h | 23 +- Src/wstk.c | 40 +- Stack/Makefile.in | 25 +- Stack/README | 2 +- Stack/libstack-ALPHA.c | 24 +- Stack/libstack-HP.c | 22 +- Stack/libstack-I386.c | 22 +- Stack/libstack-MIPS32.c | 24 +- Stack/libstack-SUN.c | 22 +- Stack/libstack-UNKNOWN_ARCH.c | 22 +- Stack/lowstack-ALPHA.c | 22 +- Stack/lowstack-MIPS32.c | 22 +- Tcl/Makefile.in | 2 +- Tcl/panic.c | 2 +- Tcl/tcl.h | 48 +- Tcl/tclEvent.c | 28 +- Tcl/tclGet.c | 4 +- Tcl/tclInt.h | 12 +- Tcl/tclPort.h | 4 +- Tcl/tclPreserve.c | 10 +- Tcl/tclTimer.c | 84 +- Tcl/tclUnixPort.h | 6 +- Tcl/tclUnixTime.c | 2 +- Tcl/tclUtil.c | 118 +- Tk/generic/tk.h | 18 +- Tk/generic/tkBind.c | 111 +- Tk/generic/tkButton.c | 75 +- Tk/generic/tkButton.h | 2 +- Tk/generic/tkCanvImg.c | 2 +- Tk/generic/tkCanvLine.c | 6 +- Tk/generic/tkCanvPoly.c | 2 +- Tk/generic/tkCanvPs.c | 4 + Tk/generic/tkCanvUtil.c | 8 +- Tk/generic/tkCanvas.c | 35 +- Tk/generic/tkCmds.c | 96 +- Tk/generic/tkConfig.c | 103 +- Tk/generic/tkEntry.c | 36 +- Tk/generic/tkFocus.c | 10 +- Tk/generic/tkFont.c | 36 +- Tk/generic/tkFrame.c | 13 +- Tk/generic/tkGrab.c | 14 +- Tk/generic/tkGrid.c | 31 +- Tk/generic/tkImage.c | 13 +- Tk/generic/tkImgPPM.c | 6 + Tk/generic/tkImgPhoto.c | 10 +- Tk/generic/tkInitScript.h | 2 +- Tk/generic/tkInt.h | 1 + Tk/generic/tkListbox.c | 20 +- Tk/generic/tkMenu.c | 99 +- Tk/generic/tkMenu.h | 5 +- Tk/generic/tkMenuDraw.c | 18 +- Tk/generic/tkMenubutton.c | 19 +- Tk/generic/tkMenubutton.h | 2 +- Tk/generic/tkMessage.c | 19 +- Tk/generic/tkOption.c | 10 +- Tk/generic/tkPack.c | 18 +- Tk/generic/tkPlace.c | 42 +- Tk/generic/tkScale.c | 75 +- Tk/generic/tkScale.h | 7 + Tk/generic/tkScrollbar.c | 8 +- Tk/generic/tkSelect.c | 22 +- Tk/generic/tkText.c | 42 +- Tk/generic/tkText.h | 2 +- Tk/generic/tkTextImage.c | 2 +- Tk/generic/tkTextIndex.c | 24 +- Tk/generic/tkTextMark.c | 2 +- Tk/generic/tkTextTag.c | 29 +- Tk/generic/tkTextWind.c | 19 +- Tk/generic/tkWindow.c | 20 +- Tk/unix/tkUnix.c | 2 +- Tk/unix/tkUnixDefault.h | 50 +- Tk/unix/tkUnixInit.c | 6 +- Tk/unix/tkUnixScale.c | 12 + Tk/unix/tkUnixSend.c | 42 +- Tk/unix/tkUnixWm.c | 74 +- Tk/win/makefile.bc | 340 - Tk/win/makefile.dsp | 84 - Tk/win/makefile.dsw | 29 - Tk/win/makefile.ncb | Bin 33792 -> 0 bytes Tk/win/makefile.opt | Bin 49664 -> 0 bytes Tk/win/makefile.plg | 12 - Tk/win/makefile.vc | 440 - Tk/win/tkWinDefault.h | 2 +- Tk/win/tkWinDialog.c | 34 + Tk/win/tkWinFont.c | 4 + Tk/win/tkWinFont.c.orig | 628 -- Tk/win/tkWinWm.c.orig | 4217 -------- Utils/STk.spec | 49 +- Utils/STk.spec.in | 17 +- VERSION | 2 +- Win32/Doc/install.doc | Bin 0 -> 5120 bytes Win32/STk.dsp | 12 +- Win32/STk.mak | 1714 ++++ Win32/STk.opt | Bin 68096 -> 0 bytes Win32/STk.plg | 193 - Win32/libgmp/libgmp.mak | 123 + Win32/libtcl/libtcl.dsp | 2 +- Win32/libtcl/libtcl.mak | 329 + Win32/libtk/libtk.dsp | 2 +- Win32/libtk/libtk.mak | 2904 ++++++ configure | 289 +- configure.in | 32 +- install.bat | 32 +- 397 files changed, 28279 insertions(+), 31522 deletions(-) mode change 100755 => 100644 Demos/Makefile mode change 100755 => 100644 Demos/S-scape.stklos mode change 100755 => 100644 Demos/amib.stklos mode change 100755 => 100644 Demos/browse.stk mode change 100755 => 100644 Demos/browse.stklos mode change 100755 => 100644 Demos/calc.stklos mode change 100755 => 100644 Demos/classbrowse.stklos mode change 100755 => 100644 Demos/colormap.stk create mode 100644 Demos/console-demo.stk mode change 100755 => 100644 Demos/filebox.stklos mode change 100755 => 100644 Demos/hanoi.stk mode change 100755 => 100644 Demos/hello.stk mode change 100755 => 100644 Demos/hello.stklos mode change 100755 => 100644 Demos/inspector.stk mode change 100755 => 100644 Demos/mc-server.stk mode change 100755 => 100644 Demos/server.stk mode change 100755 => 100644 Demos/small-ed.stk create mode 100644 Demos/stkfontsel.stk mode change 100755 => 100644 Demos/stklos-demo.stklos mode change 100755 => 100644 Demos/stklos-demo2.stklos mode change 100755 => 100644 Demos/term.stk mode change 100755 => 100644 Demos/tkcolor.stklos mode change 100755 => 100644 Demos/turtle.stk mode change 100755 => 100644 Demos/widget.stk create mode 100644 Doc/Manual/ed.n create mode 100644 Doc/Manual/make-console.n create mode 100644 Help/ed.n.html create mode 100644 Help/make-console.n.html delete mode 100644 Lib/Images/border.gif delete mode 100644 Lib/Images/clipboard.gif delete mode 100644 Lib/Images/console.gif delete mode 100644 Lib/Images/copy.gif delete mode 100644 Lib/Images/customize.gif delete mode 100644 Lib/Images/cut.gif delete mode 100644 Lib/Images/edit.gif delete mode 100644 Lib/Images/evalbuf.gif delete mode 100644 Lib/Images/evalreg.gif delete mode 100644 Lib/Images/floppy.gif delete mode 100644 Lib/Images/hborder.gif create mode 100644 Lib/Images/hourglass.gif delete mode 100644 Lib/Images/qmark.gif create mode 100644 Lib/Images/tb_back.gif create mode 100644 Lib/Images/tb_console.gif create mode 100644 Lib/Images/tb_copy.gif create mode 100644 Lib/Images/tb_customize.gif create mode 100644 Lib/Images/tb_cut.gif create mode 100644 Lib/Images/tb_edit.gif create mode 100644 Lib/Images/tb_evalbuf.gif create mode 100644 Lib/Images/tb_evalreg.gif create mode 100644 Lib/Images/tb_exit.gif create mode 100644 Lib/Images/tb_fileopen.gif create mode 100644 Lib/Images/tb_floppy.gif create mode 100644 Lib/Images/tb_forward.gif create mode 100644 Lib/Images/tb_hborder.gif create mode 100644 Lib/Images/tb_info.gif create mode 100644 Lib/Images/tb_paste.gif create mode 100644 Lib/Images/tb_reload.gif create mode 100644 Lib/Images/tb_stop.gif create mode 100644 Lib/Images/tb_vborder.gif create mode 100644 Lib/Images/up_arrow_8.bm create mode 100644 Lib/defsyntax.stk create mode 100644 Lib/fs.stk create mode 100644 Lib/srfi-0.stk create mode 100644 Lib/srfi-2.stk create mode 100644 Lib/srfi-7.stk create mode 100644 Lib/win32.stk create mode 100644 Lib/winsocket.stklos create mode 100644 STklos/Tk/Composite/Combobox.stklos create mode 100644 STklos/Tk/Composite/Scrollframe.stklos create mode 100644 STklos/Tk/Composite/Toolbar.stklos create mode 100644 STklos/Tk/Font.stklos delete mode 120000 Snow/Makefile create mode 120000 Snow/stkvers.h create mode 100644 Src/stkvers.h delete mode 100644 Tk/win/makefile.bc delete mode 100755 Tk/win/makefile.dsp delete mode 100755 Tk/win/makefile.dsw delete mode 100755 Tk/win/makefile.ncb delete mode 100755 Tk/win/makefile.opt delete mode 100755 Tk/win/makefile.plg delete mode 100644 Tk/win/makefile.vc delete mode 100644 Tk/win/tkWinFont.c.orig delete mode 100644 Tk/win/tkWinWm.c.orig create mode 100755 Win32/Doc/install.doc create mode 100755 Win32/STk.mak delete mode 100755 Win32/STk.opt delete mode 100755 Win32/STk.plg create mode 100755 Win32/libgmp/libgmp.mak create mode 100755 Win32/libtcl/libtcl.mak create mode 100755 Win32/libtk/libtk.mak diff --git a/CHANGES b/CHANGES index 9366a56..9c789ab 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,25 @@ +09/03/99 Release 4.0.0 +---------------------- +Mains changes/modifications since 4.0 are: + + * Lot of Win32 fixes + + * , STklos classes. + + * Integration of some finals SRFI (0, 2, 6, 8) + + * define-syntax (but not let-syntax and let-syntax*) + + * Lot of bug fixes. + + * New License Policy (request for commercial apps no more needed). + 02/02/99 Release 3.99.4 ----------------------- Mains changes/modifications since 3.99.3 are: * Works on Windows too (need some more testing, since this is - far form perfect) + far from perfect) * A console mode (which is used by default on Windows, but can be used with the -console option on Unix) diff --git a/COPYRIGHTS b/COPYRIGHTS index f6bd7fc..27811fd 100644 --- a/COPYRIGHTS +++ b/COPYRIGHTS @@ -2,15 +2,16 @@ Since I'm not a lawyer, I don't know where to put copyrigth notices and permission notices of softwares I use. Consequently I put them here in hope it's sufficient.... -Note: - STk licence seems not to be as clear as I hope. The main idea is -that you can do what you want with STk. You can even use it in -commercial products. The only restriction is that you must prevent me -if you intend to use it in a commercial product (so I can send you a -"written permission" for efectively using it). The goal is not to -restrict commercial applications but only to count them. If someone, -fluent in english and which like those aspects, can help me to make -things clearer... +Note: + + For version 4.0, the clause for commercial software in the STk + license has been deleted. That means that you can make a commercial + product which uses STk without asking me permission to do so, as it + was required before. The idea of this clause was not to restrict + commercial applications but rather to count them. However, it seems + that this clause was more harmful than useful. Anyway, if you make a + commercial product which uses STk, it would be kind to tell me so. + ============================================================================== @@ -109,18 +110,17 @@ STk Copyright ------------- /* - * Copyright © 1993-1996 Erick Gallesio - I3S-CNRS/ESSI + * Copyright © 1993-1999 Erick Gallesio - I3S-CNRS/ESSI * * - * Permission to use, copy, and/or distribute this software and its - * documentation for any purpose and without fee is hereby granted, provided - * that both the above copyright notice and this permission notice appear in - * all copies and derived works. Fees for distribution or use of this - * software or derived works may only be charged with express written - * permission of the copyright holder. - * This software is provided ``as is'' without express or implied warranty. + * Permission to use, copy, modify, distribute,and license this + * software and its documentation for any purpose is hereby granted, + * provided that existing copyright notices are retained in all + * copies and that this notice is included verbatim in any + * distributions. No written agreement, license, or royalty fee is + * required for any of the authorized uses. + * This software is provided ``AS IS'' without express or implied + * warranty. * - * This software is a derivative work of other copyrighted softwares; the - * copyright notices of these softwares are placed in the file COPYRIGHTS - * - */ \ No newline at end of file + */ + diff --git a/ChangeLog b/ChangeLog index 027924d..7594c7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,508 @@ +1999-09-05 Erick Gallesio + + * Release 4.0.0 + + * STk.prj: Added the file Combobox.stklos + +1999-09-04 Erick Gallesio + + * Demos/server.stk : Set the process in a variable to avoid the + socket be closed when a GC occurs. + + * Win32: some minor corrections + +1999-09-03 Erick Gallesio + + * First package named 4.0 (Let's pray). + + * New Copyright applied to all the files which need it. The new + copyright deletes the restriction on commercial applocations. + + * Tk/generic/tkConfig.c (DoConfig): Correction of a long standing + bug signalled by Brian Denheyer about the + environments which were garbaged on checkbutton menu entry. + + * configure.in : Modifications for RPM 3.0 packaging + +1999-09-01 Erick Gallesio + + * Src/syntax.c (syntax_let_family): Bug correction in named let: + the scope of the name of a * named let encloses only the body of + the let and not the * initialization values of the bound + variables. That means that + (let ((f -)) (let f ((n (f 1))) n)) => -1 + rather than 1. This (apparently very common) bug was signaled in + comp.lang.scheme. + + * Src/print.c (STk_print): Deleted an extra close parenthesis when + printing a local var. + +1999-08-31 Erick Gallesio + + * Lib/srfi-7.stk: New file for SRFI-7 (PROGRAM) + + * Src/syntax.c (STk_syntax_begin): Accepts now the form "(begin)" + without complaining about a null body + + * Src/port.c : slight modification to input-port? primtive: it + returns #t for all the input port (i.e. file, string and virtual + port) instead of the file port only. A new primitive as been + added: input-file-port? for testing explicitly if an object is an + input port. Of course, the same applies also for output. This + change was needed to be conform to SRFI-6. + +1999-08-30 Erick Gallesio + + * Lib/defsyntax.stk : R4RS define-syntax. This is the Macro By + Example implementation from Dorai Sitaram + adapted for STk. + + * Lib/srfi-0.stk: New file implementing srfi-0 + + * Lib/srfi-2.stk: New file implementing srfi-2 + +1999-08-24 Erick Gallesio + + * Demos/widget.stk (show-code): Changed the way the code file is + read to work under Win32 too. + +1999-08-23 Erick Gallesio + + * Lib/init.stk (STk): Changed the time where the autoload of the + graphical error routine is done, so that an error during the + reading of initialization file doesn't pop this weird black empty + window on the screen. + + * Src/port.c (STk_close_file_port): closing a closed file with + fclose on glibc2.1.1 dumps core. fclose has been replaced by a + fflush and a close. + + * Lib/winsocket.stklos : New file which implements sockets for + Win32. This file is a contribution of Steve Pruitt + + +1999-08-22 Erick Gallesio + + * Demos/console-demo.stk: New (simple) demo showing the console in + action. + + * Makefile.in (install-no-strip): New entry to install the + executable without stripping them. This was needed by Brian + Denheyer + + * Lib/console.stk : Added scrollbar in the list of modules when + choosing a new console + +1999-08-19 Erick Gallesio + + * STklos/Tk/Composite/Paned.stklos (): Made the fraction of a + paned an active slot. This was requested by Andrew Dorrell + + +1999-08-18 Erick Gallesio + + * Demos/widget.stk :Changed the Quit button by a new toolbar for + the widget Demo. + +1999-08-16 Erick Gallesio + + * Doc/Reference/Reference*.tex: Big documentation update. + + * Src/io.c (STk_internal_flush): Changed the implementation of + virtual port and make some cleanups. everything is documented now. + +1999-08-15 Erick Gallesio + + * Lib/console.stk : Clos console menu didn't exit the interpreter + on the main console. + + * Lib/help.stk: Modified the help function to deiconify the + browser if it already exists + + * Src/stk.h: Conditionally define TRUE and FALSE as requested by + Shiro Kawai + + * Lib/console.stk : New menu in + console to allow to open a new console in a given module. + + * Src/module.c (STk_all_modules): New primitive "all-modules" + which returns the list of all the living modules. + +1999-08-12 Erick Gallesio + + * Lib/www-url.stk (merge-paths): modified to take into account Win32 + + * Lib/fs.stk: * Lib/win32.stk: fs.stk is the file which will load + either unix.stk or win32.stk depending of the running system. + + * Lib/image.stk : Changed the images are searched. It didn't work + for Win32 + + +1999-08-04 Erick Gallesio + + * Lib/console.stk (console-splash-screen): compute geometry with + quotient rather than "/" (useful for people with odd + resolutions. Yes it exists!) + +1999-08-03 Erick Gallesio + + * Src/unix.c: Modifications to parse correctly DOS filenames. + This is probably not completely correct (DOS guys are really + crazy). + + * Lib/www-url.stk (url-regexp): Changed the regexp for parsing + correctly DOS filename (C:\\A was seen as the path \\A for the + service "C") + +1999-07-02 Erick Gallesio + + * Src/error.c (STk_err): the assignment of the two global is done + now in STk_err to have it even in the context of a CATCH. Patch + provided by Ian Wild . + + * Lib/balloon.stk ((display-balloon-help w)): Correction of a bug + which apperas when the window to which a ballon is associated does + not exists anymore. + + * Lib/dialog.stk: + * Lib/error.stk: + * STklos/Tk/Composite/Msgbox.stklos (): Added more colorful icons + for the standard message boxes + +1999-07-01 Erick Gallesio + + * STklos/stklos.stk: + * Src/stklos.c (next_method_exists): New primitive in STklos: + next-methods-exists? + +1999-06-30 Erick Gallesio + + * Src/symbol.c: New primitive string->uninterned-symbol. + + * Lib/init.stk (gensym): gensym now use an uninterned symbol. + +1999-06-21 Erick Gallesio + + * install.bat: Added the installation of libraries for Win32 as + requested by Jonathan Berry + +1999-06-19 Erick Gallesio + + * Src/hash.c (hash_table_put): + * Src/tk-glue.c (STk_add_callback): Changed the variable new to + new_entry to be more C++ friendly as requested by Jonathan Berry + + +1999-06-06 Erick Gallesio + + * Use a coherent scheme for toolbars. All the pixmaps have been + modified. + +1999-06-05 Erick Gallesio + + * Doc/Reference/Appendix-C.tex (subsection{Example}): Typo error + signalled by Ben L. Di Vito + +1999-06-04 Erick Gallesio + + * Src/proc.c (STk_procedurep): Bug corrcetion: procedure? was + returning #t for all STklos instance, it returns #t for + next-methods and descendants of methods now. + (STk_is_thunk): ditto. + + * Tcl/tclInt.h: The Tcl List type is now hidden (since it is not + used by STk) . It is a request from Jonathan Berry + + +1999-05-28 Erick Gallesio + + * Tk/generic/tkCanvLine.c: Added the option :centerarrow for + lines. The implementation was provided by Sarah Calvo + + + * STklos/Tk/Canvitem.stklos (): Added the center-arrow slot + to the class to take into account the new:centerarrow + option + + +1999-05-26 Erick Gallesio + + ****** All the stuff below has been provided by people at Grammatech + ****** & + + * Tk/generic/tkFrame.c: Declare the menu option of a frame as + a TK_CONFIG_MENU rathere than a TK_CONFIG_STRING. + + * Src/tcl-lib.c (Tcl_CreateInterp): flags field was not + initialized. + + * Src/stk.h: Added #define USE_PROCESS for Win32 + + * Src/eval.c: Two new functions for applying 1 or 2 arguments only. + + * Src/io.c (STk_StdinProc): initializing errno to 0 before a read + system call. + + * Src/dynload.c: Type declaration was uncorrect for a message + issued on architectures without FFI. + + * Src/cont.c (STk_throw): On some architecture, the thunk to be + executed on restauration of a continuation should be in a global + rather than a local variable. + + * Lib/unix.stk: Win32 adaptations + + * Lib/menu.stk: Typos and motion. + + * Lib/init.stk: Win32 fixes + + * Lib/console.stk (console-invoke): fix of STk Error if there were + multiple regions with "input" tag. + + ((init-console module std-console?)): color missing on HPUX + replaced by its value. + + * configure.in: the --prefix option was not correctly propagated + to Tk and Tcl configure scripts. + + * Stack/Makefile.in: new entry install.libs + +1999-05-21 Erick Gallesio + + * Src/dynload.c: + * Src/number.c: + * Src/port.c: + * Src/env.c: Some typo errors signalled by David Fox. + + * Src/tcl-lib.c (Tcl_CreateCommand): bug correction suggested by + David Fox + +1999-05-20 Erick Gallesio + + * STklos/Tk/Composite/Filebox.stklos: When the filebox was first + invoked the "all" button was NOT checked, but the filebox displays + all of the files, i.e., the button doesn't match functionality. + Bug signaled and corrected by Brian Denheyer . + + * STklos/describe.stklos (describe): Extended types were described + as unknown types, whereas a class is automatically defined for + them. + + * Lib/init.stk (STk): added the function repl-write which is used + by the repl-display-result to display results at the toplevel. It + was write*, but it doesn't seem to be appreciated. The new value + is a function which use write or write* for list and write* for + other object. Of course it can be changed by just setting the + repl-write result. + + * STklos/Tk/Composite/Hierarchy.stklos: Added the remove-item! + method. + + * STklos/Tk/Composite/Toolbar.stklos: Modification of the toolbar + code to allow the inclusion of any widget in a toolbar + +1999-05-19 Erick Gallesio + + * Lib/www-browser.stklos (WWW:browser): + * Demos/Widget/Wmenu.stklos (demo-menu): + * Demos/amib.stklos (build-interface): Use the new toolbar widget + instead of simple menu as before. + + * Demos/stklos-widgets.stklos: Added the font-chooser demo. + +1999-05-18 Erick Gallesio + + * STklos/Tk/Composite/Toolbar.stklos (map-toolbar): Added the + convention that spaces of length 0 in a toolbar correspond to a + space which takes all the spaces (i.e. it sets the :expand option + of the packer to #t) + + * Lib/menu.stk (Tk:menu-escape menu): code was incorrect when + using the Escape key on a cascade menu. + + * STklos/Tk/Composite/*.stklos: Added a class to all the composite + widgets, so that it can be initialized from resources. + + * STklos/Tk/Composite/Scrollframe.stklos: Modification to take + into account the width and the height of a Scroll frame. + + * STklos/Tk/Font.stklos: New class which allow to + manipulate fonts as widgets. + +1999-05-16 Erick Gallesio + + * Src/dynload.c (push_argument): New convention: #f is now + accepted for speicfing a NULL value for a string or a pointer. + This was already the case for returned values but not for + parameters. thsi was requested by terry jones + + + * STklos/Tk/Composite/Notepad.stklos (initialize): Set the + highlight thickness of tabs to 0, Otherwise the effect was bad + (unluckily this was the defaut value I set in my .Xdefaults) + + * Lib/font-chooser.stklos (pretty): The weight of the font was + missing. + +1999-05-13 Erick Gallesio + + * STklos/Examples/E3.stklos: Use a require "Tk-classes" instead of + "Canvas", otherwise *top-root* is improperly initialized + +1999-05-11 Erick Gallesio + + * STk.prj: Integration of floating toolbars + + * STklos/Tk/Tk-classes.stklos: Integration of toolbars + + * STklos/Tk/Composite/Toolbar.stklos: New file which implements + the floating toolbar abstraction. This was really a pain to write + (even if it does not seem complicate afterwards :-<). This is not + complete, but it's time to release... + + * STklos/Tk/Menu.stklos: Special clone-widget methods for + and . This was necessary when cloning a toolbar which + contains a menu. + +1999-05-10 Erick Gallesio + + * STk.prj: A pseudo-stable version. + + * Src/tcl-obj.c (Tcl_EvalObj): Added code for evaluating a Tcl_obj + expression. I forgot to write the code when new handlers were + introduced for 3.99.4 :-<. Bug signalled by many, really many, + users. + + * Lib/palette.stk: New functions: make-rgb-color, make-darker-color + make-lighter-color + + * STklos/Tk/Basics.stklos (clone-widget): New generic function. + It allows the creation of a clone of the given widget in another + place in the hierarchy. + +1999-05-06 Erick Gallesio + + * Tk/generic/tkFrame.c (TkCreateFrame): Small modification to + allow the specification of a :colormap which is the empty string + for Frames and toplevels. This is needed for cloning frames. + +1999-05-02 Erick Gallesio + + * Lib/menu.stk: Some global grabs in the Tcl file were reported as + local grab in STk. + + * STklos/Tk/Composite/Combobox.stklos (show/hide-combo-list): + Changed the focus policy for combo boxes + + +1999-05-01 Erick Gallesio + + * Tk/generic/tkPlace.c: Typo error detected in Biglook and which + seems not harmful in STk. + + * Src/vector.c (STk_sort): When sorting a list, there was an + unnecessary copy vector which was allocated. Thanks to Manuel for + signalling this bug. + +1999-04-25 Erick Gallesio + + * Demos/stkfontsel.stk: New demo. + + * Lib/font-chooser.stklos (): When the user exits the widget + without selecting a font, the old font remains the default one. + +1999-04-24 Erick Gallesio + + * Lib/font-chooser.stklos: The font chooser has been completely + rewritten. Now it only use one global variable (instead of 6) and + is cleaner than the older one. The chooser also use the Combobox + composite widget. + +1999-04-17 Erick Gallesio + + * STklos/Tk/Text.stklos (text-see): typo error signalled by + Brian Denheyer + + * Src/argv.c: Added the -version option to stk. This options just + prints the version number and exit the interpreter. + +1999-04-06 Erick Gallesio + + * STklos/Tk/Composite/Combobox.stklos: New Composite widget. + + * STklos/Tk/Tk-classes.stklos (STklos+Tk): Adaptation for the new + composite widget. + +1999-04-01 Erick Gallesio + + * Lib/trace.stk (Trace): Correction of a bug which deals with + environments. Bug signaled by Jacques Chazarain . + + * Src/boolean.c (STk_eqv): Now environment can be compared with + eqv?. Consequently, (eqv? (the-environment) (the-environment)) + returns now #t. + +1999-03-26 Erick Gallesio + + * STklos/describe.stklos (describe): Used ~W instead of ~S in some + format to avoid infinite loops when describing circular structures. + +1999-03-24 Erick Gallesio + + * Src/dynload.c (push_argument): Forgot to implement the boolean case + Patch provided by David Fox . + + * configure.in: Application of corrections for FreeBSD provided by + "F. Heinrichmeyer" + + * STk.prj: Various bug corrections + + * STklos/Tk/Image.stklos (initialize): New method: Pixmap + extension need that the :file or :data be passed when the image + is created => we use a new initialize method rather than the + initialize-image scheme used for bitmaps and photos. + Bug signaled by Brian Denheyer + + +1999-03-13 Erick Gallesio + + * Src/io.c (STk_getc): Correction of a bug on Alpha (OSF does not + seem to set errno to 0 before a read!). Bug signaled by Vincent + Granet + +1999-03-11 Erick Gallesio + + * Tk/generic/tkBind.c: patch to make significant only the first + character of a parameter in a binding lambda (i.e. x1 is now + equivalent to x). Strange behaviour signalled by Brian Denheyer + . + + * Src/primitives.c: New primitive port-closed?. + +1999-02-13 Erick Gallesio + + * Demos/widget.stk: Modification of the path for accessing source + in the widget demo. Thanks to Daniel Ortmann + +1999-02-10 Erick Gallesio + + * Tk/win/tkWinDialog.c (ProcessCDError): compound options for + standard dialog have now a dash (-initialfile => :initial-file, ...) + to be consistent with Unix. + + * Tk/win/tkWinFont.c (WinFontFamilyEnumProc): Modified to + transform font-name into strings rather than symbols. + + * Lib/menu.stk (Tk:menu-button-button-up): Typo correction (thanks + to Eric Fintzel ) + + * STklos/Tk/Composite/Scrollframe.stklos: Rewritten + +1999-02-08 Erick Gallesio + + * STklos/Tk/Composite/Scrollframe.stklos: New widget . + 1999-02-02 Erick Gallesio * Release 3.99.4: This is the last pre 4.0 version. Code for Win32 diff --git a/Contrib/Stetris/stetris.stk b/Contrib/Stetris/stetris.stk index ede7459..e37c86a 100755 --- a/Contrib/Stetris/stetris.stk +++ b/Contrib/Stetris/stetris.stk @@ -95,7 +95,7 @@ ;;; ------------------- Include files ------------------------ (require "Tk-classes") -(require "unix") +(require "fs") (require "dialog") diff --git a/Demos/%README b/Demos/%README index 5965155..0d101eb 100644 --- a/Demos/%README +++ b/Demos/%README @@ -112,6 +112,12 @@ Running demonstration programs in the STk web browser 1.5 Misc + * console-demo.stk + This is a simple demo showing a repl loop in a console. + Run with: ../Src/test-stk -f console.stk + Comment: This demo is useful for Unix users only, since under Win32 STk + is started with such a console. + * colormap.stk This is a simple color palette written in STk. Run with: ../Src/test-stk -f colormap.stk @@ -119,6 +125,10 @@ Running demonstration programs in the STk web browser offers now the function Tk:choose-color which allow to choose a color by name or by value. + * stkfontsel.stk + This is a simple program which uses the STk font chooser. + Run with: ../Src/test-stk -f stkfontsel.stk + * small-ed.stk A small editor to create enhanced text Run with: ../Src/test-stk -f small-ed.stk @@ -182,6 +192,9 @@ Running demonstration programs in the STk web browser Comment: Here again, what is interesting in this demo is not what it does, nothing specially fancy, but how it is easy to program, IMHO. + * classbrowse.stklos This demo shows the STklos class browser. + Run with: ../Src/test-stk -f classbrowse.stklos + 2.2 STklos widgets * widget.stklos @@ -241,6 +254,6 @@ Running demonstration programs in the STk web browser lines. Run with: ../Src/test-stk -f S-scape.stklos - ------------------------------------------------------------------------ + Erick Gallesio -Last modified: Mon Mar 9 19:15:46 CET 1998 +Last modified: Sun Aug 22 21:16:13 CEST 1999 diff --git a/Demos/Html-Demos/animate.stk b/Demos/Html-Demos/animate.stk index 59907e7..85763af 100644 --- a/Demos/Html-Demos/animate.stk +++ b/Demos/Html-Demos/animate.stk @@ -1,20 +1,21 @@ -;;;; animate.stk -- A simple image animation (Demo) +;;;; animate.stk -- A simple image animation (Demo) ;;;; -;;;; Copyright © 1998 Erick Gallesio - I3S-CNRS/ESSI +;;;; Copyright © 1998-1999 Erick Gallesio - I3S-CNRS/ESSI ;;;; -;;;; Permission to use, copy, and/or distribute this software and its -;;;; documentation for any purpose and without fee is hereby granted, provided -;;;; that both the above copyright notice and this permission notice appear in -;;;; all copies and derived works. Fees for distribution or use of this -;;;; software or derived works may only be charged with express written -;;;; permission of the copyright holder. -;;;; This software is provided ``as is'' without express or implied warranty. +;;;; Permission to use, copy, modify, distribute,and license this +;;;; software and its documentation for any purpose is hereby granted, +;;;; provided that existing copyright notices are retained in all +;;;; copies and that this notice is included verbatim in any +;;;; distributions. No written agreement, license, or royalty fee is +;;;; required for any of the authorized uses. +;;;; +;;;; This software is provided ``AS IS'' without express or implied +;;;; warranty. ;;;; -;;;; $Id: animate.stk 1.1 Tue, 10 Mar 1998 21:43:37 +0100 eg $ ;;;; ;;;; Author: Erick Gallesio [eg@unice.fr] ;;;; Creation date: 9-Mar-1998 18:51 -;;;;Last file update: 9-Mar-1998 21:07 +;;;;Last file update: 3-Sep-1999 18:45 (eg) (define *img* #f) diff --git a/Demos/Html-Demos/puzzle.stk b/Demos/Html-Demos/puzzle.stk index b0d0df3..785be5c 100644 --- a/Demos/Html-Demos/puzzle.stk +++ b/Demos/Html-Demos/puzzle.stk @@ -1,20 +1,20 @@ ;;;; puzzle.stk -- A puzzle written in STk (from the Tcl Demo) ;;;; -;;;; Copyright © 1998 Erick Gallesio - I3S-CNRS/ESSI +;;;; Copyright © 1998-1999 Erick Gallesio - I3S-CNRS/ESSI ;;;; -;;;; Permission to use, copy, and/or distribute this software and its -;;;; documentation for any purpose and without fee is hereby granted, provided -;;;; that both the above copyright notice and this permission notice appear in -;;;; all copies and derived works. Fees for distribution or use of this -;;;; software or derived works may only be charged with express written -;;;; permission of the copyright holder. -;;;; This software is provided ``as is'' without express or implied warranty. +;;;; Permission to use, copy, modify, distribute,and license this +;;;; software and its documentation for any purpose is hereby granted, +;;;; provided that existing copyright notices are retained in all +;;;; copies and that this notice is included verbatim in any +;;;; distributions. No written agreement, license, or royalty fee is +;;;; required for any of the authorized uses. ;;;; -;;;; $Id: puzzle.stk 1.1 Tue, 10 Mar 1998 21:43:37 +0100 eg $ +;;;; This software is provided ``AS IS'' without express or implied +;;;; warranty. ;;;; ;;;; Author: Erick Gallesio [eg@unice.fr] ;;;; Creation date: 9-Mar-1998 21:11 -;;;;Last file update: 9-Mar-1998 21:37 +;;;;Last file update: 3-Sep-1999 18:50 (eg) (define (display-puzzle parent) diff --git a/Demos/Makefile b/Demos/Makefile old mode 100755 new mode 100644 index 7a014da..18e0f20 --- a/Demos/Makefile +++ b/Demos/Makefile @@ -1,10 +1,23 @@ # # Makefile for the Demos directory # +# Copyright © 1993-1999 Erick Gallesio - I3S-CNRS/ESSI +# +# Permission to use, copy, modify, distribute,and license this +# software and its documentation for any purpose is hereby granted, +# provided that existing copyright notices are retained in all +# copies and that this notice is included verbatim in any +# distributions. No written agreement, license, or royalty fee is +# required for any of the authorized uses. +# This software is provided ``AS IS'' without express or implied +# warranty. +# +# Last file update: 3-Sep-1999 19:20 (eg) +# include ../config.make -DEMODIR=$(libdir)/Demos +DEMODIR=$(root)$(libdir)/Demos what: @echo "Type make install to install demos" @@ -25,7 +38,7 @@ install: cp Html-Demos/*.html $(DEMODIR)/Html-Demos chmod 0644 $(DEMODIR)/Html-Demos/*.html mkdir $(DEMODIR)/Html-Demos/Images; chmod 0755 $(DEMODIR)/Html-Demos/Images - cp Html-Demos/Images/* $(DEMODIR)/Html-Demos/Images + cp Html-Demos/Images/*.gif $(DEMODIR)/Html-Demos/Images chmod 0644 $(DEMODIR)/Html-Demos/Images/* (cd $(DEMODIR)/Html-Demos; ln -s ../amib.stklos ../stklos-widgets .) diff --git a/Demos/README.html b/Demos/README.html index 92e652a..ebda974 100644 --- a/Demos/README.html +++ b/Demos/README.html @@ -1,7 +1,7 @@ - Demo directory README (Version 3.99 - March 1998) + Demo directory README (Version 4.0 - August 1999) @@ -194,6 +194,17 @@

1.5 Misc