Merge remote-tracking branch 'origin/master' into YaSp 88/10188/1
Sylvestre Ledru [Thu, 10 Jan 2013 17:45:38 +0000 (18:45 +0100)]
Change-Id: I1737650d734ac9fd65265c48581c41aab81a72a3

155 files changed:
1  2 
scilab/Makefile.am
scilab/Makefile.in
scilab/bin/scilab
scilab/desktop/Makefile.in
scilab/desktop/images/icons/Makefile.in
scilab/etc/scilab.start
scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
scilab/libs/MALLOC/MALLOC.rc
scilab/libs/doublylinkedlist/doublylinkedlist.rc
scilab/libs/dynamiclibrary/dynamiclibrary.rc
scilab/libs/hashtable/hashtable.rc
scilab/libs/libst/libst.rc
scilab/modules/action_binding/src/c/action_binding.rc
scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
scilab/modules/api_scilab/src/c/api_scilab.rc
scilab/modules/arnoldi/sci_gateway/c/sci_eigs.c
scilab/modules/arnoldi/src/c/arnoldi.rc
scilab/modules/boolean/src/c/boolean.rc
scilab/modules/boolean/src/fortran/boolean_f.rc
scilab/modules/cacsd/src/c/cacsd.rc
scilab/modules/cacsd/src/fortran/cacsd_f.rc
scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.rc
scilab/modules/call_scilab/src/c/call_scilab.rc
scilab/modules/commons/src/c/commons.rc
scilab/modules/commons/src/fortran/commons_f.rc
scilab/modules/commons/src/java/org/scilab/modules/commons/ScilabCommons.java
scilab/modules/commons/src/jni/ScilabCommons.i
scilab/modules/commons/src/jni/ScilabCommons_wrap.c
scilab/modules/completion/src/c/completeLine.c
scilab/modules/completion/src/c/completion.rc
scilab/modules/completion/src/nocompletion/nocompletion.rc
scilab/modules/console/src/c/console.rc
scilab/modules/console/src/noconsole/noconsole.rc
scilab/modules/core/src/c/getval.c
scilab/modules/core/src/c/getval.h
scilab/modules/core/src/c/getversion.c
scilab/modules/data_structures/src/c/data_structures.rc
scilab/modules/data_structures/src/fortran/data_structures_f.rc
scilab/modules/differential_equations/src/c/differential_equations.rc
scilab/modules/differential_equations/src/fortran/differential_equations_f.rc
scilab/modules/dynamic_link/src/c/dynamic_link.rc
scilab/modules/dynamic_link/src/fortran/dynamic_link_f.rc
scilab/modules/elementary_functions/src/c/elementary_functions.rc
scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.rc
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc
scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.rc
scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.rc
scilab/modules/external_objects/external_objects.rc
scilab/modules/fftw/src/c/fftw.rc
scilab/modules/fftw/src/nofftw/nofftw.rc
scilab/modules/fileio/src/c/do_xxscanf.c
scilab/modules/fileio/src/c/fileio.rc
scilab/modules/fileio/src/cpp/mgetl.cpp
scilab/modules/functions/src/c/functions.rc
scilab/modules/functions/src/fortran/functions_f.rc
scilab/modules/graphic_export/graphic_export.rc
scilab/modules/graphic_export/src/nographic_export/nographic_export.rc
scilab/modules/graphics/graphic.rc
scilab/modules/graphics/src/nographics/nographics.rc
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/sci_gateway/cpp/sci_uiputfile.cpp
scilab/modules/gui/src/c/gui.rc
scilab/modules/gui/src/nogui/nogui.rc
scilab/modules/hdf5/src/c/hdf5.rc
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/helptools/helptools.iss
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/helptools/src/c/helptools.rc
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/ScilabImageConverter.java
scilab/modules/history_browser/src/c/history_browser.rc
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc
scilab/modules/history_manager/src/c/history_manager.rc
scilab/modules/integer/src/c/integer.rc
scilab/modules/integer/src/fortran/integer_f.rc
scilab/modules/interpolation/src/c/interpolation.rc
scilab/modules/interpolation/src/fortran/interpolation_f.rc
scilab/modules/io/src/c/io.rc
scilab/modules/io/src/fortran/io_f.rc
scilab/modules/javasci/javasci.rc
scilab/modules/jvm/src/c/getJvmOptions.c
scilab/modules/jvm/src/c/libjvm.rc
scilab/modules/jvm/src/nojvm/nojvm.rc
scilab/modules/linear_algebra/src/c/linear_algebra.rc
scilab/modules/linear_algebra/src/fortran/linear_algebra_f.rc
scilab/modules/localization/sci_gateway/c/sci_setdefaultlanguage.c
scilab/modules/localization/src/localization.rc
scilab/modules/matio/src/c/GetSparseVariable.c
scilab/modules/matio/src/c/matio.rc
scilab/modules/mexlib/src/libmat/libmat.rc
scilab/modules/mexlib/src/libmex/libmex.rc
scilab/modules/mexlib/src/libmx/libmx.rc
scilab/modules/optimization/src/c/optimization.rc
scilab/modules/optimization/src/fortran/optimization_f.rc
scilab/modules/output_stream/src/c/Scierror.c
scilab/modules/output_stream/src/c/output_stream.rc
scilab/modules/output_stream/src/fortran/output_stream_f.rc
scilab/modules/parallel/src/c/parallel.rc
scilab/modules/parameters/src/c/parameters.rc
scilab/modules/polynomials/sci_gateway/fortran/sci_f_poly.f
scilab/modules/polynomials/src/c/polynomials.rc
scilab/modules/polynomials/src/fortran/polynomials_f.rc
scilab/modules/randlib/src/c/randlib.rc
scilab/modules/randlib/src/fortran/randlib_f.rc
scilab/modules/randlib/src/norandlib/norandlib.rc
scilab/modules/renderer/renderer.rc
scilab/modules/renderer/src/norenderer/norenderer.rc
scilab/modules/scicos/src/c/noscicos/noscicos.rc
scilab/modules/scicos/src/c/scicos.rc
scilab/modules/scicos/src/fortran/scicos_f.rc
scilab/modules/scicos/src/scicos_sundials/scicos_sundials.rc
scilab/modules/scicos_blocks/src/c/scicos_blocks.rc
scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.rc
scilab/modules/scinotes/src/c/scinotes.rc
scilab/modules/signal_processing/src/c/signal_processing.rc
scilab/modules/signal_processing/src/fortran/signal_processing_f.rc
scilab/modules/sound/src/c/sound.rc
scilab/modules/sound/src/nosound/nosound.rc
scilab/modules/sparse/src/c/sparse.rc
scilab/modules/sparse/src/fortran/sparse_f.rc
scilab/modules/special_functions/src/c/special_functions.rc
scilab/modules/special_functions/src/fortran/special_functions_f.rc
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/spreadsheet/src/c/spreadsheet.rc
scilab/modules/spreadsheet/src/c/stringToComplex.c
scilab/modules/spreadsheet/src/c/utftolatin.c
scilab/modules/spreadsheet/src/c/xls.c
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.rc
scilab/modules/statistics/src/c/statistics.rc
scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f.rc
scilab/modules/string/src/c/string.rc
scilab/modules/string/src/fortran/string_f.rc
scilab/modules/symbolic/src/c/symbolic.rc
scilab/modules/symbolic/src/fortran/symbolic_f.rc
scilab/modules/tclsci/src/c/tclsci.rc
scilab/modules/time/src/c/time.rc
scilab/modules/ui_data/src/c/ui_data.rc
scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp
scilab/modules/ui_data/src/noui_data/noui_data.rc
scilab/modules/umfpack/src/c/umfpack.rc
scilab/modules/umfpack/src/noumfpack/noumfpack.rc
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/scilab_windows/console.c
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.rc
scilab/modules/windows_tools/src/c/windows_tools.rc
scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.rc
scilab/modules/xcos/src/c/xcos.rc
scilab/modules/xml/sci_gateway/cpp/sci_extraction.cpp
scilab/modules/xml/sci_gateway/cpp/sci_insertion.cpp
scilab/modules/xml/src/c/xml.rc
scilab/modules/xml/src/cpp/extraction.hxx
scilab/modules/xml/xml.vcxproj
scilab/modules/xml/xml.vcxproj.filters

Simple merge
@@@ -707,9 -656,9 +707,9 @@@ scilab_cli_bin_LDADD = $(COMMON_LIBS) $
  @ENABLE_STATIC_TRUE@scilab_static_bin_LDADD = $(top_builddir)/modules/libscilab.la
  @ENABLE_STATIC_TRUE@scilab_static_bin_SOURCES = $(scilab_bin_SOURCES)
  LANG_DOMAIN = scilab
 -TARGETS_ALL = macros $(am__append_4) $(am__append_5)
 +TARGETS_ALL = macros $(am__append_6) $(am__append_7)
  
- #┬ácheck is performed with scilab
+ # check is performed with scilab
  TESTS_ENVIRONMENT = LANG=C $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -f
  TESTS = $(top_srcdir)/modules/development_tools/tests/unit_tests/test_run_level_1.tst
  rootdir = $(pkgdatadir)/etc/
Simple merge
Simple merge
@@@ -384,9 -377,10 +384,11 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
  iconsdir = $(datadir)/icons/hicolor
  nobase_icons_DATA = 16x16/apps/scilab.png \
+ 16x16/apps/scinotes.png \
+ 16x16/apps/xcos.png \
  16x16/mimetypes/application-x-scilab-bin.png \
  16x16/mimetypes/application-x-scilab-cosf.png \
  16x16/mimetypes/application-x-scilab-cos.png \
@@@ -31,12 -69,30 +31,19 @@@ clear %modalWarning
  PWD = pwd();
  
  // Startup message  ===================================================
- //if (sciargs()<>"-nb") & ~fromjava() & ~fromc() then
- if sciargs() <> "-nb" then
 -if (sciargs() <> "-nb") & ~fromjava() & ~fromc() & getscilabmode() == "STD" then
 -  write(%io(2),[" ";gettext("Startup execution:")]);
 -  write(%io(2),gettext("  loading initial environment"));
++
++// if (sciargs() <> "-nb") & ~fromjava() & ~fromc() & getscilabmode() == "STD" then
++if (sciargs() <> "-nb") & getscilabmode() == "STD" then
 +  printf("\n\n%s\n", gettext("Startup execution:"));
 +  printf(gettext("  loading initial environment") + "\n");
  end
  
+ if ((getscilabmode() == "NWNI" | getscilabmode() == "NW") & sciargs()<>"-nb")
+    [v, opts] = getversion()
 -   write(%io(2), strsubst(v, "scilab-", "Scilab ") + " (" + opts($-1) + ", " + opts($) + ")");
++   printf(strsubst(v, "scilab-", "Scilab ") + " (" + opts($-1) + ", " + opts($) + ")");
+    clear v, opts;
+ end
 -// loads modules ======================================================
 -modules    = getmodules();
 -
 -// Map 'load' to 'old binary files load' called %_load to be able to load Scilab libraries
 -warning("off");
 -load = %_load;
 -warning("on");
 -
 -for i=1:size(modules,"*")
 -  exec("SCI/modules/" + modules(i) + "/etc/" + modules(i) + ".start", -1);
 -end
 -clear modules i load;
 -
  // Create some configuration variables ================================
  home = getenv("HOME", SCI);
  if getos() <> "Windows" then
