From 956ab227ccf41d7ba47c4c7112eb014a1ad9f2d8 Mon Sep 17 00:00:00 2001 From: Erick Gallesio Date: Tue, 2 Feb 1999 12:13:40 +0100 Subject: [PATCH] Commit of 3.99.4 version --- CHANGES | 21 +- ChangeLog | 181 + Demos/Widget/Wcscroll.stklos | 2 +- Demos/Widget/Wfloor.stklos | 264 +- Demos/amib.stklos | 10 +- Demos/browse.stk | 14 +- Demos/browse.stklos | 13 +- Demos/colormap.stk | 7 +- Demos/filebox.stklos | 8 +- Demos/hanoi.stk | 6 +- Demos/stklos-demo.stklos | 6 +- Demos/stklos-demo2.stklos | 6 +- Demos/stklos-widgets.stklos | 10 +- Demos/widget.stk | 3 +- Doc/Isotas96/Isotas96.dvi | Bin 64392 -> 64392 bytes Doc/Isotas96/Isotas96.ps | 7433 ++++------ Doc/Reference/Appendix-E.tex | 11 +- Doc/Reference/manual.dvi | Bin 403036 -> 403188 bytes Doc/Reference/manual.ps | 17167 ++++++------------------ Extensions/base64.c | 14 +- Extensions/hash.c | 10 +- Extensions/html.c | 17 +- Extensions/posix.c | 6 +- Extensions/process.c | 7 +- Extensions/socket.c | 8 +- INSTALL | 4 + INSTALL.win32 | 59 + Lib/Images/LineLeft.gif | Bin 0 -> 1024 bytes Lib/Images/LineRight.gif | Bin 0 -> 1019 bytes Lib/Images/STk-big-logo.gif | Bin 0 -> 66682 bytes Lib/Images/STk-logo.gif | Bin 0 -> 7643 bytes Lib/Images/STk-small-logo.gif | Bin 0 -> 2888 bytes Lib/Images/STk-tiny-logo.gif | Bin 0 -> 1120 bytes Lib/Images/border.gif | Bin 0 -> 105 bytes Lib/Images/box-minus.gif | Bin 0 -> 88 bytes Lib/Images/box-minus.xpm | 14 - Lib/Images/box-plus.gif | Bin 0 -> 88 bytes Lib/Images/box-plus.xpm | 14 - Lib/Images/clipboard.gif | Bin 0 -> 233 bytes Lib/Images/colorline.gif | Bin 0 -> 479 bytes Lib/Images/colors.gif | Bin 0 -> 233 bytes Lib/Images/console.gif | Bin 0 -> 233 bytes Lib/Images/copy.gif | Bin 0 -> 204 bytes Lib/Images/customize.gif | Bin 0 -> 204 bytes Lib/Images/cut.gif | Bin 0 -> 204 bytes Lib/Images/dir.gif | Bin 0 -> 233 bytes Lib/Images/dir.jpg | Bin 0 -> 859 bytes Lib/Images/dir.xpm | 24 - Lib/Images/diropen.gif | Bin 0 -> 233 bytes Lib/Images/diropen.xpm | 25 - Lib/Images/edit.gif | Bin 0 -> 233 bytes Lib/Images/error.gif | Bin 0 -> 1681 bytes Lib/Images/error.xpm | 64 - Lib/Images/evalbuf.gif | Bin 0 -> 233 bytes Lib/Images/evalreg.gif | Bin 0 -> 233 bytes Lib/Images/file.gif | Bin 0 -> 168 bytes Lib/Images/file.xpm | 22 - Lib/Images/floppy.gif | Bin 0 -> 233 bytes Lib/Images/font.gif | Bin 0 -> 204 bytes Lib/Images/hborder.gif | Bin 0 -> 78 bytes Lib/Images/info.gif | Bin 0 -> 2478 bytes Lib/Images/info.xpm | 98 - Lib/Images/parentdir.gif | Bin 0 -> 233 bytes Lib/Images/parentdir.xpm | 25 - Lib/Images/qmark.gif | Bin 0 -> 215 bytes Lib/Images/question.gif | Bin 0 -> 1433 bytes Lib/Images/question.xpm | 59 - Lib/Images/warning.gif | Bin 0 -> 1433 bytes Lib/Images/warning.xpm | 59 - Lib/balloon.stk | 111 + Lib/butbar.stk | 85 + Lib/button.stk | 23 +- Lib/console-customize.stk | 174 + Lib/console.stk | 604 + Lib/dialog.stk | 6 +- Lib/edit.stk | 275 + Lib/error.stk | 12 +- Lib/font-chooser.stklos | 186 + Lib/font-lock.stk | 301 + Lib/ftp.stklos | 46 +- Lib/image.stk | 4 +- Lib/init.stk | 22 +- Lib/listbox.stk | 10 +- Lib/scrollbar.stk | 9 +- Lib/text.stk | 45 +- Lib/tk-init.stk | 29 +- Lib/tk-unix.stk | 6 +- Lib/www-browser.stklos | 8 +- Lib/www-file.stk | 6 +- Lib/www-img.stk | 16 +- Lib/www.stk | 6 +- Makefile.in | 8 +- README | 14 +- STk.prj | 504 +- STklos/%README | 2 +- STklos/README.html | 2 +- STklos/Tk/Basics.stklos | 6 +- STklos/Tk/Button.stklos | 22 +- STklos/Tk/Composite/Balloon.stklos | 60 +- STklos/Tk/Composite/Filebox.stklos | 16 +- STklos/Tk/Composite/Hierarchy.stklos | 17 +- STklos/Tk/Composite/Lentry.stklos | 12 +- STklos/Tk/Composite/Lframe.stklos | 10 +- STklos/Tk/Composite/Schemetext.stklos | 102 +- STklos/Tk/Listbox.stklos | 6 +- STklos/Tk/Menu.stklos | 5 +- STklos/Tk/Text.stklos | 28 +- STklos/Tk/Toplevel.stklos | 17 +- STklos/stklos.stk | 10 +- Snow/console.c | 1 + Snow/vport.c | 1 + Snow/vport.h | 1 + Src/Makefile.in | 6 +- Src/address.c | 3 +- Src/argv.c | 48 +- Src/boolean.c | 5 +- Src/console.c | 89 + Src/cont.c | 97 +- Src/dummy.c | 8 +- Src/dump.c | 7 +- Src/dynload.c | 19 +- Src/env.c | 8 +- Src/error.c | 157 +- Src/eval.c | 68 +- Src/extend.c | 17 +- Src/gc.c | 78 +- Src/io.c | 472 +- Src/keyword.c | 5 +- Src/module.c | 48 +- Src/number.c | 5 +- Src/port.c | 558 +- Src/primitives.c | 21 +- Src/print.c | 247 +- Src/read.c | 135 +- Src/signal.c | 103 +- Src/slib.c | 121 +- Src/sport.c | 113 +- Src/sport.h | 9 +- Src/stk.h | 248 +- Src/stklos.c | 15 +- Src/str.c | 8 +- Src/symbol.c | 5 +- Src/tcl-lib.c | 255 +- Src/tcl-obj.c | 14 +- Src/tcl-util.c | 2 +- Src/tk-glue.c | 8 +- Src/tk-main.c | 6 +- Src/toplevel.c | 137 +- Src/trace.c | 10 +- Src/unix.c | 38 +- Src/userinit.c | 4 +- Src/vector.c | 10 +- Src/vport.c | 155 + Src/vport.h | 48 + Src/wstk.c | 168 +- Stack/Makefile.in | 6 +- Tcl/tcl.h | 24 +- Tcl/tclWinNotify.c | 325 + Tcl/tclWinPort.h | 406 + Tcl/tclWinTime.c | 373 + Tk/generic/tkImgPhoto.c | 6 + Tk/unix/Makefile.in | 2 - Tk/win/README | 122 + Tk/win/install-sh | 1 + Tk/win/license.terms | 39 + Tk/win/makefile.bc | 340 + Tk/win/makefile.dsp | 84 + Tk/win/makefile.dsw | 29 + Tk/win/makefile.ncb | Bin 0 -> 33792 bytes Tk/win/makefile.opt | Bin 0 -> 49664 bytes Tk/win/makefile.plg | 12 + Tk/win/makefile.vc | 440 + Tk/win/mkd.bat | 20 + Tk/win/rc/STk.ico | Bin 0 -> 1398 bytes Tk/win/rc/buttons.bmp | Bin 0 -> 846 bytes Tk/win/rc/cursor00.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor02.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor04.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor06.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor08.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor0a.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor0c.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor0e.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor10.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor12.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor14.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor16.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor18.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor1a.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor1c.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor1e.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor20.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor22.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor24.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor26.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor28.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor2a.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor2c.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor2e.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor30.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor32.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor34.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor36.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor38.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor3a.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor3c.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor3e.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor40.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor42.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor44.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor46.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor48.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor4a.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor4c.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor4e.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor50.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor52.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor54.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor56.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor58.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor5a.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor5c.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor5e.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor60.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor62.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor64.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor66.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor68.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor6a.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor6c.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor6e.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor70.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor72.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor74.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor76.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor78.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor7a.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor7c.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor7e.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor80.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor82.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor84.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor86.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor88.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor8a.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor8c.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor8e.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor90.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor92.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor94.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor96.cur | Bin 0 -> 326 bytes Tk/win/rc/cursor98.cur | Bin 0 -> 326 bytes Tk/win/rc/stk.rc | 132 + Tk/win/rc/tk.ico | Bin 0 -> 1398 bytes Tk/win/rc/tk.rc | 132 + Tk/win/rc/wish.ico | Bin 0 -> 1398 bytes Tk/win/rc/wish.rc | 44 + Tk/win/rmd.bat | 20 + Tk/win/stubs.c | 397 + Tk/win/tkWin.h | 64 + Tk/win/tkWin32Dll.c | 85 + Tk/win/tkWin3d.c | 535 + Tk/win/tkWinButton.c | 811 ++ Tk/win/tkWinClipboard.c | 291 + Tk/win/tkWinColor.c | 615 + Tk/win/tkWinCursor.c | 210 + Tk/win/tkWinDefault.h | 579 + Tk/win/tkWinDialog.c | 1065 ++ Tk/win/tkWinDraw.c | 1264 ++ Tk/win/tkWinEmbed.c | 645 + Tk/win/tkWinFont.c | 634 + Tk/win/tkWinFont.c.orig | 628 + Tk/win/tkWinImage.c | 329 + Tk/win/tkWinInit.c | 130 + Tk/win/tkWinInt.h | 200 + Tk/win/tkWinKey.c | 370 + Tk/win/tkWinMenu.c | 2697 ++++ Tk/win/tkWinPixmap.c | 184 + Tk/win/tkWinPointer.c | 466 + Tk/win/tkWinPort.h | 118 + Tk/win/tkWinRegion.c | 179 + Tk/win/tkWinScrlbr.c | 745 + Tk/win/tkWinSend.c | 86 + Tk/win/tkWinWindow.c | 801 ++ Tk/win/tkWinWm.c | 4396 ++++++ Tk/win/tkWinWm.c.orig | 4217 ++++++ Tk/win/tkWinX.c | 1034 ++ Tk/win/winMain.c | 321 + Tk/xlib/X11/X.h | 669 + Tk/xlib/X11/Xatom.h | 79 + Tk/xlib/X11/Xfuncproto.h | 60 + Tk/xlib/X11/Xlib.h | 4311 ++++++ Tk/xlib/X11/Xutil.h | 879 ++ Tk/xlib/X11/cursorfont.h | 79 + Tk/xlib/X11/keysym.h | 39 + Tk/xlib/X11/keysymdef.h | 1169 ++ Tk/xlib/X11/license.terms | 39 + Tk/xlib/license.terms | 39 + Tk/xlib/xbytes.h | 58 + Tk/xlib/xcolors.c | 911 ++ Tk/xlib/xdraw.c | 82 + Tk/xlib/xgc.c | 353 + Tk/xlib/ximage.c | 71 + Tk/xlib/xutil.c | 116 + Utils/STk.spec | 34 +- Utils/STk.spec.in | 2 +- VERSION | 2 +- Win32/STk.dsp | 309 + Win32/STk.dsw | 74 + Win32/STk.opt | Bin 0 -> 68096 bytes Win32/STk.plg | 193 + Win32/libgmp/libgmp.dsp | 58 + Win32/libtcl/libtcl.dsp | 118 + Win32/libtk/libtk.dsp | 526 + configure | 206 +- configure.in | 58 +- install.bat | 49 + 317 files changed, 48894 insertions(+), 20439 deletions(-) create mode 100644 INSTALL.win32 create mode 100644 Lib/Images/LineLeft.gif create mode 100644 Lib/Images/LineRight.gif create mode 100644 Lib/Images/STk-big-logo.gif create mode 100644 Lib/Images/STk-logo.gif create mode 100644 Lib/Images/STk-small-logo.gif create mode 100644 Lib/Images/STk-tiny-logo.gif create mode 100644 Lib/Images/border.gif create mode 100644 Lib/Images/box-minus.gif delete mode 100644 Lib/Images/box-minus.xpm create mode 100644 Lib/Images/box-plus.gif delete mode 100644 Lib/Images/box-plus.xpm create mode 100644 Lib/Images/clipboard.gif create mode 100644 Lib/Images/colorline.gif create mode 100644 Lib/Images/colors.gif create mode 100644 Lib/Images/console.gif create mode 100644 Lib/Images/copy.gif create mode 100644 Lib/Images/customize.gif create mode 100644 Lib/Images/cut.gif create mode 100644 Lib/Images/dir.gif create mode 100644 Lib/Images/dir.jpg delete mode 100644 Lib/Images/dir.xpm create mode 100644 Lib/Images/diropen.gif delete mode 100644 Lib/Images/diropen.xpm create mode 100644 Lib/Images/edit.gif create mode 100644 Lib/Images/error.gif delete mode 100644 Lib/Images/error.xpm create mode 100644 Lib/Images/evalbuf.gif create mode 100644 Lib/Images/evalreg.gif create mode 100644 Lib/Images/file.gif delete mode 100644 Lib/Images/file.xpm create mode 100644 Lib/Images/floppy.gif create mode 100644 Lib/Images/font.gif create mode 100644 Lib/Images/hborder.gif create mode 100644 Lib/Images/info.gif delete mode 100644 Lib/Images/info.xpm create mode 100644 Lib/Images/parentdir.gif delete mode 100644 Lib/Images/parentdir.xpm create mode 100644 Lib/Images/qmark.gif create mode 100644 Lib/Images/question.gif delete mode 100644 Lib/Images/question.xpm create mode 100644 Lib/Images/warning.gif delete mode 100644 Lib/Images/warning.xpm create mode 100644 Lib/balloon.stk create mode 100644 Lib/butbar.stk create mode 100644 Lib/console-customize.stk create mode 100644 Lib/console.stk create mode 100644 Lib/edit.stk create mode 100644 Lib/font-chooser.stklos create mode 100644 Lib/font-lock.stk create mode 120000 Snow/console.c create mode 120000 Snow/vport.c create mode 120000 Snow/vport.h create mode 100644 Src/console.c create mode 100644 Src/vport.c create mode 100644 Src/vport.h create mode 100644 Tcl/tclWinNotify.c create mode 100644 Tcl/tclWinPort.h create mode 100644 Tcl/tclWinTime.c create mode 100644 Tk/win/README create mode 120000 Tk/win/install-sh create mode 100644 Tk/win/license.terms create mode 100644 Tk/win/makefile.bc create mode 100755 Tk/win/makefile.dsp create mode 100755 Tk/win/makefile.dsw create mode 100755 Tk/win/makefile.ncb create mode 100755 Tk/win/makefile.opt create mode 100755 Tk/win/makefile.plg create mode 100644 Tk/win/makefile.vc create mode 100644 Tk/win/mkd.bat create mode 100644 Tk/win/rc/STk.ico create mode 100644 Tk/win/rc/buttons.bmp create mode 100644 Tk/win/rc/cursor00.cur create mode 100644 Tk/win/rc/cursor02.cur create mode 100644 Tk/win/rc/cursor04.cur create mode 100644 Tk/win/rc/cursor06.cur create mode 100644 Tk/win/rc/cursor08.cur create mode 100644 Tk/win/rc/cursor0a.cur create mode 100644 Tk/win/rc/cursor0c.cur create mode 100644 Tk/win/rc/cursor0e.cur create mode 100644 Tk/win/rc/cursor10.cur create mode 100644 Tk/win/rc/cursor12.cur create mode 100644 Tk/win/rc/cursor14.cur create mode 100644 Tk/win/rc/cursor16.cur create mode 100644 Tk/win/rc/cursor18.cur create mode 100644 Tk/win/rc/cursor1a.cur create mode 100644 Tk/win/rc/cursor1c.cur create mode 100644 Tk/win/rc/cursor1e.cur create mode 100644 Tk/win/rc/cursor20.cur create mode 100644 Tk/win/rc/cursor22.cur create mode 100644 Tk/win/rc/cursor24.cur create mode 100644 Tk/win/rc/cursor26.cur create mode 100644 Tk/win/rc/cursor28.cur create mode 100644 Tk/win/rc/cursor2a.cur create mode 100644 Tk/win/rc/cursor2c.cur create mode 100644 Tk/win/rc/cursor2e.cur create mode 100644 Tk/win/rc/cursor30.cur create mode 100644 Tk/win/rc/cursor32.cur create mode 100644 Tk/win/rc/cursor34.cur create mode 100644 Tk/win/rc/cursor36.cur create mode 100644 Tk/win/rc/cursor38.cur create mode 100644 Tk/win/rc/cursor3a.cur create mode 100644 Tk/win/rc/cursor3c.cur create mode 100644 Tk/win/rc/cursor3e.cur create mode 100644 Tk/win/rc/cursor40.cur create mode 100644 Tk/win/rc/cursor42.cur create mode 100644 Tk/win/rc/cursor44.cur create mode 100644 Tk/win/rc/cursor46.cur create mode 100644 Tk/win/rc/cursor48.cur create mode 100644 Tk/win/rc/cursor4a.cur create mode 100644 Tk/win/rc/cursor4c.cur create mode 100644 Tk/win/rc/cursor4e.cur create mode 100644 Tk/win/rc/cursor50.cur create mode 100644 Tk/win/rc/cursor52.cur create mode 100644 Tk/win/rc/cursor54.cur create mode 100644 Tk/win/rc/cursor56.cur create mode 100644 Tk/win/rc/cursor58.cur create mode 100644 Tk/win/rc/cursor5a.cur create mode 100644 Tk/win/rc/cursor5c.cur create mode 100644 Tk/win/rc/cursor5e.cur create mode 100644 Tk/win/rc/cursor60.cur create mode 100644 Tk/win/rc/cursor62.cur create mode 100644 Tk/win/rc/cursor64.cur create mode 100644 Tk/win/rc/cursor66.cur create mode 100644 Tk/win/rc/cursor68.cur create mode 100644 Tk/win/rc/cursor6a.cur create mode 100644 Tk/win/rc/cursor6c.cur create mode 100644 Tk/win/rc/cursor6e.cur create mode 100644 Tk/win/rc/cursor70.cur create mode 100644 Tk/win/rc/cursor72.cur create mode 100644 Tk/win/rc/cursor74.cur create mode 100644 Tk/win/rc/cursor76.cur create mode 100644 Tk/win/rc/cursor78.cur create mode 100644 Tk/win/rc/cursor7a.cur create mode 100644 Tk/win/rc/cursor7c.cur create mode 100644 Tk/win/rc/cursor7e.cur create mode 100644 Tk/win/rc/cursor80.cur create mode 100644 Tk/win/rc/cursor82.cur create mode 100644 Tk/win/rc/cursor84.cur create mode 100644 Tk/win/rc/cursor86.cur create mode 100644 Tk/win/rc/cursor88.cur create mode 100644 Tk/win/rc/cursor8a.cur create mode 100644 Tk/win/rc/cursor8c.cur create mode 100644 Tk/win/rc/cursor8e.cur create mode 100644 Tk/win/rc/cursor90.cur create mode 100644 Tk/win/rc/cursor92.cur create mode 100644 Tk/win/rc/cursor94.cur create mode 100644 Tk/win/rc/cursor96.cur create mode 100644 Tk/win/rc/cursor98.cur create mode 100644 Tk/win/rc/stk.rc create mode 100644 Tk/win/rc/tk.ico create mode 100644 Tk/win/rc/tk.rc create mode 100644 Tk/win/rc/wish.ico create mode 100644 Tk/win/rc/wish.rc create mode 100644 Tk/win/rmd.bat create mode 100644 Tk/win/stubs.c create mode 100644 Tk/win/tkWin.h create mode 100644 Tk/win/tkWin32Dll.c create mode 100644 Tk/win/tkWin3d.c create mode 100644 Tk/win/tkWinButton.c create mode 100644 Tk/win/tkWinClipboard.c create mode 100644 Tk/win/tkWinColor.c create mode 100644 Tk/win/tkWinCursor.c create mode 100644 Tk/win/tkWinDefault.h create mode 100644 Tk/win/tkWinDialog.c create mode 100644 Tk/win/tkWinDraw.c create mode 100644 Tk/win/tkWinEmbed.c create mode 100644 Tk/win/tkWinFont.c create mode 100644 Tk/win/tkWinFont.c.orig create mode 100644 Tk/win/tkWinImage.c create mode 100644 Tk/win/tkWinInit.c create mode 100644 Tk/win/tkWinInt.h create mode 100644 Tk/win/tkWinKey.c create mode 100644 Tk/win/tkWinMenu.c create mode 100644 Tk/win/tkWinPixmap.c create mode 100644 Tk/win/tkWinPointer.c create mode 100644 Tk/win/tkWinPort.h create mode 100644 Tk/win/tkWinRegion.c create mode 100644 Tk/win/tkWinScrlbr.c create mode 100644 Tk/win/tkWinSend.c create mode 100644 Tk/win/tkWinWindow.c create mode 100644 Tk/win/tkWinWm.c create mode 100644 Tk/win/tkWinWm.c.orig create mode 100644 Tk/win/tkWinX.c create mode 100644 Tk/win/winMain.c create mode 100644 Tk/xlib/X11/X.h create mode 100644 Tk/xlib/X11/Xatom.h create mode 100644 Tk/xlib/X11/Xfuncproto.h create mode 100644 Tk/xlib/X11/Xlib.h create mode 100644 Tk/xlib/X11/Xutil.h create mode 100644 Tk/xlib/X11/cursorfont.h create mode 100644 Tk/xlib/X11/keysym.h create mode 100644 Tk/xlib/X11/keysymdef.h create mode 100644 Tk/xlib/X11/license.terms create mode 100644 Tk/xlib/license.terms create mode 100644 Tk/xlib/xbytes.h create mode 100644 Tk/xlib/xcolors.c create mode 100644 Tk/xlib/xdraw.c create mode 100644 Tk/xlib/xgc.c create mode 100644 Tk/xlib/ximage.c create mode 100644 Tk/xlib/xutil.c create mode 100755 Win32/STk.dsp create mode 100755 Win32/STk.dsw create mode 100755 Win32/STk.opt create mode 100755 Win32/STk.plg create mode 100755 Win32/libgmp/libgmp.dsp create mode 100755 Win32/libtcl/libtcl.dsp create mode 100755 Win32/libtk/libtk.dsp create mode 100755 install.bat diff --git a/CHANGES b/CHANGES index 06ac0d5..9366a56 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,23 @@ -30/09/98 Release 3.99.3 +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) + + * A console mode (which is used by default on Windows, but can + be used with the -console option on Unix) + + * A new editor with Scheme fontification and indentation + + * New kind of ports: virtual ports + + * All the code dealing with files has been rewritten. + + * As usual, some bug corrections + + +09/30/98 Release 3.99.3 ----------------------- Mains changes/modifications since 3.99.2 are: diff --git a/ChangeLog b/ChangeLog index 373a40f..027924d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,184 @@ +1999-02-02 Erick Gallesio + + * Release 3.99.4: This is the last pre 4.0 version. Code for Win32 + is included. The definitive version will follow shortly if people + thinks this version is OK (and when documentation will be updated + :-<) + +1999-02-01 Erick Gallesio + + * Lib/font-chooser.stklos: New file. + +1999-01-28 Erick Gallesio + + * Lib/ftp.stklos: Changed the ftp code which hanged in some + situations Thanks to David Tillman + for signalling the bug. + +1999-01-27 Erick Gallesio + + * configure.in : typos which avoid the compilation of static + libraries. + +1999-01-26 Erick Gallesio + + * Lib/console.stk: some console binding have been changed to be less + "alien" with Windows. + +1999-01-07 Erick Gallesio + + * Src/stk.h: Acces to float is now direct (i.e. without pointer). + It was not the case to avoid to make too much big cells due to + alignments problems. The trick was to put the union before the + tag (suggested by "Jay Krell" . Thanks) + +1998-12-27 Erick Gallesio + + * STklos/Tk/Composite/Balloon.stklos (): class + redefined to use the STk layer ballons (defined for the console). + + * STklos/Tk/Composite/Schemetext.stklos: Modified to use the new + font-lock code. + +1998-12-26 Erick Gallesio + + * Src/signal.c: Finally code for Control-C works (finger crossed), + for the console and for classical xterms. This was a pain to write + it correctly. + + * Lib/console.stk: code cleaning and some minor bug corrections. + +1998-12-25 Erick Gallesio + + * Src/dynload.c (find_function): Better error message when dynamic + loading fails + +1998-12-19 Erick Gallesio + + * Src/error.c (print_message): recursive error seems finally correct ;-) + This was something that was unsatisfying since v2.0 !!! + + * Src/unix.c: Changes for MS C compiler provided by jay.krell@cornell.edu + have been applied. + + * STklos/Tk/Basics.stklos (Id->instance): typo error + +1998-12-10 Erick Gallesio + + * Src/error.c: error management has ben completely changed. This should + be less fragile now. + +1998-12-08 Erick Gallesio + + * Lib/tk-init.stk ("edit"): The ed function is now the scheme editor + instead of the old one in file editor.stk + + * Lib/text.stk: Deleted the binding for Control-v on Unix. I don't + like that but this allow to be more consistent with others + software which use the windowish Contol-C Control-v Control-X + bindings. + + * Lib/tk-init.stk:New functions set-widget-property! and + get-widget-property + +1998-12-02 Erick Gallesio + + * Lib/tk-init.stk: Typo correction which prevent the loading of + Tk:get-save-file on Unix. + + * STklos/Tk/Text.stklos: Correction of a bug in the initialization + of (generic parent was hidden by a local). Thanks to + Eric Fintzel for signaling it. + +1998-12-01 Erick Gallesio + + * Src/argv.c: New option -console to the interpreter to interact + through a console rather than a xterm. On Windows, the console + will be the implicit way to interact with the interpreter + + * Src/console.c: + * Lib/console.stk: New files to implement a console for interacting + with STklos. + + * Lib/font-lock.stk: New file. Font-lock doesn't need to load STklos + now. + +1998-11-22 Erick Gallesio + + * Src/port.c (STk_copy_port): New primitive: copy-port + + * Src/tcl-lib.c : Some cleaning on Tcl channels. + + * STklos/Tk/Listbox.stklos (y-view): Method lacks a dot before the + "args" paramter (thanks to Walter C. Pelissero + for signaling it). + +1998-11-21 Erick Gallesio + + * configure.in : Applied the patch given by Shiro Kawai + for IRIX 6.2. + + * Src/port.c: Char-ready is now implemented in io.c which is a + quite natural place ... More code cleaning. + +1998-11-19 Erick Gallesio + + * Src/sport.c: New primitive with-error-to-string + + * Src/port.c: + - New primitive with-error-to-file (why was it absent?) + - New primitives with-input-from-port, with-output-to-port, + with-error-to-port + - Rewriting of large parts of the file using new primitives. + + Src/io.c: has completely be rewritten. It should be faster now + and handle all the kind of port we have: file, strings and + virtual + +1998-11-18 Erick Gallesio + + * Lib/text.stk: Pasting with mouse is now correct. + +1998-11-10 Erick Gallesio + + * Src/*.c : * Extensions/*.c: Funtions using files heve all been + replaced with port. It means that port, string-ports and virtual + ports are now truly interchangeable. The drawback is that user + code written in C which use files can be BROKEN. + +1998-11-05 Erick Gallesio + + * Src/signal.c (STk_send_signal): New primitive. + +1998-11-04 Erick Gallesio + + * Src/vport.c: New file which implement virtual ports. A virtual + port can be opened for reading or writing. Functions to access + the port are given by the user as Scheme procedures + + * STklos/Tk/Composite/Filebox.stklos : Error messages use a :text + option instead of :message => error messages were not correctly + displayed + +1998-10-29 Erick Gallesio + + * Src/port.c (STk_read_line): starts now with a static buffer and + extend it dynamically if needed. Furthermore a potential bug has + been corrceted. + +1998-10-22 Erick Gallesio + + * Lib/listbox.stk : 2 typo errors corrected + +1998-10-15 Erick Gallesio + + * STklos/Tk/Toplevel.stklos: New generic-function: children and + typo error correction in export list + +1998-09-30 Erick Gallesio + + * Release 3.99.3 + 1998-09-27 Erick Gallesio * Src/toplevel.c (init_interpreter): *stk-library* is now diff --git a/Demos/Widget/Wcscroll.stklos b/Demos/Widget/Wcscroll.stklos index a864cce..520cda4 100644 --- a/Demos/Widget/Wcscroll.stklos +++ b/Demos/Widget/Wcscroll.stklos @@ -51,7 +51,7 @@ :coords (read-from-string (format #f "(~Ac ~Ac ~Ac ~Ac)" x y (+ x 2) (+ y 2)))) (make :parent c :text (cons i j) :anchor 'center - :font "fixed" + :font '(Courier -12) :tags "text" :coords (read-from-string (format #f "(~Ac ~Ac)" (+ x 1) (+ y 1)))) diff --git a/Demos/Widget/Wfloor.stklos b/Demos/Widget/Wfloor.stklos index aedef23..234d566 100644 --- a/Demos/Widget/Wfloor.stklos +++ b/Demos/Widget/Wfloor.stklos @@ -351,101 +351,101 @@ (define (fg1 w color) (clearReferences) (storeReference [w 'create 'polygon 375 246 375 172 341 172 341 246 :fill "" :tags "floor1 room"] "101") - (w 'create 'text 358 209 :text "101" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 358 209 :text "101" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 307 240 339 240 339 206 307 206 :fill "" :tags "floor1 room"] "Pub Lift1") - (w 'create 'text 323 223 :text "Pub Lift1" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 323 223 :text "Pub Lift1" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 339 205 307 205 307 171 339 171 :fill "" :tags "floor1 room"] "Priv Lift1") - (w 'create 'text 323 188 :text "Priv Lift1" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 323 188 :text "Priv Lift1" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 42 389 42 337 1 337 1 389 :fill "" :tags "floor1 room"] "110") - (w 'create 'text 21.5 363 :text "110" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 21.5 363 :text "110" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 59 389 59 385 90 385 90 337 44 337 44 389 :fill "" :tags "floor1 room"] "109") - (w 'create 'text 67 363 :text "109" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 67 363 :text "109" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 51 300 51 253 6 253 6 300 :fill "" :tags "floor1 room"] "111") - (w 'create 'text 28.5 276.5 :text "111" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 28.5 276.5 :text "111" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 98 248 98 309 79 309 79 248 :fill "" :tags "floor1 room"] "117B") - (w 'create 'text 88.5 278.5 :text "117B" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 88.5 278.5 :text "117B" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 51 251 51 204 6 204 6 251 :fill "" :tags "floor1 room"] "112") - (w 'create 'text 28.5 227.5 :text "112" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 28.5 227.5 :text "112" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 6 156 51 156 51 203 6 203 :fill "" :tags "floor1 room"] "113") - (w 'create 'text 28.5 179.5 :text "113" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 28.5 179.5 :text "113" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 85 169 79 169 79 192 85 192 :fill "" :tags "floor1 room"] "117A") - (w 'create 'text 82 180.5 :text "117A" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 82 180.5 :text "117A" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 77 302 77 168 53 168 53 302 :fill "" :tags "floor1 room"] "117") - (w 'create 'text 65 235 :text "117" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 65 235 :text "117" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 51 155 51 115 6 115 6 155 :fill "" :tags "floor1 room"] "114") - (w 'create 'text 28.5 135 :text "114" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 28.5 135 :text "114" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 95 115 53 115 53 168 95 168 :fill "" :tags "floor1 room"] "115") - (w 'create 'text 74 141.5 :text "115" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 74 141.5 :text "115" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 87 113 87 27 10 27 10 113 :fill "" :tags "floor1 room"] "116") - (w 'create 'text 48.5 70 :text "116" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 48.5 70 :text "116" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 89 91 128 91 128 113 89 113 :fill "" :tags "floor1 room"] "118") - (w 'create 'text 108.5 102 :text "118" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 108.5 102 :text "118" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 178 128 178 132 216 132 216 91 163 91 163 112 149 112 149 128 :fill "" :tags "floor1 room"] "120") - (w 'create 'text 189.5 111.5 :text "120" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 189.5 111.5 :text "120" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 79 193 87 193 87 169 136 169 136 192 156 192 156 169 175 169 175 246 79 246 :fill "" :tags "floor1 room"] "122") - (w 'create 'text 131 207.5 :text "122" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 131 207.5 :text "122" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 138 169 154 169 154 191 138 191 :fill "" :tags "floor1 room"] "121") - (w 'create 'text 146 180 :text "121" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 146 180 :text "121" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 99 300 126 300 126 309 99 309 :fill "" :tags "floor1 room"] "106A") - (w 'create 'text 112.5 304.5 :text "106A" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 112.5 304.5 :text "106A" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 128 299 128 309 150 309 150 248 99 248 99 299 :fill "" :tags "floor1 room"] "105") - (w 'create 'text 124.5 278.5 :text "105" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 124.5 278.5 :text "105" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 174 309 174 300 152 300 152 309 :fill "" :tags "floor1 room"] "106B") - (w 'create 'text 163 304.5 :text "106B" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 163 304.5 :text "106B" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 176 299 176 309 216 309 216 248 152 248 152 299 :fill "" :tags "floor1 room"] "104") - (w 'create 'text 184 278.5 :text "104" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 184 278.5 :text "104" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 138 385 138 337 91 337 91 385 :fill "" :tags "floor1 room"] "108") - (w 'create 'text 114.5 361 :text "108" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 114.5 361 :text "108" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 256 337 140 337 140 385 256 385 :fill "" :tags "floor1 room"] "107") - (w 'create 'text 198 361 :text "107" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 198 361 :text "107" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 300 353 300 329 260 329 260 353 :fill "" :tags "floor1 room"] "Smoking") - (w 'create 'text 280 341 :text "Smoking" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 280 341 :text "Smoking" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 314 135 314 170 306 170 306 246 177 246 177 135 :fill "" :tags "floor1 room"] "123") - (w 'create 'text 245.5 190.5 :text "123" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 245.5 190.5 :text "123" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 217 248 301 248 301 326 257 326 257 310 217 310 :fill "" :tags "floor1 room"] "103") - (w 'create 'text 259 287 :text "103" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 259 287 :text "103" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 396 188 377 188 377 169 316 169 316 131 396 131 :fill "" :tags "floor1 room"] "124") - (w 'create 'text 356 150 :text "124" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 356 150 :text "124" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 397 226 407 226 407 189 377 189 377 246 397 246 :fill "" :tags "floor1 room"] "125") - (w 'create 'text 392 217.5 :text "125" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 392 217.5 :text "125" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 399 187 409 187 409 207 474 207 474 164 399 164 :fill "" :tags "floor1 room"] "126") - (w 'create 'text 436.5 185.5 :text "126" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 436.5 185.5 :text "126" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 409 209 409 229 399 229 399 253 486 253 486 239 474 239 474 209 :fill "" :tags "floor1 room"] "127") - (w 'create 'text 436.5 231 :text "127" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 436.5 231 :text "127" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 501 164 501 174 495 174 495 188 490 188 490 204 476 204 476 164 :fill "" :tags "floor1 room"] "MShower") - (w 'create 'text 488.5 184 :text "MShower" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 488.5 184 :text "MShower" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 497 176 513 176 513 204 492 204 492 190 497 190 :fill "" :tags "floor1 room"] "Closet") - (w 'create 'text 502.5 190 :text "Closet" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 502.5 190 :text "Closet" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 476 237 476 206 513 206 513 254 488 254 488 237 :fill "" :tags "floor1 room"] "WShower") - (w 'create 'text 494.5 230 :text "WShower" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 494.5 230 :text "WShower" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 486 131 558 131 558 135 724 135 724 166 697 166 697 275 553 275 531 254 515 254 515 174 503 174 503 161 486 161 :fill "" :tags "floor1 room"] "130") - (w 'create 'text 638.5 205 :text "130" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 638.5 205 :text "130" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 308 242 339 242 339 248 342 248 342 246 397 246 397 276 393 276 393 309 300 309 300 248 308 248 :fill "" :tags "floor1 room"] "102") - (w 'create 'text 367.5 278.5 :text "102" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 367.5 278.5 :text "102" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 397 255 486 255 486 276 397 276 :fill "" :tags "floor1 room"] "128") - (w 'create 'text 441.5 265.5 :text "128" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 441.5 265.5 :text "128" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 510 309 486 309 486 255 530 255 552 277 561 277 561 325 510 325 :fill "" :tags "floor1 room"] "129") - (w 'create 'text 535.5 293 :text "129" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 535.5 293 :text "129" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 696 281 740 281 740 387 642 387 642 389 561 389 561 277 696 277 :fill "" :tags "floor1 room"] "133") - (w 'create 'text 628.5 335 :text "133" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 628.5 335 :text "133" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 742 387 742 281 800 281 800 387 :fill "" :tags "floor1 room"] "132") - (w 'create 'text 771 334 :text "132" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 771 334 :text "132" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 800 168 800 280 699 280 699 168 :fill "" :tags "floor1 room"] "134") - (w 'create 'text 749.5 224 :text "134" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 749.5 224 :text "134" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 726 131 726 166 800 166 800 131 :fill "" :tags "floor1 room"] "135") - (w 'create 'text 763 148.5 :text "135" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 763 148.5 :text "135" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 340 360 335 363 331 365 326 366 304 366 304 312 396 312 396 288 400 288 404 288 409 290 413 292 418 297 421 302 422 309 421 318 417 325 411 330 405 332 397 333 344 333 340 334 336 336 335 338 332 342 331 347 332 351 334 354 336 357 341 359 :fill "" :tags "floor1 room"] "Ramona Stair") - (w 'create 'text 368 323 :text "Ramona Stair" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 368 323 :text "Ramona Stair" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 30 23 30 5 93 5 98 5 104 7 110 10 116 16 119 20 122 28 123 32 123 68 220 68 220 87 90 87 90 23 :fill "" :tags "floor1 room"] "University Stair") - (w 'create 'text 155 77.5 :text "University Stair" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 155 77.5 :text "University Stair" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 282 37 295 40 312 49 323 56 337 70 352 56 358 48 363 39 365 29 348 25 335 22 321 14 300 5 283 1 260 0 246 0 242 2 236 4 231 8 227 13 223 17 221 22 220 34 260 34 :fill "" :tags "floor1 room"] "Plaza Stair") - (w 'create 'text 317.5 28.5 :text "Plaza Stair" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 317.5 28.5 :text "Plaza Stair" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 220 34 260 34 282 37 295 40 312 49 323 56 337 70 350 83 365 94 377 100 386 104 386 128 220 128 :fill "" :tags "floor1 room"] "Plaza Deck") - (w 'create 'text 303 81 :text "Plaza Deck" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 303 81 :text "Plaza Deck" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 257 336 77 336 6 336 6 301 77 301 77 310 257 310 :fill "" :tags "floor1 room"] "106") - (w 'create 'text 131.5 318.5 :text "106" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 131.5 318.5 :text "106" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 146 110 162 110 162 91 130 91 130 115 95 115 95 128 114 128 114 151 157 151 157 153 112 153 112 130 97 130 97 168 175 168 175 131 146 131 :fill "" :tags "floor1 room"] "119") - (w 'create 'text 143.5 133 :text "119" :fill color :anchor "c" :tags "floor1 label" :font "fixed") + (w 'create 'text 143.5 133 :text "119" :fill color :anchor "c" :tags "floor1 label" :font '(Courier -12)) (w 'create 'line 155 191 155 189 :fill color :tags "floor1 wall") (w 'create 'line 155 177 155 169 :fill color :tags "floor1 wall") @@ -610,107 +610,107 @@ (define (fg2 w color) (clearReferences) (storeReference [w 'create 'polygon 748 188 755 188 755 205 758 205 758 222 800 222 800 168 748 168 :fill "" :tags "floor2 room"] "238") - (w 'create 'text 774 195 :text "238" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 774 195 :text "238" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 726 188 746 188 746 166 800 166 800 131 726 131 :fill "" :tags "floor2 room"] "237") - (w 'create 'text 763 148.5 :text "237" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 763 148.5 :text "237" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 497 187 497 204 559 204 559 324 641 324 643 324 643 291 641 291 641 205 696 205 696 291 694 291 694 314 715 314 715 291 715 205 755 205 755 190 724 190 724 187 :fill "" :tags "floor2 room"] "246") - (w 'create 'text 600 264 :text "246" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 600 264 :text "246" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 694 279 643 279 643 314 694 314 :fill "" :tags "floor2 room"] "247") - (w 'create 'text 668.5 296.5 :text "247" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 668.5 296.5 :text "247" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 232 250 308 250 308 242 339 242 339 246 397 246 397 255 476 255 476 250 482 250 559 250 559 274 482 274 482 278 396 278 396 274 232 274 :fill "" :tags "floor2 room"] "202") - (w 'create 'text 285.5 260 :text "202" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 285.5 260 :text "202" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 53 228 53 338 176 338 233 338 233 196 306 196 306 180 175 180 175 169 156 169 156 196 176 196 176 228 :fill "" :tags "floor2 room"] "206") - (w 'create 'text 143 267 :text "206" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 143 267 :text "206" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 51 277 6 277 6 338 51 338 :fill "" :tags "floor2 room"] "212") - (w 'create 'text 28.5 307.5 :text "212" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 28.5 307.5 :text "212" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 557 276 486 276 486 309 510 309 510 325 557 325 :fill "" :tags "floor2 room"] "245") - (w 'create 'text 521.5 300.5 :text "245" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 521.5 300.5 :text "245" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 560 389 599 389 599 326 560 326 :fill "" :tags "floor2 room"] "244") - (w 'create 'text 579.5 357.5 :text "244" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 579.5 357.5 :text "244" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 601 389 601 326 643 326 643 389 :fill "" :tags "floor2 room"] "243") - (w 'create 'text 622 357.5 :text "243" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 622 357.5 :text "243" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 688 316 645 316 645 365 688 365 :fill "" :tags "floor2 room"] "242") - (w 'create 'text 666.5 340.5 :text "242" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 666.5 340.5 :text "242" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 802 367 759 367 759 226 802 226 :fill "" :tags "floor2 room"] "Barbecue Deck") - (w 'create 'text 780.5 296.5 :text "Barbecue Deck" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 780.5 296.5 :text "Barbecue Deck" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 755 262 755 314 717 314 717 262 :fill "" :tags "floor2 room"] "240") - (w 'create 'text 736 288 :text "240" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 736 288 :text "240" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 755 316 689 316 689 365 755 365 :fill "" :tags "floor2 room"] "241") - (w 'create 'text 722 340.5 :text "241" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 722 340.5 :text "241" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 755 206 717 206 717 261 755 261 :fill "" :tags "floor2 room"] "239") - (w 'create 'text 736 233.5 :text "239" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 736 233.5 :text "239" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 695 277 643 277 643 206 695 206 :fill "" :tags "floor2 room"] "248") - (w 'create 'text 669 241.5 :text "248" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 669 241.5 :text "248" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 676 135 676 185 724 185 724 135 :fill "" :tags "floor2 room"] "236") - (w 'create 'text 700 160 :text "236" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 700 160 :text "236" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 675 135 635 135 635 145 628 145 628 185 675 185 :fill "" :tags "floor2 room"] "235") - (w 'create 'text 651.5 160 :text "235" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 651.5 160 :text "235" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 626 143 633 143 633 135 572 135 572 143 579 143 579 185 626 185 :fill "" :tags "floor2 room"] "234") - (w 'create 'text 606 160 :text "234" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 606 160 :text "234" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 557 135 571 135 571 145 578 145 578 185 527 185 527 131 557 131 :fill "" :tags "floor2 room"] "233") - (w 'create 'text 552.5 158 :text "233" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 552.5 158 :text "233" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 476 249 557 249 557 205 476 205 :fill "" :tags "floor2 room"] "230") - (w 'create 'text 516.5 227 :text "230" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 516.5 227 :text "230" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 476 164 486 164 486 131 525 131 525 185 476 185 :fill "" :tags "floor2 room"] "232") - (w 'create 'text 500.5 158 :text "232" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 500.5 158 :text "232" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 476 186 495 186 495 204 476 204 :fill "" :tags "floor2 room"] "229") - (w 'create 'text 485.5 195 :text "229" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 485.5 195 :text "229" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 474 207 409 207 409 187 399 187 399 164 474 164 :fill "" :tags "floor2 room"] "227") - (w 'create 'text 436.5 185.5 :text "227" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 436.5 185.5 :text "227" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 399 228 399 253 474 253 474 209 409 209 409 228 :fill "" :tags "floor2 room"] "228") - (w 'create 'text 436.5 231 :text "228" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 436.5 231 :text "228" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 397 246 397 226 407 226 407 189 377 189 377 246 :fill "" :tags "floor2 room"] "226") - (w 'create 'text 392 217.5 :text "226" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 392 217.5 :text "226" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 377 169 316 169 316 131 397 131 397 188 377 188 :fill "" :tags "floor2 room"] "225") - (w 'create 'text 356.5 150 :text "225" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 356.5 150 :text "225" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 234 198 306 198 306 249 234 249 :fill "" :tags "floor2 room"] "224") - (w 'create 'text 270 223.5 :text "224" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 270 223.5 :text "224" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 270 179 306 179 306 170 314 170 314 135 270 135 :fill "" :tags "floor2 room"] "223") - (w 'create 'text 292 157 :text "223" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 292 157 :text "223" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 268 179 221 179 221 135 268 135 :fill "" :tags "floor2 room"] "222") - (w 'create 'text 244.5 157 :text "222" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 244.5 157 :text "222" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 177 179 219 179 219 135 177 135 :fill "" :tags "floor2 room"] "221") - (w 'create 'text 198 157 :text "221" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 198 157 :text "221" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 299 327 349 327 349 284 341 284 341 276 299 276 :fill "" :tags "floor2 room"] "204") - (w 'create 'text 324 301.5 :text "204" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 324 301.5 :text "204" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 234 276 297 276 297 327 257 327 257 338 234 338 :fill "" :tags "floor2 room"] "205") - (w 'create 'text 265.5 307 :text "205" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 265.5 307 :text "205" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 256 385 256 340 212 340 212 385 :fill "" :tags "floor2 room"] "207") - (w 'create 'text 234 362.5 :text "207" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 234 362.5 :text "207" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 210 340 164 340 164 385 210 385 :fill "" :tags "floor2 room"] "208") - (w 'create 'text 187 362.5 :text "208" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 187 362.5 :text "208" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 115 340 162 340 162 385 115 385 :fill "" :tags "floor2 room"] "209") - (w 'create 'text 138.5 362.5 :text "209" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 138.5 362.5 :text "209" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 89 228 89 156 53 156 53 228 :fill "" :tags "floor2 room"] "217") - (w 'create 'text 71 192 :text "217" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 71 192 :text "217" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 89 169 97 169 97 190 89 190 :fill "" :tags "floor2 room"] "217A") - (w 'create 'text 93 179.5 :text "217A" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 93 179.5 :text "217A" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 89 156 89 168 95 168 95 135 53 135 53 156 :fill "" :tags "floor2 room"] "216") - (w 'create 'text 71 145.5 :text "216" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 71 145.5 :text "216" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 51 179 51 135 6 135 6 179 :fill "" :tags "floor2 room"] "215") - (w 'create 'text 28.5 157 :text "215" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 28.5 157 :text "215" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 51 227 6 227 6 180 51 180 :fill "" :tags "floor2 room"] "214") - (w 'create 'text 28.5 203.5 :text "214" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 28.5 203.5 :text "214" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 51 275 6 275 6 229 51 229 :fill "" :tags "floor2 room"] "213") - (w 'create 'text 28.5 252 :text "213" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 28.5 252 :text "213" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 114 340 67 340 67 385 114 385 :fill "" :tags "floor2 room"] "210") - (w 'create 'text 90.5 362.5 :text "210" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 90.5 362.5 :text "210" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 59 389 59 385 65 385 65 340 1 340 1 389 :fill "" :tags "floor2 room"] "211") - (w 'create 'text 33 364.5 :text "211" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 33 364.5 :text "211" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 393 309 350 309 350 282 342 282 342 276 393 276 :fill "" :tags "floor2 room"] "203") - (w 'create 'text 367.5 292.5 :text "203" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 367.5 292.5 :text "203" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 99 191 91 191 91 226 174 226 174 198 154 198 154 192 109 192 109 169 99 169 :fill "" :tags "floor2 room"] "220") - (w 'create 'text 132.5 208.5 :text "220" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 132.5 208.5 :text "220" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 339 205 307 205 307 171 339 171 :fill "" :tags "floor2 room"] "Priv Lift2") - (w 'create 'text 323 188 :text "Priv Lift2" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 323 188 :text "Priv Lift2" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 307 240 339 240 339 206 307 206 :fill "" :tags "floor2 room"] "Pub Lift 2") - (w 'create 'text 323 223 :text "Pub Lift 2" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 323 223 :text "Pub Lift 2" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 175 168 97 168 97 131 175 131 :fill "" :tags "floor2 room"] "218") - (w 'create 'text 136 149.5 :text "218" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 136 149.5 :text "218" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 154 191 111 191 111 169 154 169 :fill "" :tags "floor2 room"] "219") - (w 'create 'text 132.5 180 :text "219" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 132.5 180 :text "219" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 375 246 375 172 341 172 341 246 :fill "" :tags "floor2 room"] "201") - (w 'create 'text 358 209 :text "201" :fill color :anchor "c" :tags "floor2 label" :font "fixed") + (w 'create 'text 358 209 :text "201" :fill color :anchor "c" :tags "floor2 label" :font '(Courier -12)) (w 'create 'line 641 186 678 186 :fill color :tags "floor2 wall") (w 'create 'line 757 350 757 367 :fill color :tags "floor2 wall") @@ -870,71 +870,71 @@ (define (fg3 w color) (clearReferences) (storeReference [w 'create 'polygon 89 228 89 180 70 180 70 228 :fill "" :tags "floor3 room"] "316") - (w 'create 'text 79.5 204 :text "316" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 79.5 204 :text "316" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 115 368 162 368 162 323 115 323 :fill "" :tags "floor3 room"] "309") - (w 'create 'text 138.5 345.5 :text "309" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 138.5 345.5 :text "309" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 164 323 164 368 211 368 211 323 :fill "" :tags "floor3 room"] "308") - (w 'create 'text 187.5 345.5 :text "308" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 187.5 345.5 :text "308" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 256 368 212 368 212 323 256 323 :fill "" :tags "floor3 room"] "307") - (w 'create 'text 234 345.5 :text "307" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 234 345.5 :text "307" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 244 276 297 276 297 327 260 327 260 321 244 321 :fill "" :tags "floor3 room"] "305") - (w 'create 'text 270.5 301.5 :text "305" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 270.5 301.5 :text "305" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 251 219 251 203 244 203 244 219 :fill "" :tags "floor3 room"] "324B") - (w 'create 'text 247.5 211 :text "324B" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 247.5 211 :text "324B" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 251 249 244 249 244 232 251 232 :fill "" :tags "floor3 room"] "324A") - (w 'create 'text 247.5 240.5 :text "324A" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 247.5 240.5 :text "324A" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 223 135 223 179 177 179 177 135 :fill "" :tags "floor3 room"] "320") - (w 'create 'text 200 157 :text "320" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 200 157 :text "320" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 114 368 114 323 67 323 67 368 :fill "" :tags "floor3 room"] "310") - (w 'create 'text 90.5 345.5 :text "310" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 90.5 345.5 :text "310" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 23 277 23 321 68 321 68 277 :fill "" :tags "floor3 room"] "312") - (w 'create 'text 45.5 299 :text "312" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 45.5 299 :text "312" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 23 229 68 229 68 275 23 275 :fill "" :tags "floor3 room"] "313") - (w 'create 'text 45.5 252 :text "313" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 45.5 252 :text "313" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 68 227 23 227 23 180 68 180 :fill "" :tags "floor3 room"] "314") - (w 'create 'text 45.5 203.5 :text "314" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 45.5 203.5 :text "314" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 95 179 95 135 23 135 23 179 :fill "" :tags "floor3 room"] "315") - (w 'create 'text 59 157 :text "315" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 59 157 :text "315" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 99 226 99 204 91 204 91 226 :fill "" :tags "floor3 room"] "316B") - (w 'create 'text 95 215 :text "316B" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 95 215 :text "316B" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 91 202 99 202 99 180 91 180 :fill "" :tags "floor3 room"] "316A") - (w 'create 'text 95 191 :text "316A" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 95 191 :text "316A" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 97 169 109 169 109 192 154 192 154 198 174 198 174 226 101 226 101 179 97 179 :fill "" :tags "floor3 room"] "319") - (w 'create 'text 141.5 209 :text "319" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 141.5 209 :text "319" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 65 368 58 368 58 389 1 389 1 333 23 333 23 323 65 323 :fill "" :tags "floor3 room"] "311") - (w 'create 'text 29.5 361 :text "311" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 29.5 361 :text "311" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 154 191 111 191 111 169 154 169 :fill "" :tags "floor3 room"] "318") - (w 'create 'text 132.5 180 :text "318" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 132.5 180 :text "318" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 175 168 97 168 97 131 175 131 :fill "" :tags "floor3 room"] "317") - (w 'create 'text 136 149.5 :text "317" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 136 149.5 :text "317" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 274 194 274 221 306 221 306 194 :fill "" :tags "floor3 room"] "323") - (w 'create 'text 290 207.5 :text "323" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 290 207.5 :text "323" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 306 222 274 222 274 249 306 249 :fill "" :tags "floor3 room"] "325") - (w 'create 'text 290 235.5 :text "325" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 290 235.5 :text "325" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 263 179 224 179 224 135 263 135 :fill "" :tags "floor3 room"] "321") - (w 'create 'text 243.5 157 :text "321" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 243.5 157 :text "321" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 314 169 306 169 306 192 273 192 264 181 264 135 314 135 :fill "" :tags "floor3 room"] "322") - (w 'create 'text 293.5 163.5 :text "322" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 293.5 163.5 :text "322" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 307 240 339 240 339 206 307 206 :fill "" :tags "floor3 room"] "Pub Lift3") - (w 'create 'text 323 223 :text "Pub Lift3" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 323 223 :text "Pub Lift3" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 339 205 307 205 307 171 339 171 :fill "" :tags "floor3 room"] "Priv Lift3") - (w 'create 'text 323 188 :text "Priv Lift3" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 323 188 :text "Priv Lift3" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 350 284 376 284 376 276 397 276 397 309 350 309 :fill "" :tags "floor3 room"] "303") - (w 'create 'text 373.5 292.5 :text "303" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 373.5 292.5 :text "303" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 272 203 272 249 252 249 252 230 244 230 244 221 252 221 252 203 :fill "" :tags "floor3 room"] "324") - (w 'create 'text 262 226 :text "324" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 262 226 :text "324" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 299 276 299 327 349 327 349 284 341 284 341 276 :fill "" :tags "floor3 room"] "304") - (w 'create 'text 324 301.5 :text "304" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 324 301.5 :text "304" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 375 246 375 172 341 172 341 246 :fill "" :tags "floor3 room"] "301") - (w 'create 'text 358 209 :text "301" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 358 209 :text "301" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 397 246 377 246 377 185 397 185 :fill "" :tags "floor3 room"] "327") - (w 'create 'text 387 215.5 :text "327" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 387 215.5 :text "327" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 316 131 316 169 377 169 377 185 397 185 397 131 :fill "" :tags "floor3 room"] "326") - (w 'create 'text 356.5 150 :text "326" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 356.5 150 :text "326" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 308 251 242 251 242 274 342 274 342 282 375 282 375 274 397 274 397 248 339 248 339 242 308 242 :fill "" :tags "floor3 room"] "302") - (w 'create 'text 319.5 261 :text "302" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 319.5 261 :text "302" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (storeReference [w 'create 'polygon 70 321 242 321 242 200 259 200 259 203 272 203 272 193 263 180 242 180 175 180 175 169 156 169 156 196 177 196 177 228 107 228 70 228 70 275 107 275 107 248 160 248 160 301 107 301 107 275 70 275 :fill "" :tags "floor3 room"] "306") - (w 'create 'text 200.5 284.5 :text "306" :fill color :anchor "c" :tags "floor3 label" :font "fixed") + (w 'create 'text 200.5 284.5 :text "306" :fill color :anchor "c" :tags "floor3 label" :font '(Courier -12)) (w 'create 'line 341 275 341 283 :fill color :tags "floor3 wall") (w 'create 'line 162 197 155 197 :fill color :tags "floor3 wall") diff --git a/Demos/amib.stklos b/Demos/amib.stklos index 35049f5..e51c87e 100755 --- a/Demos/amib.stklos +++ b/Demos/amib.stklos @@ -4,7 +4,7 @@ ;;;; a m i b . s t k l o s -- A mini interface builder. I hope it will serve ;;;; as the basis of something more complete... ;;;; -;;;; Copyright © 1993-1998 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 @@ -17,7 +17,7 @@ ;;;; ;;;; Author: Erick Gallesio [eg@unice.fr] ;;;; Creation date: 22-May-1995 14:56 -;;;; Last file update: 3-Mar-1998 22:50 +;;;; Last file update: 1-Feb-1999 17:56 (require "Tk-classes") @@ -331,7 +331,8 @@ (let* ((f (make :parent parent :relief "groove" :border-width 2)) (val (get-keyword :side old-packing-options "top")) (v (make-var 'side val))) - (pack (make