summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
commit10963c0a56109ddafb6f2f4a8dbdc925b00ac69c (patch)
tree9f8eefbac0a88917328855a3cf4c046f4e7ca719 /scilab
parentbc7b15143690a57f6ee6d6ec9401227e77b18db4 (diff)
parentc8b337d77b6d3f040afc6a76b9c607a838ae62dd (diff)
downloadscilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.zip
scilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/CHANGES_5.3.X scilab/configure scilab/configure.ac
Diffstat (limited to 'scilab')
-rw-r--r--scilab/.gitignore2
-rw-r--r--scilab/CHANGES_5.2.X65
-rw-r--r--scilab/CHANGES_5.3.X40
-rw-r--r--scilab/Makefile.in1
-rw-r--r--scilab/Scilab_f2c.sln1
-rwxr-xr-xscilab/configure707
-rw-r--r--scilab/configure.ac22
-rw-r--r--scilab/contrib/Makefile.in1
-rw-r--r--scilab/libs/MALLOC/Makefile.in1
-rw-r--r--scilab/libs/Makefile.in1
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in1
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in1
-rw-r--r--scilab/libs/hashtable/Makefile.in1
-rw-r--r--scilab/libs/libst/Makefile.in1
-rw-r--r--scilab/m4/docbook.m45
-rw-r--r--scilab/m4/java.m49
-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
477 files changed, 6863 insertions, 5909 deletions
diff --git a/scilab/.gitignore b/scilab/.gitignore
index c961303..52a073d 100644
--- a/scilab/.gitignore
+++ b/scilab/.gitignore
@@ -84,6 +84,8 @@ pt_BR_scilab.isl
84ja_JP.isl 84ja_JP.isl
85ja_JP_scilab.isl 85ja_JP_scilab.isl
86it_IT_scilab.isl 86it_IT_scilab.isl
87uk_UA.isl
88uk_UA_scilab.isl
87# 89#
88# VS solution files (windows) 90# VS solution files (windows)
89# 91#
diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index 94b8207..5337af9 100644
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -8,7 +8,9 @@ Text editor:
8 8
9* bug 5649 fixed - The Editor did not undo properly after a find/replace. 9* bug 5649 fixed - The Editor did not undo properly after a find/replace.
10 10
11* bug 5651 fixed - closing find/replace box, remove highlights. 11* bug 5651 fixed - Closing find/replace box was not removing highlights.
12
13* bug 5650 fixed - Replace all was not working in some cases
12 14
13* bug 5707 fixed - cmd-e executed the wrong editor file. 15* bug 5707 fixed - cmd-e executed the wrong editor file.
14 16
@@ -33,6 +35,8 @@ Xcos:
33 35
34* Update to jgraphx version 1.2.0.7 has been performed. 36* Update to jgraphx version 1.2.0.7 has been performed.
35 37
38* Non applicable actions are now disabled and cannot be performed anymore.
39
36* Refactoring: 40* Refactoring:
37 - The port position algorithm has been reworked to take in account default 41 - The port position algorithm has been reworked to take in account default
38 position and calculate placement according to it's default associated 42 position and calculate placement according to it's default associated
@@ -46,9 +50,12 @@ Xcos:
46 - Java package (eg namespace) has been added to reduce the number of classes 50 - Java package (eg namespace) has been added to reduce the number of classes
47 per package and improve readability. 51 per package and improve readability.
48 - org.scilab.modules.graph is independent from Xcos and can be safely used. 52 - org.scilab.modules.graph is independent from Xcos and can be safely used.
53 - the actions are now only instanciated per graph.
49 54
50* bug 4206 fixed - The CreateMask action didn't generate a valid submatrix. 55* bug 4206 fixed - The CreateMask action didn't generate a valid submatrix.
51 56
57* bug 5095 fixed - Menu were not disabled when action were not possible.
58
52* bug 5165 fixed - The CreateMask/RemoveMask/CustomizeMask actions 59* bug 5165 fixed - The CreateMask/RemoveMask/CustomizeMask actions
53 were not available. 60 were not available.
54 61
@@ -107,6 +114,10 @@ Xcos:
107* bug 6540 fixed - We were unable to open a SuperBlock due to jgraphx serializer 114* bug 6540 fixed - We were unable to open a SuperBlock due to jgraphx serializer
108 limitation. 115 limitation.
109 116
117* bug 6551 fixed - SaveAs action was not accessible
118
119* bug 6578 fixed - The CONSTRAINT_f was not a recognized as a valid block.
120
110Atoms: 121Atoms:
111====== 122======
112 123
@@ -134,8 +145,14 @@ Compilation:
134 145
135* Better detection of JOGL 146* Better detection of JOGL
136 147
137* When searching for Java packages files (jar), the oldest version was 148* Better check of the lib math (libm)
138 selected. Now, lastest version are now selected. 149
150* When two versions of the same jar libraries, in some cases, the system
151 could not detect any of them
152
153* bug 5496 fixed - When the option --disable-build-help was enabled, the
154 check/use of jeuclid was disabled. It was causing build
155 issue since jeuclid is now necessary for graphics.
139 156
140* bug 5503 fixed - add /usr/lib/*/ and /usr/lib64/*/ in the search path when 157* bug 5503 fixed - add /usr/lib/*/ and /usr/lib64/*/ in the search path when
141 looking for Java libraries (Fedora 12 for example) 158 looking for Java libraries (Fedora 12 for example)
@@ -145,6 +162,12 @@ Compilation:
145* bug 6453 fixed - ImplicitPointerConversions was triggered by some Debian/ 162* bug 6453 fixed - ImplicitPointerConversions was triggered by some Debian/
146 Ubuntu check tools 163 Ubuntu check tools
147 164
165Scilab CLI:
166===========
167
168* With the option --texmacs, the mode NWNI was used. It has been changed to NW
169 to allow the use of graphic features.
170
148Scilab extensions: 171Scilab extensions:
149================== 172==================
150 173
@@ -152,12 +175,25 @@ Scilab extensions:
152 175
153* API_Scilab: a presentation page of the feature have been added. 176* API_Scilab: a presentation page of the feature have been added.
154 177
178Matlab binary files I/O:
179========================
180
181* Support for logical/boolean type added.
182
183Obsolete functions:
184===================
185
186* 'scilab_demos' obsolete see 'demo_gui'.
187
155Bug fixes: 188Bug fixes:
156========== 189==========
157 190
158* bug 4543 fixed - Waitbar command seemed not to work properly with message 191* bug 4543 fixed - Waitbar command seemed not to work properly with message
159 define by a string. 192 define by a string.
160 193
194* bug 4941 fixed - uigetdir & ugetfile lacked icons on top right when running
195 on Windows 7.
196
161* bug 4979 fixed - Use unzoom on an empty figure resulted to a warning message. 197* bug 4979 fixed - Use unzoom on an empty figure resulted to a warning message.
162 198
163* bug 5035 fixed - Demos --> tcl/tk --> Scroll Information printed on terminal 199* bug 5035 fixed - Demos --> tcl/tk --> Scroll Information printed on terminal
@@ -165,8 +201,6 @@ Bug fixes:
165 201
166* bug 5140 fixed - 'Load into Scilab' did not work as expected. 202* bug 5140 fixed - 'Load into Scilab' did not work as expected.
167 203
168* bug 5362 fixed - help type pointed to "Type" online help
169
170* bug 5413 fixed - help_from_sci was replacing the < > in the examples by 204* bug 5413 fixed - help_from_sci was replacing the < > in the examples by
171 &gt; and &lt; causing issues in the build of documentation. 205 &gt; and &lt; causing issues in the build of documentation.
172 206
@@ -228,8 +262,15 @@ Bug fixes:
228 262
229* bug 6400 fixed - Msecs was not correctly handled in datevec/datenum functions 263* bug 6400 fixed - Msecs was not correctly handled in datevec/datenum functions
230 264
265* bug 6401 fixed - chfact() had trouble factoring 3X3 identity matrix.
266
267* bug 6412 fixed - the function sp2adj was not working.
268
231* bug 6420 fixed - It was not possible to use ax.x_ticks with LaTex commands. 269* bug 6420 fixed - It was not possible to use ax.x_ticks with LaTex commands.
232 270
271* bug 6436 fixed - uigetfile(["*.bin";"*.sce";"*.cos"]); did not let me select
272 either of those file extensions.
273
233* bug 6437 fixed - fileext('plop') crashed Scilab on linux. 274* bug 6437 fixed - fileext('plop') crashed Scilab on linux.
234 275
235* bug 6441 fixed - Callback of uimenus with option "Checked" is now executed 276* bug 6441 fixed - Callback of uimenus with option "Checked" is now executed
@@ -240,6 +281,10 @@ Bug fixes:
240* bug 6461 fixed - Scilab External function executed by scifunction may make 281* bug 6461 fixed - Scilab External function executed by scifunction may make
241 Scilab crash when they produce an error. 282 Scilab crash when they produce an error.
242 283
284* bug 6471 fixed - help about 'file' had some errors.
285
286* bug 6480 fixed - Added some info. about Calling convention used on windows.
287
243* bug 6488 fixed - the API function 'createMatrixOfUnsignedInteger32' creates good Scilab type variable. 288* bug 6488 fixed - the API function 'createMatrixOfUnsignedInteger32' creates good Scilab type variable.
244 289
245* bug 6489 fixed - removed a wrong dependency on 'WININET.dll' (Windows). 290* bug 6489 fixed - removed a wrong dependency on 'WININET.dll' (Windows).
@@ -248,6 +293,12 @@ Bug fixes:
248 293
249* bug 6521 fixed - 'getmd5' crashed with a wrong second input argument. 294* bug 6521 fixed - 'getmd5' crashed with a wrong second input argument.
250 295
296* bug 6547 fixed - 'uigetdir' crashed Scilab when returning some "root" path.
297
298* bug 6558 fixed - Infinite value was not plotted even if it was possible.
299
300* bug 6586 fixed - getmd5() crashed if the file (1st input argument) didn't exist
301
251 302
252 Changes between version 5.2.0-beta1 and 5.2.0 of Scilab 303 Changes between version 5.2.0-beta1 and 5.2.0 of Scilab
253 ========================================================== 304 ==========================================================
@@ -1915,6 +1966,8 @@ Bug fixes:
1915 1966
1916* bug 4773 fixed - Using "axes_reverse" produced a switch between the front and back color of a figure 1967* bug 4773 fixed - Using "axes_reverse" produced a switch between the front and back color of a figure
1917 1968
1969* bug 4785 fixed - tand(0) generated an error
1970
1918* bug 4789 fixed - Number of input arguments was not checked in ilib_functions (dynamic_link module) 1971* bug 4789 fixed - Number of input arguments was not checked in ilib_functions (dynamic_link module)
1919 1972
1920* bug 4792 fixed - Macro name too long 1973* bug 4792 fixed - Macro name too long
@@ -2017,3 +2070,5 @@ Bug fixes:
2017* bug 6468 fixed - wrong check in dnaupd. 2070* bug 6468 fixed - wrong check in dnaupd.
2018 2071
2019* bug 6495 fixed - in lqr, variable Q not defined. 2072* bug 6495 fixed - in lqr, variable Q not defined.
2073
2074* bug 6587 fixed - loadmatfile makes scilab hang on sparse matrix reading.
diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index 3d02e62..de492e1 100644
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -12,7 +12,7 @@ Documentation:
12============== 12==============
13 13
14* It is now possible to use LaTeX inline in the documentation. Thanks to 14* It is now possible to use LaTeX inline in the documentation. Thanks to
15 Calixte Denizet for this feature 15 Calixte Denizet for this feature.
16 16
17Xcos: 17Xcos:
18===== 18=====
@@ -31,6 +31,33 @@ Tests:
31====== 31======
32 32
33* Mechanism of unitary tests for Java code based on testng added and used 33* Mechanism of unitary tests for Java code based on testng added and used
34
35Removed functions (previously declared as obsolete):
36====================================================
37
38* 'textprint', 'pol2tex' replaced by 'prettyprint'.
39
40* 'tk_savefile' replaced by 'uigetfile'.
41
42* 'tk_getdir' replaced by 'uigetdir'.
43
44* 'sci2excel' replaced by 'write_csv'.
45
46* 'excel2sci' replaced by 'read_csv'.
47
48* 'x_message_modeless' replaced by 'messagebox'.
49
50* 'sethomedirectory' replaced by 'SCIHOME'.
51
52* 'getcwd' replaced by 'pwd'.
53
54* 'xbasc' replaced by 'clf'.
55
56* 'getf' replaced by 'exec'.
57
58* 'NumTokens' replaced by 'tokens'.
59
60* 'sort' replaced by 'gsort'.
34 61
35Bug fixes: 62Bug fixes:
36========== 63==========
@@ -40,4 +67,13 @@ Bug fixes:
40* bug 6484 fixed - file did not return filenale of a opened fortran file. 67* bug 6484 fixed - file did not return filenale of a opened fortran file.
41 68
42* bug 6511 fixed - mseek and mtell did not manage files > 2 Gbytes on 64 bits 69* bug 6511 fixed - mseek and mtell did not manage files > 2 Gbytes on 64 bits
43 Windows. \ No newline at end of file 70 Windows.
71
72* bug 6543 fixed - neldermead issues for automatic restarts.
73
74* bug 6549 fixed - genlib function had a behavior which was not consistent with the load function.
75
76* bug 6550 fixed - lib(".") returned a relative path in library variable created.
77
78* bug 6556 fixed - fprintf() returned an error if it's called 2 times (or more) on the same file.
79
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index ce4a533..a3a488a 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -416,6 +416,7 @@ LD = @LD@
416LDFLAGS = @LDFLAGS@ 416LDFLAGS = @LDFLAGS@
417LIBICONV = @LIBICONV@ 417LIBICONV = @LIBICONV@
418LIBINTL = @LIBINTL@ 418LIBINTL = @LIBINTL@
419LIBM = @LIBM@
419LIBOBJS = @LIBOBJS@ 420LIBOBJS = @LIBOBJS@
420LIBS = @LIBS@ 421LIBS = @LIBS@
421LIBTOOL = @LIBTOOL@ 422LIBTOOL = @LIBTOOL@
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 21b9341..1187208 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -275,6 +275,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileio", "modules\fileio\fi
275EndProject 275EndProject
276Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparse", "modules\sparse\src\c\sparse.vcproj", "{51240B08-5E4E-439B-B745-C870D5B513BF}" 276Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparse", "modules\sparse\src\c\sparse.vcproj", "{51240B08-5E4E-439B-B745-C870D5B513BF}"
277 ProjectSection(ProjectDependencies) = postProject 277 ProjectSection(ProjectDependencies) = postProject
278 {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
278 {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904} 279 {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
279 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} 280 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
280 EndProjectSection 281 EndProjectSection
diff --git a/scilab/configure b/scilab/configure
index e94faa6..c05d3d9 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -640,7 +640,6 @@ JLATEXMATH_FOP
640XML_APIS_EXT 640XML_APIS_EXT
641XMLGRAPHICS_COMMONS 641XMLGRAPHICS_COMMONS
642COMMONS_IO 642COMMONS_IO
643JEUCLID_CORE
644FOP 643FOP
645SAXON 644SAXON
646BATIK 645BATIK
@@ -720,6 +719,7 @@ MSGFMT
720GETTEXT_MACRO_VERSION 719GETTEXT_MACRO_VERSION
721USE_NLS 720USE_NLS
722POW_LIB 721POW_LIB
722LIBM
723GUI_ENABLE 723GUI_ENABLE
724GIWS_FALSE 724GIWS_FALSE
725GIWS_TRUE 725GIWS_TRUE
@@ -751,6 +751,7 @@ CHECKSTYLE
751JLATEXMATH 751JLATEXMATH
752COMMONS_LOGGING 752COMMONS_LOGGING
753JHDF5 753JHDF5
754JEUCLID_CORE
754JROSETTA_ENGINE 755JROSETTA_ENGINE
755JROSETTA_API 756JROSETTA_API
756JHALL 757JHALL
@@ -9844,7 +9845,7 @@ $as_echo "$ac_java_classpath" >&6; }
9844$as_echo_n "checking to see if the java compiler works... " >&6; } 9845$as_echo_n "checking to see if the java compiler works... " >&6; }
9845 9846
9846 cat << \EOF > conftest.java 9847 cat << \EOF > conftest.java
9847// #line 9847 "configure" 9848// #line 9848 "configure"
9848 9849
9849 9850
9850public class conftest { 9851public class conftest {
@@ -9904,7 +9905,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9904 if test "x$ac_java_jvm_name" = "x" ; then 9905 if test "x$ac_java_jvm_name" = "x" ; then
9905 9906
9906 cat << \EOF > conftest.java 9907 cat << \EOF > conftest.java
9907// #line 9907 "configure" 9908// #line 9908 "configure"
9908import gnu.java.io.EncodingManager; 9909import gnu.java.io.EncodingManager;
9909 9910
9910public class conftest { 9911public class conftest {
@@ -9962,7 +9963,7 @@ $as_echo_n "checking java API version... " >&6; }
9962 9963
9963 9964
9964 cat << \EOF > conftest.java 9965 cat << \EOF > conftest.java
9965// #line 9965 "configure" 9966// #line 9966 "configure"
9966import java.nio.charset.Charset; 9967import java.nio.charset.Charset;
9967 9968
9968public class conftest { 9969public class conftest {
@@ -10001,7 +10002,7 @@ EOF
10001 10002
10002 10003
10003 cat << \EOF > conftest.java 10004 cat << \EOF > conftest.java
10004// #line 10004 "configure" 10005// #line 10005 "configure"
10005import java.lang.StringBuilder; 10006import java.lang.StringBuilder;
10006 10007
10007public class conftest { 10008public class conftest {
@@ -11245,12 +11246,13 @@ $as_echo_n "checking jgraphx... " >&6; }
11245# jar_resolved=`ls $jar 2>/dev/null` 11246# jar_resolved=`ls $jar 2>/dev/null`
11246# echo "looking for $jar_resolved" 11247# echo "looking for $jar_resolved"
11247# TODO check the behaviour when spaces 11248# TODO check the behaviour when spaces
11248 jar_resolved=`ls -r $jar 2>/dev/null` 11249 jars_resolved=`ls $jar 2>/dev/null`
11250 for jar_resolved in $jars_resolved; do # If several jars matches
11249 if test -e "$jar_resolved"; then 11251 if test -e "$jar_resolved"; then
11250 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11252 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11251 11253
11252 cat << \EOF > conftest.java 11254 cat << \EOF > conftest.java
11253// #line 11253 "configure" 11255// #line 11255 "configure"
11254import com.mxgraph.model.mxCell; 11256import com.mxgraph.model.mxCell;
11255 11257
11256public class conftest { 11258public class conftest {
@@ -11305,7 +11307,13 @@ $as_echo "$jar_resolved" >&6; }
11305 fi 11307 fi
11306 11308
11307 fi 11309 fi
11310 done
11311 # If ls returns several results and the first one is OK, stop the search
11312 if test "$found_jar" = "yes"; then
11313 break
11314 fi
11308 done 11315 done
11316 # If found, no need to search in other directory
11309 if test "$found_jar" = "yes"; then 11317 if test "$found_jar" = "yes"; then
11310 break 11318 break
11311 fi 11319 fi
@@ -11331,7 +11339,7 @@ $as_echo_n "checking minimal version (1.2.0.7) of jgraphx... " >&6; }
11331 export ac_java_classpath="$JGRAPHX:$ac_java_classpath" 11339 export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
11332 11340
11333 cat << \EOF > conftest.java 11341 cat << \EOF > conftest.java
11334// #line 11334 "configure" 11342// #line 11342 "configure"
11335import com.mxgraph.view.mxGraph; 11343import com.mxgraph.view.mxGraph;
11336 11344
11337public class conftest { 11345public class conftest {
@@ -11389,12 +11397,13 @@ $as_echo_n "checking flexdock... " >&6; }
11389# jar_resolved=`ls $jar 2>/dev/null` 11397# jar_resolved=`ls $jar 2>/dev/null`
11390# echo "looking for $jar_resolved" 11398# echo "looking for $jar_resolved"
11391# TODO check the behaviour when spaces 11399# TODO check the behaviour when spaces
11392 jar_resolved=`ls -r $jar 2>/dev/null` 11400 jars_resolved=`ls $jar 2>/dev/null`
11401 for jar_resolved in $jars_resolved; do # If several jars matches
11393 if test -e "$jar_resolved"; then 11402 if test -e "$jar_resolved"; then
11394 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11403 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11395 11404
11396 cat << \EOF > conftest.java 11405 cat << \EOF > conftest.java
11397// #line 11397 "configure" 11406// #line 11406 "configure"
11398import org.flexdock.docking.DockingManager; 11407import org.flexdock.docking.DockingManager;
11399 11408
11400public class conftest { 11409public class conftest {
@@ -11449,7 +11458,13 @@ $as_echo "$jar_resolved" >&6; }
11449 fi 11458 fi
11450 11459
11451 fi 11460 fi
11461 done
11462 # If ls returns several results and the first one is OK, stop the search
11463 if test "$found_jar" = "yes"; then
11464 break
11465 fi
11452 done 11466 done
11467 # If found, no need to search in other directory
11453 if test "$found_jar" = "yes"; then 11468 if test "$found_jar" = "yes"; then
11454 break 11469 break
11455 fi 11470 fi
@@ -11483,12 +11498,13 @@ $as_echo_n "checking looks... " >&6; }
11483# jar_resolved=`ls $jar 2>/dev/null` 11498# jar_resolved=`ls $jar 2>/dev/null`
11484# echo "looking for $jar_resolved" 11499# echo "looking for $jar_resolved"
11485# TODO check the behaviour when spaces 11500# TODO check the behaviour when spaces
11486 jar_resolved=`ls -r $jar 2>/dev/null` 11501 jars_resolved=`ls $jar 2>/dev/null`
11502 for jar_resolved in $jars_resolved; do # If several jars matches
11487 if test -e "$jar_resolved"; then 11503 if test -e "$jar_resolved"; then
11488 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11504 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11489 11505
11490 cat << \EOF > conftest.java 11506 cat << \EOF > conftest.java
11491// #line 11491 "configure" 11507// #line 11507 "configure"
11492import com.jgoodies.looks.common.RenderingUtils; 11508import com.jgoodies.looks.common.RenderingUtils;
11493 11509
11494public class conftest { 11510public class conftest {
@@ -11543,7 +11559,13 @@ $as_echo "$jar_resolved" >&6; }
11543 fi 11559 fi
11544 11560
11545 fi 11561 fi
11562 done
11563 # If ls returns several results and the first one is OK, stop the search
11564 if test "$found_jar" = "yes"; then
11565 break
11566 fi
11546 done 11567 done
11568 # If found, no need to search in other directory
11547 if test "$found_jar" = "yes"; then 11569 if test "$found_jar" = "yes"; then
11548 break 11570 break
11549 fi 11571 fi
@@ -11577,12 +11599,13 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
11577# jar_resolved=`ls $jar 2>/dev/null` 11599# jar_resolved=`ls $jar 2>/dev/null`
11578# echo "looking for $jar_resolved" 11600# echo "looking for $jar_resolved"
11579# TODO check the behaviour when spaces 11601# TODO check the behaviour when spaces
11580 jar_resolved=`ls -r $jar 2>/dev/null` 11602 jars_resolved=`ls $jar 2>/dev/null`
11603 for jar_resolved in $jars_resolved; do # If several jars matches
11581 if test -e "$jar_resolved"; then 11604 if test -e "$jar_resolved"; then
11582 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11605 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11583 11606
11584 cat << \EOF > conftest.java 11607 cat << \EOF > conftest.java
11585// #line 11585 "configure" 11608// #line 11608 "configure"
11586import com.jgoodies.looks.common.RenderingUtils; 11609import com.jgoodies.looks.common.RenderingUtils;
11587 11610
11588public class conftest { 11611public class conftest {
@@ -11637,7 +11660,13 @@ $as_echo "$jar_resolved" >&6; }
11637 fi 11660 fi
11638 11661
11639 fi 11662 fi
11663 done
11664 # If ls returns several results and the first one is OK, stop the search
11665 if test "$found_jar" = "yes"; then
11666 break
11667 fi
11640 done 11668 done
11669 # If found, no need to search in other directory
11641 if test "$found_jar" = "yes"; then 11670 if test "$found_jar" = "yes"; then
11642 break 11671 break
11643 fi 11672 fi
@@ -11672,12 +11701,13 @@ $as_echo_n "checking skinlf... " >&6; }
11672# jar_resolved=`ls $jar 2>/dev/null` 11701# jar_resolved=`ls $jar 2>/dev/null`
11673# echo "looking for $jar_resolved" 11702# echo "looking for $jar_resolved"
11674# TODO check the behaviour when spaces 11703# TODO check the behaviour when spaces
11675 jar_resolved=`ls -r $jar 2>/dev/null` 11704 jars_resolved=`ls $jar 2>/dev/null`
11705 for jar_resolved in $jars_resolved; do # If several jars matches
11676 if test -e "$jar_resolved"; then 11706 if test -e "$jar_resolved"; then
11677 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11707 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11678 11708
11679 cat << \EOF > conftest.java 11709 cat << \EOF > conftest.java
11680// #line 11680 "configure" 11710// #line 11710 "configure"
11681import com.l2fprod.util.AccessUtils; 11711import com.l2fprod.util.AccessUtils;
11682 11712
11683public class conftest { 11713public class conftest {
@@ -11732,7 +11762,13 @@ $as_echo "$jar_resolved" >&6; }
11732 fi 11762 fi
11733 11763
11734 fi 11764 fi
11765 done
11766 # If ls returns several results and the first one is OK, stop the search
11767 if test "$found_jar" = "yes"; then
11768 break
11769 fi
11735 done 11770 done
11771 # If found, no need to search in other directory
11736 if test "$found_jar" = "yes"; then 11772 if test "$found_jar" = "yes"; then
11737 break 11773 break
11738 fi 11774 fi
@@ -11766,12 +11802,13 @@ $as_echo_n "checking jogl... " >&6; }
11766# jar_resolved=`ls $jar 2>/dev/null` 11802# jar_resolved=`ls $jar 2>/dev/null`
11767# echo "looking for $jar_resolved" 11803# echo "looking for $jar_resolved"
11768# TODO check the behaviour when spaces 11804# TODO check the behaviour when spaces
11769 jar_resolved=`ls -r $jar 2>/dev/null` 11805 jars_resolved=`ls $jar 2>/dev/null`
11806 for jar_resolved in $jars_resolved; do # If several jars matches
11770 if test -e "$jar_resolved"; then 11807 if test -e "$jar_resolved"; then
11771 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11808 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11772 11809
11773 cat << \EOF > conftest.java 11810 cat << \EOF > conftest.java
11774// #line 11774 "configure" 11811// #line 11811 "configure"
11775import javax.media.opengl.glu.GLUnurbs; 11812import javax.media.opengl.glu.GLUnurbs;
11776 11813
11777public class conftest { 11814public class conftest {
@@ -11826,7 +11863,13 @@ $as_echo "$jar_resolved" >&6; }
11826 fi 11863 fi
11827 11864
11828 fi 11865 fi
11866 done
11867 # If ls returns several results and the first one is OK, stop the search
11868 if test "$found_jar" = "yes"; then
11869 break
11870 fi
11829 done 11871 done
11872 # If found, no need to search in other directory
11830 if test "$found_jar" = "yes"; then 11873 if test "$found_jar" = "yes"; then
11831 break 11874 break
11832 fi 11875 fi
@@ -11960,12 +12003,13 @@ $as_echo_n "checking gluegen-rt... " >&6; }
11960# jar_resolved=`ls $jar 2>/dev/null` 12003# jar_resolved=`ls $jar 2>/dev/null`
11961# echo "looking for $jar_resolved" 12004# echo "looking for $jar_resolved"
11962# TODO check the behaviour when spaces 12005# TODO check the behaviour when spaces
11963 jar_resolved=`ls -r $jar 2>/dev/null` 12006 jars_resolved=`ls $jar 2>/dev/null`
12007 for jar_resolved in $jars_resolved; do # If several jars matches
11964 if test -e "$jar_resolved"; then 12008 if test -e "$jar_resolved"; then
11965 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12009 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11966 12010
11967 cat << \EOF > conftest.java 12011 cat << \EOF > conftest.java
11968// #line 11968 "configure" 12012// #line 12012 "configure"
11969import com.sun.gluegen.runtime.CPU; 12013import com.sun.gluegen.runtime.CPU;
11970 12014
11971public class conftest { 12015public class conftest {
@@ -12020,7 +12064,13 @@ $as_echo "$jar_resolved" >&6; }
12020 fi 12064 fi
12021 12065
12022 fi 12066 fi
12067 done
12068 # If ls returns several results and the first one is OK, stop the search
12069 if test "$found_jar" = "yes"; then
12070 break
12071 fi
12023 done 12072 done
12073 # If found, no need to search in other directory
12024 if test "$found_jar" = "yes"; then 12074 if test "$found_jar" = "yes"; then
12025 break 12075 break
12026 fi 12076 fi
@@ -12109,12 +12159,13 @@ $as_echo_n "checking jhall... " >&6; }
12109# jar_resolved=`ls $jar 2>/dev/null` 12159# jar_resolved=`ls $jar 2>/dev/null`
12110# echo "looking for $jar_resolved" 12160# echo "looking for $jar_resolved"
12111# TODO check the behaviour when spaces 12161# TODO check the behaviour when spaces
12112 jar_resolved=`ls -r $jar 2>/dev/null` 12162 jars_resolved=`ls $jar 2>/dev/null`
12163 for jar_resolved in $jars_resolved; do # If several jars matches
12113 if test -e "$jar_resolved"; then 12164 if test -e "$jar_resolved"; then
12114 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12165 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12115 12166
12116 cat << \EOF > conftest.java 12167 cat << \EOF > conftest.java
12117// #line 12117 "configure" 12168// #line 12168 "configure"
12118import javax.help.JHelp; 12169import javax.help.JHelp;
12119 12170
12120public class conftest { 12171public class conftest {
@@ -12169,7 +12220,13 @@ $as_echo "$jar_resolved" >&6; }
12169 fi 12220 fi
12170 12221
12171 fi 12222 fi
12223 done
12224 # If ls returns several results and the first one is OK, stop the search
12225 if test "$found_jar" = "yes"; then
12226 break
12227 fi
12172 done 12228 done
12229 # If found, no need to search in other directory
12173 if test "$found_jar" = "yes"; then 12230 if test "$found_jar" = "yes"; then
12174 break 12231 break
12175 fi 12232 fi
@@ -12203,12 +12260,13 @@ $as_echo_n "checking javahelp2... " >&6; }
12203# jar_resolved=`ls $jar 2>/dev/null` 12260# jar_resolved=`ls $jar 2>/dev/null`
12204# echo "looking for $jar_resolved" 12261# echo "looking for $jar_resolved"
12205# TODO check the behaviour when spaces 12262# TODO check the behaviour when spaces
12206 jar_resolved=`ls -r $jar 2>/dev/null` 12263 jars_resolved=`ls $jar 2>/dev/null`
12264 for jar_resolved in $jars_resolved; do # If several jars matches
12207 if test -e "$jar_resolved"; then 12265 if test -e "$jar_resolved"; then
12208 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12266 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12209 12267
12210 cat << \EOF > conftest.java 12268 cat << \EOF > conftest.java
12211// #line 12211 "configure" 12269// #line 12269 "configure"
12212import javax.help.JHelp; 12270import javax.help.JHelp;
12213 12271
12214public class conftest { 12272public class conftest {
@@ -12263,7 +12321,13 @@ $as_echo "$jar_resolved" >&6; }
12263 fi 12321 fi
12264 12322
12265 fi 12323 fi
12324 done
12325 # If ls returns several results and the first one is OK, stop the search
12326 if test "$found_jar" = "yes"; then
12327 break
12328 fi
12266 done 12329 done
12330 # If found, no need to search in other directory
12267 if test "$found_jar" = "yes"; then 12331 if test "$found_jar" = "yes"; then
12268 break 12332 break
12269 fi 12333 fi
@@ -12298,12 +12362,13 @@ $as_echo_n "checking jrosetta-API... " >&6; }
12298# jar_resolved=`ls $jar 2>/dev/null` 12362# jar_resolved=`ls $jar 2>/dev/null`
12299# echo "looking for $jar_resolved" 12363# echo "looking for $jar_resolved"
12300# TODO check the behaviour when spaces 12364# TODO check the behaviour when spaces
12301 jar_resolved=`ls -r $jar 2>/dev/null` 12365 jars_resolved=`ls $jar 2>/dev/null`
12366 for jar_resolved in $jars_resolved; do # If several jars matches
12302 if test -e "$jar_resolved"; then 12367 if test -e "$jar_resolved"; then
12303 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12368 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12304 12369
12305 cat << \EOF > conftest.java 12370 cat << \EOF > conftest.java
12306// #line 12306 "configure" 12371// #line 12371 "configure"
12307import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 12372import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
12308 12373
12309public class conftest { 12374public class conftest {
@@ -12358,7 +12423,13 @@ $as_echo "$jar_resolved" >&6; }
12358 fi 12423 fi
12359 12424
12360 fi 12425 fi
12426 done
12427 # If ls returns several results and the first one is OK, stop the search
12428 if test "$found_jar" = "yes"; then
12429 break
12430 fi
12361 done 12431 done
12432 # If found, no need to search in other directory
12362 if test "$found_jar" = "yes"; then 12433 if test "$found_jar" = "yes"; then
12363 break 12434 break
12364 fi 12435 fi
@@ -12392,12 +12463,13 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
12392# jar_resolved=`ls $jar 2>/dev/null` 12463# jar_resolved=`ls $jar 2>/dev/null`
12393# echo "looking for $jar_resolved" 12464# echo "looking for $jar_resolved"
12394# TODO check the behaviour when spaces 12465# TODO check the behaviour when spaces
12395 jar_resolved=`ls -r $jar 2>/dev/null` 12466 jars_resolved=`ls $jar 2>/dev/null`
12467 for jar_resolved in $jars_resolved; do # If several jars matches
12396 if test -e "$jar_resolved"; then 12468 if test -e "$jar_resolved"; then
12397 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12469 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12398 12470
12399 cat << \EOF > conftest.java 12471 cat << \EOF > conftest.java
12400// #line 12400 "configure" 12472// #line 12472 "configure"
12401import com.artenum.rosetta.core.action.AbstractConsoleAction; 12473import com.artenum.rosetta.core.action.AbstractConsoleAction;
12402 12474
12403public class conftest { 12475public class conftest {
@@ -12452,7 +12524,13 @@ $as_echo "$jar_resolved" >&6; }
12452 fi 12524 fi
12453 12525
12454 fi 12526 fi
12527 done
12528 # If ls returns several results and the first one is OK, stop the search
12529 if test "$found_jar" = "yes"; then
12530 break
12531 fi
12455 done 12532 done
12533 # If found, no need to search in other directory
12456 if test "$found_jar" = "yes"; then 12534 if test "$found_jar" = "yes"; then
12457 break 12535 break
12458 fi 12536 fi
@@ -12471,6 +12549,110 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jrosetta-e
12471 JROSETTA_ENGINE=$PACKAGE_JAR_FILE 12549 JROSETTA_ENGINE=$PACKAGE_JAR_FILE
12472 12550
12473 12551
12552
12553 # MathML rendering solution
12554 # Used in both graphic & help
12555
12556 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jeuclid-core" >&5
12557$as_echo_n "checking jeuclid-core... " >&6; }
12558 PACKAGE_JAR_FILE=
12559 found_jar=no
12560 saved_ac_java_classpath=$ac_java_classpath
12561 DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
12562 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
12563 for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do
12564# jar=`echo $jar|sed -e 's/ /\\ /'`
12565# echo "protected $jar"
12566# jar_resolved=`ls $jar 2>/dev/null`
12567# echo "looking for $jar_resolved"
12568# TODO check the behaviour when spaces
12569 jars_resolved=`ls $jar 2>/dev/null`
12570 for jar_resolved in $jars_resolved; do # If several jars matches
12571 if test -e "$jar_resolved"; then
12572 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12573
12574 cat << \EOF > conftest.java
12575// #line 12575 "configure"
12576import net.sourceforge.jeuclid.LayoutContext;
12577
12578public class conftest {
12579 public static void main(String[] argv) {
12580
12581 }
12582}
12583EOF
12584
12585 CLASSPATH=$ac_java_classpath
12586 export CLASSPATH
12587 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
12588 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
12589 if test ""no"" = "no"; then
12590 echo "yes" >&5
12591
12592 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
12593$as_echo "$jar_resolved" >&6; }
12594 found_jar=yes
12595 PACKAGE_JAR_FILE=$jar_resolved
12596 break
12597
12598 else
12599 cmd="$JAVA conftest"
12600 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
12601 echo "yes" >&5
12602
12603 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
12604$as_echo "$jar_resolved" >&6; }
12605 found_jar=yes
12606 PACKAGE_JAR_FILE=$jar_resolved
12607 break
12608
12609 else
12610 echo "configure: failed program was:" >&5
12611 cat conftest.java >&5
12612 echo "configure: CLASSPATH was $CLASSPATH" >&5
12613
12614 ac_java_classpath=$saved_ac_java_classpath
12615
12616
12617 fi
12618 fi
12619 else
12620 echo "configure: failed program was:" >&5
12621 cat conftest.java >&5
12622 echo "configure: CLASSPATH was $CLASSPATH" >&5
12623
12624 ac_java_classpath=$saved_ac_java_classpath
12625
12626
12627 fi
12628
12629 fi
12630 done
12631 # If ls returns several results and the first one is OK, stop the search
12632 if test "$found_jar" = "yes"; then
12633 break
12634 fi
12635 done
12636 # If found, no need to search in other directory
12637 if test "$found_jar" = "yes"; then
12638 break
12639 fi
12640 done
12641 if test "$found_jar" = "no"; then
12642 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12643$as_echo "no" >&6; }
12644 if test "" = "yes"; then
12645 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&5
12646$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&2;}
12647 else
12648 as_fn_error "Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" "$LINENO" 5
12649 fi
12650 fi
12651
12652 JEUCLID_CORE=$PACKAGE_JAR_FILE
12653
12654
12655
12474 if test $HDF5_ENABLE = yes; then 12656 if test $HDF5_ENABLE = yes; then
12475 # HDF5 java lib 12657 # HDF5 java lib
12476 12658
@@ -12487,12 +12669,13 @@ $as_echo_n "checking jhdf5... " >&6; }
12487# jar_resolved=`ls $jar 2>/dev/null` 12669# jar_resolved=`ls $jar 2>/dev/null`
12488# echo "looking for $jar_resolved" 12670# echo "looking for $jar_resolved"
12489# TODO check the behaviour when spaces 12671# TODO check the behaviour when spaces
12490 jar_resolved=`ls -r $jar 2>/dev/null` 12672 jars_resolved=`ls $jar 2>/dev/null`
12673 for jar_resolved in $jars_resolved; do # If several jars matches
12491 if test -e "$jar_resolved"; then 12674 if test -e "$jar_resolved"; then
12492 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12675 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12493 12676
12494 cat << \EOF > conftest.java 12677 cat << \EOF > conftest.java
12495// #line 12495 "configure" 12678// #line 12678 "configure"
12496import ncsa.hdf.hdf5lib.HDF5Constants; 12679import ncsa.hdf.hdf5lib.HDF5Constants;
12497 12680
12498public class conftest { 12681public class conftest {
@@ -12547,7 +12730,13 @@ $as_echo "$jar_resolved" >&6; }
12547 fi 12730 fi
12548 12731
12549 fi 12732 fi
12733 done
12734 # If ls returns several results and the first one is OK, stop the search
12735 if test "$found_jar" = "yes"; then
12736 break
12737 fi
12550 done 12738 done
12739 # If found, no need to search in other directory
12551 if test "$found_jar" = "yes"; then 12740 if test "$found_jar" = "yes"; then
12552 break 12741 break
12553 fi 12742 fi
@@ -12582,12 +12771,13 @@ $as_echo_n "checking commons-logging... " >&6; }
12582# jar_resolved=`ls $jar 2>/dev/null` 12771# jar_resolved=`ls $jar 2>/dev/null`
12583# echo "looking for $jar_resolved" 12772# echo "looking for $jar_resolved"
12584# TODO check the behaviour when spaces 12773# TODO check the behaviour when spaces
12585 jar_resolved=`ls -r $jar 2>/dev/null` 12774 jars_resolved=`ls $jar 2>/dev/null`
12775 for jar_resolved in $jars_resolved; do # If several jars matches
12586 if test -e "$jar_resolved"; then 12776 if test -e "$jar_resolved"; then
12587 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12777 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12588 12778
12589 cat << \EOF > conftest.java 12779 cat << \EOF > conftest.java
12590// #line 12590 "configure" 12780// #line 12780 "configure"
12591import org.apache.commons.logging.LogFactory; 12781import org.apache.commons.logging.LogFactory;
12592 12782
12593public class conftest { 12783public class conftest {
@@ -12642,7 +12832,13 @@ $as_echo "$jar_resolved" >&6; }
12642 fi 12832 fi
12643 12833
12644 fi 12834 fi
12835 done
12836 # If ls returns several results and the first one is OK, stop the search
12837 if test "$found_jar" = "yes"; then
12838 break
12839 fi
12645 done 12840 done
12841 # If found, no need to search in other directory
12646 if test "$found_jar" = "yes"; then 12842 if test "$found_jar" = "yes"; then
12647 break 12843 break
12648 fi 12844 fi
@@ -12676,12 +12872,13 @@ $as_echo_n "checking jlatexmath... " >&6; }
12676# jar_resolved=`ls $jar 2>/dev/null` 12872# jar_resolved=`ls $jar 2>/dev/null`
12677# echo "looking for $jar_resolved" 12873# echo "looking for $jar_resolved"
12678# TODO check the behaviour when spaces 12874# TODO check the behaviour when spaces
12679 jar_resolved=`ls -r $jar 2>/dev/null` 12875 jars_resolved=`ls $jar 2>/dev/null`
12876 for jar_resolved in $jars_resolved; do # If several jars matches
12680 if test -e "$jar_resolved"; then 12877 if test -e "$jar_resolved"; then
12681 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12878 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12682 12879
12683 cat << \EOF > conftest.java 12880 cat << \EOF > conftest.java
12684// #line 12684 "configure" 12881// #line 12881 "configure"
12685import org.scilab.forge.jlatexmath.TeXFormula; 12882import org.scilab.forge.jlatexmath.TeXFormula;
12686 12883
12687public class conftest { 12884public class conftest {
@@ -12736,7 +12933,13 @@ $as_echo "$jar_resolved" >&6; }
12736 fi 12933 fi
12737 12934
12738 fi 12935 fi
12936 done
12937 # If ls returns several results and the first one is OK, stop the search
12938 if test "$found_jar" = "yes"; then
12939 break
12940 fi
12739 done 12941 done
12942 # If found, no need to search in other directory
12740 if test "$found_jar" = "yes"; then 12943 if test "$found_jar" = "yes"; then
12741 break 12944 break
12742 fi 12945 fi
@@ -12762,7 +12965,7 @@ $as_echo_n "checking minimal version (0.8.8) of jlatexmath... " >&6; }
12762 export ac_java_classpath="$JLATEXMATH:$ac_java_classpath" 12965 export ac_java_classpath="$JLATEXMATH:$ac_java_classpath"
12763 12966
12764 cat << \EOF > conftest.java 12967 cat << \EOF > conftest.java
12765// #line 12765 "configure" 12968// #line 12968 "configure"
12766import org.scilab.forge.jlatexmath.TeXFormula; 12969import org.scilab.forge.jlatexmath.TeXFormula;
12767 12970
12768public class conftest { 12971public class conftest {
@@ -12826,12 +13029,13 @@ $as_echo_n "checking checkstyle... " >&6; }
12826# jar_resolved=`ls $jar 2>/dev/null` 13029# jar_resolved=`ls $jar 2>/dev/null`
12827# echo "looking for $jar_resolved" 13030# echo "looking for $jar_resolved"
12828# TODO check the behaviour when spaces 13031# TODO check the behaviour when spaces
12829 jar_resolved=`ls -r $jar 2>/dev/null` 13032 jars_resolved=`ls $jar 2>/dev/null`
13033 for jar_resolved in $jars_resolved; do # If several jars matches
12830 if test -e "$jar_resolved"; then 13034 if test -e "$jar_resolved"; then
12831 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13035 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12832 13036
12833 cat << \EOF > conftest.java 13037 cat << \EOF > conftest.java
12834// #line 12834 "configure" 13038// #line 13038 "configure"
12835import com.puppycrawl.tools.checkstyle.CheckStyleTask; 13039import com.puppycrawl.tools.checkstyle.CheckStyleTask;
12836 13040
12837public class conftest { 13041public class conftest {
@@ -12886,7 +13090,13 @@ $as_echo "$jar_resolved" >&6; }
12886 fi 13090 fi
12887 13091
12888 fi 13092 fi
13093 done
13094 # If ls returns several results and the first one is OK, stop the search
13095 if test "$found_jar" = "yes"; then
13096 break
13097 fi
12889 done 13098 done
13099 # If found, no need to search in other directory
12890 if test "$found_jar" = "yes"; then 13100 if test "$found_jar" = "yes"; then
12891 break 13101 break
12892 fi 13102 fi
@@ -12920,12 +13130,13 @@ $as_echo_n "checking commons-beanutils... " >&6; }
12920# jar_resolved=`ls $jar 2>/dev/null` 13130# jar_resolved=`ls $jar 2>/dev/null`
12921# echo "looking for $jar_resolved" 13131# echo "looking for $jar_resolved"
12922# TODO check the behaviour when spaces 13132# TODO check the behaviour when spaces
12923 jar_resolved=`ls -r $jar 2>/dev/null` 13133 jars_resolved=`ls $jar 2>/dev/null`
13134 for jar_resolved in $jars_resolved; do # If several jars matches
12924 if test -e "$jar_resolved"; then 13135 if test -e "$jar_resolved"; then
12925 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13136 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12926 13137
12927 cat << \EOF > conftest.java 13138 cat << \EOF > conftest.java
12928// #line 12928 "configure" 13139// #line 13139 "configure"
12929import org.apache.commons.beanutils.Converter; 13140import org.apache.commons.beanutils.Converter;
12930 13141
12931public class conftest { 13142public class conftest {
@@ -12980,7 +13191,13 @@ $as_echo "$jar_resolved" >&6; }
12980 fi 13191 fi
12981 13192
12982 fi 13193 fi
13194 done
13195 # If ls returns several results and the first one is OK, stop the search
13196 if test "$found_jar" = "yes"; then
13197 break
13198 fi
12983 done 13199 done
13200 # If found, no need to search in other directory
12984 if test "$found_jar" = "yes"; then 13201 if test "$found_jar" = "yes"; then
12985 break 13202 break
12986 fi 13203 fi
@@ -13014,12 +13231,13 @@ $as_echo_n "checking antlr... " >&6; }
13014# jar_resolved=`ls $jar 2>/dev/null` 13231# jar_resolved=`ls $jar 2>/dev/null`
13015# echo "looking for $jar_resolved" 13232# echo "looking for $jar_resolved"
13016# TODO check the behaviour when spaces 13233# TODO check the behaviour when spaces
13017 jar_resolved=`ls -r $jar 2>/dev/null` 13234 jars_resolved=`ls $jar 2>/dev/null`
13235 for jar_resolved in $jars_resolved; do # If several jars matches
13018 if test -e "$jar_resolved"; then 13236 if test -e "$jar_resolved"; then
13019 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13237 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13020 13238
13021 cat << \EOF > conftest.java 13239 cat << \EOF > conftest.java
13022// #line 13022 "configure" 13240// #line 13240 "configure"
13023import antlr.TokenStreamException; 13241import antlr.TokenStreamException;
13024 13242
13025public class conftest { 13243public class conftest {
@@ -13074,7 +13292,13 @@ $as_echo "$jar_resolved" >&6; }
13074 fi 13292 fi
13075 13293
13076 fi 13294 fi
13295 done
13296 # If ls returns several results and the first one is OK, stop the search
13297 if test "$found_jar" = "yes"; then
13298 break
13299 fi
13077 done 13300 done
13301 # If found, no need to search in other directory
13078 if test "$found_jar" = "yes"; then 13302 if test "$found_jar" = "yes"; then
13079 break 13303 break
13080 fi 13304 fi
@@ -13108,12 +13332,13 @@ $as_echo_n "checking testng... " >&6; }
13108# jar_resolved=`ls $jar 2>/dev/null` 13332# jar_resolved=`ls $jar 2>/dev/null`
13109# echo "looking for $jar_resolved" 13333# echo "looking for $jar_resolved"
13110# TODO check the behaviour when spaces 13334# TODO check the behaviour when spaces
13111 jar_resolved=`ls -r $jar 2>/dev/null` 13335 jars_resolved=`ls $jar 2>/dev/null`
13336 for jar_resolved in $jars_resolved; do # If several jars matches
13112 if test -e "$jar_resolved"; then 13337 if test -e "$jar_resolved"; then
13113 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13338 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13114 13339
13115 cat << \EOF > conftest.java 13340 cat << \EOF > conftest.java
13116// #line 13116 "configure" 13341// #line 13341 "configure"
13117import org.testng.TestNG; 13342import org.testng.TestNG;
13118 13343
13119public class conftest { 13344public class conftest {
@@ -13168,7 +13393,13 @@ $as_echo "$jar_resolved" >&6; }
13168 fi 13393 fi
13169 13394
13170 fi 13395 fi
13396 done
13397 # If ls returns several results and the first one is OK, stop the search
13398 if test "$found_jar" = "yes"; then
13399 break
13400 fi
13171 done 13401 done
13402 # If found, no need to search in other directory
13172 if test "$found_jar" = "yes"; then 13403 if test "$found_jar" = "yes"; then
13173 break 13404 break
13174 fi 13405 fi
@@ -13202,12 +13433,13 @@ $as_echo_n "checking qdox... " >&6; }
13202# jar_resolved=`ls $jar 2>/dev/null` 13433# jar_resolved=`ls $jar 2>/dev/null`
13203# echo "looking for $jar_resolved" 13434# echo "looking for $jar_resolved"
13204# TODO check the behaviour when spaces 13435# TODO check the behaviour when spaces
13205 jar_resolved=`ls -r $jar 2>/dev/null` 13436 jars_resolved=`ls $jar 2>/dev/null`
13437 for jar_resolved in $jars_resolved; do # If several jars matches
13206 if test -e "$jar_resolved"; then 13438 if test -e "$jar_resolved"; then
13207 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13439 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13208 13440
13209 cat << \EOF > conftest.java 13441 cat << \EOF > conftest.java
13210// #line 13210 "configure" 13442// #line 13442 "configure"
13211import com.thoughtworks.qdox.tools.QDoxTester; 13443import com.thoughtworks.qdox.tools.QDoxTester;
13212 13444
13213public class conftest { 13445public class conftest {
@@ -13262,7 +13494,13 @@ $as_echo "$jar_resolved" >&6; }
13262 fi 13494 fi
13263 13495
13264 fi 13496 fi
13497 done
13498 # If ls returns several results and the first one is OK, stop the search
13499 if test "$found_jar" = "yes"; then
13500 break
13501 fi
13265 done 13502 done
13503 # If found, no need to search in other directory
13266 if test "$found_jar" = "yes"; then 13504 if test "$found_jar" = "yes"; then
13267 break 13505 break
13268 fi 13506 fi
@@ -13296,12 +13534,13 @@ $as_echo_n "checking bsh... " >&6; }
13296# jar_resolved=`ls $jar 2>/dev/null` 13534# jar_resolved=`ls $jar 2>/dev/null`
13297# echo "looking for $jar_resolved" 13535# echo "looking for $jar_resolved"
13298# TODO check the behaviour when spaces 13536# TODO check the behaviour when spaces
13299 jar_resolved=`ls -r $jar 2>/dev/null` 13537 jars_resolved=`ls $jar 2>/dev/null`
13538 for jar_resolved in $jars_resolved; do # If several jars matches
13300 if test -e "$jar_resolved"; then 13539 if test -e "$jar_resolved"; then
13301 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13540 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13302 13541
13303 cat << \EOF > conftest.java 13542 cat << \EOF > conftest.java
13304// #line 13304 "configure" 13543// #line 13543 "configure"
13305import bsh.Console; 13544import bsh.Console;
13306 13545
13307public class conftest { 13546public class conftest {
@@ -13356,7 +13595,13 @@ $as_echo "$jar_resolved" >&6; }
13356 fi 13595 fi
13357 13596
13358 fi 13597 fi
13598 done
13599 # If ls returns several results and the first one is OK, stop the search
13600 if test "$found_jar" = "yes"; then
13601 break
13602 fi
13359 done 13603 done
13604 # If found, no need to search in other directory
13360 if test "$found_jar" = "yes"; then 13605 if test "$found_jar" = "yes"; then
13361 break 13606 break
13362 fi 13607 fi
@@ -13390,12 +13635,13 @@ $as_echo_n "checking junit... " >&6; }
13390# jar_resolved=`ls $jar 2>/dev/null` 13635# jar_resolved=`ls $jar 2>/dev/null`
13391# echo "looking for $jar_resolved" 13636# echo "looking for $jar_resolved"
13392# TODO check the behaviour when spaces 13637# TODO check the behaviour when spaces
13393 jar_resolved=`ls -r $jar 2>/dev/null` 13638 jars_resolved=`ls $jar 2>/dev/null`
13639 for jar_resolved in $jars_resolved; do # If several jars matches
13394 if test -e "$jar_resolved"; then 13640 if test -e "$jar_resolved"; then
13395 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13641 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13396 13642
13397 cat << \EOF > conftest.java 13643 cat << \EOF > conftest.java
13398// #line 13398 "configure" 13644// #line 13644 "configure"
13399import junit.framework.Assert; 13645import junit.framework.Assert;
13400 13646
13401public class conftest { 13647public class conftest {
@@ -13450,7 +13696,13 @@ $as_echo "$jar_resolved" >&6; }
13450 fi 13696 fi
13451 13697
13452 fi 13698 fi
13699 done
13700 # If ls returns several results and the first one is OK, stop the search
13701 if test "$found_jar" = "yes"; then
13702 break
13703 fi
13453 done 13704 done
13705 # If found, no need to search in other directory
13454 if test "$found_jar" = "yes"; then 13706 if test "$found_jar" = "yes"; then
13455 break 13707 break
13456 fi 13708 fi
@@ -13949,10 +14201,145 @@ fi
13949done 14201done
13950 14202
13951 14203
13952# Provided by math.h 14204
14205# Check of the libm (lib math). Macro provided by libtool.
13953save_LDFLAGS="$LDFLAGS" 14206save_LDFLAGS="$LDFLAGS"
13954LDFLAGS="$LDFLAGS -lm" 14207LIBM=
14208case $host in
14209*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
14210 # These system don't have libm, or don't need it
14211 ;;
14212*-ncr-sysv4.3*)
14213 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
14214$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
14215if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then :
14216 $as_echo_n "(cached) " >&6
14217else
14218 ac_check_lib_save_LIBS=$LIBS
14219LIBS="-lmw $LIBS"
14220cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14221/* end confdefs.h. */
13955 14222
14223/* Override any GCC internal prototype to avoid an error.
14224 Use char because int might match the return type of a GCC
14225 builtin and then its argument prototype would still apply. */
14226#ifdef __cplusplus
14227extern "C"
14228#endif
14229char _mwvalidcheckl ();
14230int
14231main ()
14232{
14233return _mwvalidcheckl ();
14234 ;
14235 return 0;
14236}
14237_ACEOF
14238if ac_fn_c_try_link "$LINENO"; then :
14239 ac_cv_lib_mw__mwvalidcheckl=yes
14240else
14241 ac_cv_lib_mw__mwvalidcheckl=no
14242fi
14243rm -f core conftest.err conftest.$ac_objext \
14244 conftest$ac_exeext conftest.$ac_ext
14245LIBS=$ac_check_lib_save_LIBS
14246fi
14247{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
14248$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
14249if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then :
14250 LIBM="-lmw"
14251fi
14252
14253 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
14254$as_echo_n "checking for cos in -lm... " >&6; }
14255if test "${ac_cv_lib_m_cos+set}" = set; then :
14256 $as_echo_n "(cached) " >&6
14257else
14258 ac_check_lib_save_LIBS=$LIBS
14259LIBS="-lm $LIBS"
14260cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14261/* end confdefs.h. */
14262
14263/* Override any GCC internal prototype to avoid an error.
14264 Use char because int might match the return type of a GCC
14265 builtin and then its argument prototype would still apply. */
14266#ifdef __cplusplus
14267extern "C"
14268#endif
14269char cos ();
14270int
14271main ()
14272{
14273return cos ();
14274 ;
14275 return 0;
14276}
14277_ACEOF
14278if ac_fn_c_try_link "$LINENO"; then :
14279 ac_cv_lib_m_cos=yes
14280else
14281 ac_cv_lib_m_cos=no
14282fi
14283rm -f core conftest.err conftest.$ac_objext \
14284 conftest$ac_exeext conftest.$ac_ext
14285LIBS=$ac_check_lib_save_LIBS
14286fi
14287{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
14288$as_echo "$ac_cv_lib_m_cos" >&6; }
14289if test "x$ac_cv_lib_m_cos" = x""yes; then :
14290 LIBM="$LIBM -lm"
14291fi
14292
14293 ;;
14294*)
14295 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
14296$as_echo_n "checking for cos in -lm... " >&6; }
14297if test "${ac_cv_lib_m_cos+set}" = set; then :
14298 $as_echo_n "(cached) " >&6
14299else
14300 ac_check_lib_save_LIBS=$LIBS
14301LIBS="-lm $LIBS"
14302cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14303/* end confdefs.h. */
14304
14305/* Override any GCC internal prototype to avoid an error.
14306 Use char because int might match the return type of a GCC
14307 builtin and then its argument prototype would still apply. */
14308#ifdef __cplusplus
14309extern "C"
14310#endif
14311char cos ();
14312int
14313main ()
14314{
14315return cos ();
14316 ;
14317 return 0;
14318}
14319_ACEOF
14320if ac_fn_c_try_link "$LINENO"; then :
14321 ac_cv_lib_m_cos=yes
14322else
14323 ac_cv_lib_m_cos=no
14324fi
14325rm -f core conftest.err conftest.$ac_objext \
14326 conftest$ac_exeext conftest.$ac_ext
14327LIBS=$ac_check_lib_save_LIBS
14328fi
14329{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
14330$as_echo "$ac_cv_lib_m_cos" >&6; }
14331if test "x$ac_cv_lib_m_cos" = x""yes; then :
14332 LIBM="-lm"
14333fi
14334
14335 ;;
14336esac
14337
14338
14339
14340# Provided by math.h
14341
14342LDFLAGS="$LDFLAGS $LIBM"
13956for ac_func in pow sqrt finite floor 14343for ac_func in pow sqrt finite floor
13957do : 14344do :
13958 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 14345 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13995,7 +14382,7 @@ $as_echo "#define isinf(x) (!finite(x) && x==x)" >>confdefs.h
13995 14382
13996fi 14383fi
13997 14384
13998 14385LIBS="$LIBS $LIBM"
13999LDFLAGS="$save_LDFLAGS" 14386LDFLAGS="$save_LDFLAGS"
14000 14387
14001# Provided by regex.h 14388# Provided by regex.h
@@ -21443,7 +21830,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
21443{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 21830{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
21444$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 21831$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
21445cat > conftest.$ac_ext <<EOF 21832cat > conftest.$ac_ext <<EOF
21446#line 21446 "configure" 21833#line 21833 "configure"
21447#include "confdefs.h" 21834#include "confdefs.h"
21448 21835
21449#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 21836#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -21755,7 +22142,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
21755$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 22142$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
21756 22143
21757cat > conftest.$ac_ext <<EOF 22144cat > conftest.$ac_ext <<EOF
21758#line 21758 "configure" 22145#line 22145 "configure"
21759#include "confdefs.h" 22146#include "confdefs.h"
21760 22147
21761#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 22148#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -22331,12 +22718,13 @@ $as_echo_n "checking batik-all... " >&6; }
22331# jar_resolved=`ls $jar 2>/dev/null` 22718# jar_resolved=`ls $jar 2>/dev/null`
22332# echo "looking for $jar_resolved" 22719# echo "looking for $jar_resolved"
22333# TODO check the behaviour when spaces 22720# TODO check the behaviour when spaces
22334 jar_resolved=`ls -r $jar 2>/dev/null` 22721 jars_resolved=`ls $jar 2>/dev/null`
22722 for jar_resolved in $jars_resolved; do # If several jars matches
22335 if test -e "$jar_resolved"; then 22723 if test -e "$jar_resolved"; then
22336 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22724 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22337 22725
22338 cat << \EOF > conftest.java 22726 cat << \EOF > conftest.java
22339// #line 22339 "configure" 22727// #line 22727 "configure"
22340import org.apache.batik.parser.Parser; 22728import org.apache.batik.parser.Parser;
22341 22729
22342public class conftest { 22730public class conftest {
@@ -22391,7 +22779,13 @@ $as_echo "$jar_resolved" >&6; }
22391 fi 22779 fi
22392 22780
22393 fi 22781 fi
22782 done
22783 # If ls returns several results and the first one is OK, stop the search
22784 if test "$found_jar" = "yes"; then
22785 break
22786 fi
22394 done 22787 done
22788 # If found, no need to search in other directory
22395 if test "$found_jar" = "yes"; then 22789 if test "$found_jar" = "yes"; then
22396 break 22790 break
22397 fi 22791 fi
@@ -22425,12 +22819,13 @@ $as_echo_n "checking batik... " >&6; }
22425# jar_resolved=`ls $jar 2>/dev/null` 22819# jar_resolved=`ls $jar 2>/dev/null`
22426# echo "looking for $jar_resolved" 22820# echo "looking for $jar_resolved"
22427# TODO check the behaviour when spaces 22821# TODO check the behaviour when spaces
22428 jar_resolved=`ls -r $jar 2>/dev/null` 22822 jars_resolved=`ls $jar 2>/dev/null`
22823 for jar_resolved in $jars_resolved; do # If several jars matches
22429 if test -e "$jar_resolved"; then 22824 if test -e "$jar_resolved"; then
22430 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22825 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22431 22826
22432 cat << \EOF > conftest.java 22827 cat << \EOF > conftest.java
22433// #line 22433 "configure" 22828// #line 22828 "configure"
22434import org.apache.batik.parser.Parser; 22829import org.apache.batik.parser.Parser;
22435 22830
22436public class conftest { 22831public class conftest {
@@ -22485,7 +22880,13 @@ $as_echo "$jar_resolved" >&6; }
22485 fi 22880 fi
22486 22881
22487 fi 22882 fi
22883 done
22884 # If ls returns several results and the first one is OK, stop the search
22885 if test "$found_jar" = "yes"; then
22886 break
22887 fi
22488 done 22888 done
22889 # If found, no need to search in other directory
22489 if test "$found_jar" = "yes"; then 22890 if test "$found_jar" = "yes"; then
22490 break 22891 break
22491 fi 22892 fi
@@ -22521,12 +22922,13 @@ $as_echo_n "checking saxon... " >&6; }
22521# jar_resolved=`ls $jar 2>/dev/null` 22922# jar_resolved=`ls $jar 2>/dev/null`
22522# echo "looking for $jar_resolved" 22923# echo "looking for $jar_resolved"
22523# TODO check the behaviour when spaces 22924# TODO check the behaviour when spaces
22524 jar_resolved=`ls -r $jar 2>/dev/null` 22925 jars_resolved=`ls $jar 2>/dev/null`
22926 for jar_resolved in $jars_resolved; do # If several jars matches
22525 if test -e "$jar_resolved"; then 22927 if test -e "$jar_resolved"; then
22526 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22928 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22527 22929
22528 cat << \EOF > conftest.java 22930 cat << \EOF > conftest.java
22529// #line 22529 "configure" 22931// #line 22931 "configure"
22530import com.icl.saxon.Loader; 22932import com.icl.saxon.Loader;
22531 22933
22532public class conftest { 22934public class conftest {
@@ -22581,7 +22983,13 @@ $as_echo "$jar_resolved" >&6; }
22581 fi 22983 fi
22582 22984
22583 fi 22985 fi
22986 done
22987 # If ls returns several results and the first one is OK, stop the search
22988 if test "$found_jar" = "yes"; then
22989 break
22990 fi
22584 done 22991 done
22992 # If found, no need to search in other directory
22585 if test "$found_jar" = "yes"; then 22993 if test "$found_jar" = "yes"; then
22586 break 22994 break
22587 fi 22995 fi
@@ -22615,12 +23023,13 @@ $as_echo_n "checking fop... " >&6; }
22615# jar_resolved=`ls $jar 2>/dev/null` 23023# jar_resolved=`ls $jar 2>/dev/null`
22616# echo "looking for $jar_resolved" 23024# echo "looking for $jar_resolved"
22617# TODO check the behaviour when spaces 23025# TODO check the behaviour when spaces
22618 jar_resolved=`ls -r $jar 2>/dev/null` 23026 jars_resolved=`ls $jar 2>/dev/null`
23027 for jar_resolved in $jars_resolved; do # If several jars matches
22619 if test -e "$jar_resolved"; then 23028 if test -e "$jar_resolved"; then
22620 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23029 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22621 23030
22622 cat << \EOF > conftest.java 23031 cat << \EOF > conftest.java
22623// #line 22623 "configure" 23032// #line 23032 "configure"
22624import org.apache.fop.pdf.PDFInfo; 23033import org.apache.fop.pdf.PDFInfo;
22625 23034
22626public class conftest { 23035public class conftest {
@@ -22675,7 +23084,13 @@ $as_echo "$jar_resolved" >&6; }
22675 fi 23084 fi
22676 23085
22677 fi 23086 fi
23087 done
23088 # If ls returns several results and the first one is OK, stop the search
23089 if test "$found_jar" = "yes"; then
23090 break
23091 fi
22678 done 23092 done
23093 # If found, no need to search in other directory
22679 if test "$found_jar" = "yes"; then 23094 if test "$found_jar" = "yes"; then
22680 break 23095 break
22681 fi 23096 fi
@@ -22694,100 +23109,6 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar fop used b
22694 FOP=$PACKAGE_JAR_FILE 23109 FOP=$PACKAGE_JAR_FILE
22695 23110
22696 23111
22697 # MathML rendering solution
22698
22699 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jeuclid-core" >&5
22700$as_echo_n "checking jeuclid-core... " >&6; }
22701 PACKAGE_JAR_FILE=
22702 found_jar=no
22703 saved_ac_java_classpath=$ac_java_classpath
22704 DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
22705 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
22706 for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do
22707# jar=`echo $jar|sed -e 's/ /\\ /'`
22708# echo "protected $jar"
22709# jar_resolved=`ls $jar 2>/dev/null`
22710# echo "looking for $jar_resolved"
22711# TODO check the behaviour when spaces
22712 jar_resolved=`ls -r $jar 2>/dev/null`
22713 if test -e "$jar_resolved"; then
22714 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22715
22716 cat << \EOF > conftest.java
22717// #line 22717 "configure"
22718import net.sourceforge.jeuclid.LayoutContext;
22719
22720public class conftest {
22721 public static void main(String[] argv) {
22722
22723 }
22724}
22725EOF
22726
22727 CLASSPATH=$ac_java_classpath
22728 export CLASSPATH
22729 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
22730 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
22731 if test ""no"" = "no"; then
22732 echo "yes" >&5
22733
22734 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
22735$as_echo "$jar_resolved" >&6; }
22736 found_jar=yes
22737 PACKAGE_JAR_FILE=$jar_resolved
22738 break
22739
22740 else
22741 cmd="$JAVA conftest"
22742 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
22743 echo "yes" >&5
22744
22745 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
22746$as_echo "$jar_resolved" >&6; }
22747 found_jar=yes
22748 PACKAGE_JAR_FILE=$jar_resolved
22749 break
22750
22751 else
22752 echo "configure: failed program was:" >&5
22753 cat conftest.java >&5
22754 echo "configure: CLASSPATH was $CLASSPATH" >&5
22755
22756 ac_java_classpath=$saved_ac_java_classpath
22757
22758
22759 fi
22760 fi
22761 else
22762 echo "configure: failed program was:" >&5
22763 cat conftest.java >&5
22764 echo "configure: CLASSPATH was $CLASSPATH" >&5
22765
22766 ac_java_classpath=$saved_ac_java_classpath
22767
22768
22769 fi
22770
22771 fi
22772 done
22773 if test "$found_jar" = "yes"; then
22774 break
22775 fi
22776 done
22777 if test "$found_jar" = "no"; then
22778 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22779$as_echo "no" >&6; }
22780 if test "" = "yes"; then
22781 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&5
22782$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&2;}
22783 else
22784 as_fn_error "Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" "$LINENO" 5
22785 fi
22786 fi
22787
22788 JEUCLID_CORE=$PACKAGE_JAR_FILE
22789
22790
22791 # Commons I/O library 23112 # Commons I/O library
22792 23113
22793 { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-io" >&5 23114 { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-io" >&5
@@ -22803,12 +23124,13 @@ $as_echo_n "checking commons-io... " >&6; }
22803# jar_resolved=`ls $jar 2>/dev/null` 23124# jar_resolved=`ls $jar 2>/dev/null`
22804# echo "looking for $jar_resolved" 23125# echo "looking for $jar_resolved"
22805# TODO check the behaviour when spaces 23126# TODO check the behaviour when spaces
22806 jar_resolved=`ls -r $jar 2>/dev/null` 23127 jars_resolved=`ls $jar 2>/dev/null`
23128 for jar_resolved in $jars_resolved; do # If several jars matches
22807 if test -e "$jar_resolved"; then 23129 if test -e "$jar_resolved"; then
22808 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23130 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22809 23131
22810 cat << \EOF > conftest.java 23132 cat << \EOF > conftest.java
22811// #line 22811 "configure" 23133// #line 23133 "configure"
22812import org.apache.commons.io.output.CountingOutputStream; 23134import org.apache.commons.io.output.CountingOutputStream;
22813 23135
22814public class conftest { 23136public class conftest {
@@ -22863,7 +23185,13 @@ $as_echo "$jar_resolved" >&6; }
22863 fi 23185 fi
22864 23186
22865 fi 23187 fi
23188 done
23189 # If ls returns several results and the first one is OK, stop the search
23190 if test "$found_jar" = "yes"; then
23191 break
23192 fi
22866 done 23193 done
23194 # If found, no need to search in other directory
22867 if test "$found_jar" = "yes"; then 23195 if test "$found_jar" = "yes"; then
22868 break 23196 break
22869 fi 23197 fi
@@ -22897,12 +23225,13 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
22897# jar_resolved=`ls $jar 2>/dev/null` 23225# jar_resolved=`ls $jar 2>/dev/null`
22898# echo "looking for $jar_resolved" 23226# echo "looking for $jar_resolved"
22899# TODO check the behaviour when spaces 23227# TODO check the behaviour when spaces
22900 jar_resolved=`ls -r $jar 2>/dev/null` 23228 jars_resolved=`ls $jar 2>/dev/null`
23229 for jar_resolved in $jars_resolved; do # If several jars matches
22901 if test -e "$jar_resolved"; then 23230 if test -e "$jar_resolved"; then
22902 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23231 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22903 23232
22904 cat << \EOF > conftest.java 23233 cat << \EOF > conftest.java
22905// #line 22905 "configure" 23234// #line 23234 "configure"
22906import org.apache.xmlgraphics.util.Service; 23235import org.apache.xmlgraphics.util.Service;
22907 23236
22908public class conftest { 23237public class conftest {
@@ -22957,7 +23286,13 @@ $as_echo "$jar_resolved" >&6; }
22957 fi 23286 fi
22958 23287
22959 fi 23288 fi
23289 done
23290 # If ls returns several results and the first one is OK, stop the search
23291 if test "$found_jar" = "yes"; then
23292 break
23293 fi
22960 done 23294 done
23295 # If found, no need to search in other directory
22961 if test "$found_jar" = "yes"; then 23296 if test "$found_jar" = "yes"; then
22962 break 23297 break
22963 fi 23298 fi
@@ -22991,12 +23326,13 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
22991# jar_resolved=`ls $jar 2>/dev/null` 23326# jar_resolved=`ls $jar 2>/dev/null`
22992# echo "looking for $jar_resolved" 23327# echo "looking for $jar_resolved"
22993# TODO check the behaviour when spaces 23328# TODO check the behaviour when spaces
22994 jar_resolved=`ls -r $jar 2>/dev/null` 23329 jars_resolved=`ls $jar 2>/dev/null`
23330 for jar_resolved in $jars_resolved; do # If several jars matches
22995 if test -e "$jar_resolved"; then 23331 if test -e "$jar_resolved"; then
22996 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23332 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22997 23333
22998 cat << \EOF > conftest.java 23334 cat << \EOF > conftest.java
22999// #line 22999 "configure" 23335// #line 23335 "configure"
23000import org.w3c.dom.svg.SVGDocument; 23336import org.w3c.dom.svg.SVGDocument;
23001 23337
23002public class conftest { 23338public class conftest {
@@ -23051,7 +23387,13 @@ $as_echo "$jar_resolved" >&6; }
23051 fi 23387 fi
23052 23388
23053 fi 23389 fi
23390 done
23391 # If ls returns several results and the first one is OK, stop the search
23392 if test "$found_jar" = "yes"; then
23393 break
23394 fi
23054 done 23395 done
23396 # If found, no need to search in other directory
23055 if test "$found_jar" = "yes"; then 23397 if test "$found_jar" = "yes"; then
23056 break 23398 break
23057 fi 23399 fi
@@ -23085,12 +23427,13 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
23085# jar_resolved=`ls $jar 2>/dev/null` 23427# jar_resolved=`ls $jar 2>/dev/null`
23086# echo "looking for $jar_resolved" 23428# echo "looking for $jar_resolved"
23087# TODO check the behaviour when spaces 23429# TODO check the behaviour when spaces
23088 jar_resolved=`ls -r $jar 2>/dev/null` 23430 jars_resolved=`ls $jar 2>/dev/null`
23431 for jar_resolved in $jars_resolved; do # If several jars matches
23089 if test -e "$jar_resolved"; then 23432 if test -e "$jar_resolved"; then
23090 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23433 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
23091 23434
23092 cat << \EOF > conftest.java 23435 cat << \EOF > conftest.java
23093// #line 23093 "configure" 23436// #line 23436 "configure"
23094import org.w3c.dom.svg.SVGDocument; 23437import org.w3c.dom.svg.SVGDocument;
23095 23438
23096public class conftest { 23439public class conftest {
@@ -23145,7 +23488,13 @@ $as_echo "$jar_resolved" >&6; }
23145 fi 23488 fi
23146 23489
23147 fi 23490 fi
23491 done
23492 # If ls returns several results and the first one is OK, stop the search
23493 if test "$found_jar" = "yes"; then
23494 break
23495 fi
23148 done 23496 done
23497 # If found, no need to search in other directory
23149 if test "$found_jar" = "yes"; then 23498 if test "$found_jar" = "yes"; then
23150 break 23499 break
23151 fi 23500 fi
@@ -23182,12 +23531,13 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
23182# jar_resolved=`ls $jar 2>/dev/null` 23531# jar_resolved=`ls $jar 2>/dev/null`
23183# echo "looking for $jar_resolved" 23532# echo "looking for $jar_resolved"
23184# TODO check the behaviour when spaces 23533# TODO check the behaviour when spaces
23185 jar_resolved=`ls -r $jar 2>/dev/null` 23534 jars_resolved=`ls $jar 2>/dev/null`
23535 for jar_resolved in $jars_resolved; do # If several jars matches
23186 if test -e "$jar_resolved"; then 23536 if test -e "$jar_resolved"; then
23187 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23537 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
23188 23538
23189 cat << \EOF > conftest.java 23539 cat << \EOF > conftest.java
23190// #line 23190 "configure" 23540// #line 23540 "configure"
23191import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj; 23541import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
23192 23542
23193public class conftest { 23543public class conftest {
@@ -23242,7 +23592,13 @@ $as_echo "$jar_resolved" >&6; }
23242 fi 23592 fi
23243 23593
23244 fi 23594 fi
23595 done
23596 # If ls returns several results and the first one is OK, stop the search
23597 if test "$found_jar" = "yes"; then
23598 break
23599 fi
23245 done 23600 done
23601 # If found, no need to search in other directory
23246 if test "$found_jar" = "yes"; then 23602 if test "$found_jar" = "yes"; then
23247 break 23603 break
23248 fi 23604 fi
@@ -23276,12 +23632,13 @@ $as_echo_n "checking avalon-framework... " >&6; }
23276# jar_resolved=`ls $jar 2>/dev/null` 23632# jar_resolved=`ls $jar 2>/dev/null`
23277# echo "looking for $jar_resolved" 23633# echo "looking for $jar_resolved"
23278# TODO check the behaviour when spaces 23634# TODO check the behaviour when spaces
23279 jar_resolved=`ls -r $jar 2>/dev/null` 23635 jars_resolved=`ls $jar 2>/dev/null`
23636 for jar_resolved in $jars_resolved; do # If several jars matches
23280 if test -e "$jar_resolved"; then 23637 if test -e "$jar_resolved"; then
23281 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23638 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
23282 23639
23283 cat << \EOF > conftest.java 23640 cat << \EOF > conftest.java
23284// #line 23284 "configure" 23641// #line 23641 "configure"
23285import org.apache.avalon.framework.configuration.ConfigurationException; 23642import org.apache.avalon.framework.configuration.ConfigurationException;
23286 23643
23287public class conftest { 23644public class conftest {
@@ -23336,7 +23693,13 @@ $as_echo "$jar_resolved" >&6; }
23336 fi 23693 fi
23337 23694
23338 fi 23695 fi
23696 done
23697 # If ls returns several results and the first one is OK, stop the search
23698 if test "$found_jar" = "yes"; then
23699 break
23700 fi
23339 done 23701 done
23702 # If found, no need to search in other directory
23340 if test "$found_jar" = "yes"; then 23703 if test "$found_jar" = "yes"; then
23341 break 23704 break
23342 fi 23705 fi
@@ -29546,7 +29909,7 @@ else
29546 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 29909 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
29547 lt_status=$lt_dlunknown 29910 lt_status=$lt_dlunknown
29548 cat > conftest.$ac_ext <<_LT_EOF 29911 cat > conftest.$ac_ext <<_LT_EOF
29549#line 29549 "configure" 29912#line 29912 "configure"
29550#include "confdefs.h" 29913#include "confdefs.h"
29551 29914
29552#if HAVE_DLFCN_H 29915#if HAVE_DLFCN_H
@@ -29652,7 +30015,7 @@ else
29652 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 30015 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
29653 lt_status=$lt_dlunknown 30016 lt_status=$lt_dlunknown
29654 cat > conftest.$ac_ext <<_LT_EOF 30017 cat > conftest.$ac_ext <<_LT_EOF
29655#line 29655 "configure" 30018#line 30018 "configure"
29656#include "confdefs.h" 30019#include "confdefs.h"
29657 30020
29658#if HAVE_DLFCN_H 30021#if HAVE_DLFCN_H
@@ -39049,8 +39412,7 @@ if test $HELP_ENABLE = yes; then
39049 echo " Batik (SVG) ............ = $BATIK" 39412 echo " Batik (SVG) ............ = $BATIK"
39050 echo " Saxon XSLT ............. = $SAXON" 39413 echo " Saxon XSLT ............. = $SAXON"
39051 echo " FOP (XML => PDF) ....... = $FOP" 39414 echo " FOP (XML => PDF) ....... = $FOP"
39052 echo " JLaTeXMath FOP ........ = $JLATEXMATH_FOP" 39415 echo " JLaTeXMath-FOP ......... = $JLATEXMATH_FOP"
39053 echo " Jeuclid (MathML) ....... = $JEUCLID_CORE"
39054 echo " Commons I/O ............ = $COMMONS_IO" 39416 echo " Commons I/O ............ = $COMMONS_IO"
39055 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS" 39417 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS"
39056 echo " XML commons external ... = $XML_APIS_EXT" 39418 echo " XML commons external ... = $XML_APIS_EXT"
@@ -39085,6 +39447,7 @@ echo " JOGL ................ = $JOGL"
39085echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS" 39447echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS"
39086echo " Gluegen ............. = $GLUEGEN_RT" 39448echo " Gluegen ............. = $GLUEGEN_RT"
39087echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS" 39449echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS"
39450echo " Jeuclid (MathML) .... = $JEUCLID_CORE"
39088echo " Jhall .............. = $JHALL" 39451echo " Jhall .............. = $JHALL"
39089echo " Jrosetta (API) ...... = $JROSETTA_API" 39452echo " Jrosetta (API) ...... = $JROSETTA_API"
39090echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE" 39453echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE"
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 76b9329..78863cc 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -749,6 +749,14 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
749 JROSETTA_ENGINE=$PACKAGE_JAR_FILE 749 JROSETTA_ENGINE=$PACKAGE_JAR_FILE
750 AC_SUBST(JROSETTA_ENGINE) 750 AC_SUBST(JROSETTA_ENGINE)
751 751
752
753 # MathML rendering solution
754 # Used in both graphic & help
755 AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
756 JEUCLID_CORE=$PACKAGE_JAR_FILE
757 AC_SUBST(JEUCLID_CORE)
758
759
752 if test $HDF5_ENABLE = yes; then 760 if test $HDF5_ENABLE = yes; then
753 # HDF5 java lib 761 # HDF5 java lib
754 AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library]) 762 AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library])
@@ -913,10 +921,14 @@ AC_CHECK_FUNCS([mkdir])
913# Provided by mman.h 921# Provided by mman.h
914AC_CHECK_FUNCS([munmap]) 922AC_CHECK_FUNCS([munmap])
915 923
916# Provided by math.h 924
925# Check of the libm (lib math). Macro provided by libtool.
917save_LDFLAGS="$LDFLAGS" 926save_LDFLAGS="$LDFLAGS"
918LDFLAGS="$LDFLAGS -lm" 927LT_LIB_M()
928
929# Provided by math.h
919 930
931LDFLAGS="$LDFLAGS $LIBM"
920AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor]) 932AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor])
921 933
922AC_CHECK_FUNC([exp10],,[ 934AC_CHECK_FUNC([exp10],,[
@@ -929,7 +941,7 @@ AC_CHECK_FUNC([exp10],,[
929AC_CHECK_FUNC([isinf],,[ 941AC_CHECK_FUNC([isinf],,[
930 AC_DEFINE([isinf(x)],[(!finite(x) && x==x)],[Provide a macro to do isinf]) 942 AC_DEFINE([isinf(x)],[(!finite(x) && x==x)],[Provide a macro to do isinf])
931]) 943])
932 944LIBS="$LIBS $LIBM"
933LDFLAGS="$save_LDFLAGS" 945LDFLAGS="$save_LDFLAGS"
934 946
935# Provided by regex.h 947# Provided by regex.h
@@ -1791,8 +1803,7 @@ if test $HELP_ENABLE = yes; then
1791 echo " Batik (SVG) ............ = $BATIK" 1803 echo " Batik (SVG) ............ = $BATIK"
1792 echo " Saxon XSLT ............. = $SAXON" 1804 echo " Saxon XSLT ............. = $SAXON"
1793 echo " FOP (XML => PDF) ....... = $FOP" 1805 echo " FOP (XML => PDF) ....... = $FOP"
1794 echo " JLaTeXMath FOP ........ = $JLATEXMATH_FOP" 1806 echo " JLaTeXMath-FOP ......... = $JLATEXMATH_FOP"
1795 echo " Jeuclid (MathML) ....... = $JEUCLID_CORE"
1796 echo " Commons I/O ............ = $COMMONS_IO" 1807 echo " Commons I/O ............ = $COMMONS_IO"
1797 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS" 1808 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS"
1798 echo " XML commons external ... = $XML_APIS_EXT" 1809 echo " XML commons external ... = $XML_APIS_EXT"
@@ -1827,6 +1838,7 @@ echo " JOGL ................ = $JOGL"
1827echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS" 1838echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS"
1828echo " Gluegen ............. = $GLUEGEN_RT" 1839echo " Gluegen ............. = $GLUEGEN_RT"
1829echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS" 1840echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS"
1841echo " Jeuclid (MathML) .... = $JEUCLID_CORE"
1830echo " Jhall .............. = $JHALL" 1842echo " Jhall .............. = $JHALL"
1831echo " Jrosetta (API) ...... = $JROSETTA_API" 1843echo " Jrosetta (API) ...... = $JROSETTA_API"
1832echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE" 1844echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE"
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 482ced8..f8775f6 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -159,6 +159,7 @@ LD = @LD@
159LDFLAGS = @LDFLAGS@ 159LDFLAGS = @LDFLAGS@
160LIBICONV = @LIBICONV@ 160LIBICONV = @LIBICONV@
161LIBINTL = @LIBINTL@ 161LIBINTL = @LIBINTL@
162LIBM = @LIBM@
162LIBOBJS = @LIBOBJS@ 163LIBOBJS = @LIBOBJS@
163LIBS = @LIBS@ 164LIBS = @LIBS@
164LIBTOOL = @LIBTOOL@ 165LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index dfd4530..9b44c1c 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -225,6 +225,7 @@ LD = @LD@
225LDFLAGS = @LDFLAGS@ 225LDFLAGS = @LDFLAGS@
226LIBICONV = @LIBICONV@ 226LIBICONV = @LIBICONV@
227LIBINTL = @LIBINTL@ 227LIBINTL = @LIBINTL@
228LIBM = @LIBM@
228LIBOBJS = @LIBOBJS@ 229LIBOBJS = @LIBOBJS@
229LIBS = @LIBS@ 230LIBS = @LIBS@
230LIBTOOL = @LIBTOOL@ 231LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index 0a83df3..cfe780d 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -197,6 +197,7 @@ LD = @LD@
197LDFLAGS = @LDFLAGS@ 197LDFLAGS = @LDFLAGS@
198LIBICONV = @LIBICONV@ 198LIBICONV = @LIBICONV@
199LIBINTL = @LIBINTL@ 199LIBINTL = @LIBINTL@
200LIBM = @LIBM@
200LIBOBJS = @LIBOBJS@ 201LIBOBJS = @LIBOBJS@
201LIBS = @LIBS@ 202LIBS = @LIBS@
202LIBTOOL = @LIBTOOL@ 203LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 0717bdb..01a43ed 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -227,6 +227,7 @@ LD = @LD@
227LDFLAGS = @LDFLAGS@ 227LDFLAGS = @LDFLAGS@
228LIBICONV = @LIBICONV@ 228LIBICONV = @LIBICONV@
229LIBINTL = @LIBINTL@ 229LIBINTL = @LIBINTL@
230LIBM = @LIBM@
230LIBOBJS = @LIBOBJS@ 231LIBOBJS = @LIBOBJS@
231LIBS = @LIBS@ 232LIBS = @LIBS@
232LIBTOOL = @LIBTOOL@ 233LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 23904e5..732f025 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -227,6 +227,7 @@ LD = @LD@
227LDFLAGS = @LDFLAGS@ 227LDFLAGS = @LDFLAGS@
228LIBICONV = @LIBICONV@ 228LIBICONV = @LIBICONV@
229LIBINTL = @LIBINTL@ 229LIBINTL = @LIBINTL@
230LIBM = @LIBM@
230LIBOBJS = @LIBOBJS@ 231LIBOBJS = @LIBOBJS@
231LIBS = @LIBS@ 232LIBS = @LIBS@
232LIBTOOL = @LIBTOOL@ 233LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index a1405c6..256315b 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -225,6 +225,7 @@ LD = @LD@
225LDFLAGS = @LDFLAGS@ 225LDFLAGS = @LDFLAGS@
226LIBICONV = @LIBICONV@ 226LIBICONV = @LIBICONV@
227LIBINTL = @LIBINTL@ 227LIBINTL = @LIBINTL@
228LIBM = @LIBM@
228LIBOBJS = @LIBOBJS@ 229LIBOBJS = @LIBOBJS@
229LIBS = @LIBS@ 230LIBS = @LIBS@
230LIBTOOL = @LIBTOOL@ 231LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index 24d8323..679f594 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -221,6 +221,7 @@ LD = @LD@
221LDFLAGS = @LDFLAGS@ 221LDFLAGS = @LDFLAGS@
222LIBICONV = @LIBICONV@ 222LIBICONV = @LIBICONV@
223LIBINTL = @LIBINTL@ 223LIBINTL = @LIBINTL@
224LIBM = @LIBM@
224LIBOBJS = @LIBOBJS@ 225LIBOBJS = @LIBOBJS@
225LIBS = @LIBS@ 226LIBS = @LIBS@
226LIBTOOL = @LIBTOOL@ 227LIBTOOL = @LIBTOOL@
diff --git a/scilab/m4/docbook.m4 b/scilab/m4/docbook.m4
index 1cab527..24f63c3 100644
--- a/scilab/m4/docbook.m4
+++ b/scilab/m4/docbook.m4
@@ -54,11 +54,6 @@ AC_ARG_WITH(docbook,
54 FOP=$PACKAGE_JAR_FILE 54 FOP=$PACKAGE_JAR_FILE
55 AC_SUBST(FOP) 55 AC_SUBST(FOP)
56 56
57 # MathML rendering solution
58 AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
59 JEUCLID_CORE=$PACKAGE_JAR_FILE
60 AC_SUBST(JEUCLID_CORE)
61
62 # Commons I/O library 57 # Commons I/O library
63 AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library]) 58 AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
64 COMMONS_IO=$PACKAGE_JAR_FILE 59 COMMONS_IO=$PACKAGE_JAR_FILE
diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
index 94ecf88..9b75699 100644
--- a/scilab/m4/java.m4
+++ b/scilab/m4/java.m4
@@ -815,7 +815,8 @@ AC_DEFUN([AC_JAVA_CHECK_PACKAGE], [
815# jar_resolved=`ls $jar 2>/dev/null` 815# jar_resolved=`ls $jar 2>/dev/null`
816# echo "looking for $jar_resolved" 816# echo "looking for $jar_resolved"
817# TODO check the behaviour when spaces 817# TODO check the behaviour when spaces
818 jar_resolved=`ls -r $jar 2>/dev/null` 818 jars_resolved=`ls $jar 2>/dev/null`
819 for jar_resolved in $jars_resolved; do # If several jars matches
819 if test -e "$jar_resolved"; then 820 if test -e "$jar_resolved"; then
820 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 821 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
821 AC_JAVA_TRY_COMPILE([import $2;], , "no", [ 822 AC_JAVA_TRY_COMPILE([import $2;], , "no", [
@@ -828,7 +829,13 @@ AC_DEFUN([AC_JAVA_CHECK_PACKAGE], [
828 829
829 ]) 830 ])
830 fi 831 fi
832 done
833 # If ls returns several results and the first one is OK, stop the search
834 if test "$found_jar" = "yes"; then
835 break
836 fi
831 done 837 done
838 # If found, no need to search in other directory
832 if test "$found_jar" = "yes"; then 839 if test "$found_jar" = "yes"; then
833 break 840 break
834 fi 841 fi
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);