@@@ -64,13 -64,13 +64,13 @@@ BEGI
      BEGIN
          BLOCK "040c04b0"
          BEGIN
 -            VALUE "FileDescription", "GetWindowsVersion library for Scilab 5.x"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 -            VALUE "InternalName", "GetWindowsVersion library for Scilab 5.x"
 +            VALUE "FileDescription", "GetWindowsVersion library for Scilab 6.x"
 +            VALUE "FileVersion", "6, 0, 0, 0"
 +            VALUE "InternalName", "GetWindowsVersion library for Scilab 6.x"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "GetWindowsVersion.dll"
 -            VALUE "ProductName", "GetWindowsVersion library for Scilab 5.x"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductName", "GetWindowsVersion library for Scilab 6.x"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,13 -64,13 +64,13 @@@ BEGI
      BEGIN
          BLOCK "040c04b0"
          BEGIN
 -            VALUE "FileDescription", "MALLOC library for Scilab 5.x"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 -            VALUE "InternalName", "MALLOC library for Scilab 5.x"
 +            VALUE "FileDescription", "MALLOC library for Scilab 6.x"
 +            VALUE "FileVersion", "6, 0, 0, 0"
 +            VALUE "InternalName", "MALLOC library for Scilab 6.x"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "MALLOC.dll"
 -            VALUE "ProductName", "MALLOC library for Scilab 5.x"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductName", "MALLOC library for Scilab 6.x"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,13 -64,13 +64,13 @@@ BEGI
      BEGIN
          BLOCK "040c04b0"
          BEGIN
 -            VALUE "FileDescription", "doublylinkedlist library for Scilab 5.x"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 -            VALUE "InternalName", "doublylinkedlist library for Scilab 5.x"
 +            VALUE "FileDescription", "doublylinkedlist library for Scilab 6.x"
 +            VALUE "FileVersion", "6, 0, 0, 0"
 +            VALUE "InternalName", "doublylinkedlist library for Scilab 6.x"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "doublylinkedlist.dll"
 -            VALUE "ProductName", "doublylinkedlist library for Scilab 5.x"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductName", "doublylinkedlist library for Scilab 6.x"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,13 -64,13 +64,13 @@@ BEGI
      BEGIN
          BLOCK "040c04b0"
          BEGIN
 -            VALUE "FileDescription", "dynamiclibrary library for Scilab 5.x"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 -            VALUE "InternalName", "dynamiclibrary library for Scilab 5.x"
 +            VALUE "FileDescription", "dynamiclibrary library for Scilab 6.x"
 +            VALUE "FileVersion", "6, 0, 0, 0"
 +            VALUE "InternalName", "dynamiclibrary library for Scilab 6.x"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "dynamiclibrary.dll"
 -            VALUE "ProductName", "dynamiclibrary library for Scilab 5.x"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductName", "dynamiclibrary library for Scilab 6.x"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,13 -64,13 +64,13 @@@ BEGI
      BEGIN
          BLOCK "040c04b0"
          BEGIN
 -            VALUE "FileDescription", "hashtable library for Scilab 5.x"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 -            VALUE "InternalName", "hashtable library for Scilab 5.x"
 +            VALUE "FileDescription", "hashtable library for Scilab 6.x"
 +            VALUE "FileVersion", "6, 0, 0, 0"
 +            VALUE "InternalName", "hashtable library for Scilab 6.x"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "hashtable.dll"
 -            VALUE "ProductName", "hashtable library for Scilab 5.x"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductName", "hashtable library for Scilab 6.x"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,13 -64,13 +64,13 @@@ BEGI
      BEGIN
          BLOCK "040c04b0"
          BEGIN
 -            VALUE "FileDescription", "libst library for Scilab 5.x"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 -            VALUE "InternalName", "libst library for Scilab 5.x"
 +            VALUE "FileDescription", "libst library for Scilab 6.x"
 +            VALUE "FileVersion", "6, 0, 0, 0"
 +            VALUE "InternalName", "libst library for Scilab 6.x"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "libst.dll"
 -            VALUE "ProductName", "libst library for Scilab 5.x"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductName", "libst library for Scilab 6.x"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "action_binding module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "action_binding module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "action_binding.dll"
              VALUE "ProductName", " action_binding"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "noaction_binding module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "noaction_binding module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "noaction_binding.dll"
              VALUE "ProductName", " noaction_binding"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "api_scilab module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "api_scilab module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "api_scilab.dll"
              VALUE "ProductName", "api_scilab module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -70,12 -70,12 +70,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "arnoldi module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "arnoldi"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "arnoldi.dll"
              VALUE "ProductName", "arnoldi module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "boolean module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "boolean module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "boolean.dll"
              VALUE "ProductName", "boolean module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "boolean_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "boolean_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "boolean_f.dll"
              VALUE "ProductName", "boolean_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "cacsd module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "cacsd module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "cacsd.dll"
              VALUE "ProductName", "cacsd module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "elementary_functions_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "elementary_functions_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "elementary_functions_f.dll"
              VALUE "ProductName", "elementary_functions_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "slicot_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "slicot_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "slicot_f.dll"
              VALUE "ProductName", "slicot_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "call_scilab module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "call_scilab module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "call_scilab.dll"
              VALUE "ProductName", " call_scilab module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "commons module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "commons module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "commons.dll"
              VALUE "ProductName", "commons module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "commons_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "commons_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "commons_f.dll"
              VALUE "ProductName", "commons_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -2,11 -2,12 +2,11 @@@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2009-2010 - DIGITEO - Allan CORNET
  * Copyright (C) 2010 - DIGITEO - Vincent LEJEUNE
- * 
 -* Copyright (C) 2011 - DIGITEO - Allan CORNET
 -* 
++*
  * 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    
++* are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
@@@ -36,17 -39,37 +36,17 @@@ static int findMatchingPrefixSuffix(con
      size_t stringLength = 0;
  
      //get a working copy of find
 -    pointerOnFindCopy = strdup(find);
 +    pointerOnFindCopy = os_strdup(find);
      //last character of string
--    lastchar = *(string+strlen(string)-1);
++    lastchar = *(string + strlen(string) - 1);
      stringLength = strlen(string);
  
      //Tips : no infinite loop there, tmpfind string length is always reduced at each iteration
-     while( movingPointerOnFindCopy = strrchr(pointerOnFindCopy, lastchar) )
 -
 -#ifdef _MSC_VER
 -    movingPointerOnFindCopy = strrchr(pointerOnFindCopy, lastchar);
 -    // On Windows paths are not case sensitive
 -    if (movingPointerOnFindCopy == NULL && stringToAddIsPath)
 -    {
 -        movingPointerOnFindCopy = strrchr(pointerOnFindCopy, toupper(lastchar));
 -    }
 -#else
 -    movingPointerOnFindCopy = strrchr(pointerOnFindCopy, lastchar);
 -#endif
 -    while( movingPointerOnFindCopy )
++    while ( movingPointerOnFindCopy = strrchr(pointerOnFindCopy, lastchar) )
      {
          //find the last occurence of last char of string in tmpfind
 -#ifdef _MSC_VER
          movingPointerOnFindCopy = strrchr(pointerOnFindCopy, lastchar);
-         if(movingPointerOnFindCopy == NULL)
 -        // On Windows paths are not case sensitive
 -        if (movingPointerOnFindCopy == NULL && stringToAddIsPath)
 -        {
 -            movingPointerOnFindCopy = strrchr(pointerOnFindCopy, toupper(lastchar));
 -        }
 -#else
 -        movingPointerOnFindCopy = strrchr(pointerOnFindCopy, lastchar);
 -#endif
 -        if(movingPointerOnFindCopy == NULL)
++        if (movingPointerOnFindCopy == NULL)
          {
              break;
          }
@@@ -54,7 -77,7 +54,7 @@@
          movingPointerOnFindCopy[0] = '\0';
          //Check if the cutted tmpfind match with the suffix of string that has adequat length
          pointerOnString = (char*)(string + stringLength - 1 - strlen(pointerOnFindCopy));
--        if( !strncmp(pointerOnFindCopy, pointerOnString, strlen(pointerOnFindCopy)) )
++        if ( !strncmp(pointerOnFindCopy, pointerOnString, strlen(pointerOnFindCopy)) )
          {
              FREE(pointerOnFindCopy);
              pointerOnFindCopy = NULL;
@@@ -68,8 -91,8 +68,8 @@@
      return (int)stringLength;
  }
  /*--------------------------------------------------------------------------*/
--char *completeLine(char *currentline,char *stringToAdd,char *filePattern,
-                    char *defaultPattern,BOOL stringToAddIsPath, char *postCaretLine)
 -    char *defaultPattern,BOOL stringToAddIsPath, char *postCaretLine)
++char *completeLine(char *currentline, char *stringToAdd, char *filePattern,
++                   char *defaultPattern, BOOL stringToAddIsPath, char *postCaretLine)
  {
      char *new_line = NULL;
      int lengthNewLine = 0;
  
      int iposInsert = 0;
  
--    if (currentline == NULL) 
++    if (currentline == NULL)
      {
 -        return  strdup("");
 +        return  os_strdup("");
      }
      lencurrentline = (int)strlen(currentline);
  
              strcat(new_line, stringToAddAtTheEnd);
          }
  
--        if (stringToAddAtTheEnd) {FREE(stringToAddAtTheEnd); stringToAddAtTheEnd = NULL;}
++        if (stringToAddAtTheEnd)
++        {
++            FREE(stringToAddAtTheEnd);
++            stringToAddAtTheEnd = NULL;
++        }
  
          return new_line;
      }
  
          if (filePatternBuf)
          {
--            char* drv = (char*)MALLOC(sizeof(char)*(PATH_MAX+1));
--            char* dir = (char*)MALLOC(sizeof(char)*(PATH_MAX+1));
--            char* name = (char*)MALLOC(sizeof(char)*(PATH_MAX+1));
--            char* ext = (char*)MALLOC(sizeof(char)*(PATH_MAX+1));
++            char* drv = (char*)MALLOC(sizeof(char) * (PATH_MAX + 1));
++            char* dir = (char*)MALLOC(sizeof(char) * (PATH_MAX + 1));
++            char* name = (char*)MALLOC(sizeof(char) * (PATH_MAX + 1));
++            char* ext = (char*)MALLOC(sizeof(char) * (PATH_MAX + 1));
  
--            splitpath(filePatternBuf,TRUE, drv,dir, name, ext);
++            splitpath(filePatternBuf, TRUE, drv, dir, name, ext);
  
              if (bfilePatternBuf)
              {
                  FREE(filePatternBuf);
                  filePatternBuf = NULL;
-                 bfilePatternBuf = FALSE;
              }
  
--            if ( strcmp(drv,"") || strcmp(dir,"") )
++            if ( strcmp(drv, "") || strcmp(dir, "") )
              {
                  /* bug 4365 */
                  /*cd SCI/modules/arnoldi/nonreg_tes */
  
--                if (drv) {FREE(drv); drv = NULL;}
--                if (dir) {FREE(dir); dir = NULL;}
--                if (name) {FREE(name); name = NULL;}
--                if (ext) {FREE(ext); ext = NULL;}
++                if (drv)
++                {
++                    FREE(drv);
++                    drv = NULL;
++                }
++                if (dir)
++                {
++                    FREE(dir);
++                    dir = NULL;
++                }
++                if (name)
++                {
++                    FREE(name);
++                    name = NULL;
++                }
++                if (ext)
++                {
++                    FREE(ext);
++                    ext = NULL;
++                }
  
                  lengthNewLine = lencurrentline + lenstringToAddAtTheEnd;
                  new_line = (char*)MALLOC(sizeof(char) * (lengthNewLine + 1));
                      strcat(new_line, stringToAddAtTheEnd);
                  }
  
--                if (stringToAddAtTheEnd) {FREE(stringToAddAtTheEnd); stringToAddAtTheEnd = NULL;}
++                if (stringToAddAtTheEnd)
++                {
++                    FREE(stringToAddAtTheEnd);
++                    stringToAddAtTheEnd = NULL;
++                }
  
                  return new_line;
              }
  
--            if (drv) {FREE(drv); drv = NULL;}
--            if (dir) {FREE(dir); dir = NULL;}
--            if (name) {FREE(name); name = NULL;}
--            if (ext) {FREE(ext); ext = NULL;}
++            if (drv)
++            {
++                FREE(drv);
++                drv = NULL;
++            }
++            if (dir)
++            {
++                FREE(dir);
++                dir = NULL;
++            }
++            if (name)
++            {
++                FREE(name);
++                name = NULL;
++            }
++            if (ext)
++            {
++                FREE(ext);
++                ext = NULL;
++            }
          }
      }
  
-     lenstringToAdd = (int)strlen(stringToAdd);
 -    iposInsert = findMatchingPrefixSuffix(currentline, stringToAdd, stringToAddIsPath);
 +    iposInsert = findMatchingPrefixSuffix(currentline, stringToAdd);
      res = strstr(stringToAdd, &currentline[iposInsert]);
  
      if (res == NULL)
          }
      }
  
--    lengthNewLine = (int)(strlen(currentline)+ strlen(stringToAdd) + lenstringToAddAtTheEnd);
--    new_line = (char*)MALLOC(sizeof(char)*(lengthNewLine + 1));
++    lengthNewLine = (int)(strlen(currentline) + strlen(stringToAdd) + lenstringToAddAtTheEnd);
++    new_line = (char*)MALLOC(sizeof(char) * (lengthNewLine + 1));
      if (new_line)
      {
          strcpy(new_line, currentline);
          strcat(new_line, stringToAddAtTheEnd);
      }
  
