Introduce new TCL interface on Linux & Windows
Allan Cornet [Tue, 15 Mar 2005 13:04:09 +0000 (13:04 +0000)]
121 files changed:
scilab/ACKNOWLEDGEMENTS
scilab/Makefile.OBJ.in
scilab/Makefile.amk
scilab/Makefile.in
scilab/Makefile.incl.amk
scilab/Makefile.incl.mak
scilab/Makefile.mak
scilab/Scilab.sln
scilab/config/configuration.in
scilab/configure
scilab/configure.in
scilab/demos/scicos/dialogs_play.sci
scilab/examples/callsci/callsciC++/config/Makefile.Top
scilab/libs/.cvsignore
scilab/libs/Makefile
scilab/libs/Makefile.mak
scilab/macros/scicos/tk_getcolor.sci
scilab/macros/scicos/tk_getvalue.sci
scilab/macros/scicos/tk_mpopup.sci
scilab/macros/scicos/tk_mpopupX.sci
scilab/macros/tksci/Makefile
scilab/macros/tksci/Makefile.amk
scilab/macros/tksci/Makefile.mak
scilab/macros/tksci/TK_EvalFile.sci [new file with mode: 0644]
scilab/macros/tksci/TK_EvalStr.sci [new file with mode: 0644]
scilab/macros/tksci/TK_GetVar.sci [new file with mode: 0644]
scilab/macros/tksci/TK_SetVar.sci [new file with mode: 0644]
scilab/macros/tksci/browsevar.sci
scilab/macros/tksci/buttondialog.sci
scilab/macros/tksci/config.sci
scilab/macros/tksci/demoplay.sci
scilab/macros/tksci/editvar.sci
scilab/macros/tksci/editvar_get.sci
scilab/macros/tksci/progressionbar.sci
scilab/macros/tksci/sciGUI_init.sci
scilab/macros/tksci/sciGUIhelp.sci
scilab/macros/tksci/tk_getdir.sci
scilab/macros/tksci/tk_getfile.sci
scilab/macros/tksci/tk_savefile.sci
scilab/macros/tksci/waitbar.sci
scilab/macros/tksci/winclose.sci
scilab/macros/tksci/winlist.sci
scilab/macros/util/browsehelp.sci
scilab/macros/util/edit_error.sci
scilab/macros/util/editor.sci
scilab/macros/util/ged.sci
scilab/macros/util/gethelpfile.sci
scilab/macros/util/m2sci_gui.sci
scilab/macros/util/plotprofile.sci
scilab/macros/util/scipad.sci
scilab/macros/util/setlanguage.sci
scilab/routines/Javasci/javasci_Matrix.c
scilab/routines/Makefile.amk
scilab/routines/Makefile.in
scilab/routines/Makefile.mak
scilab/routines/Makesubdirs.bat
scilab/routines/default/Makefile.amk
scilab/routines/default/Makefile.mak
scilab/routines/default/callinterf.c
scilab/routines/default/callinterf.h
scilab/routines/default/fundef
scilab/routines/default/mexlib.c
scilab/routines/graphics/periWin.c
scilab/routines/graphics/periX11.c
scilab/routines/gtksci/Makefile.in
scilab/routines/gtksci/io.c
scilab/routines/gtksci/readline.c
scilab/routines/gtksci/x_main.c
scilab/routines/interf/matdes.c
scilab/routines/system/Makefile
scilab/routines/system/Makefile.mak
scilab/routines/system/tksynchro.c
scilab/routines/tclsci/InitTclTk.c [new file with mode: 0644]
scilab/routines/tclsci/InitTclTk.h [new file with mode: 0644]
scilab/routines/tclsci/Makefile [new file with mode: 0644]
scilab/routines/tclsci/Makefile.mak
scilab/routines/tclsci/ScilabEval.c [new file with mode: 0644]
scilab/routines/tclsci/ScilabEval.h [new file with mode: 0644]
scilab/routines/tclsci/TCL_Global.c
scilab/routines/tclsci/TCL_Global.h
scilab/routines/tclsci/TclEvents.c [new file with mode: 0644]
scilab/routines/tclsci/TclEvents.h [new file with mode: 0644]
scilab/routines/tclsci/TclUiGet.c [new file with mode: 0644]
scilab/routines/tclsci/TclUiGet.h [new file with mode: 0644]
scilab/routines/tclsci/TclUiSet.c [new file with mode: 0644]
scilab/routines/tclsci/TclUiSet.h [new file with mode: 0644]
scilab/routines/tclsci/fundef.tclsci [new file with mode: 0644]
scilab/routines/tclsci/intClose.c [new file with mode: 0644]
scilab/routines/tclsci/intClose.h [new file with mode: 0644]
scilab/routines/tclsci/intFindObj.c [new file with mode: 0644]
scilab/routines/tclsci/intFindObj.h [new file with mode: 0644]
scilab/routines/tclsci/intOpenTk.c [new file with mode: 0644]
scilab/routines/tclsci/intOpenTk.h [new file with mode: 0644]
scilab/routines/tclsci/intTclDoOneEvent.c
scilab/routines/tclsci/intTclDoOneEvent.h
scilab/routines/tclsci/intTclEvalFile.c
scilab/routines/tclsci/intTclEvalFile.h
scilab/routines/tclsci/intTclEvalStr.c
scilab/routines/tclsci/intTclEvalStr.h
scilab/routines/tclsci/intTclGcf.c [new file with mode: 0644]
scilab/routines/tclsci/intTclGcf.h [new file with mode: 0644]
scilab/routines/tclsci/intTclGet.c [new file with mode: 0644]
scilab/routines/tclsci/intTclGet.h [new file with mode: 0644]
scilab/routines/tclsci/intTclGetVar.c
scilab/routines/tclsci/intTclGetVar.h
scilab/routines/tclsci/intTclSet.c [new file with mode: 0644]
scilab/routines/tclsci/intTclSet.h [new file with mode: 0644]
scilab/routines/tclsci/intTclSetVar.c
scilab/routines/tclsci/intTclSetVar.h
scilab/routines/tclsci/inttclsci.c
scilab/routines/tclsci/inttclsci.h
scilab/routines/tclsci/tclsci.vcproj
scilab/routines/wsci/Makefile.amk
scilab/routines/wsci/Makefile.mak
scilab/routines/wsci/jpc_Xloop.c
scilab/routines/wsci/wgraph.c
scilab/routines/wsci/wtext.c
scilab/routines/xsci/Makefile.in
scilab/routines/xsci/jpc_inter.c
scilab/routines/xsci/x_charproc.c
scilab/routines/xsci/x_util.c

index 21d395d..e0f61ce 100644 (file)
@@ -100,7 +100,9 @@ sun: system specific Scilab routines (INRIA/ENPC).
          by B.Lapeyre.
          zzledt.c is from Mitchell and Gauthier ass.
 
-tksci: interface with TCL/TK developed by Bertrand Guiheneuf.
+tksci: interface with TCL/TK (obsolete) developed by Bertrand Guiheneuf.
+
+tclsci: interface with TCL/TK developed by Allan CORNET.
 
 X11: optionnal Xaw and Xmu routines  (from MIT X11 distribution).
 
index 779a490..13ab2d3 100644 (file)
@@ -21,7 +21,7 @@ LIBRSCI = $(SCIDIR)/libs/system.a $(SCIDIR)/libs/console.a \
         $(BLAS) \
        $(SCIDIR)/libs/int.a \
         $(SCIDIR)/libs/slicot.a  $(SCIDIR)/libs/arpack.a \
-        $(SCIDIR)/libs/wintools.a @PVMSCILIB@ @XDRLIBNAME@ @TKSCILIB@ 
+        $(SCIDIR)/libs/wintools.a @PVMSCILIB@ @XDRLIBNAME@ @TCLSCILIB@ 
 
 
 LIBR = $(XAW_LOCAL_LIB) $(LIBRSCI) $(DLDLIB) $(PVMGLIB) $(PVMLIB)
index 6903bb6..7f2005e 100644 (file)
@@ -31,7 +31,7 @@ LIBRSCI = libs/system.lib libs/console.lib libs/interf.lib \
        libs/sound.lib libs/dcd.lib \\r
        libs/rand.lib libs/blas.lib libs/xdr.lib \\r
        libs/gd.lib \\r
-       $(TKSCI) $(PVM)\r
+       $(TCLSCI) $(PVM)\r
 \r
 LIBR = $(XAW_LOCAL_LIB) $(LIBRSCI) $(DLDLIB)\r
 \r
index b7b7356..eced36e 100644 (file)
@@ -303,7 +303,7 @@ uninstall:
 
 cvsclean::
        @$(RM) -f -r geci xless wless xmetanet routines/comm routines/libcomm
-       @cd man; $(RM) -f -r arma comm control dcd elementary fileio functions graphics gui identification linear metanet nonlinear polynomials programming pvm robust scicos signal sound strings tdcs time-date tksci translation utilities
+       @cd man; $(RM) -f -r arma comm control dcd elementary fileio functions graphics gui identification linear metanet nonlinear polynomials programming pvm robust scicos signal sound strings tdcs time-date tclsci translation utilities
 
 setversion : 
        echo "SCIVERSION=Scilab-3.0-CVS-`date --iso`" > Version.incl
index f974ef2..045bc35 100644 (file)
@@ -9,8 +9,8 @@ MAKE=amake /f Makefile.amk
 # Scilab tksci library \r
 #---------------------\r
 # To compile with TCL/TK interface, uncomment the following lines and give\r
-# the good pathnames for TKLIBS and TCL_INCLUDES.\r
-#TKSCI=libs/tksci.lib \r
+# the good pathnames for TClLIBS and TCL_INCLUDES.\r
+#TKSCI=libs/tclsci.lib \r
 #TKLIBS=d:\tcl8.0\win\tcl80.lib d:\tk8.0\win\tk80.lib\r
 #TKLIBSBIN="$(SCIDIR1)\bin\tcl80.lib" "$(SCIDIR1)\bin\tk80.lib"\r
 #TCL_INCLUDES=-Id:\tcl8.0\generic -Id:\tk8.0\generic -Id:\tk8.0\xlib\r
index 8e46297..25066f4 100644 (file)
@@ -7,7 +7,7 @@ all::
 MAKE=nmake /f Makefile.mak
 
 #---------------------
-# Scilab tksci library 
+# Scilab tclsci library 
 #---------------------
 # To compile with TCL/TK interface, uncomment the following lines and give
 # the good pathnames for TKLIBS and TCL_INCLUDES.
@@ -26,7 +26,7 @@ USE_MT=-MT
 # and to scilab full path when used after compilation 
 # for dynamic linking
 TCLTK=$(SCIDIR1)\tcl
-TKSCI=libs/tksci.lib 
+TCLSCI=libs/tclsci.lib 
 TKLIBS="$(SCIDIR1)\bin\tcl84.lib" "$(SCIDIR1)\bin\tk84.lib"
 TKLIBSBIN=$(TKLIBS)
 TCL_INCLUDES=-I"$(TCLTK)\include" -I"$(TCLTK)\include\X11"
index 4c389f6..52c7aa7 100644 (file)
@@ -94,7 +94,7 @@ LIBRSCI = libs/system.lib libs/console.lib libs/interf.lib \
        libs/sound.lib libs/dcd.lib \
        libs/rand.lib libs/blas.lib libs/xdr.lib  \
        libs/gd.lib libs/int.lib libs/arpack.lib \
-       libs/libf2c.lib libs/wintools.lib libs/tclsci.lib $(TKSCI) $(PVM)
+       libs/libf2c.lib libs/wintools.lib $(TCLSCI) $(PVM)
 
 LIBR = $(XAW_LOCAL_LIB) $(LIBRSCI) $(DLDLIB)
 
index 7a07623..d138995 100644 (file)
@@ -1,8 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WScilex", "routines\wsci\WScilex\WScilex.vcproj", "{CCD80549-EB9C-42AA-9B86-D687377E94F6}"
        ProjectSection(ProjectDependencies) = postProject
-               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {66F2FB48-5D68-4445-A856-119F685A371B} = {66F2FB48-5D68-4445-A856-119F685A371B}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77} = {9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77}
        EndProjectSection
 EndProject
@@ -71,71 +71,70 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "dcd_f", "routines\dcd\dcd_f
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab\LibScilab.vcproj", "{64BC155E-292F-484F-9404-76EE6AE67A43}"
        ProjectSection(ProjectDependencies) = postProject
