summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/Makefile.in1
-rw-r--r--scilab/modules/action_binding/Makefile.in1
-rw-r--r--scilab/modules/api_scilab/Makefile.in1
-rw-r--r--scilab/modules/arnoldi/Makefile.in1
-rw-r--r--scilab/modules/atoms/Makefile.in1
-rw-r--r--scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONget.sci4
-rw-r--r--scilab/modules/boolean/Makefile.in1
-rw-r--r--scilab/modules/cacsd/Makefile.in1
-rw-r--r--scilab/modules/cacsd/etc/cacsd.start2
-rw-r--r--scilab/modules/cacsd/help/en_US/contr.xml2
-rw-r--r--scilab/modules/cacsd/help/pt_BR/m_circle.xml2
-rw-r--r--scilab/modules/call_scilab/Makefile.in1
-rw-r--r--scilab/modules/call_scilab/help/en_US/BooleanManagement.xml6
-rw-r--r--scilab/modules/call_scilab/help/en_US/ComplexManagement.xml4
-rw-r--r--scilab/modules/call_scilab/help/en_US/DisableInteractiveMode.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/DoubleManagement.xml6
-rw-r--r--scilab/modules/call_scilab/help/en_US/GetLastJob.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/ScilabHaveAGraph.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/SendScilabJob.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/SendScilabJobs.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/StartScilab.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/StringManagement.xml6
-rw-r--r--scilab/modules/call_scilab/help/en_US/TerminateScilab.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/call_scilab.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/compile_and_run_call_scilab.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/creadbmat.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/creadchain.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/creadcmat.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/creadmat.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/cwritebmat.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/cwritechain.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/cwritecmat.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/cwritemat.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/fromc.xml2
-rw-r--r--scilab/modules/call_scilab/help/en_US/fromjava.xml2
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in1
-rw-r--r--scilab/modules/completion/Makefile.in1
-rw-r--r--scilab/modules/console/Makefile.in1
-rw-r--r--scilab/modules/core/Makefile.in1
-rw-r--r--scilab/modules/core/help/en_US/external.xml4
-rw-r--r--scilab/modules/core/help/en_US/sethomedirectory.xml28
-rw-r--r--scilab/modules/core/help/fr_FR/external.xml2
-rw-r--r--scilab/modules/core/help/pt_BR/external.xml5
-rw-r--r--scilab/modules/core/help/pt_BR/sethomedirectory.xml44
-rw-r--r--scilab/modules/core/includes/callinter.h3
-rw-r--r--scilab/modules/core/macros/scilab_demos.sci7
-rw-r--r--scilab/modules/core/macros/sethomedirectory.sci20
-rw-r--r--scilab/modules/core/macros/toolboxes.sci8
-rw-r--r--scilab/modules/core/sci_gateway/c/sci_getmd5.c8
-rw-r--r--scilab/modules/core/src/c/recursionFunction.c4
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_4077.dia.ref12
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_4077.tst4
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_6521.dia.ref3
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_6521.tst6
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_6586.dia.ref15
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_6586.tst18
-rw-r--r--scilab/modules/core/tests/unit_tests/comment.dia.ref72
-rw-r--r--scilab/modules/core/tests/unit_tests/comment.tst8
-rw-r--r--scilab/modules/data_structures/Makefile.in1
-rw-r--r--scilab/modules/demo_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/macros/test_run.sci6
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in1
-rw-r--r--scilab/modules/differential_equations/Makefile.in1
-rw-r--r--scilab/modules/differential_equations/help/en_US/feval.xml4
-rw-r--r--scilab/modules/differential_equations/help/en_US/impl.xml6
-rw-r--r--scilab/modules/differential_equations/help/en_US/intg.xml2
-rw-r--r--scilab/modules/differential_equations/help/en_US/ode.xml2
-rw-r--r--scilab/modules/differential_equations/help/en_US/ode_optional_output.xml2
-rw-r--r--scilab/modules/differential_equations/help/fr_FR/feval.xml4
-rw-r--r--scilab/modules/differential_equations/help/fr_FR/intg.xml2
-rw-r--r--scilab/modules/differential_equations/help/fr_FR/ode.xml2
-rw-r--r--scilab/modules/differential_equations/help/pt_BR/feval.xml4
-rw-r--r--scilab/modules/differential_equations/help/pt_BR/impl.xml6
-rw-r--r--scilab/modules/differential_equations/help/pt_BR/intg.xml2
-rw-r--r--scilab/modules/differential_equations/help/pt_BR/ode.xml2
-rw-r--r--scilab/modules/differential_equations/help/pt_BR/ode_optional_output.xml2
-rw-r--r--scilab/modules/double/Makefile.in1
-rw-r--r--scilab/modules/dynamic_link/Makefile.in1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/call.xml16
-rw-r--r--scilab/modules/elementary_functions/Makefile.am10
-rw-r--r--scilab/modules/elementary_functions/Makefile.in40
-rw-r--r--scilab/modules/elementary_functions/help/en_US/sort.xml141
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/sort.xml128
-rw-r--r--scilab/modules/elementary_functions/help/pt_BR/binomial.xml4
-rw-r--r--scilab/modules/elementary_functions/help/pt_BR/dsearch.xml6
-rw-r--r--scilab/modules/elementary_functions/help/pt_BR/ndgrid.xml4
-rw-r--r--scilab/modules/elementary_functions/help/pt_BR/sort.xml143
-rw-r--r--scilab/modules/elementary_functions/includes/elementary_functions.h1
-rw-r--r--scilab/modules/elementary_functions/includes/gw_elementary_functions.h1
-rw-r--r--scilab/modules/elementary_functions/macros/%_sort.sci31
-rw-r--r--scilab/modules/elementary_functions/macros/tand.sci26
-rw-r--r--scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c3
-rw-r--r--scilab/modules/elementary_functions/sci_gateway/c/sci_sort.c68
-rw-r--r--scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml1
-rw-r--r--scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_sort.f310
-rw-r--r--scilab/modules/elementary_functions/src/c/elementary_functions.vcproj4
-rw-r--r--scilab/modules/elementary_functions/src/c/sci_tools.c2
-rw-r--r--scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj6
-rw-r--r--scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcproj16
-rw-r--r--scilab/modules/elementary_functions/src/fortran/wsort.f190
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_3159.dia.ref2
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_3159.tst2
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_3567.dia.ref2
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_3567.tst2
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/factorial.dia.ref75
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/factorial.tst79
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/sort.dia.ref72
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/sort.tst73
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref824
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/tand.tst825
-rw-r--r--scilab/modules/fftw/Makefile.in1
-rw-r--r--scilab/modules/fileio/Makefile.in1
-rw-r--r--scilab/modules/fileio/includes/filesmanagement.h6
-rw-r--r--scilab/modules/fileio/macros/getcwd.sci15
-rw-r--r--scilab/modules/fileio/src/c/filesmanagement.c24
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_6556.dia.ref20
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_6556.tst22
-rw-r--r--scilab/modules/functions/Makefile.am2
-rw-r--r--scilab/modules/functions/Makefile.in17
-rw-r--r--scilab/modules/functions/help/en_US/getf.xml166
-rw-r--r--scilab/modules/functions/includes/gw_functions.h1
-rw-r--r--scilab/modules/functions/sci_gateway/c/gw_functions.c14
-rw-r--r--scilab/modules/functions/sci_gateway/c/sci_getf.c36
-rw-r--r--scilab/modules/functions/sci_gateway/c/sci_lib.c31
-rw-r--r--scilab/modules/functions/sci_gateway/fortran/intgetf.f122
-rw-r--r--scilab/modules/functions/sci_gateway/functions_gateway.xml1
-rw-r--r--scilab/modules/functions/src/c/functions.vcproj4
-rw-r--r--scilab/modules/functions/src/fortran/functions_f.vfproj5
-rw-r--r--scilab/modules/functions/src/fortran/functions_f2c.vcproj8
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_1469.dia.ref11
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_1469.tst4
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_6549.dia.ref78
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_6549.tst60
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_6550.dia.ref37
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_6550.tst34
-rw-r--r--scilab/modules/functions/tests/unit_tests/fun2string.dia.ref1
-rw-r--r--scilab/modules/functions/tests/unit_tests/fun2string.tst2
-rw-r--r--scilab/modules/functions/tests/unit_tests/getf.dia.ref11
-rw-r--r--scilab/modules/functions/tests/unit_tests/getf.tst11
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in1
-rw-r--r--scilab/modules/graphic_export/Makefile.in1
-rw-r--r--scilab/modules/graphic_export/help/pt_BR/driver.xml4
-rw-r--r--scilab/modules/graphics/Makefile.in1
-rw-r--r--scilab/modules/graphics/help/en_US/Graphics.xml2
-rw-r--r--scilab/modules/graphics/help/en_US/xbasc.xml68
-rw-r--r--scilab/modules/graphics/help/fr_FR/Graphics.xml2
-rw-r--r--scilab/modules/graphics/help/fr_FR/xbasc.xml58
-rw-r--r--scilab/modules/graphics/help/pt_BR/Graphics.xml7
-rw-r--r--scilab/modules/graphics/help/pt_BR/Sfgrayplot.xml6
-rw-r--r--scilab/modules/graphics/help/pt_BR/colorbar.xml6
-rw-r--r--scilab/modules/graphics/help/pt_BR/contour.xml4
-rw-r--r--scilab/modules/graphics/help/pt_BR/contourf.xml4
-rw-r--r--scilab/modules/graphics/help/pt_BR/fec.xml8
-rw-r--r--scilab/modules/graphics/help/pt_BR/graduate.xml4
-rw-r--r--scilab/modules/graphics/help/pt_BR/grayplot_properties.xml2
-rw-r--r--scilab/modules/graphics/help/pt_BR/histplot.xml4
-rw-r--r--scilab/modules/graphics/help/pt_BR/isoview.xml2
-rw-r--r--scilab/modules/graphics/help/pt_BR/oldplot.xml4
-rw-r--r--scilab/modules/graphics/help/pt_BR/plot2d_old_version.xml26
-rw-r--r--scilab/modules/graphics/help/pt_BR/replot.xml2
-rw-r--r--scilab/modules/graphics/help/pt_BR/square.xml2
-rw-r--r--scilab/modules/graphics/help/pt_BR/xbasc.xml79
-rw-r--r--scilab/modules/graphics/help/pt_BR/xclear.xml2
-rw-r--r--scilab/modules/graphics/help/pt_BR/xgetech.xml2
-rw-r--r--scilab/modules/graphics/help/pt_BR/xset.xml4
-rw-r--r--scilab/modules/graphics/help/pt_BR/xsetech.xml10
-rw-r--r--scilab/modules/graphics/help/pt_BR/xstring.xml2
-rw-r--r--scilab/modules/graphics/macros/xbasc.sci55
-rw-r--r--scilab/modules/gui/Makefile.in1
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiConcatTree.xml24
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiCreateNode.xml8
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiCreateTree.xml7
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiDeleteNode.xml20
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiDisplayTree.xml16
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiDumpTree.xml7
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiEqualsTree.xml19
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiFindNode.xml31
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiGetChildrenNode.xml18
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiGetNodePosition.xml21
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiGetParentNode.xml22
-rw-r--r--scilab/modules/gui/help/en_US/tree/uiInsertNode.xml26
-rw-r--r--scilab/modules/gui/help/en_US/uigetfile.xml4
-rw-r--r--scilab/modules/gui/help/en_US/x_message_modeless.xml56
-rw-r--r--scilab/modules/gui/help/fr_FR/x_message_modeless.xml59
-rw-r--r--scilab/modules/gui/macros/tree/uiFindNode.sci8
-rw-r--r--scilab/modules/gui/macros/x_message_modeless.sci26
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabFileChooser.java21
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_6436.tst35
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_6547.tst27
-rw-r--r--scilab/modules/hdf5/Makefile.in1
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabBoolean.java (renamed from scilab/modules/hdf5/tests/java/testScilabBoolean.java)1
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabDouble.java (renamed from scilab/modules/hdf5/tests/java/testScilabDouble.java)1
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabGraph.java (renamed from scilab/modules/hdf5/tests/java/testScilabGraph.java)1
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabList.java (renamed from scilab/modules/hdf5/tests/java/testScilabList.java)1
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabString.java (renamed from scilab/modules/hdf5/tests/java/testScilabString.java)1
-rw-r--r--scilab/modules/helptools/Makefile.in1
-rw-r--r--scilab/modules/history_manager/Makefile.in1
-rw-r--r--scilab/modules/integer/Makefile.in1
-rw-r--r--scilab/modules/integer/macros/%i_mfprintf.sci20
-rw-r--r--scilab/modules/interpolation/Makefile.in1
-rw-r--r--scilab/modules/interpolation/help/pt_BR/cshep2d.xml2
-rw-r--r--scilab/modules/interpolation/help/pt_BR/eval_cshep2d.xml2
-rw-r--r--scilab/modules/interpolation/help/pt_BR/interp.xml4
-rw-r--r--scilab/modules/interpolation/help/pt_BR/interp2d.xml2
-rw-r--r--scilab/modules/interpolation/help/pt_BR/linear_interpn.xml8
-rw-r--r--scilab/modules/interpolation/help/pt_BR/lsq_splin.xml2
-rw-r--r--scilab/modules/interpolation/help/pt_BR/splin.xml4
-rw-r--r--scilab/modules/interpolation/help/pt_BR/splin2d.xml6
-rw-r--r--scilab/modules/interpolation/help/pt_BR/splin3d.xml2
-rw-r--r--scilab/modules/intersci/Makefile.in1
-rw-r--r--scilab/modules/io/Makefile.in1
-rw-r--r--scilab/modules/io/help/en_US/file.xml17
-rw-r--r--scilab/modules/io/help/pt_BR/file.xml10
-rw-r--r--scilab/modules/io/sci_gateway/c/sci_file.c22
-rw-r--r--scilab/modules/javasci/Makefile.in1
-rw-r--r--scilab/modules/jvm/Makefile.in1
-rw-r--r--scilab/modules/linear_algebra/Makefile.in1
-rw-r--r--scilab/modules/localization/Makefile.in1
-rw-r--r--scilab/modules/localization/includes/localization.h3
-rw-r--r--scilab/modules/m2sci/Makefile.in1
-rw-r--r--scilab/modules/m2sci/help/en_US/Type.xml2
-rw-r--r--scilab/modules/m2sci/macros/sci_files/sci_uigetdir.sci2
-rw-r--r--scilab/modules/maple2scilab/Makefile.in1
-rw-r--r--scilab/modules/matio/Makefile.am1
-rw-r--r--scilab/modules/matio/Makefile.in15
-rw-r--r--scilab/modules/matio/matio.vcproj4
-rw-r--r--scilab/modules/matio/src/c/CreateBooleanVariable.c59
-rw-r--r--scilab/modules/matio/src/c/CreateHyperMatrixVariable.c4
-rw-r--r--scilab/modules/matio/src/c/CreateMatlabVariable.c9
-rw-r--r--scilab/modules/matio/src/c/CreateMatlabVariable.h10
-rw-r--r--scilab/modules/matio/src/c/CreateSparseVariable.c85
-rw-r--r--scilab/modules/mexlib/Makefile.in1
-rw-r--r--scilab/modules/optimization/Makefile.in1
-rw-r--r--scilab/modules/optimization/help/en_US/fsolve.xml2
-rw-r--r--scilab/modules/optimization/help/en_US/neldermead/neldermead.xml17
-rw-r--r--scilab/modules/optimization/help/fr_FR/fsolve.xml2
-rw-r--r--scilab/modules/optimization/macros/neldermead/neldermead_configure.sci23
-rw-r--r--scilab/modules/optimization/macros/neldermead/neldermead_search.sci13
-rw-r--r--scilab/modules/optimization/macros/neldermead/neldermead_updatesimp.sci2
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_configure.dia.ref36
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_configure.tst39
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_mckinnon.dia.ref97
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_mckinnon.tst87
-rw-r--r--scilab/modules/output_stream/Makefile.in1
-rw-r--r--scilab/modules/output_stream/help/en_US/ssprint.xml7
-rw-r--r--scilab/modules/output_stream/help/pt_BR/ssprint.xml7
-rw-r--r--scilab/modules/overloading/Makefile.in1
-rw-r--r--scilab/modules/overloading/macros/%s_sort.sci14
-rw-r--r--scilab/modules/overloading/macros/%sp_sort.sci28
-rw-r--r--scilab/modules/parameters/Makefile.in1
-rw-r--r--scilab/modules/polynomials/Makefile.in1
-rw-r--r--scilab/modules/polynomials/help/en_US/pol2str.xml2
-rw-r--r--scilab/modules/polynomials/help/en_US/roots.xml2
-rw-r--r--scilab/modules/polynomials/help/fr_FR/pol2str.xml2
-rw-r--r--scilab/modules/polynomials/help/fr_FR/roots.xml2
-rw-r--r--scilab/modules/polynomials/help/pt_BR/pol2str.xml2
-rw-r--r--scilab/modules/polynomials/help/pt_BR/roots.xml2
-rw-r--r--scilab/modules/pvm/Makefile.in1
-rw-r--r--scilab/modules/pvm/src/c/pvm_proc_ctrl.c2
-rw-r--r--scilab/modules/randlib/Makefile.in1
-rw-r--r--scilab/modules/renderer/Makefile.in1
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/polylineDrawing/PolylineLineDrawerGL.java12
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/geom3D/GeomAlgos.java37
-rw-r--r--scilab/modules/renderer/tests/nonreg_tests/bug_6558.tst26
-rw-r--r--scilab/modules/scicos/Makefile.in1
-rw-r--r--scilab/modules/scicos/demos/live.dat18
-rw-r--r--scilab/modules/scicos/macros/scicos_scicos/Nyquist_.sci2
-rw-r--r--scilab/modules/scicos/macros/scicos_scicos/Window_.sci2
-rw-r--r--scilab/modules/scicos/macros/scicos_scicos/do_xsetech.sci2
-rw-r--r--scilab/modules/scicos/macros/scicos_scicos/systshow.sci2
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in1
-rw-r--r--scilab/modules/shell/Makefile.in1
-rw-r--r--scilab/modules/shell/src/c/others/mainscic.c3
-rw-r--r--scilab/modules/signal_processing/Makefile.in1
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in1
-rw-r--r--scilab/modules/sound/Makefile.in1
-rw-r--r--scilab/modules/sparse/Makefile.am6
-rw-r--r--scilab/modules/sparse/Makefile.in17
-rw-r--r--scilab/modules/sparse/includes/gw_sparse.h1
-rw-r--r--scilab/modules/sparse/macros/sp2adj.sci2
-rw-r--r--scilab/modules/sparse/sci_gateway/c/gw_sparse.c3
-rw-r--r--scilab/modules/sparse/sci_gateway/fortran/sci_ta2lpd.f88
-rw-r--r--scilab/modules/sparse/sci_gateway/sparse_gateway.xml1
-rw-r--r--scilab/modules/sparse/src/fortran/LibScilab_Import.def4
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f.vfproj2
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f2c.vcproj16
-rw-r--r--scilab/modules/sparse/src/fortran/ta2lpd.f63
-rw-r--r--scilab/modules/sparse/tests/nonreg_tests/bug_6412.dia.ref19
-rw-r--r--scilab/modules/sparse/tests/nonreg_tests/bug_6412.tst22
-rw-r--r--scilab/modules/special_functions/Makefile.in1
-rw-r--r--scilab/modules/special_functions/help/en_US/bessel.xml3
-rw-r--r--scilab/modules/special_functions/help/pt_BR/bessel.xml12
-rw-r--r--scilab/modules/special_functions/help/pt_BR/beta.xml4
-rw-r--r--scilab/modules/special_functions/help/pt_BR/gamma.xml2
-rw-r--r--scilab/modules/special_functions/help/pt_BR/legendre.xml6
-rw-r--r--scilab/modules/special_functions/help/pt_BR/oldbessel.xml10
-rw-r--r--scilab/modules/spreadsheet/Makefile.in1
-rw-r--r--scilab/modules/spreadsheet/help/en_US/excel2sci.xml37
-rw-r--r--scilab/modules/spreadsheet/macros/excel2sci.sci19
-rw-r--r--scilab/modules/spreadsheet/macros/sci2excel.sci23
-rw-r--r--scilab/modules/spreadsheet/tests/unit_tests/sci2excel.dia.ref15
-rw-r--r--scilab/modules/spreadsheet/tests/unit_tests/sci2excel.tst18
-rw-r--r--scilab/modules/statistics/Makefile.in1
-rw-r--r--scilab/modules/string/Makefile.am5
-rw-r--r--scilab/modules/string/Makefile.in14
-rw-r--r--scilab/modules/string/includes/gw_string.h1
-rw-r--r--scilab/modules/string/sci_gateway/c/gw_string.c4
-rw-r--r--scilab/modules/string/sci_gateway/c/sci_NumTokens.c42
-rw-r--r--scilab/modules/string/sci_gateway/string_gateway.xml1
-rw-r--r--scilab/modules/string/src/c/Get_length.c31
-rw-r--r--scilab/modules/string/src/c/Get_length.h29
-rw-r--r--scilab/modules/string/src/c/string.vcproj4
-rw-r--r--scilab/modules/symbolic/Makefile.in1
-rw-r--r--scilab/modules/tclsci/Makefile.in1
-rw-r--r--scilab/modules/tclsci/help/en_US/tk_getdir.xml84
-rw-r--r--scilab/modules/tclsci/help/en_US/tk_savefile.xml97
-rw-r--r--scilab/modules/tclsci/macros/tk_getdir.sci29
-rw-r--r--scilab/modules/tclsci/macros/tk_savefile.sci29
-rw-r--r--scilab/modules/texmacs/Makefile.in1
-rw-r--r--scilab/modules/texmacs/help/en_US/pol2tex.xml65
-rw-r--r--scilab/modules/texmacs/help/en_US/texprint.xml69
-rw-r--r--scilab/modules/texmacs/macros/pol2tex.sci17
-rw-r--r--scilab/modules/texmacs/macros/texprint.sci15
-rw-r--r--scilab/modules/time/Makefile.in1
-rw-r--r--scilab/modules/umfpack/Makefile.in1
-rw-r--r--scilab/modules/windows_tools/Makefile.in1
-rw-r--r--scilab/modules/windows_tools/src/c/httpdownloadfile.c82
-rw-r--r--scilab/modules/windows_tools/src/c/httpdownloadfile.h3
-rw-r--r--scilab/modules/xcos/Makefile.in1
-rw-r--r--scilab/modules/xcos/demos/Cont.Disc-Observer.xcos2
-rw-r--r--scilab/modules/xcos/demos/Controller.xcos2
-rw-r--r--scilab/modules/xcos/demos/Discrete-KalmanFilter.xcos2
-rw-r--r--scilab/modules/xcos/demos/Electrical/AND_Gate.xcos2
-rw-r--r--scilab/modules/xcos/demos/Electrical/Colpitts_Oscillator.xcos2
-rw-r--r--scilab/modules/xcos/demos/Electrical/DC_DC_Buck_Converter.xcos2
-rw-r--r--scilab/modules/xcos/demos/Electrical/NOR_Gate.xcos2
-rw-r--r--scilab/modules/xcos/demos/Electrical/Opamp_Amplifier.xcos2
-rw-r--r--scilab/modules/xcos/demos/Kalman.xcos2
-rw-r--r--scilab/modules/xcos/demos/Lorentz.xcos2
-rw-r--r--scilab/modules/xcos/demos/OldGainTest.xcos2
-rw-r--r--scilab/modules/xcos/demos/Plant_DiscreteController.xcos2
-rw-r--r--scilab/modules/xcos/demos/Scilab_Block.xcos2
-rw-r--r--scilab/modules/xcos/demos/demo_Datatype.xcos2
-rw-r--r--scilab/modules/xcos/demos/demo_watertank.xcos2
-rw-r--r--scilab/modules/xcos/demos/susp.xcos2
-rw-r--r--scilab/modules/xcos/etc/Xcos-style.xml4
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Mathoperations_pal/AA_Mathoperations_pal.xml2
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Mathoperations_pal/SQRT.xml4
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Matrix_pal/AA_Matrix_pal.xml2
-rw-r--r--scilab/modules/xcos/sci_gateway/cpp/sci_xcosDiagramToHDF5.cpp1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabComponent.java28
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java108
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/CopyAction.java35
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/CutAction.java35
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/DefaultAction.java168
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/DeleteAction.java22
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/GroupAction.java25
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/InvertSelectionAction.java17
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/PasteAction.java33
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/RedoAction.java88
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/SelectAllAction.java22
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/UnGroupAction.java24
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/UndoAction.java88
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/ZoomInAction.java17
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/ZoomOutAction.java16
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/ActionConstraint.java74
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/DefaultAction.java261
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/EdgeSelectionDependantAction.java97
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/GraphActionManager.java174
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/MinimalNumberOfCellsConstraint.java70
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/MultiSelectionDependantAction.java38
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/OneBlockDependantAction.java31
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/OneSelectionDependantAction.java38
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/SelectedNumberOfCellsConstraint.java64
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/SpecificCellSelectedConstraint.java72
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/VertexSelectionDependantAction.java97
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/event/ArrowKeyListener.java8
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java145
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/AboutXcosAction.java24
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CloseAction.java25
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CloseViewportAction.java26
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CodeGenerationAction.java48
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CompileAction.java22
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DebugLevelAction.java23
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DiagramBackgroundAction.java22
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java25
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ExportAction.java31
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/FitDiagramToViewAction.java53
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/LinkStyleAction.java121
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/LinkStyleHorizontalAction.java69
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/LinkStyleStraightAction.java66
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/LinkStyleVerticalAction.java69
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/NewDiagramAction.java30
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/NormalViewAction.java25
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java32
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/PrintAction.java30
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/QuitAction.java27
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/RecentFileAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAction.java30
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAsAction.java29
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAsInterfaceFunctionAction.java51
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SetContextAction.java15
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SetupAction.java86
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java24
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SimulationNotRunningAction.java41
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java57
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java30
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewDiagramBrowserAction.java58
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewGetinfosAction.java40
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewGridAction.java27
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewInScicosAction.java74
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewViewportAction.java25
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java18
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java19
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosShortCut.java71
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java32
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SplitBlock.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/TextBlock.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/AlignBlockAction.java59
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java20
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockParametersAction.java28
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BorderColorAction.java72
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/FilledColorAction.java (renamed from scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ColorAction.java)44
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/FlipAction.java27
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/MirrorAction.java33
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java55
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RotateAction.java29
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ShowParentAction.java31
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperBlockSelectedAction.java36
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCreateAction.java20
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java27
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskRemoveAction.java24
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskSaveBlockGUIAction.java41
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java31
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockAction.java44
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionBottom.java45
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionCenter.java45
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionLeft.java45
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionMiddle.java45
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionRight.java45
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionTop.java45
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/PaletteDiagram.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/SuperBlockDiagram.java12
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java114
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BasicBlockInfo.java40
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockReader.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/codec/ScilabListCodec.java14
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/BasicLink.java13
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/ClosePalettesAction.java27
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/LoadAsPalAction.java30
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/NewPaletteAction.java28
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/ViewPaletteBrowserAction.java39
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteBlockView.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/PaletteComponent.java70
-rw-r--r--scilab/modules/xcos/tests/java/org/scilab/tests/modules/xcos/XcosTest.java47
-rw-r--r--scilab/modules/xcos/tests/java/org/scilab/tests/modules/xcos/utils/FileTypeTest.java80
-rw-r--r--scilab/modules/xcos/tests/java/org/scilab/tests/modules/xcos/utils/StyleMapTest.java93
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_6578.tst21
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_6578.xcos1
-rw-r--r--scilab/modules/xpad/Makefile.in1
461 files changed, 6194 insertions, 5719 deletions
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index e23ac63..1c878d1 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -283,6 +283,7 @@ LD = @LD@
283LDFLAGS = @LDFLAGS@ 283LDFLAGS = @LDFLAGS@
284LIBICONV = @LIBICONV@ 284LIBICONV = @LIBICONV@
285LIBINTL = @LIBINTL@ 285LIBINTL = @LIBINTL@
286LIBM = @LIBM@
286LIBOBJS = @LIBOBJS@ 287LIBOBJS = @LIBOBJS@
287LIBS = @LIBS@ 288LIBS = @LIBS@
288LIBTOOL = @LIBTOOL@ 289LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 9438865..1bb45fa 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -248,6 +248,7 @@ LD = @LD@
248LDFLAGS = @LDFLAGS@ 248LDFLAGS = @LDFLAGS@
249LIBICONV = @LIBICONV@ 249LIBICONV = @LIBICONV@
250LIBINTL = @LIBINTL@ 250LIBINTL = @LIBINTL@
251LIBM = @LIBM@
251LIBOBJS = @LIBOBJS@ 252LIBOBJS = @LIBOBJS@
252LIBS = @LIBS@ 253LIBS = @LIBS@
253LIBTOOL = @LIBTOOL@ 254LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index 7f663c8..bb18c45 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -242,6 +242,7 @@ LD = @LD@
242LDFLAGS = @LDFLAGS@ 242LDFLAGS = @LDFLAGS@
243LIBICONV = @LIBICONV@ 243LIBICONV = @LIBICONV@
244LIBINTL = @LIBINTL@ 244LIBINTL = @LIBINTL@
245LIBM = @LIBM@
245LIBOBJS = @LIBOBJS@ 246LIBOBJS = @LIBOBJS@
246LIBS = @LIBS@ 247LIBS = @LIBS@
247LIBTOOL = @LIBTOOL@ 248LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index cbe7e6d..ea1d4f7 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -264,6 +264,7 @@ LD = @LD@
264LDFLAGS = @LDFLAGS@ 264LDFLAGS = @LDFLAGS@
265LIBICONV = @LIBICONV@ 265LIBICONV = @LIBICONV@
266LIBINTL = @LIBINTL@ 266LIBINTL = @LIBINTL@
267LIBM = @LIBM@
267LIBOBJS = @LIBOBJS@ 268LIBOBJS = @LIBOBJS@
268LIBS = @LIBS@ 269LIBS = @LIBS@
269LIBTOOL = @LIBTOOL@ 270LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 57a4a0f..a42a90e 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -204,6 +204,7 @@ LD = @LD@
204LDFLAGS = @LDFLAGS@ 204LDFLAGS = @LDFLAGS@
205LIBICONV = @LIBICONV@ 205LIBICONV = @LIBICONV@
206LIBINTL = @LIBINTL@ 206LIBINTL = @LIBINTL@
207LIBM = @LIBM@
207LIBOBJS = @LIBOBJS@ 208LIBOBJS = @LIBOBJS@
208LIBS = @LIBS@ 209LIBS = @LIBS@
209LIBTOOL = @LIBTOOL@ 210LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONget.sci b/scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONget.sci
index 2b3e5e5..d4b1579 100644
--- a/scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONget.sci
+++ b/scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONget.sci
@@ -56,10 +56,10 @@ function [packages,categories_flat,categories] = atomsDESCRIPTIONget(update)
56 [OSNAME,ARCH,LINUX,MACOSX,SOLARIS,BSD] = atomsGetPlatform(); 56 [OSNAME,ARCH,LINUX,MACOSX,SOLARIS,BSD] = atomsGetPlatform();
57 57
58 description_files = [ .. 58 description_files = [ ..
59 atomsPath("system","session") + "DESCRIPTION_archives" "" ; ..
60 atomsPath("system","allusers") + "DESCRIPTION_installed" "" ; .. 59 atomsPath("system","allusers") + "DESCRIPTION_installed" "" ; ..
61 atomsPath("system","user") + "DESCRIPTION_installed" "" ; .. 60 atomsPath("system","user") + "DESCRIPTION_installed" "" ; ..
62 atomsPath("system","session") + "DESCRIPTION_installed" "" ]; 61 atomsPath("system","session") + "DESCRIPTION_installed" "" ; ..
62 atomsPath("system","session") + "DESCRIPTION_archives" "" ];
63 63
64 // 1st step : Loop on available repositories 64 // 1st step : Loop on available repositories
65 // --------------------------------------------------------------------- 65 // ---------------------------------------------------------------------
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 32d152a..99127e5 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -243,6 +243,7 @@ LD = @LD@
243LDFLAGS = @LDFLAGS@ 243LDFLAGS = @LDFLAGS@
244LIBICONV = @LIBICONV@ 244LIBICONV = @LIBICONV@
245LIBINTL = @LIBINTL@ 245LIBINTL = @LIBINTL@
246LIBM = @LIBM@
246LIBOBJS = @LIBOBJS@ 247LIBOBJS = @LIBOBJS@
247LIBS = @LIBS@ 248LIBS = @LIBS@
248LIBTOOL = @LIBTOOL@ 249LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index a846567..89c73b4 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -338,6 +338,7 @@ LD = @LD@
338LDFLAGS = @LDFLAGS@ 338LDFLAGS = @LDFLAGS@
339LIBICONV = @LIBICONV@ 339LIBICONV = @LIBICONV@
340LIBINTL = @LIBINTL@ 340LIBINTL = @LIBINTL@
341LIBM = @LIBM@
341LIBOBJS = @LIBOBJS@ 342LIBOBJS = @LIBOBJS@
342LIBS = @LIBS@ 343LIBS = @LIBS@
343LIBTOOL = @LIBTOOL@ 344LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/cacsd/etc/cacsd.start b/scilab/modules/cacsd/etc/cacsd.start
index 2c784ce..3c6a269 100644
--- a/scilab/modules/cacsd/etc/cacsd.start
+++ b/scilab/modules/cacsd/etc/cacsd.start
@@ -22,5 +22,5 @@ end
22// Add help chapter 22// Add help chapter
23// ============================================================================= 23// =============================================================================
24if WITH_HELPTOOLS then 24if WITH_HELPTOOLS then
25 add_module_help_chapter("boolean"); 25 add_module_help_chapter("cacsd");
26end 26end
diff --git a/scilab/modules/cacsd/help/en_US/contr.xml b/scilab/modules/cacsd/help/en_US/contr.xml
index 0a019f9..dc8e92b 100644
--- a/scilab/modules/cacsd/help/en_US/contr.xml
+++ b/scilab/modules/cacsd/help/en_US/contr.xml
@@ -105,7 +105,7 @@
105 <refsection> 105 <refsection>
106 <title>Reference</title> 106 <title>Reference</title>
107 <para> 107 <para>
108 Slicot library (see ab01od in SCIDIR/routines/slicot).</para> 108 Slicot library (see ab01od in SCI/modules/cacsd/src/slicot).</para>
109 </refsection> 109 </refsection>
110 <refsection> 110 <refsection>
111 <title>Examples</title> 111 <title>Examples</title>
diff --git a/scilab/modules/cacsd/help/pt_BR/m_circle.xml b/scilab/modules/cacsd/help/pt_BR/m_circle.xml
index 3a53422..9bb3182 100644
--- a/scilab/modules/cacsd/help/pt_BR/m_circle.xml
+++ b/scilab/modules/cacsd/help/pt_BR/m_circle.xml
@@ -86,7 +86,7 @@ h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
86nyquist(h,0.01,100,'(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)') 86nyquist(h,0.01,100,'(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)')
87m_circle(); 87m_circle();
88//Exemplo 2: 88//Exemplo 2:
89xbasc(); 89clf();
90h1=h*syslin('c',(s^2+2*0.1*15.1*s+228.01)/(s^2+2*0.9*15*s+225)) 90h1=h*syslin('c',(s^2+2*0.1*15.1*s+228.01)/(s^2+2*0.9*15*s+225))
91nyquist([h1;h],0.01,100,['h1';'h']) 91nyquist([h1;h],0.01,100,['h1';'h'])
92m_circle([-8 -6 -4]); 92m_circle([-8 -6 -4]);
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index c35a1c5..67c21db 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -239,6 +239,7 @@ LD = @LD@
239LDFLAGS = @LDFLAGS@ 239LDFLAGS = @LDFLAGS@
240LIBICONV = @LIBICONV@ 240LIBICONV = @LIBICONV@
241LIBINTL = @LIBINTL@ 241LIBINTL = @LIBINTL@
242LIBM = @LIBM@
242LIBOBJS = @LIBOBJS@ 243LIBOBJS = @LIBOBJS@
243LIBS = @LIBS@ 244LIBS = @LIBS@
244LIBTOOL = @LIBTOOL@ 245LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/call_scilab/help/en_US/BooleanManagement.xml b/scilab/modules/call_scilab/help/en_US/BooleanManagement.xml
index cf32389..fdfd7fe 100644
--- a/scilab/modules/call_scilab/help/en_US/BooleanManagement.xml
+++ b/scilab/modules/call_scilab/help/en_US/BooleanManagement.xml
@@ -32,13 +32,13 @@
32 <title>Description</title> 32 <title>Description</title>
33 33
34 <para>This help describes how boolean and matrix of booleans can be handle 34 <para>This help describes how boolean and matrix of booleans can be handle
35 through the <link linkend="call_scilab">Call Scilab API</link> and <link linkend="api_scilab">API Scilab</link>.</para> 35 through the <link linkend="call_scilab">Call Scilab API</link> and <link linkend="api_scilab">api Scilab</link>.</para>
36 36
37 <para>There are several functions which can be used to read / write from 37 <para>There are several functions which can be used to read / write from
38 the memory of Scilab. These functions are described in dedicated 38 the memory of Scilab. These functions are described in dedicated
39 pages.</para> 39 pages.</para>
40 40
41 <para>Note: Access to variables is done through <link linkend="api_scilab">API Scilab</link> (named variable). 41 <para>Note: Access to variables is done through <link linkend="api_scilab">api Scilab</link> (named variable).
42</para> 42</para>
43 </refsection> 43 </refsection>
44 44
@@ -110,7 +110,7 @@ for(j = 0 ; j < rowB_ ; j++)
110 <title>See Also</title> 110 <title>See Also</title>
111 111
112 <simplelist type="inline"> 112 <simplelist type="inline">
113<link linkend="API_scilab">API Scilab</link>,<link linkend="call_scilab">call_scilab</link>, 113<link linkend="api_scilab">api Scilab</link>,<link linkend="call_scilab">call_scilab</link>,
114 <member><link linkend="boolean_reading_API">API_Scilab: Boolean reading</link>, 114 <member><link linkend="boolean_reading_API">API_Scilab: Boolean reading</link>,
115 <link linkend="boolean_writing_API">API_Scilab: Boolean writing</link>, <link 115 <link linkend="boolean_writing_API">API_Scilab: Boolean writing</link>, <link
116 linkend="SendScilabJob">SendScilabJob</link>, <link 116 linkend="SendScilabJob">SendScilabJob</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/ComplexManagement.xml b/scilab/modules/call_scilab/help/en_US/ComplexManagement.xml
index 6ef9d54..25126c9 100644
--- a/scilab/modules/call_scilab/help/en_US/ComplexManagement.xml
+++ b/scilab/modules/call_scilab/help/en_US/ComplexManagement.xml
@@ -38,7 +38,7 @@
38 the memory of Scilab. These functions are described in dedicated 38 the memory of Scilab. These functions are described in dedicated
39 pages.</para> 39 pages.</para>
40 40
41 <para>Note: Access to variables is done through <link linkend="api_scilab">API Scilab</link> (named variable).</para> 41 <para>Note: Access to variables is done through <link linkend="api_scilab">api Scilab</link> (named variable).</para>
42 42
43 </refsection> 43 </refsection>
44 44
@@ -125,7 +125,7 @@ for(j = 0 ; j < rowB_ ; j++)
125 <title>See Also</title> 125 <title>See Also</title>
126 126
127 <simplelist type="inline"> 127 <simplelist type="inline">
128 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link linkend="cwritecmat">cwritecmat</link>, <link 128 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link linkend="cwritecmat">cwritecmat</link>, <link
129 linkend="creadcmat">creadcmat</link>, <link 129 linkend="creadcmat">creadcmat</link>, <link
130 linkend="SendScilabJob">SendScilabJob</link>, <link 130 linkend="SendScilabJob">SendScilabJob</link>, <link
131 linkend="StartScilab">StartScilab</link>, <link 131 linkend="StartScilab">StartScilab</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/DisableInteractiveMode.xml b/scilab/modules/call_scilab/help/en_US/DisableInteractiveMode.xml
index ec40f85..8020aa4 100644
--- a/scilab/modules/call_scilab/help/en_US/DisableInteractiveMode.xml
+++ b/scilab/modules/call_scilab/help/en_US/DisableInteractiveMode.xml
@@ -60,7 +60,7 @@ if (code!=0){
60 <title>See Also</title> 60 <title>See Also</title>
61 61
62 <simplelist type="inline"> 62 <simplelist type="inline">
63 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link 63 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link
64 linkend="compile_and_run_call_scilab">Compile and run with 64 linkend="compile_and_run_call_scilab">Compile and run with
65 call_scilab</link> <link linkend="SendScilabJob">SendScilabJob</link> 65 call_scilab</link> <link linkend="SendScilabJob">SendScilabJob</link>
66 <link linkend="TerminateScilab">TerminateScilab</link>, <link 66 <link linkend="TerminateScilab">TerminateScilab</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/DoubleManagement.xml b/scilab/modules/call_scilab/help/en_US/DoubleManagement.xml
index c85204d..4437cf0 100644
--- a/scilab/modules/call_scilab/help/en_US/DoubleManagement.xml
+++ b/scilab/modules/call_scilab/help/en_US/DoubleManagement.xml
@@ -32,7 +32,7 @@
32 <title>Description</title> 32 <title>Description</title>
33 33
34 <para>This help describes how doubles and matrix of doubles can be handle 34 <para>This help describes how doubles and matrix of doubles can be handle
35 through the <link linkend="call_scilab">Call Scilab API</link> and <link linkend="api_scilab">API Scilab</link>.</para> 35 through the <link linkend="call_scilab">Call Scilab API</link> and <link linkend="api_scilab">api Scilab</link>.</para>
36 36
37 <para>There are several functions which can be used to read / write from 37 <para>There are several functions which can be used to read / write from
38 the memory of Scilab. These functions are described in dedicated 38 the memory of Scilab. These functions are described in dedicated
@@ -41,7 +41,7 @@
41 <para>Note that the default type of a numeric value in Scilab is double. 41 <para>Note that the default type of a numeric value in Scilab is double.
42 For example, in <emphasis>a=1</emphasis> or <emphasis>a=[1,2]</emphasis>, 42 For example, in <emphasis>a=1</emphasis> or <emphasis>a=[1,2]</emphasis>,
43 <emphasis>a</emphasis> will be consider as a double.</para> 43 <emphasis>a</emphasis> will be consider as a double.</para>
44 <para>Note: Access to variables is done through <link linkend="api_scilab">API Scilab</link> (named variable).</para> 44 <para>Note: Access to variables is done through <link linkend="api_scilab">api Scilab</link> (named variable).</para>
45 45
46 </refsection> 46 </refsection>
47 47
@@ -118,7 +118,7 @@ for(j = 0 ; j < rowB_ ; j++)
118 <title>See Also</title> 118 <title>See Also</title>
119 119
120 <simplelist type="inline"> 120 <simplelist type="inline">
121 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link linkend="Double_management_reading_API">API_Scilab: Double reading</link>, 121 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link linkend="Double_management_reading_API">API_Scilab: Double reading</link>,
122 <link linkend="Double_management_writing_API">API_Scilab: Double writing</link>, <link 122 <link linkend="Double_management_writing_API">API_Scilab: Double writing</link>, <link
123 linkend="SendScilabJob">SendScilabJob</link>, <link 123 linkend="SendScilabJob">SendScilabJob</link>, <link
124 linkend="StartScilab">StartScilab</link>, <link 124 linkend="StartScilab">StartScilab</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/GetLastJob.xml b/scilab/modules/call_scilab/help/en_US/GetLastJob.xml
index ee2ddad..ed8ed02 100644
--- a/scilab/modules/call_scilab/help/en_US/GetLastJob.xml
+++ b/scilab/modules/call_scilab/help/en_US/GetLastJob.xml
@@ -97,7 +97,7 @@ if (code!=0){
97 <title>See Also</title> 97 <title>See Also</title>
98 98
99 <simplelist type="inline"> 99 <simplelist type="inline">
100 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link 100 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link
101 linkend="compile_and_run_call_scilab">Compile and run with 101 linkend="compile_and_run_call_scilab">Compile and run with
102 call_scilab</link>, <link linkend="SendScilabJob">SendScilabJob</link>, 102 call_scilab</link>, <link linkend="SendScilabJob">SendScilabJob</link>,
103 <link linkend="TerminateScilab">TerminateScilab</link>, <link 103 <link linkend="TerminateScilab">TerminateScilab</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/ScilabHaveAGraph.xml b/scilab/modules/call_scilab/help/en_US/ScilabHaveAGraph.xml
index 6c9fe5e..fbbf73a 100644
--- a/scilab/modules/call_scilab/help/en_US/ScilabHaveAGraph.xml
+++ b/scilab/modules/call_scilab/help/en_US/ScilabHaveAGraph.xml
@@ -56,7 +56,7 @@ if (ScilabHaveAGraph()){
56 <title>See Also</title> 56 <title>See Also</title>
57 57
58 <simplelist type="inline"> 58 <simplelist type="inline">
59 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link 59 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link
60 linkend="compile_and_run_call_scilab">Compile and run with 60 linkend="compile_and_run_call_scilab">Compile and run with
61 call_scilab</link> <link linkend="SendScilabJob">SendScilabJob</link>, 61 call_scilab</link> <link linkend="SendScilabJob">SendScilabJob</link>,
62 <link linkend="TerminateScilab">TerminateScilab</link>, <link 62 <link linkend="TerminateScilab">TerminateScilab</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/SendScilabJob.xml b/scilab/modules/call_scilab/help/en_US/SendScilabJob.xml
index 98dffcc..d29f8f4 100644
--- a/scilab/modules/call_scilab/help/en_US/SendScilabJob.xml
+++ b/scilab/modules/call_scilab/help/en_US/SendScilabJob.xml
@@ -87,7 +87,7 @@ SendScilabJob("myMatrix=['sample','for the help']");
87 <title>See Also</title> 87 <title>See Also</title>
88 88
89 <simplelist type="inline"> 89 <simplelist type="inline">
90 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link 90 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link
91 linkend="compile_and_run_call_scilab">Compile and run with 91 linkend="compile_and_run_call_scilab">Compile and run with
92 call_scilab</link>, <link linkend="SendScilabJob">SendScilabJob</link>, 92 call_scilab</link>, <link linkend="SendScilabJob">SendScilabJob</link>,
93 <link linkend="DoubleManagement_callscilab">Double Management</link>, 93 <link linkend="DoubleManagement_callscilab">Double Management</link>,
diff --git a/scilab/modules/call_scilab/help/en_US/SendScilabJobs.xml b/scilab/modules/call_scilab/help/en_US/SendScilabJobs.xml
index 94867ee..e34e2a8 100644
--- a/scilab/modules/call_scilab/help/en_US/SendScilabJobs.xml
+++ b/scilab/modules/call_scilab/help/en_US/SendScilabJobs.xml
@@ -96,7 +96,7 @@ SendScilabJob("disp(c);"); // Will display 4.
96 <title>See Also</title> 96 <title>See Also</title>
97 97
98 <simplelist type="inline"> 98 <simplelist type="inline">
99 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link 99 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link
100 linkend="SendScilabJob">SendScilabJob</link>, <link 100 linkend="SendScilabJob">SendScilabJob</link>, <link
101 linkend="compile_and_run_call_scilab">Compile and run with 101 linkend="compile_and_run_call_scilab">Compile and run with
102 call_scilab</link>, <link linkend="DoubleManagement_callscilab">Double 102 call_scilab</link>, <link linkend="DoubleManagement_callscilab">Double
diff --git a/scilab/modules/call_scilab/help/en_US/StartScilab.xml b/scilab/modules/call_scilab/help/en_US/StartScilab.xml
index bd9401c..03f8559 100644
--- a/scilab/modules/call_scilab/help/en_US/StartScilab.xml
+++ b/scilab/modules/call_scilab/help/en_US/StartScilab.xml
@@ -114,7 +114,7 @@ if ( StartScilab(getenv("SCI"),NULL,NULL) == FALSE )
114 <title>See Also</title> 114 <title>See Also</title>
115 115
116 <simplelist type="inline"> 116 <simplelist type="inline">
117 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>, 117 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,
118<link linkend="compile_and_run_call_scilab">Compile and run with 118<link linkend="compile_and_run_call_scilab">Compile and run with
119 call_scilab</link>, <link linkend="SendScilabJob">SendScilabJob</link>, 119 call_scilab</link>, <link linkend="SendScilabJob">SendScilabJob</link>,
120 <link linkend="TerminateScilab">TerminateScilab</link>, <link 120 <link linkend="TerminateScilab">TerminateScilab</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/StringManagement.xml b/scilab/modules/call_scilab/help/en_US/StringManagement.xml
index a2432c9..fa00614 100644
--- a/scilab/modules/call_scilab/help/en_US/StringManagement.xml
+++ b/scilab/modules/call_scilab/help/en_US/StringManagement.xml
@@ -32,12 +32,12 @@
32 <title>Description</title> 32 <title>Description</title>
33 33
34 <para>This help describes how strings and matrix of strings can be handle 34 <para>This help describes how strings and matrix of strings can be handle
35 through the <link linkend="call_scilab">Call Scilab API</link> and <link linkend="api_scilab">API Scilab</link>.</para> 35 through the <link linkend="call_scilab">Call Scilab API</link> and <link linkend="api_scilab">api Scilab</link>.</para>
36 36
37 <para>There are several functions which can be used to read / write from 37 <para>There are several functions which can be used to read / write from
38 the memory of Scilab. These functions are described in dedicated 38 the memory of Scilab. These functions are described in dedicated
39 pages.</para> 39 pages.</para>
40 <para>Note: Access to variables is done through <link linkend="api_scilab">API Scilab</link> (named variable).</para> 40 <para>Note: Access to variables is done through <link linkend="api_scilab">api Scilab</link> (named variable).</para>
41 </refsection> 41 </refsection>
42 42
43 <refsection> 43 <refsection>
@@ -118,7 +118,7 @@ free(pstData);
118 <title>See Also</title> 118 <title>See Also</title>
119 119
120 <simplelist type="inline"> 120 <simplelist type="inline">
121 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>, 121 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,
122<link linkend="cwritechain">cwritechain</link>, <link 122<link linkend="cwritechain">cwritechain</link>, <link
123 linkend="creadchain">creadchain</link>, <link 123 linkend="creadchain">creadchain</link>, <link
124 linkend="SendScilabJob">SendScilabJob</link>, <link 124 linkend="SendScilabJob">SendScilabJob</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/TerminateScilab.xml b/scilab/modules/call_scilab/help/en_US/TerminateScilab.xml
index e32fe68..f3f6831 100644
--- a/scilab/modules/call_scilab/help/en_US/TerminateScilab.xml
+++ b/scilab/modules/call_scilab/help/en_US/TerminateScilab.xml
@@ -86,7 +86,7 @@ if ( TerminateScilab(NULL) == FALSE ) {
86 <title>See Also</title> 86 <title>See Also</title>
87 87
88 <simplelist type="inline"> 88 <simplelist type="inline">
89 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>, 89 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,
90<link linkend="compile_and_run_call_scilab">Compile and run with 90<link linkend="compile_and_run_call_scilab">Compile and run with
91 call_scilab</link>, <link linkend="StartScilab">StartScilab</link>, 91 call_scilab</link>, <link linkend="StartScilab">StartScilab</link>,
92 <link linkend="SendScilabJob">SendScilabJob</link>, <link 92 <link linkend="SendScilabJob">SendScilabJob</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/call_scilab.xml b/scilab/modules/call_scilab/help/en_US/call_scilab.xml
index 22a0c0c..34fb746 100644
--- a/scilab/modules/call_scilab/help/en_US/call_scilab.xml
+++ b/scilab/modules/call_scilab/help/en_US/call_scilab.xml
@@ -96,7 +96,7 @@ int main(void)
96 <title>See Also</title> 96 <title>See Also</title>
97 97
98 <simplelist type="inline"> 98 <simplelist type="inline">
99 <member><link linkend="API_scilab">API Scilab</link>,<link linkend="compile_and_run_call_scilab">Compile and run with 99 <member><link linkend="api_scilab">api Scilab</link>,<link linkend="compile_and_run_call_scilab">Compile and run with
100 call_scilab</link>, <link linkend="DoubleManagement_callscilab">Matrix 100 call_scilab</link>, <link linkend="DoubleManagement_callscilab">Matrix
101 Management</link>, <link linkend="BooleanManagement_callscilab">Boolean 101 Management</link>, <link linkend="BooleanManagement_callscilab">Boolean
102 Management</link>, <link linkend="ComplexManagement_callscilab">Complex 102 Management</link>, <link linkend="ComplexManagement_callscilab">Complex
diff --git a/scilab/modules/call_scilab/help/en_US/compile_and_run_call_scilab.xml b/scilab/modules/call_scilab/help/en_US/compile_and_run_call_scilab.xml
index 144be5f..ee19647 100644
--- a/scilab/modules/call_scilab/help/en_US/compile_and_run_call_scilab.xml
+++ b/scilab/modules/call_scilab/help/en_US/compile_and_run_call_scilab.xml
@@ -249,7 +249,7 @@ $ ./myExample
249 <title>See Also</title> 249 <title>See Also</title>
250 250
251 <simplelist type="inline"> 251 <simplelist type="inline">
252 <member><link linkend="API_scilab">API Scilab</link>,<link linkend="call_scilab">call_scilab</link>, <link 252 <member><link linkend="api_scilab">api Scilab</link>,<link linkend="call_scilab">call_scilab</link>, <link
253 linkend="StartScilab">StartScilab</link>, <link 253 linkend="StartScilab">StartScilab</link>, <link
254 linkend="SendScilabJob">SendScilabJob</link>, <link 254 linkend="SendScilabJob">SendScilabJob</link>, <link
255 linkend="SendScilabJobs">SendScilabJobs</link>, <link 255 linkend="SendScilabJobs">SendScilabJobs</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/creadbmat.xml b/scilab/modules/call_scilab/help/en_US/creadbmat.xml
index 3a5f477..cd91440 100644
--- a/scilab/modules/call_scilab/help/en_US/creadbmat.xml
+++ b/scilab/modules/call_scilab/help/en_US/creadbmat.xml
@@ -139,7 +139,7 @@ for(j = 0 ; j < rowB_ ; j++)
139 <title>See Also</title> 139 <title>See Also</title>
140 140
141 <simplelist type="inline"> 141 <simplelist type="inline">
142 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link linkend="boolean_reading_API">API_Scilab: Boolean reading</link>, <link linkend="boolean_writing_API">API_Scilab: Boolean writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link 142 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link linkend="boolean_reading_API">API_Scilab: Boolean reading</link>, <link linkend="boolean_writing_API">API_Scilab: Boolean writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link
143 linkend="StartScilab">StartScilab</link>, <link 143 linkend="StartScilab">StartScilab</link>, <link
144 linkend="cwritebmat">cwritebmat</link>, <link 144 linkend="cwritebmat">cwritebmat</link>, <link
145 linkend="BooleanManagement_callscilab">Boolean 145 linkend="BooleanManagement_callscilab">Boolean
diff --git a/scilab/modules/call_scilab/help/en_US/creadchain.xml b/scilab/modules/call_scilab/help/en_US/creadchain.xml
index e607bf7..d7b0aa1 100644
--- a/scilab/modules/call_scilab/help/en_US/creadchain.xml
+++ b/scilab/modules/call_scilab/help/en_US/creadchain.xml
@@ -125,7 +125,7 @@ printf("Display of A (size %d): %s\n", length_myStringFromScilab, myStringFromSc
125 <title>See Also</title> 125 <title>See Also</title>
126 126
127 <simplelist type="inline"> 127 <simplelist type="inline">
128 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link linkend="String_management_reading_API">API_Scilab: String reading</link>, <link linkend="String_management_writing_API">API_Scilab: String writing</link>, 128 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link linkend="String_management_reading_API">API_Scilab: String reading</link>, <link linkend="String_management_writing_API">API_Scilab: String writing</link>,
129 <link linkend="SendScilabJob">SendScilabJob</link>, <link 129 <link linkend="SendScilabJob">SendScilabJob</link>, <link
130 linkend="StartScilab">StartScilab</link>, <link 130 linkend="StartScilab">StartScilab</link>, <link
131 linkend="cwritechain">cwritechain</link>, <link 131 linkend="cwritechain">cwritechain</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/creadcmat.xml b/scilab/modules/call_scilab/help/en_US/creadcmat.xml
index 9fe3262..101e9e3 100644
--- a/scilab/modules/call_scilab/help/en_US/creadcmat.xml
+++ b/scilab/modules/call_scilab/help/en_US/creadcmat.xml
@@ -140,7 +140,7 @@ for(j = 0 ; j < rowB_ ; j++)
140 <title>See Also</title> 140 <title>See Also</title>
141 141
142 <simplelist type="inline"> 142 <simplelist type="inline">
143 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link linkend="Double_management_reading_API">API_Scilab: Complex double reading</link>, <link linkend="Double_management_writing_API">API_Scilab: Double writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link 143 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link linkend="Double_management_reading_API">API_Scilab: Complex double reading</link>, <link linkend="Double_management_writing_API">API_Scilab: Double writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link
144 linkend="StartScilab">StartScilab</link>, <link 144 linkend="StartScilab">StartScilab</link>, <link
145 linkend="cwritecmat">cwritecmat</link>, <link 145 linkend="cwritecmat">cwritecmat</link>, <link
146 linkend="ComplexManagement_callscilab">Complex 146 linkend="ComplexManagement_callscilab">Complex
diff --git a/scilab/modules/call_scilab/help/en_US/creadmat.xml b/scilab/modules/call_scilab/help/en_US/creadmat.xml
index 39a1526..786b2fa 100644
--- a/scilab/modules/call_scilab/help/en_US/creadmat.xml
+++ b/scilab/modules/call_scilab/help/en_US/creadmat.xml
@@ -140,7 +140,7 @@ for(j = 0 ; j < rowB_ ; j++)
140 <title>See Also</title> 140 <title>See Also</title>
141 141
142 <simplelist type="inline"> 142 <simplelist type="inline">
143 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link linkend="Double_management_reading_API">API_Scilab: Double reading</link>,<link linkend="Double_management_writing_API">API_Scilab: Double writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link 143 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link linkend="Double_management_reading_API">API_Scilab: Double reading</link>,<link linkend="Double_management_writing_API">API_Scilab: Double writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link
144 linkend="StartScilab">StartScilab</link>, <link 144 linkend="StartScilab">StartScilab</link>, <link
145 linkend="cwritemat">cwritemat</link>, <link 145 linkend="cwritemat">cwritemat</link>, <link
146 linkend="DoubleManagement_callscilab">Double Management</link></member> 146 linkend="DoubleManagement_callscilab">Double Management</link></member>
diff --git a/scilab/modules/call_scilab/help/en_US/cwritebmat.xml b/scilab/modules/call_scilab/help/en_US/cwritebmat.xml
index d4fe17c..9ef2786 100644
--- a/scilab/modules/call_scilab/help/en_US/cwritebmat.xml
+++ b/scilab/modules/call_scilab/help/en_US/cwritebmat.xml
@@ -123,7 +123,7 @@ SendScilabJob("disp(B);"); /* Display B */
123 <title>See Also</title> 123 <title>See Also</title>
124 124
125 <simplelist type="inline"> 125 <simplelist type="inline">
126 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link linkend="boolean_reading_API">API_Scilab: Boolean reading</link>, <link linkend="boolean_writing_API">API_Scilab: Boolean writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link 126 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link linkend="boolean_reading_API">API_Scilab: Boolean reading</link>, <link linkend="boolean_writing_API">API_Scilab: Boolean writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link
127 linkend="StartScilab">StartScilab</link>, <link 127 linkend="StartScilab">StartScilab</link>, <link
128 linkend="creadbmat">creadbmat</link>, <link 128 linkend="creadbmat">creadbmat</link>, <link
129 linkend="BooleanManagement_callscilab">Boolean 129 linkend="BooleanManagement_callscilab">Boolean
diff --git a/scilab/modules/call_scilab/help/en_US/cwritechain.xml b/scilab/modules/call_scilab/help/en_US/cwritechain.xml
index 45b78b1..1beec06 100644
--- a/scilab/modules/call_scilab/help/en_US/cwritechain.xml
+++ b/scilab/modules/call_scilab/help/en_US/cwritechain.xml
@@ -123,7 +123,7 @@ SendScilabJob("disp(A);"); /* Display A */
123 <title>See Also</title> 123 <title>See Also</title>
124 124
125 <simplelist type="inline"> 125 <simplelist type="inline">
126 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link linkend="String_management_reading_API">API_Scilab: String reading</link>, <link linkend="String_management_writing_API">API_Scilab: String writing</link>, 126 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link linkend="String_management_reading_API">API_Scilab: String reading</link>, <link linkend="String_management_writing_API">API_Scilab: String writing</link>,
127 <link linkend="SendScilabJob">SendScilabJob</link> 127 <link linkend="SendScilabJob">SendScilabJob</link>
128 <link linkend="StartScilab">StartScilab</link> 128 <link linkend="StartScilab">StartScilab</link>
129 <link linkend="creadchain">creadchains</link> 129 <link linkend="creadchain">creadchains</link>
diff --git a/scilab/modules/call_scilab/help/en_US/cwritecmat.xml b/scilab/modules/call_scilab/help/en_US/cwritecmat.xml
index b3b858e..98ec931 100644
--- a/scilab/modules/call_scilab/help/en_US/cwritecmat.xml
+++ b/scilab/modules/call_scilab/help/en_US/cwritecmat.xml
@@ -128,7 +128,7 @@ SendScilabJob("disp(B);"); /* Display B */
128 <title>See Also</title> 128 <title>See Also</title>
129 129
130 <simplelist type="inline"> 130 <simplelist type="inline">
131 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link linkend="Double_management_reading_API">API_Scilab: Complex double reading</link>, <link linkend="Double_management_writing_API">API_Scilab: Complex double writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link 131 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link linkend="Double_management_reading_API">API_Scilab: Complex double reading</link>, <link linkend="Double_management_writing_API">API_Scilab: Complex double writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link
132 linkend="StartScilab">StartScilab</link>, <link 132 linkend="StartScilab">StartScilab</link>, <link
133 linkend="ComplexManagement_callscilab">Complex Management</link>, <link 133 linkend="ComplexManagement_callscilab">Complex Management</link>, <link
134 linkend="creadcmat">creadcmat</link></member> 134 linkend="creadcmat">creadcmat</link></member>
diff --git a/scilab/modules/call_scilab/help/en_US/cwritemat.xml b/scilab/modules/call_scilab/help/en_US/cwritemat.xml
index 532b114..56ab7e2e 100644
--- a/scilab/modules/call_scilab/help/en_US/cwritemat.xml
+++ b/scilab/modules/call_scilab/help/en_US/cwritemat.xml
@@ -127,7 +127,7 @@ SendScilabJob("disp(B);"); /* Display A */
127 <title>See Also</title> 127 <title>See Also</title>
128 128
129 <simplelist type="inline"> 129 <simplelist type="inline">
130 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>, 130 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,
131<link linkend="Double_management_reading_API">API_Scilab: Double reading</link>,<link linkend="Double_management_writing_API">API_Scilab: Double writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link 131<link linkend="Double_management_reading_API">API_Scilab: Double reading</link>,<link linkend="Double_management_writing_API">API_Scilab: Double writing</link>, <link linkend="SendScilabJob">SendScilabJob</link>, <link
132 linkend="StartScilab">StartScilab</link>, <link 132 linkend="StartScilab">StartScilab</link>, <link
133 linkend="DoubleManagement_callscilab">Double Management</link>, <link 133 linkend="DoubleManagement_callscilab">Double Management</link>, <link
diff --git a/scilab/modules/call_scilab/help/en_US/fromc.xml b/scilab/modules/call_scilab/help/en_US/fromc.xml
index 0d58213..6102258 100644
--- a/scilab/modules/call_scilab/help/en_US/fromc.xml
+++ b/scilab/modules/call_scilab/help/en_US/fromc.xml
@@ -30,7 +30,7 @@
30 <refsection> 30 <refsection>
31 <title>See Also</title> 31 <title>See Also</title>
32 <simplelist type="inline"> 32 <simplelist type="inline">
33 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link linkend="fromjava">fromjava</link></member> 33 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link linkend="fromjava">fromjava</link></member>
34 </simplelist> 34 </simplelist>
35 </refsection> 35 </refsection>
36 36
diff --git a/scilab/modules/call_scilab/help/en_US/fromjava.xml b/scilab/modules/call_scilab/help/en_US/fromjava.xml
index d76ae61..4e4ed6e 100644
--- a/scilab/modules/call_scilab/help/en_US/fromjava.xml
+++ b/scilab/modules/call_scilab/help/en_US/fromjava.xml
@@ -30,7 +30,7 @@
30 <refsection> 30 <refsection>
31 <title>See Also</title> 31 <title>See Also</title>
32 <simplelist type="inline"> 32 <simplelist type="inline">
33 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="API_scilab">API Scilab</link>,<link linkend="fromc">fromc</link></member> 33 <member><link linkend="call_scilab">Call_Scilab</link>,<link linkend="api_scilab">api Scilab</link>,<link linkend="fromc">fromc</link></member>
34 </simplelist> 34 </simplelist>
35 </refsection> 35 </refsection>
36 36
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index a1be5c2..482c7d9 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -203,6 +203,7 @@ LD = @LD@
203LDFLAGS = @LDFLAGS@ 203LDFLAGS = @LDFLAGS@
204LIBICONV = @LIBICONV@ 204LIBICONV = @LIBICONV@
205LIBINTL = @LIBINTL@ 205LIBINTL = @LIBINTL@
206LIBM = @LIBM@
206LIBOBJS = @LIBOBJS@ 207LIBOBJS = @LIBOBJS@
207LIBS = @LIBS@ 208LIBS = @LIBS@
208LIBTOOL = @LIBTOOL@ 209LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index ec791a4..42dc95b 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -265,6 +265,7 @@ LD = @LD@
265LDFLAGS = @LDFLAGS@ 265LDFLAGS = @LDFLAGS@
266LIBICONV = @LIBICONV@ 266LIBICONV = @LIBICONV@
267LIBINTL = @LIBINTL@ 267LIBINTL = @LIBINTL@
268LIBM = @LIBM@
268LIBOBJS = @LIBOBJS@ 269LIBOBJS = @LIBOBJS@
269LIBS = @LIBS@ 270LIBS = @LIBS@
270LIBTOOL = @LIBTOOL@ 271LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index eb7e75f..a8b8f27 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -277,6 +277,7 @@ LD = @LD@
277LDFLAGS = @LDFLAGS@ 277LDFLAGS = @LDFLAGS@
278LIBICONV = @LIBICONV@ 278LIBICONV = @LIBICONV@
279LIBINTL = @LIBINTL@ 279LIBINTL = @LIBINTL@
280LIBM = @LIBM@
280LIBOBJS = @LIBOBJS@ 281LIBOBJS = @LIBOBJS@
281LIBS = @LIBS@ 282LIBS = @LIBS@
282LIBTOOL = @LIBTOOL@ 283LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 6611013..b1165a1 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -476,6 +476,7 @@ LD = @LD@
476LDFLAGS = @LDFLAGS@ 476LDFLAGS = @LDFLAGS@
477LIBICONV = @LIBICONV@ 477LIBICONV = @LIBICONV@
478LIBINTL = @LIBINTL@ 478LIBINTL = @LIBINTL@
479LIBM = @LIBM@
479LIBOBJS = @LIBOBJS@ 480LIBOBJS = @LIBOBJS@
480LIBS = @LIBS@ 481LIBS = @LIBS@
481LIBTOOL = @LIBTOOL@ 482LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/core/help/en_US/external.xml b/scilab/modules/core/help/en_US/external.xml
index ab9aa2a..5cccd6f 100644
--- a/scilab/modules/core/help/en_US/external.xml
+++ b/scilab/modules/core/help/en_US/external.xml
@@ -46,8 +46,8 @@ optim(list(costfunc,a1,b1,c1),....
46 <para> 46 <para>
47 The name of the routine is given to the high-level primitive 47 The name of the routine is given to the high-level primitive
48 as a character string. The calling sequence of the routine 48 as a character string. The calling sequence of the routine
49 is also imposed. Examples are given in the <literal>routines/default</literal> directory 49 is also imposed.
50 (see the <literal>README</literal> file).</para> 50 </para>
51 <para> 51 <para>
52 External Fortran or C routines can also be dynamically linked (see <literal>link</literal>)</para> 52 External Fortran or C routines can also be dynamically linked (see <literal>link</literal>)</para>
53 </refsection> 53 </refsection>
diff --git a/scilab/modules/core/help/en_US/sethomedirectory.xml b/scilab/modules/core/help/en_US/sethomedirectory.xml
deleted file mode 100644
index 864bfe6..0000000
--- a/scilab/modules/core/help/en_US/sethomedirectory.xml
+++ /dev/null
@@ -1,28 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en" xml:id="sethomedirectory">
3 <info>
4 <pubdate>$LastChangedDate$</pubdate>
5 </info>
6 <refnamediv>
7 <refname>sethomedirectory</refname>
8 <refpurpose>Set Scilab home directory</refpurpose>
9 </refnamediv>
10 <refsynopsisdiv>
11 <title>Calling Sequence</title>
12 <synopsis>[home,scilabhome] = sethomedirectory()</synopsis>
13 </refsynopsisdiv>
14 <refsection>
15 <title>Description</title>
16 <para>DEPRECATED : You need to use "SCIHOME" and "home" scilab variables.</para>
17 <para>Set Scilab home path : "SCIHOME" variable.</para>
18 <para>On Windows 2k and XP , C:\Documents and
19 Settings\&lt;User&gt;\Scilab\&lt;Scilab-Version&gt;</para>
20 <para>On Windows Vista ,
21 C:\Users\&lt;User&gt;\Scilab\&lt;Scilab-Version&gt;</para>
22 <para>On Unix, /home/&lt;User&gt;/.Scilab/&lt;Scilab-Version&gt;</para>
23 </refsection>
24 <refsection>
25 <title>Authors</title>
26 <para>Allan CORNET</para>
27 </refsection>
28</refentry>
diff --git a/scilab/modules/core/help/fr_FR/external.xml b/scilab/modules/core/help/fr_FR/external.xml
index ee15937..92e000d 100644
--- a/scilab/modules/core/help/fr_FR/external.xml
+++ b/scilab/modules/core/help/fr_FR/external.xml
@@ -52,7 +52,7 @@ optim(list(costfunc,a1,b1,c1),....
52 </para> 52 </para>
53 <para> 53 <para>
54 Le nom de la routine est donné comme argument à la primitive de haut niveau sous forme d'une 54 Le nom de la routine est donné comme argument à la primitive de haut niveau sous forme d'une
55 chaîne de caractères. La séquence d'appel est aussi imposée. Des exemples sont donnés dans le répertoire <literal>routines/default</literal> (voir le fichier <literal>README</literal>). 55 chaîne de caractères. La séquence d'appel est aussi imposée.
56 </para> 56 </para>
57 <para> 57 <para>
58 Les routines externes Fortran ou C peuvent aussi être liées dynamiquement (voir <literal>link</literal>). 58 Les routines externes Fortran ou C peuvent aussi être liées dynamiquement (voir <literal>link</literal>).
diff --git a/scilab/modules/core/help/pt_BR/external.xml b/scilab/modules/core/help/pt_BR/external.xml
index aecb62b..4f5d0e0 100644
--- a/scilab/modules/core/help/pt_BR/external.xml
+++ b/scilab/modules/core/help/pt_BR/external.xml
@@ -64,9 +64,8 @@ optim(list(costfunc,a1,b1,c1),....
64 conveniente para acelerar computaes.</para> 64 conveniente para acelerar computaes.</para>
65 65
66 <para>TO nome da rotina fornecido para a primitiva de alto nvel como um 66 <para>TO nome da rotina fornecido para a primitiva de alto nvel como um
67 string. A seqncia de chamamento da rotina tambm imposta. Exemplos so 67 string. A seqncia de chamamento da rotina tambm imposta.
68 dados no diretrio <literal>routines/default</literal> (ver o arquivo 68 </para>
69 <literal>README</literal>).</para>
70 69
71 <para>Rotinas FORTRAN ou C podem ser dinamicamente linkadas ("ligadas, 70 <para>Rotinas FORTRAN ou C podem ser dinamicamente linkadas ("ligadas,
72 conectadas") (ver <literal>link</literal>)</para> 71 conectadas") (ver <literal>link</literal>)</para>
diff --git a/scilab/modules/core/help/pt_BR/sethomedirectory.xml b/scilab/modules/core/help/pt_BR/sethomedirectory.xml
deleted file mode 100644
index 33cb021..0000000
--- a/scilab/modules/core/help/pt_BR/sethomedirectory.xml
+++ /dev/null
@@ -1,44 +0,0 @@
1<?xml version="1.0" encoding="ISO-8859-1"?>
2<refentry version="5.0-subset Scilab" xml:id="sethomedirectory" xml:lang="en"
3 xmlns="http://docbook.org/ns/docbook"
4 xmlns:xlink="http://www.w3.org/1999/xlink"
5 xmlns:svg="http://www.w3.org/2000/svg"
6 xmlns:ns5="http://www.w3.org/1999/xhtml"
7 xmlns:mml="http://www.w3.org/1998/Math/MathML"
8 xmlns:db="http://docbook.org/ns/docbook">
9 <info>
10 <pubdate>$LastChangedDate$</pubdate>
11 </info>
12
13 <refnamediv>
14 <refname>sethomedirectory</refname>
15
16 <refpurpose>ajusta o diretrio home do Scilab</refpurpose>
17 </refnamediv>
18
19 <refsynopsisdiv>
20 <title>Seqncia de Chamamento</title>
21
22 <synopsis>[home,scilabhome] = sethomedirectory()</synopsis>
23 </refsynopsisdiv>
24
25 <refsection>
26 <title>Descrio</title>
27
28 <para>Ajusta o endereo hom do Scilab : varivel "SCIHOME".</para>
29
30 <para>No Windows 2k e XP , C:\Documents and
31 Settings\&lt;User&gt;\Scilab\&lt;Scilab-Version&gt;</para>
32
33 <para>No Windows Vista ,
34 C:\Users\&lt;User&gt;\Scilab\&lt;Scilab-Version&gt;</para>
35
36 <para>No Unix, /home/&lt;User&gt;/.Scilab/&lt;Scilab-Version&gt;</para>
37 </refsection>
38
39 <refsection>
40 <title>Autor</title>
41
42 <para>Allan CORNET</para>
43 </refsection>
44</refentry>
diff --git a/scilab/modules/core/includes/callinter.h b/scilab/modules/core/includes/callinter.h
index 20e20fc..b2dde3c 100644
--- a/scilab/modules/core/includes/callinter.h
+++ b/scilab/modules/core/includes/callinter.h
@@ -58,9 +58,6 @@ c see exec (intexec.f)
58 else if (RECURSION_CALL_EXECSTR .eq. ir) then 58 else if (RECURSION_CALL_EXECSTR .eq. ir) then
59c see execstr (intexecstr.f) 59c see execstr (intexecstr.f)
60 k = GW_FUNCTIONS_ID 60 k = GW_FUNCTIONS_ID
61 else if (RECURSION_CALL_GETF .eq. ir) then
62c see getf (intgetf.f)
63 k = GW_FUNCTIONS_ID
64 else if (RECURSION_CALL_SAVE .eq. ir) then 61 else if (RECURSION_CALL_SAVE .eq. ir) then
65c see save (newsave.f) 62c see save (newsave.f)
66 k = GW_IO_ID 63 k = GW_IO_ID
diff --git a/scilab/modules/core/macros/scilab_demos.sci b/scilab/modules/core/macros/scilab_demos.sci
index 4cccfec..0e324a9 100644
--- a/scilab/modules/core/macros/scilab_demos.sci
+++ b/scilab/modules/core/macros/scilab_demos.sci
@@ -9,10 +9,7 @@
9 9
10function scilab_demos() 10function scilab_demos()
11 11
12 global demolist // Demos list is defined in scilab.start 12 warnobsolete('demo_gui','5.3')
13 global demopath 13 demo_gui()
14
15 demopath = "";
16 demo_file_choice();
17 14
18endfunction 15endfunction
diff --git a/scilab/modules/core/macros/sethomedirectory.sci b/scilab/modules/core/macros/sethomedirectory.sci
deleted file mode 100644
index bf88aba..0000000
--- a/scilab/modules/core/macros/sethomedirectory.sci
+++ /dev/null
@@ -1,20 +0,0 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2005-2007 - INRIA - Allan CORNET
3//
4// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which
6// you should have received as part of this distribution. The terms
7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
10//------------------------------------------------------------------------------
11function [HomeDirectory,ScilabHomeDirectory] = sethomedirectory(varargin)
12 nv = size(varargin);
13 ScilabHomeDirectory = SCIHOME;
14 HomeDirectory = home;
15
16 if nv == 1 then // to set Scilab home with a path
17 warnobsolete("SCIHOME","5.3");
18 end
19endfunction
20//------------------------------------------------------------------------------
diff --git a/scilab/modules/core/macros/toolboxes.sci b/scilab/modules/core/macros/toolboxes.sci
index a96be12..46f9c69 100644
--- a/scilab/modules/core/macros/toolboxes.sci
+++ b/scilab/modules/core/macros/toolboxes.sci
@@ -9,11 +9,10 @@
9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 10
11//=========================================================== 11//===========================================================
12function [y] = toolboxes(path,flag,force) 12function [y] = toolboxes(path)
13// INTERNAL macro should NOT used by users 13// INTERNAL macro should NOT used by users
14// toolboxes loading 14// toolboxes loading
15// path is a directory to explore for contribs 15// path is a directory to explore for contribs
16// flag & force removed never managed
17//=========================================================== 16//===========================================================
18 global %toolboxes 17 global %toolboxes
19 global %toolboxes_dir 18 global %toolboxes_dir
@@ -30,11 +29,6 @@ function [y] = toolboxes(path,flag,force)
30 path = SCI + filesep() + 'contrib'; 29 path = SCI + filesep() + 'contrib';
31 end 30 end
32 31
33 if rhs > 1 then
34 // Remove flag & force input arguments
35 warnobsolete("toolboxes", "5.3")
36 end
37
38 cur_wd = pwd(); 32 cur_wd = pwd();
39 chdir(path); 33 chdir(path);
40 files = listfiles('.'); 34 files = listfiles('.');
diff --git a/scilab/modules/core/sci_gateway/c/sci_getmd5.c b/scilab/modules/core/sci_gateway/c/sci_getmd5.c
index ae19e05..2ed8748 100644
--- a/scilab/modules/core/sci_gateway/c/sci_getmd5.c
+++ b/scilab/modules/core/sci_gateway/c/sci_getmd5.c
@@ -65,7 +65,7 @@ int C2F(sci_getmd5) (char *fname,unsigned long fname_len)
65 if (isdir(real_path)) 65 if (isdir(real_path))
66 { 66 {
67 Scierror(999,_("%s: The file %s does not exist.\n"), fname, Input_Matrix[i]); 67 Scierror(999,_("%s: The file %s does not exist.\n"), fname, Input_Matrix[i]);
68 freeArrayOfString(Output_Matrix, mn); 68 freeArrayOfString(Output_Matrix, i);
69 freeArrayOfString(Input_Matrix, mn); 69 freeArrayOfString(Input_Matrix, mn);
70 FREE(real_path); real_path = NULL; 70 FREE(real_path); real_path = NULL;
71 return 0; 71 return 0;
@@ -85,7 +85,7 @@ int C2F(sci_getmd5) (char *fname,unsigned long fname_len)
85 else 85 else
86 { 86 {
87 Scierror(999, _("%s: The file %s does not exist.\n"), fname, Input_Matrix[i]); 87 Scierror(999, _("%s: The file %s does not exist.\n"), fname, Input_Matrix[i]);
88 freeArrayOfString(Output_Matrix, mn); 88 freeArrayOfString(Output_Matrix,i);
89 freeArrayOfString(Input_Matrix, mn); 89 freeArrayOfString(Input_Matrix, mn);
90 return 0; 90 return 0;
91 } 91 }
@@ -135,7 +135,7 @@ int C2F(sci_getmd5) (char *fname,unsigned long fname_len)
135 if (Output_Matrix[i] == NULL) 135 if (Output_Matrix[i] == NULL)
136 { 136 {
137 freeArrayOfString(Input_Matrix, m1*n1); 137 freeArrayOfString(Input_Matrix, m1*n1);
138 freeArrayOfString(Output_Matrix, i); 138 freeArrayOfString(Output_Matrix,i);
139 Scierror(999,("%s: No more memory.\n"), fname); 139 Scierror(999,("%s: No more memory.\n"), fname);
140 return 0; 140 return 0;
141 } 141 }
@@ -152,7 +152,7 @@ int C2F(sci_getmd5) (char *fname,unsigned long fname_len)
152 } 152 }
153 else 153 else
154 { 154 {
155 Scierror(999,_("%s: Wrong type for input argument #%d: String expected.\n"),fname,2); 155 Scierror(999,_("%s: Wrong value for input argument #%d: \"%s\" expected.\n"),fname,2,"string");
156 } 156 }
157 } 157 }
158 else 158 else
diff --git a/scilab/modules/core/src/c/recursionFunction.c b/scilab/modules/core/src/c/recursionFunction.c
index 371028f..9b717a9 100644
--- a/scilab/modules/core/src/c/recursionFunction.c
+++ b/scilab/modules/core/src/c/recursionFunction.c
@@ -80,10 +80,6 @@ int C2F(getrecursiongatewaytocall)(int *callID)
80 /* see execstr (intexecstr.f) */ 80 /* see execstr (intexecstr.f) */
81 gw = GW_FUNCTIONS_ID; /* gw_functions */ 81 gw = GW_FUNCTIONS_ID; /* gw_functions */
82 break; 82 break;
83 case RECURSION_CALL_GETF:
84 /* see getf (intgetf.f) */
85 gw = GW_FUNCTIONS_ID; /* gw_functions */
86 break;
87 case RECURSION_CALL_SAVE: 83 case RECURSION_CALL_SAVE:
88 /* see save (newsave.f) */ 84 /* see save (newsave.f) */
89 gw = GW_IO_ID; /* gw_io */ 85 gw = GW_IO_ID; /* gw_io */
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_4077.dia.ref b/scilab/modules/core/tests/nonreg_tests/bug_4077.dia.ref
index 3d90cb0..3339a89 100644
--- a/scilab/modules/core/tests/nonreg_tests/bug_4077.dia.ref
+++ b/scilab/modules/core/tests/nonreg_tests/bug_4077.dia.ref
@@ -10,13 +10,19 @@
10// http://bugzilla.scilab.org/show_bug.cgi?id=4077 10// http://bugzilla.scilab.org/show_bug.cgi?id=4077
11// 11//
12// <-- Short Description --> 12// <-- Short Description -->
13// problem with getf and try 13// problem with exec and try
14warning('off'); 14warning('off');
15mputl(['function r=circe()' 15mputl(['function r=circe()'
16' for j=1,end' 16' for j=1,end'
17' try b=0,end' 17' try b=0,end'
18' r= 0' 18' r= 0'
19'endfunction'],TMPDIR+'/circe.sci'); 19'endfunction'],TMPDIR+'/circe.sci');
20for i=1,getf(TMPDIR+'/circe.sci'),end 20
21function r=circe()
22 for j=1,end
23 try b=0,end
24 r= 0
25endfunction
26
21if type(circe)<>13 then bugmes();quit;end 27if type(circe)<>13 then bugmes();quit;end
22warning('on'); 28warning('on');
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_4077.tst b/scilab/modules/core/tests/nonreg_tests/bug_4077.tst
index 15987cc..db8aac9 100644
--- a/scilab/modules/core/tests/nonreg_tests/bug_4077.tst
+++ b/scilab/modules/core/tests/nonreg_tests/bug_4077.tst
@@ -11,13 +11,13 @@
11// http://bugzilla.scilab.org/show_bug.cgi?id=4077 11// http://bugzilla.scilab.org/show_bug.cgi?id=4077
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// problem with getf and try 14// problem with exec and try
15warning('off'); 15warning('off');
16mputl(['function r=circe()' 16mputl(['function r=circe()'
17' for j=1,end' 17' for j=1,end'
18' try b=0,end' 18' try b=0,end'
19' r= 0' 19' r= 0'
20'endfunction'],TMPDIR+'/circe.sci'); 20'endfunction'],TMPDIR+'/circe.sci');
21for i=1,getf(TMPDIR+'/circe.sci'),end 21for i=1,exec(TMPDIR+'/circe.sci'),end
22if type(circe)<>13 then pause,end 22if type(circe)<>13 then pause,end
23warning('on'); 23warning('on');
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_6521.dia.ref b/scilab/modules/core/tests/nonreg_tests/bug_6521.dia.ref
index f1b6c82..31e1152 100644
--- a/scilab/modules/core/tests/nonreg_tests/bug_6521.dia.ref
+++ b/scilab/modules/core/tests/nonreg_tests/bug_6521.dia.ref
@@ -1,9 +1,10 @@
1// ============================================================================= 1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2009 - DIGITEO - Allan CORNET 3// Copyright (C) 2010 - DIGITEO - Allan CORNET
4// 4//
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7// <-- JVM NOT MANDATORY -->
7// <-- Non-regression test for bug 6521 --> 8// <-- Non-regression test for bug 6521 -->
8// 9//
9// <-- Bugzilla URL --> 10// <-- Bugzilla URL -->
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_6521.tst b/scilab/modules/core/tests/nonreg_tests/bug_6521.tst
index 56ef684..eb321d6 100644
--- a/scilab/modules/core/tests/nonreg_tests/bug_6521.tst
+++ b/scilab/modules/core/tests/nonreg_tests/bug_6521.tst
@@ -1,10 +1,12 @@
1// ============================================================================= 1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2009 - DIGITEO - Allan CORNET 3// Copyright (C) 2010 - DIGITEO - Allan CORNET
4// 4//
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 6521 --> 10// <-- Non-regression test for bug 6521 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
@@ -14,4 +16,4 @@
14// getmd5 crashed with a wrong second argument. 16// getmd5 crashed with a wrong second argument.
15 17
16ierr = execstr('getmd5(""toto"",""strin"")','errcatch'); 18ierr = execstr('getmd5(""toto"",""strin"")','errcatch');
17if ierr <> 999 then pause,end \ No newline at end of file 19if ierr <> 999 then pause,end
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_6586.dia.ref b/scilab/modules/core/tests/nonreg_tests/bug_6586.dia.ref
new file mode 100644
index 0000000..6f00a4c
--- /dev/null
+++ b/scilab/modules/core/tests/nonreg_tests/bug_6586.dia.ref
@@ -0,0 +1,15 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2010 - DIGITEO - Pierre MARECHAL
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7// <-- JVM NOT MANDATORY -->
8// <-- Non-regression test for bug 6586 -->
9//
10// <-- Bugzilla URL -->
11// http://bugzilla.scilab.org/show_bug.cgi?id=6586
12//
13// <-- Short Description -->
14// getmd5 crashed if the file (1st input argument) didn't exist
15if execstr("getmd5(''"+TMPDIR+"/phantom_file'')","errcatch") == 0 then bugmes();quit;end
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_6586.tst b/scilab/modules/core/tests/nonreg_tests/bug_6586.tst
new file mode 100644
index 0000000..e46cd4a
--- /dev/null
+++ b/scilab/modules/core/tests/nonreg_tests/bug_6586.tst
@@ -0,0 +1,18 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2010 - DIGITEO - Pierre MARECHAL
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7
8// <-- JVM NOT MANDATORY -->
9
10// <-- Non-regression test for bug 6586 -->
11//
12// <-- Bugzilla URL -->
13// http://bugzilla.scilab.org/show_bug.cgi?id=6586
14//
15// <-- Short Description -->
16// getmd5 crashed if the file (1st input argument) didn't exist
17
18if execstr("getmd5(''"+TMPDIR+"/phantom_file'')","errcatch") == 0 then pause, end
diff --git a/scilab/modules/core/tests/unit_tests/comment.dia.ref b/scilab/modules/core/tests/unit_tests/comment.dia.ref
index f7df45c..0bb9cbe 100644
--- a/scilab/modules/core/tests/unit_tests/comment.dia.ref
+++ b/scilab/modules/core/tests/unit_tests/comment.dia.ref
@@ -4,7 +4,7 @@
4// 4//
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7//for version after 3.0 the comments are no more handled by a preprocessor, 7//for version after 3.0 the comments are no more handled by a preprocessor,
8//but by the parser itself 8//but by the parser itself
9a=1//test 9a=1//test
10 a = 10 a =
@@ -233,10 +233,36 @@ t=['function a=foo'
233 ' end //loop end' 233 ' end //loop end'
234 'endfunction']; 234 'endfunction'];
235mputl(t,TMPDIR+'/foo.sci'); 235mputl(t,TMPDIR+'/foo.sci');
236getf(TMPDIR+'/foo.sci','n') 236
237function a=foo
238a=0;k=0;//initialization
239 while %t //loop begin
240 k=k+1; //ttttt
241 if a> 10 then //
242 break // go out the loop
243 else //111111
244 a=a-1; //sdfdfd
245 end //xxxxx
246 a=a+k; //hhhhh
247 end //loop end
248endfunction
249
237a=foo(); 250a=foo();
238if a<>15 then bugmes();quit;end 251if a<>15 then bugmes();quit;end
239getf(TMPDIR+'/foo.sci') 252
253function a=foo
254a=0;k=0;//initialization
255 while %t //loop begin
256 k=k+1; //ttttt
257 if a> 10 then //
258 break // go out the loop
259 else //111111
260 a=a-1; //sdfdfd
261 end //xxxxx
262 a=a+k; //hhhhh
263 end //loop end
264endfunction
265
240a=foo(); 266a=foo();
241if a<>15 then bugmes();quit;end 267if a<>15 then bugmes();quit;end
242t=['//sdffgfgfgggg' 268t=['//sdffgfgfgggg'
@@ -254,10 +280,44 @@ t=['//sdffgfgfgggg'
254 ' end //loop end' 280 ' end //loop end'
255 'endfunction']; 281 'endfunction'];
256mputl(t,TMPDIR+'/foo.sci'); 282mputl(t,TMPDIR+'/foo.sci');
257getf(TMPDIR+'/foo.sci','n') 283
284//sdffgfgfgggg
285
286//sdsdsddfgfgfghgfhjhui
287
288function a=foo//uuuuuuu
289a=0;k=0;//initialization
290 while %t //loop begin
291 k=k+1; //ttttt
292 if a> 10 then //
293 break // go out the loop
294 else //111111
295 a=a-1; //sdfdfd
296 end //xxxxx
297 a=a+k; //hhhhh
298 end //loop end
299endfunction
300
258a=foo(); 301a=foo();
259if a<>15 then bugmes();quit;end 302if a<>15 then bugmes();quit;end
260getf(TMPDIR+'/foo.sci') 303
304//sdffgfgfgggg
305
306//sdsdsddfgfgfghgfhjhui
307
308function a=foo//uuuuuuu
309a=0;k=0;//initialization
310 while %t //loop begin
311 k=k+1; //ttttt
312 if a> 10 then //
313 break // go out the loop
314 else //111111
315 a=a-1; //sdfdfd
316 end //xxxxx
317 a=a+k; //hhhhh
318 end //loop end
319endfunction
320
261a=foo(); 321a=foo();
262if a<>15 then bugmes();quit;end 322if a<>15 then bugmes();quit;end
263warning('on'); 323warning('on');
@@ -392,7 +452,7 @@ if or(L<>Lref) then bugmes();quit;end
392function a=foo 452function a=foo
393 a=0;k=0;//initialization 453 a=0;k=0;//initialization
394 while %t //loop begin 454 while %t //loop begin
395 k=k+1; //ttttt tttt 455 k=k+1; //ttttt tttt
396 if a> 10 then //ff 456 if a> 10 then //ff
397 break // go out the loop 457 break // go out the loop
398 else //111111 458 else //111111
diff --git a/scilab/modules/core/tests/unit_tests/comment.tst b/scilab/modules/core/tests/unit_tests/comment.tst
index d94e625..ff8da1d 100644
--- a/scilab/modules/core/tests/unit_tests/comment.tst
+++ b/scilab/modules/core/tests/unit_tests/comment.tst
@@ -251,10 +251,10 @@ t=['function a=foo'
251 'endfunction']; 251 'endfunction'];
252 252
253mputl(t,TMPDIR+'/foo.sci'); 253mputl(t,TMPDIR+'/foo.sci');
254getf(TMPDIR+'/foo.sci','n') 254exec(TMPDIR+'/foo.sci')
255a=foo(); 255a=foo();
256if a<>15 then pause,end 256if a<>15 then pause,end
257getf(TMPDIR+'/foo.sci') 257exec(TMPDIR+'/foo.sci')
258a=foo(); 258a=foo();
259if a<>15 then pause,end 259if a<>15 then pause,end
260 260
@@ -274,10 +274,10 @@ t=['//sdffgfgfgggg'
274 'endfunction']; 274 'endfunction'];
275 275
276mputl(t,TMPDIR+'/foo.sci'); 276mputl(t,TMPDIR+'/foo.sci');
277getf(TMPDIR+'/foo.sci','n') 277exec(TMPDIR+'/foo.sci')
278a=foo(); 278a=foo();
279if a<>15 then pause,end 279if a<>15 then pause,end
280getf(TMPDIR+'/foo.sci') 280exec(TMPDIR+'/foo.sci')
281a=foo(); 281a=foo();
282if a<>15 then pause,end 282if a<>15 then pause,end
283warning('on'); 283warning('on');
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index 777ac72..bf5fa0e 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -274,6 +274,7 @@ LD = @LD@
274LDFLAGS = @LDFLAGS@ 274LDFLAGS = @LDFLAGS@
275LIBICONV = @LIBICONV@ 275LIBICONV = @LIBICONV@
276LIBINTL = @LIBINTL@ 276LIBINTL = @LIBINTL@
277LIBM = @LIBM@
277LIBOBJS = @LIBOBJS@ 278LIBOBJS = @LIBOBJS@
278LIBS = @LIBS@ 279LIBS = @LIBS@
279LIBTOOL = @LIBTOOL@ 280LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index 96e6047..7457de2 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -202,6 +202,7 @@ LD = @LD@
202LDFLAGS = @LDFLAGS@ 202LDFLAGS = @LDFLAGS@
203LIBICONV = @LIBICONV@ 203LIBICONV = @LIBICONV@
204LIBINTL = @LIBINTL@ 204LIBINTL = @LIBINTL@
205LIBM = @LIBM@
205LIBOBJS = @LIBOBJS@ 206LIBOBJS = @LIBOBJS@
206LIBS = @LIBS@ 207LIBS = @LIBS@
207LIBTOOL = @LIBTOOL@ 208LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index 9d2abd0..736a1aa 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -201,6 +201,7 @@ LD = @LD@
201LDFLAGS = @LDFLAGS@ 201LDFLAGS = @LDFLAGS@
202LIBICONV = @LIBICONV@ 202LIBICONV = @LIBICONV@
203LIBINTL = @LIBINTL@ 203LIBINTL = @LIBINTL@
204LIBM = @LIBM@
204LIBOBJS = @LIBOBJS@ 205LIBOBJS = @LIBOBJS@
205LIBS = @LIBS@ 206LIBS = @LIBS@
206LIBTOOL = @LIBTOOL@ 207LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/development_tools/macros/test_run.sci b/scilab/modules/development_tools/macros/test_run.sci
index 35dda2f..31ffa09 100644
--- a/scilab/modules/development_tools/macros/test_run.sci
+++ b/scilab/modules/development_tools/macros/test_run.sci
@@ -1105,8 +1105,10 @@ function st = st_run(st)
1105 1105
1106 if st.language == "any" then 1106 if st.language == "any" then
1107 language_arg = ""; 1107 language_arg = "";
1108 else 1108 elseif MSDOS then
1109 language_arg = "-l "+ st.language; 1109 language_arg = "-l "+ st.language;
1110 else
1111 language_arg = "LANG=" + st.language + " ; ";
1110 end 1112 end
1111 1113
1112 // Assembly 1114 // Assembly
@@ -1115,7 +1117,7 @@ function st = st_run(st)
1115 if MSDOS then 1117 if MSDOS then
1116 test_cmd = "( """+SCI_BIN+"\bin\scilex.exe"+""""+" "+mode_arg+" "+language_arg+" -nb -f """+st.tmp_tst+""" > """+st.tmp_res+""" ) 2> """+st.tmp_err+""""; 1118 test_cmd = "( """+SCI_BIN+"\bin\scilex.exe"+""""+" "+mode_arg+" "+language_arg+" -nb -f """+st.tmp_tst+""" > """+st.tmp_res+""" ) 2> """+st.tmp_err+"""";
1117 else 1119 else
1118 test_cmd = "( "+SCI_BIN+"/bin/scilab "+mode_arg+" "+language_arg+" -nb -f "+st.tmp_tst+" > "+st.tmp_res+" ) 2> "+st.tmp_err; 1120 test_cmd = "( "+language_arg+" "+SCI_BIN+"/bin/scilab "+mode_arg+" -nb -f "+st.tmp_tst+" > "+st.tmp_res+" ) 2> "+st.tmp_err;
1119 end 1121 end
1120 1122
1121 st= st_set_cmd(st,test_cmd); 1123 st= st_set_cmd(st,test_cmd);
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index 2609cd7..3f3f9be 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -152,6 +152,7 @@ LD = @LD@
152LDFLAGS = @LDFLAGS@ 152LDFLAGS = @LDFLAGS@
153LIBICONV = @LIBICONV@ 153LIBICONV = @LIBICONV@
154LIBINTL = @LIBINTL@ 154LIBINTL = @LIBINTL@
155LIBM = @LIBM@
155LIBOBJS = @LIBOBJS@ 156LIBOBJS = @LIBOBJS@
156LIBS = @LIBS@ 157LIBS = @LIBS@
157LIBTOOL = @LIBTOOL@ 158LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 812213b..133201e 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -285,6 +285,7 @@ LD = @LD@
285LDFLAGS = @LDFLAGS@ 285LDFLAGS = @LDFLAGS@
286LIBICONV = @LIBICONV@ 286LIBICONV = @LIBICONV@
287LIBINTL = @LIBINTL@ 287LIBINTL = @LIBINTL@
288LIBM = @LIBM@
288LIBOBJS = @LIBOBJS@ 289LIBOBJS = @LIBOBJS@
289LIBS = @LIBS@ 290LIBS = @LIBS@
290LIBTOOL = @LIBTOOL@ 291LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/differential_equations/help/en_US/feval.xml b/scilab/modules/differential_equations/help/en_US/feval.xml
index c88b6ac..5c658ea 100644
--- a/scilab/modules/differential_equations/help/en_US/feval.xml
+++ b/scilab/modules/differential_equations/help/en_US/feval.xml
@@ -87,8 +87,8 @@
87 on one or two arguments which are supposed to be real. The result returned 87 on one or two arguments which are supposed to be real. The result returned
88 by <literal>f</literal> can be real or complex. In case of a Fortran call, 88 by <literal>f</literal> can be real or complex. In case of a Fortran call,
89 the function <literal> 'f' </literal> must be defined in the subroutine 89 the function <literal> 'f' </literal> must be defined in the subroutine
90 <literal>ffeval.f</literal> (in directory 90 <literal>fevaltable.c</literal> (in directory
91 <literal>SCIDIR/routines/default</literal>)</para> 91 <literal>SCI/modules/differential_equations/src/c</literal>)</para>
92 </refsection> 92 </refsection>
93 93
94 <refsection> 94 <refsection>
diff --git a/scilab/modules/differential_equations/help/en_US/impl.xml b/scilab/modules/differential_equations/help/en_US/impl.xml
index 567f13b..e11b1aa 100644
--- a/scilab/modules/differential_equations/help/en_US/impl.xml
+++ b/scilab/modules/differential_equations/help/en_US/impl.xml
@@ -127,7 +127,7 @@ r = res(t,y,ydot)
127 127
128 <para>If <literal>res</literal> is a character string, it refers to the 128 <para>If <literal>res</literal> is a character string, it refers to the
129 name of a Fortran subroutine or a C function. See 129 name of a Fortran subroutine or a C function. See
130 <literal>SCIDIR/routines/default/Ex-impl.f</literal> for an example to do 130 <literal>SCI/modules/differential_equations/sci_gateway/fortran/Ex-impl.f</literal> for an example to do
131 that.</para> 131 that.</para>
132 132
133 <para><literal>res</literal> can also be a list: see the help of 133 <para><literal>res</literal> can also be a list: see the help of
@@ -148,7 +148,7 @@ r = adda(t,y,p)
148 148
149 <para>If <literal>adda</literal> is a character string, it refers to the 149 <para>If <literal>adda</literal> is a character string, it refers to the
150 name of a Fortran subroutine or a C function. See 150 name of a Fortran subroutine or a C function. See
151 <literal>SCIDIR/routines/default/Ex-impl.f</literal> for an example to do 151 <literal>SCI/modules/differential_equations/sci_gateway/fortran/Ex-impl.f</literal> for an example to do
152 that.</para> 152 that.</para>
153 153
154 <para><literal>adda</literal> can also be a list: see the help of 154 <para><literal>adda</literal> can also be a list: see the help of
@@ -169,7 +169,7 @@ j = jac(t,y,ydot)
169 169
170 <para>If <literal>jac</literal> is a character string, it refers to the 170 <para>If <literal>jac</literal> is a character string, it refers to the
171 name of a Fortran subroutine or a C function. See 171 name of a Fortran subroutine or a C function. See
172 <literal>SCIDIR/routines/default/Ex-impl.f</literal> for an example to do 172 <literal>SCI/modules/differential_equations/sci_gateway/fortran/Ex-impl.f</literal> for an example to do
173 that.</para> 173 that.</para>
174 174
175 <para><literal>jac</literal> can also be a list: see the help of 175 <para><literal>jac</literal> can also be a list: see the help of
diff --git a/scilab/modules/differential_equations/help/en_US/intg.xml b/scilab/modules/differential_equations/help/en_US/intg.xml
index 5f7af78..ec1afce 100644
--- a/scilab/modules/differential_equations/help/en_US/intg.xml
+++ b/scilab/modules/differential_equations/help/en_US/intg.xml
@@ -199,7 +199,7 @@ abs(exact-I)
199 <refsection> 199 <refsection>
200 <title>Used Functions</title> 200 <title>Used Functions</title>
201 201
202 <para>The associated routines can be found in routines/integ directory 202 <para>The associated routines can be found in SCI/modules/differential_equations/src/fortran directory
203 :</para> 203 :</para>
204 204
205 <para>dqag0.f and dqags.f from quadpack</para> 205 <para>dqag0.f and dqags.f from quadpack</para>
diff --git a/scilab/modules/differential_equations/help/en_US/ode.xml b/scilab/modules/differential_equations/help/en_US/ode.xml
index 773543a..f7cd36c 100644
--- a/scilab/modules/differential_equations/help/en_US/ode.xml
+++ b/scilab/modules/differential_equations/help/en_US/ode.xml
@@ -482,7 +482,7 @@ ode("stiff",[0;1],0,1,f,Jacobian)
482 <refsection> 482 <refsection>
483 <title>Used Functions</title> 483 <title>Used Functions</title>
484 484
485 <para>The associated routines can be found in routines/integ directory 485 <para>The associated routines can be found in SCI/modules/differential_equations/src/fortran directory
486 :</para> 486 :</para>
487 487
488 <para>lsode.f lsoda.f lsodar.f</para> 488 <para>lsode.f lsoda.f lsodar.f</para>
diff --git a/scilab/modules/differential_equations/help/en_US/ode_optional_output.xml b/scilab/modules/differential_equations/help/en_US/ode_optional_output.xml
index df883b4..fd2fd06 100644
--- a/scilab/modules/differential_equations/help/en_US/ode_optional_output.xml
+++ b/scilab/modules/differential_equations/help/en_US/ode_optional_output.xml
@@ -27,7 +27,7 @@
27 <literal>iw</literal>. 27 <literal>iw</literal>.
28 These are valid only for the <literal>lsode</literal> 28 These are valid only for the <literal>lsode</literal>
29 <literal>lsoda</literal> and <literal>lsodar</literal> ode solver. 29 <literal>lsoda</literal> and <literal>lsodar</literal> ode solver.
30 For more details, one can look at the solvers fortran code comments in <literal>routines/integ/lsod*.f</literal>. 30 For more details, one can look at the solvers fortran code comments in <literal>SCI/modules/differential_equations/src/fortran/lsod*.f</literal>.
31 </para> 31 </para>
32 <variablelist> 32 <variablelist>
33 <varlistentry> 33 <varlistentry>
diff --git a/scilab/modules/differential_equations/help/fr_FR/feval.xml b/scilab/modules/differential_equations/help/fr_FR/feval.xml
index c339452..b4690cf 100644
--- a/scilab/modules/differential_equations/help/fr_FR/feval.xml
+++ b/scilab/modules/differential_equations/help/fr_FR/feval.xml
@@ -76,8 +76,8 @@
76 ou C) acceptant un ou deux arguments d'entrée supposés réels. Le résultat 76 ou C) acceptant un ou deux arguments d'entrée supposés réels. Le résultat
77 renvoyé par <literal>f</literal> peut par contre être réel ou complexe. 77 renvoyé par <literal>f</literal> peut par contre être réel ou complexe.
78 Dans le cas d'un appel Fortran ou C, la fonction <literal> 'f' </literal> 78 Dans le cas d'un appel Fortran ou C, la fonction <literal> 'f' </literal>
79 doit être définie dans la fonction <literal>ffevalf</literal> (voir dans 79 doit être définie dans la fonction <literal>fevaltable.c</literal> (voir dans
80 le dossier <literal>SCIDIR/routines/default</literal>)</para> 80 le dossier <literal>SCI/modules/differential_equations/src/c</literal>)</para>
81 </refsection> 81 </refsection>
82 82
83 <refsection> 83 <refsection>
diff --git a/scilab/modules/differential_equations/help/fr_FR/intg.xml b/scilab/modules/differential_equations/help/fr_FR/intg.xml
index 5182e60..b474114 100644
--- a/scilab/modules/differential_equations/help/fr_FR/intg.xml
+++ b/scilab/modules/differential_equations/help/fr_FR/intg.xml
@@ -189,6 +189,6 @@ abs(exact-I)
189 <title>Fonctions Utilisées</title> 189 <title>Fonctions Utilisées</title>
190 190
191 <para>Les programmes correspondants (dqag0.f et dqags.f de quadpack) se 191 <para>Les programmes correspondants (dqag0.f et dqags.f de quadpack) se
192 trouvent dabs le repertoire routines/integ :</para> 192 trouvent dabs le repertoire SCI/modules/differential_equations/src/fortran.</para>
193 </refsection> 193 </refsection>
194</refentry> 194</refentry>
diff --git a/scilab/modules/differential_equations/help/fr_FR/ode.xml b/scilab/modules/differential_equations/help/fr_FR/ode.xml
index f64390a..2d19497 100644
--- a/scilab/modules/differential_equations/help/fr_FR/ode.xml
+++ b/scilab/modules/differential_equations/help/fr_FR/ode.xml
@@ -488,6 +488,6 @@ ode("stiff",[0;1],0,1,f,Jacobian)
488 <title>Fonctions Utilisées</title> 488 <title>Fonctions Utilisées</title>
489 489
490 <para>Les sous programmes associés se trouvent dans le repertoire 490 <para>Les sous programmes associés se trouvent dans le repertoire
491 routines/integ: lsode.f lsoda.f lsodar.f</para> 491 SCI/modules/differential_equations/src/fortran: lsode.f lsoda.f lsodar.f</para>
492 </refsection> 492 </refsection>
493</refentry> 493</refentry>
diff --git a/scilab/modules/differential_equations/help/pt_BR/feval.xml b/scilab/modules/differential_equations/help/pt_BR/feval.xml
index d362e41..b8819a5 100644
--- a/scilab/modules/differential_equations/help/pt_BR/feval.xml
+++ b/scilab/modules/differential_equations/help/pt_BR/feval.xml
@@ -87,8 +87,8 @@
87 dois ou mais argumentos supostos reais. O resultado retornado por 87 dois ou mais argumentos supostos reais. O resultado retornado por
88 <literal>f</literal> pode ser real ou complexo. No caso de uma chamada 88 <literal>f</literal> pode ser real ou complexo. No caso de uma chamada
89 FORTRAN, a funo <literal> 'f' </literal> deve ser definida na subrotina 89 FORTRAN, a funo <literal> 'f' </literal> deve ser definida na subrotina
90 <literal>ffeval.f</literal> (no diretrio 90 <literal>fevaltable.c</literal> (no diretrio
91 <literal>SCIDIR/routines/default</literal>)</para> 91 <literal>SCI/modules/differential_equations/src/c</literal>)</para>
92 </refsection> 92 </refsection>
93 93
94 <refsection> 94 <refsection>
diff --git a/scilab/modules/differential_equations/help/pt_BR/impl.xml b/scilab/modules/differential_equations/help/pt_BR/impl.xml
index dadd273..002f55b 100644
--- a/scilab/modules/differential_equations/help/pt_BR/impl.xml
+++ b/scilab/modules/differential_equations/help/pt_BR/impl.xml
@@ -128,7 +128,7 @@ r = res(t,y,ydot)
128 128
129 <para>Se <literal>res</literal> for um string, ele se refere a uma 129 <para>Se <literal>res</literal> for um string, ele se refere a uma
130 subrotina FORTRAN ou uma funo C. Ver 130 subrotina FORTRAN ou uma funo C. Ver
131 <literal>SCIDIR/routines/default/Ex-impl.f</literal> para um 131 <literal>SCI/modules/differential_equations/sci_gateway/fortran/Ex-impl.f</literal> para um
132 exemplo.</para> 132 exemplo.</para>
133 133
134 <para><literal>res</literal> tambm pode ser uma lista, ver a ajuda de 134 <para><literal>res</literal> tambm pode ser uma lista, ver a ajuda de
@@ -149,7 +149,7 @@ r = adda(t,y,p)
149 149
150 <para>Se <literal>adda</literal> for um string, ele se refere a uma 150 <para>Se <literal>adda</literal> for um string, ele se refere a uma
151 subrotina FORTRAN ou uma funo C. Ver 151 subrotina FORTRAN ou uma funo C. Ver
152 <literal>SCIDIR/routines/default/Ex-impl.f</literal> para um 152 <literal>SCI/modules/differential_equations/sci_gateway/fortran/Ex-impl.f</literal> para um
153 exemplo.</para> 153 exemplo.</para>
154 154
155 <para><literal>adda</literal> tambm pode ser uma lista, ver a ajuda de 155 <para><literal>adda</literal> tambm pode ser uma lista, ver a ajuda de
@@ -170,7 +170,7 @@ j = jac(t,y,ydot)
170 170
171 <para>Se <literal>jac</literal> for um string, ele se refere a uma 171 <para>Se <literal>jac</literal> for um string, ele se refere a uma
172 subrotina FORTRAN ou uma funo C. Ver 172 subrotina FORTRAN ou uma funo C. Ver
173 <literal>SCIDIR/routines/default/Ex-impl.f</literal> para um 173 <literal>SCI/modules/differential_equations/sci_gateway/fortran/Ex-impl.f</literal> para um
174 exemplo.</para> 174 exemplo.</para>
175 175
176 <para><literal>jac</literal> tambm pode ser uma lista, ver a ajuda de 176 <para><literal>jac</literal> tambm pode ser uma lista, ver a ajuda de
diff --git a/scilab/modules/differential_equations/help/pt_BR/intg.xml b/scilab/modules/differential_equations/help/pt_BR/intg.xml
index 8bd5db4..02bc06c 100644
--- a/scilab/modules/differential_equations/help/pt_BR/intg.xml
+++ b/scilab/modules/differential_equations/help/pt_BR/intg.xml
@@ -200,7 +200,7 @@ abs(exact-I)
200 <title>Funes Utilizadas</title> 200 <title>Funes Utilizadas</title>
201 201
202 <para>As rotinas associadas podem ser encontradas no diretrio 202 <para>As rotinas associadas podem ser encontradas no diretrio
203 routines/integ :</para> 203 SCI/modules/differential_equations/src/fortran :</para>
204 204
205 <para>dqag0.f e dqags.f de quadpack</para> 205 <para>dqag0.f e dqags.f de quadpack</para>
206 </refsection> 206 </refsection>
diff --git a/scilab/modules/differential_equations/help/pt_BR/ode.xml b/scilab/modules/differential_equations/help/pt_BR/ode.xml
index a51da42..0721a14 100644
--- a/scilab/modules/differential_equations/help/pt_BR/ode.xml
+++ b/scilab/modules/differential_equations/help/pt_BR/ode.xml
@@ -487,7 +487,7 @@ ode("stiff",[0;1],0,1,f,Jacobian)
487 <title>Funes Utilizadas</title> 487 <title>Funes Utilizadas</title>
488 488
489 <para>As rotinas associadas podem ser encontradas no diretrio 489 <para>As rotinas associadas podem ser encontradas no diretrio
490 routines/integ:</para> 490 SCI/modules/differential_equations/src/fortran:</para>
491 491
492 <para>lsode.f lsoda.f lsodar.f</para> 492 <para>lsode.f lsoda.f lsodar.f</para>
493 </refsection> 493 </refsection>
diff --git a/scilab/modules/differential_equations/help/pt_BR/ode_optional_output.xml b/scilab/modules/differential_equations/help/pt_BR/ode_optional_output.xml
index e29b15a..8f54827 100644
--- a/scilab/modules/differential_equations/help/pt_BR/ode_optional_output.xml
+++ b/scilab/modules/differential_equations/help/pt_BR/ode_optional_output.xml
@@ -38,7 +38,7 @@
38 vlidos apenas para os solucionadores de EDOs <literal>lsode</literal>, 38 vlidos apenas para os solucionadores de EDOs <literal>lsode</literal>,
39 <literal>lsoda</literal> e <literal>lsodar</literal>. Para mais detalhes, 39 <literal>lsoda</literal> e <literal>lsodar</literal>. Para mais detalhes,
40 pode se consultar os comentrios dos cdigos das subrotinas FORTRAN 40 pode se consultar os comentrios dos cdigos das subrotinas FORTRAN
41 <literal>routines/integ/lsod*.f</literal>.</para> 41 <literal>SCI/modules/differential_equations/src/fortran/lsod*.f</literal>.</para>
42 42
43 <variablelist> 43 <variablelist>
44 <varlistentry> 44 <varlistentry>
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index 26d4303..55fc80b 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -243,6 +243,7 @@ LD = @LD@
243LDFLAGS = @LDFLAGS@ 243LDFLAGS = @LDFLAGS@
244LIBICONV = @LIBICONV@ 244LIBICONV = @LIBICONV@
245LIBINTL = @LIBINTL@ 245LIBINTL = @LIBINTL@
246LIBM = @LIBM@
246LIBOBJS = @LIBOBJS@ 247LIBOBJS = @LIBOBJS@
247LIBS = @LIBS@ 248LIBS = @LIBS@
248LIBTOOL = @LIBTOOL@ 249LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index b633ba5..c7bcce2 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -260,6 +260,7 @@ LD = @LD@
260LDFLAGS = @LDFLAGS@ 260LDFLAGS = @LDFLAGS@
261LIBICONV = @LIBICONV@ 261LIBICONV = @LIBICONV@
262LIBINTL = @LIBINTL@ 262LIBINTL = @LIBINTL@
263LIBM = @LIBM@
263LIBOBJS = @LIBOBJS@ 264LIBOBJS = @LIBOBJS@
264LIBS = @LIBS@ 265LIBS = @LIBS@
265LIBTOOL = @LIBTOOL@ 266LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/dynamic_link/help/en_US/call.xml b/scilab/modules/dynamic_link/help/en_US/call.xml
index 4adc296..b54ab8c 100644
--- a/scilab/modules/dynamic_link/help/en_US/call.xml
+++ b/scilab/modules/dynamic_link/help/en_US/call.xml
@@ -86,9 +86,13 @@
86 86
87 <itemizedlist> 87 <itemizedlist>
88 <listitem> 88 <listitem>
89 <para>with Scilab "<literal>link</literal>" command (incremental 89 <para>with Scilab "<literal>link</literal>" command (dynamical
90 "soft" linking) during the Scilab session.(see 90 linking) during the Scilab session.(see
91 <literal>link</literal>)</para> 91 <literal>link</literal>)</para>
92
93 <para>On Windows, C functions must use cdecl calling convention name
94 (see options in your C compiler(default calling convention for x86 C
95 compilers)).</para>
92 </listitem> 96 </listitem>
93 </itemizedlist> 97 </itemizedlist>
94 98
@@ -194,13 +198,13 @@
194 <refsection> 198 <refsection>
195 <title>Examples</title> 199 <title>Examples</title>
196 200
197 <programlisting role="example"><![CDATA[ 201 <programlisting role="example">
198//Example 1 with a simple C code 202//Example 1 with a simple C code
199f1=['#include <math.h>' 203f1=['#include &lt;math.h&gt;'
200 'void fooc(double c[],double a[],double *b,int *m,int *n)' 204 'void fooc(double c[],double a[],double *b,int *m,int *n)'
201 '{' 205 '{'
202 ' int i;' 206 ' int i;'
203 ' for ( i =0 ; i < (*m)*(*n) ; i++) ' 207 ' for ( i =0 ; i &lt; (*m)*(*n) ; i++) '
204 ' c[i] = sin(a[i]) + *b; ' 208 ' c[i] = sin(a[i]) + *b; '
205 '}']; 209 '}'];
206 210
@@ -251,7 +255,7 @@ exec loader.sce
251a=[1,2,3;4,5,6];b= %pi; 255a=[1,2,3;4,5,6];b= %pi;
252[m,n]=size(a); 256[m,n]=size(a);
253c=call("foof",a,2,"d",b,3,"d",m,4,"i",n,5,"i","out",[m,n],1,"d"); 257c=call("foof",a,2,"d",b,3,"d",m,4,"i",n,5,"i","out",[m,n],1,"d");
254 ]]></programlisting> 258 </programlisting>
255 </refsection> 259 </refsection>
256 260
257 <refsection> 261 <refsection>
diff --git a/scilab/modules/elementary_functions/Makefile.am b/scilab/modules/elementary_functions/Makefile.am
index bf61a55..1254bf7 100644
--- a/scilab/modules/elementary_functions/Makefile.am
+++ b/scilab/modules/elementary_functions/Makefile.am
@@ -119,7 +119,7 @@ src/fortran/slatec/pchim.f
119 119
120LINPACK_SOURCES = src/fortran/linpack/dgesl.f \ 120LINPACK_SOURCES = src/fortran/linpack/dgesl.f \
121 src/fortran/linpack/wpade.f \ 121 src/fortran/linpack/wpade.f \
122 src/fortran/linpack/util.f \ 122 src/fortran/linpack/util.f \
123 src/fortran/linpack/wcopy.f \ 123 src/fortran/linpack/wcopy.f \
124 src/fortran/linpack/dgefa.f \ 124 src/fortran/linpack/dgefa.f \
125 src/fortran/linpack/dgbfa.f \ 125 src/fortran/linpack/dgbfa.f \
@@ -133,8 +133,7 @@ LINPACK_SOURCES = src/fortran/linpack/dgesl.f \
133 src/fortran/linpack/wgeco.f \ 133 src/fortran/linpack/wgeco.f \
134 src/fortran/linpack/wgefa.f \ 134 src/fortran/linpack/wgefa.f \
135 src/fortran/linpack/wgesl.f \ 135 src/fortran/linpack/wgesl.f \
136 src/fortran/linpack/dpofa.f \ 136 src/fortran/linpack/dpofa.f
137 src/fortran/linpack/util.f
138 137
139ELEMENTARIES_FUNCTIONS_FORTRAN_SOURCES = \ 138ELEMENTARIES_FUNCTIONS_FORTRAN_SOURCES = \
140src/fortran/psi.f \ 139src/fortran/psi.f \
@@ -261,7 +260,6 @@ src/fortran/ortran.f \
261src/fortran/bdiag.f \ 260src/fortran/bdiag.f \
262src/fortran/wvmul.f \ 261src/fortran/wvmul.f \
263src/fortran/dmmul.f \ 262src/fortran/dmmul.f \
264src/fortran/wsort.f \
265src/fortran/wsqrt.f \ 263src/fortran/wsqrt.f \
266src/fortran/rat.f \ 264src/fortran/rat.f \
267src/fortran/ribesl.f \ 265src/fortran/ribesl.f \
@@ -318,7 +316,6 @@ sci_gateway/c/sci_imult.c \
318sci_gateway/c/sci_exp.c \ 316sci_gateway/c/sci_exp.c \
319sci_gateway/c/sci_maxi.c \ 317sci_gateway/c/sci_maxi.c \
320sci_gateway/c/sci_gsort.c \ 318sci_gateway/c/sci_gsort.c \
321sci_gateway/c/sci_sort.c \
322sci_gateway/c/sci_isequalbitwise.c 319sci_gateway/c/sci_isequalbitwise.c
323 320
324GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_f_isequal.f \ 321GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_f_isequal.f \
@@ -366,8 +363,7 @@ sci_gateway/fortran/sci_f_round.f \
366sci_gateway/fortran/sci_f_conj.f \ 363sci_gateway/fortran/sci_f_conj.f \
367sci_gateway/fortran/sci_f_int.f \ 364sci_gateway/fortran/sci_f_int.f \
368sci_gateway/fortran/sci_f_imult.f \ 365sci_gateway/fortran/sci_f_imult.f \
369sci_gateway/fortran/sci_f_exp.f \ 366sci_gateway/fortran/sci_f_exp.f
370sci_gateway/fortran/sci_f_sort.f
371 367
372EISPACK_SOURCES = src/fortran/eispack/balbak.f 368EISPACK_SOURCES = src/fortran/eispack/balbak.f
373 369
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index e1a69d8..aed41ca 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -212,6 +212,7 @@ am__objects_1 = libscielementary_functions_la-zwrsk.lo \
212 libscielementary_functions_la-pchim.lo 212 libscielementary_functions_la-pchim.lo
213am__objects_2 = libscielementary_functions_la-dgesl.lo \ 213am__objects_2 = libscielementary_functions_la-dgesl.lo \
214 libscielementary_functions_la-wpade.lo \ 214 libscielementary_functions_la-wpade.lo \
215 libscielementary_functions_la-util.lo \
215 libscielementary_functions_la-wcopy.lo \ 216 libscielementary_functions_la-wcopy.lo \
216 libscielementary_functions_la-dgefa.lo \ 217 libscielementary_functions_la-dgefa.lo \
217 libscielementary_functions_la-dgbfa.lo \ 218 libscielementary_functions_la-dgbfa.lo \
@@ -225,8 +226,7 @@ am__objects_2 = libscielementary_functions_la-dgesl.lo \
225 libscielementary_functions_la-wgeco.lo \ 226 libscielementary_functions_la-wgeco.lo \
226 libscielementary_functions_la-wgefa.lo \ 227 libscielementary_functions_la-wgefa.lo \
227 libscielementary_functions_la-wgesl.lo \ 228 libscielementary_functions_la-wgesl.lo \
228 libscielementary_functions_la-dpofa.lo \ 229 libscielementary_functions_la-dpofa.lo
229 libscielementary_functions_la-util.lo
230am__objects_3 = libscielementary_functions_la-balbak.lo 230am__objects_3 = libscielementary_functions_la-balbak.lo
231am__objects_4 = libscielementary_functions_la-sci_tools.lo \ 231am__objects_4 = libscielementary_functions_la-sci_tools.lo \
232 libscielementary_functions_la-finite.lo \ 232 libscielementary_functions_la-finite.lo \
@@ -373,7 +373,6 @@ am__objects_5 = libscielementary_functions_la-psi.lo \
373 libscielementary_functions_la-bdiag.lo \ 373 libscielementary_functions_la-bdiag.lo \
374 libscielementary_functions_la-wvmul.lo \ 374 libscielementary_functions_la-wvmul.lo \
375 libscielementary_functions_la-dmmul.lo \ 375 libscielementary_functions_la-dmmul.lo \
376 libscielementary_functions_la-wsort.lo \
377 libscielementary_functions_la-wsqrt.lo \ 376 libscielementary_functions_la-wsqrt.lo \
378 libscielementary_functions_la-rat.lo \ 377 libscielementary_functions_la-rat.lo \
379 libscielementary_functions_la-ribesl.lo \ 378 libscielementary_functions_la-ribesl.lo \
@@ -429,7 +428,6 @@ am__objects_6 = libscielementary_functions_la-sci_isequal.lo \
429 libscielementary_functions_la-sci_exp.lo \ 428 libscielementary_functions_la-sci_exp.lo \
430 libscielementary_functions_la-sci_maxi.lo \ 429 libscielementary_functions_la-sci_maxi.lo \
431 libscielementary_functions_la-sci_gsort.lo \ 430 libscielementary_functions_la-sci_gsort.lo \
432 libscielementary_functions_la-sci_sort.lo \
433 libscielementary_functions_la-sci_isequalbitwise.lo 431 libscielementary_functions_la-sci_isequalbitwise.lo
434am__objects_7 = libscielementary_functions_la-sci_f_isequal.lo \ 432am__objects_7 = libscielementary_functions_la-sci_f_isequal.lo \
435 libscielementary_functions_la-sci_f_maxi.lo \ 433 libscielementary_functions_la-sci_f_maxi.lo \
@@ -476,8 +474,7 @@ am__objects_7 = libscielementary_functions_la-sci_f_isequal.lo \
476 libscielementary_functions_la-sci_f_conj.lo \ 474 libscielementary_functions_la-sci_f_conj.lo \
477 libscielementary_functions_la-sci_f_int.lo \ 475 libscielementary_functions_la-sci_f_int.lo \
478 libscielementary_functions_la-sci_f_imult.lo \ 476 libscielementary_functions_la-sci_f_imult.lo \
479 libscielementary_functions_la-sci_f_exp.lo \ 477 libscielementary_functions_la-sci_f_exp.lo
480 libscielementary_functions_la-sci_f_sort.lo
481am__objects_8 = 478am__objects_8 =
482am_libscielementary_functions_la_OBJECTS = $(am__objects_1) \ 479am_libscielementary_functions_la_OBJECTS = $(am__objects_1) \
483 $(am__objects_2) $(am__objects_3) $(am__objects_4) \ 480 $(am__objects_2) $(am__objects_3) $(am__objects_4) \
@@ -612,6 +609,7 @@ LD = @LD@
612LDFLAGS = @LDFLAGS@ 609LDFLAGS = @LDFLAGS@
613LIBICONV = @LIBICONV@ 610LIBICONV = @LIBICONV@
614LIBINTL = @LIBINTL@ 611LIBINTL = @LIBINTL@
612LIBM = @LIBM@
615LIBOBJS = @LIBOBJS@ 613LIBOBJS = @LIBOBJS@
616LIBS = @LIBS@ 614LIBS = @LIBS@
617LIBTOOL = @LIBTOOL@ 615LIBTOOL = @LIBTOOL@
@@ -874,7 +872,7 @@ src/fortran/slatec/pchim.f
874 872
875LINPACK_SOURCES = src/fortran/linpack/dgesl.f \ 873LINPACK_SOURCES = src/fortran/linpack/dgesl.f \
876 src/fortran/linpack/wpade.f \ 874 src/fortran/linpack/wpade.f \
877 src/fortran/linpack/util.f \ 875 src/fortran/linpack/util.f \
878 src/fortran/linpack/wcopy.f \ 876 src/fortran/linpack/wcopy.f \
879 src/fortran/linpack/dgefa.f \ 877 src/fortran/linpack/dgefa.f \
880 src/fortran/linpack/dgbfa.f \ 878 src/fortran/linpack/dgbfa.f \
@@ -888,8 +886,7 @@ LINPACK_SOURCES = src/fortran/linpack/dgesl.f \
888 src/fortran/linpack/wgeco.f \ 886 src/fortran/linpack/wgeco.f \
889 src/fortran/linpack/wgefa.f \ 887 src/fortran/linpack/wgefa.f \
890 src/fortran/linpack/wgesl.f \ 888 src/fortran/linpack/wgesl.f \
891 src/fortran/linpack/dpofa.f \ 889 src/fortran/linpack/dpofa.f
892 src/fortran/linpack/util.f
893 890
894ELEMENTARIES_FUNCTIONS_FORTRAN_SOURCES = \ 891ELEMENTARIES_FUNCTIONS_FORTRAN_SOURCES = \
895src/fortran/psi.f \ 892src/fortran/psi.f \
@@ -1016,7 +1013,6 @@ src/fortran/ortran.f \
1016src/fortran/bdiag.f \ 1013src/fortran/bdiag.f \
1017src/fortran/wvmul.f \ 1014src/fortran/wvmul.f \
1018src/fortran/dmmul.f \ 1015src/fortran/dmmul.f \
1019src/fortran/wsort.f \
1020src/fortran/wsqrt.f \ 1016src/fortran/wsqrt.f \
1021src/fortran/rat.f \ 1017src/fortran/rat.f \
1022src/fortran/ribesl.f \ 1018src/fortran/ribesl.f \
@@ -1073,7 +1069,6 @@ sci_gateway/c/sci_imult.c \
1073sci_gateway/c/sci_exp.c \ 1069sci_gateway/c/sci_exp.c \
1074sci_gateway/c/sci_maxi.c \ 1070sci_gateway/c/sci_maxi.c \
1075sci_gateway/c/sci_gsort.c \ 1071sci_gateway/c/sci_gsort.c \
1076sci_gateway/c/sci_sort.c \
1077sci_gateway/c/sci_isequalbitwise.c 1072sci_gateway/c/sci_isequalbitwise.c
1078 1073
1079GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_f_isequal.f \ 1074GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_f_isequal.f \
@@ -1121,8 +1116,7 @@ sci_gateway/fortran/sci_f_round.f \
1121sci_gateway/fortran/sci_f_conj.f \ 1116sci_gateway/fortran/sci_f_conj.f \
1122sci_gateway/fortran/sci_f_int.f \ 1117sci_gateway/fortran/sci_f_int.f \
1123sci_gateway/fortran/sci_f_imult.f \ 1118sci_gateway/fortran/sci_f_imult.f \
1124sci_gateway/fortran/sci_f_exp.f \ 1119sci_gateway/fortran/sci_f_exp.f
1125sci_gateway/fortran/sci_f_sort.f
1126 1120
1127EISPACK_SOURCES = src/fortran/eispack/balbak.f 1121EISPACK_SOURCES = src/fortran/eispack/balbak.f
1128 1122
@@ -1386,7 +1380,6 @@ distclean-compile:
1386@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sign.Plo@am__quote@ 1380@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sign.Plo@am__quote@
1387@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sin.Plo@am__quote@ 1381@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sin.Plo@am__quote@
1388@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_size.Plo@am__quote@ 1382@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_size.Plo@am__quote@
1389@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sort.Plo@am__quote@
1390@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_spones.Plo@am__quote@ 1383@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_spones.Plo@am__quote@
1391@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sqrt.Plo@am__quote@ 1384@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sqrt.Plo@am__quote@
1392@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sum.Plo@am__quote@ 1385@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sum.Plo@am__quote@
@@ -1907,13 +1900,6 @@ libscielementary_functions_la-sci_gsort.lo: sci_gateway/c/sci_gsort.c
1907@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1900@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1908@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(libscielementary_functions_la_CFLAGS) $(CFLAGS) -c -o libscielementary_functions_la-sci_gsort.lo `test -f 'sci_gateway/c/sci_gsort.c' || echo '$(srcdir)/'`sci_gateway/c/sci_gsort.c 1901@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(libscielementary_functions_la_CFLAGS) $(CFLAGS) -c -o libscielementary_functions_la-sci_gsort.lo `test -f 'sci_gateway/c/sci_gsort.c' || echo '$(srcdir)/'`sci_gateway/c/sci_gsort.c
1909 1902
1910libscielementary_functions_la-sci_sort.lo: sci_gateway/c/sci_sort.c
1911@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(libscielementary_functions_la_CFLAGS) $(CFLAGS) -MT libscielementary_functions_la-sci_sort.lo -MD -MP -MF $(DEPDIR)/libscielementary_functions_la-sci_sort.Tpo -c -o libscielementary_functions_la-sci_sort.lo `test -f 'sci_gateway/c/sci_sort.c' || echo '$(srcdir)/'`sci_gateway/c/sci_sort.c
1912@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libscielementary_functions_la-sci_sort.Tpo $(DEPDIR)/libscielementary_functions_la-sci_sort.Plo
1913@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sci_gateway/c/sci_sort.c' object='libscielementary_functions_la-sci_sort.lo' libtool=yes @AMDEPBACKSLASH@
1914@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1915@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(libscielementary_functions_la_CFLAGS) $(CFLAGS) -c -o libscielementary_functions_la-sci_sort.lo `test -f 'sci_gateway/c/sci_sort.c' || echo '$(srcdir)/'`sci_gateway/c/sci_sort.c
1916
1917libscielementary_functions_la-sci_isequalbitwise.lo: sci_gateway/c/sci_isequalbitwise.c 1903libscielementary_functions_la-sci_isequalbitwise.lo: sci_gateway/c/sci_isequalbitwise.c
1918@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(libscielementary_functions_la_CFLAGS) $(CFLAGS) -MT libscielementary_functions_la-sci_isequalbitwise.lo -MD -MP -MF $(DEPDIR)/libscielementary_functions_la-sci_isequalbitwise.Tpo -c -o libscielementary_functions_la-sci_isequalbitwise.lo `test -f 'sci_gateway/c/sci_isequalbitwise.c' || echo '$(srcdir)/'`sci_gateway/c/sci_isequalbitwise.c 1904@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(libscielementary_functions_la_CFLAGS) $(CFLAGS) -MT libscielementary_functions_la-sci_isequalbitwise.lo -MD -MP -MF $(DEPDIR)/libscielementary_functions_la-sci_isequalbitwise.Tpo -c -o libscielementary_functions_la-sci_isequalbitwise.lo `test -f 'sci_gateway/c/sci_isequalbitwise.c' || echo '$(srcdir)/'`sci_gateway/c/sci_isequalbitwise.c
1919@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libscielementary_functions_la-sci_isequalbitwise.Tpo $(DEPDIR)/libscielementary_functions_la-sci_isequalbitwise.Plo 1905@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libscielementary_functions_la-sci_isequalbitwise.Tpo $(DEPDIR)/libscielementary_functions_la-sci_isequalbitwise.Plo
@@ -2200,6 +2186,9 @@ libscielementary_functions_la-dgesl.lo: src/fortran/linpack/dgesl.f
2200libscielementary_functions_la-wpade.lo: src/fortran/linpack/wpade.f 2186libscielementary_functions_la-wpade.lo: src/fortran/linpack/wpade.f
2201 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-wpade.lo `test -f 'src/fortran/linpack/wpade.f' || echo '$(srcdir)/'`src/fortran/linpack/wpade.f 2187 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-wpade.lo `test -f 'src/fortran/linpack/wpade.f' || echo '$(srcdir)/'`src/fortran/linpack/wpade.f
2202 2188
2189libscielementary_functions_la-util.lo: src/fortran/linpack/util.f
2190 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-util.lo `test -f 'src/fortran/linpack/util.f' || echo '$(srcdir)/'`src/fortran/linpack/util.f
2191
2203libscielementary_functions_la-wcopy.lo: src/fortran/linpack/wcopy.f 2192libscielementary_functions_la-wcopy.lo: src/fortran/linpack/wcopy.f
2204 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-wcopy.lo `test -f 'src/fortran/linpack/wcopy.f' || echo '$(srcdir)/'`src/fortran/linpack/wcopy.f 2193 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-wcopy.lo `test -f 'src/fortran/linpack/wcopy.f' || echo '$(srcdir)/'`src/fortran/linpack/wcopy.f
2205 2194
@@ -2242,9 +2231,6 @@ libscielementary_functions_la-wgesl.lo: src/fortran/linpack/wgesl.f
2242libscielementary_functions_la-dpofa.lo: src/fortran/linpack/dpofa.f 2231libscielementary_functions_la-dpofa.lo: src/fortran/linpack/dpofa.f
2243 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-dpofa.lo `test -f 'src/fortran/linpack/dpofa.f' || echo '$(srcdir)/'`src/fortran/linpack/dpofa.f 2232 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-dpofa.lo `test -f 'src/fortran/linpack/dpofa.f' || echo '$(srcdir)/'`src/fortran/linpack/dpofa.f
2244 2233
2245libscielementary_functions_la-util.lo: src/fortran/linpack/util.f
2246 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-util.lo `test -f 'src/fortran/linpack/util.f' || echo '$(srcdir)/'`src/fortran/linpack/util.f
2247
2248libscielementary_functions_la-balbak.lo: src/fortran/eispack/balbak.f 2234libscielementary_functions_la-balbak.lo: src/fortran/eispack/balbak.f
2249 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-balbak.lo `test -f 'src/fortran/eispack/balbak.f' || echo '$(srcdir)/'`src/fortran/eispack/balbak.f 2235 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-balbak.lo `test -f 'src/fortran/eispack/balbak.f' || echo '$(srcdir)/'`src/fortran/eispack/balbak.f
2250 2236
@@ -2620,9 +2606,6 @@ libscielementary_functions_la-wvmul.lo: src/fortran/wvmul.f
2620libscielementary_functions_la-dmmul.lo: src/fortran/dmmul.f 2606libscielementary_functions_la-dmmul.lo: src/fortran/dmmul.f
2621 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-dmmul.lo `test -f 'src/fortran/dmmul.f' || echo '$(srcdir)/'`src/fortran/dmmul.f 2607 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-dmmul.lo `test -f 'src/fortran/dmmul.f' || echo '$(srcdir)/'`src/fortran/dmmul.f
2622 2608
2623libscielementary_functions_la-wsort.lo: src/fortran/wsort.f
2624 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-wsort.lo `test -f 'src/fortran/wsort.f' || echo '$(srcdir)/'`src/fortran/wsort.f
2625
2626libscielementary_functions_la-wsqrt.lo: src/fortran/wsqrt.f 2609libscielementary_functions_la-wsqrt.lo: src/fortran/wsqrt.f
2627 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-wsqrt.lo `test -f 'src/fortran/wsqrt.f' || echo '$(srcdir)/'`src/fortran/wsqrt.f 2610 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-wsqrt.lo `test -f 'src/fortran/wsqrt.f' || echo '$(srcdir)/'`src/fortran/wsqrt.f
2628 2611
@@ -2782,9 +2765,6 @@ libscielementary_functions_la-sci_f_imult.lo: sci_gateway/fortran/sci_f_imult.f
2782libscielementary_functions_la-sci_f_exp.lo: sci_gateway/fortran/sci_f_exp.f 2765libscielementary_functions_la-sci_f_exp.lo: sci_gateway/fortran/sci_f_exp.f
2783 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-sci_f_exp.lo `test -f 'sci_gateway/fortran/sci_f_exp.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_f_exp.f 2766 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-sci_f_exp.lo `test -f 'sci_gateway/fortran/sci_f_exp.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_f_exp.f
2784 2767
2785libscielementary_functions_la-sci_f_sort.lo: sci_gateway/fortran/sci_f_sort.f
2786 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-sci_f_sort.lo `test -f 'sci_gateway/fortran/sci_f_sort.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_f_sort.f
2787
2788mostlyclean-libtool: 2768mostlyclean-libtool:
2789 -rm -f *.lo 2769 -rm -f *.lo
2790 2770
diff --git a/scilab/modules/elementary_functions/help/en_US/sort.xml b/scilab/modules/elementary_functions/help/en_US/sort.xml
deleted file mode 100644
index 25379a7..0000000
--- a/scilab/modules/elementary_functions/help/en_US/sort.xml
+++ /dev/null
@@ -1,141 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2008 - INRIA
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="sort" xml:lang="en"
14 xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20 <info>
21 <pubdate>$LastChangedDate: 2008-04-10 16:45:48 +0200 (jeu., 10 avr. 2008)
22 $</pubdate>
23 </info>
24
25 <refnamediv>
26 <refname>sort</refname>
27
28 <refpurpose>stable sorting by "quick sort" algorithm (DEPRECATED see gsort)</refpurpose>
29 </refnamediv>
30
31 <refsynopsisdiv>
32 <title>Calling Sequence</title>
33
34 <synopsis>
35 [s, [k]]=sort(v)
36 [s, [k]]=sort(v,'r')
37 [s, [k]]=sort(v,'c')</synopsis>
38 </refsynopsisdiv>
39
40 <refsection>
41 <title>Parameters</title>
42
43 <variablelist>
44 <varlistentry>
45 <term>v</term>
46
47 <listitem>
48 <para>real or complex vector/matrix; sparse vector; character string
49 vector/matrix</para>
50 </listitem>
51 </varlistentry>
52
53 <varlistentry>
54 <term>s</term>
55
56 <listitem>
57 <para>real or complex vector or matrix; sparse vector; character
58 string vector/matrix</para>
59 </listitem>
60 </varlistentry>
61
62 <varlistentry>
63 <term>k</term>
64
65 <listitem>
66 <para>vector or matrix of integers</para>
67 </listitem>
68 </varlistentry>
69 </variablelist>
70 </refsection>
71
72 <refsection>
73 <title>Description</title>
74
75 <para>the <literal>sort</literal> implements a "bubble sort algorithm".
76 </para>
77
78 <para> sort will be removed in Scilab 5.3. see gsort </para>
79
80 <para><literal>s=sort(v)</literal> sorts <literal>v</literal> in
81 decreasing order. If <literal>v</literal> is a matrix, sorting is done
82 columnwise, <literal>v</literal> being seen as the stacked vector
83 <literal>v(:)</literal>. If <literal>v</literal> is a string, sort is
84 increasing order. <literal>[s,k]=sort(v)</literal> gives in addition the
85 indices of entries of <literal>s</literal> in <literal>v</literal>, i.e.
86 <literal>v(k(:)) </literal> is the vector <literal>s</literal>.</para>
87
88 <para><literal>s=sort(v,'r')</literal> sorts the rows of
89 <literal>v</literal> in decreasing order i.e. each column of
90 <literal>s</literal> is obtained from each column of <literal>v</literal>
91 by reordering it in decreasing order. <literal>[s,k]=sort(v,'r')</literal>
92 returns in addition in each column of <literal>k</literal> the indices
93 such that <literal>v(k(:,i),i)=s(:,i)</literal> for each column index
94 <literal>i</literal>.</para>
95
96 <para><literal>s=sort(v,'c')</literal> sorts the columns of
97 <literal>v</literal> in decreasing order i.e. each row of
98 <literal>s</literal> is obtained from each row of <literal>v</literal> by
99 reordering it in decreasing order. <literal>[s,k]=sort(v,'c')</literal>
100 returns in addition in each row of <literal>k</literal> the indices such
101 that <literal>v(i,k(i,:))=s(i,:)</literal> for each row index
102 <literal>i</literal>.</para>
103
104 <para>Complex matrix or vectors are sorted by their magnitude. Column/row
105 sorting is not implemented for complex matrices.</para>
106
107 <para><literal>y=sort(A)</literal> is valid when <literal>A</literal> is a
108 sparse vector. Column/row sorting is not implemented for sparse
109 matrix.</para>
110
111 <para><emphasis role="bold">Remark</emphasis> : <literal>sort </literal>is
112 now obsolete it may be replaced by<emphasis role="bold"> <link
113 linkend="gsort">gsort</link> .</emphasis></para>
114 </refsection>
115
116 <refsection>
117 <title>Examples</title>
118
119 <programlisting role="example"><![CDATA[
120[s,p]=sort(rand(1,10));
121//p is a random permutation of 1:10
122A=[1,2,5;3,4,2];
123[Asorted,q]=sort(A);A(q(:))-Asorted(:)
124v=1:10;
125sort(v)
126sort(v')
127sort(v,'r') //Does nothing for row vectors
128sort(v,'c')
129 ]]></programlisting>
130 </refsection>
131
132 <refsection>
133 <title>See Also</title>
134
135 <simplelist type="inline">
136 <member><link linkend="find">find</link></member>
137
138 <member><link linkend="gsort">gsort</link></member>
139 </simplelist>
140 </refsection>
141</refentry>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/sort.xml b/scilab/modules/elementary_functions/help/fr_FR/sort.xml
deleted file mode 100644
index 501aee6..0000000
--- a/scilab/modules/elementary_functions/help/fr_FR/sort.xml
+++ /dev/null
@@ -1,128 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<refentry version="5.0-subset Scilab" xml:id="sort" xml:lang="fr"
3 xmlns="http://docbook.org/ns/docbook"
4 xmlns:xlink="http://www.w3.org/1999/xlink"
5 xmlns:svg="http://www.w3.org/2000/svg"
6 xmlns:ns5="http://www.w3.org/1999/xhtml"
7 xmlns:mml="http://www.w3.org/1998/Math/MathML"
8 xmlns:db="http://docbook.org/ns/docbook">
9 <info>
10 <pubdate>$LastChangedDate: 2008-04-10 16:44:37 +0200 (jeu., 10 avr. 2008)
11 $</pubdate>
12 </info>
13
14 <refnamediv>
15 <refname>sort</refname>
16
17 <refpurpose>tri stable par l'agorithme "quick sort" (Déprécié voir gsort)</refpurpose>
18 </refnamediv>
19
20 <refsynopsisdiv>
21 <title>Séquence d'appel</title>
22
23 <synopsis>[s, [k]]=sort(v)
24[s, [k]]=sort(v,'r')
25[s, [k]]=sort(v,'c')</synopsis>
26 </refsynopsisdiv>
27
28 <refsection>
29 <title>Paramètres</title>
30
31 <variablelist>
32 <varlistentry>
33 <term>v,s</term>
34
35 <listitem>
36 <para>vecteur (plein ou creux) ou matrice de nombres réels ou de
37 chaînes de caractères.</para>
38 </listitem>
39 </varlistentry>
40
41 <varlistentry>
42 <term>k</term>
43
44 <listitem>
45 <para>vecteur ou matrice de nombres entiers.</para>
46 </listitem>
47 </varlistentry>
48 </variablelist>
49 </refsection>
50
51 <refsection>
52 <title>Description</title>
53
54 <para> sort sera replacé par gsort dans Scilab 5.3. </para>
55
56 <para>la fonction <literal>sort</literal> est désormais obsolete elle peut
57 être remplacée par la fonction <link linkend="gsort">gsort</link>.</para>
58
59 <para><literal>s=sort(v)</literal> trie <literal>v</literal> par ordre
60 décroissant. Si <literal>v</literal> est une matrice, cette instruction
61 produit un tri de la matrice <literal>v</literal> vue comme un vecteur
62 <literal>v(:)</literal> (les colonnes sont empilées).
63 <literal>[s,k]=sort(v)</literal> donne de plus les indices des termes de
64 <literal>s</literal> dans <literal>v</literal>, c'est à dire que
65 <literal>v(k(:)) </literal> est le vecteur <literal>s</literal>.</para>
66
67 <para><literal>s=sort(v,'r')</literal> effectue le tri par ordre
68 décroissant de <literal>v</literal> suivant l'indice de ligne : chaque
69 colonne de <literal>s</literal> est obtenue à partir de la colonne de
70 <literal>v</literal> correspondante triée par ordre décroissant.
71 <literal>[s,k]=sort(v,'r')</literal> renvoie de plus dans chaque colonne
72 de <literal>k</literal> les indices tels que
73 <literal>v(k(:,i),i)=s(:,i)</literal> pour chaque indice de colonne
74 <literal>i</literal>.</para>
75
76 <para><literal>s=sort(v,'c')</literal> effectue le tri par ordre
77 décroissant de <literal>v</literal> suivant l'indice de colonne : chaque
78 ligne de <literal>s</literal> est obtenue à partir de la ligne de
79 <literal>v</literal> correspondante triée par ordre décroissant.</para>
80
81 <para><literal>[s,k]=sort(v,'c')</literal> renvoie de plus dans chaque
82 ligne de <literal>k</literal> les indices tels que
83 <literal>v(i,k(i,:))=s(i,:)</literal> pour chaque indice de ligne
84 <literal>i</literal>.</para>
85
86 <para>Les matrices ou vecteurs complexes sont triés par rapport au module
87 complexe. le tri suivant les lignes ou les colonnes n'est pas implémenté
88 pour les matrices complexes.</para>
89
90 <para>Limitation : Si la matrice contient des %nan , la matrice ne sera
91 pas triée. Dans ce cas , utilisez <link
92 linkend="gsort">gsort</link>.</para>
93
94 <para><literal>y=sort(A)</literal> est valide quand <literal>A</literal>
95 est un vecteur creux. le tri suivant les lignes ou les colonnes n'est pas
96 implémenté pour les matrices creuses.</para>
97
98 <para><emphasis role="bold">Remarque: </emphasis>Cette fonction est
99 obsolete et peut être remplacée par <link
100 linkend="gsort">gsort</link>.</para>
101 </refsection>
102
103 <refsection>
104 <title>Exemples</title>
105
106 <programlisting role="example"><![CDATA[
107[s,p]=sort(rand(1,10));
108// p est une permutation aléatoire de 1:10
109A=[1,2,5;3,4,2];
110[A_trie,q]=sort(A);A(q(:))-A_trie(:)
111v=1:10;
112sort(v)
113sort(v')
114sort(v,'r') // ne fait rien pour les vecteurs lignes
115sort(v,'c')
116 ]]></programlisting>
117 </refsection>
118
119 <refsection>
120 <title>Voir Aussi</title>
121
122 <simplelist type="inline">
123 <member><link linkend="find">find</link></member>
124
125 <member><link linkend="gsort">gsort</link></member>
126 </simplelist>
127 </refsection>
128</refentry>
diff --git a/scilab/modules/elementary_functions/help/pt_BR/binomial.xml b/scilab/modules/elementary_functions/help/pt_BR/binomial.xml
index 7789b80..bc8f8d0 100644
--- a/scilab/modules/elementary_functions/help/pt_BR/binomial.xml
+++ b/scilab/modules/elementary_functions/help/pt_BR/binomial.xml
@@ -86,13 +86,13 @@
86 86
87 <programlisting role="example"><![CDATA[ 87 <programlisting role="example"><![CDATA[
88// primeiro exemplo 88// primeiro exemplo
89n=10;p=0.3; xbasc(); plot2d3(0:n,binomial(p,n)); 89n=10;p=0.3; clf(); plot2d3(0:n,binomial(p,n));
90 90
91// segundo exemplo 91// segundo exemplo
92n=50;p=0.4; 92n=50;p=0.4;
93mea=n*p; sigma=sqrt(n*p*(1-p)); 93mea=n*p; sigma=sqrt(n*p*(1-p));
94x=( (0:n)-mea )/sigma; 94x=( (0:n)-mea )/sigma;
95xbasc() 95clf()
96plot2d(x, sigma*binomial(p,n)); 96plot2d(x, sigma*binomial(p,n));
97deff('y=Gauss(x)','y=1/sqrt(2*%pi)*exp(-(x.^2)/2)') 97deff('y=Gauss(x)','y=1/sqrt(2*%pi)*exp(-(x.^2)/2)')
98plot2d(x, Gauss(x), style=2); 98plot2d(x, Gauss(x), style=2);
diff --git a/scilab/modules/elementary_functions/help/pt_BR/dsearch.xml b/scilab/modules/elementary_functions/help/pt_BR/dsearch.xml
index dc4000d..354cf24 100644
--- a/scilab/modules/elementary_functions/help/pt_BR/dsearch.xml
+++ b/scilab/modules/elementary_functions/help/pt_BR/dsearch.xml
@@ -169,14 +169,14 @@ m = 50000 ; n = 10;
169X = grand(m,1,"def"); 169X = grand(m,1,"def");
170val = linspace(0,1,n+1)'; 170val = linspace(0,1,n+1)';
171[ind, occ] = dsearch(X, val); 171[ind, occ] = dsearch(X, val);
172xbasc() ; plot2d2(val, [occ/m;0]) // sem normalizao: y deve ser prximo de 1/n 172clf() ; plot2d2(val, [occ/m;0]) // sem normalizao: y deve ser prximo de 1/n
173 173
174// exemplo #2 (estatstica elementar para B(N,p)) 174// exemplo #2 (estatstica elementar para B(N,p))
175N = 8 ; p = 0.5; m = 50000; 175N = 8 ; p = 0.5; m = 50000;
176X = grand(m,1,"bin",N,p); val = (0:N)'; 176X = grand(m,1,"bin",N,p); val = (0:N)';
177[ind, occ] = dsearch(X, val, "d"); 177[ind, occ] = dsearch(X, val, "d");
178Pexp = occ/m; Pexa = binomial(p,N); 178Pexp = occ/m; Pexa = binomial(p,N);
179xbasc() ; hm = 1.1*max(max(Pexa),max(Pexp)); 179clf() ; hm = 1.1*max(max(Pexa),max(Pexp));
180plot2d3([val val+0.1], [Pexa' Pexp],[1 2],"111", ... 180plot2d3([val val+0.1], [Pexa' Pexp],[1 2],"111", ...
181 "Pexact@Pexp", [-1 0 N+1 hm],[0 N+2 0 6]) 181 "Pexact@Pexp", [-1 0 N+1 hm],[0 N+2 0 6])
182xtitle( "Distribuio binomial B("+string(N)+","+string(p)+") :" ... 182xtitle( "Distribuio binomial B("+string(N)+","+string(p)+") :" ...
@@ -197,7 +197,7 @@ deff("y=Kl(t,k,x)","y=(t-x(k)).*Ll(t,k,x).^2")
197deff("y=Kr(t,k,x)","y=(t-x(k+1)).*Lr(t,k,x).^2") 197deff("y=Kr(t,k,x)","y=(t-x(k+1)).*Lr(t,k,x).^2")
198// plotando a curva 198// plotando a curva
199Y = y(ind).*Hl(X,ind) + y(ind+1).*Hr(X,ind) + d(ind).*Kl(X,ind) + d(ind+1).*Kr(X,ind); 199Y = y(ind).*Hl(X,ind) + y(ind+1).*Hr(X,ind) + d(ind).*Kl(X,ind) + d(ind+1).*Kr(X,ind);
200xbasc(); plot2d(X,Y,2) ; plot2d(x,y,-9,"000") 200clf(); plot2d(X,Y,2) ; plot2d(x,y,-9,"000")
201xtitle("Um polinmio seccionado de hermite") 201xtitle("Um polinmio seccionado de hermite")
202// NOTE : a verificao pode ser feita adicionando-se : 202// NOTE : a verificao pode ser feita adicionando-se :
203// YY = interp(X,x,y,d); plot2d(X,YY,3,"000") 203// YY = interp(X,x,y,d); plot2d(X,YY,3,"000")
diff --git a/scilab/modules/elementary_functions/help/pt_BR/ndgrid.xml b/scilab/modules/elementary_functions/help/pt_BR/ndgrid.xml
index 5fdf370..09d6cc0 100644
--- a/scilab/modules/elementary_functions/help/pt_BR/ndgrid.xml
+++ b/scilab/modules/elementary_functions/help/pt_BR/ndgrid.xml
@@ -106,7 +106,7 @@ y = linspace(-1,1,ny);
106//deff("z=f(x,y)","z=128*x.^2 .*(1-x).^2 .*y.^2 .*(1-y).^2"); 106//deff("z=f(x,y)","z=128*x.^2 .*(1-x).^2 .*y.^2 .*(1-y).^2");
107deff("z=f(x,y)","z=x.^2 + y.^3") 107deff("z=f(x,y)","z=x.^2 + y.^3")
108Z = f(X,Y); 108Z = f(X,Y);
109xbasc() 109clf()
110plot3d(x,y,Z, flag=[2 6 4]); xselect() 110plot3d(x,y,Z, flag=[2 6 4]); xselect()
111 111
112// criando um grid 3d simples 112// criando um grid 3d simples
@@ -127,7 +127,7 @@ for j=1:ny
127 matrix(Z(:,j,:),[nx,nz])); 127 matrix(Z(:,j,:),[nx,nz]));
128 XF = [XF xf]; YF = [YF yf]; ZF = [ZF zf]; 128 XF = [XF xf]; YF = [YF yf]; ZF = [ZF zf];
129end 129end
130xbasc() 130clf()
131plot3d(XF,YF,ZF, flag=[0 6 3], leg="X@Y@Z") 131plot3d(XF,YF,ZF, flag=[0 6 3], leg="X@Y@Z")
132xtitle("A 3d grid !"); xselect() 132xtitle("A 3d grid !"); xselect()
133 ]]></programlisting> 133 ]]></programlisting>
diff --git a/scilab/modules/elementary_functions/help/pt_BR/sort.xml b/scilab/modules/elementary_functions/help/pt_BR/sort.xml
deleted file mode 100644
index 2b48594..0000000
--- a/scilab/modules/elementary_functions/help/pt_BR/sort.xml
+++ /dev/null
@@ -1,143 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2008 - INRIA
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="sort" xml:lang="en"
14 xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20 <info>
21 <pubdate>$LastChangedDate: 2008-04-10 16:45:48 +0200 (jeu., 10 avr. 2008)
22 $</pubdate>
23 </info>
24
25 <refnamediv>
26 <refname>sort</refname>
27
28 <refpurpose>ordenamento decrescente (DEPRECATED see gsort)</refpurpose>
29 </refnamediv>
30
31 <refsynopsisdiv>
32 <title>Seqüência de Chamamento</title>
33
34 <synopsis>
35 [s, [k]]=sort(v)
36 [s, [k]]=sort(v,'r')
37 [s, [k]]=sort(v,'c')
38</synopsis>
39 </refsynopsisdiv>
40
41 <refsection>
42 <title>Parâmetros</title>
43
44 <variablelist>
45 <varlistentry>
46 <term>v</term>
47
48 <listitem>
49 <para>vetor esparso; vetor ou matriz de reais, complexos ou
50 "strings" </para>
51 </listitem>
52 </varlistentry>
53
54 <varlistentry>
55 <term>s</term>
56
57 <listitem>
58 <para>vetor esparso; vetor ou matriz de reais, complexos ou
59 "strings" </para>
60 </listitem>
61 </varlistentry>
62
63 <varlistentry>
64 <term>k</term>
65
66 <listitem>
67 <para>vetor ou matriz de inteiros</para>
68 </listitem>
69 </varlistentry>
70 </variablelist>
71 </refsection>
72
73 <refsection>
74 <title>Descrição</title>
75
76 <para> sort will be removed in Scilab 5.3. see gsort </para>
77
78 <para>A função <literal>sort</literal> está obsoleta. Ela pode ser
79 substituída por <link linkend="gsort">gsort</link>.</para>
80
81 <para><literal>s=sort(v)</literal> põe <literal>v</literal> em ordem
82 decrescente. Se <literal>v</literal> é uma matriz, a ordenação é feita
83 coluna a coluna, <literal>v</literal> sendo visto como o vetor empilhado
84 <literal>v(:)</literal>. Se <literal>v</literal> é um string, a ordenação
85 é crescente. <literal>[s,k]=sort(v)</literal> retorna ainda os índices de
86 entradas de <literal>s</literal> em <literal>v</literal>, i.e.
87 <literal>v(k(:)) </literal> é o vetor <literal>s</literal>.</para>
88
89 <para><literal>s=sort(v,'r')</literal> põe as linhas de
90 <literal>v</literal> em ordem decrescente i.e. cada coluna de
91 <literal>s</literal> é obtida de cada coluna de <literal>v</literal> por
92 reordenação decrescente. <literal>[s,k]=sort(v,'r')</literal> retorna
93 ainda em cada coluna de <literal>k</literal> os índices tais que
94 <literal>v(k(:,i),i)=s(:,i)</literal> para cada índice de coluna
95 <literal>i</literal>.</para>
96
97 <para><literal>s=sort(v,'c')</literal> põe as colunas de
98 <literal>v</literal> em ordem decrescente i.e. cada linha de
99 <literal>s</literal> é obtida de cada linha de <literal>v</literal> por
100 reordenação decrescente. <literal>[s,k]=sort(v,'c')</literal> retorna
101 ainda em cada linha de <literal>k</literal> os índices tais que
102 <literal>v(i,k(i,:))=s(i,:)</literal> para cada índice de linha
103 <literal>i</literal>.</para>
104
105 <para>Matrizes ou vetores de complexos são ordenados de acordo com suas
106 magnitudes. Ordenação por colunas/linhas não é implementada para matrizes
107 complexas.</para>
108
109 <para><literal>y=sort(A)</literal> é válido quando <literal>A</literal> é
110 um vetor esparso. Ordenação de linhas/colunas não é implementado para
111 matrizes esparsas.</para>
112
113 <para>Limitação : se <literal>v</literal> inclui elementos %nan, a matriz
114 não será ordenada. Por favor, use <link linkend="gsort">gsort</link> neste
115 caso.</para>
116 </refsection>
117
118 <refsection>
119 <title>Exemplos</title>
120
121 <programlisting role="example"><![CDATA[
122[s,p]=sort(rand(1,10));
123//p é uma permutação aleatória de 1:10
124A=[1,2,5;3,4,2];
125[Asorted,q]=sort(A);A(q(:))-Asorted(:)
126v=1:10;
127sort(v)
128sort(v')
129sort(v,'r') //Não faz nada para vetores-linha
130sort(v,'c')
131 ]]></programlisting>
132 </refsection>
133
134 <refsection>
135 <title>Ver Também</title>
136
137 <simplelist type="inline">
138 <member><link linkend="find">find</link></member>
139
140 <member><link linkend="gsort">gsort</link></member>
141 </simplelist>
142 </refsection>
143</refentry>
diff --git a/scilab/modules/elementary_functions/includes/elementary_functions.h b/scilab/modules/elementary_functions/includes/elementary_functions.h
index 59fff0c..4e7f9da 100644
--- a/scilab/modules/elementary_functions/includes/elementary_functions.h
+++ b/scilab/modules/elementary_functions/includes/elementary_functions.h
@@ -19,7 +19,6 @@ typedef int(*I_fp)();
19 19
20int C2F(vfinite)(int *n, double *v); 20int C2F(vfinite)(int *n, double *v);
21 21
22extern int C2F(wsort)(double *countr, double *counti, int *n, int *index, I_fp test);
23 22
24extern int C2F(rcsort)(I_fp test, int *isz, int *iptr, int *iv, int *n, int *index); 23extern int C2F(rcsort)(I_fp test, int *isz, int *iptr, int *iv, int *n, int *index);
25 24
diff --git a/scilab/modules/elementary_functions/includes/gw_elementary_functions.h b/scilab/modules/elementary_functions/includes/gw_elementary_functions.h
index 9e796e3..0580e95 100644
--- a/scilab/modules/elementary_functions/includes/gw_elementary_functions.h
+++ b/scilab/modules/elementary_functions/includes/gw_elementary_functions.h
@@ -66,7 +66,6 @@ int C2F(sci_isequal)(char *fname,unsigned long fname_len);
66int C2F(sci_spones)(char *fname,unsigned long fname_len); 66int C2F(sci_spones)(char *fname,unsigned long fname_len);
67int C2F(sci_gsort)(char *fname, unsigned long fname_len); 67int C2F(sci_gsort)(char *fname, unsigned long fname_len);
68int C2F(sci_isequalbitwise)(char *fname, unsigned long fname_len); 68int C2F(sci_isequalbitwise)(char *fname, unsigned long fname_len);
69int C2F(sci_sort)(char *fname, unsigned long fname_len);
70#endif /* __GW_ELEMENTARIES_FUNCTIONS__ */ 69#endif /* __GW_ELEMENTARIES_FUNCTIONS__ */
71/*--------------------------------------------------------------------------*/ 70/*--------------------------------------------------------------------------*/
72 71
diff --git a/scilab/modules/elementary_functions/macros/%_sort.sci b/scilab/modules/elementary_functions/macros/%_sort.sci
deleted file mode 100644
index 0f1e40c..0000000
--- a/scilab/modules/elementary_functions/macros/%_sort.sci
+++ /dev/null
@@ -1,31 +0,0 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) DIGITEO - 2009 - Allan CORNET
3//
4// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which
6// you should have received as part of this distribution. The terms
7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
10function [matrix_sorted, origin_indices] = %_sort(matrix_to_sort, sort_type)
11
12 if ~isdef('matrix_to_sort') then
13 matrix_to_sort = [];
14 return
15 end
16
17 if ~isdef('sort_type') then
18 sort_type = 'g';
19 end
20
21 if ~or(sort_type == ['g' 'r' 'c']) then
22 error(999,msprintf(_("%s: Wrong value for input argument #%d: [''g'' ''r'' ''c''] expected.\n"),'gsort',2));
23 end
24
25 // sort default direction is 'd'
26 sort_direction = 'd';
27
28 [matrix_sorted, origin_indices] = %_gsort(matrix_to_sort, sort_type, sort_direction);
29
30endfunction
31 \ No newline at end of file
diff --git a/scilab/modules/elementary_functions/macros/tand.sci b/scilab/modules/elementary_functions/macros/tand.sci
index 43d0219..2394270 100644
--- a/scilab/modules/elementary_functions/macros/tand.sci
+++ b/scilab/modules/elementary_functions/macros/tand.sci
@@ -1,5 +1,6 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) INRIA, Serge Steer 2// Copyright (C) INRIA, Serge Steer
3// Copyright (C) 2010 - DIGITEO - Michael Baudin
3// 4//
4// This file must be used under the terms of the CeCILL. 5// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which 6// This source file is licensed as described in the file COPYING, which
@@ -8,19 +9,18 @@
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9function y = tand(x) 10function y = tand(x)
10// Tangent of x in degrees. 11// Tangent of x in degrees.
11 if ~isreal(x) then 12// tand(x) = tan(x*%pi/180) in the mathematical sense
13// But floating point numbers behave differently.
14// For example, tand(180) = 0 while tan(pi) = -1.225D-16
15 if ( ~isreal(x) ) then
12 error(msprintf(gettext("%s: Wrong type for input argument #%d: Array of reals expected.\n"),"tand",1)); 16 error(msprintf(gettext("%s: Wrong type for input argument #%d: Array of reals expected.\n"),"tand",1));
13 end 17 end
14 18 // Argument reduction toward [-90,90[
15 n = round(x/90); 19 n = round(x/180)
16 x = x - n*90; 20 x = x - n*180
17 z = (x == 0); 21 y = tan(%pi/180*x)
18 m = pmodulo(n,2); 22 // Set all singular points to nan
19 y = x 23 m = pmodulo(x+90,180)
20 y(m==0) = tan(%pi/180*x(m==0)); 24 y(m==0) = %nan
21 if or(m==1) then
22 y(m==1 & ~z) = -1 ./ tan(%pi/180*x(m==1 & ~z));
23 y(m==1 & z & n>=0) = %inf;
24 y(m==1 & z & n<0) = -%inf;
25 end
26endfunction 25endfunction
26
diff --git a/scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c b/scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
index 32c7b4b..4b07b5e 100644
--- a/scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
+++ b/scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
@@ -65,8 +65,7 @@ static gw_generic_table Tab[] =
65 {C2F(sci_isequal),"isequal"}, 65 {C2F(sci_isequal),"isequal"},
66 {C2F(sci_spones),"spones"}, 66 {C2F(sci_spones),"spones"},
67 {C2F(sci_gsort),"gsort"}, 67 {C2F(sci_gsort),"gsort"},
68 {C2F(sci_isequalbitwise),"isequalbitwise"}, 68 {C2F(sci_isequalbitwise),"isequalbitwise"}
69 {C2F(sci_sort),"sort"}
70}; 69};
71/*--------------------------------------------------------------------------*/ 70/*--------------------------------------------------------------------------*/
72int gw_elementary_functions(void) 71int gw_elementary_functions(void)
diff --git a/scilab/modules/elementary_functions/sci_gateway/c/sci_sort.c b/scilab/modules/elementary_functions/sci_gateway/c/sci_sort.c
deleted file mode 100644
index b3dbce2..0000000
--- a/scilab/modules/elementary_functions/sci_gateway/c/sci_sort.c
+++ /dev/null
@@ -1,68 +0,0 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2008 - DIGITEO - Allan CORNET
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12/*-----------------------------------------------------------------------------------*/
13#include <string.h>
14#include "gw_elementary_functions.h"
15#include "stack-c.h"
16#include "warningmode.h"
17#include "sciprint.h"
18#include "localization.h"
19/*-----------------------------------------------------------------------------------*/
20extern int C2F(intsort) (int *id);
21extern int C2F(intssort) (int *id);
22/*-----------------------------------------------------------------------------------*/
23int C2F(sci_sort) (char *fname,unsigned long fname_len)
24{
25 /* TO DO : rewrite sort and merge with gsort */
26 /* compatibility with scilab 4.x */
27
28 static int id[6];
29
30 CheckRhs(1,2);
31 CheckLhs(1,2);
32
33 if (getWarningMode())
34 {
35 sciprint(_("WARNING: Function %s is obsolete.\n"), fname);
36 sciprint(_("WARNING: Please use %s instead.\n"), "gsort");
37 sciprint(_("WARNING: This function will be permanently removed in Scilab %s.\n"), "5.3");
38 }
39
40 if ( VarType(1) == sci_strings )
41 {
42 C2F(intssort)(id);
43 }
44 else
45 {
46 /* bug 3567 : previous version of scilab didn't sort correctly complex */
47 /* we use same algorithm than gsort with complex case */
48 #define COMPLEX 1
49 int *header = NULL;
50 int Cmplx = 0; /* real */
51 header = (int *) GetData(1);
52 Cmplx = header[3];
53
54 if (Cmplx == COMPLEX)
55 {
56 int lw = 0;
57 C2F(overload)(&lw, "sort", (unsigned long)strlen("sort"));
58 return 0;
59 }
60 else
61 {
62 C2F(intsort)(id);
63 }
64 }
65 return 0;
66}
67/*-----------------------------------------------------------------------------------*/
68
diff --git a/scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml b/scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
index 43d52c5..045b310 100644
--- a/scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
+++ b/scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
@@ -85,5 +85,4 @@
85<PRIMITIVE gatewayId="6" primitiveId="49" primitiveName="spones" /> 85<PRIMITIVE gatewayId="6" primitiveId="49" primitiveName="spones" />
86<PRIMITIVE gatewayId="6" primitiveId="50" primitiveName="gsort" /> 86<PRIMITIVE gatewayId="6" primitiveId="50" primitiveName="gsort" />
87<PRIMITIVE gatewayId="6" primitiveId="51" primitiveName="isequalbitwise" /> 87<PRIMITIVE gatewayId="6" primitiveId="51" primitiveName="isequalbitwise" />
88<PRIMITIVE gatewayId="6" primitiveId="52" primitiveName="sort" />
89</GATEWAY> 88</GATEWAY>
diff --git a/scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_sort.f b/scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_sort.f
deleted file mode 100644
index f3c478c..0000000
--- a/scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_sort.f
+++ /dev/null
@@ -1,310 +0,0 @@
1c Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2c Copyright (C) INRIA
3c
4c This file must be used under the terms of the CeCILL.
5c This source file is licensed as described in the file COPYING, which
6c you should have received as part of this distribution. The terms
7c are also available at
8c http://www.cecill.info/licences/Licence_CeCILL_V2-en.txtc
9
10c =========================================
11 subroutine intsort(id)
12 INCLUDE 'stack.h'
13 integer id(nsiz)
14
15 integer tops,sel
16 integer iadr,sadr
17 integer modtest
18 external modtest
19c
20 iadr(l)=l+l-1
21 sadr(l)=(l/2)+1
22c
23 tops=top
24c
25 il=iadr(lstk(top+1-rhs))
26 if(istk(il).lt.0) il=iadr(istk(il+1))
27 if(istk(il).ne.1) then
28 call funnam(ids(1,pt+1),'sort',il)
29 fun=-1
30 return
31 endif
32
33c select type of sort to perform
34 sel=0
35 if(rhs.eq.2) then
36 call getorient(top,sel)
37 if(err.gt.0) return
38 top=top-1
39 endif
40
41 if(sel.eq.2) then
42c sort(a,'c') <=> sort(a,2) The lazy way...
43 top=tops
44 call funnam(ids(1,pt+1),'sort',il)
45 fun=-1
46 return
47 endif
48
49 il0=iadr(lstk(top))
50 if(istk(il0).lt.0) then
51c array is passed by reference copy it on the top of the stack
52 k=istk(il0+2)
53 err=lstk(top)+lstk(k+1)-lstk(k)-lstk(bot)
54 if(err.gt.0) then
55 call error(17)
56 return
57 endif
58 call unsfdcopy(lstk(k+1)-lstk(k),stk(lstk(k)),1
59 $ ,stk(lstk(top)),1)
60 lstk(top+1)=lstk(top)+lstk(k+1)-lstk(k)
61 endif
62
63 m=istk(il0+1)
64 n=istk(il0+2)
65 it=istk(il0+3)
66 mn=m*n
67c
68 if(mn.eq.0) then
69 if(lhs.eq.1) return
70 top=top+1
71 il=iadr(lstk(top))
72 istk(il)=1
73 istk(il+1)=0
74 istk(il+2)=0
75 istk(il+3)=0
76 lstk(top+1)=sadr(il+4)
77 return
78 endif
79c
80 lw=iadr(lstk(top+1))
81 err=sadr(lw+mn)-lstk(bot)
82 if(err.gt.0) then
83 call error(17)
84 return
85 endif
86c
87 if(sel.eq.0) then
88c sort(a) <=> sort(a,'*')
89 istk(il0)=1
90 istk(il0+1)=m
91 istk(il0+2)=n
92 istk(il0+3)=it
93 l1=sadr(il0+4)
94 if(it.eq.0) then
95 call dsort(stk(l1),mn,istk(lw))
96 else
97 call wsort(stk(l1),stk(l1+mn),mn,istk(lw),modtest)
98 endif
99 lstk(top+1)=l1+mn*(it+1)
100 if(lhs.eq.1) return
101 top=top+1
102 il=lw
103 l1=sadr(il+4)+mn
104 l2=lw+mn
105 err=l1-lstk(bot)
106 if(err.gt.0) then
107 call error(17)
108 return
109 endif
110 lstk(top+1)=l1
111 do 106 i=1,mn