--    if (stringToAddAtTheEnd) {FREE(stringToAddAtTheEnd); stringToAddAtTheEnd = NULL;}
++    if (stringToAddAtTheEnd)
++    {
++        FREE(stringToAddAtTheEnd);
++        stringToAddAtTheEnd = NULL;
++    }
  
      return new_line;
  }
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "completion module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "completion module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "completion.dll"
              VALUE "ProductName", " completion"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "nocompletion module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "nocompletion module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "nocompletion.dll"
              VALUE "ProductName", " nocompletion"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "console module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "console module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "sciconsole.dll"
              VALUE "ProductName", " console module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "noconsole module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "noconsole module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "noconsole.dll"
              VALUE "ProductName", " noconsole"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
  extern int C2F(fortrangetch)();
  
  
- int C2F(getval)(double *s, int *dotdet, int *opt)
+ int C2F(getval)(double *s, int *dotdet)
  {
 -    /* Initialized constants */
 -    static double toto = 0.;
 -    static double c10 = 10.;
 -
 -    /* Local variables */
 -    static int expo;
 -    static int code0;
 -    static int i, k;
 -    static int digit[25], ndgrec;
 -    static int detdot;
 -    static int ndgexp, expcor, sgnexp;
 -    static char string[31];
 -    static int ndg;
 +    ///* Initialized constants */
 +    //static double toto = 0.;
 +    //static double c10 = 10.;
  
 -    /* System generated locals */
 -    static double d1;
 -    int i1;
 +    ///* Local variables */
 +    //static int expo;
 +    //static int code0;
 +    //static int i, k;
 +    //static int digit[25], ndgrec;
 +    //static int detdot;
 +    //static int ndgexp, expcor, sgnexp;
 +    //static char string[31];
 +    //static int ndg;
  
 -    Fin = 0;
 -    /*     beginning of the code */
 -    detdot = *dotdet;
 -    ndg = 0;
 -    ndgrec = 0;
 -    if (! detdot)
 -    {
 -        /*  1) got the int part of the mantissa of the pattern
 -          1-a) may be there is some 0 at the beginning */
 -        while (C2F(com).char1 == 0)
 -        {
 -            C2F(fortrangetch)();
 -        }
 -        /* 1-b) now record the digits (inside the digit array)
 -           (but we record a maximum of ndgmax digits)*/
 -        while (abs(C2F(com).char1) <= 9)
 -        {
 -            ++ndg;
 -            if (ndgrec < 25)
 -            {
 -                ++ndgrec;
 -                digit[ndgrec - 1] = C2F(com).char1;
 -            }
 -            C2F(fortrangetch)();
 -        }
 -        /*1-c) at this point we have detected something which is not a digit
 -               may be a point, may be a d,D,e,E, or something else
 -               here we only test for the dot and let the others cases
 -           to be treated after ... */
 -        if (abs(C2F(com).char1) == dot)
 -        {
 -            detdot = TRUE;
 -            C2F(fortrangetch)();
 -            if (getWarningMode())
 -            {
 -                if ((abs(C2F(com).char1) == slash) || (abs(C2F(com).char1) == bchar_slash))
 -                {
 -                    int v = 0;
 +    ///* System generated locals */
 +    //static double d1;
 +    //int i1;
  
 -                    for (i = 0; i < ndgrec; ++i)
 -                    {
 -                        v = v * 10 + digit[i];
 -                    }
 -                    if (abs(C2F(com).char1) == slash)
 -                        sciprint(_("%s: \"%d.%s ...\" is interpreted as \"%d.0%s ...\". Use \"%d .%s ...\" for element wise operation \n") ,
 -                                 "Warning", v, "/", v, "/", v, "/");
 -                    else
 -                        sciprint(_("%s: \"%d.%s ...\" is interpreted as \"%d.0%s ...\". Use \"%d .%s ...\" for element wise operation \n") ,
 -                                 "Warning", v, "\\", v, "\\", v, "\\");
 -                }
 -            }
 -        }
 -    }
 -    /*first correction for the (future) exponent : if the first part
 -      of the string have more then ndgmax digits we have to add
 -      ndg - ndgrec (else we have expcor=0) */
 -    expcor = ndg - ndgrec;
 -    if (detdot)
 -    {
 -        /*2) got the "fractionnal" part of the "mantissa" */
 -        if (ndgrec == 0)
 -        {
 -            /*we have not passed throw the part 1) or only zeros have been met
 -            and may be the number start with .000xxx : so clean up those 0 */
 -            while (C2F(com).char1 == 0)
 -            {
 -                --expcor;
 -                C2F(fortrangetch)();
 -            }
 -        }
 -        /*now we begin to record the digits */
 -        while (abs(C2F(com).char1) <= 9)
 -        {
 -            if (ndgrec < 25)
 -            {
 -                ++ndgrec;
 -                --expcor;
 -                digit[ndgrec - 1] = C2F(com).char1;
 -            }
 -            C2F(fortrangetch)();
 -        }
 -    }
 -    /*3) at this point the "mantissa" of the string decimal number
 -      must be recorded, now detect the exponent */
 -    expo = 0;
 -    ndgexp = 0;
 -    sgnexp = plus;
 -    if (abs(C2F(com).char1) == D || abs(C2F(com).char1) == E)
 -    {
 -        /*the string have an exponent part (which, in Scilab, may be empty or
 -          may had only a sign ! => expo = 0) */
 -        C2F(fortrangetch)();
 -        if (C2F(com).char1 == minus || C2F(com).char1 == plus)
 -        {
 -            sgnexp = C2F(com).char1;
 -            C2F(fortrangetch)();
 -        }
 -        else
 -        {
 -            sgnexp = plus;
 -        }
 -        /*may be the exponent start by some 0 */
 -        while (C2F(com).char1 == 0)
 -        {
 -            C2F(fortrangetch)();
 -        }
 -        /*now form the exponent : the var ndgexp is here
 -          to treat spurious int overflow ... */
 -        while (abs(C2F(com).char1) <= 9)
 -        {
 -            expo = expo * 10 + C2F(com).char1;
 -            ++ndgexp;
 -            C2F(fortrangetch)();
 -        }
 -    }
 -    /*4) Now we can form the double float number s
 -      4-1/ only zeros in the mantissa */
 -    if (ndgrec == 0)
 -    {
 -        /*no digits have been recorded : this is the case
 -          when the mantissa part is of the form [000][.][000]
 -          the number is 0 */
 -        *s = 0.;
 -        return 0;
 -    }
 -    /*4-2/ ndgexp is to large => the exponent expo is perhaps badly
 -      computed (int "overflow") or in all cases the
 -      exponent is too large (positive or negative) such that it result
 -      (for s) in an overflow or underflow depending the exponent sign */
 -    if (ndgexp >= NDEMAX)
 -    {
 -        if (sgnexp == minus)  /*underflow */
 -        {
 -            *s = 0.;
 -        }
 -        else    /*overflow : got an inf ... */
 -        {
 -            *s = 1. / (toto - toto);
 -        }
 -        return 0;
 -    }
 -    /*4-3/ now build the final exponent */
 -    if (sgnexp == plus)
 -    {
 -        expo += expcor;
 -    }
 -    else
 -    {
 -        expo = -expo + expcor;
 -    }
 -    /*4-4/ here some tests to avoid unnecessary call to  "strtod"
 -      Now we have a number s of the form  d_1 d_2 ... d_ndgrec 10^expo
 -      which is equal to d_1 . d_2 ... d_ndgrec 10^(expo + ndgrec - 1)
 -      with d_1 .ne. 0
 -      so it comes :  s >= 10^(expo + ndgrec - 1)
 -      s <= 10^(expo + ndgrec)
 +    //Fin = 0;
 +    ///*     beginning of the code */
 +    //detdot = *dotdet;
 +    //ndg = 0;
 +    //ndgrec = 0;
 +    //if (! detdot)
 +    //{
 +    //    /*  1) got the int part of the mantissa of the pattern
 +    //      1-a) may be there is some 0 at the beginning */
 +    //    while (C2F(com).char1 == 0)
 +    //    {
 +    //        C2F(fortrangetch)();
 +    //    }
 +    //    /* 1-b) now record the digits (inside the digit array)
 +    //       (but we record a maximum of ndgmax digits)*/
 +    //    while (abs(C2F(com).char1) <= 9)
 +    //    {
 +    //        ++ndg;
 +    //        if (ndgrec < 25)
 +    //        {
 +    //            ++ndgrec;
 +    //            digit[ndgrec - 1] = C2F(com).char1;
 +    //        }
 +    //        C2F(fortrangetch)();
 +    //    }
 +    //    /*1-c) at this point we have detected something which is not a digit
 +    //           may be a point, may be a d,D,e,E, or something else
 +    //           here we only test for the dot and let the others cases
 +    //       to be treated after ... */
 +    //    if (abs(C2F(com).char1) == dot)
 +    //    {
 +    //        detdot = TRUE;
 +    //        C2F(fortrangetch)();
 +    //        if (getWarningMode())
 +    //        {
 +    //            if ((abs(C2F(com).char1) == slash) || (abs(C2F(com).char1) == bchar_slash))
 +    //            {
 +    //                int v = 0;
 +    //                for (i = 0; i < ndgrec; ++i)
 +    //                {
 +    //                    v = v * 10 + digit[i];
 +    //                }
 +    //                if (abs(C2F(com).char1) == slash)
 +    //                    sciprint(_("%s: \"%d.%s ...\" is interpreted as \"%d.0%s ...\". Use \"%d .%s ...\" for element wise operation \n") ,
 +    //                             "Warning", v, "/", v, "/", v, "/");
 +    //                else
 +    //                    sciprint(_("%s: \"%d.%s ...\" is interpreted as \"%d.0%s ...\". Use \"%d .%s ...\" for element wise operation \n") ,
 +    //                             "Warning", v, "\\", v, "\\", v, "\\");
 +    //            }
 +    //        }
 +    //    }
 +    //}
 +    ///*first correction for the (future) exponent : if the first part
 +    //  of the string have more then ndgmax digits we have to add
 +    //  ndg - ndgrec (else we have expcor=0) */
 +    //expcor = ndg - ndgrec;
 +    //if (detdot)
 +    //{
 +    //    /*2) got the "fractionnal" part of the "mantissa" */
 +    //    if (ndgrec == 0)
 +    //    {
 +    //        /*we have not passed throw the part 1) or only zeros have been met
 +    //        and may be the number start with .000xxx : so clean up those 0 */
 +    //        while (C2F(com).char1 == 0)
 +    //        {
 +    //            --expcor;
 +    //            C2F(fortrangetch)();
 +    //        }
 +    //    }
 +    //    /*now we begin to record the digits */
 +    //    while (abs(C2F(com).char1) <= 9)
 +    //    {
 +    //        if (ndgrec < 25)
 +    //        {
 +    //            ++ndgrec;
 +    //            --expcor;
 +    //            digit[ndgrec - 1] = C2F(com).char1;
 +    //        }
 +    //        C2F(fortrangetch)();
 +    //    }
 +    //}
 +    ///*3) at this point the "mantissa" of the string decimal number
 +    //  must be recorded, now detect the exponent */
 +    //expo = 0;
 +    //ndgexp = 0;
 +    //sgnexp = plus;
 +    //if (abs(C2F(com).char1) == D || abs(C2F(com).char1) == E)
 +    //{
 +    //    /*the string have an exponent part (which, in Scilab, may be empty or
 +    //      may had only a sign ! => expo = 0) */
 +    //    C2F(fortrangetch)();
 +    //    if (C2F(com).char1 == minus || C2F(com).char1 == plus)
 +    //    {
 +    //        sgnexp = C2F(com).char1;
 +    //        C2F(fortrangetch)();
 +    //    }
 +    //    else
 +    //    {
 +    //        sgnexp = plus;
 +    //    }
 +    //    /*may be the exponent start by some 0 */
 +    //    while (C2F(com).char1 == 0)
 +    //    {
 +    //        C2F(fortrangetch)();
 +    //    }
 +    //    /*now form the exponent : the var ndgexp is here
 +    //      to treat spurious int overflow ... */
 +    //    while (abs(C2F(com).char1) <= 9)
 +    //    {
 +    //        expo = expo * 10 + C2F(com).char1;
 +    //        ++ndgexp;
 +    //        C2F(fortrangetch)();
 +    //    }
 +    //}
 +    ///*4) Now we can form the double float number s
 +    //  4-1/ only zeros in the mantissa */
 +    //if (ndgrec == 0)
 +    //{
 +    //    /*no digits have been recorded : this is the case
 +    //      when the mantissa part is of the form [000][.][000]
 +    //      the number is 0 */
 +    //    *s = 0.;
 +    //    return 0;
 +    //}
 +    ///*4-2/ ndgexp is to large => the exponent expo is perhaps badly
 +    //  computed (int "overflow") or in all cases the
 +    //  exponent is too large (positive or negative) such that it result
 +    //  (for s) in an overflow or underflow depending the exponent sign */
 +    //if (ndgexp >= NDEMAX)
 +    //{
 +    //    if (sgnexp == minus)  /*underflow */
 +    //    {
 +    //        *s = 0.;
 +    //    }
 +    //    else    /*overflow : got an inf ... */
 +    //    {
 +    //        *s = 1. / (toto - toto);
 +    //    }
 +    //    return 0;
 +    //}
 +    ///*4-3/ now build the final exponent */
 +    //if (sgnexp == plus)
 +    //{
 +    //    expo += expcor;
 +    //}
 +    //else
 +    //{
 +    //    expo = -expo + expcor;
 +    //}
 +    ///*4-4/ here some tests to avoid unnecessary call to  "strtod"
 +    //  Now we have a number s of the form  d_1 d_2 ... d_ndgrec 10^expo
 +    //  which is equal to d_1 . d_2 ... d_ndgrec 10^(expo + ndgrec - 1)
 +    //  with d_1 .ne. 0
 +    //  so it comes :  s >= 10^(expo + ndgrec - 1)
 +    //  s <= 10^(expo + ndgrec)
  
 -      Suppose given EXPMAX such that  10^EXPMAX > max positive float number
 -      and EXPMIN such that  10^EXPMIN < min positive float number
 +    //  Suppose given EXPMAX such that  10^EXPMAX > max positive float number
 +    //  and EXPMIN such that  10^EXPMIN < min positive float number
  
 -      then if  expo + ndgrec - 1 >= EXPMAX then overflow occurs necessarily
 -      and  if  expo + ndgrec <= EXPMIN then underflow occurs
 +    //  then if  expo + ndgrec - 1 >= EXPMAX then overflow occurs necessarily
 +    //  and  if  expo + ndgrec <= EXPMIN then underflow occurs
  
 -      On IEEE 754 we have : max positive float num = (approx) 1.8E+308
 -      min positive float num = (approx) 4.9EEXPMIN
 -      (if denormalised number are used)
 +    //  On IEEE 754 we have : max positive float num = (approx) 1.8E+308
 +    //  min positive float num = (approx) 4.9EEXPMIN
 +    //  (if denormalised number are used)
  
 -      So that EXPMAX = 309
 -      and  EXPMIN = -324  are OK (but larger limits are possible to take
 -      into account others f.p. arithmetics)
 -      Note that after the test (with these values) the exponent have a
 -      maximum of 3 (decimals) digits */
 -    if (expo + ndgrec - 1 >= EXPMAX)  /*overflow : got an inf ... */
 -    {
 -        *s = 1. / (toto - toto);
 -        return 0;
 -    }
 -    if (expo + ndgrec <= EXPMIN)   /*underflow : got an 0 */
 -    {
 -        *s = 0.;
 -        return 0;
 -    }
 -    /*4-5/ Now the usual case where we can get the near floating point
 -      without any problem */
 -    if (ndgrec <= DGLIM && abs(expo) <= EXPLIM)
 -    {
 -        *s = 0.;
 -        i1 = ndgrec;
 -        for (i = 1; i <= i1; ++i)
 -        {
 -            *s = *s * 10. + digit[i - 1];
 -        }
 -        if (expo < 0)
 -        {
 -            d1 = -expo;
 -            *s /= pow(c10, d1);
 -        }
 -        else
 -        {
 -            d1 = expo;
 -            *s *= pow(c10, d1);
 -        }
 -        return 0;
 -    }
 -    /*4-6/ The other easy case where we can compute s :
 -      if expo = EXPLIM + k  but [int part]*10^k < max_int_coded_in_double
 -      then it is OK (retrieve k in the exponent and multiply the int
 -      part by 10^k and do the same job as previus) */
 -    if (expo > EXPLIM && expo - EXPLIM + ndgrec <= DGLIM)
 -    {
 -        *s = 0.;
 -        i1 = ndgrec;
 -        for (i = 1; i <= i1; ++i)
 -        {
 -            *s = *s * 10. + digit[i - 1];
 -        }
 -        /*peut etre dangereux avec des options d'optimisation ?
 -          (le compilo peut etre tente d'ecrire directement s = s*10**expo
 -          ce qui detruit le truc ...) */
 -        /*         s = s*10.d0**(expo-EXPLIM)
 -               s = s*10.d0**EXPLIM*/
 +    //  So that EXPMAX = 309
 +    //  and  EXPMIN = -324  are OK (but larger limits are possible to take
 +    //  into account others f.p. arithmetics)
 +    //  Note that after the test (with these values) the exponent have a
 +    //  maximum of 3 (decimals) digits */
 +    //if (expo + ndgrec - 1 >= EXPMAX)  /*overflow : got an inf ... */
 +    //{
 +    //    *s = 1. / (toto - toto);
 +    //    return 0;
 +    //}
 +    //if (expo + ndgrec <= EXPMIN)   /*underflow : got an 0 */
 +    //{
 +    //    *s = 0.;
 +    //    return 0;
 +    //}
 +    ///*4-5/ Now the usual case where we can get the near floating point
 +    //  without any problem */
 +    //if (ndgrec <= DGLIM && abs(expo) <= EXPLIM)
 +    //{
 +    //    *s = 0.;
 +    //    i1 = ndgrec;
 +    //    for (i = 1; i <= i1; ++i)
 +    //    {
 +    //        *s = *s * 10. + digit[i - 1];
 +    //    }
 +    //    if (expo < 0)
 +    //    {
 +    //        d1 = -expo;
 +    //        *s /= pow(c10, d1);
 +    //    }
 +    //    else
 +    //    {
 +    //        d1 = expo;
 +    //        *s *= pow(c10, d1);
 +    //    }
 +    //    return 0;
 +    //}
 +    ///*4-6/ The other easy case where we can compute s :
 +    //  if expo = EXPLIM + k  but [int part]*10^k < max_int_coded_in_double
 +    //  then it is OK (retrieve k in the exponent and multiply the int
 +    //  part by 10^k and do the same job as previus) */
 +    //if (expo > EXPLIM && expo - EXPLIM + ndgrec <= DGLIM)
 +    //{
 +    //    *s = 0.;
 +    //    i1 = ndgrec;
 +    //    for (i = 1; i <= i1; ++i)
 +    //    {
 +    //        *s = *s * 10. + digit[i - 1];
 +    //    }
 +    //    /*peut etre dangereux avec des options d'optimisation ?
 +    //      (le compilo peut etre tente d'ecrire directement s = s*10**expo
 +    //      ce qui detruit le truc ...) */
 +    //    /*         s = s*10.d0**(expo-EXPLIM)
 +    //           s = s*10.d0**EXPLIM*/
  
 -        d1 = (double)(expo - EXPLIM);
 -        *s *= pow(c10, d1);
 -        d1 = (double) EXPLIM;
 -        *s *= pow(c10, d1);
 +    //    d1 = (double)(expo - EXPLIM);
 +    //    *s *= pow(c10, d1);
 +    //    d1 = (double) EXPLIM;
 +    //    *s *= pow(c10, d1);
  
 -        return 0;
 -    }
 -    /*4-7/ else use langage routines to do the job
 -      the overhead is a retranslation into a string... */
 -    code0 = '0';
 -    i1 = ndgrec;
 -    for (i = 1; i <= i1; ++i)
 -    {
 -        *(unsigned char *)&string[i - 1] = (char) (digit[i - 1] + code0);
 -    }
 -    i1 = ndgrec;
 -    if (expo < 0)
 -    {
 -        sprintf(string + i1, ".e-%d", abs(expo));
 -    }
 -    else
 -    {
 -        sprintf(string + i1, ".e+%d", abs(expo));
 -    }
 -    k = ndgrec + 4;
 -    *s = strtod(string, NULL);
 +    //    return 0;
 +    //}
 +    ///*4-7/ else use langage routines to do the job
 +    //  the overhead is a retranslation into a string... */
 +    //code0 = '0';
 +    //i1 = ndgrec;
 +    //for (i = 1; i <= i1; ++i)
 +    //{
 +    //    *(unsigned char *)&string[i - 1] = (char) (digit[i - 1] + code0);
 +    //}
 +    //i1 = ndgrec;
 +    //if (expo < 0)
 +    //{
 +    //    sprintf(string + i1, ".e-%d", abs(expo));
 +    //}
 +    //else
 +    //{
 +    //    sprintf(string + i1, ".e+%d", abs(expo));
 +    //}
 +    //k = ndgrec + 4;
 +    //*s = strtod(string, NULL);
      return 0;
  }
  
