add function libraryinfo and librarieslist 00/15900/4
Antoine ELIAS [Tue, 3 Feb 2015 08:22:25 +0000 (09:22 +0100)]
test_run functions get_function_path
test_run functions libraryinfo.encoding
test_run functions bug_10391
test_run functions bug_4608
test_run functions bug_7619
test_run functions bug_7952
test_run helptools bug_5486

Tests in Scinotes: CopyAsHTML, bug_5707, ...

Change-Id: I7727799de722de6f55224a17f553698d543396c3

15 files changed:
scilab/modules/ast/includes/symbol/context.hxx
scilab/modules/ast/includes/symbol/libraries.hxx
scilab/modules/ast/src/cpp/symbol/context.cpp
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/includes/functions_gw.hxx
scilab/modules/functions/includes/gw_functions.h
scilab/modules/functions/sci_gateway/cpp/functions_gw.vcxproj
scilab/modules/functions/sci_gateway/cpp/functions_gw.vcxproj.filters
scilab/modules/functions/sci_gateway/cpp/sci_librarieslist.cpp [new file with mode: 0644]
scilab/modules/functions/sci_gateway/cpp/sci_libraryinfo.cpp [new file with mode: 0644]
scilab/modules/functions/sci_gateway/functions_gateway.xml
scilab/modules/functions/tests/nonreg_tests/bug_7952.dia.ref
scilab/modules/functions/tests/nonreg_tests/bug_7952.tst
scilab/modules/scinotes/tests/nonreg_tests/bug_5707.tst

index 0b48765..1873ba7 100644 (file)
@@ -80,6 +80,7 @@ public :
     std::list<std::wstring>* getVarsNameForWho(bool sorted);
     std::list<std::wstring>* getGlobalNameForWho(bool sorted);
     std::list<std::wstring>* getWhereIs(const std::wstring& _str);
+    std::list<std::wstring>* getLibrariesList();
 
     /* global functions */
 
index 8759e11..6072995 100644 (file)
@@ -271,6 +271,18 @@ struct Libraries
         return ret;
     }
 
+    std::list<std::wstring>* librarieslist()
+    {
+        std::list<std::wstring>* ret = new std::list<std::wstring>();
+
+        for (auto lib : libs)
+        {
+            ret->push_back(lib.first.getName());
+        }
+
+        return ret;
+    }
+
 private:
     MapLibs libs;
 };
index 7254991..73446bb 100644 (file)
@@ -249,6 +249,11 @@ std::list<std::wstring>* Context::getWhereIs(const std::wstring& _str)
     return libraries.whereis(Symbol(_str));
 }
 