-               {6638C3BC-D85D-414D-8AC3-9BD514CA23E1} = {6638C3BC-D85D-414D-8AC3-9BD514CA23E1}
-               {45CA5B12-7601-4968-AE16-16069FD1A152} = {45CA5B12-7601-4968-AE16-16069FD1A152}
-               {425B887B-9FC5-4CD2-B632-DBFC000E3E25} = {425B887B-9FC5-4CD2-B632-DBFC000E3E25}
-               {B50F726C-8536-4DAC-8CEF-D97706ACACCC} = {B50F726C-8536-4DAC-8CEF-D97706ACACCC}
+               {798D5602-CF39-4B2F-B780-0EF282E7CEA0} = {798D5602-CF39-4B2F-B780-0EF282E7CEA0}
+               {51240B08-5E4E-439B-B745-C870D5B513BF} = {51240B08-5E4E-439B-B745-C870D5B513BF}
                {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
-               {104D88A6-C72A-411C-B32F-D6819DDBB737} = {104D88A6-C72A-411C-B32F-D6819DDBB737}
+               {45CA5B12-7601-4968-AE16-16069FD1A152} = {45CA5B12-7601-4968-AE16-16069FD1A152}
+               {73AA7612-4297-4339-B521-8C2870E7BEC1} = {73AA7612-4297-4339-B521-8C2870E7BEC1}
+               {836EC214-02DD-474F-91C9-C8C46C183D48} = {836EC214-02DD-474F-91C9-C8C46C183D48}
                {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
-               {7B77E45C-9E80-4DDA-A3C8-C6C8FEBAA190} = {7B77E45C-9E80-4DDA-A3C8-C6C8FEBAA190}
-               {5DB1307C-6079-4C25-AA66-92B9569274B0} = {5DB1307C-6079-4C25-AA66-92B9569274B0}
-               {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33} = {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}
                {4F703D1F-8ADC-46A9-A4A2-1C69541BC6C1} = {4F703D1F-8ADC-46A9-A4A2-1C69541BC6C1}
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0} = {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}
-               {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
-               {7AF6C45E-142F-436C-A23D-1FC79C9599BE} = {7AF6C45E-142F-436C-A23D-1FC79C9599BE}
-               {4467FBE5-45A6-4CA7-AD8C-48419B656137} = {4467FBE5-45A6-4CA7-AD8C-48419B656137}
-               {3FF921DF-3084-4F09-BD14-362F60B0D037} = {3FF921DF-3084-4F09-BD14-362F60B0D037}
-               {B0817AEC-2DA0-4C95-9599-4E01F2B547CD} = {B0817AEC-2DA0-4C95-9599-4E01F2B547CD}
-               {4C0B22D1-F74D-42DF-B90D-71CBC1B43DC4} = {4C0B22D1-F74D-42DF-B90D-71CBC1B43DC4}
-               {3396F078-1296-47EB-B817-78CB36265DD1} = {3396F078-1296-47EB-B817-78CB36265DD1}
-               {495C9E8A-439A-426E-AA2C-0B22653875F9} = {495C9E8A-439A-426E-AA2C-0B22653875F9}
-               {DAA1FD4E-02E2-4E85-B60A-81B067E8FBA0} = {DAA1FD4E-02E2-4E85-B60A-81B067E8FBA0}
                {FE9EB721-B3C1-41D8-B585-3FB3A0083CEC} = {FE9EB721-B3C1-41D8-B585-3FB3A0083CEC}
-               {566E524B-D327-4416-A865-9C83503FAB7B} = {566E524B-D327-4416-A865-9C83503FAB7B}
+               {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
+               {B7A0273E-8E71-4663-8497-0895945ED54D} = {B7A0273E-8E71-4663-8497-0895945ED54D}
+               {BC23A846-75D6-4375-A5AB-F5A8EFEFE290} = {BC23A846-75D6-4375-A5AB-F5A8EFEFE290}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
-               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
+               {566E524B-D327-4416-A865-9C83503FAB7B} = {566E524B-D327-4416-A865-9C83503FAB7B}
+               {DAA1FD4E-02E2-4E85-B60A-81B067E8FBA0} = {DAA1FD4E-02E2-4E85-B60A-81B067E8FBA0}
                {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
+               {2652D55A-391C-4341-A299-6B7BDCE45F0C} = {2652D55A-391C-4341-A299-6B7BDCE45F0C}
+               {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315}
+               {7B77E45C-9E80-4DDA-A3C8-C6C8FEBAA190} = {7B77E45C-9E80-4DDA-A3C8-C6C8FEBAA190}
                {1D5E735D-176E-4C6D-B980-3C2EC7051F90} = {1D5E735D-176E-4C6D-B980-3C2EC7051F90}
+               {7AF6C45E-142F-436C-A23D-1FC79C9599BE} = {7AF6C45E-142F-436C-A23D-1FC79C9599BE}
                {89630A5F-60FB-424E-AD60-330607086D56} = {89630A5F-60FB-424E-AD60-330607086D56}
-               {B678A0CA-E006-415A-83E4-46F6060282C4} = {B678A0CA-E006-415A-83E4-46F6060282C4}
+               {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} = {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
+               {63352867-3983-48E3-94FE-DD8F0D6E921F} = {63352867-3983-48E3-94FE-DD8F0D6E921F}
                {1311C068-7314-4C3D-9C00-7F5EB4AA4DBB} = {1311C068-7314-4C3D-9C00-7F5EB4AA4DBB}
-               {25F06272-3E27-46E4-BEE0-8D24F60CE451} = {25F06272-3E27-46E4-BEE0-8D24F60CE451}
+               {B50F726C-8536-4DAC-8CEF-D97706ACACCC} = {B50F726C-8536-4DAC-8CEF-D97706ACACCC}
                {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
-               {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E}
-               {4A98D3E0-692D-4F80-877F-7441FC107C09} = {4A98D3E0-692D-4F80-877F-7441FC107C09}
-               {2652D55A-391C-4341-A299-6B7BDCE45F0C} = {2652D55A-391C-4341-A299-6B7BDCE45F0C}
+               {B5945471-7E91-43B1-8728-37E37ADB7EE2} = {B5945471-7E91-43B1-8728-37E37ADB7EE2}
+               {25F06272-3E27-46E4-BEE0-8D24F60CE451} = {25F06272-3E27-46E4-BEE0-8D24F60CE451}
+               {E9741474-5C3A-4101-8B85-AC5221018C05} = {E9741474-5C3A-4101-8B85-AC5221018C05}
                {114F3B77-2A32-4EC8-AC23-B3F910622BD9} = {114F3B77-2A32-4EC8-AC23-B3F910622BD9}
-               {836EC214-02DD-474F-91C9-C8C46C183D48} = {836EC214-02DD-474F-91C9-C8C46C183D48}
+               {3396F078-1296-47EB-B817-78CB36265DD1} = {3396F078-1296-47EB-B817-78CB36265DD1}
+               {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E}
+               {425B887B-9FC5-4CD2-B632-DBFC000E3E25} = {425B887B-9FC5-4CD2-B632-DBFC000E3E25}
+               {5DB1307C-6079-4C25-AA66-92B9569274B0} = {5DB1307C-6079-4C25-AA66-92B9569274B0}
                {7C349E84-E25E-496F-93EC-14C0F42FDE3B} = {7C349E84-E25E-496F-93EC-14C0F42FDE3B}
-               {73AA7612-4297-4339-B521-8C2870E7BEC1} = {73AA7612-4297-4339-B521-8C2870E7BEC1}
+               {495C9E8A-439A-426E-AA2C-0B22653875F9} = {495C9E8A-439A-426E-AA2C-0B22653875F9}
                {3DBBFF93-F344-4484-A317-14F985434BBC} = {3DBBFF93-F344-4484-A317-14F985434BBC}
                {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
-               {500443BC-F67D-442B-8713-8E2A03BB3C8D} = {500443BC-F67D-442B-8713-8E2A03BB3C8D}
+               {104D88A6-C72A-411C-B32F-D6819DDBB737} = {104D88A6-C72A-411C-B32F-D6819DDBB737}
                {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20}
-               {53AAB5BC-2C08-4BBA-9793-C36140A404F8} = {53AAB5BC-2C08-4BBA-9793-C36140A404F8}
-               {BC23A846-75D6-4375-A5AB-F5A8EFEFE290} = {BC23A846-75D6-4375-A5AB-F5A8EFEFE290}
-               {63352867-3983-48E3-94FE-DD8F0D6E921F} = {63352867-3983-48E3-94FE-DD8F0D6E921F}
-               {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} = {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}
+               {6F1E57AB-01D9-488D-9E7A-A5065848D693} = {6F1E57AB-01D9-488D-9E7A-A5065848D693}
                {D531CDB2-CCA6-4C50-BE29-D7822BB83ECF} = {D531CDB2-CCA6-4C50-BE29-D7822BB83ECF}
+               {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126}
                {19342CBB-EEB1-425C-A91D-EABAD8A115AF} = {19342CBB-EEB1-425C-A91D-EABAD8A115AF}
-               {B7A0273E-8E71-4663-8497-0895945ED54D} = {B7A0273E-8E71-4663-8497-0895945ED54D}
+               {500443BC-F67D-442B-8713-8E2A03BB3C8D} = {500443BC-F67D-442B-8713-8E2A03BB3C8D}
+               {53AAB5BC-2C08-4BBA-9793-C36140A404F8} = {53AAB5BC-2C08-4BBA-9793-C36140A404F8}
+               {6638C3BC-D85D-414D-8AC3-9BD514CA23E1} = {6638C3BC-D85D-414D-8AC3-9BD514CA23E1}
                {1BE7DEBD-2F93-4FB7-BE2C-052B4139B7B0} = {1BE7DEBD-2F93-4FB7-BE2C-052B4139B7B0}
-               {3A131FDF-BDA9-4216-91AD-DFFCEF46F89A} = {3A131FDF-BDA9-4216-91AD-DFFCEF46F89A}
-               {B5945471-7E91-43B1-8728-37E37ADB7EE2} = {B5945471-7E91-43B1-8728-37E37ADB7EE2}
-               {51240B08-5E4E-439B-B745-C870D5B513BF} = {51240B08-5E4E-439B-B745-C870D5B513BF}
-               {6F1E57AB-01D9-488D-9E7A-A5065848D693} = {6F1E57AB-01D9-488D-9E7A-A5065848D693}
-               {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315}
-               {798D5602-CF39-4B2F-B780-0EF282E7CEA0} = {798D5602-CF39-4B2F-B780-0EF282E7CEA0}
+               {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33} = {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}
+               {B678A0CA-E006-415A-83E4-46F6060282C4} = {B678A0CA-E006-415A-83E4-46F6060282C4}
                {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} = {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9}
+               {4C0B22D1-F74D-42DF-B90D-71CBC1B43DC4} = {4C0B22D1-F74D-42DF-B90D-71CBC1B43DC4}
                {FD0F48D8-9D0B-42A8-A743-B57198FAB41E} = {FD0F48D8-9D0B-42A8-A743-B57198FAB41E}
                {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0} = {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}
-               {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126}
+               {3A131FDF-BDA9-4216-91AD-DFFCEF46F89A} = {3A131FDF-BDA9-4216-91AD-DFFCEF46F89A}
+               {3FF921DF-3084-4F09-BD14-362F60B0D037} = {3FF921DF-3084-4F09-BD14-362F60B0D037}
+               {4A98D3E0-692D-4F80-877F-7441FC107C09} = {4A98D3E0-692D-4F80-877F-7441FC107C09}
+               {4467FBE5-45A6-4CA7-AD8C-48419B656137} = {4467FBE5-45A6-4CA7-AD8C-48419B656137}
                {F01314E9-62D5-4A6E-891B-0F9E16B838E2} = {F01314E9-62D5-4A6E-891B-0F9E16B838E2}
+               {B0817AEC-2DA0-4C95-9599-4E01F2B547CD} = {B0817AEC-2DA0-4C95-9599-4E01F2B547CD}
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
                {972C50F5-FE25-4FCF-A43F-D5934DAEE634} = {972C50F5-FE25-4FCF-A43F-D5934DAEE634}
-               {E9741474-5C3A-4101-8B85-AC5221018C05} = {E9741474-5C3A-4101-8B85-AC5221018C05}
                {959384FC-016C-4B01-B848-1B18D26B6CC4} = {959384FC-016C-4B01-B848-1B18D26B6CC4}
                {F230A0FD-8B40-4112-B458-1947D48348FD} = {F230A0FD-8B40-4112-B458-1947D48348FD}
        EndProjectSection
@@ -335,11 +334,6 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "system2_f", "routines\syste
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tksci", "routines\tksci\tksci.vcproj", "{55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}"
-       ProjectSection(ProjectDependencies) = postProject
-               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
-       EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wsci", "routines\wsci\wsci.vcproj", "{2652D55A-391C-4341-A299-6B7BDCE45F0C}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -1705,28 +1699,6 @@ Global
                {89630A5F-60FB-424E-AD60-330607086D56}.Release with Atlas without Java.Build.0 = Release with Atlas without Java|Win32
                {89630A5F-60FB-424E-AD60-330607086D56}.Release with Debug Information.ActiveCfg = Release with Debug Information|Win32
                {89630A5F-60FB-424E-AD60-330607086D56}.Release with Debug Information.Build.0 = Release with Debug Information|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Debug.ActiveCfg = Debug|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Debug.Build.0 = Debug|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Debug with Atlas.ActiveCfg = Debug with Atlas|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Debug with Atlas.Build.0 = Debug with Atlas|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Debug with Atlas without Java.ActiveCfg = Debug with Atlas without Java|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Debug with Atlas without Java.Build.0 = Debug with Atlas without Java|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Debug without Java.ActiveCfg = Debug without Java|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Debug without Java.Build.0 = Debug without Java|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Pentium_Release.ActiveCfg = Pentium_Release|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Pentium_Release.Build.0 = Pentium_Release|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.PIV_Release.ActiveCfg = PIV_Release|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.PIV_Release.Build.0 = PIV_Release|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.PIV_Release with Atlas.ActiveCfg = PIV_Release with Atlas|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.PIV_Release with Atlas.Build.0 = PIV_Release with Atlas|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Release.ActiveCfg = Release|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Release.Build.0 = Release|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Release with Atlas.ActiveCfg = Release with Atlas|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Release with Atlas.Build.0 = Release with Atlas|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Release with Atlas without Java.ActiveCfg = Release with Atlas without Java|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Release with Atlas without Java.Build.0 = Release with Atlas without Java|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Release with Debug Information.ActiveCfg = Release with Debug Information|Win32
-               {55250DE7-CFDE-45F4-A766-8A46E2B3CDF0}.Release with Debug Information.Build.0 = Release with Debug Information|Win32
                {2652D55A-391C-4341-A299-6B7BDCE45F0C}.Debug.ActiveCfg = Debug|Win32
                {2652D55A-391C-4341-A299-6B7BDCE45F0C}.Debug.Build.0 = Debug|Win32
                {2652D55A-391C-4341-A299-6B7BDCE45F0C}.Debug with Atlas.ActiveCfg = Debug with Atlas|Win32
@@ -2087,6 +2059,50 @@ Global
                {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Atlas without Java.Build.0 = Release with Atlas without Java|Win32
                {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Debug Information.ActiveCfg = Release with Debug Information|Win32
                {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Debug Information.Build.0 = Release with Debug Information|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug.ActiveCfg = Debug|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug.Build.0 = Debug|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug with Atlas.ActiveCfg = Debug with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug with Atlas.Build.0 = Debug with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug with Atlas without Java.ActiveCfg = Debug with Atlas without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug with Atlas without Java.Build.0 = Debug with Atlas without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug without Java.ActiveCfg = Debug without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug without Java.Build.0 = Debug without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Pentium_Release.ActiveCfg = Pentium_Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Pentium_Release.Build.0 = Pentium_Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.PIV_Release.ActiveCfg = PIV_Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.PIV_Release.Build.0 = PIV_Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.PIV_Release with Atlas.ActiveCfg = PIV_Release with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.PIV_Release with Atlas.Build.0 = PIV_Release with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release.ActiveCfg = Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release.Build.0 = Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Atlas.ActiveCfg = Release with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Atlas.Build.0 = Release with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Atlas without Java.ActiveCfg = Release with Atlas without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Atlas without Java.Build.0 = Release with Atlas without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Debug Information.ActiveCfg = Release with Debug Information|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Debug Information.Build.0 = Release with Debug Information|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug.ActiveCfg = Debug|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug.Build.0 = Debug|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug with Atlas.ActiveCfg = Debug with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug with Atlas.Build.0 = Debug with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug with Atlas without Java.ActiveCfg = Debug with Atlas without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug with Atlas without Java.Build.0 = Debug with Atlas without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug without Java.ActiveCfg = Debug without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Debug without Java.Build.0 = Debug without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Pentium_Release.ActiveCfg = Pentium_Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Pentium_Release.Build.0 = Pentium_Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.PIV_Release.ActiveCfg = PIV_Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.PIV_Release.Build.0 = PIV_Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.PIV_Release with Atlas.ActiveCfg = PIV_Release with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.PIV_Release with Atlas.Build.0 = PIV_Release with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release.ActiveCfg = Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release.Build.0 = Release|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Atlas.ActiveCfg = Release with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Atlas.Build.0 = Release with Atlas|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Atlas without Java.ActiveCfg = Release with Atlas without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Atlas without Java.Build.0 = Release with Atlas without Java|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Debug Information.ActiveCfg = Release with Debug Information|Win32
+               {0AEC8745-BB5B-4E66-A59A-7251412C3605}.Release with Debug Information.Build.0 = Release with Debug Information|Win32
                {AAFF2053-3F1E-4B8B-B174-4407A6B98FA5}.Debug.ActiveCfg = Debug|Win32
                {AAFF2053-3F1E-4B8B-B174-4407A6B98FA5}.Debug with Atlas.ActiveCfg = Debug|Win32
                {AAFF2053-3F1E-4B8B-B174-4407A6B98FA5}.Debug with Atlas.Build.0 = Debug|Win32
@@ -2202,50 +2218,6 @@ Global
                {C456D5B8-8A32-496A-A2EE-164B0D734126}.Release with Atlas without Java.Build.0 = Release|Win32
                {C456D5B8-8A32-496A-A2EE-164B0D734126}.Release with Debug Information.ActiveCfg = Release|Win32
                {C456D5B8-8A32-496A-A2EE-164B0D734126}.Release with Debug Information.Build.0 = Release|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Debug.ActiveCfg = Debug|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Debug.Build.0 = Debug|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Debug with Atlas.ActiveCfg = Debug with Atlas|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Debug with Atlas.Build.0 = Debug with Atlas|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Debug with Atlas without Java.ActiveCfg = Debug with Atlas without Java|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Debug with Atlas without Java.Build.0 = Debug with Atlas without Java|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Debug without Java.ActiveCfg = Debug without Java|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Debug without Java.Build.0 = Debug without Java|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Pentium_Release.ActiveCfg = Pentium_Release|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Pentium_Release.Build.0 = Pentium_Release|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.PIV_Release.ActiveCfg = PIV_Release|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.PIV_Release.Build.0 = PIV_Release|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.PIV_Release with Atlas.ActiveCfg = PIV_Release with Atlas|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.PIV_Release with Atlas.Build.0 = PIV_Release with Atlas|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Release.ActiveCfg = Release|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Release.Build.0 = Release|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Release with Atlas.ActiveCfg = Release with Atlas|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Release with Atlas.Build.0 = Release with Atlas|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Release with Atlas without Java.ActiveCfg = Release with Atlas without Java|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Release with Atlas without Java.Build.0 = Release with Atlas without Java|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Release with Debug Information.ActiveCfg = Release with Debug Information|Win32
-               {FD210764-A6A0-4542-8FD0-C312971A32AA}.Release with Debug Information.Build.0 = Release with Debug Information|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Debug.ActiveCfg = Debug|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Debug.Build.0 = Debug|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Debug with Atlas.ActiveCfg = Debug with Atlas|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Debug with Atlas.Build.0 = Debug with Atlas|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Debug with Atlas without Java.ActiveCfg = Debug with Atlas without Java|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Debug with Atlas without Java.Build.0 = Debug with Atlas without Java|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Debug without Java.ActiveCfg = Debug without Java|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Debug without Java.Build.0 = Debug without Java|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Pentium_Release.ActiveCfg = Pentium_Release|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Pentium_Release.Build.0 = Pentium_Release|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.PIV_Release.ActiveCfg = PIV_Release|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.PIV_Release.Build.0 = PIV_Release|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.PIV_Release with Atlas.ActiveCfg = PIV_Release with Atlas|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.PIV_Release with Atlas.Build.0 = PIV_Release with Atlas|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Release.ActiveCfg = Release|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Release.Build.0 = Release|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Release with Atlas.ActiveCfg = Release with Atlas|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Release with Atlas.Build.0 = Release with Atlas|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Release with Atlas without Java.ActiveCfg = Release with Atlas without Java|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Release with Atlas without Java.Build.0 = Release with Atlas without Java|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Release with Debug Information.ActiveCfg = Release with Debug Information|Win32
-               {08766CA1-E9C2-4A39-B5E8-5A9172C25111}.Release with Debug Information.Build.0 = Release with Debug Information|Win32
        EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
        EndGlobalSection
index 5f8b1db..dd24fa4 100644 (file)
@@ -162,8 +162,8 @@ tcl/tk Variables
 TK_INC_PATH            :@TK_INC_PATH@
 TCL_INC_PATH           :@TCL_INC_PATH@
 TCLTK_LIBS             :@TCLTK_LIBS@
-TKSCILIB               :@TKSCILIB@
-TKSCIDIR               :@TKSCIDIR@
+TCLSCILIB              :@TCLSCILIB@
+TCLSCIDIR              :@TCLSCIDIR@
 TK_MINOR_VERSION       :@TK_MINOR_VERSION@
 TK_MAJOR_VERSION       :@TK_MAJOR_VERSION@
 
index 78ac7fa..3c53707 100755 (executable)
@@ -464,7 +464,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WITH_GCC WITH_G77 ICC IFC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL F2C FLIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_JAVAC _ACJNI_JAVAC GTK_CONFIG GNOME_CONFIG PKG_CONFIG with_ocamlc with_ocamlopt with_ocamldep WITH_SABCMD WITH_XSLTPROC RM AR_FLAGS FILES_TO_CLEAN CC_OPTIONS CC_LDFLAGS CC_PICFLAGS FC FC_OPTIONS FC_OPTIONS1 FC_OPTIONS2 FC_LDFLAGS FC_PICFLAGS LD LD_LDFLAGS SCILAB_GS SCILABSCRIPT FGETARG GETARG HPPA_OLD DLDLIB DLD_SUBDIR XAWLIB XAW XMULIB XAW_LOCAL_SUBDIR XAW_LOCAL_INCLUDES XAW_LOCAL_LIB GTKCFLAGS GTKLIBS GNOMECFLAGS TERMCAPLIB MAIN MAKEFILE_TARGET PERIFILE GUILIB GZVT XDRLIB XDRLIBNAME WINXFLAGS MENUSOBJS MALLOC PVMARCH PVMLIB PVMSCIDIR PVMSCILIB PVMGLIB PVMTARGET PVMROOT PVMROOTR PVMINST PVMINST1 PVMINCLUDE PVMHOSTERFILES PVMHOSTER TKBASE TK_INC_PATH TCL_INC_PATH TCLTK_LIBS TKSCILIB TKSCIDIR TK_MINOR_VERSION TK_MAJOR_VERSION NOINLINE WHICH_BLAS ATLAS_DIR IN_ATLAS OCAMLTARGET WITH_OCAML MANTARGET DLLTOOL LIBM LIBTOOL_DEPS NM OBJDUMP PACKAGE STATIC SCIVERSION FC_SUBDIR BLPR_SCRIPTS SED_CYGDRIVE F2C_SUBDIR EXAMPLES_TESTS IMPPREF IMPENV ZZLEDT HTMLFLAGS GTKPLUGBUG XXTXEXT XX11 PERIX11NOPT GETLIBTK MANGENERATOR TERM_NAME TERM_LDFLAGS JAVASCITARGET JAVA_INCL GCCFIX LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WITH_GCC WITH_G77 ICC IFC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL F2C FLIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_JAVAC _ACJNI_JAVAC GTK_CONFIG GNOME_CONFIG PKG_CONFIG with_ocamlc with_ocamlopt with_ocamldep WITH_SABCMD WITH_XSLTPROC RM AR_FLAGS FILES_TO_CLEAN CC_OPTIONS CC_LDFLAGS CC_PICFLAGS FC FC_OPTIONS FC_OPTIONS1 FC_OPTIONS2 FC_LDFLAGS FC_PICFLAGS LD LD_LDFLAGS SCILAB_GS SCILABSCRIPT FGETARG GETARG HPPA_OLD DLDLIB DLD_SUBDIR XAWLIB XAW XMULIB XAW_LOCAL_SUBDIR XAW_LOCAL_INCLUDES XAW_LOCAL_LIB GTKCFLAGS GTKLIBS GNOMECFLAGS TERMCAPLIB MAIN MAKEFILE_TARGET PERIFILE GUILIB GZVT XDRLIB XDRLIBNAME WINXFLAGS MENUSOBJS MALLOC PVMARCH PVMLIB PVMSCIDIR PVMSCILIB PVMGLIB PVMTARGET PVMROOT PVMROOTR PVMINST PVMINST1 PVMINCLUDE PVMHOSTERFILES PVMHOSTER TKBASE TK_INC_PATH TCL_INC_PATH TCLTK_LIBS TCLSCILIB TCLSCIDIR TK_MINOR_VERSION TK_MAJOR_VERSION NOINLINE WHICH_BLAS ATLAS_DIR IN_ATLAS OCAMLTARGET WITH_OCAML MANTARGET DLLTOOL LIBM LIBTOOL_DEPS NM OBJDUMP PACKAGE STATIC SCIVERSION FC_SUBDIR BLPR_SCRIPTS SED_CYGDRIVE F2C_SUBDIR EXAMPLES_TESTS IMPPREF IMPENV ZZLEDT HTMLFLAGS GTKPLUGBUG XXTXEXT XX11 PERIX11NOPT GETLIBTK MANGENERATOR TERM_NAME TERM_LDFLAGS JAVASCITARGET JAVA_INCL GCCFIX LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -26698,8 +26698,8 @@ fi
 TK_INC_PATH=
 TK_LIB_PATH=
 TCLTK_LIBS=
-TKSCILIB=
-TKSCIDIR=
+TCLSCILIB=
+TCLSCIDIR=
 
 if test "$with_tk" != no; then
 
@@ -27463,8 +27463,8 @@ if test $WITH_TKSCI = 1; then
 #define WITH_TK 1
 _ACEOF
 
-  TKSCILIB="\$(SCIDIR)/libs/tksci.a"
-  TKSCIDIR=tksci
+  TCLSCILIB="\$(SCIDIR)/libs/tclsci.a"
+  TCLSCIDIR=tclsci
 else
   { { echo "$as_me:$LINENO: error: TCL/TK not found. Use --without-tk or specify the librairies and include paths manually" >&5
 echo "$as_me: error: TCL/TK not found. Use --without-tk or specify the librairies and include paths manually" >&2;}
@@ -29339,8 +29339,8 @@ s,@TKBASE@,$TKBASE,;t t
 s,@TK_INC_PATH@,$TK_INC_PATH,;t t
 s,@TCL_INC_PATH@,$TCL_INC_PATH,;t t
 s,@TCLTK_LIBS@,$TCLTK_LIBS,;t t
-s,@TKSCILIB@,$TKSCILIB,;t t
-s,@TKSCIDIR@,$TKSCIDIR,;t t
+s,@TCLSCILIB@,$TCLSCILIB,;t t
+s,@TCLSCIDIR@,$TCLSCIDIR,;t t
 s,@TK_MINOR_VERSION@,$TK_MINOR_VERSION,;t t
 s,@TK_MAJOR_VERSION@,$TK_MAJOR_VERSION,;t t
 s,@NOINLINE@,$NOINLINE,;t t
index 7e46a95..5544ebb 100644 (file)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 ## Copyright INRIA/Enpc
 
-AC_REVISION($Revision: 1.112 $)dnl
+AC_REVISION($Revision: 1.113 $)dnl
 AC_INIT(license.txt)
 SCIDIR=`pwd`
 AC_CONFIG_AUX_DIR(config)
@@ -1655,8 +1655,8 @@ fi
 TK_INC_PATH=
 TK_LIB_PATH=
 TCLTK_LIBS=
-TKSCILIB=
-TKSCIDIR=
+TCLSCILIB=
+TCLSCIDIR=
 
 if test "$with_tk" != no; then
 
@@ -1693,8 +1693,8 @@ AC_CHECK_TCLTK()
 # set variables
 if test $WITH_TKSCI = 1; then
   AC_DEFINE(WITH_TK)
-  TKSCILIB="\$(SCIDIR)/libs/tksci.a"
-  TKSCIDIR=tksci
+  TCLSCILIB="\$(SCIDIR)/libs/tclsci.a"
+  TCLSCIDIR=tclsci
 else
   AC_MSG_ERROR([TCL/TK not found. Use --without-tk or specify the librairies and include paths manually])
 fi
@@ -2058,9 +2058,9 @@ AC_SUBST(TKBASE)
 AC_SUBST(TK_INC_PATH)
 AC_SUBST(TCL_INC_PATH)
 AC_SUBST(TCLTK_LIBS)
-AC_SUBST(TKSCILIB)
-AC_SUBST(TKSCIDIR)
-AC_SUBST(TKSCIDIR)
+AC_SUBST(TCLSCILIB)
+AC_SUBST(TCLSCIDIR)
+AC_SUBST(TCLSCIDIR)
 AC_SUBST(TK_MINOR_VERSION)
 AC_SUBST(TK_MAJOR_VERSION)
 AC_SUBST(NOINLINE)
index bea82dc..4d6f014 100644 (file)
@@ -32,17 +32,17 @@ function str=x_dialog(comment,default)
   
   txt=create_txt4(comment,default)
 
-  TK_EvalStr(txt)
+  TCL_EvalStr(txt)
 
-  TK_EvalStr('$w.mess  insert 0.0 '"'+sci2tcl(default)+''"')
+  TCL_EvalStr('$w.mess  insert 0.0 '"'+sci2tcl(default)+''"')
 
   for t=1:100,  xpause(2000),end
-  TK_EvalStr('$w.mess delete 0.0 end')
-  TK_EvalStr('$w.mess  insert 0.0 '"'+sci2tcl(str)+''"')
+  TCL_EvalStr('$w.mess delete 0.0 end')
+  TCL_EvalStr('$w.mess  insert 0.0 '"'+sci2tcl(str)+''"')
   
   for t=1:min(100*(ln-1),5000),  xpause(2000),end
   
-  TK_EvalStr('destroy $w')
+  TCL_EvalStr('destroy $w')
 endfunction
 
 function str=x_mdialog(description,labels,valuesini)
@@ -52,7 +52,7 @@ function str=x_mdialog(description,labels,valuesini)
   
    txt=create_txt1(description,labels,valuesini);
   
-   TK_EvalStr(txt)
+   TCL_EvalStr(txt)
    xpause(500000)
    for k=1:n
      str(k,1)=readline()
@@ -61,14 +61,14 @@ function str=x_mdialog(description,labels,valuesini)
    rep=readline()
    for i=1:3
      txt=create_txt2(valuesini);
-     TK_EvalStr(txt)
+     TCL_EvalStr(txt)
      xpause(500000)
      txt=create_txt2(str);
-     TK_EvalStr(txt)
+     TCL_EvalStr(txt)
      xpause(500000)
    end
     xpause(1500000)
-   TK_EvalStr('destroy $w')
+   TCL_EvalStr('destroy $w')
    if part(rep,1)=='c' then str=[],end
 endfunction
 
@@ -322,17 +322,17 @@ function tk_mpop(ll,but,pos)
 
   for bb=1:but-1
   [txt,MM]=create_pop(ll,bb,pos)
-  ierr=execstr('TK_EvalStr(txt)','continue')
+  ierr=execstr('TCL_EvalStr(txt)','continue')
   for i=1:10,xpause(5000),end
    txt='catch {destroy .scicoslhb}'
-  ierr=execstr('TK_EvalStr(txt)','continue')
+  ierr=execstr('TCL_EvalStr(txt)','continue')
   end
   [txt,MM]=create_pop(ll,but,pos)
-  ierr=execstr('TK_EvalStr(txt)','continue')
+  ierr=execstr('TCL_EvalStr(txt)','continue')
   
   xpause(1000000)
   txt='catch {destroy .scicoslhb}'
-  ierr=execstr('TK_EvalStr(txt)','continue')
+  ierr=execstr('TCL_EvalStr(txt)','continue')
 endfunction
 
 function [txt,MM]=create_pop(ll,but,pos)
index 76ecb8e..49a6ff6 100644 (file)
@@ -20,7 +20,7 @@ LIBRSCI = $(SCIDIR)/libs/system.a $(SCIDIR)/libs/interf.a \
         $(BLAS) \
        $(SCIDIR)/libs/int.a \
         $(SCIDIR)/libs/slicot.a  \
-       $(SCIDIR)/libs/pvm.a  $(SCIDIR)/libs/tksci.a
+       $(SCIDIR)/libs/pvm.a  $(SCIDIR)/libs/tclsci.a
 
 LIBR = $(XAW_LOCAL_LIB) $(LIBRSCI) $(DLDLIB) $(PVMGLIB) $(PVMLIB)
 
index 877cbe8..f902757 100755 (executable)
@@ -11,7 +11,7 @@ sun_f.lib
 system.lib
 system2_f.lib
 system_f.lib
-tksci.lib
+tclsci.lib
 wsci.lib
 xdr.lib
 libf2c.lib
@@ -112,4 +112,5 @@ integ.def
 control.def
 wintools.lib
 wintools.def
-tclsci.def
\ No newline at end of file
+tclsci.def
+tclsci.lib
\ No newline at end of file
index 0ec0b75..4f614fd 100644 (file)
@@ -9,7 +9,6 @@ DEFS= blas.def \
 calelm.def \
 control.def \
 dcd.def \
-fraclab.def \
 graphics.def \
 integ.def \
 interf.def \
@@ -31,7 +30,8 @@ system.def \
 system2.def \
 wsci.def \
 xdr.def \
-slicot.def 
+slicot.def \
+wintools.def
 
 all : $(DEFS)
 
index c5c7224..2e07844 100644 (file)
@@ -4,11 +4,11 @@ include ../Makefile.incl.mak
 all :: ..\bin\LibScilab.def 
 
 
-FILES = AAbase.def+arpack.def+blas.def+calelm.def+console.def+control.def+dcd.def+default.def+gd.def+graphics.def+int.def+integ.def+interf.def+intersci.def+lapack.def+libf2c.def+menusX.def+metanet.def+optim.def+poly.def+rand.def+scicos.def+signal.def+slicot.def+sound.def+sparse.def+sun.def+system.def+system2.def+wsci.def+xdr.def+wintools.def+tclsci.def
+FILES = AAbase.def+arpack.def+blas.def+calelm.def+console.def+control.def+dcd.def+default.def+gd.def+graphics.def+int.def+integ.def+interf.def+intersci.def+lapack.def+libf2c.def+menusX.def+metanet.def+optim.def+poly.def+rand.def+scicos.def+signal.def+slicot.def+sound.def+sparse.def+sun.def+system.def+system2.def+wsci.def+xdr.def+wintools.def
 
 
 !IF "$(DTK)" == "-DWITH_TK"
-FILES1 = $(FILES)+tksci.def 
+FILES1 = $(FILES)+tclsci.def
 !ELSE 
 FILES1 = $(FILES)
 !ENDIF
@@ -56,7 +56,7 @@ clean::
        -del wsci.def
        -del xdr.def
        -del pvm.def 
-       -del tksci.def 
+       -del tclsci.def
        -del wintools.def 
        -del *.lib
        -del ..\bin\libscilab.def
@@ -96,7 +96,7 @@ distclean::
        -del wsci.def
        -del xdr.def
        -del pvm.def 
-       -del tksci.def 
+       -del tclsci.def
        -del wintools.def 
        -del *.lib
        
index a92cf96..758c49c 100644 (file)
@@ -33,10 +33,10 @@ ta=size(col,1);
       " '+ttb+'] '+string(ta)+' '+string(Color)+';pack .toto.titi;tkwait w"+...
       "indow .toto;'
   Color=[];
-  TK_EvalStr(txt)
+  TCL_EvalStr(txt)
   Color=evstr(Color)
 endfunction
 
 
-//getf gg.sci;txt=gg(xget('colormap'),1);;TK_EvalStr(txt)
+//getf gg.sci;txt=gg(xget('colormap'),1);;TCL_EvalStr(txt)
 
index 587d521..a1d688a 100644 (file)
@@ -217,14 +217,14 @@ function result=mdialog(title,items,init)
     
 txt=create_txt(title,items,init);
 result=[];
-TK_EvalStr(txt)
-done=TK_GetVar('done')
+TCL_EvalStr(txt)
+done=TCL_GetVar('done')
 if done==string(1) then
   for i=1:size(items,'*')
-    execstr('result(i)=TK_GetVar(''x'+string(i)+''')')
+    execstr('result(i)=TCL_GetVar(''x'+string(i)+''')')
   end
 end
-TK_EvalStr('destroy $w')
+TCL_EvalStr('destroy $w')
 
 endfunction
 
index 35677d5..1c49f7e 100644 (file)
@@ -3,7 +3,7 @@ function Cmenu=tk_mpopup(ll)
   if length(ll)==0 then return;end
 
   [txt,MM]=create_popup(ll)
-  ierr=execstr('TK_EvalStr(txt)','continue')
+  ierr=execstr('TCL_EvalStr(txt)','continue')
 endfunction
 
 function [txt,MM]=create_popup(ll)
index 34ac078..fcf5e86 100644 (file)
@@ -2,7 +2,7 @@ function Cmenu=tk_mpopupX(ll)
   Cmenu=[]
   if length(ll)==0 then return;end
   [txt,MM]=create_popup(ll)
-  ierr=execstr('TK_EvalStr(txt)','continue')
+  ierr=execstr('TCL_EvalStr(txt)','continue')
   done=0
   while ~done,end
 endfunction
index 263a82c..42566f5 100644 (file)
@@ -13,6 +13,6 @@ NAM = SCI/macros/tksci
 MACROS = tk_getfile.sci tk_getdir.sci tk_savefile.sci \
        buttondialog.sci demoplay.sci editvar_get.sci winclose.sci browsevar.sci \
        config.sci editvar.sci progressionbar.sci waitbar.sci winlist.sci sciGUIhelp.sci\
-       sciGUI_init.sci
+       sciGUI_init.sci  TK_EvalFile.sci TK_EvalStr.sci TK_GetVar.sci TK_SetVar.sci
 
 include ../Make.lib
index 82bcf6c..3805ace 100644 (file)
@@ -16,6 +16,6 @@ NAM = SCI/macros/tksci
 MACROS = tk_getfile.sci tk_getdir.sci tk_savefile.sci \
        buttondialog.sci demoplay.sci editvar_get.sci winclose.sci browsevar.sci \
        config.sci editvar.sci progressionbar.sci waitbar.sci winlist.sci sciGUIhelp.sci\
-       sciGUI_init.sci
+       sciGUI_init.sci TK_EvalFile.sci TK_EvalStr.sci TK_GetVar.sci TK_SetVar.sci
 
 include ../Make.lib.amk
index 9b02193..69f46e6 100644 (file)
@@ -16,6 +16,6 @@ NAM = SCI/macros/tksci
 MACROS = tk_getfile.sci tk_getdir.sci tk_savefile.sci \
        buttondialog.sci demoplay.sci editvar_get.sci winclose.sci browsevar.sci \
        config.sci editvar.sci progressionbar.sci waitbar.sci winlist.sci sciGUIhelp.sci\
-       sciGUI_init.sci
+       sciGUI_init.sci TK_EvalFile.sci TK_EvalStr.sci TK_GetVar.sci TK_SetVar.sci
 
 include ../Make.lib.mak
diff --git a/scilab/macros/tksci/TK_EvalFile.sci b/scilab/macros/tksci/TK_EvalFile.sci
new file mode 100644 (file)
index 0000000..caa948c
--- /dev/null
@@ -0,0 +1,6 @@
+// Allan CORNET
+// INRIA 2005
+function TK_EvalFile(f1)
+  printf('\nWarning TCL_EvalFile obselete please use TCL_EvalFile.\n');
+  TCL_EvalFile(f1)
+endfunction
\ No newline at end of file
diff --git a/scilab/macros/tksci/TK_EvalStr.sci b/scilab/macros/tksci/TK_EvalStr.sci
new file mode 100644 (file)
index 0000000..0b300fa
--- /dev/null
@@ -0,0 +1,6 @@
+// Allan CORNET
+// INRIA 2005
+function TK_EvalStr(Str)
+  printf('\nWarning TCL_EvalStr obselete please use TCL_EvalStr.\n');
+  TCL_EvalStr(Str)
+endfunction
\ No newline at end of file
diff --git a/scilab/macros/tksci/TK_GetVar.sci b/scilab/macros/tksci/TK_GetVar.sci
new file mode 100644 (file)
index 0000000..0af9687
--- /dev/null
@@ -0,0 +1,6 @@
+// Allan CORNET
+// INRIA 2005
+function ret=TK_GetVar(Var)
+  printf('\nWarning TCL_GetVar obselete please use TCL_GetVar.\n');
+  ret=TCL_GetVar(Var)
+endfunction
\ No newline at end of file
diff --git a/scilab/macros/tksci/TK_SetVar.sci b/scilab/macros/tksci/TK_SetVar.sci
new file mode 100644 (file)
index 0000000..e4a7aca
--- /dev/null
@@ -0,0 +1,6 @@
+// Allan CORNET
+// INRIA 2005
+function ret=TK_SetVar(Var,Val)
+  printf('\nWarning TCL_SetVar obselete please use TCL_SetVar.\n');
+  ret=TCL_SetVar(Var,Val)
+endfunction
\ No newline at end of file
index 6194f53..16ba0ec 100644 (file)
@@ -33,6 +33,6 @@ function browsevar()
   file('close',u);
 
   tmpDir=strsubst(TMPDIR,'\','/');
-  TK_EvalStr('sciGUIBrowseVar ""'+tmpDir+'""');
+  TCL_EvalStr('sciGUIBrowseVar ""'+tmpDir+'""');
 endfunction
 
index 4128343..ec0d923 100644 (file)
@@ -27,13 +27,13 @@ function answer=buttondialog(mes,bt,icon)
     end
     if ((type(mes)==10)&(type(bt)==10)) then
       // do the work
-      TK_EvalStr('set mybutdialoganswertmp [sciGUIButtonDialog -1 ""'+mes+'"" ""'+bt+'"" '+locicon+']');
+      TCL_EvalStr('set mybutdialoganswertmp [sciGUIButtonDialog -1 ""'+mes+'"" ""'+bt+'"" '+locicon+']');
       while %t
        realtimeinit(0.1);realtime(0);realtime(0.1);
-       TK_EvalStr('set mybutdialogtmp [info exist mybutdialoganswertmp]');
-       if TK_GetVar('mybutdialogtmp')=='1' then break,end;
+       TCL_EvalStr('set mybutdialogtmp [info exist mybutdialoganswertmp]');
+       if TCL_GetVar('mybutdialogtmp')=='1' then break,end;
       end
-      answer=TK_GetVar('mybutdialoganswertmp');
+      answer=TCL_GetVar('mybutdialoganswertmp');
       doerror=%f;
     end
   end
index 811d1b8..fb57602 100644 (file)
@@ -39,6 +39,6 @@ function config()
     end
   end
   vt=v1+' '+v2+' '+v3+' '+v4+' '+v5+' '+v6+' '+v7+' '+v8;
-  TK_EvalStr('sciGUIConfig -1 {'+vt+'}');
+  TCL_EvalStr('sciGUIConfig -1 {'+vt+'}');
   format(v4,evstr(v5));
 endfunction
index 9b83715..4ec73f6 100644 (file)
@@ -24,11 +24,11 @@ function demoplay(filename)
 
   if (goon) then
     ll=lines();lines(0);
-    TK_EvalStr('set editvartmp [sciGUIGenFileName ]');
-    slideFile=strsubst(TMPDIR,'\','/')+'/'+TK_GetVar('editvartmp');
+    TCL_EvalStr('set editvartmp [sciGUIGenFileName ]');
+    slideFile=strsubst(TMPDIR,'\','/')+'/'+TCL_GetVar('editvartmp');
     fileFile=strsubst(filename,'\','/');
-    TK_EvalStr('set demoplaytmp [sciGUIDemoPlay -1 ""'+fileFile+'"" ""'+slideFile+'"" ]');
-    demoplaytmp=evstr(TK_GetVar('demoplaytmp'));
+    TCL_EvalStr('set demoplaytmp [sciGUIDemoPlay -1 ""'+fileFile+'"" ""'+slideFile+'"" ]');
+    demoplaytmp=evstr(TCL_GetVar('demoplaytmp'));
     while %t
       realtimeinit(0.1);
       realtime(0);realtime(0.1);
index 2a5c347..539bc87 100644 (file)
@@ -28,18 +28,18 @@ function editvar(varargin)
   %_loc_nj=size(%_loc_var,2);
   %_loc_type=string(%_loc_type);
 
-  TK_EvalStr("set EdVarLoc [sciGUIEditVar -1]");
+  TCL_EvalStr("set EdVarLoc [sciGUIEditVar -1]");
 
-  %_winId=TK_GetVar("EdVarLoc");
+  %_winId=TCL_GetVar("EdVarLoc");
 
-  TK_SetVar("sciGUITable(win,"+%_winId+",data,name)",%_loc_nam);
-  TK_SetVar("sciGUITable(win,"+%_winId+",data,type)",string(%_loc_type));
-  TK_SetVar("sciGUITable(win,"+%_winId+",data,ni)",string(%_loc_ni));
-  TK_SetVar("sciGUITable(win,"+%_winId+",data,nj)",string(%_loc_nj));
+  TCL_SetVar("sciGUITable(win,"+%_winId+",data,name)",%_loc_nam);
+  TCL_SetVar("sciGUITable(win,"+%_winId+",data,type)",string(%_loc_type));
+  TCL_SetVar("sciGUITable(win,"+%_winId+",data,ni)",string(%_loc_ni));
+  TCL_SetVar("sciGUITable(win,"+%_winId+",data,nj)",string(%_loc_nj));
 
   //
   // This is a slow manner to move the data ...
-  // Anyone have a faster method than TK_SetVar
+  // Anyone have a faster method than TCL_SetVar
   // I would like set some tcl variable like varname(pos_i,pos_j)
   //
 
@@ -47,10 +47,10 @@ function editvar(varargin)
     for %_i=1:%_loc_ni,
       %_value=string(%_loc_var(%_i,%_j));
       %_varname="sciGUITable(win,"+%_winId+",data,"+string(%_i)+","+string(%_j)+")";
-      TK_SetVar(%_varname,%_value);
+      TCL_SetVar(%_varname,%_value);
     end
   end
 
-  TK_EvalStr("sciGUIEditVarDrawGrid "+%_winId);
+  TCL_EvalStr("sciGUIEditVarDrawGrid "+%_winId);
 
 endfunction
index d91e283..2cda625 100644 (file)
@@ -13,13 +13,13 @@ function outvar=editvar_get(winId)
 disp("Please wait...");
 outvar=[];
 base="sciGUITable(win,"+string(winId)+",data";
-varType=evstr(TK_GetVar(base+',type)'));
-varni=evstr(TK_GetVar(base+',ni)'));
-varnj=evstr(TK_GetVar(base+',nj)'));
+varType=evstr(TCL_GetVar(base+',type)'));
+varni=evstr(TCL_GetVar(base+',ni)'));
+varnj=evstr(TCL_GetVar(base+',nj)'));
 for j=1:varnj,
        ww=[];
        for i=1:varni,
-               q=TK_GetVar(base+','+string(i)+','+string(j)+')');
+               q=TCL_GetVar(base+','+string(i)+','+string(j)+')');
                if (varType~=10) then
                        if (varType==4) then
                                if ((q=="T")|(q=="t")) then
index 66f30ee..6509f8a 100644 (file)
@@ -46,11 +46,11 @@ function hout=progressionbar(h,mes)
 
 
   if (m1=="") then
-    TK_EvalStr('set progressionbartmp [sciGUIBarProgression '+string(h1)+' """"]');
+    TCL_EvalStr('set progressionbartmp [sciGUIBarProgression '+string(h1)+' """"]');
   else
-    TK_EvalStr('set progressionbartmp [sciGUIBarProgression '+string(h1)+' ""'+m1+'""]');
+    TCL_EvalStr('set progressionbartmp [sciGUIBarProgression '+string(h1)+' ""'+m1+'""]');
   end
-  hout=evstr(TK_GetVar('progressionbartmp'));
+  hout=evstr(TCL_GetVar('progressionbartmp'));
 
 endfunction
 
index 371db12..fd282bf 100644 (file)
@@ -1,13 +1,13 @@
 function sciGUI_init()
-  if execstr('TK_GetVar(''sciGUITable(win,0,type)'')','errcatch')<>0 then
+  if execstr('TCL_GetVar(''sciGUITable(win,0,type)'')','errcatch')<>0 then
     sciGUI_tclpath=SCI+"/tcl/sciGUI/'
-    TK_EvalFile(sciGUI_tclpath+'sciGUI.tcl');
-    TK_EvalFile(sciGUI_tclpath+'sciBar.tcl');
-    TK_EvalFile(sciGUI_tclpath+'sciDemoPlay.tcl');
-    TK_EvalFile(sciGUI_tclpath+'sciBrowseVar.tcl');
-    TK_EvalFile(sciGUI_tclpath+'sciBrowseHelp.tcl');
-    TK_EvalFile(sciGUI_tclpath+'sciEditVar.tcl');
-    TK_EvalFile(sciGUI_tclpath+'sciConfig.tcl');
-    TK_EvalStr('sciGUIDoInit ""'+SCI+'"";sciGUIBrowseVarINI;sciGUIBrowseHelpINI');
+    TCL_EvalFile(sciGUI_tclpath+'sciGUI.tcl');
+    TCL_EvalFile(sciGUI_tclpath+'sciBar.tcl');
+    TCL_EvalFile(sciGUI_tclpath+'sciDemoPlay.tcl');
+    TCL_EvalFile(sciGUI_tclpath+'sciBrowseVar.tcl');
+    TCL_EvalFile(sciGUI_tclpath+'sciBrowseHelp.tcl');
+    TCL_EvalFile(sciGUI_tclpath+'sciEditVar.tcl');
+    TCL_EvalFile(sciGUI_tclpath+'sciConfig.tcl');
+    TCL_EvalStr('sciGUIDoInit ""'+SCI+'"";sciGUIBrowseVarINI;sciGUIBrowseHelpINI');
   end
 endfunction
index 526dd92..fe77e5d 100644 (file)
@@ -14,15 +14,15 @@ function sciGUIhelp(key)
   
   sciGUI_init();
 
-  nch=eval(TK_GetVar('sciGUITable(browsehelp,nchap)'));
+  nch=eval(TCL_GetVar('sciGUITable(browsehelp,nchap)'));
   if (size(%helps,1)~=nch) then        
     rescan_helps()
-    TK_SetVar('sciGUITable(browsehelp,nchap)',string(size(%helps,1)));
+    TCL_SetVar('sciGUITable(browsehelp,nchap)',string(size(%helps,1)));
     update='1';
   end
   tmpDir=strsubst(TMPDIR,'\','/');
   if (argn(2)==0|key=='index') then
-    TK_EvalStr('sciGUIBrowseHelp -1 '+update+' ""'+tmpDir+'/browsehelp.txt""');
+    TCL_EvalStr('sciGUIBrowseHelp -1 '+update+' ""'+tmpDir+'/browsehelp.txt""');
   elseif (argn(2)==1) then
     key=stripblanks(key)
     if or(part(key,1)==['(',')','[',']','{','}','%','''','""',':','*','/', ...
@@ -30,7 +30,7 @@ function sciGUIhelp(key)
       key="symbols";
     end
     nn=string(key);
-    TK_EvalStr('sciGUIBrowseHelp -1 '+update+' ""'+tmpDir+'/browsehelp.txt"" '+nn);
+    TCL_EvalStr('sciGUIBrowseHelp -1 '+update+' ""'+tmpDir+'/browsehelp.txt"" '+nn);
   else
     error(42);
   end
index 0dcf161..03f547c 100644 (file)
@@ -8,6 +8,6 @@ function p=tk_getdir(startdir,title)
   end
   if exists('title','local')==1 then arg=arg+' -title ""'+title+'""',end
   arg=arg+' -parent $root '
-  TK_EvalStr("set scifilepath [tk_chooseDirectory"+arg+"]")
-  p=TK_GetVar('scifilepath')
+  TCL_EvalStr("set scifilepath [tk_chooseDirectory"+arg+"]")
+  p=TCL_GetVar('scifilepath')
 endfunction
index 1cbe7ab..20b3e41 100644 (file)
@@ -2,7 +2,7 @@ function p=tk_getfile(file_mask,path,title,foo)
   if ~with_tk() then error('Tcl/Tk interface not defined'),end
   arg=''
   if exists('file_mask','local')==1 then 
-    TK_SetVar("ftypes",'{""Requested Extensions"" {'+file_mask+'} }')
+    TCL_SetVar("ftypes",'{""Requested Extensions"" {'+file_mask+'} }')
     arg=arg+' -filetypes $ftypes'
   end
   if exists('path','local')==1 then 
@@ -32,8 +32,8 @@ function p=tk_getfile(file_mask,path,title,foo)
   if exists('title','local')==1 then 
     arg=arg+' -title ""'+title+'""',
   end
-  TK_EvalStr('set scifilepath [tk_getOpenFile'+arg+']')
-  p=TK_GetVar('scifilepath')
+  TCL_EvalStr('set scifilepath [tk_getOpenFile'+arg+']')
+  p=TCL_GetVar('scifilepath')
   if MSDOS then
        if ~( p=='' ) then
                global %tk_getfile_defaultpath;
index 88230da..ffd1bb7 100644 (file)
@@ -2,12 +2,12 @@ function p=tk_savefile(file_mask,path,title,foo)
   if ~with_tk() then error('Tcl/Tk interface not defined'),end
   arg=''
   if exists('file_mask','local')==1 then 
-    TK_SetVar("ftypes",'{""Requested Extensions"" {'+file_mask+'} }')
+    TCL_SetVar("ftypes",'{""Requested Extensions"" {'+file_mask+'} }')
     arg=arg+' -filetypes $ftypes',
   end
   if exists('path','local')==1 then arg=arg+' -initialdir ""'+path+'""',end
   if exists('title','local')==1 then arg=arg+' -title ""'+title+'""',end
   if exists('ini','local')==1 then arg=arg+' -initialfile ""'+ini+'""',end
-  TK_EvalStr('set scifilepath [tk_getSaveFile'+arg+']')
-  p=TK_GetVar('scifilepath')
+  TCL_EvalStr('set scifilepath [tk_getSaveFile'+arg+']')
+  p=TCL_GetVar('scifilepath')
 endfunction
index 65ce892..5cbae21 100644 (file)
@@ -68,9 +68,9 @@ function hout=waitbar(x,mes,h)
 
   if doerror then      error(49); end
   if (m1=="") then
-    TK_EvalStr('set waitbartmp [sciGUIBarWait '+string(h1)+' """" '+string(x1)+']');
+    TCL_EvalStr('set waitbartmp [sciGUIBarWait '+string(h1)+' """" '+string(x1)+']');
   else
-    TK_EvalStr('set waitbartmp [sciGUIBarWait '+string(h1)+' ""'+m1+'"" '+string(x1)+']');
+    TCL_EvalStr('set waitbartmp [sciGUIBarWait '+string(h1)+' ""'+m1+'"" '+string(x1)+']');
   end
-  hout=evstr(TK_GetVar('waitbartmp'))
+  hout=evstr(TCL_GetVar('waitbartmp'))
 endfunction
index cfcb605..e1519aa 100644 (file)
@@ -10,12 +10,12 @@ function sta=winclose(h)
 //the Free Software Foundation; either version 2 of the License, or
 //(at your option) any later version.
 
-  if execstr('TK_GetVar(''sciGUITable(win,id)'')','errcatch')<>0 then
+  if execstr('TCL_GetVar(''sciGUITable(win,id)'')','errcatch')<>0 then
     sta=1
     return
   end
   sta=0;
   for j=1:length(h),
-    TK_EvalStr('sciGUIDestroy '+string(h(j)));
+    TCL_EvalStr('sciGUIDestroy '+string(h(j)));
   end
 endfunction
index 373fedd..aef7aef 100644 (file)
@@ -11,7 +11,7 @@ function hout=winlist()
 //(at your option) any later version.
   
   rhs=argn(2);
-  if execstr('rep=TK_GetVar(''sciGUITable(win,id)'')','errcatch')<>0 then
+  if execstr('rep=TCL_GetVar(''sciGUITable(win,id)'')','errcatch')<>0 then
     hout=[];
     return
   end
index 905c4d2..25baf5e 100644 (file)
@@ -132,24 +132,24 @@ function tcltk_help(path,key,key1)
   K=[' ','(',')','[',']','{','}','""','/','\','.','<','>']
   for k=K,key1=strsubst(key1,k,'_'),end
   if MSDOS then
-    TK_EvalStr('set isbrowsehelpinterp [interp exists browsehelp]');
-    if TK_GetVar("isbrowsehelpinterp")=='0' then    
-      TK_EvalStr("interp create browsehelp")
-      TK_EvalStr("load {"+SCI+"/bin/tk84.dll} Tk browsehelp")
-      TK_EvalStr("browsehelp eval {wm withdraw .}")
+    TCL_EvalStr('set isbrowsehelpinterp [interp exists browsehelp]');
+    if TCL_GetVar("isbrowsehelpinterp")=='0' then    
+      TCL_EvalStr("interp create browsehelp")
+      TCL_EvalStr("load {"+SCI+"/bin/tk84.dll} Tk browsehelp")
+      TCL_EvalStr("browsehelp eval {wm withdraw .}")
     end
-    TK_EvalStr("browsehelp eval {set lang "+LANGUAGE+"}")
-    TK_EvalStr("browsehelp eval {set SciPath """+SCI+"""}")
-    TK_EvalStr("browsehelp eval {set Home """+INDEX+"""}")
-    TK_EvalStr("browsehelp eval {set sciw .scihelp-"+key1+"}")
-    TK_EvalStr("browsehelp eval {set manpath """+path+"""}")
-    TK_EvalStr("browsehelp eval {source ""'+SCI+'/tcl/browsehelp.tcl""}")
+    TCL_EvalStr("browsehelp eval {set lang "+LANGUAGE+"}")
+    TCL_EvalStr("browsehelp eval {set SciPath """+SCI+"""}")
+    TCL_EvalStr("browsehelp eval {set Home """+INDEX+"""}")
+    TCL_EvalStr("browsehelp eval {set sciw .scihelp-"+key1+"}")
+    TCL_EvalStr("browsehelp eval {set manpath """+path+"""}")
+    TCL_EvalStr("browsehelp eval {source ""'+SCI+'/tcl/browsehelp.tcl""}")
   else
-     TK_SetVar("lang",LANGUAGE)
-     TK_SetVar("Home",INDEX)
-     TK_SetVar("sciw",".scihelp-"+key1+"}")
-     TK_SetVar("manpath",path)
-     TK_EvalFile(SCI+"/tcl/browsehelp.tcl")
+     TCL_SetVar("lang",LANGUAGE)
+     TCL_SetVar("Home",INDEX)
+     TCL_SetVar("sciw",".scihelp-"+key1+"}")
+     TCL_SetVar("manpath",path)
+     TCL_EvalFile(SCI+"/tcl/browsehelp.tcl")
   end
 endfunction
 
@@ -161,18 +161,18 @@ function tcltk_apropos(path)
   path=strsubst(path,"\","/")
   INDEX=strsubst(INDEX,"\","/")
   if MSDOS then
-    TK_EvalStr("browsehelp eval {set lang "+LANGUAGE+"}")
-    TK_EvalStr("browsehelp eval {set SciPath """+SCI+"""}")
-    TK_EvalStr("browsehelp eval {set Home """+INDEX+"""}")
-    TK_EvalStr("browsehelp eval {set sciw .sciapropos}")
-    TK_EvalStr("browsehelp eval {set manpath """+path+"""}")
-    TK_EvalStr("browsehelp eval {source $SciPath/tcl/browsehelp.tcl}")
+    TCL_EvalStr("browsehelp eval {set lang "+LANGUAGE+"}")
+    TCL_EvalStr("browsehelp eval {set SciPath """+SCI+"""}")
+    TCL_EvalStr("browsehelp eval {set Home """+INDEX+"""}")
+    TCL_EvalStr("browsehelp eval {set sciw .sciapropos}")
+    TCL_EvalStr("browsehelp eval {set manpath """+path+"""}")
+    TCL_EvalStr("browsehelp eval {source $SciPath/tcl/browsehelp.tcl}")
   else
-     TK_SetVar("lang",LANGUAGE)
-     TK_SetVar("Home",INDEX)
-     TK_SetVar("sciw",".sciapropos")
-     TK_SetVar("manpath",path)
-     TK_EvalFile(SCI+"/tcl/browsehelp.tcl")
+     TCL_SetVar("lang",LANGUAGE)
+     TCL_SetVar("Home",INDEX)
+     TCL_SetVar("sciw",".sciapropos")
+     TCL_SetVar("manpath",path)
+     TCL_EvalFile(SCI+"/tcl/browsehelp.tcl")
   end
 endfunction
 
index dfd419a..294319c 100644 (file)
@@ -8,7 +8,7 @@ function answ=edit_error(clearerror)
       p=get_function_path(func)
       if p<>[] then
         scipad(p)
-        TK_EvalStr("scipad eval {updateactivebreakpointtag "+..
+        TCL_EvalStr("scipad eval {updateactivebreakpointtag "+..
            string(line) +" "+func+"}")
         answ="opening file "+p+" on line "+string(line)+" of function "+func
       else
index 47b8420..5ed3751 100644 (file)
@@ -3,13 +3,13 @@ global LANGUAGE
 [lhs,rhs]=argn(0)
 if rhs<>0 then error(39), end
 if MSDOS then
-  if funptr("TK_EvalStr")==0 then
+  if funptr("TCL_EvalStr")==0 then
     write(%io(2),["Editor works only with TCL/TK.";],"(a)")
     return
   end
-  TK_EvalStr("scipad eval {set lang "+LANGUAGE+"}")
-  TK_EvalStr("scipad eval {set SciPath """+SCI+"""}")
-  TK_EvalStr("scipad eval {source $SciPath/tcl/scipad.tcl}")
+  TCL_EvalStr("scipad eval {set lang "+LANGUAGE+"}")
+  TCL_EvalStr("scipad eval {set SciPath """+SCI+"""}")
+  TCL_EvalStr("scipad eval {source $SciPath/tcl/scipad.tcl}")
 else
   write(%io(2),["Editor works only under Windows.";],"(a)")
 end
index 9419eac..fb222fc 100644 (file)
@@ -14,11 +14,11 @@ function ged(k,win)
     return
   end
   if k>3 then
-    TK_EvalStr("set isgedinterp [interp exists ged]")
-    if TK_GetVar("isgedinterp")=='0' then    
-      TK_EvalStr("interp create ged")
-      TK_EvalStr("load {'+gettklib()+'} Tk ged")
-      TK_EvalStr("ged eval {wm withdraw .}")
+    TCL_EvalStr("set isgedinterp [interp exists ged]")
+    if TCL_GetVar("isgedinterp")=='0' then    
+      TCL_EvalStr("interp create ged")
+      TCL_EvalStr("load {'+gettklib()+'} Tk ged")
+      TCL_EvalStr("ged eval {wm withdraw .}")
     end
   end
 
@@ -33,17 +33,17 @@ function ged(k,win)
 
    // hierarchical viewer
     TK_send_handles_list(gcf())
-    TK_SetVar("curgedindex",string(Get_handle_pos_in_list(gcf())))
+    TCL_SetVar("curgedindex",string(Get_handle_pos_in_list(gcf())))
 
     //color_map array for color sample display
     f=gcf();
     for i=1:size(f.color_map,1)
       redname= "RED("+string(i)+")";
-      TK_EvalStr('set '+redname+" "+string(f.color_map(i,1)));
+      TCL_EvalStr('set '+redname+" "+string(f.color_map(i,1)));
       grename= "GREEN("+string(i)+")";
-      TK_EvalStr('set '+grename+" "+string(f.color_map(i,2)));
+      TCL_EvalStr('set '+grename+" "+string(f.color_map(i,2)));
       bluname= "BLUE("+string(i)+")";
-      TK_EvalStr('set '+bluname+" "+string(f.color_map(i,3)));
+      TCL_EvalStr('set '+bluname+" "+string(f.color_map(i,3)));
     end
     
     //ged_fontarray = ["Courier" "Symbol" "Times" "Times Italic" "Times Bold" "Times Bold Italic"  "Helvetica"  "Helvetica Italic" "Helvetica Bold" "Helvetica Bold Italic"];
@@ -52,17 +52,17 @@ function ged(k,win)
     case 5 then //edit current axes
     // hierarchical viewer
     TK_send_handles_list(gcf())
-    TK_SetVar("curgedindex",string(Get_handle_pos_in_list(gca())))
+    TCL_SetVar("curgedindex",string(Get_handle_pos_in_list(gca())))
 
     //color_map array for color sample display
     f=gcf();
     for i=1:size(f.color_map,1)
       redname= "RED("+string(i)+")";
-      TK_EvalStr('set '+redname+" "+string(f.color_map(i,1)));
+      TCL_EvalStr('set '+redname+" "+string(f.color_map(i,1)));
       grename= "GREEN("+string(i)+")";
-      TK_EvalStr('set '+grename+" "+string(f.color_map(i,2)));
+      TCL_EvalStr('set '+grename+" "+string(f.color_map(i,2)));
       bluname= "BLUE("+string(i)+")";
-      TK_EvalStr('set '+bluname+" "+string(f.color_map(i,3)));
+      TCL_EvalStr('set '+bluname+" "+string(f.color_map(i,3)));
     end
 
     ged_axes(gca())
@@ -109,7 +109,7 @@ iAxi = 0; // axis : entity created when using drawaxis method for example
 f=getparfig(h);
 handles = Get_handles_list(f)
 
-TK_SetVar("ged_handle_list_size",string(size(handles,1)));
+TCL_SetVar("ged_handle_list_size",string(size(handles,1)));
 
 for i=1:size(handles,1)
  SelObject="SELOBJECT("+string(i)+")";
@@ -118,67 +118,67 @@ for i=1:size(handles,1)
    case "Figure"
     iFig = iFig+1;
     figname= "Figure("+string(iFig)+")";
-    TK_EvalStr('set '+SelObject+" "+figname);
+    TCL_EvalStr('set '+SelObject+" "+figname);
    case "Axes"
     iAxe = iAxe+1;
     axename= "Axes("+string(iAxe)+")";
-    TK_EvalStr('set '+SelObject+" "+axename);
+    TCL_EvalStr('set '+SelObject+" "+axename);
    case "Agregation"
     iAgr = iAgr+1;
     agrname= "Agregation("+string(iAgr)+")";
-    TK_EvalStr('set '+SelObject+" "+agrname);
+    TCL_EvalStr('set '+SelObject+" "+agrname);
    case "Polyline"
     iPol = iPol+1;
     polname= "Polyline("+string(iPol)+")";
-    TK_EvalStr('set '+SelObject+" "+polname);
+    TCL_EvalStr('set '+SelObject+" "+polname);
    case "Plot3d"
     iPl3 = iPl3+1;
     pl3name= "Plot3d("+string(iPl3)+")";
-    TK_EvalStr('set '+SelObject+" "+pl3name);
+    TCL_EvalStr('set '+SelObject+" "+pl3name);
    case "Fac3d"
     iFac = iFac+1;
     Facname= "Fac3d("+string(iFac)+")";
-    TK_EvalStr('set '+SelObject+" "+Facname);
+    TCL_EvalStr('set '+SelObject+" "+Facname);
    case "Rectangle"
     iRec = iRec+1;
     Recname= "Rectangle("+string(iRec)+")";
-    TK_EvalStr('set '+SelObject+" "+Recname);
+    TCL_EvalStr('set '+SelObject+" "+Recname);
    case "Text"
     iTex = iTex+1;
     Texname= "Text("+string(iTex)+")";
-    TK_EvalStr('set '+SelObject+" "+Texname);
+    TCL_EvalStr('set '+SelObject+" "+Texname);
    case "Legend"
     iLeg = iLeg+1;
     Legname= "Legend("+string(iLeg)+")";
-    TK_EvalStr('set '+SelObject+" "+Legname);
+    TCL_EvalStr('set '+SelObject+" "+Legname);
    case "Arc"
     iArc = iArc+1;
     Arcname= "Arc("+string(iArc)+")";
-    TK_EvalStr('set '+SelObject+" "+Arcname);
+    TCL_EvalStr('set '+SelObject+" "+Arcname);
    case "Segs"
     iSeg = iSeg+1;
     Segname= "Segs("+string(iSeg)+")";
-    TK_EvalStr('set '+SelObject+" "+Segname);
+    TCL_EvalStr('set '+SelObject+" "+Segname);
    case "Champ"
     iCha = iCha+1;
     Chaname= "Champ("+string(iCha)+")";
-    TK_EvalStr('set '+SelObject+" "+Chaname);
+    TCL_EvalStr('set '+SelObject+" "+Chaname);
    case "Fec"
     iFec = iFec+1;
     Fecname= "Fec("+string(iFec)+")";
-    TK_EvalStr('set '+SelObject+" "+Fecname);
+    TCL_EvalStr('set '+SelObject+" "+Fecname);
    case "Grayplot"
     iGra = iGra+1;
     Graname= "Grayplot("+string(iGra)+")";
-    TK_EvalStr('set '+SelObject+" "+Graname);
+    TCL_EvalStr('set '+SelObject+" "+Graname);
    case "Matplot"
     iMat = iMat+1;
     Matname= "Matplot("+string(iMat)+")";
-    TK_EvalStr('set '+SelObject+" "+Matname);
+    TCL_EvalStr('set '+SelObject+" "+Matname);
    case "Axis"
     iAxi = iAxi+1;
     Axiname= "Axis("+string(iAxi)+")";
-    TK_EvalStr('set '+SelObject+" "+Axiname);
+    TCL_EvalStr('set '+SelObject+" "+Axiname);
   end
 end
 endfunction
@@ -254,31 +254,31 @@ endfunction
 
 function ged_agregation(h)
   global ged_handle;ged_handle=h;
-  TK_SetVar("curvis",h.visible)
-  TK_EvalFile(SCI+'/tcl/ged/Agregation.tcl')
+  TCL_SetVar("curvis",h.visible)
+  TCL_EvalFile(SCI+'/tcl/ged/Agregation.tcl')
 endfunction
 
 
 function ged_figure(h)
   global ged_handle;ged_handle=h;
-  TK_SetVar("background",string(h.background))
-  TK_SetVar("rotation_style",h.rotation_style)
-  TK_SetVar("figure_name",h.figure_name)
-  TK_SetVar("figure_id",string(h.figure_id))
-  TK_SetVar("figure_xposition",string(h.figure_position(1)))
-  TK_SetVar("figure_yposition",string(h.figure_position(2)))
-  TK_SetVar("figure_xsiz",string(h.figure_size(1)))
-  TK_SetVar("figure_ysiz",string(h.figure_size(2)))
-  TK_SetVar("figure_xaxesiz",string(h.axes_size(1)))
-  TK_SetVar("figure_yaxesiz",string(h.axes_size(2)))
-  TK_SetVar("bcolor",string(h.background))
-  TK_SetVar("ncolors",string(size(h.color_map,1)))
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("curpix",h.pixmap)
-  TK_SetVar("curpdm",h.pixel_drawing_mode)
-  TK_SetVar("curautoresize",h.auto_resize)
-  TK_SetVar("currotation_style",h.rotation_style)
-  TK_EvalFile(SCI+'/tcl/ged/Figure.tcl')
+  TCL_SetVar("background",string(h.background))
+  TCL_SetVar("rotation_style",h.rotation_style)
+  TCL_SetVar("figure_name",h.figure_name)
+  TCL_SetVar("figure_id",string(h.figure_id))
+  TCL_SetVar("figure_xposition",string(h.figure_position(1)))
+  TCL_SetVar("figure_yposition",string(h.figure_position(2)))
+  TCL_SetVar("figure_xsiz",string(h.figure_size(1)))
+  TCL_SetVar("figure_ysiz",string(h.figure_size(2)))
+  TCL_SetVar("figure_xaxesiz",string(h.axes_size(1)))
+  TCL_SetVar("figure_yaxesiz",string(h.axes_size(2)))
+  TCL_SetVar("bcolor",string(h.background))
+  TCL_SetVar("ncolors",string(size(h.color_map,1)))
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("curpix",h.pixmap)
+  TCL_SetVar("curpdm",h.pixel_drawing_mode)
+  TCL_SetVar("curautoresize",h.auto_resize)
+  TCL_SetVar("currotation_style",h.rotation_style)
+  TCL_EvalFile(SCI+'/tcl/ged/Figure.tcl')
 endfunction
 
 
@@ -287,244 +287,244 @@ function ged_axes(h)
 
   LoadTicks2TCL(h);
 
-  TK_SetVar("Xaxes_reverseToggle",h.axes_reverse(1))
-  TK_SetVar("Yaxes_reverseToggle",h.axes_reverse(2))
-  TK_SetVar("Zaxes_reverseToggle",h.axes_reverse(3))
+  TCL_SetVar("Xaxes_reverseToggle",h.axes_reverse(1))
+  TCL_SetVar("Yaxes_reverseToggle",h.axes_reverse(2))
+  TCL_SetVar("Zaxes_reverseToggle",h.axes_reverse(3))
 
 // forgotten axes bounds info.
-  TK_SetVar("axes_boundsL",string(h.axes_bounds(1,1)))
-  TK_SetVar("axes_boundsU",string(h.axes_bounds(1,2)))
-  TK_SetVar("axes_boundsW",string(h.axes_bounds(1,3)))
-  TK_SetVar("axes_boundsH",string(h.axes_bounds(1,4)))
+  TCL_SetVar("axes_boundsL",string(h.axes_bounds(1,1)))
+  TCL_SetVar("axes_boundsU",string(h.axes_bounds(1,2)))
+  TCL_SetVar("axes_boundsW",string(h.axes_bounds(1,3)))
+  TCL_SetVar("axes_boundsH",string(h.axes_bounds(1,4)))
 
  // forgotten visibilty info.
-  TK_SetVar("xlabel_visibility",string(h.x_label.visible))
-  TK_SetVar("ylabel_visibility",string(h.y_label.visible))
-  TK_SetVar("zlabel_visibility",string(h.z_label.visible))
-  TK_SetVar("titlelabel_visibility",string(h.title.visible))
-
-  TK_SetVar("Lmargins",string(h.margins(1)));
-  TK_SetVar("Rmargins",string(h.margins(2)));
-  TK_SetVar("Tmargins",string(h.margins(3)));
-  TK_SetVar("Bmargins",string(h.margins(4)));
+  TCL_SetVar("xlabel_visibility",string(h.x_label.visible))
+  TCL_SetVar("ylabel_visibility",string(h.y_label.visible))
+  TCL_SetVar("zlabel_visibility",string(h.z_label.visible))
+  TCL_SetVar("titlelabel_visibility",string(h.title.visible))
+
+  TCL_SetVar("Lmargins",string(h.margins(1)));
+  TCL_SetVar("Rmargins",string(h.margins(2)));
+  TCL_SetVar("Tmargins",string(h.margins(3)));
+  TCL_SetVar("Bmargins",string(h.margins(4)));
   ged_linestylearray=["solid" "dash" "dash dot" "longdash dot" "bigdash dot" "bigdash longdash"]; 
-  TK_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
+  TCL_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
   if((h.clip_state<>'clipgrf') & (h.clip_state<>'on'))
     h.clip_state='clipgrf';
-    TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-    TK_SetVar("Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("Hclipbox",string(h.clip_box(4)))
     h.clip_state='off';
    else
-    TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-    TK_SetVar("Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("Hclipbox",string(h.clip_box(4)))
   end
-  TK_SetVar("curclipstate",h.clip_state);
-  TK_SetVar("curautoclear",h.auto_clear);
-  TK_SetVar("curautoscale",h.auto_scale);
-  //TK_SetVar("curfillmode",h.fill_mode);
-  TK_SetVar("curalpharotation",string(h.rotation_angles(1)))
-  TK_SetVar("curthetarotation",string(h.rotation_angles(2)))
+  TCL_SetVar("curclipstate",h.clip_state);
+  TCL_SetVar("curautoclear",h.auto_clear);
+  TCL_SetVar("curautoscale",h.auto_scale);
+  //TCL_SetVar("curfillmode",h.fill_mode);
+  TCL_SetVar("curalpharotation",string(h.rotation_angles(1)))
+  TCL_SetVar("curthetarotation",string(h.rotation_angles(2)))
   ged_fontarray = ["Courier" "Symbol" "Times" "Times Italic"...
         "Times Bold" "Times Bold Italic"  "Helvetica"  "Helvetica  Italic"...
         "Helvetica Bold" "Helvetica Bold Italic"];
-  TK_SetVar("Xlabelpos",h.x_location)
-  TK_SetVar("Ylabelpos",h.y_location)
-  TK_SetVar("Xlabelfontstyle",ged_fontarray(h.x_label.font_style+1))
-  TK_SetVar("Ylabelfontstyle",ged_fontarray(h.y_label.font_style+1))
-  TK_SetVar("Zlabelfontstyle",ged_fontarray(h.z_label.font_style+1))
-  TK_SetVar("TITLEfontstyle",ged_fontarray(h.title.font_style+1))
-  TK_SetVar("fontstyle",ged_fontarray(h.font_style+1))
-  TK_SetVar("msdos",string(MSDOS))
-  TK_SetVar("xlabel",h.x_label.text)
-  TK_SetVar("ylabel",h.y_label.text)
-  TK_SetVar("zlabel",h.z_label.text)
-  TK_SetVar("tlabel",h.title_label.text)
-  TK_SetVar("xlabel_foreground",string(h.x_label.foreground))
-  TK_SetVar("ylabel_foreground",string(h.y_label.foreground))
-  TK_SetVar("zlabel_foreground",string(h.z_label.foreground))
-  TK_SetVar("titlelabel_foreground",string(h.title.foreground))
-  TK_SetVar("xlabel_fontsize",string(h.x_label.font_size))
-  TK_SetVar("ylabel_fontsize",string(h.y_label.font_size))
-  TK_SetVar("zlabel_fontsize",string(h.z_label.font_size))
-  TK_SetVar("titlelabel_fontsize",string(h.title.font_size))
-  TK_SetVar("ncolors",string(size(f.color_map,1)))
-  TK_SetVar("fcolor",string(h.foreground))
-  TK_SetVar("bcolor",string(h.background))
-  TK_SetVar("curthick",string(h.thickness))
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("curfontsize",string(h.font_size))
-  TK_SetVar("curfontcolor",string(h.font_color))
-  TK_SetVar("limToggle",h.tight_limits)
-  TK_SetVar("isoToggle",h.isoview)
-  TK_SetVar("cubToggle",h.cube_scaling)
-  TK_SetVar("viewToggle",h.view)
-  TK_SetVar("boxToggle",h.box)
-  TK_SetVar("xToggle",part(h.log_flags,1))
-  TK_SetVar("yToggle",part(h.log_flags,2))
-  TK_SetVar("zToggle",part(h.log_flags,3))
-  TK_SetVar("xGrid",string(h.grid(1)))
-  TK_SetVar("yGrid",string(h.grid(2)))
+  TCL_SetVar("Xlabelpos",h.x_location)
+  TCL_SetVar("Ylabelpos",h.y_location)
+  TCL_SetVar("Xlabelfontstyle",ged_fontarray(h.x_label.font_style+1))
+  TCL_SetVar("Ylabelfontstyle",ged_fontarray(h.y_label.font_style+1))
+  TCL_SetVar("Zlabelfontstyle",ged_fontarray(h.z_label.font_style+1))
+  TCL_SetVar("TITLEfontstyle",ged_fontarray(h.title.font_style+1))
+  TCL_SetVar("fontstyle",ged_fontarray(h.font_style+1))
+  TCL_SetVar("msdos",string(MSDOS))
+  TCL_SetVar("xlabel",h.x_label.text)
+  TCL_SetVar("ylabel",h.y_label.text)
+  TCL_SetVar("zlabel",h.z_label.text)
+  TCL_SetVar("tlabel",h.title_label.text)
+  TCL_SetVar("xlabel_foreground",string(h.x_label.foreground))
+  TCL_SetVar("ylabel_foreground",string(h.y_label.foreground))
+  TCL_SetVar("zlabel_foreground",string(h.z_label.foreground))
+  TCL_SetVar("titlelabel_foreground",string(h.title.foreground))
+  TCL_SetVar("xlabel_fontsize",string(h.x_label.font_size))
+  TCL_SetVar("ylabel_fontsize",string(h.y_label.font_size))
+  TCL_SetVar("zlabel_fontsize",string(h.z_label.font_size))
+  TCL_SetVar("titlelabel_fontsize",string(h.title.font_size))
+  TCL_SetVar("ncolors",string(size(f.color_map,1)))
+  TCL_SetVar("fcolor",string(h.foreground))
+  TCL_SetVar("bcolor",string(h.background))
+  TCL_SetVar("curthick",string(h.thickness))
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("curfontsize",string(h.font_size))
+  TCL_SetVar("curfontcolor",string(h.font_color))
+  TCL_SetVar("limToggle",h.tight_limits)
+  TCL_SetVar("isoToggle",h.isoview)
+  TCL_SetVar("cubToggle",h.cube_scaling)
+  TCL_SetVar("viewToggle",h.view)
+  TCL_SetVar("boxToggle",h.box)
+  TCL_SetVar("xToggle",part(h.log_flags,1))
+  TCL_SetVar("yToggle",part(h.log_flags,2))
+  TCL_SetVar("zToggle",part(h.log_flags,3))
+  TCL_SetVar("xGrid",string(h.grid(1)))
+  TCL_SetVar("yGrid",string(h.grid(2)))
 
   
   select h.view
     case "2d" 
     drawlater();
     h.view='3d'
-    TK_SetVar("old_curalpharotation",string(h.rotation_angles(1)))
-    TK_SetVar("old_curthetarotation",string(h.rotation_angles(2)))
-    TK_SetVar("zGrid",string(h.grid(3)))
-    TK_SetVar("dbxmin",string(h.data_bounds(1,1)))
-    TK_SetVar("dbymin",string(h.data_bounds(1,2)))
-    TK_SetVar("dbzmin",string(h.data_bounds(1,3)))
-    TK_SetVar("dbxmax",string(h.data_bounds(2,1)))
-    TK_SetVar("dbymax",string(h.data_bounds(2,2)))
-    TK_SetVar("dbzmax",string(h.data_bounds(2,3)))
+    TCL_SetVar("old_curalpharotation",string(h.rotation_angles(1)))
+    TCL_SetVar("old_curthetarotation",string(h.rotation_angles(2)))
+    TCL_SetVar("zGrid",string(h.grid(3)))
+    TCL_SetVar("dbxmin",string(h.data_bounds(1,1)))
+    TCL_SetVar("dbymin",string(h.data_bounds(1,2)))
+    TCL_SetVar("dbzmin",string(h.data_bounds(1,3)))
+    TCL_SetVar("dbxmax",string(h.data_bounds(2,1)))
+    TCL_SetVar("dbymax",string(h.data_bounds(2,2)))
+    TCL_SetVar("dbzmax",string(h.data_bounds(2,3)))
     h.view='2d'
     drawnow();
     case "3d"
-    TK_SetVar("zGrid",string(h.grid(3)))
-    TK_SetVar("dbxmin",string(h.data_bounds(1,1)))
-    TK_SetVar("dbymin",string(h.data_bounds(1,2)))
-    TK_SetVar("dbzmin",string(h.data_bounds(1,3)))
-    TK_SetVar("dbxmax",string(h.data_bounds(2,1)))
-    TK_SetVar("dbymax",string(h.data_bounds(2,2)))
-    TK_SetVar("dbzmax",string(h.data_bounds(2,3)))
+    TCL_SetVar("zGrid",string(h.grid(3)))
+    TCL_SetVar("dbxmin",string(h.data_bounds(1,1)))
+    TCL_SetVar("dbymin",string(h.data_bounds(1,2)))
+    TCL_SetVar("dbzmin",string(h.data_bounds(1,3)))
+    TCL_SetVar("dbxmax",string(h.data_bounds(2,1)))
+    TCL_SetVar("dbymax",string(h.data_bounds(2,2)))
+    TCL_SetVar("dbzmax",string(h.data_bounds(2,3)))
   end
-  TK_EvalFile(SCI+'/tcl/ged/Axes.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Axes.tcl')
 endfunction
 
 function ged_rectangle(h)
   global ged_handle; ged_handle=h
  if(h.clip_box==[])
-    TK_SetVar("old_Xclipbox","")
-    TK_SetVar("old_Yclipbox","")
-    TK_SetVar("old_Wclipbox","")
-    TK_SetVar("old_Hclipbox","")
-    TK_SetVar("Xclipbox","")
-    TK_SetVar("Yclipbox","")
-    TK_SetVar("Wclipbox","")
-    TK_SetVar("Hclipbox","")
+    TCL_SetVar("old_Xclipbox","")
+    TCL_SetVar("old_Yclipbox","")
+    TCL_SetVar("old_Wclipbox","")
+    TCL_SetVar("old_Hclipbox","")
+    TCL_SetVar("Xclipbox","")
+    TCL_SetVar("Yclipbox","")
+    TCL_SetVar("Wclipbox","")
+    TCL_SetVar("Hclipbox","")
    else
-    TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-    TK_SetVar("Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("Hclipbox",string(h.clip_box(4)))
   end
-  TK_SetVar("curclipstate",h.clip_state);
+  TCL_SetVar("curclipstate",h.clip_state);
 
   f=h;while stripblanks(f.type)<>"Figure" then f=f.parent,end
   ax=h;while stripblanks(ax.type)<>"Axes" then ax=ax.parent,end
-  TK_SetVar("ncolors",string(size(f.color_map,1)))
-  TK_SetVar("curcolor",string(h.foreground))
-  TK_SetVar("curthick",string(h.thickness))
-  TK_SetVar("curvis",h.visible)
+  TCL_SetVar("ncolors",string(size(f.color_map,1)))
+  TCL_SetVar("curcolor",string(h.foreground))
+  TCL_SetVar("curthick",string(h.thickness))
+  TCL_SetVar("curvis",h.visible)
   ged_linestylearray=["solid" "dash" "dash dot" "longdash dot" "bigdash dot" "bigdash longdash"]; 
-  TK_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
+  TCL_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
   ged_markstylearray=["dot" "plus" "cross" "star" "filled diamond" ..
   "diamond" "triangle up" "triangle down" "diamond plus" "circle" ..
   "asterisk" "square" "triangle right" "triangle left" "pentagram"];
-  TK_SetVar("curmarkstyle",ged_markstylearray(abs(h.mark_style)+1))
-  TK_SetVar("curmarkmode",h.mark_mode)
-  TK_SetVar("curmarksize",string(h.mark_size))
-  TK_SetVar("curmarksizeunit",h.mark_size_unit);
-  TK_SetVar("curmarkforeground",string(h.mark_foreground))
-  TK_SetVar("curmarkbackground",string(h.mark_background))
+  TCL_SetVar("curmarkstyle",ged_markstylearray(abs(h.mark_style)+1))
+  TCL_SetVar("curmarkmode",h.mark_mode)
+  TCL_SetVar("curmarksize",string(h.mark_size))
+  TCL_SetVar("curmarksizeunit",h.mark_size_unit);
+  TCL_SetVar("curmarkforeground",string(h.mark_foreground))
+  TCL_SetVar("curmarkbackground",string(h.mark_background))
 
  
-  TK_SetVar("curlinemode",h.line_mode)
+  TCL_SetVar("curlinemode",h.line_mode)
   // Rectangle data
    select ax.view
     case "2d" 
     ax.view='3d'
-    TK_SetVar("Xval",string(h.data(1)))
-    TK_SetVar("Yval",string(h.data(2)))
-    TK_SetVar("Zval",string(h.data(3)))
-    TK_SetVar("Wval",string(h.data(4)))
-    TK_SetVar("Hval",string(h.data(5)))
+    TCL_SetVar("Xval",string(h.data(1)))
+    TCL_SetVar("Yval",string(h.data(2)))
+    TCL_SetVar("Zval",string(h.data(3)))
+    TCL_SetVar("Wval",string(h.data(4)))
+    TCL_SetVar("Hval",string(h.data(5)))
     ax.view='2d'
     case "3d"
-    TK_SetVar("Xval",string(h.data(1)))
-    TK_SetVar("Yval",string(h.data(2)))
-    TK_SetVar("Zval",string(h.data(3)))
-    TK_SetVar("Wval",string(h.data(4)))
-    TK_SetVar("Hval",string(h.data(5)))
+    TCL_SetVar("Xval",string(h.data(1)))
+    TCL_SetVar("Yval",string(h.data(2)))
+    TCL_SetVar("Zval",string(h.data(3)))
+    TCL_SetVar("Wval",string(h.data(4)))
+    TCL_SetVar("Hval",string(h.data(5)))
   end
-  TK_EvalFile(SCI+'/tcl/ged/Rectangle.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Rectangle.tcl')
 endfunction
 
 function ged_polyline(h)
     global ged_handle; ged_handle=h
  
   if(h.clip_box==[])
-    TK_SetVar("old_Xclipbox","")
-    TK_SetVar("old_Yclipbox","")
-    TK_SetVar("old_Wclipbox","")
-    TK_SetVar("old_Hclipbox","")
-    TK_SetVar("Xclipbox","")
-    TK_SetVar("Yclipbox","")
-    TK_SetVar("Wclipbox","")
-    TK_SetVar("Hclipbox","")
+    TCL_SetVar("old_Xclipbox","")
+    TCL_SetVar("old_Yclipbox","")
+    TCL_SetVar("old_Wclipbox","")
+    TCL_SetVar("old_Hclipbox","")
+    TCL_SetVar("Xclipbox","")
+    TCL_SetVar("Yclipbox","")
+    TCL_SetVar("Wclipbox","")
+    TCL_SetVar("Hclipbox","")
    else
-    TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-    TK_SetVar("Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("Hclipbox",string(h.clip_box(4)))
   end
-  TK_SetVar("curclipstate",h.clip_state);
+  TCL_SetVar("curclipstate",h.clip_state);
 
     f=h;while stripblanks(f.type)<>"Figure" then f=f.parent,end
-    TK_SetVar("ncolors",string(size(f.color_map,1)))
-    TK_SetVar("curcolor",string(h.foreground))
-    TK_SetVar("curthick",string(h.thickness))
-    TK_SetVar("curvis",h.visible)
+    TCL_SetVar("ncolors",string(size(f.color_map,1)))
+    TCL_SetVar("curcolor",string(h.foreground))
+    TCL_SetVar("curthick",string(h.thickness))
+    TCL_SetVar("curvis",h.visible)
 
     ged_polylinestylearray=["interpolated" "staircase" "barplot" "arrowed" "filled"];
-    TK_SetVar("curpolylinestyle",ged_polylinestylearray(max(h.polyline_style,1)))
+    TCL_SetVar("curpolylinestyle",ged_polylinestylearray(max(h.polyline_style,1)))
     ged_linestylearray=["solid" "dash" "dash dot" "longdash dot" "bigdash dot" "bigdash longdash"];
-    TK_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
+    TCL_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
     ged_markstylearray=["dot" "plus" "cross" "star" "filled diamond" ..
     "diamond" "triangle up" "triangle down" "diamond plus" "circle" ..
     "asterisk" "square" "triangle right" "triangle left" "pentagram"];
 
-    TK_SetVar("curmarkstyle",ged_markstylearray(abs(h.mark_style)+1))
-    TK_SetVar("curmarkmode",h.mark_mode)
-    TK_SetVar("curmarksize",string(h.mark_size))
-    TK_SetVar("curmarksizeunit",h.mark_size_unit);
-    TK_SetVar("curmarkforeground",string(h.mark_foreground))
-    TK_SetVar("curmarkbackground",string(h.mark_background))
+    TCL_SetVar("curmarkstyle",ged_markstylearray(abs(h.mark_style)+1))
+    TCL_SetVar("curmarkmode",h.mark_mode)
+    TCL_SetVar("curmarksize",string(h.mark_size))
+    TCL_SetVar("curmarksizeunit",h.mark_size_unit);
+    TCL_SetVar("curmarkforeground",string(h.mark_foreground))
+    TCL_SetVar("curmarkbackground",string(h.mark_background))
 
-    TK_SetVar("curlinemode",h.line_mode)
+    TCL_SetVar("curlinemode",h.line_mode)
     
     d="["+strcat(string(size(h.data)),'x')+" double array]"
-    TK_SetVar("curdata",d);
+    TCL_SetVar("curdata",d);
 
     select get(getparaxe(h),'view')
       case "2d"
-      TK_SetVar("nbcol",string(2));
+      TCL_SetVar("nbcol",string(2));
       case "3d"
-      TK_SetVar("nbcol",string(3));
+      TCL_SetVar("nbcol",string(3));
     end
-    TK_EvalFile(SCI+'/tcl/ged/Polyline.tcl')
+    TCL_EvalFile(SCI+'/tcl/ged/Polyline.tcl')
 endfunction
 
 
@@ -533,61 +533,61 @@ function ged_plot3d(h)
 
 //  if((h.clip_state<>'clipgrf') & (h.clip_state<>'on'))
 //   h.clip_state='clipgrf';
-//   TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-//   TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-//   TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-//   TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-//   TK_SetVar("Xclipbox",string(h.clip_box(1)))
-//   TK_SetVar("Yclipbox",string(h.clip_box(2)))
-//   TK_SetVar("Wclipbox",string(h.clip_box(3)))
-//   TK_SetVar("Hclipbox",string(h.clip_box(4)))
+//   TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+//   TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+//   TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+//   TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+//   TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+//   TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+//   TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+//   TCL_SetVar("Hclipbox",string(h.clip_box(4)))
 //   h.clip_state='off';
 //  else
-//   TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-//   TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-//   TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-//   TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-//   TK_SetVar("Xclipbox",string(h.clip_box(1)))
-//   TK_SetVar("Yclipbox",string(h.clip_box(2)))
-//   TK_SetVar("Wclipbox",string(h.clip_box(3)))
-//   TK_SetVar("Hclipbox",string(h.clip_box(4)))
+//   TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+//   TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+//   TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+//   TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+//   TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+//   TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+//   TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+//   TCL_SetVar("Hclipbox",string(h.clip_box(4)))
 //  end
-//  TK_SetVar("curclipstate",h.clip_state);
+//  TCL_SetVar("curclipstate",h.clip_state);
 
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("curcolormode",string(h.color_mode))
-  TK_SetVar("colorflagToggle",string(h.color_flag))
-  TK_SetVar("curforeground",string(h.foreground))
-  TK_SetVar("curhiddencolor",string(h.hiddencolor))
-  TK_SetVar("curthick",string(h.thickness))
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("curcolormode",string(h.color_mode))
+  TCL_SetVar("colorflagToggle",string(h.color_flag))
+  TCL_SetVar("curforeground",string(h.foreground))
+  TCL_SetVar("curhiddencolor",string(h.hiddencolor))
+  TCL_SetVar("curthick",string(h.thickness))
 
   ged_markstylearray=["dot" "plus" "cross" "star" "filled diamond" ..
   "diamond" "triangle up" "triangle down" "diamond plus" "circle" ..
   "asterisk" "square" "triangle right" "triangle left" "pentagram"];
 
-  TK_SetVar("curmarkstyle",ged_markstylearray(abs(h.mark_style)+1))
-  TK_SetVar("curmarkmode",h.mark_mode)
-  TK_SetVar("curmarksize",string(h.mark_size))
-  TK_SetVar("curmarksizeunit",h.mark_size_unit);
-  TK_SetVar("curmarkforeground",string(h.mark_foreground))
-  TK_SetVar("curmarkbackground",string(h.mark_background))
-  TK_SetVar("curlinemode",h.surface_mode)
+  TCL_SetVar("curmarkstyle",ged_markstylearray(abs(h.mark_style)+1))
+  TCL_SetVar("curmarkmode",h.mark_mode)
+  TCL_SetVar("curmarksize",string(h.mark_size))
+  TCL_SetVar("curmarksizeunit",h.mark_size_unit);
+  TCL_SetVar("curmarkforeground",string(h.mark_foreground))
+  TCL_SetVar("curmarkbackground",string(h.mark_background))
+  TCL_SetVar("curlinemode",h.surface_mode)
 
 
   d="["+strcat(string(size(h.data.x)),'x')+" double array]"
-  TK_SetVar("curdata_x",d);
+  TCL_SetVar("curdata_x",d);
   d="["+strcat(string(size(h.data.y)),'x')+" double array]"
-  TK_SetVar("curdata_y",d);
+  TCL_SetVar("curdata_y",d);
   d="["+strcat(string(size(h.data.z)),'x')+" double array]"
-  TK_SetVar("curdata_z",d);
+  TCL_SetVar("curdata_z",d);
 
-  TK_EvalStr('set flagCOLOR 0')
+  TCL_EvalStr('set flagCOLOR 0')
   if(h.data(1)==["3d" "x" "y" "z" "color"])
-  TK_EvalStr('set flagCOLOR 1')
+  TCL_EvalStr('set flagCOLOR 1')
     d="["+strcat(string(size(h.data.color)),'x')+" integer array]"
-    TK_SetVar("curdata_color",d);
+    TCL_SetVar("curdata_color",d);
   end
-  TK_EvalFile(SCI+'/tcl/ged/Plot3d.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Plot3d.tcl')
 endfunction
 
 
@@ -596,121 +596,121 @@ function ged_fac3d(h)
 
 //  if((h.clip_state<>'clipgrf') & (h.clip_state<>'on'))
 //   h.clip_state='clipgrf';
-//   TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-//   TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-//   TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-//   TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-//   TK_SetVar("Xclipbox",string(h.clip_box(1)))
-//   TK_SetVar("Yclipbox",string(h.clip_box(2)))
-//   TK_SetVar("Wclipbox",string(h.clip_box(3)))
-//   TK_SetVar("Hclipbox",string(h.clip_box(4)))
+//   TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+//   TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+//   TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+//   TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+//   TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+//   TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+//   TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+//   TCL_SetVar("Hclipbox",string(h.clip_box(4)))
 //   h.clip_state='off';
 //  else
-//   TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-//   TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-//   TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-//   TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-//   TK_SetVar("Xclipbox",string(h.clip_box(1)))
-//   TK_SetVar("Yclipbox",string(h.clip_box(2)))
-//   TK_SetVar("Wclipbox",string(h.clip_box(3)))
-//   TK_SetVar("Hclipbox",string(h.clip_box(4)))
+//   TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+//   TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+//   TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+//   TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+//   TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+//   TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+//   TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+//   TCL_SetVar("Hclipbox",string(h.clip_box(4)))
 //  end
-//  TK_SetVar("curclipstate",h.clip_state);
+//  TCL_SetVar("curclipstate",h.clip_state);
 
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("curcolormode",string(h.color_mode))
-  TK_SetVar("colorflagToggle",string(h.color_flag))
-  TK_SetVar("curforeground",string(h.foreground))
-  TK_SetVar("curhiddencolor",string(h.hiddencolor))
-  TK_SetVar("curthick",string(h.thickness))
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("curcolormode",string(h.color_mode))
+  TCL_SetVar("colorflagToggle",string(h.color_flag))
+  TCL_SetVar("curforeground",string(h.foreground))
+  TCL_SetVar("curhiddencolor",string(h.hiddencolor))
+  TCL_SetVar("curthick",string(h.thickness))
 
   ged_markstylearray=["dot" "plus" "cross" "star" "filled diamond" ..
   "diamond" "triangle up" "triangle down" "diamond plus" "circle" ..
   "asterisk" "square" "triangle right" "triangle left" "pentagram"];
 
-  TK_SetVar("curmarkstyle",ged_markstylearray(abs(h.mark_style)+1))
-  TK_SetVar("curmarkmode",h.mark_mode)
-  TK_SetVar("curmarksize",string(h.mark_size))
-  TK_SetVar("curmarksizeunit",h.mark_size_unit);
-  TK_SetVar("curmarkforeground",string(h.mark_foreground))
-  TK_SetVar("curmarkbackground",string(h.mark_background))
-  TK_SetVar("curlinemode",h.surface_mode)
+  TCL_SetVar("curmarkstyle",ged_markstylearray(abs(h.mark_style)+1))
+  TCL_SetVar("curmarkmode",h.mark_mode)
+  TCL_SetVar("curmarksize",string(h.mark_size))
+  TCL_SetVar("curmarksizeunit",h.mark_size_unit);
+  TCL_SetVar("curmarkforeground",string(h.mark_foreground))
+  TCL_SetVar("curmarkbackground",string(h.mark_background))
+  TCL_SetVar("curlinemode",h.surface_mode)
 
 
   d="["+strcat(string(size(h.data.x)),'x')+" double array]"
-  TK_SetVar("curdata_x",d);
+  TCL_SetVar("curdata_x",d);
   d="["+strcat(string(size(h.data.y)),'x')+" double array]"
-  TK_SetVar("curdata_y",d);
+  TCL_SetVar("curdata_y",d);
    d="["+strcat(string(size(h.data.z)),'x')+" double array]"
-  TK_SetVar("curdata_z",d);
+  TCL_SetVar("curdata_z",d);
 
-  TK_EvalStr('set flagCOLOR 0')
+  TCL_EvalStr('set flagCOLOR 0')
   if(h.data(1)==["3d" "x" "y" "z" "color"])
-  TK_EvalStr('set flagCOLOR 1')
+  TCL_EvalStr('set flagCOLOR 1')
     d="["+strcat(string(size(h.data.color)),'x')+" integer array]"
-    TK_SetVar("curdata_color",d);
+    TCL_SetVar("curdata_color",d);
   end
 
 
-  TK_EvalFile(SCI+'/tcl/ged/Fac3d.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Fac3d.tcl')
 endfunction
 
 
 function ged_text(h)
   global ged_handle; ged_handle=h
   f=h;while stripblanks(f.type)<>"Figure" then f=f.parent,end
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("ncolors",string(size(f.color_map,1)))
-  TK_SetVar("curforeground",string(h.foreground))
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("ncolors",string(size(f.color_map,1)))
+  TCL_SetVar("curforeground",string(h.foreground))
   ged_fontarray = ["Courier" "Symbol" "Times" "Times Italic"...
         "Times Bold" "Times Bold Italic"  "Helvetica"  "Helvetica  Italic"...
         "Helvetica Bold" "Helvetica Bold Italic"];
-  TK_SetVar("curfontstyle",ged_fontarray(h.font_style+1))
-  TK_SetVar("curfontsize",string(h.font_size))
-  TK_SetVar("curfontangle",string(h.font_angle))
-//TK_SetVar("curtextbox1",string(h.textbox(1)))
-//TK_SetVar("curtextbox2",string(h.textbox(2)))
-  TK_SetVar("curtextboxmode",h.text_box_mode)
-  TK_SetVar("curtext",h.text)
+  TCL_SetVar("curfontstyle",ged_fontarray(h.font_style+1))
+  TCL_SetVar("curfontsize",string(h.font_size))
+  TCL_SetVar("curfontangle",string(h.font_angle))
+//TCL_SetVar("curtextbox1",string(h.textbox(1)))
+//TCL_SetVar("curtextbox2",string(h.textbox(2)))
+  TCL_SetVar("curtextboxmode",h.text_box_mode)
+  TCL_SetVar("curtext",h.text)
 
   if(h.clip_box==[])
-    TK_SetVar("old_Xclipbox","")
-    TK_SetVar("old_Yclipbox","")
-    TK_SetVar("old_Wclipbox","")
-    TK_SetVar("old_Hclipbox","")
-    TK_SetVar("Xclipbox","")
-    TK_SetVar("Yclipbox","")
-    TK_SetVar("Wclipbox","")
-    TK_SetVar("Hclipbox","")
+    TCL_SetVar("old_Xclipbox","")
+    TCL_SetVar("old_Yclipbox","")
+    TCL_SetVar("old_Wclipbox","")
+    TCL_SetVar("old_Hclipbox","")
+    TCL_SetVar("Xclipbox","")
+    TCL_SetVar("Yclipbox","")
+    TCL_SetVar("Wclipbox","")
+    TCL_SetVar("Hclipbox","")
    else
-    TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-    TK_SetVar("Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("Hclipbox",string(h.clip_box(4)))
   end
-  TK_SetVar("curclipstate",h.clip_state);
+  TCL_SetVar("curclipstate",h.clip_state);
 
-  TK_EvalFile(SCI+'/tcl/ged/Text.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Text.tcl')
 endfunction
 
 
 function ged_legend(h)
   global ged_handle; ged_handle=h
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("ncolors",string(size(f.color_map,1)))
-  TK_SetVar("curforeground",string(h.foreground))
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("ncolors",string(size(f.color_map,1)))
+  TCL_SetVar("curforeground",string(h.foreground))
   ged_fontarray = ["Courier" "Symbol" "Times" "Times Italic"...
         "Times Bold" "Times Bold Italic"  "Helvetica"  "Helvetica  Italic"...
         "Helvetica Bold" "Helvetica Bold Italic"];
-  TK_SetVar("curfontstyle",ged_fontarray(h.font_style+1))
-  TK_SetVar("curfontsize",string(h.font_size))
-  TK_SetVar("curtext",h.text)
+  TCL_SetVar("curfontstyle",ged_fontarray(h.font_style+1))
+  TCL_SetVar("curfontsize",string(h.font_size))
+  TCL_SetVar("curtext",h.text)
 
-  TK_EvalFile(SCI+'/tcl/ged/Legend.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Legend.tcl')
 endfunction
 
 
@@ -718,266 +718,266 @@ function ged_arc(h)
   global ged_handle; ged_handle=h
 
   if(h.clip_box==[])
-    TK_SetVar("old_Xclipbox","")
-    TK_SetVar("old_Yclipbox","")
-    TK_SetVar("old_Wclipbox","")
-    TK_SetVar("old_Hclipbox","")
-    TK_SetVar("Xclipbox","")
-    TK_SetVar("Yclipbox","")
-    TK_SetVar("Wclipbox","")
-    TK_SetVar("Hclipbox","")
+    TCL_SetVar("old_Xclipbox","")
+    TCL_SetVar("old_Yclipbox","")
+    TCL_SetVar("old_Wclipbox","")
+    TCL_SetVar("old_Hclipbox","")
+    TCL_SetVar("Xclipbox","")
+    TCL_SetVar("Yclipbox","")
+    TCL_SetVar("Wclipbox","")
+    TCL_SetVar("Hclipbox","")
    else
-    TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-    TK_SetVar("Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("Hclipbox",string(h.clip_box(4)))
   end
-  TK_SetVar("curclipstate",h.clip_state);
+  TCL_SetVar("curclipstate",h.clip_state);
   ged_linestylearray=["solid" "dash" "dash dot" "longdash dot" "bigdash dot" "bigdash longdash"];
-  TK_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
-  TK_SetVar("nbcol",string(size(h.data,2)))
+  TCL_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
+  TCL_SetVar("nbcol",string(size(h.data,2)))
   for i=1:size(h.data,2)
     val= "arcVAL("+string(i)+")";
-      TK_EvalStr('set '+val+" "+string(h.data(2)));
+      TCL_EvalStr('set '+val+" "+string(h.data(2)));
   end
   f=h;while stripblanks(f.type)<>"Figure" then f=f.parent,end
-  TK_SetVar("ncolors",string(size(f.color_map,1)))
-  TK_SetVar("curcolor",string(h.foreground))
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("curfillmode",h.fill_mode)
-  TK_SetVar("curthick",string(h.thickness))
+  TCL_SetVar("ncolors",string(size(f.color_map,1)))
+  TCL_SetVar("curcolor",string(h.foreground))
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("curfillmode",h.fill_mode)
+  TCL_SetVar("curthick",string(h.thickness))
 
   ax=getparaxe(h);
   // Arc data
    select ax.view
     case "2d" 
     ax.view='3d'  //strange behavior in 3D... seems to be bugged!!
-    TK_SetVar("Xval",string(h.data(1)))
-    TK_SetVar("Yval",string(h.data(2)))
-    TK_SetVar("Zval",string(h.data(3)))
-    TK_SetVar("Wval",string(h.data(4)))
-    TK_SetVar("Hval",string(h.data(5)))
-    TK_SetVar("A1val",string(h.data(6)))
-    TK_SetVar("A2val",string(h.data(7)))
+    TCL_SetVar("Xval",string(h.data(1)))
+    TCL_SetVar("Yval",string(h.data(2)))
+    TCL_SetVar("Zval",string(h.data(3)))
+    TCL_SetVar("Wval",string(h.data(4)))
+    TCL_SetVar("Hval",string(h.data(5)))
+    TCL_SetVar("A1val",string(h.data(6)))
+    TCL_SetVar("A2val",string(h.data(7)))
      ax.view='2d'
     case "3d"
-    TK_SetVar("Xval",string(h.data(1)))
-    TK_SetVar("Yval",string(h.data(2)))
-    TK_SetVar("Zval",string(h.data(3)))
-    TK_SetVar("Wval",string(h.data(4)))
-    TK_SetVar("Hval",string(h.data(5)))
-    TK_SetVar("A1val",string(h.data(6)))
-    TK_SetVar("A2val",string(h.data(7)))
+    TCL_SetVar("Xval",string(h.data(1)))
+    TCL_SetVar("Yval",string(h.data(2)))
+    TCL_SetVar("Zval",string(h.data(3)))
+    TCL_SetVar("Wval",string(h.data(4)))
+    TCL_SetVar("Hval",string(h.data(5)))
+    TCL_SetVar("A1val",string(h.data(6)))
+    TCL_SetVar("A2val",string(h.data(7)))
   end
-  TK_EvalFile(SCI+'/tcl/ged/Arc.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Arc.tcl')
 endfunction
 
 
 function ged_segs(h)
   global ged_handle; ged_handle=h
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("ncolors",string(size(f.color_map,1)))
-  TK_SetVar("curarrowsize",string(h.arrow_size))
-  TK_SetVar("curthick",string(h.thickness))
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("ncolors",string(size(f.color_map,1)))
+  TCL_SetVar("curarrowsize",string(h.arrow_size))
+  TCL_SetVar("curthick",string(h.thickness))
   ged_linestylearray=["solid" "dash" "dash dot" "longdash dot" "bigdash dot" "bigdash longdash"]; 
-  TK_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
+  TCL_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
 
   ged_markstylearray=["dot" "plus" "cross" "star" "filled diamond" ..
   "diamond" "triangle up" "triangle down" "diamond plus" "circle" ..
   "asterisk" "square" "triangle right" "triangle left" "pentagram"];
 
-  TK_SetVar("curmarkstyle",ged_markstylearray(abs(h.mark_style)+1))
-  TK_SetVar("curmarkmode",h.mark_mode)
-  TK_SetVar("curmarksize",string(h.mark_size))
-  TK_SetVar("curmarksizeunit",h.mark_size_unit);
-  TK_SetVar("curmarkforeground",string(h.mark_foreground))
-  TK_SetVar("curmarkbackground",string(h.mark_background))
-  TK_SetVar("curlinemode",h.line_mode)
+  TCL_SetVar("curmarkstyle",ged_markstylearray(abs(h.mark_style)+1))
+  TCL_SetVar("curmarkmode",h.mark_mode)
+  TCL_SetVar("curmarksize",string(h.mark_size))
+  TCL_SetVar("curmarksizeunit",h.mark_size_unit);
+  TCL_SetVar("curmarkforeground",string(h.mark_foreground))
+  TCL_SetVar("curmarkbackground",string(h.mark_background))
+  TCL_SetVar("curlinemode",h.line_mode)
     
-  TK_SetVar("nbrow",string(size(h.data,1)))
+  TCL_SetVar("nbrow",string(size(h.data,1)))
   
    d="["+strcat(string(size(h.data)),'x')+" double array]"
-  TK_SetVar("curdata",d);
+  TCL_SetVar("curdata",d);
   
-  TK_SetVar("nbcolsegscolor",string(size(h.segs_color,2)))
+  TCL_SetVar("nbcolsegscolor",string(size(h.segs_color,2)))
   for i=1:size(h.segs_color,2)
     val= "segscolorVAL("+string(i)+")";
-    TK_EvalStr('set '+val+" "+string(h.segs_color(i)));
+    TCL_EvalStr('set '+val+" "+string(h.segs_color(i)));
   end
 
   if(h.clip_box==[])
-    TK_SetVar("old_Xclipbox","")
-    TK_SetVar("old_Yclipbox","")
-    TK_SetVar("old_Wclipbox","")
-    TK_SetVar("old_Hclipbox","")
-    TK_SetVar("Xclipbox","")
-    TK_SetVar("Yclipbox","")
-    TK_SetVar("Wclipbox","")
-    TK_SetVar("Hclipbox","")
+    TCL_SetVar("old_Xclipbox","")
+    TCL_SetVar("old_Yclipbox","")
+    TCL_SetVar("old_Wclipbox","")
+    TCL_SetVar("old_Hclipbox","")
+    TCL_SetVar("Xclipbox","")
+    TCL_SetVar("Yclipbox","")
+    TCL_SetVar("Wclipbox","")
+    TCL_SetVar("Hclipbox","")
    else
-    TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-    TK_SetVar("Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("Hclipbox",string(h.clip_box(4)))
   end
-  TK_SetVar("curclipstate",h.clip_state);
+  TCL_SetVar("curclipstate",h.clip_state);
 
-  TK_EvalFile(SCI+'/tcl/ged/Segs.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Segs.tcl')
 endfunction
 
 
 function ged_champ(h)
   global ged_handle; ged_handle=h
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("curcolored",h.colored)
-  TK_SetVar("ncolors",string(size(f.color_map,1)))
-  TK_SetVar("curarrowsize",string(h.arrow_size))
-  TK_SetVar("curthick",string(h.thickness))
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("curcolored",h.colored)
+  TCL_SetVar("ncolors",string(size(f.color_map,1)))
+  TCL_SetVar("curarrowsize",string(h.arrow_size))
+  TCL_SetVar("curthick",string(h.thickness))
   ged_linestylearray=["solid" "dash" "dash dot" "longdash dot" "bigdash dot" "bigdash longdash"]; 
-  TK_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
+  TCL_SetVar("curlinestyle",ged_linestylearray(max(h.line_style,1)))
 
   d="["+strcat(string(size(h.data)),'x')+" double array]"
-  TK_SetVar("curdata",d);
+  TCL_SetVar("curdata",d);
 
   if(h.clip_box==[])
-    TK_SetVar("old_Xclipbox","")
-    TK_SetVar("old_Yclipbox","")
-    TK_SetVar("old_Wclipbox","")
-    TK_SetVar("old_Hclipbox","")
-    TK_SetVar("Xclipbox","")
-    TK_SetVar("Yclipbox","")
-    TK_SetVar("Wclipbox","")
-    TK_SetVar("Hclipbox","")
+    TCL_SetVar("old_Xclipbox","")
+    TCL_SetVar("old_Yclipbox","")
+    TCL_SetVar("old_Wclipbox","")
+    TCL_SetVar("old_Hclipbox","")
+    TCL_SetVar("Xclipbox","")
+    TCL_SetVar("Yclipbox","")
+    TCL_SetVar("Wclipbox","")
+    TCL_SetVar("Hclipbox","")
    else
-    TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-    TK_SetVar("Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("Hclipbox",string(h.clip_box(4)))
   end
-  TK_SetVar("curclipstate",h.clip_state);
+  TCL_SetVar("curclipstate",h.clip_state);
 
-  TK_EvalFile(SCI+'/tcl/ged/Champ.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Champ.tcl')
 endfunction
 
 function ged_fec(h)
   global ged_handle; ged_handle=h
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("zbmin",string(h.z_bounds(1)))
-  TK_SetVar("zbmax",string(h.z_bounds(2)))
-//  TK_SetVar("nbrow",string(size(h.data,1)))
-//  TK_SetVar("nbcol",string(size(h.data,2)))
-//  TK_SetVar("nbrowTri",string(size(h.triangles,1)))
-//  TK_SetVar("nbcolTri",string(size(h.triangles,2)))
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("zbmin",string(h.z_bounds(1)))
+  TCL_SetVar("zbmax",string(h.z_bounds(2)))
+//  TCL_SetVar("nbrow",string(size(h.data,1)))
+//  TCL_SetVar("nbcol",string(size(h.data,2)))
+//  TCL_SetVar("nbrowTri",string(size(h.triangles,1)))
+//  TCL_SetVar("nbcolTri",string(size(h.triangles,2)))
 
   d="["+strcat(string(size(h.data)),'x')+" double array]"
-  TK_SetVar("curdata_data",d);
+  TCL_SetVar("curdata_data",d);
   d="["+strcat(string(size(h.triangles)),'x')+" double array]"
-  TK_SetVar("curdata_triangles",d);
+  TCL_SetVar("curdata_triangles",d);
 
 //  if(h.clip_box==[])
-//    TK_SetVar("old_Xclipbox","")
-//    TK_SetVar("old_Yclipbox","")
-//    TK_SetVar("old_Wclipbox","")
-//    TK_SetVar("old_Hclipbox","")
-//    TK_SetVar("Xclipbox","")
-//    TK_SetVar("Yclipbox","")
-//    TK_SetVar("Wclipbox","")
-//    TK_SetVar("Hclipbox","")
+//    TCL_SetVar("old_Xclipbox","")
+//    TCL_SetVar("old_Yclipbox","")
+//    TCL_SetVar("old_Wclipbox","")
+//    TCL_SetVar("old_Hclipbox","")
+//    TCL_SetVar("Xclipbox","")
+//    TCL_SetVar("Yclipbox","")
+//    TCL_SetVar("Wclipbox","")
+//    TCL_SetVar("Hclipbox","")
 //   else
-//    TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-//    TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-//    TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-//    TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-//    TK_SetVar("Xclipbox",string(h.clip_box(1)))
-//    TK_SetVar("Yclipbox",string(h.clip_box(2)))
-//    TK_SetVar("Wclipbox",string(h.clip_box(3)))
-//    TK_SetVar("Hclipbox",string(h.clip_box(4)))
+//    TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+//    TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+//    TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+//    TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+//    TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+//    TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+//    TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+//    TCL_SetVar("Hclipbox",string(h.clip_box(4)))
 //  end
-//  TK_SetVar("curclipstate",h.clip_state);
+//  TCL_SetVar("curclipstate",h.clip_state);
 
-  TK_EvalFile(SCI+'/tcl/ged/Fec.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Fec.tcl')
 endfunction
 
 
 function ged_grayplot(h)
   global ged_handle; ged_handle=h
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("curdatamapping",h.data_mapping)
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("curdatamapping",h.data_mapping)
 
   d="["+strcat(string(size(h.data(2:$,1))),'x')+" double array]"
-  TK_SetVar("curdata_x",d);
+  TCL_SetVar("curdata_x",d);
   d="["+strcat(string(size(h.data(1,2:$))),'x')+" double array]"
-  TK_SetVar("curdata_y",d);
+  TCL_SetVar("curdata_y",d);
   d="["+strcat(string(size(h.data(2:$,2:$))),'x')+" double array]"
-  TK_SetVar("curdata_z",d);
+  TCL_SetVar("curdata_z",d);
 
-  TK_EvalFile(SCI+'/tcl/ged/Grayplot.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Grayplot.tcl')
 
 endfunction
 
 function ged_matplot(h)
   global ged_handle; ged_handle=h
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("curdatamapping",h.data_mapping)
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("curdatamapping",h.data_mapping)
 
   d="["+strcat(string(size(h.data)),'x')+" double array]"
-  TK_SetVar("curdata",d);
+  TCL_SetVar("curdata",d);
 
-  TK_EvalFile(SCI+'/tcl/ged/Matplot.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Matplot.tcl')
 
 endfunction
 
 
 function ged_axis(h)
   global ged_handle; ged_handle=h
-  TK_SetVar("curvis",h.visible)
-  TK_SetVar("curseg",h.tics_segment)
-  TK_SetVar("curcolor",string(h.tics_color))
-  TK_SetVar("curticsstyle",h.tics_style)
-  TK_SetVar("curfontcolor",string(h.labels_font_color))
-  TK_SetVar("curfontsize",string(h.labels_font_size))
-  TK_SetVar("nbcolX",string(size(h.xtics_coord,2)))
-  TK_SetVar("nbcolY",string(size(h.ytics_coord,2)))
-  TK_SetVar("xticscoord",sci2exp(h.xtics_coord,0))
-  TK_SetVar("yticscoord",sci2exp(h.ytics_coord,0))
-  TK_SetVar("cursubtics",string(h.sub_tics))
-  TK_SetVar("curticslabel",sci2exp(h.tics_labels,0))
-  TK_SetVar("curticsdir",string(h.tics_direction))
+  TCL_SetVar("curvis",h.visible)
+  TCL_SetVar("curseg",h.tics_segment)
+  TCL_SetVar("curcolor",string(h.tics_color))
+  TCL_SetVar("curticsstyle",h.tics_style)
+  TCL_SetVar("curfontcolor",string(h.labels_font_color))
+  TCL_SetVar("curfontsize",string(h.labels_font_size))
+  TCL_SetVar("nbcolX",string(size(h.xtics_coord,2)))
+  TCL_SetVar("nbcolY",string(size(h.ytics_coord,2)))
+  TCL_SetVar("xticscoord",sci2exp(h.xtics_coord,0))
+  TCL_SetVar("yticscoord",sci2exp(h.ytics_coord,0))
+  TCL_SetVar("cursubtics",string(h.sub_tics))
+  TCL_SetVar("curticslabel",sci2exp(h.tics_labels,0))
+  TCL_SetVar("curticsdir",string(h.tics_direction))
 
   if(h.clip_box==[])
-    TK_SetVar("old_Xclipbox","")
-    TK_SetVar("old_Yclipbox","")
-    TK_SetVar("old_Wclipbox","")
-    TK_SetVar("old_Hclipbox","")
-    TK_SetVar("Xclipbox","")
-    TK_SetVar("Yclipbox","")
-    TK_SetVar("Wclipbox","")
-    TK_SetVar("Hclipbox","")
+    TCL_SetVar("old_Xclipbox","")
+    TCL_SetVar("old_Yclipbox","")
+    TCL_SetVar("old_Wclipbox","")
+    TCL_SetVar("old_Hclipbox","")
+    TCL_SetVar("Xclipbox","")
+    TCL_SetVar("Yclipbox","")
+    TCL_SetVar("Wclipbox","")
+    TCL_SetVar("Hclipbox","")
    else
-    TK_SetVar("old_Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("old_Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("old_Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("old_Hclipbox",string(h.clip_box(4)))
-    TK_SetVar("Xclipbox",string(h.clip_box(1)))
-    TK_SetVar("Yclipbox",string(h.clip_box(2)))
-    TK_SetVar("Wclipbox",string(h.clip_box(3)))
-    TK_SetVar("Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("old_Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("old_Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("old_Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("old_Hclipbox",string(h.clip_box(4)))
+    TCL_SetVar("Xclipbox",string(h.clip_box(1)))
+    TCL_SetVar("Yclipbox",string(h.clip_box(2)))
+    TCL_SetVar("Wclipbox",string(h.clip_box(3)))
+    TCL_SetVar("Hclipbox",string(h.clip_box(4)))
   end
-  TK_SetVar("curclipstate",h.clip_state);
+  TCL_SetVar("curclipstate",h.clip_state);
 
-  TK_EvalFile(SCI+'/tcl/ged/Axis.tcl')
+  TCL_EvalFile(SCI+'/tcl/ged/Axis.tcl')
 endfunction
 
 
@@ -1163,17 +1163,17 @@ function tkged()
 
   // hierarchical viewer
   TK_send_handles_list(gcf())
-  TK_SetVar("curgedindex",string(Get_handle_pos_in_list(h)))
+  TCL_SetVar("curgedindex",string(Get_handle_pos_in_list(h)))
 
   //color_map array for color sample display
   f=getparfig(h);
   for i=1:size(f.color_map,1)
     redname= "RED("+string(i)+")";
-    TK_EvalStr('set '+redname+" "+string(f.color_map(i,1)));
+    TCL_EvalStr('set '+redname+" "+string(f.color_map(i,1)));
     grename= "GREEN("+string(i)+")";
-    TK_EvalStr('set '+grename+" "+string(f.color_map(i,2)));
+    TCL_EvalStr('set '+grename+" "+string(f.color_map(i,2)));
     bluname= "BLUE("+string(i)+")";
-    TK_EvalStr('set '+bluname+" "+string(f.color_map(i,3)));
+    TCL_EvalStr('set '+bluname+" "+string(f.color_map(i,3)));
   end
 
   select h.type
@@ -1630,13 +1630,13 @@ function outvar=GEDeditvar_get(winId)
 //disp("Please wait...");
 outvar=[];
 base="sciGUITable(win,"+string(winId)+",data";
-varType=evstr(TK_GetVar(base+',type)'));
-varni=evstr(TK_GetVar(base+',ni)'));
-varnj=evstr(TK_GetVar(base+',nj)'));
+varType=evstr(TCL_GetVar(base+',type)'));
+varni=evstr(TCL_GetVar(base+',ni)'));
+varnj=evstr(TCL_GetVar(base+',nj)'));
 for j=1:varnj,
        ww=[];
        for i=1:varni,
-               q=TK_GetVar(base+','+string(i)+','+string(j)+')');
+               q=TCL_GetVar(base+','+string(i)+','+string(j)+')');
                if (varType~=10) then
                        if (varType==4) then
                                if ((q=="T")|(q=="t")) then
@@ -1685,18 +1685,18 @@ function [WINID] = GEDeditvar(varargin)
   %_loc_nj=size(%_loc_var,2);
   %_loc_type=string(%_loc_type);
 
-  TK_EvalStr("set EdVarLoc [GEDsciGUIEditVar -1]");
+  TCL_EvalStr("set EdVarLoc [GEDsciGUIEditVar -1]");
 
-  %_winId=TK_GetVar("EdVarLoc");
+  %_winId=TCL_GetVar("EdVarLoc");
 
-  TK_SetVar("sciGUITable(win,"+%_winId+",data,name)",%_loc_nam);
-  TK_SetVar("sciGUITable(win,"+%_winId+",data,type)",string(%_loc_type));
-  TK_SetVar("sciGUITable(win,"+%_winId+",data,ni)",string(%_loc_ni));
-  TK_SetVar("sciGUITable(win,"+%_winId+",data,nj)",string(%_loc_nj));
+  TCL_SetVar("sciGUITable(win,"+%_winId+",data,name)",%_loc_nam);
+  TCL_SetVar("sciGUITable(win,"+%_winId+",data,type)",string(%_loc_type));
+  TCL_SetVar("sciGUITable(win,"+%_winId+",data,ni)",string(%_loc_ni));
+  TCL_SetVar("sciGUITable(win,"+%_winId+",data,nj)",string(%_loc_nj));
 
   //
   // This is a slow manner to move the data ...
-  // Anyone have a faster method than TK_SetVar
+  // Anyone have a faster method than TCL_SetVar
   // I would like set some tcl variable like varname(pos_i,pos_j)
   //
   Nb_data=(%_loc_nj)*(%_loc_ni)
@@ -1711,7 +1711,7 @@ function [WINID] = GEDeditvar(varargin)
     for %_i=1:%_loc_ni,
       %_value=string(%_loc_var(%_i,%_j));
       %_varname="sciGUITable(win,"+%_winId+",data,"+string(%_i)+","+string(%_j)+")";
-      TK_SetVar(%_varname,%_value);
+      TCL_SetVar(%_varname,%_value);
     end
 
   //tmp = ((%_j)*(%_loc_ni)) / Nb_data;
@@ -1733,7 +1733,7 @@ function [WINID] = GEDeditvar(varargin)
  // disp("AVANT DrawGrid");
 
  
-  TK_EvalStr("GEDsciGUIEditVarDrawGrid "+%_winId)
+  TCL_EvalStr("GEDsciGUIEditVarDrawGrid "+%_winId)
  
   WINID = %_winId;
 
@@ -1775,64 +1775,64 @@ endfunction
 function LoadTicks2TCL(h)
   global ged_handle;ged_handle=h;
 
-  TK_SetVar("Xaxes_visibleToggle",h.axes_visible(1))
-  TK_SetVar("Yaxes_visibleToggle",h.axes_visible(2))
-  TK_SetVar("Zaxes_visibleToggle",h.axes_visible(3))
+  TCL_SetVar("Xaxes_visibleToggle",h.axes_visible(1))
+  TCL_SetVar("Yaxes_visibleToggle",h.axes_visible(2))
+  TCL_SetVar("Zaxes_visibleToggle",h.axes_visible(3))
 
-  TK_SetVar("SubticksEntryX",string(h.sub_ticks(1)))
-  TK_GetVar("SubticksEntryX")
+  TCL_SetVar("SubticksEntryX",string(h.sub_ticks(1)))
+  TCL_GetVar("SubticksEntryX")
  
  // disp("h.sub_ticks(1) =")
  // disp(h.sub_ticks(1));
 
-  TK_SetVar("SubticksEntryY",string(h.sub_ticks(2)))
+  TCL_SetVar("SubticksEntryY",string(h.sub_ticks(2)))
 
   select h.view
    case "2d" 
     drawlater();
     h.view='3d'
-    TK_SetVar("SubticksEntryZ",string(h.sub_ticks(3)))
+    TCL_SetVar("SubticksEntryZ",string(h.sub_ticks(3)))
     h.view='2d'
     drawnow();
    case "3d"
-     TK_SetVar("SubticksEntryZ",string(h.sub_ticks(3)))
+     TCL_SetVar("SubticksEntryZ",string(h.sub_ticks(3)))
    end
 
-  TK_SetVar("XautoticksToggle",h.auto_ticks(1))
-  TK_SetVar("YautoticksToggle",h.auto_ticks(2))
-  TK_SetVar("ZautoticksToggle",h.auto_ticks(3))
+  TCL_SetVar("XautoticksToggle",h.auto_ticks(1))
+  TCL_SetVar("YautoticksToggle",h.auto_ticks(2))
+  TCL_SetVar("ZautoticksToggle",h.auto_ticks(3))
 
   //ticks value: X axis
   ticks = h.x_ticks;
   sizeticks = size(ticks.locations,1);
-  TK_SetVar("nbticks_x",string(sizeticks));
+  TCL_SetVar("nbticks_x",string(sizeticks));
   for i=1:sizeticks
     val= "LOCATIONS_X("+string(i)+")";
-      TK_EvalStr('set '+val+" "+string(ticks.locations(i)));
+      TCL_EvalStr('set '+val+" "+string(ticks.locations(i)));
     val= "LABELS_X("+string(i)+")";
-      TK_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
+      TCL_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
   end
 
   //ticks value: Y axis
   ticks = h.y_ticks;
   sizeticks = size(ticks.locations,1);
-  TK_SetVar("nbticks_y",string(sizeticks));
+  TCL_SetVar("nbticks_y",string(sizeticks));
   for i=1:sizeticks
     val= "LOCATIONS_Y("+string(i)+")";
-      TK_EvalStr('set '+val+" "+string(ticks.locations(i)));
+      TCL_EvalStr('set '+val+" "+string(ticks.locations(i)));
     val= "LABELS_Y("+string(i)+")";
-      TK_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
+      TCL_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
   end
 
  //ticks value: Z axis
   ticks = h.z_ticks;
   sizeticks = size(ticks.locations,1);
-  TK_SetVar("nbticks_z",string(sizeticks));
+  TCL_SetVar("nbticks_z",string(sizeticks));
   for i=1:sizeticks
     val= "LOCATIONS_Z("+string(i)+")";
-      TK_EvalStr('set '+val+" "+string(ticks.locations(i)));
+      TCL_EvalStr('set '+val+" "+string(ticks.locations(i)));
     val= "LABELS_Z("+string(i)+")";
-      TK_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
+      TCL_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
   end
 
 endfunction
@@ -1856,87 +1856,87 @@ endfunction
 function ReLoadTicks2TCL(h)
   global ged_handle;ged_handle=h;
 
-  TK_SetVar("Xaxes_visibleToggle",h.axes_visible(1))
-  TK_SetVar("Yaxes_visibleToggle",h.axes_visible(2))
-  TK_SetVar("Zaxes_visibleToggle",h.axes_visible(3))
+  TCL_SetVar("Xaxes_visibleToggle",h.axes_visible(1))
+  TCL_SetVar("Yaxes_visibleToggle",h.axes_visible(2))
+  TCL_SetVar("Zaxes_visibleToggle",h.axes_visible(3))
 
   ticks = h.x_ticks;
   sizeticks = size(ticks.locations,1);
   if (sizeticks <> 0)
-   TK_EvalStr("unset LOCATIONS_X");
-   TK_EvalStr("unset LABELS_X");
+   TCL_EvalStr("unset LOCATIONS_X");
+   TCL_EvalStr("unset LABELS_X");
   end
   
   ticks = h.y_ticks;
   sizeticks = size(ticks.locations,1);
   if (sizeticks <> 0)
-   TK_EvalStr("unset LOCATIONS_Y");
-   TK_EvalStr("unset LABELS_Y");
+   TCL_EvalStr("unset LOCATIONS_Y");
+   TCL_EvalStr("unset LABELS_Y");
   end
   
   ticks = h.z_ticks;
   sizeticks = size(ticks.locations,1);
   if (sizeticks <> 0)
-   TK_EvalStr("unset LOCATIONS_Z");
-   TK_EvalStr("unset LABELS_Z");
+   TCL_EvalStr("unset LOCATIONS_Z");
+   TCL_EvalStr("unset LABELS_Z");
   end
   
-  TK_SetVar("SubticksEntryX",string(h.sub_ticks(1)))
-  TK_GetVar("SubticksEntryX")
+  TCL_SetVar("SubticksEntryX",string(h.sub_ticks(1)))
+  TCL_GetVar("SubticksEntryX")
  
  // disp("h.sub_ticks(1) =")
  // disp(h.sub_ticks(1));
 
-  TK_SetVar("SubticksEntryY",string(h.sub_ticks(2)))
+  TCL_SetVar("SubticksEntryY",string(h.sub_ticks(2)))
 
   select h.view
    case "2d" 
     drawlater();
     h.view='3d'
-    TK_SetVar("SubticksEntryZ",string(h.sub_ticks(3)))
+    TCL_SetVar("SubticksEntryZ",string(h.sub_ticks(3)))
     h.view='2d'
     drawnow();
    case "3d"
-     TK_SetVar("SubticksEntryZ",string(h.sub_ticks(3)))
+     TCL_SetVar("SubticksEntryZ",string(h.sub_ticks(3)))
    end
 
-  TK_SetVar("XautoticksToggle",h.auto_ticks(1))
-  TK_SetVar("YautoticksToggle",h.auto_ticks(2))
-  TK_SetVar("ZautoticksToggle",h.auto_ticks(3))
+  TCL_SetVar("XautoticksToggle",h.auto_ticks(1))
+  TCL_SetVar("YautoticksToggle",h.auto_ticks(2))
+  TCL_SetVar("ZautoticksToggle",h.auto_ticks(3))
 
   //ticks value: X axis
   ticks = h.x_ticks;
   sizeticks = size(ticks.locations,1);
-  TK_SetVar("nbticks_x",string(sizeticks));
+  TCL_SetVar("nbticks_x",string(sizeticks));
   for i=1:sizeticks
     val= "LOCATIONS_X("+string(i)+")";
-      TK_EvalStr('set '+val+" "+string(ticks.locations(i)));
+      TCL_EvalStr('set '+val+" "+string(ticks.locations(i)));
 //      disp("i vaut:");
 //      disp(i);
     val= "LABELS_X("+string(i)+")";
-      TK_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
+      TCL_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
   end
 
   //ticks value: Y axis
   ticks = h.y_ticks;
   sizeticks = size(ticks.locations,1);
-  TK_SetVar("nbticks_y",string(sizeticks));
+  TCL_SetVar("nbticks_y",string(sizeticks));
   for i=1:sizeticks
     val= "LOCATIONS_Y("+string(i)+")";
-      TK_EvalStr('set '+val+" "+string(ticks.locations(i)));
+      TCL_EvalStr('set '+val+" "+string(ticks.locations(i)));
      val= "LABELS_Y("+string(i)+")";
-      TK_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
+      TCL_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
   end
 
  //ticks value: Z axis
   ticks = h.z_ticks;
   sizeticks = size(ticks.locations,1);
-  TK_SetVar("nbticks_z",string(sizeticks));
+  TCL_SetVar("nbticks_z",string(sizeticks));
   for i=1:sizeticks
     val= "LOCATIONS_Z("+string(i)+")";
-      TK_EvalStr('set '+val+" "+string(ticks.locations(i)));
+      TCL_EvalStr('set '+val+" "+string(ticks.locations(i)));
     val= "LABELS_Z("+string(i)+")";
-      TK_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
+      TCL_EvalStr('set '+val+" {"+ticks.labels(i)+"}");
   end
 
 endfunction
index 9a89052..ddffc58 100644 (file)
@@ -133,6 +133,6 @@ function path=genhelpfromfunc(key)
   mputl(W,TMPDIR+'/localman/whatis.htm')
   if   nh==size(%helps,1)&%browsehelp=='Scilab Browser' then 
     //force a rescan
-    TK_SetVar('sciGUITable(browsehelp,nchap)',string(nh-1))
+    TCL_SetVar('sciGUITable(browsehelp,nchap)',string(nh-1))
   end
 endfunction
index 357bd63..6ca5882 100644 (file)
@@ -8,35 +8,35 @@ if ~with_tk() then
 end
 
 // Default Options and Values
-TK_SetVar("ePathToConvert",getcwd());
-TK_SetVar("eFileToConvert","<enter a file name>");
-TK_SetVar("eResDirName",getcwd());
-TK_SetVar("rRecMode","NO");
-TK_SetVar("rOnlyDouble","NO");
-TK_SetVar("rVerbMode","3");
-TK_SetVar("rPrettyPrint","NO");
-TK_SetVar("rFlagWhatToConvert","0");
-TK_SetVar("rToDo","0");
-TK_SetVar("rWindowKilled","0");
+TCL_SetVar("ePathToConvert",getcwd());
+TCL_SetVar("eFileToConvert","<enter a file name>");
+TCL_SetVar("eResDirName",getcwd());
+TCL_SetVar("rRecMode","NO");
+TCL_SetVar("rOnlyDouble","NO");
+TCL_SetVar("rVerbMode","3");
+TCL_SetVar("rPrettyPrint","NO");
+TCL_SetVar("rFlagWhatToConvert","0");
+TCL_SetVar("rToDo","0");
+TCL_SetVar("rWindowKilled","0");
 
-TK_EvalFile(SCI+"/tcl/m2sci.tcl");
+TCL_EvalFile(SCI+"/tcl/m2sci.tcl");
 
-rWindowKilled=TK_GetVar("rWindowKilled");
-rToDo=TK_GetVar("rToDo");
+rWindowKilled=TCL_GetVar("rWindowKilled");
+rToDo=TCL_GetVar("rToDo");
 while rToDo=="0" & rWindowKilled=="0"
-  rWindowKilled=TK_GetVar("rWindowKilled");
-  rToDo=TK_GetVar("rToDo");
+  rWindowKilled=TCL_GetVar("rWindowKilled");
+  rToDo=TCL_GetVar("rToDo");
 end
 
 if rToDo=="1" then
-  DirName=TK_GetVar("ePathToConvert");
-  FileName=TK_GetVar("eFileToConvert");
-  ResDirName=TK_GetVar("eResDirName");
-  RecMode=TK_GetVar("rRecMode");
-  OnlyDouble=TK_GetVar("rOnlyDouble");
-  VerbMode=TK_GetVar("rVerbMode");
-  PrettyPrint=TK_GetVar("rPrettyPrint");
-  FlagWhatToConvert=TK_GetVar("rFlagWhatToConvert");
+  DirName=TCL_GetVar("ePathToConvert");
+  FileName=TCL_GetVar("eFileToConvert");
+  ResDirName=TCL_GetVar("eResDirName");
+  RecMode=TCL_GetVar("rRecMode");
+  OnlyDouble=TCL_GetVar("rOnlyDouble");
+  VerbMode=TCL_GetVar("rVerbMode");
+  PrettyPrint=TCL_GetVar("rPrettyPrint");
+  FlagWhatToConvert=TCL_GetVar("rFlagWhatToConvert");
   
   // Modify Tcl/Tk values
   if RecMode=="YES" then
index d768143..7aa2097 100644 (file)
@@ -103,34 +103,34 @@ function endprof()
   if or(winsid()==(win+1)) then xdel(win+1);end
   if or(winsid()==(win)) then xdel(win);end
   if withpad then
-    TK_EvalStr("set isscipadinterp [interp exists scipad]")
-    if TK_GetVar("isscipadinterp")=='0' then return,end
-    TK_EvalStr('scipad eval {montretext $profiled}')
-    TK_EvalStr('scipad eval {closecur}')
+    TCL_EvalStr("set isscipadinterp [interp exists scipad]")
+    if TCL_GetVar("isscipadinterp")=='0' then return,end
+    TCL_EvalStr('scipad eval {montretext $profiled}')
+    TCL_EvalStr('scipad eval {closecur}')
   end
 endfunction
 
 function scipad_hiliteline(n)
-  TK_EvalStr("set isscipadinterp [interp exists scipad]")
-  if TK_GetVar("isscipadinterp")=='0' then //scipad has been closed
+  TCL_EvalStr("set isscipadinterp [interp exists scipad]")
+  if TCL_GetVar("isscipadinterp")=='0' then //scipad has been closed
      openinscipad(profpath)
   end
-  TK_EvalStr('scipad eval {montretext $profiled}')
-  TK_EvalStr('scipad eval {set gotlnCommand '+string(n)+'}')
-  TK_EvalStr('scipad eval {[gettextareacur] mark set insert ""$gotlnCommand.0""}')
-  //TK_EvalStr('scipad eval {catch {keyposn [gettextareacur]}}')
-  TK_EvalStr('scipad eval {[gettextareacur] see insert}')
-  TK_EvalStr('scipad eval {set i1 [$textareacur index ""insert linestart""]}')
-  TK_EvalStr('scipad eval {set i2 [$textareacur index ""insert lineend""]}')
-  TK_EvalStr('scipad eval {$textareacur tag add sel $i1 $i2}')
-  TK_EvalStr('scipad eval {selectline}')
+  TCL_EvalStr('scipad eval {montretext $profiled}')
+  TCL_EvalStr('scipad eval {set gotlnCommand '+string(n)+'}')
+  TCL_EvalStr('scipad eval {[gettextareacur] mark set insert ""$gotlnCommand.0""}')
+  //TCL_EvalStr('scipad eval {catch {keyposn [gettextareacur]}}')
+  TCL_EvalStr('scipad eval {[gettextareacur] see insert}')
+  TCL_EvalStr('scipad eval {set i1 [$textareacur index ""insert linestart""]}')
+  TCL_EvalStr('scipad eval {set i2 [$textareacur index ""insert lineend""]}')
+  TCL_EvalStr('scipad eval {$textareacur tag add sel $i1 $i2}')
+  TCL_EvalStr('scipad eval {selectline}')
 
 endfunction
 
 function r=with_scipad()
   if with_tk() then
-    TK_EvalStr("set isscipadinterp [interp exists scipad]")
-    if TK_GetVar("isscipadinterp")=='0' then scipad(),end
+    TCL_EvalStr("set isscipadinterp [interp exists scipad]")
+    if TCL_GetVar("isscipadinterp")=='0' then scipad(),end
     r=%t
   else
     r=%f
@@ -138,10 +138,10 @@ function r=with_scipad()
 endfunction
 
 function openinscipad(path)
-  TK_EvalStr("set isscipadinterp [interp exists scipad]")
-  if TK_GetVar("isscipadinterp")=='0' then scipad(),end
-  TK_EvalStr('scipad eval {openfile ""'+path+'""}')
-  TK_EvalStr('scipad eval {set profiled [lindex $listoftextarea end]}')
+  TCL_EvalStr("set isscipadinterp [interp exists scipad]")
+  if TCL_GetVar("isscipadinterp")=='0' then scipad(),end
+  TCL_EvalStr('scipad eval {openfile ""'+path+'""}')
+  TCL_EvalStr('scipad eval {set profiled [lindex $listoftextarea end]}')
 endfunction
 
 function [h,M]=dispfuntxt(txt,k,h,M)
index b3a6338..a22b816 100644 (file)
@@ -4,18 +4,18 @@ global %scipad_language;
 global LANGUAGE
 global TMPDIR
   if with_tk() then
-    TK_EvalStr("set isscipadinterp [interp exists scipad]")
-    if TK_GetVar("isscipadinterp")=="0" then    
-      TK_EvalStr("interp create scipad")
-      TK_EvalStr("load {'+gettklib()+'} Tk scipad")
-      TK_EvalStr("scipad eval {wm withdraw .}")
-      TK_EvalStr("scipad alias ScilabEval ScilabEval")
+    TCL_EvalStr("set isscipadinterp [interp exists scipad]")
+    if TCL_GetVar("isscipadinterp")=="0" then    
+      TCL_EvalStr("interp create scipad")
+      TCL_EvalStr("load {'+gettklib()+'} Tk scipad")
+      TCL_EvalStr("scipad eval {wm withdraw .}")
+      TCL_EvalStr("scipad alias ScilabEval ScilabEval")
     end
     if exists("home") then
       if MSDOS then
-        TK_EvalStr("scipad eval { set env(HOME) """+strsubst(home,"\","/")+""" }")
+        TCL_EvalStr("scipad eval { set env(HOME) """+strsubst(home,"\","/")+""" }")
       else
-        TK_EvalStr("scipad eval { set env(HOME) """+pathconvert(home,%f,%t)+""" }")
+        TCL_EvalStr("scipad eval { set env(HOME) """+pathconvert(home,%f,%t)+""" }")
       end
     end
     if %scipad_language==[] then 
@@ -25,15 +25,15 @@ global TMPDIR
         %scipad_language="eng"
       end
     end
-    TK_EvalStr("scipad eval { set lang """+%scipad_language+""" }")
+    TCL_EvalStr("scipad eval { set lang """+%scipad_language+""" }")
     if MSDOS then
-      TK_EvalStr("scipad eval { set tmpdir """+strsubst(TMPDIR,"\","/")+""" }")
+      TCL_EvalStr("scipad eval { set tmpdir """+strsubst(TMPDIR,"\","/")+""" }")
     else
-      TK_EvalStr("scipad eval { set tmpdir """+pathconvert(TMPDIR,%f,%t)+""" }")
+      TCL_EvalStr("scipad eval { set tmpdir """+pathconvert(TMPDIR,%f,%t)+""" }")
     end
-//    TK_EvalStr("scipad eval { set FontSize """+string(%scipad_fontsize)+""" }")
-    TK_EvalStr("set isscipadopen [scipad eval {info exists pad}]")
-    TK_EvalStr("scipad eval {source ""'+SCI+'/tcl/scipadsources/scipad.tcl""}")
+//    TCL_EvalStr("scipad eval { set FontSize """+string(%scipad_fontsize)+""" }")
+    TCL_EvalStr("set isscipadopen [scipad eval {info exists pad}]")
+    TCL_EvalStr("scipad eval {source ""'+SCI+'/tcl/scipadsources/scipad.tcl""}")
     nfiles=argn(2)
     if nfiles>0 then
       onevalidfile=%f
@@ -71,12 +71,12 @@ global TMPDIR
           else
             filetoopen=pathconvert(filetoopen,%f,%t);
           end
-          TK_EvalStr("scipad eval {openfile """+ filetoopen +"""}")          
+          TCL_EvalStr("scipad eval {openfile """+ filetoopen +"""}")          
         end
       end
   // close "Untitled.sce" opened as default when scipad is started anew
-      if TK_GetVar("isscipadopen")=="0" & onevalidfile then
-          TK_EvalStr("scipad eval {closefile $pad.new1}")
+      if TCL_GetVar("isscipadopen")=="0" & onevalidfile then
+          TCL_EvalStr("scipad eval {closefile $pad.new1}")
       end
     end
   else
index 4c6bfa8..29eaa3b 100644 (file)
@@ -27,12 +27,12 @@ endfunction
 function RescanSciGUIHelp()
   update='0';
   sciGUI_init();
-  nch=eval(TK_GetVar('sciGUITable(browsehelp,nchap)'));
+  nch=eval(TCL_GetVar('sciGUITable(browsehelp,nchap)'));
   rescan_helps()
-  TK_SetVar('sciGUITable(browsehelp,nchap)',string(size(%helps,1)));
+  TCL_SetVar('sciGUITable(browsehelp,nchap)',string(size(%helps,1)));
   update='1';
   tmpDir=strsubst(TMPDIR,'\','/');
-  TK_EvalStr('sciGUIBrowseHelp -1 '+update+' ""'+tmpDir+'/browsehelp.txt""');
+  TCL_EvalStr('sciGUIBrowseHelp -1 '+update+' ""'+tmpDir+'/browsehelp.txt""');
 
 endfunction
 //=====================================================================
index 7fd4267..661a01c 100644 (file)
@@ -25,7 +25,7 @@ static void Initialize() ;
 /********************************************************************************************************/
 extern void C2F(banier)(int *x) ;
 extern integer C2F (ismenu) __PARAMS((void));
-extern void inittk();
+extern void initTCLTK();
 extern int C2F(inisci)(int *,int *,int *);
 extern int C2F (sciquit) (void);
 extern void C2F(settmpdir) (void);
@@ -352,7 +352,7 @@ static void Initialize()
   #endif
 
   /* Scilab Initialization */
-  inittk(); /* TK Init. */
+  initTCLTK(); /* TK Init. */
   C2F(inisci)(&iflag,&stacksize,&ierr);
   if ( ierr > 0 ) 
     {
index dbe50d5..76434e8 100644 (file)
@@ -13,7 +13,7 @@ all::
        @copy machine-abs.h machine.h\r
        @Makesubdirs.bat all ABSOFT\r
        @if "%COMPILE_PVM%" == "yes" call Makesubdirs.bat pvm ABSOFT none\r
-       @if "%COMPILE_TCL_TK%" == "yes" call Makesubdirs.bat tksci ABSOFT none\r
+       @if "%COMPILE_TCL_TK%" == "yes" call Makesubdirs.bat tclsci ABSOFT none\r
 \r
 clean::\r
        @Makesubdirs.bat clean\r
index f8d9a57..10e2174 100644 (file)
@@ -6,7 +6,7 @@ SCIDIRS = graphics calelm blas  control default integ interf intersci \
        lapack slicot arpack \
        metanet optim poly signal sparse sun system system2 console\
        menusX scicos sound dcd randlib slicot arpack wintools\
-       gd int @GUILIB@ @XDRLIB@ @TKSCIDIR@ @PVMSCIDIR@ @GZVT@
+       gd int @GUILIB@ @XDRLIB@ @TCLSCIDIR@ @PVMSCIDIR@ @GZVT@
 
 SUBDIRS = $(XAW_LOCAL_SUBDIR) $(DLD_SUBDIR) $(SCIDIRS) @F2C_SUBDIR@
 
index c3649d9..7ff0c69 100644 (file)
@@ -18,7 +18,7 @@ all::
 
 !IF "$(DTK)" == "-DWITH_TK"
 all::
-       Makesubdirs.bat tksci
+       Makesubdirs.bat tclsci
 !ENDIF
 
 !IF "$(DPVM)" == "-DWITH_PVM"
index 7e5644f..ba7a755 100755 (executable)
@@ -3,7 +3,7 @@ REM Makesubdirs.bat all
 if "%1" == "all" goto all
 if "%1" == "clean" goto all
 if "%1" == "distclean" goto all
-if "%1" == "tksci" goto tksci 
+if "%1" == "tclsci" goto tclsci 
 if "%1" == "pvm" goto pvm 
 
 echo Unknown target %1 
@@ -154,9 +154,9 @@ cd ..
 echo on
 goto end
 
-:tksci 
-cd tksci 
-echo Making %1 in directory  tksci 
+:tclsci 
+cd tclsci 
+echo Making %1 in directory  tclsci 
  nmake /C /f Makefile.mak all
 cd ..
 goto end 
index f39fe73..f1cce37 100644 (file)
@@ -59,7 +59,7 @@ callinterf.obj: callinterf.c ../machine.h ../sun/addinter.h callinterf.h
 FTables.obj: FTables.c FTables0.h ../machine.h FTables.h ../stack-c.h \\r
   ../graphics/Math.h ../graphics/Graphics.h ../stack-def.h \\r
   ../interf/stack1.h ../interf/stack2.h ../interf/stack3.h ../sun/link.h\r
-Funtab.obj: Funtab.c ../machine.h fundef ../tksci/fundef.tksci\r
+Funtab.obj: Funtab.c ../machine.h fundef ../tclsci/fundef.tclsci\r
 mexlib.obj: mexlib.c ../mex.h ../stack-c.h ../graphics/Math.h ../machine.h \\r
   ../graphics/Graphics.h ../stack-def.h ../interf/stack1.h \\r
   ../interf/stack2.h ../interf/stack3.h\r
index 5b78d5f..f63c84e 100644 (file)
@@ -56,7 +56,7 @@ callinterf.obj: callinterf.c ../machine.h ../sun/addinter.h callinterf.h
 FTables.obj: FTables.c FTables0.h ../machine.h FTables.h ../stack-c.h \
   ../graphics/Math.h ../graphics/Graphics.h ../stack-def.h \
   ../interf/stack1.h ../interf/stack2.h ../interf/stack3.h ../sun/link.h
-Funtab.obj: Funtab.c ../machine.h fundef ../tksci/fundef.tksci
+Funtab.obj: Funtab.c ../machine.h fundef ../tclsci/fundef.tclsci
 mexlib.obj: mexlib.c ../mex.h ../stack-c.h ../graphics/Math.h ../machine.h \
   ../graphics/Graphics.h ../stack-def.h ../interf/stack1.h \
   ../interf/stack2.h ../interf/stack3.h
index 5b5e1a7..e3c2af8 100644 (file)
@@ -28,9 +28,9 @@ static void  sci_sigint_addinter(int n);
 
 static int c_local = 9999;
 
-void C2F(NoTksci)(void)
+void C2F(NoTclsci)(void)
 {
-  sciprint("tksci interface not loaded \n");
+  sciprint("TclSci interface not loaded \n");
   C2F(error)(&c_local);
   return;
 }
index d422b27..bb8870c 100644 (file)
@@ -51,10 +51,10 @@ extern void    /* 38  */ C2F(randlib)();
 extern void    /* 39  */ C2F(otherspfunlib)();
 
 #ifdef WITH_TK
-extern void    /* 40  */ C2F(tksciInterf)();
-#define TKINTERF C2F(tksciInterf)
+extern void    /* 40  */ C2F(inttclsci)();
+#define TCLINTERF C2F(inttclsci)
 #else 
-#define TKINTERF C2F(NoTksci)
+#define TCLINTERF C2F(NoTclsci)
 #endif
 extern void    /* 41  */ C2F(lstelmi)();
 #ifdef WITH_PVM
@@ -69,9 +69,6 @@ extern void    /* 45  */ C2F(intslicot)();
 extern void    /* 46  */ C2F(intarpack)();
 extern void    /* 47  */ C2F(intcscicos)();
 extern void    /* 48  */ C2F(intwintools)();
-#if WIN32
-extern void    /* 49  */ C2F(inttclsci)();
-#endif
 
 static OpTab Interfaces[] ={
     /* 01  */ {C2F(matlu)},
@@ -113,7 +110,7 @@ static OpTab Interfaces[] ={
        /* 37  */ {C2F(dcd)},
     /* 38  */ {C2F(randlib)},
     /* 39  */ {C2F(otherspfunlib)},
-    /* 40  */ {TKINTERF},
+    /* 40  */ {TCLINTERF},
        /* 41  */ {C2F(lstelmi)},
        /* 42  */ {PVMINTERF},
     /* 43  */ {C2F(intelm)},
@@ -122,10 +119,6 @@ static OpTab Interfaces[] ={
     /* 46  */ {C2F(intarpack)},
        /* 47  */ {C2F(intcscicos)},
        /* 48  */ {C2F(intwintools)}
-#if WIN32
-       /* 49  */ ,{C2F(inttclsci)}
-#endif
-
 };
 
 #endif /*__CALLINTERF__*/
index 5068c67..98b5c13 100644 (file)
@@ -31,8 +31,8 @@
 {"fileinfo",           IN_matio,       27,     1},
 {"getio",              IN_matio,       28,     1},
 {"setenv",             IN_matio,       29,     1},
-/*{"xls_open",         IN_matio,       30,     1},*/
-/*{"xls_read",         IN_matio,       31,     1},*/
+/*{"xls_open",         IN_matio,       30,     1},
+{"xls_read",           IN_matio,       31,     1},*/
 #define  IN_matelm  6  
 {"abs",                        IN_matelm,      1,      0},     
 {"atan",               IN_matelm,      25,     0},     
 {"bessely",            IN_otherspecfun,        6,      3},     
 {"besselh",            IN_otherspecfun,        7,      3},     
 
-#define  IN_tksci  40
+#define  IN_tclsci  40
 #ifdef WITH_TK
-#include "../tksci/fundef.tksci"
+#include "../tclsci/fundef.tclsci"
 #endif
 #define  IN_lstelmi  41
 {"getfield",           IN_lstelmi,     1,      1},     
 {"setlanguagemenu",            IN_intwintools, 14,     2},
 {"console",                            IN_intwintools, 15,     2},
 {"about",                              IN_intwintools, 16,     2},
-#ifdef WIN32
-
-#define  IN_intTCLsci 49
-{"TCL_DoOneEvent",      IN_intTCLsci, 1,       2},
-{"TCL_EvalFile",        IN_intTCLsci, 2,       2}, 
-{"TCL_EvalStr",         IN_intTCLsci, 3,       2},
-{"TCL_GetVar",          IN_intTCLsci, 4,       2},
-{"TCL_SetVar",          IN_intTCLsci, 5,       2},
-
-#endif
\ No newline at end of file
index d2187e5..a39294d 100644 (file)
@@ -49,7 +49,6 @@
 #ifdef WIN32
        #include <stdlib.h> /*pour exit()*/
 #endif
-
 #include "../calelm/calelm.h"
 static char *the_current_mex_name;
 
@@ -2800,4 +2799,3 @@ int C2F(mxcopyptrtocomplex16)(mxArray *ptr, mxArray *pti, double *y, integer *n)
     int mxAddField(mxArray *pa, const char *fieldname);
     void mxRemoveField(mxArray *pa, int field);
     void mxSetCopyInCell(mxArray *pa, int i, mxArray *value);  */
-
index cc1c6d6..b99128b 100644 (file)
@@ -38,7 +38,7 @@
 #include "tk.h"
 #include "tkPlatDecls.h"
 
-extern Tcl_Interp *TKinterp;
+extern Tcl_Interp *TCLinterp;
 extern Tk_Window TKmainWindow;
 
 extern void flushTKEvents ();
@@ -4046,10 +4046,10 @@ void C2F(initgraphic)(string, v2, v3, v4, v5, v6, v7, dv1, dv2, dv3, dv4)
        #ifdef WITH_TK
          Tk_Window  win;
          Window    windowId;
-         /* TKmainWindow est initialise dans tksci.c  Tk_CreateMainWindow */
+         /* TKmainWindow est initialise dans tclsci.c  Tk_CreateMainWindow */
          if ( TKmainWindow != 0)
                {
-                       win = Tk_NameToWindow(TKinterp, string,TKmainWindow);
+                       win = Tk_NameToWindow(TCLinterp, string,TKmainWindow);
                        if (win != 0)
                        {
                                windowId = Tk_WindowId(win);
index 3c7b544..9042c45 100644 (file)
@@ -32,7 +32,7 @@
 #include <tcl.h>
 #include <tk.h>
 
-extern Tcl_Interp *TKinterp;
+extern Tcl_Interp *TCLinterp;
 extern Tk_Window TKmainWindow;
 #endif
 
@@ -3522,9 +3522,9 @@ void C2F(initgraphic)(char *string, integer *v2, integer *v3, integer *v4, integ
   if (IsTKGraphicalMode()) {
     Tk_Window  win;
 
-    /* TKmainWindow est initialise dans tksci.c  Tk_CreateMainWindow */
+    /* TKmainWindow est initialise dans tclsci.c  Tk_CreateMainWindow */
     if (TKmainWindow != (Tk_Window)0) {
-      win = Tk_NameToWindow(TKinterp, string, (Tk_Window) TKmainWindow);
+      win = Tk_NameToWindow(TCLinterp, string, (Tk_Window) TKmainWindow);
       if (win != (Tk_Window)0) {
        ScilabXgc->CWindow=Tk_WindowId(win);
        ScilabXgc->CBGWindow=(Window)0;
index aa8882e..4cd01cf 100644 (file)
@@ -70,8 +70,8 @@ helpbrowser.o: helpbrowser.c \
   queue-gtk2.h uri.h
 
 io.o: io.c ../graphics/Math.h \
-  ../machine.h ../graphics/Graphics.h ../sun/Sun.h All-extern.h \
-  ../tksci/tksci.h ../tksci/C-LAB_Interf.h ../stack-def.h
+  ../machine.h ../graphics/Graphics.h ../sun/Sun.h All-extern.h \ 
+  ../tclsci/TCL_Global.h ../tksci/C-LAB_Interf.h ../stack-def.h
 
 menus.o: menus.c ../graphics/Math.h ../machine.h ../graphics/Graphics.h \
   ../graphics/bcg.h  queue-gtk2.c queue-gtk2.h
index 26547cc..71c7fea 100644 (file)
@@ -27,7 +27,7 @@
    include by ../graphics/Math.h */ 
 
 #ifdef WITH_TK
-#include "../tksci/tksci.h"
+include "../tclsci/TCL_Global.h"
 #endif
 
 extern void start_sci_gtk(void);
@@ -184,7 +184,7 @@ static int INXscilab=0;
 void SetXsciOn()
 {
 #ifdef WITH_TK
-  inittk();
+  initTCLTK();
 #endif
   INXscilab=1;
   BasicScilab = 0;
@@ -231,7 +231,7 @@ void sci_tk_activate(void)
 {
 #ifdef WITH_TK
   start_sci_gtk(); /* be sure that gtk is started */
-  inittk();
+  initTCLTK();
   BasicScilab = 0;
   flushTKEvents();
 #endif
index a76c426..eb2f2b7 100644 (file)
@@ -20,7 +20,7 @@
 #include <gtk/gtk.h>
 
 #ifdef WITH_TK
-#include "../tksci/tksci.h"
+#include "../tclsci/TCL_Global.h"
 #endif
 
 #include "../graphics/Math.h"
index 8848483..a94457c 100644 (file)
@@ -685,8 +685,7 @@ int GetScreenProperty(char *prop, char *value)
     }
   else
     {
-      sciprint("Unknown property %s\r\n",prop);
-      return -1;
+       return -1;
     }
   return 0;
 #endif
index 58b1308..bf694af 100644 (file)
@@ -95,7 +95,7 @@ static char *KeyTab_[] = {
          " ", /* added */
  };
 
-int cf_type=1; /* used by gcf to determine if current figure is a graphic (1) or a tksci (0) one */
+int cf_type=1; /* used by gcf to determine if current figure is a graphic (1) or a tclsci (0) one */
 static char *pmodes[] =
   { 
     "clear", 
@@ -131,7 +131,7 @@ extern int C2F(gsort)  __PARAMS((int *xI,double *xD,int *ind,int *iflag, int *m,
 extern void ShowScales  __PARAMS((void));
 extern  void C2F(seteventhandler)  __PARAMS((int *win_num,char *name,int *ierr));
 #ifdef WITH_TK
-extern int LAB_gcf();
+  extern int GetTclCurrentFigure(void);
 #endif
 extern sciPointObj *pfiguremdl; /* DJ.A 08/01/04 */
 extern sciPointObj *paxesmdl;/* DJ.A 08/01/04 */
@@ -5028,7 +5028,7 @@ int gset(fname,fname_len)
   /*  set or create a graphic window */
   switch(VarType(1)) 
     {
-    case 1: /* tksci handle */
+    case 1: /* tclsci handle */
       lw = 1 + Top - Rhs;
       C2F(overload)(&lw,"set",3);return 0;
       return 0;
@@ -5270,7 +5270,7 @@ int gget(fname,fname_len)
   l'objet courant ) */
   switch(VarType(1))
   {
-  case 1: /* tksci handle */
+  case 1: /* tclsci handle */
     lw = 1 + Top - Rhs;
     C2F(overload)(&lw,"get",3);return 0;
     return 0;
@@ -7202,7 +7202,7 @@ if ((pobj == (sciPointObj *)NULL) &&
        numcol   = 1;
        CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
 #ifdef WITH_TK
-       *stk(outindex) = (double )LAB_gcf();
+       *stk(outindex) = (double )GetTclCurrentFigure();
 #endif
       }
     }
index 656a5a3..bb37efd 100644 (file)
@@ -128,5 +128,5 @@ scicurdir.o: scicurdir.c ../machine.h
 storeversion.o: storeversion.c ../stack-c.h ../graphics/Math.h \
   ../machine.h ../graphics/Graphics.h ../stack-def.h ../interf/stack1.h \
   ../interf/stack2.h ../interf/stack3.h ../version.h
-tksynchro.o: tksynchro.c ../machine.h ../tksci/tksci.h \
-  ../tksci/C-LAB_Interf.h ../stack-def.h
+tksynchro.o: tksynchro.c ../machine.h ../tclsci/TCL_Global.h \
+ ../stack-def.h
index 7290588..4e5a39a 100644 (file)
@@ -130,5 +130,5 @@ scicurdir.obj: scicurdir.c ../machine.h
 storeversion.obj: storeversion.c ../stack-c.h ../graphics/Math.h \
   ../machine.h ../graphics/Graphics.h ../stack-def.h ../interf/stack1.h \
   ../interf/stack2.h ../interf/stack3.h ../version.h
-tksynchro.obj: tksynchro.c ../machine.h ../tksci/tksci.h \
-  ../tksci/C-LAB_Interf.h ../stack-def.h
+tksynchro.obj: tksynchro.c ../machine.h ../tclsci/TCL_Global.h \
+   ../stack-def.h
index e57b014..c770eed 100644 (file)
@@ -6,7 +6,7 @@
 #include "../machine.h"
 
 #ifdef WITH_TK
-#include "../tksci/tksci.h"
+  #include "../tclsci/TCL_Global.h"
 #endif
 
 
@@ -22,7 +22,8 @@ void C2F(tksynchro)(l)
     int RET;
 
     sprintf(str,"scipad eval {set sciprompt %d}",*l);
-    RET=Tcl_Eval(TKinterp,str);
+         RET=Tcl_Eval(TCLinterp,str);
+    
 
   }
 #endif
diff --git a/scilab/routines/tclsci/InitTclTk.c b/scilab/routines/tclsci/InitTclTk.c
new file mode 100644 (file)
index 0000000..be3c701
--- /dev/null
@@ -0,0 +1,120 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "InitTclTk.h"
+#include "TclEvents.h"
+#ifndef WIN32
+ #include <dirent.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Shell.h>
+ #include <X11/Xos.h>
+ #include <ctype.h>
+#endif
+/*-----------------------------------------------------------------------------------*/ 
+extern int TCL_EvalScilabCmd(ClientData clientData,Tcl_Interp * theinterp,int objc,CONST char ** argv);
+/*-----------------------------------------------------------------------------------*/ 
+void initTCLTK(void)
+{
+  if ( OpenTCLsci()==0 ) TK_Started=1;
+}
+/*-----------------------------------------------------------------------------------*/
+int OpenTCLsci(void)
+/* Checks if tcl/tk has already been initialised and if not */
+/* initialise it. It must find the tcl script */
+{
+  char *SciPath;
+  char TkScriptpath[1000];
+  char MyCommand[1000];
+
+#ifndef WIN32
+  DIR *tmpdir;
+#endif
+
+  FILE *tmpfile;
+
+  Display *XTKdisplay;
+
+#ifdef TCL_MAJOR_VERSION
+  #ifdef TCL_MINOR_VERSION
+    #if TCL_MAJOR_VERSION >= 8
+      #if TCL_MINOR_VERSION > 0
+        Tcl_FindExecutable(" ");
+      #endif
+    #endif
+  #endif
+#endif
+  SciPath=getenv("SCI");
+  
+  /* test SCI validity) */
+  if (SciPath==NULL)
+    {
+      sciprint("\nThe SCI environment variable is not set.\nTCL initialisation failed !\n");
+      return(1);
+    }
+
+#ifdef WIN32
+  strcpy(TkScriptpath, SciPath);
+  strcat(TkScriptpath, "/tcl/TK_Scilab.tcl");
+
+  tmpfile = fopen(TkScriptpath,"r");
+  if (tmpfile==NULL) 
+    {
+      sciprint("\nUnable to find TCL initialisation scripts \n. Check your SCI environment variable.\nTCL initialisation failed !\n");
+      return(1);
+    }
+  else fclose(tmpfile);
+#else
+  tmpdir=opendir(SciPath);
+  if (tmpdir==NULL) 
+    {
+      sciprint("\nThe SCI environment variable is not set properly.\nTCL initialisation failed !\n");
+      return(1);
+    }
+  else closedir(tmpdir);
+  strcpy(TkScriptpath, SciPath);
+  strcat(TkScriptpath, "/tcl/TK_Scilab.tcl");
+
+  tmpfile = fopen(TkScriptpath,"r");
+  if (tmpfile==NULL) 
+    {
+      sciprint("\nUnable to find TCL initialisation scripts \n. Check your SCI environment variable.\nTCL initialisation failed !\n");
+      return(1);
+    }
+  else fclose(tmpfile);
+#endif /* WIN32 */ 
+
+  if (TCLinterp == NULL) 
+    {
+      TCLinterp = Tcl_CreateInterp();
+      Tcl_Init(TCLinterp);
+      Tk_Init(TCLinterp);
+
+      sprintf(MyCommand, "set SciPath \"%s\";",SciPath); 
+      Tcl_Eval(TCLinterp,MyCommand);
+      
+         Tcl_CreateCommand(TCLinterp,"ScilabEval",TCL_EvalScilabCmd,(ClientData)1,NULL);
+    }
+   
+  if (TKmainWindow == NULL)
+    {
+      TKmainWindow = Tk_MainWindow(TCLinterp);
+      XTKdisplay=Tk_Display(TKmainWindow);
+      XTKsocket = ConnectionNumber(XTKdisplay);
+      
+      Tk_GeometryRequest(TKmainWindow,2,2);
+      Tcl_EvalFile(TCLinterp,TkScriptpath);
+      flushTKEvents();
+    }
+
+  TK_Started=1;
+  
+  return(0);
+
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/routines/tclsci/InitTclTk.h b/scilab/routines/tclsci/InitTclTk.h
new file mode 100644 (file)
index 0000000..0c1c960
--- /dev/null
@@ -0,0 +1,14 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __INITTCLTK__
+#define __INITTCLTK__
+
+#include "TCL_Global.h"
+
+void initTCLTK(void);
+int OpenTCLsci(void);
+
+#endif /* __INITTCLTK__ */
+/*-----------------------------------------------------------------------------------*/ 
diff --git a/scilab/routines/tclsci/Makefile b/scilab/routines/tclsci/Makefile
new file mode 100644 (file)
index 0000000..ab16a0e
--- /dev/null
@@ -0,0 +1,30 @@
+SHELL = /bin/sh
+SCIDIR=../..
+SCIDIR1=..\..
+
+LIBRARY = $(SCIDIR)/libs/tclsci.a
+
+OBJSF = 
+
+OBJSC  = InitTclTk.o intClose.o intFindObj.o intOpenTk.o \
+        intTclDoOneEvent.o intTclEvalFile.o intTclEvalStr.o \
+        intTclGcf.o intTclGet.o intTclGetVar.o inttclsci.o \
+        intTclSet.o intTclSetVar.o ScilabEval.o TclEvents.o \
+        TclUiGet.o TclUiSet.o TCL_Global.o 
+
+
+include ../../Makefile.incl
+
+CFLAGS = $(CC_OPTIONS) $(XFLAGS) $(TK_INC_PATH) $(TCL_INC_PATH) -I. 
+
+FFLAGS = $(FC_OPTIONS)
+
+include ../Make.lib
+
+
+
+all:: Makefile.mak
+
+Makefile.mak   : Makefile
+       $(SCIDIR)/util/Mak2VCMak Makefile
+
index ab52b7b..ec5de3c 100644 (file)
@@ -1,4 +1,3 @@
-
 SHELL = /bin/sh
 SCIDIR=../..
 SCIDIR1=..\..
@@ -7,9 +6,11 @@ LIBRARY = $(SCIDIR)/libs/tclsci.lib
 
 OBJSF = 
 
-OBJSC  = intTclDoOneEvent.obj intTclEvalFile.obj intTclEvalStr.obj \
-         intTclGetVar.obj inttclsci.obj intTclSetVar.obj \
-         TCL_Global.obj         
+OBJSC  = InitTclTk.obj intClose.obj intFindObj.obj intOpenTk.obj \
+        intTclDoOneEvent.obj intTclEvalFile.obj intTclEvalStr.obj \
+        intTclGcf.obj intTclGet.obj intTclGetVar.obj inttclsci.obj \
+        intTclSet.obj intTclSetVar.obj ScilabEval.obj TclEvents.obj \
+        TclUiGet.obj TclUiSet.obj TCL_Global.obj 
 
 include ../../Makefile.incl.mak
 
@@ -20,7 +21,7 @@ FFLAGS = $(FC_OPTIONS)
 include ../Make.lib.mak
 
 
-tksci.obj: ../machine.h
+
 
 
 
diff --git a/scilab/routines/tclsci/ScilabEval.c b/scilab/routines/tclsci/ScilabEval.c
new file mode 100644 (file)
index 0000000..6044704
--- /dev/null
@@ -0,0 +1,143 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "TCL_Global.h"
+#include "ScilabEval.h"
+/*-----------------------------------------------------------------------------------*/
+/* what's the max number of commands in the queue ??*/
+#define arbitrary_max_queued_callbacks 20
+/*-----------------------------------------------------------------------------------*/
+static int c_n1 = -1;     
+int TK_Started=0;
+int XTKsocket=0;
+/*-----------------------------------------------------------------------------------*/
+extern void SetCommandflag(int flag) ;
+extern void C2F(syncexec)(char * str, int *ns, int *ierr, int *seq);
+extern int GetCommand(char *str);
+extern int StoreCommand ( char *command); 
+extern int C2F(tksynchro)();
+extern integer C2F (ismenu)(void); 
+/*-----------------------------------------------------------------------------------*/
+int TCL_EvalScilabCmd(ClientData clientData,Tcl_Interp * theinterp,int objc,CONST char ** argv)
+{
+  int ns,ierr,seq;
+  char *command;
+
+  char *comm[arbitrary_max_queued_callbacks];
+  int   seqf[arbitrary_max_queued_callbacks];
+  int nc,ncomm=-1;
+
+  if (C2F(iop).ddt==-1)
+  {
+       /* trace for debugging */
+    int argc=1;
+    sciprint("TCL_EvalScilabCmd %s",argv[1]);
+    while (argv[++argc]) sciprint(" %s",argv[argc]);
+    sciprint("\n");
+  }
+
+  if (argv[1] != (char *)0)
+  {
+    if (strlen(argv[1])>=bsiz)
+       {
+      command = (char *) malloc (bsiz * sizeof (char));
+      if (command == (char *) 0)
+      {
+        sciprint ("TCL_EvalScilabCmd: No more memory\r\n");
+        return TCL_ERROR;
+      }
+      memset(command,'\0',bsiz);
+      strncpy(command,argv[1],bsiz-1);
+      sciprint("Warning: ScilabTCLEval command is too long and has been truncated to %d characters!\r\n",bsiz-1);
+    }
+       else
+       {
+      command = (char *) malloc ((strlen (argv[1]) + 1) * sizeof (char));
+      if (command == (char *) 0)
+      {
+        sciprint ("TCL_EvalScilabCmd: No more memory\r\n");
+        return TCL_ERROR;
+      }
+      strcpy(command,argv[1]);
+    }
+
+    if ( (argv[2] != (char *)0) && (strncmp(argv[2],"sync",4)==0) )
+       {
+      /* sync or sync seq */
+      C2F(tksynchro)(&c_n1);  /* set sciprompt to -1 (scilab busy) */
+      seq= ( (argv[3] != (char *)0) && (strncmp(argv[3],"seq",3)==0) );
+      ns=strlen(command); 
+      if (C2F(iop).ddt==-1) sciprint(" Execution starts for %s\r\n",command);
+      C2F(syncexec)(command,&ns,&ierr,&seq);
+      if (C2F(iop).ddt==-1) sciprint(" Execution ends for %s\r\n",command);
+      C2F(tksynchro)(&C2F(recu).paus);
+      if (ierr != 0) return TCL_ERROR;
+    }
+    else if (strncmp(command,"flush",5)==0)
+       {
+      /* flush */
+      if (C2F(iop).ddt==-1) sciprint(" Flushing starts for queued commands\r\n");
+      while (C2F(ismenu)() && ncomm<arbitrary_max_queued_callbacks-1)
+         {
+        ncomm++;
+        comm[ncomm] = (char *) malloc (bsiz+1);
+        if (comm[ncomm] == (char *) 0)
+        {
+          sciprint ("TCL_EvalScilabCmd: No more memory\r\n");
+          return TCL_ERROR;
+        }
+        seqf[ncomm]=GetCommand (comm[ncomm]);
+      }
+      if (C2F(ismenu)()) sciprint("Warning: Too many callbacks in queue!\r\n");
+      for (nc = 0 ; nc <= ncomm ; nc++ )
+         {
+        C2F(tksynchro)(&c_n1);  /* set sciprompt to -1 (scilab busy) */
+        if (C2F(iop).ddt==-1)
+        {
+             if (seqf[nc]==0)
+                 {
+                         sciprint(" Flushed execution starts for %s - No option\r\n",comm[nc]);
+                 }
+             else
+                 {
+                         sciprint(" Flushed execution starts for %s - seq\r\n",comm[nc]);
+                 }
+        }
+        ns=strlen(comm[nc]);
+        C2F(syncexec)(comm[nc],&ns,&ierr,&(seqf[nc]));
+        if (C2F(iop).ddt==-1)
+        {
+          sciprint(" Flushed execution ends for %s\r\n",comm[nc]);
+          free(comm[nc]);
+        }
+        C2F(tksynchro)(&C2F(recu).paus);
+        if (ierr != 0) return TCL_ERROR;
+      }
+      if (C2F(iop).ddt==-1) sciprint(" Flushing ends\r\n");
+    }
+    else
+       {
+      /* seq or no option */
+      StoreCommand(command); 
+      if ( (argv[2] != (char *)0) && (strncmp(argv[2],"seq",3)==0) )
+         {
+        SetCommandflag(1);
+      }
+      else
+         {
+               /* unknown option */
+        Tcl_SetResult(theinterp,NULL,NULL);
+         }
+    }
+    free(command);
+
+  } 
+  else
+  {
+       /* ScilabEval called without argument */
+    Scierror(999,"ScilabTCLEval: at least one argument is required\r\n");
+  }
+
+  return TCL_OK;
+}
diff --git a/scilab/routines/tclsci/ScilabEval.h b/scilab/routines/tclsci/ScilabEval.h
new file mode 100644 (file)
index 0000000..ce5b141
--- /dev/null
@@ -0,0 +1,13 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __SCILABEVAL__
+#define __SCILABEVAL__
+
+
+
+int TCL_EvalScilabCmd(ClientData clientData,Tcl_Interp * theinterp,int objc,CONST char ** argv);
+
+#endif /* __SCILABEVAL__ */
+/*-----------------------------------------------------------------------------------*/ 
index 4fe662c..41e9da1 100644 (file)
 /*-----------------------------------------------------------------------------------*/
 #include "TCL_Global.h"
 /*-----------------------------------------------------------------------------------*/
-extern void SetCommandflag(int flag) ;
-extern void C2F(syncexec)(char * str, int *ns, int *ierr, int *seq);
-extern int GetCommand(char *str);
-extern int StoreCommand ( char *command); 
-extern int C2F(tksynchro)();
-extern integer C2F (ismenu)(void); 
+Tcl_Interp *TCLinterp=NULL;
+Tk_Window TKmainWindow=NULL;
 /*-----------------------------------------------------------------------------------*/
-/* what's the max number of commands in the queue ??*/
-#define arbitrary_max_queued_callbacks 20
-/*-----------------------------------------------------------------------------------*/
-static int c_n1 = -1;     
+void nocase (char *s)
+{
+#ifndef WIN32
+  int lg;
+  int i;
+  char c;
+  lg = strlen(s);
+  for (i=0; i<lg; i++)
+    {
+      c = s[i];
+      if ( (c >= 'A') && (c <= 'Z') ) s[i] = 'a' + (c-'A');
+    }
+#else
+  s=_strlwr(s);
+#endif
+} 
 /*-----------------------------------------------------------------------------------*/
-int TCL_EvalScilabCmd(ClientData clientData,Tcl_Interp * theinterp,int objc,CONST char ** argv)
+char *Matrix2String(int RhsMatrix)
 {
-  int ns,ierr,seq;
-  char *command;
+       
+       static int l1,n1,m1;
+       double *param=NULL;
+       int sz=0;
+       char *retstr=NULL;
+       char *tmpstr=NULL;
+    
+       GetRhsVar(RhsMatrix,"d",&m1,&n1,&l1);
+       param=stk(l1);
+       
+       sz=m1*n1;
 
-  char *comm[arbitrary_max_queued_callbacks];
-  int   seqf[arbitrary_max_queued_callbacks];
-  int nc,ncomm=-1;
+    if (sz>0) 
+    {
+               #define ENT 10
+               #define MANT 5
+               int i=0;
+               int strl=0;
+               strl = sz * (ENT * MANT + 2);
+               /* the before the dot, after the dot, the dot and a space */
+      
+               retstr = (char*) malloc( (1+strl) * sizeof(char));
+               tmpstr = (char*) malloc( (ENT * MANT + 2) * sizeof(char));
+      
+               strcpy(retstr,"");
+        strcpy(tmpstr,"");
 
-  if (C2F(iop).ddt==-1)
-  {
-       /* trace for debugging */
-    int argc=1;
-    sciprint("TCL_EvalScilabCmd %s",argv[1]);
-    while (argv[++argc]) sciprint(" %s",argv[argc]);
-    sciprint("\n");
-  }
-
-  if (argv[1] != (char *)0)
-  {
-    if (strlen(argv[1])>=bsiz)
-       {
-      command = (char *) malloc (bsiz * sizeof (char));
-      if (command == (char *) 0)
-      {
-        sciprint ("TCL_EvalScilabCmd: No more memory\r\n");
-        return TCL_ERROR;
-      }
-      memset(command,'\0',bsiz);
-      strncpy(command,argv[1],bsiz-1);
-      sciprint("Warning: ScilabTCLEval command is too long and has been truncated to %d characters!\r\n",bsiz-1);
+               for (i=0; i<(sz-1); i++)
+               {
+                       sprintf(tmpstr,"%.10lf|", param[i]);
+                       strcat( retstr,tmpstr );
+               }
+      
+               sprintf(tmpstr,"%.10lf", param[i]);
+               strcat( retstr,tmpstr );
+      
+        if (tmpstr) {free(tmpstr);tmpstr=NULL;}
     }
        else
-       {
-      command = (char *) malloc ((strlen (argv[1]) + 1) * sizeof (char));
-      if (command == (char *) 0)
-      {
-        sciprint ("TCL_EvalScilabCmd: No more memory\r\n");
-        return TCL_ERROR;
-      }
-      strcpy(command,argv[1]);
+    { 
+      retstr = (char*) malloc( sizeof(char) );
+      strcpy(retstr,"");
     }
+  
+  return(retstr);
+  
+}
+/*-----------------------------------------------------------------------------------*/  
+int IsAInteger(int RhsNumber)
+{
+       int bOK=0;
 
-    if ( (argv[2] != (char *)0) && (strncmp(argv[2],"sync",4)==0) )
-       {
-      /* sync or sync seq */
-      C2F(tksynchro)(&c_n1);  /* set sciprompt to -1 (scilab busy) */
-      seq= ( (argv[3] != (char *)0) && (strncmp(argv[3],"seq",3)==0) );
-      ns=strlen(command); 
-      if (C2F(iop).ddt==-1) sciprint(" Execution starts for %s\r\n",command);
-      C2F(syncexec)(command,&ns,&ierr,&seq);
-      if (C2F(iop).ddt==-1) sciprint(" Execution ends for %s\r\n",command);
-      C2F(tksynchro)(&C2F(recu).paus);
-      if (ierr != 0) return TCL_ERROR;
-    }
-    else if (strncmp(command,"flush",5)==0)
+       if ( GetType(RhsNumber) == sci_matrix )
        {
-      /* flush */
-      if (C2F(iop).ddt==-1) sciprint(" Flushing starts for queued commands\r\n");
-      while (C2F(ismenu)() && ncomm<arbitrary_max_queued_callbacks-1)
-         {
-        ncomm++;
-        comm[ncomm] = (char *) malloc (bsiz+1);
-        if (comm[ncomm] == (char *) 0)
-        {
-          sciprint ("TCL_EvalScilabCmd: No more memory\r\n");
-          return TCL_ERROR;
-        }
-        seqf[ncomm]=GetCommand (comm[ncomm]);
-      }
-      if (C2F(ismenu)()) sciprint("Warning: Too many callbacks in queue!\r\n");
-      for (nc = 0 ; nc <= ncomm ; nc++ )
-         {
-        C2F(tksynchro)(&c_n1);  /* set sciprompt to -1 (scilab busy) */
-        if (C2F(iop).ddt==-1)
-        {
-             if (seqf[nc]==0)
-                 {
-                         sciprint(" Flushed execution starts for %s - No option\r\n",comm[nc]);
-                 }
-             else
-                 {
-                         sciprint(" Flushed execution starts for %s - seq\r\n",comm[nc]);
-                 }
-        }
-        ns=strlen(comm[nc]);
-        C2F(syncexec)(comm[nc],&ns,&ierr,&(seqf[nc]));
-        if (C2F(iop).ddt==-1)
-        {
-          sciprint(" Flushed execution ends for %s\r\n",comm[nc]);
-          free(comm[nc]);
-        }
-        C2F(tksynchro)(&C2F(recu).paus);
-        if (ierr != 0) return TCL_ERROR;
-      }
-      if (C2F(iop).ddt==-1) sciprint(" Flushing ends\r\n");
-    }
-    else
+               static int l1,n1,m1;
+               GetRhsVar(1,"i",&m1,&n1,&l1);
+               if ( (m1 == 1) && (n1 == 1) )
+               {
+                       bOK=1;
+               }
+       }
+       return bOK;
+}
+/*-----------------------------------------------------------------------------------*/
+double *String2Matrix(char *StringIn,int *nbelemOut)
+{
+    double *MatrixReturn=NULL;
+       int nbelem=0;
+       int Stringlen=strlen(StringIn);
+
+       if (Stringlen>0)
        {
-      /* seq or no option */
-      StoreCommand(command); 
-      if ( (argv[2] != (char *)0) && (strncmp(argv[2],"seq",3)==0) )
-         {
-        SetCommandflag(1);
-      }
-      else
-         {
-               /* unknown option */
-        Tcl_SetResult(theinterp,NULL,NULL);
-         }
-    }
-    free(command);
+               int begin_elem=0;
+               int end_elem=0;
+               int elem=0;
+               int i=0;
+               char *tmpstr=NULL;
+
+               /* How many elements in the string ? */
+               for (i=0; i<(Stringlen-1); i++)  if (StringIn[i]=='|')  nbelem++;
+
+               nbelem++;
+
+               MatrixReturn=(double*) malloc(nbelem*sizeof(double));
+               tmpstr = (char *)malloc((Stringlen+1) * sizeof(char));
 
-  } 
-  else
-  {
-       /* ScilabEval called without argument */
-    Scierror(999,"ScilabTCLEval: at least one argument is required\r\n");
-  }
+               for (elem=0; elem<nbelem; elem++)
+               {
+                       while ( (end_elem<Stringlen) && (StringIn[end_elem] != '|') )
+                       {
+                   end_elem++;
+                       }
+         
+                       strncpy(tmpstr, StringIn+begin_elem, end_elem-begin_elem);
+                       MatrixReturn[elem]=atof(tmpstr);
+                       begin_elem = end_elem+1;
+                       end_elem = begin_elem;
+               }
+        if (tmpstr) {free(tmpstr);tmpstr=NULL;}
+               *nbelemOut=nbelem;
+       }
 
-  return TCL_OK;
+       return MatrixReturn;
+}
+/*-----------------------------------------------------------------------------------*/
+int MustReturnAString(char *FieldPropertie)
+{
+       int bOK=0;
+       char Propertie[256];
+
+       strcpy(Propertie,FieldPropertie);
+    nocase(Propertie);
+
+       if ( (strcmp(Propertie,"style") == 0) ||
+                (strcmp(Propertie,"tag") == 0) ||
+                (strcmp(Propertie,"units") == 0) ||
+                (strcmp(Propertie,"callback") == 0) ||
+                (strcmp(Propertie,"fontangle") == 0) ||
+                (strcmp(Propertie,"fontunits") == 0) ||
+                (strcmp(Propertie,"fontweight") == 0) ||
+                (strcmp(Propertie,"string") == 0) ) bOK=1;
+
+       return bOK;
+}
+/*-----------------------------------------------------------------------------------*/
+int MustReturnAMatrix(char *FieldPropertie)
+{
+       int bOK=0;
+       char Propertie[256];
+
+       strcpy(Propertie,FieldPropertie);
+    nocase(Propertie);
+
+       if ( (strcmp(Propertie,"backgroungcolor") == 0) ||
+                (strcmp(Propertie,"fontsize") == 0) ||
+                (strcmp(Propertie,"listboxtop") == 0) ||
+                (strcmp(Propertie,"max") == 0) ||
+                (strcmp(Propertie,"min") == 0) ||
+                (strcmp(Propertie,"parent") == 0) ||
+                (strcmp(Propertie,"position") == 0) ||
+                (strcmp(Propertie,"sliderstep") == 0) ||
+                (strcmp(Propertie,"value") == 0) ) bOK=1;
+
+       return bOK;
+}
+/*-----------------------------------------------------------------------------------*/
+int ValueMustBeAMatrix(char *FieldPropertie)
+{
+       return (MustReturnAMatrix(FieldPropertie));
+}
+/*-----------------------------------------------------------------------------------*/
+int ValueMustBeAString(char *FieldPropertie)
+{
+       return (MustReturnAString(FieldPropertie));
 }
 /*-----------------------------------------------------------------------------------*/
index ddbb06e..0e3624a 100644 (file)
@@ -10,6 +10,7 @@
   #include <windows.h>
 #endif
 #include <stdio.h>
+#include <string.h>
 #include "../machine.h"
 #include "../stack-c.h"
 #include "../version.h"
 #define TRUE  1
 #define FALSE 0
 /*-----------------------------------------------------------------------------------*/
-/*Tcl_Interp *TKinterp=NULL;*/
-/*Tk_Window TKmainWindow=NULL;*/
-extern Tcl_Interp *TKinterp;
+extern Tcl_Interp *TCLinterp;
 extern Tk_Window TKmainWindow;
+extern int TK_Started;
+extern int XTKsocket;
 /*-----------------------------------------------------------------------------------*/
-int TCL_EvalScilabCmd(ClientData clientData,Tcl_Interp * theinterp,int objc,CONST char ** argv);
+void nocase (char *s);
+char *Matrix2String(int RhsMatrix);
+double *String2Matrix(char *StringIn,int *nbelemOut);
+int IsAInteger(int RhsNumber); 
+int MustReturnAMatrix(char *FieldPropertie);
+int MustReturnAString(char *FieldPropertie);
+int ValueMustBeAMatrix(char *FieldPropertie);
+int ValueMustBeAString(char *FieldPropertie);
 /*-----------------------------------------------------------------------------------*/
 #endif /* __TCLGLOBAL__ */
-/*-----------------------------------------------------------------------------------*/ 
\ No newline at end of file
+/*-----------------------------------------------------------------------------------*/ 
diff --git a/scilab/routines/tclsci/TclEvents.c b/scilab/routines/tclsci/TclEvents.c
new file mode 100644 (file)
index 0000000..db99a68
--- /dev/null
@@ -0,0 +1,18 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "TclEvents.h"
+/*-----------------------------------------------------------------------------------*/ 
+void flushTKEvents(void)
+{
+  while (Tcl_DoOneEvent(TCL_ALL_EVENTS | TCL_DONT_WAIT)==1)
+  {
+  }
+}
+/*-----------------------------------------------------------------------------------*/
+int tcl_check_one_event(void) 
+{
+  return Tcl_DoOneEvent ( TCL_DONT_WAIT);
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/routines/tclsci/TclEvents.h b/scilab/routines/tclsci/TclEvents.h
new file mode 100644 (file)
index 0000000..17dab4c
--- /dev/null
@@ -0,0 +1,14 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __TCLEVENTS__
+#define __TCLEVENTS__
+
+#include "TCL_Global.h"
+
+int tcl_check_one_event(void);
+void flushTKEvents(void);
+
+#endif /* __TCLEVENTS__ */
+/*-----------------------------------------------------------------------------------*/ 
diff --git a/scilab/routines/tclsci/TclUiGet.c b/scilab/routines/tclsci/TclUiGet.c
new file mode 100644 (file)
index 0000000..3d31252
--- /dev/null
@@ -0,0 +1,108 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#include "TclUiGet.h"
+/*-----------------------------------------------------------------------------------*/
+extern int GetScreenProperty(char *prop, char *value);
+/*-----------------------------------------------------------------------------------*/
+int TCL_UiGet(int  Handle,int RhsPropertieField)
+{
+       #define StrMax 200
+
+       int bOK=0;
+       static int l1,n1,m1;
+       char MyTclCommand[2000];
+       
+       if (Handle == 0)
+       {
+               if (GetType(RhsPropertieField) == sci_strings)
+               {
+                       char *StrField=NULL;
+                       char *StrValue=NULL;
+                       int nbelem=0;
+                       double *MatrixOut=NULL;
+
+                       GetRhsVar(RhsPropertieField,"c",&m1,&n1,&l1);
+                       StrField=cstk(l1);
+                       StrValue=(char*)malloc((StrMax+1)*sizeof(char));
+
+                       if(!GetScreenProperty(StrField,StrValue))
+                       {
+                               MatrixOut=String2Matrix(StrValue,&nbelem);
+                               n1=1;
+                               m1=nbelem;
+                               CreateVarFromPtr(Rhs+1, "d", &n1, &m1, &MatrixOut);
+                               if (MatrixOut) {free(MatrixOut); MatrixOut=NULL;}
+                       }
+                       else
+                       {
+                               if (StrValue) {free(StrValue); StrValue=NULL;}
+                               Scierror(999,"Unknown propertie %s\r\n",StrField);
+                               return 0;
+                       }
+                       if (StrValue) {free(StrValue); StrValue=NULL;}
+                       bOK=1;
+               }
+               else
+               {
+                       Scierror(999,"Invalid parameter(s) type.\n");
+                       return 0;
+               }
+       }
+       else
+       {
+               char *StrField=NULL;
+               char *StrValue=NULL;
+               double *MatrixOut=NULL;
+
+               GetRhsVar(RhsPropertieField,"c",&m1,&n1,&l1);
+               StrField=cstk(l1);
+
+               nocase(StrField);
+
+               sprintf(MyTclCommand,"set TclScilabTmpVar [GetField %d \"%s\"]", Handle, StrField);
+               
+               Tcl_Eval(TCLinterp,MyTclCommand);
+               StrValue = (char*)Tcl_GetVar(TCLinterp, "TclScilabTmpVar", 0);
+
+               if (StrValue)
+               {
+                       if ( MustReturnAMatrix(StrField) )
+                       {
+                               int nbelem=0;
+                               double *MatrixOut=NULL;
+
+                               MatrixOut=String2Matrix(StrValue,&nbelem);
+                               n1=1;
+                               m1=nbelem;
+                               CreateVarFromPtr(Rhs+1, "d", &n1, &m1, &MatrixOut);
+                               if (MatrixOut) {free(MatrixOut); MatrixOut=NULL;}
+                               bOK=1;
+                       }
+                       else
+                       if ( MustReturnAString(StrField) )
+                       {
+                               m1=strlen(StrValue);
+                               n1=1;
+                               CreateVar(Rhs+1, "c", &m1,&n1,&l1);
+                               sprintf(cstk(l1),"%s",StrValue);
+                               bOK=1;
+                       }
+                       else
+                       {
+                               Scierror(999,"Unknown propertie %s\r\n",StrField);
+                               return 0;
+                       }
+               }
+               else
+               {
+                       Scierror(999,"Error propertie not found.\n");
+                       return 0;
+               }
+               
+       }
+
+       return bOK;
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/routines/tclsci/TclUiGet.h b/scilab/routines/tclsci/TclUiGet.h
new file mode 100644 (file)
index 0000000..560d0dd
--- /dev/null
@@ -0,0 +1,13 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __TCLUIGET__
+#define __TCLUIGET__
+
+#include "TCL_Global.h"
+
+int TCL_UiGet(int  Handle,int RhsPropertieField);
+
+#endif /* __TCLUIGET__ */
+/*-----------------------------------------------------------------------------------*/ 
diff --git a/scilab/routines/tclsci/TclUiSet.c b/scilab/routines/tclsci/TclUiSet.c
new file mode 100644 (file)
index 0000000..bc0d185
--- /dev/null
@@ -0,0 +1,89 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#include "TclUiSet.h"
+/*-----------------------------------------------------------------------------------*/
+int TCL_UiSet(int Handle,char *PropertieField,char *PropertieValue)
+{
+       #define CommandLenMax 2048      
+       int bOK=0;
+       int LenStr=0;
+       
+       char MyTclCommand[CommandLenMax];
+       
+       sciprint("TCL_UiSet handle %d propertie %s value %s\n",Handle,PropertieField,PropertieValue);
+
+       LenStr=(strlen(PropertieField)+strlen(PropertieValue)+strlen("SetField    ")+1);
+
+       if (LenStr >= CommandLenMax)
+       {
+               Scierror(999,"Tcl Command > %d characters \r\n",CommandLenMax);
+               return 0;
+       }
+       nocase(PropertieField);
+
+       sprintf(MyTclCommand,"SetField %d \"%s\" \"%s\"",Handle,PropertieField,PropertieValue);
+
+       if ( Tcl_Eval(TCLinterp,MyTclCommand) == TCL_ERROR  )
+       {
+               Scierror(999,"Tcl Error %s\r\n",TCLinterp->result);
+               return 0;
+       }
+
+       bOK=1;
+
+       
+       return bOK;
+}
+/*-----------------------------------------------------------------------------------*/
+int InterfaceScilabToUiSet(int  Handle,int RhsPropertieField,int RhsPropertieValue)
+{
+       static int l1,n1,m1;
+       int bOK=0;
+       
+       if ( (Handle > 0) && (GetType(RhsPropertieField) == sci_strings) )
+       {
+               char *PropertieField=NULL;
+               char *PropertieValue=NULL;
+
+               GetRhsVar(RhsPropertieField,"c",&m1,&n1,&l1);
+               PropertieField=cstk(l1);
+
+               if (GetType(RhsPropertieValue) == sci_strings)
+               {
+                       GetRhsVar(RhsPropertieValue,"c",&m1,&n1,&l1);
+                       PropertieValue=cstk(l1);
+               }
+               else if (GetType(RhsPropertieValue) == sci_matrix)
+               {
+                       PropertieValue=Matrix2String(RhsPropertieValue);
+               }
+               else
+               {
+                       Scierror(999,"Invalid parameter(s) type.\n");
+                       return 0;
+               }
+
+               bOK=TCL_UiSet(Handle,PropertieField,PropertieValue);
+
+               if (PropertieField){free(PropertieField);PropertieField=NULL;}
+               if (PropertieValue){free(PropertieValue);PropertieValue=NULL;}
+       }
+       else
+       {
+               if (Handle <= 0)
+               {
+                       Scierror(999,"Invalid Handle. it must be > 0.\n");
+                       return 0;
+               }
+               if (GetType(RhsPropertieField) != sci_strings)
+               {
+                       Scierror(999,"Invalid parameter(s) type.\n");
+                       return 0;
+               }
+       }
+
+       return bOK;
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/routines/tclsci/TclUiSet.h b/scilab/routines/tclsci/TclUiSet.h
new file mode 100644 (file)
index 0000000..56d40f1
--- /dev/null
@@ -0,0 +1,14 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __TCLUISET__
+#define __TCLUISET__
+
+#include "TCL_Global.h"
+
+int InterfaceScilabToUiSet(int  Handle,int RhsPropertieField,int RhsPropertieValue);
+int TCL_UiSet(int Handle,char *PropertieField,char *PropertieValue);
+
+#endif /* __TCLUISET__ */
+/*-----------------------------------------------------------------------------------*/ 
diff --git a/scilab/routines/tclsci/fundef.tclsci b/scilab/routines/tclsci/fundef.tclsci
new file mode 100644 (file)
index 0000000..ddbbea5
--- /dev/null
@@ -0,0 +1,10 @@
+{"TCL_DoOneEvent",      IN_tclsci, 1,  2},
+{"TCL_EvalFile",        IN_tclsci, 2,  2}, 
+{"TCL_EvalStr",         IN_tclsci, 3,  2},
+{"TCL_GetVar",          IN_tclsci, 4,  2},
+{"TCL_SetVar",          IN_tclsci, 5,  2},
+{"opentk",              IN_tclsci, 6,  2},
+{"close",               IN_tclsci, 7,    2},
+{"findobj",             IN_tclsci, 8,    2},
+{"%s_set",              IN_tclsci, 9,  2},
+{"%s_get",              IN_tclsci, 10, 2},
diff --git a/scilab/routines/tclsci/intClose.c b/scilab/routines/tclsci/intClose.c
new file mode 100644 (file)
index 0000000..8a6489f
--- /dev/null
@@ -0,0 +1,61 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#include "intClose.h"
+/*-----------------------------------------------------------------------------------*/
+int C2F(intClose) _PARAMS((char *fname))
+{
+       char MyTclCommand[2000];
+
+       CheckLhs(1,1);
+       CheckRhs(0,1);
+
+       if (Rhs == 0)
+       {
+               sprintf(MyTclCommand, "DestroyFigure 0;"); 
+       }
+       else
+       {
+               if ( GetType(1) == sci_matrix )
+               {
+                       static int l1,n1,m1;
+                       int *param=NULL;
+
+                       GetRhsVar(1,"i",&m1,&n1,&l1);
+
+                       if ( (m1 == 1) && (n1 == 1) )
+                       {
+                               param=istk(l1);
+                               if (*param >= 0)
+                               {
+                                       sprintf(MyTclCommand, "DestroyFigure %d;",*param); 
+                               }
+                               else
+                               {
+                                       Scierror(999,"parameter must be >= 0\n");
+                                       return 0;
+                               }
+                               
+                       }
+                       else
+                       {
+                               Scierror(999,"Invalid parameter type : must be a integer\n");
+                               return 0;
+                       }
+               }
+               else
+               {
+                       Scierror(999,"Invalid parameter type : must be a integer\n");
+                       return 0;
+               }
+       }
+       
+       Tcl_Eval(TCLinterp,MyTclCommand);
+       
+       LhsVar(1) = 0;
+       C2F(putlhsvar)();       
+
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/routines/tclsci/intClose.h b/scilab/routines/tclsci/intClose.h
new file mode 100644 (file)
index 0000000..d8cc4c7
--- /dev/null
@@ -0,0 +1,14 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __INTCLOSE__
+#define __INTCLOSE__
+
+#include "TCL_Global.h"
+
+int C2F(intClose) _PARAMS((char *fname));
+
+
+#endif /* __INTCLOSE__ */
+/*-----------------------------------------------------------------------------------*/ 
diff --git a/scilab/routines/tclsci/intFindObj.c b/scilab/routines/tclsci/intFindObj.c
new file mode 100644 (file)
index 0000000..a0cdabe
--- /dev/null
@@ -0,0 +1,68 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#include "intFindObj.h"
+/*-----------------------------------------------------------------------------------*/
+int C2F(intFindObj) _PARAMS((char *fname))
+{
+       int *paramoutINT=NULL;
+
+       CheckLhs(1,1);
+       CheckRhs(2,2);
+
+       if ( (GetType(1) == sci_strings ) && (GetType(2) == sci_strings ) )
+       {
+               static int l1,n1,m1;
+               
+               char MyTclCommand[2000];
+               char *StrHandle;
+               int Handle=0;
+               char *field=NULL;
+               char *value=NULL;
+                       
+               GetRhsVar(1,"c",&m1,&n1,&l1);
+               field=cstk(l1);
+
+               GetRhsVar(2,"c",&m1,&n1,&l1);
+               value=cstk(l1);
+
+               nocase(value);
+
+               sprintf(MyTclCommand, "set TclScilabTmpVar [FindObj \"%s\" \"%s\"];", field, value);
+               Tcl_Eval(TCLinterp,MyTclCommand);
+               StrHandle = (char*)Tcl_GetVar(TCLinterp, "TclScilabTmpVar", 0);
+
+               Handle = (int)atoi(StrHandle);
+
+               if (Handle == -1)  
+               {
+                       /* object not found */
+                       m1=0;
+                       n1=0;
+                       l1=0;
+                       CreateVar(1,"d",  &m1, &n1, &l1);
+               }
+               else
+               {
+                       /* objet found */
+                       paramoutINT=(int*)malloc(sizeof(int));
+                       *paramoutINT=(int)(Handle);
+                       n1=1;
+                       CreateVarFromPtr(1, "i", &n1, &n1, &paramoutINT);
+               }
+       }
+       else
+       {
+               Scierror(999,"Invalid parameter(s) type.\n");
+               return 0;
+       }
+       
+       LhsVar(1) = 1;
+       C2F(putlhsvar)();       
+
+    if (paramoutINT) {free(paramoutINT);paramoutINT=NULL;}
+
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/routines/tclsci/intFindObj.h b/scilab/routines/tclsci/intFindObj.h
new file mode 100644 (file)
index 0000000..ec9a11f
--- /dev/null
@@ -0,0 +1,13 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __INTFINDOBJ__
+#define __INTFINDOBJ__
+
+#include "TCL_Global.h"
+
+int C2F(intFindObj) _PARAMS((char *fname));
+
+#endif /* __INTFINDOBJ__ */
+/*-----------------------------------------------------------------------------------*/ 
diff --git a/scilab/routines/tclsci/intOpenTk.c b/scilab/routines/tclsci/intOpenTk.c
new file mode 100644 (file)
index 0000000..a6f356b
--- /dev/null
@@ -0,0 +1,26 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#include "intOpenTk.h"
+/*-----------------------------------------------------------------------------------*/
+int C2F(intOpenTk) _PARAMS((char *fname))
+{
+       Tcl_Interp *TCLinterpLocal=NULL;
+
+       CheckRhs(0,0);
+       CheckLhs(1,1);
+  
+       TCLinterpLocal = Tcl_CreateInterp();
+    Tcl_Init(TCLinterpLocal);
+    Tk_Init(TCLinterpLocal);
+    TKmainWindow = Tk_MainWindow(TCLinterpLocal);
+    Tk_GeometryRequest(TKmainWindow,200,200);
+    Tk_SetWindowBackground(TKmainWindow, WhitePixelOfScreen(Tk_Screen(TKmainWindow)));
+
+       LhsVar(1) = 0;
+       C2F(putlhsvar)();       
+       
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/routines/tclsci/intOpenTk.h b/scilab/routines/tclsci/intOpenTk.h
new file mode 100644 (file)
index 0000000..6acba48
--- /dev/null
@@ -0,0 +1,13 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __INTOPENTK__
+#define __INTOPENTK__
+
+#include "TCL_Global.h"
+
+int C2F(intOpenTk) _PARAMS((char *fname));
+
+#endif /* __INTOPENTK__ */
+/*-----------------------------------------------------------------------------------*/ 
index 7d89ce5..4a6f8db 100644 (file)
@@ -4,7 +4,7 @@
 /*-----------------------------------------------------------------------------------*/
 #include "intTclDoOneEvent.h"
 /*-----------------------------------------------------------------------------------*/
-C2F(intTclDoOneEvent) _PARAMS((char *fname))
+int C2F(intTclDoOneEvent) _PARAMS((char *fname))
 {
        CheckRhs(0,0);
        CheckLhs(1,1);
index 7d0e2fc..839dfad 100644 (file)
@@ -5,7 +5,7 @@
 #ifndef __INTTCLDOONEEVENT__
 #define __INTTCLDOONEEVENT__
 
-#include "TCL_GLOBAL.h"
+#include "TCL_Global.h"
 
 
 int C2F(intTclDoOneEvent) _PARAMS((char *fname));
index 0e8b768..42b77db 100644 (file)
@@ -4,7 +4,7 @@
 /*-----------------------------------------------------------------------------------*/
 #include "intTclEvalFile.h"
 /*-----------------------------------------------------------------------------------*/
-C2F(intTclEvalFile) _PARAMS((char *fname))
+int C2F(intTclEvalFile) _PARAMS((char *fname))
 {
   /* execute Tcl scripts */
   int m1,n1,l1;
@@ -16,17 +16,17 @@ C2F(intTclEvalFile) _PARAMS((char *fname))
   if (GetType(1) == sci_strings)
   {
        GetRhsVar(1,"c",&m1,&n1,&l1);
-       RET=Tcl_EvalFile(TKinterp,cstk(l1));
+       RET=Tcl_EvalFile(TCLinterp,cstk(l1));
 
        if (RET==TCL_ERROR)
        {
                if (C2F(iop).err>0) 
                {
-                       sciprint("%s, at line %i of file %s\r\n","ScilabEval",TKinterp->errorLine,cstk(l1));
+                       sciprint("%s, at line %i of file %s\r\n","ScilabEval",TCLinterp->errorLine,cstk(l1));
                }
         else
                {
-                       Scierror(999,"%s, at line %i of file %s: %s\r\n",fname,TKinterp->errorLine,cstk(l1),TKinterp->result);
+                       Scierror(999,"%s, at line %i of file %s: %s\r\n",fname,TCLinterp->errorLine,cstk(l1),TCLinterp->result);
                        return 0;
                }
     }
index a730a3f..a20493c 100644 (file)
@@ -5,7 +5,7 @@
 #ifndef __INTTCLEVALFILE__
 #define __INTTCLEVALFILE__
 
-#include "TCL_GLOBAL.h"
+#include "TCL_Global.h"
 
 int C2F(intTclEvalFile) _PARAMS((char *fname));
 
index 57a7a5e..783c993 100644 (file)
@@ -4,7 +4,7 @@
 /*-----------------------------------------------------------------------------------*/
 #include "intTclEvalStr.h"
 /*-----------------------------------------------------------------------------------*/
-C2F(intTclEvalStr) _PARAMS((char *fname))
+int C2F(intTclEvalStr) _PARAMS((char *fname))
 { 
        CheckRhs(1,1);
        CheckLhs(1,1);
@@ -17,7 +17,7 @@ C2F(intTclEvalStr) _PARAMS((char *fname))
                GetRhsVar(1,"S",&m1,&n1,&Str);
                for (i = 0; i<m1*n1 ;i++)
                {
-                       RET=Tcl_Eval(TKinterp,Str[i]);
+                       RET=Tcl_Eval(TCLinterp,Str[i]);
                        if (RET==TCL_ERROR)
                        {
                                if(C2F(iop).err>0)
@@ -26,7 +26,7 @@ C2F(intTclEvalStr) _PARAMS((char *fname))
                                }
                                else
                                {
-                                       Scierror(999,"%s, %s at line %i \r\n",fname,TKinterp->result,i+1);
+                                       Scierror(999,"%s, %s at line %i \r\n",fname,TCLinterp->result,i+1);
                                }
                                FreeRhsSVar(Str);
                                return 0;
index d282b6b..37c084a 100644 (file)
@@ -5,7 +5,7 @@
 #ifndef __INTTCLEVALSTR__
 #define __INTTCLEVALSTR__
 
-#include "TCL_GLOBAL.h"
+#include "TCL_Global.h"
 
 
 int C2F(intTclEvalStr) _PARAMS((char *fname));
diff --git a/scilab/routines/tclsci/intTclGcf.c b/scilab/routines/tclsci/intTclGcf.c
new file mode 100644 (file)
index 0000000..2e63808
--- /dev/null
@@ -0,0 +1,42 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#include "intTclGcf.h"
+/*-----------------------------------------------------------------------------------*/
+int GetTclCurrentFigure(void);
+/*-----------------------------------------------------------------------------------*/
+int C2F(intTclGcf) _PARAMS((char *fname))
+{
+       static int l1,n1,m1;
+       int *paramoutINT=(int*)malloc(sizeof(int));
+
+       CheckRhs(0,0);
+       CheckLhs(1,1);
+       
+       *paramoutINT=GetTclCurrentFigure();
+       n1=1;
+       CreateVarFromPtr(1, "i", &n1, &n1, &paramoutINT);
+
+       LhsVar(1) = 1;
+       C2F(putlhsvar)();       
+
+       if (paramoutINT) {free(paramoutINT);paramoutINT=NULL;}
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
+int GetTclCurrentFigure(void)
+{
+       int ValRet=-1;
+       char MyTclCommand[2000];
+       char *StrHandle;
+
+       sprintf(MyTclCommand, "set TclScilabTmpVar [GetGcf];"); 
+       Tcl_Eval(TCLinterp,MyTclCommand);
+       StrHandle = (char *) Tcl_GetVar(TCLinterp, "TclScilabTmpVar", 0);
+
+       ValRet=(int)atoi(StrHandle);
+
+       return ValRet;
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/routines/tclsci/intTclGcf.h b/scilab/routines/tclsci/intTclGcf.h
new file mode 100644 (file)
index 0000000..a04110e
--- /dev/null
@@ -0,0 +1,14 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __INTTCLGCF__
+#define __INTTCLGCF__
+
+#include "TCL_Global.h"
+
+
+int C2F(intTclGcf) _PARAMS((char *fname));
+
+#endif /* __INTTCLGCF__ */
+/*-----------------------------------------------------------------------------------*/ 
diff --git a/scilab/routines/tclsci/intTclGet.c b/scilab/routines/tclsci/intTclGet.c
new file mode 100644 (file)
index 0000000..26b5822
--- /dev/null
@@ -0,0 +1,33 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#include "intTclGet.h"
+/*-----------------------------------------------------------------------------------*/
+int C2F(intTclGet) _PARAMS((char *fname))
+{
+       CheckLhs(1,1);
+       CheckRhs(2,2);
+
+       if ( IsAInteger(Rhs-1) && (GetType(Rhs)==sci_strings) )
+       {
+               static int l1,n1,m1;
+               int *Handle=NULL;
+
+               GetRhsVar(Rhs-1,"i",&m1,&n1,&l1);
+               Handle=istk(l1);
+
+               TCL_UiGet(*Handle,Rhs);
+       }
+       else
+       {
+               Scierror(999,"Invalid parameter(s) type.\n");
+               return 0;
+       }
+
+       LhsVar(1) = Rhs+1;
+       C2F(putlhsvar)();       
+
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/routines/tclsci/intTclGet.h b/scilab/routines/tclsci/intTclGet.h
new file mode 100644 (file)
index 0000000..16c2019
--- /dev/null
@@ -0,0 +1,14 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __INTTCLGET__
+#define __INTTCLGET__
+
+#include "TCL_Global.h"
+#include "TclUiGet.h"
+
+int C2F(intTclGet) _PARAMS((char *fname));
+
+#endif /* __INTTCLGET__ */
+/*-----------------------------------------------------------------------------------*/ 
index 5a4fd5f..1d5adcf 100644 (file)
@@ -4,7 +4,7 @@
 /*-----------------------------------------------------------------------------------*/
 #include "intTclGetVar.h"
 /*-----------------------------------------------------------------------------------*/
-C2F(intTclGetVar) _PARAMS((char *fname))
+int C2F(intTclGetVar) _PARAMS((char *fname))
 {
        static int l1,n1,m1;
        int TypeVar1=GetType(1);
@@ -20,7 +20,7 @@ C2F(intTclGetVar) _PARAMS((char *fname))
                GetRhsVar(1,"c",&m1,&n1,&l1);
                VarName=cstk(l1);
 
-               RetStr= (char*)Tcl_GetVar(TKinterp, VarName, 0);
+               RetStr= (char*)Tcl_GetVar(TCLinterp, VarName, 0);
 
                if ( RetStr )
                {
index df93f26..bf7547f 100644 (file)
@@ -5,7 +5,7 @@
 #ifndef __INTTCLGETVAR__
 #define __INTTCLGETVAR__
 
-#include "TCL_GLOBAL.h"
+#include "TCL_Global.h"
 
 
 int C2F(intTclGetVar) _PARAMS((char *fname));
diff --git a/scilab/routines/tclsci/intTclSet.c b/scilab/routines/tclsci/intTclSet.c
new file mode 100644 (file)
index 0000000..06108e9
--- /dev/null
@@ -0,0 +1,41 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#include "intTclSet.h"
+/*-----------------------------------------------------------------------------------*/
+int C2F(intTclSet) _PARAMS((char *fname))
+{
+       CheckLhs(1,1);
+       CheckRhs(3,3);
+
+       if ( IsAInteger(Rhs-2) && (GetType(Rhs-1)==sci_strings) )
+       {
+               static int l1,n1,m1;
+               int *Handle=NULL;
+
+               GetRhsVar(1,"i",&m1,&n1,&l1);
+               Handle=istk(l1);
+               
+               InterfaceScilabToUiSet(*Handle,Rhs-1,Rhs);
+       }
+       else
+       {
+               if (GetType(Rhs-1)==sci_strings)
+               {
+                       Scierror(999,"Handle must be an integer.\n");
+                       return 0;
+               }
+               if ( IsAInteger(Rhs-2) )
+               {
+                       Scierror(999,"Field parameter must be a string.\n");
+                       return 0;
+               }
+    }
+
+       LhsVar(1) = 0;
+       C2F(putlhsvar)();       
+
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/routines/tclsci/intTclSet.h b/scilab/routines/tclsci/intTclSet.h
new file mode 100644 (file)
index 0000000..2f91d2e
--- /dev/null
@@ -0,0 +1,14 @@
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2005 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __INTTCLSET__
+#define __INTTCLSET__
+
+#include "TCL_Global.h"
+#include "TclUiSet.h"
+
+int C2F(intTclSet) _PARAMS((char *fname));
+
+#endif /* __INTTCLSET__ */
+/*-----------------------------------------------------------------------------------*/ 
index e27b760..ade1428 100644 (file)
@@ -4,7 +4,7 @@
 /*-----------------------------------------------------------------------------------*/
 #include "intTclSetVar.h"
 /*-----------------------------------------------------------------------------------*/
-C2F(intTclSetVar) _PARAMS((char *fname))
+int C2F(intTclSetVar) _PARAMS((char *fname))
 {
        static int l1,n1,m1;
        int TypeVar1=GetType(1);
@@ -25,7 +25,7 @@ C2F(intTclSetVar) _PARAMS((char *fname))
                VarValue=cstk(l1);
                
 
-               if ( !Tcl_SetVar(TKinterp, VarName, VarValue, 0) )
+               if ( !Tcl_SetVar(TCLinterp, VarName, VarValue, 0) )
                {
                        *paramoutINT=(int)(FALSE);
                }
index 1e7cc01..e7fff0f 100644 (file)
@@ -5,7 +5,7 @@
 #ifndef __INTTCLSETVAR__
 #define __INTTCLSETVAR__
 
-#include "TCL_GLOBAL.h"
+#include "TCL_Global.h"
 
 
 int C2F(intTclSetVar) _PARAMS((char *fname));
index 26d5acd..0cc4153 100644 (file)
@@ -8,6 +8,12 @@ extern int C2F(intTclEvalFile) _PARAMS((char *fname));
 extern int C2F(intTclEvalStr) _PARAMS((char *fname));
 extern int C2F(intTclGetVar) _PARAMS((char *fname));
 extern int C2F(intTclSetVar) _PARAMS((char *fname));
+extern int C2F(intOpenTk) _PARAMS((char *fname));
+extern int C2F(intClose) _PARAMS((char *fname));
+extern int C2F(intFindObj) _PARAMS((char *fname));
+extern int C2F(intTclSet) _PARAMS((char *fname));
+extern int C2F(intTclGet) _PARAMS((char *fname));
+extern int C2F(intTclGcf) _PARAMS((char *fname));
 /*-----------------------------------------------------------------------------------*/
  static TCLSCITable Tab[]=
  {
@@ -15,7 +21,13 @@ extern int C2F(intTclSetVar) _PARAMS((char *fname));
   {C2F(intTclEvalFile),"TCL_EvalFile"},
   {C2F(intTclEvalStr),"TCL_EvalStr"},
   {C2F(intTclGetVar),"TCL_GetVar"},
-  {C2F(intTclSetVar),"TCL_SetVar"}
+  {C2F(intTclSetVar),"TCL_SetVar"},
+  {C2F(intOpenTk),"opentk"},
+  {C2F(intClose),"close"},
+  {C2F(intFindObj),"findobj"},
+  {C2F(intTclSet),"%s_set"},
+  {C2F(intTclGet),"%s_get"},
+  {C2F(intTclGcf),"TCL_gcf"}
 
  };
 /*-----------------------------------------------------------------------------------*/
index 68af962..6c5a2bb 100644 (file)
@@ -15,7 +15,8 @@
 
 typedef int (*TCLSci_Interf) __PARAMS((char *fname,unsigned long l));
 
-typedef struct table_struct {
+typedef struct table_struct 
+{
   TCLSci_Interf f;    /** function **/
   char *name;      /** its name **/
 } TCLSCITable;
index 6041f8e..24ea061 100644 (file)
@@ -679,6 +679,18 @@ cd .. &gt;nul
                        Name="Source Files"
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
                        <File
+                               RelativePath=".\InitTclTk.c">
+                       </File>
+                       <File
+                               RelativePath=".\intClose.c">
+                       </File>
+                       <File
+                               RelativePath=".\intFindObj.c">
+                       </File>
+                       <File
+                               RelativePath=".\intOpenTk.c">
+                       </File>
+                       <File
                                RelativePath=".\intTclDoOneEvent.c">
                        </File>
                        <File
@@ -688,22 +700,55 @@ cd .. &gt;nul
                                RelativePath=".\intTclEvalStr.c">
                        </File>
                        <File
+                               RelativePath=".\intTclGcf.c">
+                       </File>
+                       <File
+                               RelativePath=".\intTclGet.c">
+                       </File>
+                       <File
                                RelativePath=".\intTclGetVar.c">
                        </File>
                        <File
                                RelativePath=".\inttclsci.c">
                        </File>
                        <File
+                               RelativePath=".\intTclSet.c">
+                       </File>
+                       <File
                                RelativePath=".\intTclSetVar.c">
                        </File>
                        <File
+                               RelativePath=".\ScilabEval.c">
+                       </File>
+                       <File
                                RelativePath=".\TCL_Global.c">
                        </File>
+                       <File
+                               RelativePath=".\TclEvents.c">
+                       </File>
+                       <File
+                               RelativePath=".\TclUiGet.c">
+                       </File>
+                       <File
+                               RelativePath=".\TclUiSet.c">
+                       </File>
                </Filter>
                <Filter
                        Name="Header Files"
                        Filter="h;hpp;hxx;hm;inl">
                        <File
+                               RelativePath=".\InitTclTk.h">
+                       </File>
+                       <File
+                               RelativePath=".\intClose.h">
+                       </File>
+                       <File
+                               RelativePath=".\intFindObj.h">
+                       </File>
+                       <File
+                               RelativePath=".\intOpenTk.h">
+                       </File>
+                       <File
                                RelativePath=".\intTclDoOneEvent.h">
                        </File>
                        <File
@@ -713,17 +758,38 @@ cd .. &gt;nul
                                RelativePath=".\intTclEvalStr.h">
                        </File>
                        <File
+                               RelativePath=".\intTclGcf.h">
+                       </File>
+                       <File
+                               RelativePath=".\intTclGet.h">
+                       </File>
+                       <File
                                RelativePath=".\intTclGetVar.h">
                        </File>
                        <File
                                RelativePath=".\inttclsci.h">
                        </File>
                        <File
+                               RelativePath=".\intTclSet.h">
+                       </File>
+                       <File
                                RelativePath=".\intTclSetVar.h">
                        </File>
                        <File
+                               RelativePath=".\intUIMenu.h">
+                       </File>
+                       <File
+                               RelativePath=".\ScilabEval.h">
+                       </File>
+                       <File
                                RelativePath=".\TCL_Global.h">
                        </File>
+                       <File
+                               RelativePath=".\TclEvents.h">
+                       </File>
+                       <File
+                               RelativePath=".\TclUiGet.h">
+                       </File>
                </Filter>
        </Files>
        <Globals>
index ff88a05..1deb8f5 100644 (file)
@@ -41,7 +41,7 @@ Rscilab.res: Rscilab.rc wresource.h
 
 #===================test ========================
 #!IF "$(DTK)" == "-DWITH_TK"
-#GTK_LIBS= ../../libs/tksci.lib ../../libs/intersci.lib ../../libs/libf2c.lib $(XLIBS)
+#GTK_LIBS= ../../libs/tclsci.lib ../../libs/intersci.lib ../../libs/libf2c.lib $(XLIBS)
 #!ELSE 
 GTK_LIBS= $(XLIBS)
 #!ENDIF
index ad35143..c5ce706 100644 (file)
@@ -37,7 +37,7 @@ GUIFLAGS=-SUBSYSTEM:windows
 
 #===================test ========================
 !IF "$(DTK)" == "-DWITH_TK"
-GTK_LIBS= ../../libs/tksci.lib ../../libs/intersci.lib ../../libs/libf2c.lib $(XLIBS)
+GTK_LIBS= ../../libs/tclsci.lib ../../libs/intersci.lib ../../libs/libf2c.lib $(XLIBS)
 !ELSE 
 GTK_LIBS= $(XLIBS)
 !ENDIF
index 7fb1540..9597556 100644 (file)
@@ -17,7 +17,7 @@
 #include "../machine.h"
 #ifdef WITH_TK
 #include "tcl.h"
-extern void inittk ();
+extern void initTCLTK ();
 extern void flushTKEvents ();
 extern int  tcl_check_one_event(void);
 static int BasicScilab = 1;
@@ -48,7 +48,7 @@ int GetBasic()
 void start_sci_gtk() 
 {
 #ifdef WITH_TK
-  inittk();
+  initTCLTK();
   BasicScilab = 0;
   flushTKEvents();
 #endif
@@ -60,7 +60,7 @@ void SetXsciOn ()
 switch_rlgets (1);
 INXscilab = 1;
 #ifdef WITH_TK
-  inittk ();
+  initTCLTK ();
 #endif
 }
 /*-----------------------------------------------------------------------------------*/
@@ -100,7 +100,7 @@ void sci_tk_activate(void)
 {
        #ifdef WITH_TK
   start_sci_gtk();
-  inittk();
+  initTCLTK();
   BasicScilab = 0;
   #endif
 }
index e1b0aa6..d92f6a8 100644 (file)
@@ -1801,7 +1801,6 @@ int GetScreenProperty(char *prop, char *value)
     }
   else
     {
-      sciprint("Unknown property %s\r\n",prop);
       return -1;
     }
   return 0;
index c23e63a..a189735 100644 (file)
@@ -913,7 +913,18 @@ EXPORT LRESULT CALLBACK WndParentProc (HWND hwnd, UINT message, WPARAM wParam, L
                                SecondOccurence= strtok(NULL,"("); 
                        wsprintf(ScilexWindowName,"%s (%s",VERSION,SecondOccurence);
                
-                       SetWindowText(hwnd,ScilexWindowName);  
+                       SetWindowText(hwnd,ScilexWindowName); 
+//                             {
+//                             typedef BOOL (WINAPI *SLWA_FUNC)(HWND hwnd,COLORREF crKey,BYTE 
+//bAlpha,DWORD dwFlags);
+//                                     SLWA_FUNC MySetLayeredWindowAttributes;
+//HMODULE hUser32 = GetModuleHandle("USER32.DLL");
+//if (!hUser32) return FALSE;
+//MySetLayeredWindowAttributes = (SLWA_FUNC)GetProcAddress(hUser32, "SetLayeredWindowAttributes");
+//                             #define _WIN32_WINNT 0x0500
+//#define LWA_COLORKEY    0x01
+// MySetLayeredWindowAttributes(hwnd, RGB(255, 0, 255), 0, LWA_COLORKEY);
+//}
                }
         }
                break;
index 675cd83..7c5518b 100644 (file)
@@ -53,7 +53,7 @@ test: $(OBJTEST) $(OBJSC) ../sun/zzledt.o ../sun/flags.o  ../sun/men_Sutils.o ..
        $(CC) -g -o $@ $(OBJTEST) ../sun/zzledt.o ../sun/flags.o  ../sun/tmpdir.o \
        ../sun/men_Sutils.o ../sun/inffic.o ../sun/timer.o \
        $(OBJSC) $(SCIDIR)/libs/graphics.a $(SCIDIR)/libs/menusX.a \
-       $(SCIDIR)/@TKSCILIB@ $(CC_LDFLAGS) $(XLIBS) $(TERMCAPLIB) \
+       $(SCIDIR)/@TCLSCILIB@ $(CC_LDFLAGS) $(XLIBS) $(TERMCAPLIB) \
        $(TCLTK_LIBS) -lm
 
 clean::
@@ -121,8 +121,8 @@ x_VTPrsTbl.o: x_VTPrsTbl.c x_VTparse.h
 x_button.o: x_button.c x_ptyxP.h x_ptyx.h x_data.h x_error.h x_menu.h \
   ../machine.h All-extern-x.h
 x_charproc.o: x_charproc.c ../machine.h x_ptyxP.h x_ptyx.h x_VTparse.h \
-  x_data.h x_error.h x_menu.h x_main.h ../tksci/tksci.h \
-  ../tksci/C-LAB_Interf.h ../stack-def.h All-extern-x.h All-extern.h
+  x_data.h x_error.h x_menu.h x_main.h ../tclsci/TCL_Global.h \
+  ../stack-def.h All-extern-x.h All-extern.h
 x_cursor.o: x_cursor.c x_ptyxP.h x_ptyx.h ../machine.h All-extern-x.h
 x_data.o: x_data.c x_ptyxP.h x_ptyx.h x_data.h
 x_input.o: x_input.c x_ptyxP.h x_ptyx.h ../machine.h All-extern-x.h
index 9b97557..1ec6f7f 100644 (file)
@@ -49,7 +49,7 @@
 #include "../sun/Sun.h"
 
 #ifdef WITH_TK
-#include "../tksci/tksci.h"
+#include "../tclsci/TCL_Global.h"
 #endif
 
 extern int  Scierror __PARAMS((int iv,char *fmt,...));
@@ -85,7 +85,7 @@ static int intoemacs=0;
 void SetXsciOn(void)
 {
 #ifdef WITH_TK
-  inittk();
+  initTCLTK();
 #endif
   INXscilab=1;
 }
@@ -146,7 +146,7 @@ void sci_tk_activate(void)
   Cout("You have started Scilab in a mode in which TK is not initialized.\n");
   Cout("Trying to initialize \n");
   DisplayInit("",&dpy,&toplevel);
-  inittk();
+  initTCLTK();
   BasicScilab = 0;
   basic_scilab_mask(&dpy);
   flushTKEvents();
index 5c6db62..86b6405 100644 (file)
@@ -67,7 +67,7 @@
 
 
 #ifdef WITH_TK
-#include "../tksci/tksci.h"
+#include "../tclsci/TCL_Global.h"
 #endif
 
 
index 97c30f6..dd68c00 100644 (file)
@@ -1114,7 +1114,6 @@ int GetScreenProperty(char *prop, char *value)
     }
   else
     {
-      sciprint("Unknown property %s\r\n",prop);
       return -1;
     }
   return 0;