Simple merge
  #include <string.h>
  #include "getversion.h"
  #include "version.h"
 -#include "scilabmode.h"
 +#include "sci_mode.h"
  #include "scilabDefaults.h"
 -#ifdef _MSC_VER
 -#include "strdup_windows.h"
 -#endif
 +#include "os_strdup.h"
  #include "with_module.h"
  #include "loadversion.h"
+ #include "freeArrayOfString.h"
  #include "MALLOC.h"
  #include "../../../io/includes/getenvc.h"
 +#include "os_wcsdup.h"
 +#include "charEncoding.h"
  /*--------------------------------------------------------------------------*/
 -#define TCLSCI_MODULE_NAME "tclsci"
 -#define TCLTK_OPTION_STRING "tk"
 -#define MODELICAC_OPTION_STRING "modelicac"
 -#define X86_STRING "x86"
 -#define X64_STRING "x64"
 -#define ICC_STRING "ICC"
 -#define VC_STRING "VC++"
 -#define GCC_STRING "GCC"
 -#define PGI_STRING "PGI"
 -#define SUN_STRING "SUN"
 -#define UNKNOW_STRING "UKN"
 -#define RELEASE_STRING "release"
 -#define DEBUG_STRING "debug"
 +/*wide char*/
 +#define TCLSCI_MODULE_NAME L"tclsci"
 +#define TCLTK_OPTION_STRING L"tk"
 +#define MODELICAC_OPTION_STRING L"modelicac"
 +#define X86_STRING L"x86"
 +#define X64_STRING L"x64"
 +#define ICC_STRING L"ICC"
 +#define VC_STRING L"VC++"
 +#define GCC_STRING L"GCC"
 +#define PGI_STRING L"PGI"
 +#define SUN_STRING L"SUN"
 +#define UNKNOW_STRING L"UKN"
 +#define RELEASE_STRING L"release"
 +#define DEBUG_STRING L"debug"
  #define DEFAULT_VERSION_ARRAY_SIZE 4
 -#define SCILAB_STRING "scilab"
 +#define SCILAB_STRING L"scilab"
  /*--------------------------------------------------------------------------*/
  int *getScilabVersion(int *sizeArrayReturned)
  {
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "data_structures module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "data_structures module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "data_structures.dll"
              VALUE "ProductName", "data_structures module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "elementary_functions_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "elementary_functions_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "elementary_functions_f.dll"
              VALUE "ProductName", "elementary_functions_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "differential_equations module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "differential_equations module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "differential_equations.dll"
              VALUE "ProductName", "differential_equations module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "differential_equations_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "differential_equations_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "differential_equations_f.dll"
              VALUE "ProductName", "differential_equations_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "dynamic_link module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "dynamic_link module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "dynamic_link.dll"
              VALUE "ProductName", "dynamic_link module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "dynamic_link_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "dynamic_link_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "dynamic_link_f.dll"
              VALUE "ProductName", "dynamic_link_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "elementary_functions module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "elementary_functions module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "elementary_functions.dll"
              VALUE "ProductName", "elementary_functions module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "eispack library"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 -            VALUE "InternalName", "eispack library for scilab 5.x"
 +            VALUE "FileVersion", "6, 0, 0, 0"
 +            VALUE "InternalName", "eispack library for Scilab 6.x"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "eispack.dll"
 -            VALUE "ProductName", "eispack library for scilab 5.x"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductName", "eispack library for Scilab 6.x"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "elementary_functions_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "elementary_functions_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "elementary_functions_f.dll"
              VALUE "ProductName", "elementary_functions_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "linpack_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "linpack_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "linpack_f.dll"
              VALUE "ProductName", "linpack_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "slatec_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "slatec_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "slatec_f.dll"
              VALUE "ProductName", "slatec_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "external_objects module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "5, 4, 0, 0"
              VALUE "InternalName", "external_objects module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "external_objects.dll"
              VALUE "ProductName", " external_objects"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "5, 4, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BEGIN
              VALUE "CompanyName", "Scilab"
              VALUE "FileDescription", "fftw module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "fftw"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "fftw.rc"
              VALUE "ProductName", " fftw"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "nofftw module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "nofftw module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "nofftw.dll"
              VALUE "ProductName", " nofftw"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -58,14 -58,13 +58,13 @@@ int do_xxscanf (wchar_t *fname, FILE *f
      int str_width_flag = 0;
      int num_conversion = -1;
      void *ptrtab[MAXSCAN];
 -    char sformat[MAX_STR];
 -    char backupcurrrentchar;
 -    char directive;
 -    char *p1 = NULL;
 -    char *target = NULL;
 -    char *sval = NULL;
 -    register char *currentchar = NULL;
 +    wchar_t sformat[MAX_STR];
 +    wchar_t backupcurrrentchar;
 +    wchar_t directive;
-     wchar_t *p = NULL;
 +    wchar_t *p1 = NULL;
 +    wchar_t *target = NULL;
 +    wchar_t *sval = NULL;
 +    register wchar_t *currentchar = NULL;
  
      XXSCANF xxscanf;
  
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "fileio module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "fileio module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "fileio.dll"
              VALUE "ProductName", " fileio"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
index e89ad7d,0000000..c431504
mode 100644,000000..100644
--- /dev/null
@@@ -1,338 -1,0 +1,337 @@@
 +/*
 +* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 +* Copyright (C) 2010 - DIGITEO - Allan CORNET
 +* Copyright (C) 2010 - DIGITEO - 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 "filemanager.hxx"
 +
 +extern "C"
 +{
 +#ifdef _MSC_VER
 +#include <Windows.h>
 +#endif
 +#include "mgetl.h"
 +#include "filesmanagement.h"
 +#include "mopen.h"
 +#include "MALLOC.h"
 +#include "os_wcsdup.h"
 +#include "os_strdup.h"
 +}
 +/*--------------------------------------------------------------------------*/
 +#define LINE_MAX 4096
 +#define CR L'\r'
 +#define LF L'\n'
 +#define EMPTYSTRW L""
 +#define EMPTYSTR ""
 +/*--------------------------------------------------------------------------*/
 +static wchar_t *removeEOL(wchar_t *_inString);
 +static char *convertAnsiToUtf(char *_inString);
 +static wchar_t* getLine(wchar_t* _pstLine, int _iLineSize, File* _pFile);
 +/*--------------------------------------------------------------------------*/  
 +#define UTF_16BE_BOM 0xFEFF // 0xFEFF = to_wide_string(0xEFBBBF)
 +/*--------------------------------------------------------------------------*/
 +wchar_t **mgetl(int fd, int nbLinesIn, int *nbLinesOut, int *ierr)
 +{
 +    wchar_t **strLines = NULL;
 +    File* pFile     = NULL;
 +
 +    *ierr = MGETL_ERROR;
 +    *nbLinesOut = 0;
 +
 +    pFile = FileManager::getFile(fd);
 +
 +    if(nbLinesIn < 0 && fd == 5)
 +    {
 +        nbLinesIn = 1;
 +    }
 +
 +    if (pFile)
 +    {
 +        wchar_t Line[LINE_MAX * 2];
 +        int nbLines = 0;
 +
 +        if (nbLinesIn < 0)
 +        {
 +            strLines = (wchar_t **)MALLOC(sizeof(wchar_t *));
 +            if (strLines == NULL)
 +            {
 +                *nbLinesOut = 0;
 +                *ierr = MGETL_MEMORY_ALLOCATION_ERROR;
 +                return NULL;
 +            }
 +
 +            while ( getLine ( Line, sizeof(Line), pFile ) != NULL )
 +            {
 +                /* UTF-16 BOM */
 +                if ((nbLines == 0) && (Line[0] == UTF_16BE_BOM))
 +                {
 +                    wchar_t* tmpLine = os_wcsdup(Line);
 +                    memset(Line, 0x00, LINE_MAX * 2);
 +                    wcscpy(Line, &tmpLine[1]);
 +                }
 +
 +                nbLines++;
 +                strLines = (wchar_t **)REALLOC(strLines, nbLines * sizeof(wchar_t *));
 +                if (strLines == NULL)
 +                {
 +                    *nbLinesOut = 0;
 +                    *ierr = MGETL_MEMORY_ALLOCATION_ERROR;
 +                    return NULL;
 +                }
 +
 +                strLines[nbLines - 1] = os_wcsdup(removeEOL(Line)); 
 +                if (strLines[nbLines - 1] == NULL)
 +                {
 +                    *nbLinesOut = 0;
 +                    *ierr = MGETL_MEMORY_ALLOCATION_ERROR;
 +                    return NULL;
 +                }
 +                wcscpy(Line, EMPTYSTRW);
 +            }
 +            *nbLinesOut = nbLines;
 +            *ierr = MGETL_NO_ERROR;
 +        }
 +        else
 +        {
 +            if (nbLinesIn == 0)
 +            {
 +                *ierr = MGETL_EOF;
 +                *nbLinesOut = 0;
 +                if (strLines) 
 +                {
 +                    FREE(strLines);
 +                }
 +                strLines = NULL;
 +            }
 +            else
 +            {
 +                BOOL bContinue = TRUE;
 +                BOOL bEOF = FALSE;
 +                strLines = (wchar_t **)MALLOC(sizeof(wchar_t *) * nbLinesIn);
 +                if (strLines == NULL)
 +                {
 +                    *nbLinesOut = 0;
 +                    *ierr = MGETL_MEMORY_ALLOCATION_ERROR;
 +                    return NULL;
 +                }
 +
 +                do 
 +                {
 +                    if (nbLines < nbLinesIn)
 +                    {
 +                        bool header = false;
 +                        /* UTF-16 BOM */
 +                        if ((ftell(pFile->getFiledesc()) == 0) && (nbLines == 0))
 +                        {
 +                            header = true;
 +                        }
 +
 +                        if ( getLine ( Line, sizeof(Line), pFile) != NULL)
 +                        {
 +                            if(header && (Line[0] == UTF_16BE_BOM))
 +                            {
 +                                wchar_t* tmpLine = os_wcsdup(Line);
 +                                memset(Line, 0x00, LINE_MAX * 2);
 +                                wcscpy(Line, &tmpLine[1]);
 +                            }
 +                            nbLines++;
 +                            strLines[nbLines - 1] = os_wcsdup(removeEOL(Line));
 +                            if (strLines[nbLines - 1] == NULL)
 +                            {
 +                                *nbLinesOut = 0;
 +                                *ierr = MGETL_MEMORY_ALLOCATION_ERROR;
 +                                return NULL;
 +                            }
 +                            wcscpy(Line, EMPTYSTRW);
 +                        }
 +                        else
 +                        {
 +                            /* EOF */
 +                            if (feof(pFile->getFiledesc()))
 +                            {
 +                                bEOF = TRUE;
 +                            }
 +                            bContinue = FALSE;
 +                        }
 +                    }
 +                    else
 +                    {
 +                        bContinue = FALSE;
 +                    }
 +                } while (bContinue);
 +
 +                *nbLinesOut = nbLines;
 +                if (bEOF)
 +                {
 +                    *ierr = MGETL_EOF;
 +                }
 +                else
 +                {
 +                    *ierr = MGETL_NO_ERROR;
 +                }
 +            }
 +        }
 +    }
 +    return strLines;
 +}
 +/*--------------------------------------------------------------------------*/
 +wchar_t* getLine(wchar_t* _pstLine, int _iLineSize, File* _pFile)
 +{
 +    if(static_cast<int>(_pFile->getFileModeAsDouble()) % 2 == 1)
 +    {//binary mode
 +        return fgetws(_pstLine, _iLineSize, _pFile->getFiledesc());
 +    }
 +    else
 +    {
 +        char* pstTemp = (char*)MALLOC(sizeof(char) * _iLineSize);
 +        if(fgets(pstTemp, _iLineSize, _pFile->getFiledesc()) == NULL)
 +        {
 +            FREE(pstTemp);
 +            return NULL;
 +        }
 +        char* pstUtf = convertAnsiToUtf(pstTemp);
 +        wchar_t* pstTempWide = to_wide_string(pstUtf);
 +        wcscpy(_pstLine, pstTempWide);
 +        FREE(pstUtf);
 +        FREE(pstTemp);
 +        FREE(pstTempWide);
 +        return _pstLine;
 +    }
 +}
 +/*--------------------------------------------------------------------------*/
 +wchar_t *removeEOL(wchar_t *_inString)
 +{
 +    if (_inString)
 +    {
 +        wchar_t *pos = wcschr(_inString, LF);
 +        if(pos)
 +        {
 +            *pos = 0;
 +        }
 +
 +        pos = wcschr(_inString, CR);
 +        if(pos)
 +        {
 +            *pos = 0;
 +        }
 +    }
 +    return _inString;
 +}
 +/*--------------------------------------------------------------------------*/
 +/*
 +* convert ansi to Utf
 +*/
- char *convertAnsiToUtf(char *_inString)
++static char *convertAnsiToUtf(char *_inString)
 +{
 +    char *outString = NULL;
 +    if (_inString)
 +    {
 +#ifdef _MSC_VER
 +        if (IsValidUTF8(_inString))
 +        {
 +            outString = os_strdup(_inString);
 +        }
 +        else
 +        {
 +            /* conversion ANSI to UTF */
 +            int Len = 0;
 +            int newLen = 0;   
 +            BSTR bstrCode = NULL;    
 +
 +            Len = MultiByteToWideChar(CP_ACP, 0, _inString, lstrlen(_inString), NULL, NULL);    
 +            bstrCode = SysAllocStringLen(NULL, Len);    
 +            if (bstrCode)
 +            {
 +                MultiByteToWideChar(CP_ACP, 0, _inString, lstrlen(_inString), bstrCode, Len);   
 +                newLen = WideCharToMultiByte(CP_UTF8, 0, bstrCode, -1, outString, 0, NULL, NULL);    
 +                outString = (char*) MALLOC(sizeof(char) * (newLen + 1));
 +                if (outString)
 +                {
 +                    WideCharToMultiByte(CP_UTF8, 0, bstrCode, -1, outString, newLen, NULL, NULL); 
 +                }
 +                else
 +                {
 +                    outString = os_strdup(_inString);
 +                }
 +                SysFreeString(bstrCode);
 +                bstrCode = NULL;
 +            }
 +            else
 +            {
 +                outString = os_strdup(_inString);
 +            }
 +        }
 +#else
 +        if (IsValidUTF8(_inString))
 +        {
 +            outString = os_strdup(_inString);
 +        }
 +        else
 +        {
 +            int len = (int)strlen(_inString);
 +            int i = 0;
 +
-             outString = (char*)MALLOC(((len*3) + 1) * sizeof(char));
++            outString = (char*)MALLOC(((len * 3) + 1) * sizeof(char));
 +            if (outString == NULL)
 +            {
 +                return NULL;
 +            }
 +
 +            strcpy(outString, EMPTYSTR);
 +
 +            for (i = 0; i < len; i++)
 +            {
 +                char *outUtfChar = NULL;
 +                unsigned char inAnsiChar = 0;
 +
 +                if (_inString[i] < 0)
 +                {
 +                    inAnsiChar = 256 + _inString[i];
 +                }
 +                else
 +                {
 +                    inAnsiChar = _inString[i];
 +                }
 +
 +                if(inAnsiChar < 128)
 +                {
 +                    outUtfChar = (char *)CALLOC(2, sizeof(char));
 +                    if (outUtfChar)
 +                    {
 +                        outUtfChar[0] = inAnsiChar;
 +                        outUtfChar[1] = 0;
 +                    }
 +                }
 +                else
 +                {
 +                    outUtfChar = (char *)CALLOC(3, sizeof(char));
 +                    if (outUtfChar)
 +                    {
 +                        outUtfChar[0] = (inAnsiChar >> 6) | 0xC0;
 +                        outUtfChar[1] = (inAnsiChar & 0x3F) | 0x80;
 +                        outUtfChar[2] = 0;
 +                    }
 +                }
 +
 +                if (outUtfChar)
 +                {
 +                    strcat(outString, outUtfChar);
 +                    FREE(outUtfChar);
 +                    outUtfChar = NULL;
 +                }
 +            }
 +        }
 +#endif
 +    }
 +    return outString;
 +}
 +/*--------------------------------------------------------------------------*/
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "functions module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "functions module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "functions.dll"
              VALUE "ProductName", "functions module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "functions_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "functions_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "functions_f.dll"
              VALUE "ProductName", "functions_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "graphic_export module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "graphic_export module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scigraphic_export.dll"
              VALUE "ProductName", "graphic_export module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "nographic_export module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "nographic_export module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "nographic_export.dll"
              VALUE "ProductName", " nographic_export"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "graphics module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "graphics module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "graphics.dll"
              VALUE "ProductName", "graphics module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "nographics module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "nographics module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "nographics.dll"
              VALUE "ProductName", " nographics"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "gui module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "gui module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scigui.dll"
              VALUE "ProductName", "gui module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "nogui module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "nogui module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "noscigui.dll"
              VALUE "ProductName", " nogui"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "hdf5 module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "hdf5 module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scihdf5.dll"
              VALUE "ProductName", " hdf5"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -6,14 -8,12 +6,14 @@@
        @import url("c_code.css");
        @import url("style.css");
      </style>
 -</head>
 -<body>
 -  <div class="manualnavbar" align="left">
 -    <img src="jarsci:ban_en_US.png"><br/>
 -    <a href="http://www.scilab.org/" class="ulink">Portail Scilab</a> | <a href="http://help.scilab.org/" class="ulink">Aide en ligne</a> | <a href="http://wiki.scilab.org/" class="ulink">Wiki</a> | <a href="http://bugzilla.scilab.org/" class="ulink">Suivi de bugs</a> | <a href="http://forge.scilab.org/" class="ulink">Forge</a> | <a href="http://lists.scilab.org/" class="ulink">Archives de la liste de diffusion</a> | <a href="http://atoms.scilab.org/" class="ulink">ATOMS</a> | <a href="http://fileexchange.scilab.org/" class="ulink">File exchange</a>
 -    <hr>
 +  </head>
 +  <body>
 +<div align="center">
- <img src="ban_en_US.png" />
++<img src="jarsci:ban_en_US.png" />
 +</div>
 +    <div class="manualnavbar" align="center">
 +<a href="http://www.scilab.org/" class="ulink">Portail Scilab</a> | <a href="http://help.scilab.org/" class="ulink">Aide en ligne</a> | <a href="http://wiki.scilab.org/" class="ulink">Wiki</a> | <a href="http://bugzilla.scilab.org/" class="ulink">Suivi de bugs</a> | <a href="http://forge.scilab.org/" class="ulink">Forge</a> | <a href="http://lists.scilab.org/" class="ulink">Archives de la liste de diffusion</a> | <a href="http://atoms.scilab.org/" class="ulink">ATOMS</a> | <a href="http://fileexchange.scilab.org/" class="ulink">File exchange</a>
 +      <hr />
      </div>
      <span class="path"><a href="index.html">Aide Scilab</a> &gt;&gt; Page d'accueil</span>
      <br><br><div class="refsection">
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BEGIN
              VALUE "CompanyName", "Scilab"
              VALUE "FileDescription", "helptools module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "helptools"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "helptools.rc"
              VALUE "ProductName", " helptools"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -138,9 -133,8 +138,8 @@@ public class ScilabImageConverter imple
          buffer.append("endfunction\n");
          buffer.append("_generate_image_from_doc();\n");
          buffer.append("clear _generate_image_from_doc;\n");
--
 +        */
-         return getHTMLCodeToReturn(code, "<img src=\'" + imageName + "\'/>");
+         return getHTMLCodeToReturn(code, "<img src=\'" + conv.getBaseImagePath() + imageName + "\'/>");
      }
  
      public String getHTMLCodeToReturn(String code, String imageTag) {
              code = convertCode(code);
              /* Provide a tooltip */
              return "<div rel='tooltip' title='" + code + "'>" + imageTag + "</div>";
--        } else {
++    } else {
              /* No tooltip in the javahelp browser ...
               * too limited html capabilities */
              return imageTag;
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "history_browser module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "history_browser module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "history_browser.dll"
              VALUE "ProductName", "history_browser module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "nohistory_browser module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "nohistory_browser module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "nohistory_browser.dll"
              VALUE "ProductName", " nohistory_browser"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "history_manager module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "history_manager module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "history_manager.dll"
              VALUE "ProductName", " history_manager"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "integer module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "integer module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "integer.dll"
              VALUE "ProductName", "integer module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "intger_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "integer_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "integer_f.dll"
              VALUE "ProductName", "integer_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "interpolation module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "interpolation module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "interpolation.dll"
              VALUE "ProductName", "intepolation module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "interpolation_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "interpolation_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "interpolation_f.dll"
              VALUE "ProductName", "interpolation_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "io module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "io module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "io.dll"
              VALUE "ProductName", "io module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "io_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "io_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "io_f.dll"
              VALUE "ProductName", "io_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "javasci module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "javasci module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "javasci.dll"
              VALUE "ProductName", "javasci module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BEGIN
              VALUE "CompanyName", "Scilab"
              VALUE "FileDescription", "jvm module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "jvm"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "libjvm.dll"
              VALUE "ProductName", "jvm"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "nojvm module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "nojvm module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "nolibjvm.dll"
              VALUE "ProductName", " nojvm"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "linear_algebra module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "linear_algebra module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "linear_algebra.dll"
              VALUE "ProductName", "linear_algebra module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "linear_algebra_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "linear_algebra_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "linear_algebra_f.dll"
              VALUE "ProductName", "linear_algebra_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -30,102 -30,102 +30,101 @@@ static char *getLanguageFromAlias(char 
  /*--------------------------------------------------------------------------*/
  int sci_setdefaultlanguage(char *fname,unsigned long fname_len)
  {
 -      int n1 = 0, m1 = 0, l1 = 0;
 -
 -      CheckRhs(1, 1);
 -      CheckLhs(1, 1);
 -      #ifndef _MSC_VER
 -      {
 -              if (getWarningMode())
 -              {
 -                      sciprint(_("%s: This feature is only used on Windows.\n"), fname);
 -              }
 -              m1 = 1; n1 = 1;
 -              CreateVar(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &m1,&n1,&l1);
 -              *istk(l1)=(int)(FALSE);
 +      //int n1 = 0, m1 = 0, l1 = 0;
  
 -              LhsVar(1) = Rhs+1;
 -              PutLhsVar();
 -      }
 -      #else
 -      {
 -              if (GetType(1) == sci_strings)
 -              {
 -                      char *newlang = NULL;
 -                      GetRhsVar(1, STRING_DATATYPE, &m1, &n1, &l1);
 -                      newlang = getLanguageFromAlias( cstk(l1) );
 +      //CheckRhs(1, 1);
 +      //CheckLhs(1, 1);
 +      //#ifndef _MSC_VER
 +      //{
 +      //      if (getWarningMode())
 +      //      {
 +      //              sciprint(_("%s: This feature is only used on Windows.\n"), fname);
 +      //      }
 +      //      m1 = 1; n1 = 1;
 +      //      CreateVar(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1,&n1,&l1);
 +      //      *istk(l1)=(int)(FALSE);
 +      //      LhsVar(1) = Rhs+1;
 +      //      C2F(putlhsvar)();
 +      //}
 +      //#else
 +      //{
 +      //      if (GetType(1) == sci_strings)
 +      //      {
 +      //              char *newlang = NULL;
 +      //              GetRhsVar(1, STRING_DATATYPE, &m1, &n1, &l1);
 +      //              newlang = getLanguageFromAlias( cstk(l1) );
  
 -                      if ( !isValidLanguage(newlang) )
 -                      {
 -                              if ( getWarningMode() )
 -                              {
 -                                      sciprint(_("Unsupported language '%s'.\n"),newlang);
 -                              }
 -                              m1 = 1; n1 = 1;
 -                              CreateVar(Rhs+1, MATRIX_OF_BOOLEAN_DATATYPE, &n1,&n1,&l1);
 -                              *istk(l1) = (int)(FALSE);
 -                if (newlang) { FREE(newlang); newlang = NULL; }
 -                              LhsVar(1) = Rhs+1;
 -                              PutLhsVar();
 -                              return 0;
 -                      }
 -                      else
 -                      {
 -                              char *savedLanguage = getLanguagePreferences();
 -                              if ( strcmp(newlang, savedLanguage) == 0 )
 -                              {
 -                                      /* do nothing */
 -                                      m1 = 1; n1 = 1;
 -                                      CreateVar(Rhs+1, MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &l1);
 -                                      *istk(l1) = (int)(TRUE);
 -                                      LhsVar(1) = Rhs+1;
 -                                      if (newlang) { FREE(newlang); newlang = NULL; }
 -                                      if (savedLanguage) { FREE(savedLanguage); savedLanguage = NULL; }
 -                                      PutLhsVar();
 -                                      return 0;
 -                              }
 -                              else
 -                              {
 -                                      if (savedLanguage) { FREE(savedLanguage); savedLanguage = NULL; }
 -                                      if ( !setlanguage(newlang) ) /* */
 -                                      {
 -                                              m1 = 1; n1 = 1;
 -                                              CreateVar(Rhs+1, MATRIX_OF_BOOLEAN_DATATYPE, &n1,&n1,&l1);
 -                                              *istk(l1) = (int)(FALSE);
 -                                              LhsVar(1) = Rhs+1;
 -                        if (newlang) { FREE(newlang); newlang = NULL; }
 -                                              PutLhsVar();
 +      //              if ( !isValidLanguage(newlang) )
 +      //              {
 +      //                      if ( getWarningMode() )
 +      //                      {
 +      //                              sciprint(_("Unsupported language '%s'.\n"),newlang);
 +      //                      }
 +      //                      m1 = 1; n1 = 1;
 +      //                      CreateVar(Rhs+1, MATRIX_OF_BOOLEAN_DATATYPE, &n1,&n1,&l1);
 +      //                      *istk(l1) = (int)(FALSE);
 +      //                      LhsVar(1) = Rhs+1;
 +      //                      C2F(putlhsvar)();
 +      //                      if (newlang) { FREE(newlang); newlang = NULL; }
 +      //                      return 0;
 +      //              }
 +      //              else
 +      //              {
 +      //                      char *savedLanguage = getLanguagePreferences();
 +      //                      if ( strcmp(newlang, savedLanguage) == 0 )
 +      //                      {
 +      //                              /* do nothing */
 +      //                              m1 = 1; n1 = 1;
 +      //                              CreateVar(Rhs+1, MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &l1);
 +      //                              *istk(l1) = (int)(TRUE);
 +      //                              LhsVar(1) = Rhs+1;
 +      //                              C2F(putlhsvar)();
 +      //                              if (newlang) { FREE(newlang); newlang = NULL; }
 +      //                              if (savedLanguage) { FREE(savedLanguage); savedLanguage = NULL; }
 +      //                              return 0;
 +      //                      }
 +      //                      else
 +      //                      {
 +      //                              if (savedLanguage) { FREE(savedLanguage); savedLanguage = NULL; }
 +      //                              if ( !setlanguage(newlang) ) /* */
 +      //                              {
 +      //                                      m1 = 1; n1 = 1;
 +      //                                      CreateVar(Rhs+1, MATRIX_OF_BOOLEAN_DATATYPE, &n1,&n1,&l1);
 +      //                                      *istk(l1) = (int)(FALSE);
 +      //                                      LhsVar(1) = Rhs+1;
 +      //                                      C2F(putlhsvar)();
 +      //                                      if (newlang) { FREE(newlang); newlang = NULL; }
 +      //                                      return 0;
 +      //                              }
 +      //                              else
 +      //                              {
 +      //                                      if ( getWarningMode() )
 +      //                                      {
 +      //                                              sciprint("\n");
 +      //                                              sciprint(_("The language for menus cannot be changed on a running console.\n"));
 +      //                                              sciprint(_("Restart Scilab to apply to menus.\n"));
 +      //                                      }
  
 -                                              return 0;
 -                                      }
 -                                      else
 -                                      {
 -                                              if ( getWarningMode() )
 -                                              {
 -                                                      sciprint("\n");
 -                                                      sciprint(_("The language for menus cannot be changed on a running console.\n"));
 -                                                      sciprint(_("Restart Scilab to apply to menus.\n"));
 -                                              }
 +      //                                      m1 = 1; n1 = 1;
 +      //                                      CreateVar(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1,&n1,&l1);
  
 -                                              m1 = 1; n1 = 1;
 -                                              CreateVar(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1,&n1,&l1);
 +      //                                      if ( setLanguagePreferences() ) *istk(l1) = (int)TRUE;
 +      //                                      else *istk(l1) = (int)FALSE;
  
 -                                              if ( setLanguagePreferences() ) *istk(l1) = (int)TRUE;
 -                                              else *istk(l1) = (int)FALSE;
 -                                              if (newlang) { FREE(newlang); newlang = NULL; }
 -                                              LhsVar(1) = Rhs+1;
 -                                              PutLhsVar();
 -                                              return 0;
 -                                      }
 -                              }
 -                       }
 -              }
 -              else
 -              {
 -                      Scierror(999,_("%s: Wrong type for first input argument: String expected.\n"), fname);
 -              }
 -      }
 -      #endif
 +      //                                      LhsVar(1) = Rhs+1;
 +      //                                      C2F(putlhsvar)();
 +      //                                      if (newlang) { FREE(newlang); newlang = NULL; }
 +      //                                      return 0;
 +      //                              }
 +      //                      }
 +      //               }
 +      //      }
 +      //      else
 +      //      {
 +      //              Scierror(999,_("%s: Wrong type for first input argument: String expected.\n"), fname);
 +      //      }
 +      //}
 +      //#endif
  
        return 0;
  }
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "localization module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "localization module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scilocalization.dll"
              VALUE "ProductName", "localization module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
        return 0;                            \
      }
  
 -matvar_t *GetSparseVariable(int iVar, const char *name, int * parent, int item_position)
 +matvar_t *GetSparseVariable(void* pvApiCtx, int iVar, const char *name, int * parent, int item_position)
  {
-   int K = 0;
-   int rank = 0;
-   int *dims = NULL;
-   double *data = NULL;
-   matvar_t *createdVar = NULL;
-   sparse_t *sparseData = NULL;
-   SciSparse scilabSparse;
-   int *colIndexes = NULL;
-   int *rowIndexes = NULL;
-   int * var_addr = NULL;
-   int * item_addr = NULL;
-   int var_type;
-   SciErr _SciErr;
-   if (parent==NULL)
+     int K = 0;
+     int rank = 0;
+     int *dims = NULL;
+     double *data = NULL;
+     matvar_t *createdVar = NULL;
+     sparse_t *sparseData = NULL;
+     SciSparse scilabSparse;
+     int *colIndexes = NULL;
+     int *rowIndexes = NULL;
+     int * var_addr = NULL;
+     int * item_addr = NULL;
+     int var_type;
+     SciErr _SciErr;
+     if (parent == NULL)
      {
-       _SciErr = getVarAddressFromPosition(pvApiCtx, iVar, &var_addr); MATIO_ERROR;
-       _SciErr = getVarType(pvApiCtx, var_addr, &var_type); MATIO_ERROR;
+         _SciErr = getVarAddressFromPosition(pvApiCtx, iVar, &var_addr);
+         MATIO_ERROR;
+         _SciErr = getVarType(pvApiCtx, var_addr, &var_type);
+         MATIO_ERROR;
      }
-   else
+     else
      {
-       _SciErr = getListItemAddress(pvApiCtx, parent, item_position, &item_addr); MATIO_ERROR;
-       _SciErr = getVarType(pvApiCtx, item_addr, &var_type); MATIO_ERROR;
+         _SciErr = getListItemAddress(pvApiCtx, parent, item_position, &item_addr);
+         MATIO_ERROR;
+         _SciErr = getVarType(pvApiCtx, item_addr, &var_type);
+         MATIO_ERROR;
      }
  
-   if (var_type == sci_sparse)
+     if (var_type == sci_sparse)
      {
-       sparseData = (sparse_t*) MALLOC(sizeof(sparse_t));
-       if (sparseData==NULL)
+         sparseData = (sparse_t*) MALLOC(sizeof(sparse_t));
+         if (sparseData == NULL)
+         {
+             Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+             return FALSE;
+         }
+         rank = 2;
+         if ((dims = (int*) MALLOC (sizeof(int) * rank)) == NULL)
          {
-           Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-           return FALSE;
+             Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+             free(sparseData);
+             return NULL;
+         }
+         if (isVarComplex(pvApiCtx, var_addr))
+         {
+             if (parent == NULL)
+             {
+                 getAllocatedComplexSparseMatrix(pvApiCtx, var_addr, &dims[1], &dims[0],
+                                                 &scilabSparse.nel, &scilabSparse.mnel,
+                                                 &scilabSparse.icol, &scilabSparse.R,
+                                                 &scilabSparse.I);
+             }
+             else
+             {
+                 _SciErr = getSparseMatrixInList(pvApiCtx, parent, item_position, &dims[1], &dims[0],
+                                                 &scilabSparse.nel, NULL, NULL, NULL);
+                 scilabSparse.mnel = (int *)MALLOC(dims[1] * sizeof(int));
+                 if (scilabSparse.mnel == NULL)
+                 {
+                     Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+                     FREE(scilabSparse.mnel);
+                     return FALSE;
+                 }
+                 scilabSparse.icol = (int *)MALLOC(scilabSparse.nel * sizeof(int));
+                 if (scilabSparse.icol == NULL)
+                 {
+                     Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+                     FREE(scilabSparse.mnel);
+                     FREE(scilabSparse.icol);
+                     return FALSE;
+                 }
+                 scilabSparse.R    = (double *)MALLOC(scilabSparse.nel * sizeof(double));
+                 if (scilabSparse.R == NULL)
+                 {
+                     Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+                     FREE(scilabSparse.mnel);
+                     FREE(scilabSparse.icol);
+                     FREE(scilabSparse.R);
+                     return FALSE;
+                 }
+                 scilabSparse.I    = (double *)MALLOC(scilabSparse.nel * sizeof(double));
+                 if (scilabSparse.I == NULL)
+                 {
+                     Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+                     FREE(scilabSparse.mnel);
+                     FREE(scilabSparse.icol);
+                     FREE(scilabSparse.R);
+                     FREE(scilabSparse.I);
+                     return FALSE;
+                 }
+                 _SciErr = getComplexSparseMatrixInList(pvApiCtx, parent, item_position, &dims[1], &dims[0],
+                                                        &scilabSparse.nel, &scilabSparse.mnel,
+                                                        &scilabSparse.icol, &scilabSparse.R, &scilabSparse.I);
+             }
+             scilabSparse.it = 1;
          }
-       
-       rank = 2;
-       if ((dims = (int*) MALLOC (sizeof(int) * rank)) == NULL)
+         else
          {
-           Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-           return NULL;
+             if (parent == NULL)
+             {
+                 getAllocatedSparseMatrix(pvApiCtx, var_addr, &dims[1], &dims[0],
+                                          &scilabSparse.nel, &scilabSparse.mnel,
+                                          &scilabSparse.icol, &scilabSparse.R);
+             }
+             else
+             {
+                 _SciErr = getSparseMatrixInList(pvApiCtx, parent, item_position, &dims[1], &dims[0],
+                                                 &scilabSparse.nel, NULL, NULL, NULL);
+                 scilabSparse.mnel = (int *)MALLOC(dims[1] * sizeof(int));
+                 if (scilabSparse.mnel == NULL)
+                 {
+                     Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+                     FREE(scilabSparse.mnel);
+                     return FALSE;
+                 }
+                 scilabSparse.icol = (int *)MALLOC(scilabSparse.nel * sizeof(int));
+                 if (scilabSparse.icol == NULL)
+                 {
+                     Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+                     FREE(scilabSparse.mnel);
+                     FREE(scilabSparse.icol);
+                     return FALSE;
+                 }
+                 scilabSparse.R    = (double *)MALLOC(scilabSparse.nel * sizeof(double));
+                 if (scilabSparse.R == NULL)
+                 {
+                     Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+                     FREE(scilabSparse.mnel);
+                     FREE(scilabSparse.icol);
+                     FREE(scilabSparse.R);
+                     return FALSE;
+                 }
+                 _SciErr = getSparseMatrixInList(pvApiCtx, parent, item_position, &dims[1], &dims[0],
+                                                 &scilabSparse.nel, &scilabSparse.mnel,
+                                                 &scilabSparse.icol, &scilabSparse.R);
+             }
+             scilabSparse.it = 0;
          }
  
-       if (isVarComplex(pvApiCtx, var_addr))
-       {
-         if (parent==NULL)
-           {
-             getAllocatedComplexSparseMatrix(pvApiCtx, var_addr, &dims[1], &dims[0], 
-                                             &scilabSparse.nel, &scilabSparse.mnel, 
-                                             &scilabSparse.icol, &scilabSparse.R, 
-                                             &scilabSparse.I);
-           }
-         else
-           {
-             _SciErr = getSparseMatrixInList(pvApiCtx, parent, item_position, &dims[1], &dims[0], 
-                                             &scilabSparse.nel, NULL, NULL, NULL);
-             scilabSparse.mnel = (int *)MALLOC(dims[1]*sizeof(int));
-             if (scilabSparse.mnel==NULL)
-               {
-                 Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-                 FREE(scilabSparse.mnel);
-                 return FALSE;
-               }
-             scilabSparse.icol = (int *)MALLOC(scilabSparse.nel*sizeof(int));
-             if (scilabSparse.icol==NULL)
-               {
-                 Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-                 FREE(scilabSparse.mnel);
-                 FREE(scilabSparse.icol);
-                 return FALSE;
-               }
-             scilabSparse.R    = (double *)MALLOC(scilabSparse.nel*sizeof(double));
-             if (scilabSparse.R==NULL)
-               {
-                 Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-                 FREE(scilabSparse.mnel);
-                 FREE(scilabSparse.icol);
-                 FREE(scilabSparse.R);
-                 return FALSE;
-               }
-             scilabSparse.I    = (double *)MALLOC(scilabSparse.nel*sizeof(double));
-             if (scilabSparse.I==NULL)
-               {
-                 Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-                 FREE(scilabSparse.mnel);
-                 FREE(scilabSparse.icol);
-                 FREE(scilabSparse.R);
-                 FREE(scilabSparse.I);
-                 return FALSE;
-               }
-             _SciErr = getComplexSparseMatrixInList(pvApiCtx, parent, item_position, &dims[1], &dims[0], 
-                                                    &scilabSparse.nel, &scilabSparse.mnel, 
-                                                    &scilabSparse.icol, &scilabSparse.R, &scilabSparse.I);
-           }
-         scilabSparse.it = 1;
-                                                   
-       }
-       else
-       {
-         if (parent==NULL)
-           {
-             getAllocatedSparseMatrix(pvApiCtx, var_addr, &dims[1], &dims[0], 
-                                      &scilabSparse.nel, &scilabSparse.mnel, 
-                                      &scilabSparse.icol, &scilabSparse.R);
-           }
-         else
-           {
-             _SciErr = getSparseMatrixInList(pvApiCtx, parent, item_position, &dims[1], &dims[0], 
-                                             &scilabSparse.nel, NULL, NULL, NULL);
-             scilabSparse.mnel = (int *)MALLOC(dims[1]*sizeof(int));
-             if (scilabSparse.mnel==NULL)
-               {
-                 Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-                 FREE(scilabSparse.mnel);
-                 return FALSE;
-               }
-             scilabSparse.icol = (int *)MALLOC(scilabSparse.nel*sizeof(int));
-             if (scilabSparse.icol==NULL)
-               {
-                 Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-                 FREE(scilabSparse.mnel);
-                 FREE(scilabSparse.icol);
-                 return FALSE;
-               }
-             scilabSparse.R    = (double *)MALLOC(scilabSparse.nel*sizeof(double));
-             if (scilabSparse.R==NULL)
-               {
-                 Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-                 FREE(scilabSparse.mnel);
-                 FREE(scilabSparse.icol);
-                 FREE(scilabSparse.R);
-                 return FALSE;
-               }
-             _SciErr = getSparseMatrixInList(pvApiCtx, parent, item_position, &dims[1], &dims[0], 
-                                             &scilabSparse.nel, &scilabSparse.mnel, 
-                                             &scilabSparse.icol, &scilabSparse.R);
-           }
-         scilabSparse.it = 0;
-       }
-       scilabSparse.m = dims[1];
-       scilabSparse.n = dims[0];
-       /* colIndexes = (int*) MALLOC(sizeof(int) *  (scilabSparse.nel + 1));  */
-       colIndexes = (int*) MALLOC(sizeof(int) *  (scilabSparse.m + 1)); 
-       if (colIndexes==NULL)
+         scilabSparse.m = dims[1];
+         scilabSparse.n = dims[0];
+         /* colIndexes = (int*) MALLOC(sizeof(int) *  (scilabSparse.nel + 1));  */
+         colIndexes = (int*) MALLOC(sizeof(int) *  (scilabSparse.m + 1));
+         if (colIndexes == NULL)
          {
-           Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-         if (scilabSparse.it)
-           {
-             freeAllocatedComplexSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R, scilabSparse.I);
-           }
-         else
-           {
-             freeAllocatedSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R);
-           }
-           return FALSE;
+             Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+             if (scilabSparse.it)
+             {
+                 freeAllocatedComplexSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R, scilabSparse.I);
+             }
+             else
+             {
+                 freeAllocatedSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R);
+             }
+             return FALSE;
          }