+std::list<std::wstring>* Context::getLibrariesList()
+{
+    return libraries.librarieslist();
+}
+
 void Context::put(Variable* _var, types::InternalType* _pIT)
 {
     if (_pIT->isLibrary())
index 647d7f1..449d350 100644 (file)
@@ -13,7 +13,9 @@ GATEWAY_CPP_SOURCES =  \
     sci_gateway/cpp/sci_execstr.cpp \
     sci_gateway/cpp/sci_getCurrentThreadId.cpp \
     sci_gateway/cpp/sci_getThreads.cpp \
-    sci_gateway/cpp/sci_macrovar.cpp
+    sci_gateway/cpp/sci_macrovar.cpp \
+    sci_gateway/cpp/sci_libraryinfo.cpp \
+    sci_gateway/cpp/sci_librarieslist.cpp
 
 libscifunctions_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
index 9f3aca7..f3aca39 100644 (file)
@@ -171,7 +171,9 @@ am__objects_2 = sci_gateway/cpp/libscifunctions_la-sci_exec.lo \
        sci_gateway/cpp/libscifunctions_la-sci_execstr.lo \
        sci_gateway/cpp/libscifunctions_la-sci_getCurrentThreadId.lo \
        sci_gateway/cpp/libscifunctions_la-sci_getThreads.lo \
-       sci_gateway/cpp/libscifunctions_la-sci_macrovar.lo
+       sci_gateway/cpp/libscifunctions_la-sci_macrovar.lo \
+       sci_gateway/cpp/libscifunctions_la-sci_libraryinfo.lo \
+       sci_gateway/cpp/libscifunctions_la-sci_librarieslist.lo
 am_libscifunctions_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscifunctions_la_OBJECTS = $(am_libscifunctions_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -553,7 +555,9 @@ GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/sci_execstr.cpp \
     sci_gateway/cpp/sci_getCurrentThreadId.cpp \
     sci_gateway/cpp/sci_getThreads.cpp \
-    sci_gateway/cpp/sci_macrovar.cpp
+    sci_gateway/cpp/sci_macrovar.cpp \
+    sci_gateway/cpp/sci_libraryinfo.cpp \
+    sci_gateway/cpp/sci_librarieslist.cpp
 
 libscifunctions_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
@@ -782,6 +786,12 @@ sci_gateway/cpp/libscifunctions_la-sci_getThreads.lo:  \
 sci_gateway/cpp/libscifunctions_la-sci_macrovar.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libscifunctions_la-sci_libraryinfo.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libscifunctions_la-sci_librarieslist.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 
 libscifunctions.la: $(libscifunctions_la_OBJECTS) $(libscifunctions_la_DEPENDENCIES) $(EXTRA_libscifunctions_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libscifunctions_la_OBJECTS) $(libscifunctions_la_LIBADD) $(LIBS)
@@ -802,6 +812,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_functionlist.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_getCurrentThreadId.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_getThreads.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_librarieslist.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_libraryinfo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_macrovar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_whereis.Plo@am__quote@
 
@@ -909,6 +921,20 @@ sci_gateway/cpp/libscifunctions_la-sci_macrovar.lo: sci_gateway/cpp/sci_macrovar
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifunctions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscifunctions_la-sci_macrovar.lo `test -f 'sci_gateway/cpp/sci_macrovar.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_macrovar.cpp
 
+sci_gateway/cpp/libscifunctions_la-sci_libraryinfo.lo: sci_gateway/cpp/sci_libraryinfo.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifunctions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscifunctions_la-sci_libraryinfo.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_libraryinfo.Tpo -c -o sci_gateway/cpp/libscifunctions_la-sci_libraryinfo.lo `test -f 'sci_gateway/cpp/sci_libraryinfo.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_libraryinfo.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_libraryinfo.Tpo sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_libraryinfo.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_libraryinfo.cpp' object='sci_gateway/cpp/libscifunctions_la-sci_libraryinfo.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifunctions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscifunctions_la-sci_libraryinfo.lo `test -f 'sci_gateway/cpp/sci_libraryinfo.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_libraryinfo.cpp
+
+sci_gateway/cpp/libscifunctions_la-sci_librarieslist.lo: sci_gateway/cpp/sci_librarieslist.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifunctions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscifunctions_la-sci_librarieslist.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_librarieslist.Tpo -c -o sci_gateway/cpp/libscifunctions_la-sci_librarieslist.lo `test -f 'sci_gateway/cpp/sci_librarieslist.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_librarieslist.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_librarieslist.Tpo sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_librarieslist.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_librarieslist.cpp' object='sci_gateway/cpp/libscifunctions_la-sci_librarieslist.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifunctions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscifunctions_la-sci_librarieslist.lo `test -f 'sci_gateway/cpp/sci_librarieslist.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_librarieslist.cpp
+
 mostlyclean-libtool:
        -rm -f *.lo
 
index 66fa8d9..7099802 100644 (file)
@@ -24,6 +24,8 @@ CPP_GATEWAY_PROTOTYPE_EXPORT(sci_whereis, FUNCTIONS_GW_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_getCurrentThreadId, FUNCTIONS_GW_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_getThreads, FUNCTIONS_GW_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_macrovar, FUNCTIONS_GW_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_libraryinfo, FUNCTIONS_GW_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_librarieslist, FUNCTIONS_GW_IMPEXP);
 
 #endif /* __FUNCTIONS_GW_HXX__ */
 
index 5c721b4..a471ca5 100644 (file)
 /*--------------------------------------------------------------------------*/
 FUNCTIONS_SCILAB_IMPEXP int gw_functions(void);
 /*--------------------------------------------------------------------------*/
-FUNCTIONS_SCILAB_IMPEXP int C2F(sci_deff)(char *fname, unsigned long fname_len);
-FUNCTIONS_SCILAB_IMPEXP int C2F(sci_getf)(char *fname, unsigned long fname_len);
-FUNCTIONS_SCILAB_IMPEXP int sci_librarieslist(char *fname, unsigned long fname_len);
-FUNCTIONS_SCILAB_IMPEXP int sci_libraryinfo(char *fname, unsigned long fname_len);
-
 //YaSp
 FUNCTIONS_SCILAB_IMPEXP int sci_libfunc(char *fname, void* pvApiCtx);
 /*--------------------------------------------------------------------------*/
index a0dcd72..1abe911 100644 (file)
     <ClCompile Include="sci_functionlist.cpp" />
     <ClCompile Include="sci_getCurrentThreadId.cpp" />
     <ClCompile Include="sci_getThreads.cpp" />
+    <ClCompile Include="sci_libraryinfo.cpp" />
+    <ClCompile Include="sci_librarieslist.cpp" />
     <ClCompile Include="sci_macrovar.cpp" />
     <ClCompile Include="sci_whereis.cpp" />
   </ItemGroup>
index 7eb24f9..94443d0 100644 (file)
     <ClCompile Include="sci_macrovar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="sci_libraryinfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_librarieslist.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\dynlib_functions_gw.h">
diff --git a/scilab/modules/functions/sci_gateway/cpp/sci_librarieslist.cpp b/scilab/modules/functions/sci_gateway/cpp/sci_librarieslist.cpp
new file mode 100644 (file)
index 0000000..f535543
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2015 - Scilab Enterprises - Antoine ELIAS
+*
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution.  The terms
+* are also available at
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+
+#include <string.h>
+#include "funcmanager.hxx"
+#include "context.hxx"
+#include "functions_gw.hxx"
+#include "string.hxx"
+
+extern "C"
+{
+#include "localization.h"
+#include "Scierror.h"
+}
+
+using namespace types;
+/*--------------------------------------------------------------------------*/
+Function::ReturnValue sci_librarieslist(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    if (in.size() != 0)
+    {
+        Scierror(999, _("%s: Wrong number of input argument(s): %d expected.\n"), "librarieslist", 0);
+        return Function::Error;
+    }
+
+    std::list<std::wstring>* lst = symbol::Context::getInstance()->getLibrariesList();
+
+    String* pOut = new String(static_cast<int>(lst->size()), 1);
+    int i = 0;
+    for (auto l : *lst)
+    {
+        pOut->set(i++, l.c_str());
+    }
+
+    delete lst;
+    out.push_back(pOut);
+    return Function::OK;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/functions/sci_gateway/cpp/sci_libraryinfo.cpp b/scilab/modules/functions/sci_gateway/cpp/sci_libraryinfo.cpp
new file mode 100644 (file)
index 0000000..c1cd494
--- /dev/null
@@ -0,0 +1,88 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2015 - Scilab Enterprises - Antoine ELIAS
+*
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution.  The terms
+* are also available at
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+/*--------------------------------------------------------------------------*/
+
+#include "functions_gw.hxx"
+#include "context.hxx"
+#include "string.hxx"
+#include "double.hxx"
+
+extern "C" {
+#include "Scierror.h"
+#include "localization.h"
+#include "sci_malloc.h"
+#include "charEncoding.h"
+}
+
+/*--------------------------------------------------------------------------*/
+
+using namespace types;
+using namespace std;
+
+Function::ReturnValue sci_libraryinfo(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    /* Check the number of input argument */
+    if (in.size() != 1)
+    {
+        Scierror(999, _("%s: Wrong number of input argument(s): %d expected.\n"), "libraryinfo", 1);
+        return Function::Error;
+    }
+
+    /* Check the number of output argument */
+    if (_iRetCount != 1 && _iRetCount != 2)
+    {
+        Scierror(999, _("%s: Wrong number of output argument(s): %d expected.\n"), "libraryinfo", 1);
+        return Function::Error;
+    }
+
+    if (in[0]->isString() == false)
+    {
+        Scierror(999, _("%s: Wrong type for input argument #%d: A String expected.\n"), "libraryinfo", 1);
+        return Function::Error;
+    }
+
+    types::String* pS = in[0]->getAs<types::String>();
+    if (pS->isScalar() == false)
+    {
+        Scierror(999, _("%s: Wrong size for input argument #%d: A String expected.\n"), "libraryinfo", 1);
+        return Function::Error;
+    }
+
+    InternalType* pIT = symbol::Context::getInstance()->get(symbol::Symbol(pS->get(0)));
+    if (pIT == nullptr || pIT->isLibrary() == false)
+    {
+        char* libname = wide_string_to_UTF8(pS->get()[0]);
+        Scierror(999, _("%s: Invalid library %s.\n"), "libraryinfo", libname);
+        FREE(libname);
+        return Function::Error;
+    }
+
+    types::Library* lib = pIT->getAs<Library>();
+
+    std::list<std::wstring>* names = lib->getMacrosName();
+    String* pNames = new String(static_cast<int>(names->size()), 1);
+    int i = 0;
+    for (auto name : *names)
+    {
+        pNames->set(i++, name.c_str());
+    }
+
+    delete names;
+    out.push_back(pNames);
+
+    if (_iRetCount == 2)
+    {
+        out.push_back(new String(lib->getPath().c_str()));
+    }
+    return Function::OK;
+}
+/*--------------------------------------------------------------------------*/
index c5637b0..c4d4425 100644 (file)
@@ -25,5 +25,7 @@
     <gateway name="sci_whereis"             function="whereis"              type="1" />
     <gateway name="sci_getCurrentThreadId"  function="getCurrentThreadId"   type="1" />
     <gateway name="sci_getThreads"          function="getThreads"           type="1" />
-    <gateway name="sci_macrovar"            function="macrovar"           type="1" />
+    <gateway name="sci_macrovar"            function="macrovar"             type="1" />
+    <gateway name="sci_libraryinfo"         function="libraryinfo"          type="1" />
+    <gateway name="sci_librarieslist"       function="librarieslist"        type="1" />
 </module>
index de29ca9..7031db1 100644 (file)
 // <-- Short Description -->
 // libraryinfo did not check size of input argument.
 //
-if execstr("macros = libraryinfo()", "errcatch") <> 77 then bugmes();quit;end
+if execstr("macros = libraryinfo()", "errcatch") <> 999 then bugmes();quit;end
 if lasterror() <> msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"), "libraryinfo", 1) then bugmes();quit;end
 if execstr("macros = libraryinfo([""functionslib"", ""corelib""])", "errcatch") <> 999 then bugmes();quit;end
-if lasterror() <> msprintf(_("%s: Wrong size for input argument #%d: String expected.\n"), "libraryinfo", 1) then bugmes();quit;end
-macros = libraryinfo('functionslib');
+if lasterror() <> msprintf(_("%s: Wrong size for input argument #%d: A String expected.\n"), "libraryinfo", 1) then bugmes();quit;end
+macros = libraryinfo("functionslib");
 if size(macros) == [] then bugmes();quit;end
-[macroslist, pathmacros] = libraryinfo('functionslib');
+[macroslist, pathmacros] = libraryinfo("functionslib");
 if size(macros) == [] then bugmes();quit;end
 if ~isdir(pathmacros) then bugmes();quit;end
index 4fc3658..eca8dfe 100644 (file)
 // libraryinfo did not check size of input argument.
 //
 
-if execstr("macros = libraryinfo()", "errcatch") <> 77 then pause, end
+if execstr("macros = libraryinfo()", "errcatch") <> 999 then pause, end
 if lasterror() <> msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"), "libraryinfo", 1) then pause, end
 
 if execstr("macros = libraryinfo([""functionslib"", ""corelib""])", "errcatch") <> 999 then pause, end
-if lasterror() <> msprintf(_("%s: Wrong size for input argument #%d: String expected.\n"), "libraryinfo", 1) then pause, end
+if lasterror() <> msprintf(_("%s: Wrong size for input argument #%d: A String expected.\n"), "libraryinfo", 1) then pause, end
 
-macros = libraryinfo('functionslib');
+macros = libraryinfo("functionslib");
 if size(macros) == [] then pause,end
 
-[macroslist, pathmacros] = libraryinfo('functionslib');
+[macroslist, pathmacros] = libraryinfo("functionslib");
 if size(macros) == [] then pause,end
 if ~isdir(pathmacros) then pause,end
 
index 82d30a3..8c2a901 100644 (file)
 // <-- Short Description -->
 // cmd-e executed the wrong editor file
 
-edit tic
-edit toc
+edit acosd
+edit isrow
 edit calendar
 
-// select toc & cmd-e  toc.sci must be executed
+// select isrow & cmd-e  isrow.sci must be executed
 // select calendar & cmd-e  calendar.sci must be executed
-// select tic & cmd-e  tic.sci must be executed
+// select acosd & cmd-e  acosd.sci must be executed