-       
-       colIndexes[0] = 0;
-       /* for (K=0; K<scilabSparse.nel; K++) */
-       for (K=0; K<scilabSparse.m; K++)
+         colIndexes[0] = 0;
+         /* for (K=0; K<scilabSparse.nel; K++) */
+         for (K = 0; K < scilabSparse.m; K++)
          {
-           colIndexes[K+1] = colIndexes[K] + scilabSparse.mnel[K];
+             colIndexes[K + 1] = colIndexes[K] + scilabSparse.mnel[K];
          }
-  
-       rowIndexes = (int*) MALLOC(sizeof(int) *  scilabSparse.nel);
-       if (rowIndexes==NULL)
+         rowIndexes = (int*) MALLOC(sizeof(int) *  scilabSparse.nel);
+         if (rowIndexes == NULL)
          {
-           Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-         if (scilabSparse.it)
-           {
-             freeAllocatedComplexSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R, scilabSparse.I);
-           }
-         else
-           {
-             freeAllocatedSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R);
-           }
-           return FALSE;
+             Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+             free(colIndexes);
+             if (scilabSparse.it)
+             {
+                 freeAllocatedComplexSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R, scilabSparse.I);
+             }
+             else
+             {
+                 freeAllocatedSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R);
+             }
+             return FALSE;
          }
-       
-       for (K=0; K<scilabSparse.nel; K++)
+         for (K = 0; K < scilabSparse.nel; K++)
          {
-           rowIndexes[K] = scilabSparse.icol[K] - 1;
+             rowIndexes[K] = scilabSparse.icol[K] - 1;
          }
  
-       if (scilabSparse.it==0) /* Real sparse */
+         if (scilabSparse.it == 0) /* Real sparse */
          {
-           if ((data = (double*) MALLOC(sizeof(double) * scilabSparse.nel)) == NULL)
+             if ((data = (double*) MALLOC(sizeof(double) * scilabSparse.nel)) == NULL)
+             {
+                 Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+                 free(rowIndexes);
+                 free(colIndexes);
+                 if (scilabSparse.it)
+                 {
+                     freeAllocatedComplexSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R, scilabSparse.I);
+                 }
+                 else
+                 {
+                     freeAllocatedSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R);
+                 }
+                 return 0;
+             }
+             for (K = 0; K < scilabSparse.nel; K++)
              {
-               Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-             if (scilabSparse.it)
-               {
-                 freeAllocatedComplexSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R, scilabSparse.I);
-               }
-             else
-               {
-                 freeAllocatedSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R);
-               }
-             
-             return 0;
-           }
-           for(K = 0; K < scilabSparse.nel; K++) 
-              { 
-                data[K] = scilabSparse.R[K]; 
-              } 
+                 data[K] = scilabSparse.R[K];
+             }
          }
-       else
+         else
          {
-           if ((data = (double*) MALLOC(2 * sizeof(double) * scilabSparse.nel)) == NULL)
+             if ((data = (double*) MALLOC(2 * sizeof(double) * scilabSparse.nel)) == NULL)
              {
-               Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
-             if (scilabSparse.it)
-               {
-                 freeAllocatedComplexSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R, scilabSparse.I);
-               }
-             else
-               {
-                 freeAllocatedSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R);
-               }
-             
-               return FALSE;
+                 Scierror(999, _("%s: No more memory.\n"), "GetSparseVariable");
+                 if (scilabSparse.it)
+                 {
+                     freeAllocatedComplexSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R, scilabSparse.I);
+                 }
+                 else
+                 {
+                     freeAllocatedSparseMatrix(scilabSparse.mnel, scilabSparse.icol, scilabSparse.R);
+                 }
+                 free(rowIndexes);
+                 free(colIndexes);
+                 return FALSE;
              }
  
-           for(K = 0; K < scilabSparse.nel; K++)
+             for (K = 0; K < scilabSparse.nel; K++)
              {
-               data[K] = scilabSparse.R[K];
+                 data[K] = scilabSparse.R[K];
              }
  
-           for(K = 0; K < scilabSparse.nel; K++)
+             for (K = 0; K < scilabSparse.nel; K++)
              {
-               data[K + scilabSparse.nel] = scilabSparse.I[K];
+                 data[K + scilabSparse.nel] = scilabSparse.I[K];
              }
          }
  
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BEGIN
              VALUE "CompanyName", "Scilab"
              VALUE "FileDescription", "matio module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "matio"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "matio.rc"
              VALUE "ProductName", " matio"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "mexlib module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "mexlib module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "libmat.dll"
              VALUE "ProductName", "mexlib module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "mexlib module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "mexlib module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "libmex.dll"
              VALUE "ProductName", "mexlib module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "mexlib module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "mexlib module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "libmx.dll"
              VALUE "ProductName", "mexlib module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "optimization module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "optimization module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "optimization.dll"
              VALUE "ProductName", "optimization module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "optmization_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "optmization_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "optmization_f.dll"
              VALUE "ProductName", "optmization_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
  #include <string.h>
  #include <stdio.h>
  #include "Scierror.h"
 -#include "stack-def.h" /* bsiz */
 -#include "error_internal.h"
 -/*--------------------------------------------------------------------------*/ 
 +#include "MALLOC.h"
 +#include "charEncoding.h"
 +#include "scilabWrite.hxx"
 +#include "lasterror.h"
 +
 +/*--------------------------------------------------------------------------*/
  #ifdef _MSC_VER
 -      #define vsnprintf _vsnprintf
 +  #define vsnprintf _vsnprintf
 +    #define vsnwprintf _vsnwprintf
  #endif
 -/*--------------------------------------------------------------------------*/ 
 +/*--------------------------------------------------------------------------*/
  /* Scilab Error at C level */
 -/*--------------------------------------------------------------------------*/ 
 +/*--------------------------------------------------------------------------*/
  int  Scierror(int iv,const char *fmt,...)
  {
-   int retval = 0;
-   int lstr = 0;
-   char s_buf[bsiz];
+       int retval = 0;
 +    wchar_t* pwstError = NULL;
-   va_list ap;
+       char s_buf[bsiz];
+       va_list ap;
+       
+       va_start(ap,fmt);
  
-   va_start(ap,fmt);
- #if _MSC_VER
-   retval = vsnprintf(s_buf,bsiz-1, fmt, ap );
+ #if defined (vsnprintf) || defined (linux)
+       retval = vsnprintf(s_buf,bsiz-1, fmt, ap );
  #else
 -      retval = vsprintf(s_buf,fmt, ap );
 +  retval = vsnprintf(s_buf, bsiz - 1, fmt, ap);
  #endif
 -      if (retval < 0) s_buf[bsiz-1]='\0';
 +  if (retval < 0) s_buf[bsiz-1]='\0';
  
-   lstr = (int) strlen(s_buf);
-   va_end(ap);
+       va_end(ap);
  
 -      error_internal(&iv,s_buf);
 +    pwstError = to_wide_string(s_buf);
 +    setLastError(iv, pwstError, 0, NULL);
  
 -      return retval;
 +    scilabErrorW(pwstError);
 +    scilabErrorW(L"\n");
 +    FREE(pwstError);
 +  return retval;
  }
 +
 +//int ScierrorW(int iv, const wchar_t *fmt,...)
 +//{
 +//  int retval = 0;
 +//  int lstr = 0;
 +//  wchar_t s_buf[bsiz];
 +//  va_list ap;
 +//
 +//  va_start(ap,fmt);
 +//
 +//#if _MSC_VER
 +//  retval = vsnwprintf(s_buf,bsiz-1, fmt, ap );
 +//#else
 +//  retval = vswprintf(s_buf, bsiz-1, fmt, ap );
 +//#endif
 +//  if (retval < 0) s_buf[bsiz-1]='\0';
 +//
 +//  lstr = (int) wcslen(s_buf);
 +//  va_end(ap);
 +//
 +//
 +//    setLastError(iv, s_buf, 0, NULL);
 +//    scilabErrorW(s_buf);
 +//    scilabErrorW(L"\n");
 +//
 +//  return retval;
 +//}
  /*--------------------------------------------------------------------------*/
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "output_stream module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "output_stream module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "output_stream.dll"
              VALUE "ProductName", "output_stream module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "output_stream_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "output_stream_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "output_stream_f.dll"
              VALUE "ProductName", "output_stream_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "parameters module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "parameters module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "parameters.dll"
              VALUE "ProductName", " parameters"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "polynomials module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "polynomials module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "polynomials.dll"
              VALUE "ProductName", " polynomials"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "polynomials_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "polynomials_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "polynomials_f.dll"
              VALUE "ProductName", "polynomials_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "randlib module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "randlib module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "randlib.dll"
              VALUE "ProductName", "randlib module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "randlib_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "randlib_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scirandlib_f.dll"
              VALUE "ProductName", "randlib_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "norandlib module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "norandlib module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "norandlib.dll"
              VALUE "ProductName", " norandlib"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "renderer module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "renderer module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scirenderer.dll"
              VALUE "ProductName", "renderer module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "norender"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "norenderer"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "noscirenderer.dll"
              VALUE "ProductName", " norenderer"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "noscicos module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "noscicos module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "noscicos.dll"
              VALUE "ProductName", " noscicos"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "scicos module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "scicos module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scicos.dll"
              VALUE "ProductName", "scicos module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "scicos_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "scicos_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scicos_f.dll"
              VALUE "ProductName", "scicos_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "scicos_sundials module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "scicos_sundials module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scicos_sundials.dll"
              VALUE "ProductName", "scicos_sundials module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "scicos_blocks module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "scicos_blocks module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scicos_blocks.dll"
              VALUE "ProductName", "scicos_blocks module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "scicos_blocks_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "scicos_blocks_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scicos_blocks_f.dll"
              VALUE "ProductName", "scicos_blocks_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "scinotes module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "scinotes module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "scinotes.dll"
              VALUE "ProductName", "scinotes module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "signal_processing module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "signal_processing module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "signal_processing.dll"
              VALUE "ProductName", "signal_processing module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "signal_processing_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "signal_processing_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "signal_processing_f.dll"
              VALUE "ProductName", "signal_processing_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BEGIN
              VALUE "CompanyName", "Scilab"
              VALUE "FileDescription", "sound module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "sound"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "sound.rc"
              VALUE "ProductName", " sound"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -66,12 -66,12 +66,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "nosound module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "nosound module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "nosound.dll"
              VALUE "ProductName", " nosound"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "sparse module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "sparse module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "sparse.dll"
              VALUE "ProductName", "sparse module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -65,12 -65,12 +65,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "sparse_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "sparse_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "sparse_f.dll"
              VALUE "ProductName", "sparse_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "special_functions module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "special_functions module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "special_functions.dll"
              VALUE "ProductName", "special_functions module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"
@@@ -64,12 -64,12 +64,12 @@@ BEGI
          BLOCK "040c04b0"
          BEGIN
              VALUE "FileDescription", "elementary_functions_f module"
 -            VALUE "FileVersion", "5, 5, 0, 0"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "elementary_functions_f module"
-             VALUE "LegalCopyright", "Copyright (C) 2012"
+             VALUE "LegalCopyright", "Copyright (C) 2013"
              VALUE "OriginalFilename", "elementary_functions_f.dll"
              VALUE "ProductName", "elementary_functions_f module"
 -            VALUE "ProductVersion", "5, 5, 0, 0"
 +            VALUE "ProductVersion", "6, 0, 0, 0"
          END
      END
      BLOCK "VarFileInfo"