* Bug #10168 fixed - kron produced a segfault in some cases.
+* Bug #10336 fixed - Default key of rand was changed from "uniform" to "normal".
+
* Bug #10555 fixed - Scilab failed to build with some configure options.
* Bug #10583 fixed - ./configure --without-xcos did not work.
* Bug #13333 fixed - Selecting "Offline mode" in Scilab installer installed
Scilab in "Command line mode" (without GUI modules).
+* Bug #13336 fixed - In SciNotes it was not possible to complete brackets only at eol.
+
* Bug #13344 fixed - User defined ticks were not drawn at the right position.
* Bug #13345 fixed - Scilab did not start on Debian Wheezy (GLIBC issue).
+* Bug #13346 fixed - Filter did not works for simple delays.
+ Improved documentation on the function filter.
+
* Bug #13349 fixed - Double-clicking on a MAT-file in file browser did not load it.
* Bug #13351 fixed - xstringb failed with LaTeX code.
* Bug #13358 fixed - Intersect and unique were slow due to an issue in quicksort implementation.
+* Bug #13359 fixed - Nyquist datatip with symetry now displaying properly
+ negative frequencies
+
* Bug #13364 fixed - Scilab did not start on CentOS 6.5, RedHat 5.4, RedHat 5.5 (GLIBC issue).
* Bug #13365 fixed - Data bounds were not correctly updated in 3-D.
* Bug #13426 fixed - optim help page was written with bad indentation.
+* Bug #13432 fixed - xstringl help page was not clear about fonts and Latex-rendered text.
+
* Bug #13435 fixed - Windows version crashes when calling xmlRemove on the first child.
* Bug #13438 fixed - drawaxis did not return the handle of the created axis.
* Bug #13510 fixed - Datatip callback cleared 'd'.
+* Bug #13512 fixed - dae crashed if the evaluation function had wrong prototype.
+
+* Bug #13515 fixed - There were wrong results for matrix/hypermatrix with bitset function.
+
+* Bug #13524 fixed - strtod did not ignore the tabs and CR.
+
+* Bug #13527 fixed - hilb did not check correctly the type of first input argument.
+
+* Bug #13554 fixed - rubberbox returns wrong values.
+
Xcos Bug Fixes
==============
* Bug #13396 fixed - MBLOCK did not work with an external file containing the modelica class.
-* Bug #13513 fixed - EXPRESSION block with "u1" as expression failed with a
+* Bug #13436 fixed - STEP function was not delayed with the Continuous Fix Delay.
+
+* Bug #13443 fixed - There was no image on CSCOPXY3D block.
+
+* Bug #13513 fixed - EXPRESSION block with "u1" as expression failed with a
singularity error.
* Bug #13514 fixed - External modules' loader_pal.sce file contained absolute path.
+* Bug #13540 fixed - Tkscale block did not respect min and max value.
+
+* Bug #13553 fixed - "Export all diagrams" failed if the directory did not exist.
+
Known issues
=============
http://bugzilla.scilab.org/
-
Changes between version 5.4.1 and 5.5.0
=======================================
with_javasci
enable_compilation_tests
with_gui
-with_build_swig
+enable_build_swig
enable_build_giws
with_fink_prefix
with_min_macosx_version
the C/C++ code
--enable-compilation-tests
Enable unitary tests and checks at compilation time
+ --enable-build-swig=path
+ Regenerate Java => C and Scilab => C wrappers
+ produces by Swig
--enable-build-giws Regenerate C/C++ => Java wrappers produces by Giws
--disable-nls do not use Native Language Support
--disable-build-localization
--without-javasci Disable the Java/Scilab interface (javasci)
--without-gui Disable the Scilab Graphical User Interface (GUI).
Intended for embedded/clustering/grid Scilab
- --enable-build-swig=path
- Regenerate Java => C and Scilab => C wrappers
- produces by Swig
--with-fink-prefix Provide a fink prefix. Default: /sw/
--with-min-macosx-version
Force compilers to generate binaries compatible with
fi
-
-# Check whether --with-build-swig was given.
-if test "${with_build_swig+set}" = set; then :
- withval=$with_build_swig; with_build_swig=$withval
+# Check whether --enable-build-swig was given.
+if test "${enable_build_swig+set}" = set; then :
+ enableval=$enable_build_swig; with_build_swig=$withval
else
with_build_swig=no
$as_echo_n "checking to see if the java compiler works... " >&6; }
cat << \EOF > conftest.java
-// #line 11053 "configure"
+// #line 11052 "configure"
import java.util.regex.Pattern;
if test "x$ac_java_jvm_name" = "x" ; then
cat << \EOF > conftest.java
-// #line 11140 "configure"
+// #line 11139 "configure"
import java.util.regex.Pattern;
import gnu.java.io.EncodingManager;
# The class java.nio.charset.Charset is new to 1.4
cat << \EOF > conftest.java
-// #line 11224 "configure"
+// #line 11223 "configure"
import java.util.regex.Pattern;
import java.nio.charset.Charset;
# The class java.lang.StringBuilder is new to 1.5
cat << \EOF > conftest.java
-// #line 11289 "configure"
+// #line 11288 "configure"
import java.util.regex.Pattern;
import java.lang.StringBuilder;
# The class java.util.ArrayDeque is new to 1.6
cat << \EOF > conftest.java
-// #line 11354 "configure"
+// #line 11353 "configure"
import java.util.regex.Pattern;
import java.util.ArrayDeque;
# The class java.nio.file.Path is new to 1.7
cat << \EOF > conftest.java
-// #line 11419 "configure"
+// #line 11418 "configure"
import java.util.regex.Pattern;
import java.nio.file.Path;
# The class java.util.stream.DoubleStream is new to 1.8
cat << \EOF > conftest.java
-// #line 11484 "configure"
+// #line 11483 "configure"
import java.util.regex.Pattern;
import java.util.stream.DoubleStream;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 12862 "configure"
+// #line 12861 "configure"
import java.util.regex.Pattern;
import com.mxgraph.model.mxCell;
if test "x" == "x"; then
cat << \EOF > conftest.java
-// #line 12969 "configure"
+// #line 12968 "configure"
import java.util.regex.Pattern;
import com.mxgraph.view.mxGraph;
else
cat << \EOF > conftest.java
-// #line 13041 "configure"
+// #line 13040 "configure"
import java.util.regex.Pattern;
import com.mxgraph.view.mxGraph;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13135 "configure"
+// #line 13134 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.scirenderer.PackageInfo;
if test "x" == "x"; then
cat << \EOF > conftest.java
-// #line 13242 "configure"
+// #line 13241 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.scirenderer.PackageInfo;
else
cat << \EOF > conftest.java
-// #line 13314 "configure"
+// #line 13313 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.scirenderer.PackageInfo;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13413 "configure"
+// #line 13412 "configure"
import java.util.regex.Pattern;
import org.flexdock.docking.DockingManager;
if test "x" == "x"; then
cat << \EOF > conftest.java
-// #line 13520 "configure"
+// #line 13519 "configure"
import java.util.regex.Pattern;
import org.flexdock.util.Utilities;
else
cat << \EOF > conftest.java
-// #line 13592 "configure"
+// #line 13591 "configure"
import java.util.regex.Pattern;
import org.flexdock.util.Utilities;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13683 "configure"
+// #line 13682 "configure"
import java.util.regex.Pattern;
import com.jgoodies.looks.common.MenuItemRenderer;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13800 "configure"
+// #line 13799 "configure"
import java.util.regex.Pattern;
import com.jgoodies.looks.common.MenuItemRenderer;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13918 "configure"
+// #line 13917 "configure"
import java.util.regex.Pattern;
import com.l2fprod.util.AccessUtils;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 14035 "configure"
+// #line 14034 "configure"
import java.util.regex.Pattern;
import javax.media.opengl.glu.GLUnurbs;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 14258 "configure"
+// #line 14257 "configure"
import java.util.regex.Pattern;
import jogamp.common.os.MachineDescriptionRuntime;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 14432 "configure"
+// #line 14431 "configure"
import java.util.regex.Pattern;
import javax.help.JHelp;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 14547 "configure"
+// #line 14546 "configure"
import java.util.regex.Pattern;
import javax.help.JHelp;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 14665 "configure"
+// #line 14664 "configure"
import java.util.regex.Pattern;
import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 14779 "configure"
+// #line 14778 "configure"
import java.util.regex.Pattern;
import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 14897 "configure"
+// #line 14896 "configure"
import java.util.regex.Pattern;
import com.artenum.rosetta.core.action.AbstractConsoleAction;
if test "x" == "x"; then
cat << \EOF > conftest.java
-// #line 15003 "configure"
+// #line 15002 "configure"
import java.util.regex.Pattern;
import com.artenum.rosetta.util.ConfigurationBuilder;
else
cat << \EOF > conftest.java
-// #line 15075 "configure"
+// #line 15074 "configure"
import java.util.regex.Pattern;
import com.artenum.rosetta.util.ConfigurationBuilder;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 15168 "configure"
+// #line 15167 "configure"
import java.util.regex.Pattern;
import net.sourceforge.jeuclid.LayoutContext;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 15287 "configure"
+// #line 15286 "configure"
import java.util.regex.Pattern;
import org.apache.fop.pdf.PDFInfo;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 15411 "configure"
+// #line 15410 "configure"
import java.util.regex.Pattern;
import org.freehep.graphics2d.VectorGraphics;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 15528 "configure"
+// #line 15527 "configure"
import java.util.regex.Pattern;
import org.freehep.graphicsio.emf.EMFGraphics2D;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 15645 "configure"
+// #line 15644 "configure"
import java.util.regex.Pattern;
import org.freehep.graphicsio.VectorGraphicsIO;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 15762 "configure"
+// #line 15761 "configure"
import java.util.regex.Pattern;
import org.freehep.util.io.XMLSequence;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 15879 "configure"
+// #line 15878 "configure"
import java.util.regex.Pattern;
import org.freehep.util.StringUtilities;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 15997 "configure"
+// #line 15996 "configure"
import java.util.regex.Pattern;
import org.apache.batik.parser.Parser;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 16114 "configure"
+// #line 16113 "configure"
import java.util.regex.Pattern;
import org.apache.batik.parser.Parser;
if test "x" == "x"; then
cat << \EOF > conftest.java
-// #line 16221 "configure"
+// #line 16220 "configure"
import java.util.regex.Pattern;
import org.apache.batik.Version;
else
cat << \EOF > conftest.java
-// #line 16293 "configure"
+// #line 16292 "configure"
import java.util.regex.Pattern;
import org.apache.batik.Version;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 16384 "configure"
+// #line 16383 "configure"
import java.util.regex.Pattern;
import org.apache.commons.io.output.CountingOutputStream;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 16501 "configure"
+// #line 16500 "configure"
import java.util.regex.Pattern;
import org.apache.xmlgraphics.util.Service;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 16618 "configure"
+// #line 16617 "configure"
import java.util.regex.Pattern;
import org.apache.avalon.framework.configuration.ConfigurationException;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 16735 "configure"
+// #line 16734 "configure"
import java.util.regex.Pattern;
import org.w3c.dom.svg.SVGDocument;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 16852 "configure"
+// #line 16851 "configure"
import java.util.regex.Pattern;
import org.w3c.dom.svg.SVGDocument;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 16973 "configure"
+// #line 16972 "configure"
import java.util.regex.Pattern;
import org.apache.commons.logging.LogFactory;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 17090 "configure"
+// #line 17089 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.jlatexmath.TeXFormula;
if test "x" == "x"; then
cat << \EOF > conftest.java
-// #line 17197 "configure"
+// #line 17196 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.jlatexmath.TeXFormula;
else
cat << \EOF > conftest.java
-// #line 17269 "configure"
+// #line 17268 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.jlatexmath.TeXFormula;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 17360 "configure"
+// #line 17359 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 17483 "configure"
+// #line 17482 "configure"
import java.util.regex.Pattern;
import com.puppycrawl.tools.checkstyle.CheckStyleTask;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 17600 "configure"
+// #line 17599 "configure"
import java.util.regex.Pattern;
import org.apache.commons.beanutils.Converter;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 17717 "configure"
+// #line 17716 "configure"
import java.util.regex.Pattern;
import antlr.TokenStreamException;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 17834 "configure"
+// #line 17833 "configure"
import java.util.regex.Pattern;
import org.junit.Assert;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 17948 "configure"
+// #line 17947 "configure"
import java.util.regex.Pattern;
import org.junit.Assert;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 18069 "configure"
+// #line 18068 "configure"
import java.util.regex.Pattern;
import net.sourceforge.cobertura.merge.Main;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 18186 "configure"
+// #line 18185 "configure"
import java.util.regex.Pattern;
import org.objectweb.asm.Type;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 18300 "configure"
+// #line 18299 "configure"
import java.util.regex.Pattern;
import org.objectweb.asm.Type;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 18417 "configure"
+// #line 18416 "configure"
import java.util.regex.Pattern;
import org.eclipse.jdt.core.compiler.batch.BatchCompiler;
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
cat > conftest.$ac_ext <<EOF
-#line 26961 "configure"
+#line 26960 "configure"
#include "confdefs.h"
#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
cat > conftest.$ac_ext <<EOF
-#line 27272 "configure"
+#line 27271 "configure"
#include "confdefs.h"
#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 27856 "configure"
+// #line 27855 "configure"
import java.util.regex.Pattern;
import net.sf.saxon.Version;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 27971 "configure"
+// #line 27970 "configure"
import java.util.regex.Pattern;
import net.sf.saxon.Version;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 28087 "configure"
+// #line 28086 "configure"
import java.util.regex.Pattern;
import com.icl.saxon.Loader;
AC_ARG_WITH(gui,
AC_HELP_STRING([--without-gui],[Disable the Scilab Graphical User Interface (GUI). Intended for embedded/clustering/grid Scilab ]))
-AC_ARG_WITH(build-swig,
+AC_ARG_ENABLE(build-swig,
AC_HELP_STRING([--enable-build-swig=path],[Regenerate Java => C and Scilab => C wrappers produces by Swig]),
[with_build_swig=$withval],
[with_build_swig=no]
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/cpp/sci_notify.cpp, line: 46
# File: sci_gateway/cpp/sci_notify.cpp, line: 54
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: src/cpp/api_boolean.cpp, line: 35
# File: src/cpp/api_boolean_sparse.cpp, line: 33
# File: src/cpp/api_string.cpp, line: 646
# File: src/cpp/api_string.cpp, line: 659
# File: src/cpp/api_string.cpp, line: 670
-# File: src/cpp/api_string.cpp, line: 695
-# File: src/cpp/api_string.cpp, line: 719
-# File: src/cpp/api_string.cpp, line: 729
-# File: src/cpp/api_string.cpp, line: 754
-# File: src/cpp/api_string.cpp, line: 764
-# File: src/cpp/api_string.cpp, line: 777
-# File: src/cpp/api_string.cpp, line: 787
-# File: src/cpp/api_string.cpp, line: 811
-# File: src/cpp/api_string.cpp, line: 828
-# File: src/cpp/api_string.cpp, line: 838
-# File: src/cpp/api_string.cpp, line: 863
-# File: src/cpp/api_string.cpp, line: 876
-# File: src/cpp/api_string.cpp, line: 929
-# File: src/cpp/api_string.cpp, line: 942
-# File: src/cpp/api_string.cpp, line: 955
+# File: src/cpp/api_string.cpp, line: 700
+# File: src/cpp/api_string.cpp, line: 724
+# File: src/cpp/api_string.cpp, line: 734
+# File: src/cpp/api_string.cpp, line: 759
+# File: src/cpp/api_string.cpp, line: 769
+# File: src/cpp/api_string.cpp, line: 782
+# File: src/cpp/api_string.cpp, line: 792
+# File: src/cpp/api_string.cpp, line: 816
+# File: src/cpp/api_string.cpp, line: 833
+# File: src/cpp/api_string.cpp, line: 843
+# File: src/cpp/api_string.cpp, line: 868
+# File: src/cpp/api_string.cpp, line: 881
+# File: src/cpp/api_string.cpp, line: 933
+# File: src/cpp/api_string.cpp, line: 946
+# File: src/cpp/api_string.cpp, line: 959
#, c-format
msgid "%s: Unable to get argument data"
msgstr ""
msgstr ""
#
-# File: src/cpp/api_string.cpp, line: 711
-# File: src/cpp/api_string.cpp, line: 746
+# File: src/cpp/api_string.cpp, line: 716
+# File: src/cpp/api_string.cpp, line: 751
#, c-format
msgid "%s: Wrong type for input argument \"%s\": A single string expected.\n"
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_dnaupd.c, line: 98
# File: sci_gateway/c/sci_dnaupd.c, line: 116
# File: macros/eigs.sci, line: 952
# File: macros/eigs.sci, line: 1050
# File: macros/eigs.sci, line: 1067
-# File: macros/eigs.sci, line: 1101
+# File: macros/eigs.sci, line: 1103
#, c-format
msgid "%s: Error with %s: info = %d.\n"
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: macros/atomsAutoload.sci, line: 47
# File: macros/atomsLoad.sci, line: 38
#
# File: macros/atomsShow.sci, line: 81
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 265
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 269
msgid "Version"
msgstr ""
#
# File: macros/atomsShow.sci, line: 84
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 218
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 222
msgid "Author(s)"
msgstr ""
#
# File: macros/atomsShow.sci, line: 98
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 268
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 272
msgid "Description"
msgstr ""
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 195
-# File: macros/atoms_gui/atomsGui.sci, line: 197
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 59
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 68
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 80
+# File: macros/atoms_gui/atomsGui.sci, line: 199
+# File: macros/atoms_gui/atomsGui.sci, line: 201
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 63
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 72
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 84
msgid "ATOMS error"
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 195
+# File: macros/atoms_gui/atomsGui.sci, line: 199
msgid ""
"No ATOMS module is available. Please, check your Internet connection or make "
"sure that your OS is compatible with ATOMS."
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 197
+# File: macros/atoms_gui/atomsGui.sci, line: 201
msgid "No ATOMS module is available: your repository list is empty."
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 211
+# File: macros/atoms_gui/atomsGui.sci, line: 215
msgid "File"
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 212
+# File: macros/atoms_gui/atomsGui.sci, line: 216
msgid "Installed modules"
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 213
+# File: macros/atoms_gui/atomsGui.sci, line: 217
msgid "Update List of Packages"
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 214
+# File: macros/atoms_gui/atomsGui.sci, line: 218
msgid "Close"
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 215
+# File: macros/atoms_gui/atomsGui.sci, line: 219
msgid "?"
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 216
+# File: macros/atoms_gui/atomsGui.sci, line: 220
msgid "Atoms Help..."
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 225
+# File: macros/atoms_gui/atomsGui.sci, line: 229
msgid "Back"
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 226
+# File: macros/atoms_gui/atomsGui.sci, line: 230
msgid "Remove"
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 227
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 55
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 295
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 317
+# File: macros/atoms_gui/atomsGui.sci, line: 231
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 59
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 299
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 321
msgid "Install"
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 228
+# File: macros/atoms_gui/atomsGui.sci, line: 232
msgid "Autoload"
msgstr ""
#
-# File: macros/atoms_gui/atomsGui.sci, line: 232
+# File: macros/atoms_gui/atomsGui.sci, line: 236
msgid "List of installed modules"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 56
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 60
msgid "Installing"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 59
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 63
msgid "Installation failed!"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 62
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 66
msgid "Installation done! Please restart Scilab to take changes into account."
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 65
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 69
msgid "Updating"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 68
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 72
msgid "Update failed!"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 71
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 75
msgid "Update done! Please restart Scilab to take changes into account."
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 77
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 81
msgid "Removing"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 80
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 84
msgid "Remove failed!"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 83
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 87
msgid "Remove done! Please restart Scilab to take changes into account. "
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 91
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 95
msgid "The module will be automatically loaded at next startup."
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 95
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 99
msgid ""
"Autoload at startup is canceled. The Toolboxes menu or atomsLoad() can be "
"used to load the module when needed."
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 203
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 207
msgid "Download size"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 242
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 246
msgid "See also"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 255
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 259
msgid "Release date"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 302
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 306
msgid "Update"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 303
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 307
#, c-format
msgid "A new version ('%s') of '%s' is available"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 327
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 331
msgid "Bytes"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 329
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 333
msgid "KB"
msgstr ""
#
-# File: macros/atoms_gui/cbAtomsGui.sci, line: 331
+# File: macros/atoms_gui/cbAtomsGui.sci, line: 335
msgid "MB"
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_and.c, line: 40
# File: sci_gateway/c/sci_and.c, line: 58
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_contr.c, line: 72
# File: sci_gateway/c/sci_contr.c, line: 78
msgstr ""
#
-# File: macros/evans.sci, line: 215
+# File: macros/evans.sci, line: 216
#, c-format
msgid "%s: Curve truncated to the first %d discretization points.\n"
msgstr ""
xpoly([R(k,:) R(k,$:-1:1)],[I(k,:) -I(k,$:-1:1)]);
e=gce();e.foreground=k;
e.display_function = "formatNyquistTip";
- e.display_function_data = [F(kf,:) F(kf,$:-1:1)];
+ e.display_function_data = [F(kf,:) -1*F(kf,$:-1:1)];
Curves=[Curves,e];
kf=kf+ilf;
end
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Pierre-Aime Agnel
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 13359 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13359
+//
+// <-- Short Description -->
+// Nyquist datatip were not displaying negative frequencies properly
+//
+// <-- TEST WITH GRAPHIC -->
+s = poly(0, 's');
+h = syslin('c', 1 / (s + 1));
+nyquist(h);
+ax = gca();
+pl = ax.children(1).children(2);
+d1 = datatipCreate(pl, 200);
+txt_datatip = d1.text;
+assert_checkequal(strindex(txt_datatip(2), "-"), 1);
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Pierre-Aime Agnel
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 13359 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13359
+//
+// <-- Short Description -->
+// Nyquist datatip were not displaying negative frequencies properly
+//
+// <-- TEST WITH GRAPHIC -->
+
+s = poly(0, 's');
+h = syslin('c', 1 / (s + 1));
+nyquist(h);
+
+ax = gca();
+pl = ax.children(1).children(2);
+d1 = datatipCreate(pl, 200);
+txt_datatip = d1.text;
+assert_checkequal(strindex(txt_datatip(2), "-"), 1);
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: src/java/org/scilab/modules/commons/xml/ScilabXMLUtilities.java, line: 59
msgid "Could not save file: "
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: macros/%b_cumprod.sci, line: 31
# File: macros/%b_cumsum.sci, line: 31
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_completion.c, line: 43
# File: sci_gateway/c/sci_completion.c, line: 83
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_clc.c, line: 41
# File: sci_gateway/c/sci_lines.c, line: 206
msgstr ""
#
-# File: src/c/cmdLine/getKey.c, line: 361
+# File: src/c/cmdLine/getKey.c, line: 371
# File: src/java/org/scilab/modules/console/SciConsole.java, line: 560
#, c-format
msgid ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: examples/capi/call_scifunction/sci_call_scifunc.c, line: 37
# File: examples/capi/call_scifunction/sci_call_scifunc.c, line: 55
# File: examples/capi/call_scifunction/sci_call_scifunc.c, line: 48
# File: examples/capi/call_scifunction/sci_call_scifunc.c, line: 66
# File: sci_gateway/c/sci_errclear.c, line: 47
-# File: sci_gateway/c/sci_error.c, line: 179
-# File: sci_gateway/c/sci_error.c, line: 219
-# File: sci_gateway/c/sci_error.c, line: 225
-# File: sci_gateway/c/sci_error.c, line: 281
+# File: sci_gateway/c/sci_error.c, line: 220
+# File: sci_gateway/c/sci_error.c, line: 260
+# File: sci_gateway/c/sci_error.c, line: 266
+# File: sci_gateway/c/sci_error.c, line: 322
# File: sci_gateway/c/sci_exit.c, line: 76
# File: sci_gateway/c/sci_funcprot.c, line: 65
# File: sci_gateway/c/sci_mode.c, line: 64
#
# File: sci_gateway/c/sci_debug.c, line: 40
# File: sci_gateway/c/sci_errclear.c, line: 35
-# File: sci_gateway/c/sci_error.c, line: 80
-# File: sci_gateway/c/sci_error.c, line: 111
-# File: sci_gateway/c/sci_error.c, line: 119
+# File: sci_gateway/c/sci_error.c, line: 82
+# File: sci_gateway/c/sci_error.c, line: 123
+# File: sci_gateway/c/sci_error.c, line: 131
# File: sci_gateway/c/sci_exit.c, line: 47
# File: sci_gateway/c/sci_exit.c, line: 55
# File: sci_gateway/c/sci_format.c, line: 82
#
# File: sci_gateway/c/sci_debug.c, line: 70
-# File: sci_gateway/c/sci_error.c, line: 154
-# File: sci_gateway/c/sci_error.c, line: 185
-# File: sci_gateway/c/sci_error.c, line: 231
-# File: sci_gateway/c/sci_error.c, line: 244
-# File: sci_gateway/c/sci_error.c, line: 287
-# File: sci_gateway/c/sci_error.c, line: 312
-# File: sci_gateway/c/sci_error.c, line: 350
+# File: sci_gateway/c/sci_error.c, line: 195
+# File: sci_gateway/c/sci_error.c, line: 226
+# File: sci_gateway/c/sci_error.c, line: 272
+# File: sci_gateway/c/sci_error.c, line: 285
+# File: sci_gateway/c/sci_error.c, line: 328
+# File: sci_gateway/c/sci_error.c, line: 353
+# File: sci_gateway/c/sci_error.c, line: 391
# File: sci_gateway/c/sci_format.c, line: 127
# File: sci_gateway/c/sci_format.c, line: 283
# File: sci_gateway/c/sci_format.c, line: 289
#
# File: sci_gateway/c/sci_debug.c, line: 77
# File: sci_gateway/c/sci_errclear.c, line: 56
-# File: sci_gateway/c/sci_error.c, line: 192
-# File: sci_gateway/c/sci_error.c, line: 238
-# File: sci_gateway/c/sci_error.c, line: 251
-# File: sci_gateway/c/sci_error.c, line: 294
+# File: sci_gateway/c/sci_error.c, line: 233
+# File: sci_gateway/c/sci_error.c, line: 279
+# File: sci_gateway/c/sci_error.c, line: 292
+# File: sci_gateway/c/sci_error.c, line: 335
# File: sci_gateway/c/sci_format.c, line: 146
# File: sci_gateway/c/sci_format.c, line: 303
# File: sci_gateway/c/sci_format.c, line: 361
msgstr ""
#
-# File: sci_gateway/c/sci_error.c, line: 94
+# File: sci_gateway/c/sci_error.c, line: 91
+# File: sci_gateway/c/sci_error.c, line: 104
+# File: sci_gateway/c/sci_error.c, line: 140
+# File: sci_gateway/c/sci_error.c, line: 152
+# File: sci_gateway/c/sci_error.c, line: 165
+# File: sci_gateway/c/sci_error.c, line: 169
#, c-format
msgid "%s: Wrong type for input argument #%d.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_error.c, line: 137
+# File: sci_gateway/c/sci_error.c, line: 178
#, c-format
msgid "%s: Wrong type for input argument.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_error.c, line: 165
-# File: sci_gateway/c/sci_error.c, line: 323
+# File: sci_gateway/c/sci_error.c, line: 206
+# File: sci_gateway/c/sci_error.c, line: 364
# File: sci_gateway/c/sci_format.c, line: 227
# File: sci_gateway/c/sci_format.c, line: 265
# File: sci_gateway/c/sci_format.c, line: 271
msgstr ""
#
-# File: sci_gateway/c/sci_error.c, line: 198
-# File: sci_gateway/c/sci_error.c, line: 257
-# File: sci_gateway/c/sci_error.c, line: 263
-# File: sci_gateway/c/sci_error.c, line: 300
+# File: sci_gateway/c/sci_error.c, line: 239
+# File: sci_gateway/c/sci_error.c, line: 298
+# File: sci_gateway/c/sci_error.c, line: 304
+# File: sci_gateway/c/sci_error.c, line: 341
#, c-format
msgid ""
"%s: Wrong value for input argument #%d: Value greater than 0 expected.\n"
msgstr ""
#
-# File: src/c/callinterf.c, line: 128
+# File: src/c/callinterf.c, line: 126
msgid "Aborting current computation\n"
msgstr ""
#
-# File: src/c/callinterf.c, line: 142
+# File: src/c/callinterf.c, line: 140
#, c-format
msgid "Error: Not a valid gateway ID %d. Should be between %d and %d.\n"
msgstr ""
msgstr ""
#
-# File: src/c/signal_mgmt.c, line: 408
+# File: src/c/signal_mgmt.c, line: 405
#, c-format
msgid ""
"A fatal error has been detected by Scilab.\n"
msgstr ""
#
-# File: src/c/tmpdir.c, line: 59
+# File: src/c/tmpdir.c, line: 58
msgid "Cannot find Windows temporary directory (1)."
msgstr ""
#
-# File: src/c/tmpdir.c, line: 59
-# File: src/c/tmpdir.c, line: 81
+# File: src/c/tmpdir.c, line: 58
+# File: src/c/tmpdir.c, line: 80
msgid "Error"
msgstr ""
#
-# File: src/c/tmpdir.c, line: 80
+# File: src/c/tmpdir.c, line: 79
#, c-format
msgid "Impossible to create : %s"
msgstr ""
#
-# File: src/c/tmpdir.c, line: 143
+# File: src/c/tmpdir.c, line: 142
#, c-format
msgid "Warning: Could not resolve the realpath of %s.\n"
msgstr ""
#
-# File: src/c/tmpdir.c, line: 149
+# File: src/c/tmpdir.c, line: 148
#, c-format
msgid "Error: Could not create %s: %s\n"
msgstr ""
msgstr ""
#
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 73
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 73
msgid "Startup execution:"
msgstr ""
#
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 74
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 74
msgid " loading initial environment"
msgstr ""
#
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 95
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 95
#, c-format
msgid "Failed to execute %s:"
msgstr ""
#
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 163
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 163
msgid "&File"
msgstr ""
#
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 164
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 164
msgid "&Edit"
msgstr ""
#
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 165
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 165
msgid "&Preferences"
msgstr ""
#
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 166
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 166
msgid "&Control"
msgstr ""
#
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 167
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 169
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 172
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 175
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 178
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 167
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 169
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 172
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 175
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 178
msgid "&Applications"
msgstr ""
#
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 180
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 180
msgid "&?"
msgstr ""
#
-# File: /home/couvert/git/scilab/scilab/etc/scilab.start, line: 181
+# File: /home/couvert/git/scilab_5.5/scilab/etc/scilab.start, line: 181
msgid "&Toolboxes"
msgstr ""
#
# File: macros/edit.sci, line: 41
#, c-format
-msgid "%s: %s is a uneditable hard coded function.\n"
+msgid "%s: %s is an uneditable hard coded function.\n"
msgstr ""
#
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_mlist.c, line: 35
# File: sci_gateway/c/sci_tlist.c, line: 35
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: macros/add_demo.sci, line: 38
#, c-format
msgstr ""
#
+# File: macros/demo_gui.sci, line: 41
# File: macros/demo_gui.sci, line: 63
msgid "Demonstrations"
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: macros/assert/assert_checkalmostequal.sci, line: 16
# File: macros/assert/assert_checkfilesequal.sci, line: 15
#
# File: macros/assert/assert_checkalmostequal.sci, line: 81
-# File: macros/assert/assert_checkequal.sci, line: 82
+# File: macros/assert/assert_checkequal.sci, line: 81
# File: macros/assert/assert_computedigits.sci, line: 34
#, c-format
msgid "%s: Incompatible input arguments #%d and #%d: Same sizes expected.\n"
#
# File: macros/assert/assert_checkalmostequal.sci, line: 110
-# File: macros/assert/assert_checkequal.sci, line: 154
+# File: macros/assert/assert_checkequal.sci, line: 155
#, c-format
msgid "%s: Assertion failed: expected = %s while computed = %s"
msgstr ""
#
# File: macros/assert/assert_checkequal.sci, line: 54
-# File: macros/assert/assert_checkequal.sci, line: 63
+# File: macros/assert/assert_checkequal.sci, line: 62
#, c-format
msgid "%s: Incompatible input arguments #%d and #%d: Same types expected.\n"
msgstr ""
#
-# File: macros/assert/assert_checkequal.sci, line: 91
+# File: macros/assert/assert_checkequal.sci, line: 90
#, c-format
msgid "%s: Computed is real, but expected is complex."
msgstr ""
#
-# File: macros/assert/assert_checkequal.sci, line: 95
+# File: macros/assert/assert_checkequal.sci, line: 94
#, c-format
msgid "%s: Computed is complex, but expected is real."
msgstr ""
#
-# File: macros/assert/assert_checkequal.sci, line: 152
+# File: macros/assert/assert_checkequal.sci, line: 153
#, c-format
msgid ""
"%s: Assertion failed: expected = %s while computed = %s (mean diff = %s)"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: demos/bike/bike.dem.gateway.sce, line: 10
msgid "Unstable trajectory"
msgstr ""
#
-# File: demos/flow/blackhole_interface.sci, line: 48
+# File: demos/flow/blackhole_interface.sci, line: 37
msgid "Blackhole"
msgstr ""
#
-# File: demos/flow/cylinder_interface.sci, line: 52
+# File: demos/flow/create_interface.sci, line: 58
+msgid "Simulation Parameters"
+msgstr ""
+
+#
+# File: demos/flow/cylinder_interface.sci, line: 47
msgid "Cylinder"
msgstr ""
#
-# File: demos/flow/sphere_interface.sci, line: 45
+# File: demos/flow/sphere_interface.sci, line: 40
msgid "Sphere"
msgstr ""
#
-# File: demos/ode/ode_1dvect/ode_1dvect.dem.sce, line: 44
+# File: demos/ode/ode_1dvect/ode_1dvect.dem.sce, line: 46
msgid "ODE 1D vector field"
msgstr ""
C
SAVE LID, LENID, NONNEG, NCPHI
C
+ COMMON /ierode/ierror
+C
C
C***FIRST EXECUTABLE STATEMENT DDASKR
C
* NONNEG,NTYPE,IERNLS)
C
IF(IERNLS .NE. 0)GO TO 600
+ IF(IDID.eq.-12) RETURN
C
C
C
DIMENSION WM(*),IWM(*), RPAR(*),IPAR(*)
DIMENSION PHI(NEQ,*),GAMMA(*)
EXTERNAL RES, JACD
+ COMMON /ierode/ierror
C
PARAMETER (LNRE=12, LNJE=13)
C
SAVE MULDEL, MAXIT, XRATE
DATA MULDEL/1/, MAXIT/4/, XRATE/0.25D0/
C
+C
+C
C Verify that this is the correct subroutine.
C
IERTYP = 0
C
IWM(LNRE)=IWM(LNRE)+1
CALL RES(X,Y,YPRIME,DELTA,IRES,RPAR,IPAR)
+C ierror indicates if RES had the right prototype
+ IF(ierror.ne.0) THEN
+ IDID=-12
+ RETURN
+ ENDIF
IF (IRES .LT. 0) GO TO 380
C
C If indicated, reevaluate the iteration matrix
DIMENSION WM(*),IWM(*)
DIMENSION GAMMA(*),RPAR(*),IPAR(*)
EXTERNAL RES, JACK, PSOL
+ COMMON /ierode/ierror
C
PARAMETER (LNRE=12, LNJE=13, LLOCWP=29, LLCIWP=30)
C
SAVE MULDEL, MAXIT, XRATE
DATA MULDEL/0/, MAXIT/4/, XRATE/0.25D0/
C
+C
+C
C Verify that this is the correct subroutine.
C
IERTYP = 0
C
IWM(LNRE)=IWM(LNRE)+1
CALL RES(X,Y,YPRIME,DELTA,IRES,RPAR,IPAR)
+C ierror indicates if RES had the right prototype
+ IF(ierror.ne.0) THEN
+ IDID=-12
+ RETURN
+ ENDIF
+
IF (IRES .LT. 0) GO TO 380
C
C
C
CALL RES(X,Y,YPRIME,DELTA,IRES,RPAR,IPAR)
if(iero.ne.0) return
+C IERROR indicates if RES had the right prototype
+ if(IERROR.ne.0) then
+ IDID=-12
+ return
+ endif
IF (IRES.LT.0) GO TO 430
C
C
C
C COMPUTE INITIAL DERIVATIVE, UPDATING TN AND Y, IF APPLICABLE
340 IF (INFO(11) .EQ. 0) GO TO 350
+ iero=0
CALL DDAINI(TN,Y,YPRIME,NEQ,
* RES,JAC,HO,RWORK(LWT),IDID,RPAR,IPAR,
* RWORK(LPHI),RWORK(LDELTA),RWORK(LE),
IF (RH .GT. 1.0D0) H = H/RH
526 CONTINUE
C
+ iero=0
CALL DDASTP(TN,Y,YPRIME,NEQ,
* RES,JAC,H,RWORK(LWT),INFO(1),IDID,RPAR,IPAR,
* RWORK(LPHI),RWORK(LDELTA),RWORK(LE),
IRES = 0
iero = 0
CALL RES(X,Y,YPRIME,DELTA,IRES,RPAR,IPAR)
+C IERROR indicates if RES had the right prototype
+ if(IERROR.ne.0) then
+ IDID=-11
+ return
+ endif
if(iero.ne.0) return
IF (IRES .LT. 0) GO TO 380
C
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Paul Bignier
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Non-regression test for bug 13512 -->
+//
+// <-- Bugzilla URL -->
+//http://bugzilla.scilab.org/show_bug.cgi?id=13512
+//
+// <-- Short Description -->
+// dae crashed if the evaluation function had wrong prototype
+y0 = 0;
+t0 = 0;
+t = 1;
+// ==================================================================
+// DASSL
+// -------------------------------
+// With initial yprime computation
+// The evaluation function purposely lacks the output argument 'ires'
+deff("ydot = f1(t, y)", "ydot = y^2 - y*sin(t) + cos(t)")
+refMsg = msprintf(_("Wrong number of output arguments."));
+assert_checkerror("y = dae(y0, t0, t, f1);", refMsg);
+ ***MESSAGE FROM ROUTINE DDASSL IN LIBRARY SLATEC.
+ ***POTENTIALLY RECOVERABLE ERROR, PROG ABORTED, TRACEBACK REQUESTED
+ * AT T = 1.000000D-03 AND STEPSIZE H = 1.000000D-03 THE INITIAL
+ * YPRIME COULD NOT BE COMPUTED
+ * ERROR NUMBER = -12
+ *
+ ***END OF MESSAGE
+
+ ***JOB ABORT DUE TO UNRECOVERED ERROR.
+0 ERROR MESSAGE SUMMARY
+ LIBRARY SUBROUTINE MESSAGE START NERR LEVEL COUNT
+ SLATEC DDASSL AT T = 1.000000D- -12 1 1
+
+// The evaluation function purposely lacks the input argument 'ydot'
+deff("[ydot,ires] = f2(t, y)", "ydot = y^2 - y*sin(t) + cos(t)");
+refMsg = msprintf(_("Wrong number of input arguments."));
+assert_checkerror("y = dae(y0, t0, t, f2);", refMsg);
+ ***MESSAGE FROM ROUTINE DDASSL IN LIBRARY SLATEC.
+ ***POTENTIALLY RECOVERABLE ERROR, PROG ABORTED, TRACEBACK REQUESTED
+ * AT T = 1.000000D-03 AND STEPSIZE H = 1.000000D-03 THE INITIAL
+ * YPRIME COULD NOT BE COMPUTED
+ * ERROR NUMBER = -12
+ *
+ ***END OF MESSAGE
+
+ ***JOB ABORT DUE TO UNRECOVERED ERROR.
+0 ERROR MESSAGE SUMMARY
+ LIBRARY SUBROUTINE MESSAGE START NERR LEVEL COUNT
+ SLATEC DDASSL AT T = 1.000000D- -12 1 2
+
+// ----------------------------------
+// Without initial yprime computation
+// The evaluation function purposely lacks the output argument 'ires'
+refMsg = msprintf(_("Wrong number of output arguments."));
+assert_checkerror("y = dae([y0; 0], t0, t, f1);", refMsg);
+ ***MESSAGE FROM ROUTINE DDASSL IN LIBRARY SLATEC.
+ ***POTENTIALLY RECOVERABLE ERROR, PROG ABORTED, TRACEBACK REQUESTED
+ * AT T = 1.000000D-03 AND STEPSIZE H = 1.000000D-03 THE INITIAL
+ * YPRIME COULD NOT BE COMPUTED
+ * ERROR NUMBER = -12
+ *
+ ***END OF MESSAGE
+
+ ***JOB ABORT DUE TO UNRECOVERED ERROR.
+0 ERROR MESSAGE SUMMARY
+ LIBRARY SUBROUTINE MESSAGE START NERR LEVEL COUNT
+ SLATEC DDASSL AT T = 1.000000D- -12 1 3
+
+// The evaluation function purposely lacks the input argument 'ydot'
+refMsg = msprintf(_("Wrong number of input arguments."));
+assert_checkerror("y = dae([y0; 0], t0, t, f2);", refMsg);
+ ***MESSAGE FROM ROUTINE DDASSL IN LIBRARY SLATEC.
+ ***POTENTIALLY RECOVERABLE ERROR, PROG ABORTED, TRACEBACK REQUESTED
+ * AT T = 1.000000D-03 AND STEPSIZE H = 1.000000D-03 THE INITIAL
+ * YPRIME COULD NOT BE COMPUTED
+ * ERROR NUMBER = -12
+ *
+ ***END OF MESSAGE
+
+ ***JOB ABORT DUE TO UNRECOVERED ERROR.
+0 ERROR MESSAGE SUMMARY
+ LIBRARY SUBROUTINE MESSAGE START NERR LEVEL COUNT
+ SLATEC DDASSL AT T = 1.000000D- -12 1 4
+
+// ==================================================================
+// DASRT
+deff("r = g(t, y)", "r = ones(y)");
+// -------------------------------
+// With initial yprime computation
+// The evaluation function purposely lacks the output argument 'ires'
+refMsg = msprintf(_("Wrong number of output arguments."));
+assert_checkerror("[y, r] = dae(""root"", y0, t0, t, f1, 1, g);", refMsg);
+// The evaluation function purposely lacks the input argument 'ydot'
+refMsg = msprintf(_("Wrong number of input arguments."));
+assert_checkerror("[y, r] = dae(""root"", y0, t0, t, f2, 1, g);", refMsg);
+// ----------------------------------
+// Without initial yprime computation
+// The evaluation function purposely lacks the output argument 'ires'
+refMsg = msprintf(_("Wrong number of output arguments."));
+assert_checkerror("[y, r] = dae(""root"", [y0; 0], t0, t, f1, 1, g);", refMsg);
+// The evaluation function purposely lacks the input argument 'ydot'
+refMsg = msprintf(_("Wrong number of input arguments."));
+assert_checkerror("[y, r] = dae(""root"", [y0; 0], t0, t, f2, 1, g);", refMsg);
+// ==================================================================
+// DASKR
+// -------------------------------
+// With initial yprime computation
+// The evaluation function purposely lacks the output argument 'ires'
+refMsg = msprintf(_("Wrong number of output arguments."));
+assert_checkerror("[y, r] = dae(""root2"", y0, t0, t, f1, 1, g);", refMsg);
+DASKR-- AT T (=R1) AND STEPSIZE H (=R2) THE
+DASKR-- INITIAL (Y,YPRIME) COULD NOT BE COMPUTED
+ In above message, R1 = 0.1000000000000D-02 R2 = 0.1000000000000D-02
+// The evaluation function purposely lacks the input argument 'ydot'
+refMsg = msprintf(_("Wrong number of input arguments."));
+assert_checkerror("[y, r] = dae(""root2"", y0, t0, t, f2, 1, g);", refMsg);
+DASKR-- AT T (=R1) AND STEPSIZE H (=R2) THE
+DASKR-- INITIAL (Y,YPRIME) COULD NOT BE COMPUTED
+ In above message, R1 = 0.1000000000000D-02 R2 = 0.1000000000000D-02
+// ----------------------------------
+// Without initial yprime computation
+// The evaluation function purposely lacks the output argument 'ires'
+refMsg = msprintf(_("Variable returned by scilab argument function is incorrect."));
+assert_checkerror("[y, r] = dae(""root2"", [y0; 0], t0, t, f1, 1, g);", refMsg);
+DASKR-- AT T (=R1) AND STEPSIZE H (=R2) THE
+DASKR-- INITIAL (Y,YPRIME) COULD NOT BE COMPUTED
+ In above message, R1 = 0.1000000000000D-02 R2 = 0.1000000000000D-02
+// The evaluation function purposely lacks the input argument 'ydot'
+assert_checkerror("[y, r] = dae(""root2"", [y0; 0], t0, t, f2, 1, g);", refMsg);
+DASKR-- AT T (=R1) AND STEPSIZE H (=R2) THE
+DASKR-- INITIAL (Y,YPRIME) COULD NOT BE COMPUTED
+ In above message, R1 = 0.1000000000000D-02 R2 = 0.1000000000000D-02
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Paul Bignier
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Non-regression test for bug 13512 -->
+//
+// <-- Bugzilla URL -->
+//http://bugzilla.scilab.org/show_bug.cgi?id=13512
+//
+// <-- Short Description -->
+// dae crashed if the evaluation function had wrong prototype
+
+y0 = 0;
+t0 = 0;
+t = 1;
+
+// ==================================================================
+// DASSL
+
+// -------------------------------
+// With initial yprime computation
+
+// The evaluation function purposely lacks the output argument 'ires'
+deff("ydot = f1(t, y)", "ydot = y^2 - y*sin(t) + cos(t)")
+
+refMsg = msprintf(_("Wrong number of output arguments."));
+assert_checkerror("y = dae(y0, t0, t, f1);", refMsg);
+
+// The evaluation function purposely lacks the input argument 'ydot'
+deff("[ydot,ires] = f2(t, y)", "ydot = y^2 - y*sin(t) + cos(t)");
+
+refMsg = msprintf(_("Wrong number of input arguments."));
+assert_checkerror("y = dae(y0, t0, t, f2);", refMsg);
+
+// ----------------------------------
+// Without initial yprime computation
+
+// The evaluation function purposely lacks the output argument 'ires'
+refMsg = msprintf(_("Wrong number of output arguments."));
+assert_checkerror("y = dae([y0; 0], t0, t, f1);", refMsg);
+
+// The evaluation function purposely lacks the input argument 'ydot'
+refMsg = msprintf(_("Wrong number of input arguments."));
+assert_checkerror("y = dae([y0; 0], t0, t, f2);", refMsg);
+
+
+// ==================================================================
+// DASRT
+
+deff("r = g(t, y)", "r = ones(y)");
+
+// -------------------------------
+// With initial yprime computation
+
+// The evaluation function purposely lacks the output argument 'ires'
+refMsg = msprintf(_("Wrong number of output arguments."));
+assert_checkerror("[y, r] = dae(""root"", y0, t0, t, f1, 1, g);", refMsg);
+
+// The evaluation function purposely lacks the input argument 'ydot'
+refMsg = msprintf(_("Wrong number of input arguments."));
+assert_checkerror("[y, r] = dae(""root"", y0, t0, t, f2, 1, g);", refMsg);
+
+// ----------------------------------
+// Without initial yprime computation
+
+// The evaluation function purposely lacks the output argument 'ires'
+refMsg = msprintf(_("Wrong number of output arguments."));
+assert_checkerror("[y, r] = dae(""root"", [y0; 0], t0, t, f1, 1, g);", refMsg);
+
+// The evaluation function purposely lacks the input argument 'ydot'
+refMsg = msprintf(_("Wrong number of input arguments."));
+assert_checkerror("[y, r] = dae(""root"", [y0; 0], t0, t, f2, 1, g);", refMsg);
+
+
+// ==================================================================
+// DASKR
+
+// -------------------------------
+// With initial yprime computation
+
+// The evaluation function purposely lacks the output argument 'ires'
+refMsg = msprintf(_("Wrong number of output arguments."));
+assert_checkerror("[y, r] = dae(""root2"", y0, t0, t, f1, 1, g);", refMsg);
+
+// The evaluation function purposely lacks the input argument 'ydot'
+refMsg = msprintf(_("Wrong number of input arguments."));
+assert_checkerror("[y, r] = dae(""root2"", y0, t0, t, f2, 1, g);", refMsg);
+
+// ----------------------------------
+// Without initial yprime computation
+
+// The evaluation function purposely lacks the output argument 'ires'
+refMsg = msprintf(_("Variable returned by scilab argument function is incorrect."));
+assert_checkerror("[y, r] = dae(""root2"", [y0; 0], t0, t, f1, 1, g);", refMsg);
+
+// The evaluation function purposely lacks the input argument 'ydot'
+assert_checkerror("[y, r] = dae(""root2"", [y0; 0], t0, t, f2, 1, g);", refMsg);
// builder code for ext10f.c
link_name = "ext10f"; // functions to be added to the call table
-flag = "f"; // ext10f is a C function
+flag = "f"; // ext10f is a Fortran function
files = ["ext10f.f" ]; // objects files for ext10f
libs = []; // other libs needed for linking
// builder code for ext1f.c
link_name = "ext1f"; // functions to be added to the call table
-flag = "f"; // ext1f is a C function
+flag = "f"; // ext1f is a Fortran function
files = ["ext1f.f" ]; // objects files for ext1f
libs = []; // other libs needed for linking
// builder code for ext2f.c
link_name = "ext2f"; // functions to be added to the call table
-flag = "f"; // ext2f is a C function
+flag = "f"; // ext2f is a Fortran function
files = ["ext2f.f" ]; // objects files for ext2f
libs = []; // other libs needed for linking
// builder code for ext3f.c
link_name = "ext3f"; // functions to be added to the call table
-flag = "f"; // ext3f is a C function
+flag = "f"; // ext3f is a Fortran function
files = ["ext3f.f" ]; // objects files for ext3f
libs = []; // other libs needed for linking
// builder code for ext4f.c
link_name = "ext4f"; // functions to be added to the call table
-flag = "f"; // ext4f is a C function
+flag = "f"; // ext4f is a Fortran function
files = ["ext4f.f" ]; // objects files for ext4f
libs = []; // other libs needed for linking
// builder code for ext5f.c
link_name = "ext5f"; // functions to be added to the call table
-flag = "f"; // ext5f is a C function
+flag = "f"; // ext5f is a Fortran function
files = ["ext5f.f" ]; // objects files for ext5f
libs = []; // other libs needed for linking
// builder code for ext6f.c
link_name = "ext6f"; // functions to be added to the call table
-flag = "f"; // ext6f is a C function
+flag = "f"; // ext6f is a Fortran function
files = ["ext6f.f" ]; // objects files for ext6f
libs = []; // other libs needed for linking
// builder code for ext7f.c
link_name = "ext7f"; // functions to be added to the call table
-flag = "f"; // ext7f is a C function
+flag = "f"; // ext7f is a Fortran function
files = ["ext7f.f" ]; // objects files for ext7f
libs = []; // other libs needed for linking
// builder code for ext8f.c
link_name = "ext8f"; // functions to be added to the call table
-flag = "f"; // ext8f is a C function
+flag = "f"; // ext8f is a Fortran function
files = ["ext8f.f" ]; // objects files for ext8f
libs = []; // other libs needed for linking
// builder code for ext9f.c
// functions to be added to the call table
link_name = ["ext9f"];
-flag = "f"; // ext9f is a C function
+flag = "f"; // ext9f is a Fortran function
files = ["ext9f.f" ]; // objects files for ext9f
libs = []; // other libs needed for linking
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_addinter.c, line: 46
# File: sci_gateway/c/sci_addinter.c, line: 58
msgstr ""
#
-# File: macros/detectmsifort64tools.sci, line: 37
+# File: macros/detectmsifort64tools.sci, line: 40
msgid "Intel Fortran Compiler 9, 10, 11 or 12 Compiler not found."
msgstr ""
#
-# File: macros/detectmsvc64tools.sci, line: 68
+# File: macros/detectmsvc64tools.sci, line: 70
msgid ""
"Microsoft Visual Studio C 2008 (or more recent) x64 Compiler not installed."
msgstr ""
#
-# File: macros/detectmsvc64tools.sci, line: 78
+# File: macros/detectmsvc64tools.sci, line: 80
msgid "Microsoft Visual Studio C 2008 (or more recent) Compiler not found."
msgstr ""
#
# File: macros/ilib_build.sci, line: 38
-# File: macros/ilib_build_jar.sci, line: 144
+# File: macros/ilib_build_jar.sci, line: 147
# File: macros/ilib_gen_loader.sci, line: 86
# File: macros/ilib_gen_loader.sci, line: 94
# File: macros/ilib_gen_loader.sci, line: 102
#
# File: macros/ilib_build.sci, line: 42
-# File: macros/ilib_build_jar.sci, line: 151
-# File: macros/ilib_build_jar.sci, line: 158
-# File: macros/ilib_build_jar.sci, line: 165
-# File: macros/ilib_build_jar.sci, line: 175
+# File: macros/ilib_build_jar.sci, line: 154
+# File: macros/ilib_build_jar.sci, line: 161
+# File: macros/ilib_build_jar.sci, line: 168
+# File: macros/ilib_build_jar.sci, line: 178
#, c-format
msgid "%s: Wrong type for input argument #%d: A matrix of strings expected.\n"
msgstr ""
# File: macros/ilib_gen_Make.sci, line: 38
# File: macros/ilib_gen_Make_unix.sci, line: 169
# File: macros/ilib_mex_build.sci, line: 34
-# File: macros/windows/dlwGenerateMakefile.sci, line: 177
+# File: macros/windows/dlwGenerateMakefile.sci, line: 181
#, c-format
msgid "%s: Wrong value for input argument #%d: existing file(s) expected.\n"
msgstr ""
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 128
+# File: macros/ilib_build_jar.sci, line: 131
#, c-format
msgid "%s: function not available in NWNI mode.\n"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 135
+# File: macros/ilib_build_jar.sci, line: 138
#, c-format
msgid "%s: Wrong number of input argument(s): 3 to 5 expected.\n"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 185
+# File: macros/ilib_build_jar.sci, line: 188
#, c-format
msgid " Building JAR library %s\n"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 191
+# File: macros/ilib_build_jar.sci, line: 194
#, c-format
msgid "Cannot create jar build dir %s"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 198
+# File: macros/ilib_build_jar.sci, line: 201
#, c-format
msgid ""
" Add dependency class paths:\n"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 207
+# File: macros/ilib_build_jar.sci, line: 210
#, c-format
msgid " Build package %s\n"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 221
+# File: macros/ilib_build_jar.sci, line: 224
msgid " Compiling source files:\n"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 224
+# File: macros/ilib_build_jar.sci, line: 227
#, c-format
msgid " Compiling Java sources in %s\n"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 229
+# File: macros/ilib_build_jar.sci, line: 232
#, c-format
msgid "No Java sources in %s to compile for package %s"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 239
+# File: macros/ilib_build_jar.sci, line: 242
#, c-format
msgid "Cannot create jar package directory %s"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 243
+# File: macros/ilib_build_jar.sci, line: 246
#, c-format
msgid " Copying compiled package from %s to %s\n"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 248
+# File: macros/ilib_build_jar.sci, line: 251
#, c-format
msgid "Cannot find compilation directory %s for package %s"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 260
+# File: macros/ilib_build_jar.sci, line: 263
#, c-format
msgid " Creating JAR archive %s\n"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 264
+# File: macros/ilib_build_jar.sci, line: 267
#, c-format
msgid "Cannot create JAR file %s"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 270
+# File: macros/ilib_build_jar.sci, line: 273
#, c-format
msgid " Creating scripts for JAR relative path %s\n"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 276
+# File: macros/ilib_build_jar.sci, line: 279
#, c-format
msgid " Create loader script for Java %s\n"
msgstr ""
#
-# File: macros/ilib_build_jar.sci, line: 283
+# File: macros/ilib_build_jar.sci, line: 286
#, c-format
msgid " Create cleaner script for Java %s\n"
msgstr ""
msgstr ""
#
-# File: macros/windows/dlwGenerateMakefile.sci, line: 261
+# File: macros/windows/dlwGenerateMakefile.sci, line: 265
msgid "not found."
msgstr ""
ifpath = getenv("IFORT_COMPILER12", "");
case "ifort13" then
ifpath = getenv("IFORT_COMPILER13", "");
+ case "ifort14" then
+ ifpath = getenv("IFORT_COMPILER14", "");
else
ifpath = "";
end
machinepath = "ia32";
else
select ifortcompiler,
+ case "ifort14" then
+ machinepath = "intel64";
case "ifort13" then
machinepath = "intel64";
case "ifort12" then
end
select ifortcompiler,
+ case "ifort14" then
+ bOK = set_commons_ifort12(if_path, machinepath);
case "ifort13" then
bOK = set_commons_ifort12(if_path, machinepath);
case "ifort12" then
ifortcomp = findmsifortcompiler();
if ifortcomp <> "unknown" then
select ifortcomp,
+ case "ifort14" then
+ IFORTPATH = getenv("IFORT_COMPILER14","");
+
case "ifort13" then
IFORTPATH = getenv("IFORT_COMPILER13","");
end
select ifortcomp,
+ case "ifort14" then
+ IFORTSPATHEMT64 = IFORTPATH + "compiler\lib\intel64";
case "ifort13" then
IFORTSPATHEMT64 = IFORTPATH + "compiler\lib\intel64";
case "ifort12" then
load("SCI/modules/dynamic_link/macros/windows/lib");
end
- if win64() then
- compiler = findmsvccompiler();
- supported_compiler = ['msvc110pro', ..
- 'msvc110express', ..
- 'msvc100pro', ..
- 'msvc100express', ..
- 'msvc90pro', ..
- 'msvc90std', ..
- 'msvc90express'];
+ if win64() then
+ compiler = findmsvccompiler();
+ supported_compiler = ["msvc120pro", ..
+ "msvc120express", ..
+ "msvc110pro", ..
+ "msvc110express", ..
+ "msvc100pro", ..
+ "msvc100express", ..
+ "msvc90pro", ..
+ "msvc90std", ..
+ "msvc90express"];
if (find(supported_compiler == compiler) <> []) then
MSVCBIN64PATH = dlwGet64BitPath();
- if dlwIsVc11Express() then
+ if dlwIsVc11Express() | dlwIsVc12Express() then
MSVCBIN64PATH = MSVCBIN64PATH + filesep() + "VC\bin";
else
MSVCBIN64PATH = MSVCBIN64PATH + filesep() + "VC\bin\amd64";
end
-
+
if isdir(MSVCBIN64PATH) then
bOK = %T;
else
ifortCompiler = "unknown"; // unknown
if getos() == "Windows" then
+ if getenv("IFORT_COMPILER14","NOK") <> "NOK" then
+ ifortCompiler = "ifort14";
+ return
+ end
+
if getenv("IFORT_COMPILER13","NOK") <> "NOK" then
ifortCompiler = "ifort13";
return
// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
// Copyright (C) DIGITEO - 2010 - Allan CORNET
+// Copyright (C) Scilab Enterprises - 2014 - Antoine ELIAS
//
// This file must be used under the terms of the CeCILL.
// This source file is licensed as described in the file COPYING, which
bOK = %F;
msvc = findmsvccompiler();
- select msvc,
+ select msvc
+ // Microsoft Visual 2013 Studio Professional
+ case 'msvc120pro' then
+ bOK = dlwSetEnvVc12(msvc, %t);
+
+ // Microsoft Visual 2013 Express
+ case 'msvc120express' then
+ bOK = dlwSetEnvVc12(msvc, %t);
+
// Microsoft Visual 2012 Studio Professional
case 'msvc110pro' then
- bOK = dlwSetEnvVc11(msvc, %t);
+ bOK = dlwSetEnvVc11(msvc, %t);
// Microsoft Visual 2012 Express
case 'msvc110express' then
- bOK = dlwSetEnvVc11(msvc, %t);
+ bOK = dlwSetEnvVc11(msvc, %t);
// Microsoft Visual 2010 Studio Professional
- case 'msvc100pro' then
- bOK = dlwSetEnvVc10(msvc, %t);
+ case 'msvc100pro' then
+ bOK = dlwSetEnvVc10(msvc, %t);
// Microsoft Visual 2010 Express
case 'msvc100express' then
- bOK = dlwSetEnvVc10(msvc, %t);
+ bOK = dlwSetEnvVc10(msvc, %t);
// Microsoft Visual 2008 Studio Professional
case 'msvc90pro' then
- bOK = dlwSetEnvVc90(msvc, %t);
+ bOK = dlwSetEnvVc90(msvc, %t);
// Microsoft Visual 2008 Studio Standard
case 'msvc90std' then
- bOK = dlwSetEnvVc90(msvc, %t);
+ bOK = dlwSetEnvVc90(msvc, %t);
// Microsoft Visual 2008 Express
case 'msvc90express' then
- bOK = dlwSetEnvVc90(msvc, %t);
+ bOK = dlwSetEnvVc90(msvc, %t);
else
end
endfunction
// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
// Copyright (C) DIGITEO - 2010 - Allan CORNET
+// Copyright (C) Scilab Enterprises - 2014 - Antoine ELIAS
//
// This file must be used under the terms of the CeCILL.
// This source file is licensed as described in the file COPYING, which
bOK = %F;
msvc = findmsvccompiler();
- select msvc,
+ select msvc
+ // Microsoft Visual 2013 Studio Professional
+ case 'msvc120pro' then
+ bOK = dlwSetEnvVc12(msvc, %f);
+
+ // Microsoft Visual 2013 Express
+ case 'msvc120express' then
+ bOK = dlwSetEnvVc12(msvc, %f);
+
// Microsoft Visual 2012 Studio Professional
case 'msvc110pro' then
- bOK = dlwSetEnvVc11(msvc, %f);
+ bOK = dlwSetEnvVc11(msvc, %f);
// Microsoft Visual 2010 Studio Professional
case 'msvc100pro' then
- bOK = dlwSetEnvVc10(msvc, %f);
+ bOK = dlwSetEnvVc10(msvc, %f);
// Microsoft Visual 2012 Express
case 'msvc110express' then
- bOK = dlwSetEnvVc11(msvc, %f);
+ bOK = dlwSetEnvVc11(msvc, %f);
// Microsoft Visual 2010 Express
case 'msvc100express' then
- bOK = dlwSetEnvVc10(msvc, %f);
+ bOK = dlwSetEnvVc10(msvc, %f);
// Microsoft Visual 2008 Studio Professional
case 'msvc90pro' then
- bOK = dlwSetEnvVc90(msvc, %f);
+ bOK = dlwSetEnvVc90(msvc, %f);
// Microsoft Visual 2008 Studio Standard
case 'msvc90std' then
- bOK = dlwSetEnvVc90(msvc, %f);
+ bOK = dlwSetEnvVc90(msvc, %f);
// Microsoft Visual 2008 Express
case 'msvc90express' then
- bOK = dlwSetEnvVc90(msvc, %f);
+ bOK = dlwSetEnvVc90(msvc, %f);
// Microsoft Visual 2005 Studio Professional
case 'msvc80pro' then
- bOK = dlwSetEnvVc80(msvc);
+ bOK = dlwSetEnvVc80(msvc);
// Microsoft Visual 2005 Studio Standard
case 'msvc80std' then
- bOK = dlwSetEnvVc80(msvc);
+ bOK = dlwSetEnvVc80(msvc);
// Microsoft Visual 2005 Express
case 'msvc80express' then
- bOK = dlwSetEnvVc80(msvc);
+ bOK = dlwSetEnvVc80(msvc);
// Microsoft Visual Studio .NET 2003
case 'msvc71' then
- bOK = dlwSetEnvVc71();
+ bOK = dlwSetEnvVc71();
// Microsoft Visual Studio .NET 2002
case 'msvc70' then
- bOK = dlwSetEnvVc70();
+ bOK = dlwSetEnvVc70();
else
end
endfunction
// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
// Copyright (C) DIGITEO - 2010 - Allan CORNET
+// Copyright (C) Scilab Enterprises - 2014 - Antoine ELIAS
//
// This file must be used under the terms of the CeCILL.
// This source file is licensed as described in the file COPYING, which
// We use always last version of MS compiler
- if dlwIsVc11Express() then
- MSCompiler = 'msvc110express'; // Microsoft Visual 2012 Express
- return;
- end
+ if dlwIsVc12Express() then
+ MSCompiler = 'msvc120express'; // Microsoft Visual 2013 Express
+ return;
+ end
+
+ if dlwIsVc12Pro() then
+ MSCompiler = 'msvc120pro'; // Microsoft Visual 2013 Professional (or more)
+ return;
+ end
- if dlwIsVc11Pro() then
- MSCompiler = 'msvc110pro'; // Microsoft Visual 2012 Professional (or more)
- return;
- end
+ if dlwIsVc11Express() then
+ MSCompiler = 'msvc110express'; // Microsoft Visual 2012 Express
+ return;
+ end
+ if dlwIsVc11Pro() then
+ MSCompiler = 'msvc110pro'; // Microsoft Visual 2012 Professional (or more)
+ return;
+ end
- if dlwIsVc10Pro() & dlwIsVc10Express() then
- MSCompiler = 'msvc100express'; // Microsoft Visual 2010 Express with SDK extension
- return;
- end
+ if dlwIsVc10Pro() & dlwIsVc10Express() then
+ MSCompiler = 'msvc100express'; // Microsoft Visual 2010 Express with SDK extension
+ return;
+ end
if dlwIsVc10Express() then
MSCompiler = "msvc100express"; // Microsoft Visual 2010 Express
vcPath64 = [];
if win64() then
MSCompiler = findmsvccompiler();
- if (MSCompiler == 'msvc110express' | MSCompiler == 'msvc100express' | MSCompiler == 'msvc90express') then
+ if (MSCompiler == 'msvc120express' | MSCompiler == 'msvc110express' | MSCompiler == 'msvc100express' | MSCompiler == 'msvc90express') then
programFilesx86Path = getenv('ProgramFiles(x86)', '');
if (programFilesx86Path <> '') then
+ if isfile(programFilesx86Path + '\Microsoft Visual Studio 12.0\VC\bin\cl.exe') then
+ vcPath64 = programFilesx86Path + '\Microsoft Visual Studio 12.0';
+ return
+ end
+
if isfile(programFilesx86Path + '\Microsoft Visual Studio 11.0\VC\bin\cl.exe') then
vcPath64 = programFilesx86Path + '\Microsoft Visual Studio 11.0';
return
end
else
select MSCompiler,
+ // Microsoft Visual 2013 Studio Professional
+ case 'msvc120pro' then
+ vcPath64 = dlwGetVc12ProPath(); //same as VS2012
// Microsoft Visual 2012 Studio Professional
case 'msvc110pro' then
vcPath64 = dlwGetVc11ProPath();
--- /dev/null
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) Scilab Enterprises - 2014 - Antoine ELIAS
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+
+//=============================================================================
+function vcPath = dlwGetVc12ExpressPath()
+ vcPath = [];
+ try
+ vcPath = winqueryreg('HKEY_LOCAL_MACHINE', ..
+ 'Software\Microsoft\VisualStudio\12.0\Setup\VS', ..
+ 'ProductDir');
+ catch
+ // remove last error on 'winqueryreg' fails
+ lasterror();
+ return;
+ end
+
+ // remove last file separator if it exists
+ if vcPath <> [] then
+ vcPath = pathconvert(vcPath, %f, %t);
+ end
+endfunction
+//=============================================================================
--- /dev/null
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) Scilab Enterprises - 2014 - Antoine ELIAS
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+
+//=============================================================================
+function vcPath = dlwGetVc12ProPath()
+ vcPath = [];
+ try
+ vcPath = winqueryreg('HKEY_LOCAL_MACHINE', ..
+ 'Software\Microsoft\VisualStudio\12.0\Setup\VS', ..
+ 'ProductDir');
+ catch
+ // remove last error on 'winqueryreg' fails
+ lasterror();
+ return;
+ end
+
+ // remove last file separator if it exists
+ if vcPath <> [] then
+ vcPath = pathconvert(vcPath, %f, %t);
+ end
+
+endfunction
+//=============================================================================
--- /dev/null
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) Scilab Enterprises - 2014 - Antoine ELIAS
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+
+//=============================================================================
+function bOK = dlwIsVc12Express()
+ bOK = %f;
+ try
+ if winqueryreg('key', 'HKLM', 'Software\Microsoft\DevDiv\wdexpress\Servicing\12.0') <> [] then
+ bOK = %t;
+ end
+ catch
+ end
+endfunction
+//=============================================================================
--- /dev/null
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) Scilab Enterprises - 2014 - Antoine ELIAS
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+
+//=============================================================================
+function bOK = dlwIsVc12Pro()
+ bOK = %f;
+ try
+ if winqueryreg('HKLM', 'Software\Microsoft\DevDiv\vs\Servicing\12.0\devenv', "install") == 1 & ...
+ dlwIsVc12Express() == %f then
+ bOK = %t;
+ end
+ catch
+ end
+endfunction
+//=============================================================================
--- /dev/null
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) Scilab Enterprises - 2014 - Antoine ELIAS
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+
+//=============================================================================
+function bOK = dlwSetEnvCommonVc12(MSVSDir, IsExpress, bWin64)
+ bOK = %F;
+
+ windowsSdkPath = dlwGetSdkPath();
+ if (windowsSdkPath <> []) then
+ err = setenv("WindowsSdkDir", windowsSdkPath);
+ else
+ windowsSdkPath = "";
+ end
+
+ err = setenv("VSINSTALLDIR", MSVSDir);
+ if (err == %F) then
+ bOK = %F;
+ return
+ end
+
+ DevEnvDir = MSVSDir + "\Common7\IDE";
+ err = setenv("DevEnvDir", DevEnvDir);
+ if (err == %F) then
+ bOK = %F;
+ return
+ end
+
+ err = setenv("VCINSTALLDIR", MSVSDir + "\VC\");
+ if (err == %F) then
+ bOK = %F;
+ return
+ end
+
+ PATH = getenv("PATH", "");
+ INCLUDE = getenv("INCLUDE", "");
+ LIB = getenv("LIB", "");
+ LIBPATH = getenv("LIBPATH", "");
+
+ if bWin64 then
+ PATH = getNewPATHx64(PATH, MSVSDir, windowsSdkPath, IsExpress);
+ INCLUDE = getNewINCLUDEx64(INCLUDE, MSVSDir, windowsSdkPath, IsExpress);
+ LIB = getNewLIBx64(LIB, MSVSDir, windowsSdkPath, IsExpress);
+ LIBPATH = getNewLIBPATHx64(LIBPATH, MSVSDir, windowsSdkPath, IsExpress);
+ else
+ PATH = getNewPATHx86(PATH, MSVSDir, windowsSdkPath, IsExpress);
+ INCLUDE = getNewINCLUDEx86(INCLUDE, MSVSDir, windowsSdkPath, IsExpress);
+ LIB = getNewLIBx86(LIB, MSVSDir, windowsSdkPath, IsExpress);
+ LIBPATH = getNewLIBPATHx86(LIBPATH, MSVSDir, windowsSdkPath, IsExpress);
+ end
+
+ err = setenv("PATH", PATH);
+ if (err == %F) then
+ bOK = %F;
+ return
+ end
+
+ err = setenv("INCLUDE", INCLUDE);
+ if (err == %F) then
+ bOK = %F;
+ return
+ end
+
+ err = setenv("LIB", LIB);
+ if (err == %F) then
+ bOK = %F;
+ return
+ end
+
+ err = setenv("LIBPATH", LIBPATH);
+ if (err == %F) then
+ bOK = %F;
+ return
+ end
+
+ bOK = %T;
+endfunction
+//=============================================================================
+function newLIB = getNewLIBx64(LIB, msvsPath, sdkPath, bIsExpress)
+ newLIB = "";
+
+ if bIsExpress then
+ Vc64Path = dlwGet64BitPath();
+ newLIB = Vc64Path + "\VC\LIB\amd64" + pathsep();
+ else
+ newLIB = msvsPath + "\VC\ATLMFC\LIB\amd64" + pathsep() + ..
+ msvsPath + "\VC\LIB\amd64" + pathsep();
+ end
+
+ newLIB = newLIB + ..
+ sdkPath + "\lib\x64" + pathsep() + LIB + pathsep() + ..
+ getenv("PROGRAMFILES(X86)") + "\Windows Kits\8.1\Lib\winv6.3\um\x64\;";
+endfunction
+//=============================================================================
+function newLIB = getNewLIBx86(LIB, msvsPath, sdkPath, bIsExpress)
+ newLIB = "";
+ if ~bIsExpress then
+ newLIB = msvsPath + filesep() + "VC\ATLMFC\LIB" + pathsep();
+ end
+ newLIB = newLIB + ..
+ msvsPath + filesep() + "VC\LIB" + pathsep() + ..
+ sdkPath + filesep() + "lib" + pathsep() + ..
+ LIB + pathsep() + ..
+ getenv("PROGRAMFILES") + "\Windows Kits\8.1\Lib\winv6.3\um\x86\;";
+endfunction
+//=============================================================================
+function newPATH = getNewPATHx64(PATH, msvsPath, sdkPath, bIsExpress)
+ newPATH = "";
+
+ if bIsExpress then
+ newPATH = msvsPath + "\VC\BIN\x86_amd64" + pathsep();
+ newPATH = newPATH + msvsPath + "\VC\BIN" + pathsep();
+ else
+ newPATH = msvsPath + "\VC\BIN\amd64" + pathsep();
+ end
+
+ newPATH = newPATH + ..
+ msvsPath + "\VC\VCPackages" + pathsep() + ..
+ msvsPath + "\Common7\IDE" + pathsep() + ..
+ msvsPath + "\Common7\Tools" + pathsep() + ..
+ msvsPath + "\Common7\Tools\bin" + pathsep() + ..
+ sdkPath + "\bin\x64" + pathsep() + ..
+ sdkPath + "\bin\win64\x64" + pathsep() + ..
+ sdkPath + "\bin" + pathsep() + PATH;
+endfunction
+//=============================================================================
+function newPATH = getNewPATHx86(PATH, msvsPath, sdkPath, bIsExpress)
+ newPATH = msvsPath + "\Common7\IDE\" + pathsep() + ..
+ msvsPath + "\VC\bin" + pathsep() + ..
+ msvsPath + "\Common7\Tools"+ pathsep() + ..
+ msvsPath + "\VC\VCPackages" + pathsep() + ..
+ sdkPath + "\bin" + pathsep() + PATH + pathsep();
+endfunction
+//=============================================================================
+function newLIBPATH = getNewLIBPATHx64(LIBPATH, msvsPath, sdkPath, bIsExpress)
+ newLIBPATH = "";
+
+ if bIsExpress then
+ Vc64Path = dlwGet64BitPath();
+ newLIBPATH = Vc64Path + "\VC\LIB\amd64" + pathsep() + LIBPATH;
+ else
+ newLIBPATH = msvsPath + "\VC\ATLMFC\LIB\amd64" + pathsep() + ..
+ msvsPath + "\VC\LIB\amd64" + pathsep() + LIBPATH;
+ end
+
+endfunction
+//=============================================================================
+function newLIBPATH = getNewLIBPATHx86(LIBPATH, msvsPath, sdkPath, bIsExpress)
+ newLIBPATH = "";
+
+ if ~bIsExpress then
+ newLIBPATH = msvsPath + "\VC\ATLMFC\LIB" + pathsep();
+ end
+
+ newLIBPATH = newLIBPATH + ..
+ msvsPath + "\VC\LIB";
+endfunction
+//=============================================================================
+function newINCLUDE = getNewINCLUDEx64(INCLUDE, msvsPath, sdkPath, bIsExpress)
+ newINCLUDE = "";
+ if bIsExpress then
+ Vc64Path = dlwGet64BitPath();
+ newINCLUDE = Vc64Path + "\VC\INCLUDE" + pathsep();
+ else
+ newINCLUDE = msvsPath + "\VC\INCLUDE" + pathsep() + ..
+ msvsPath + "\VC\ATLMFC\INCLUDE" + pathsep();
+ end
+
+ newINCLUDE = newINCLUDE + ..
+ sdkPath + "\include" + pathsep() + INCLUDE + ..
+ getenv("PROGRAMFILES(X86)") + "\Windows Kits\8.0\Include\um;" + ..
+ getenv("PROGRAMFILES(X86)") + "\Windows Kits\8.0\Include\shared;";
+
+endfunction
+//=============================================================================
+function newINCLUDE = getNewINCLUDEx86(INCLUDE, msvsPath, sdkPath, bIsExpress)
+ newINCLUDE = "";
+
+ if ~bIsExpress then
+ newINCLUDE = msvsPath + "\VC\ATLMFC\INCLUDE" + pathsep();
+ end
+
+ newINCLUDE = newINCLUDE + ..
+ msvsPath + "\VC\INCLUDE" + pathsep() + ..
+ sdkPath + "\include" + pathsep() + INCLUDE + ..
+ getenv("PROGRAMFILES") + "\Windows Kits\8.0\Include\um;" + ..
+ getenv("PROGRAMFILES") + "\Windows Kits\8.0\Include\shared;";
+ ;
+endfunction
+//=============================================================================
--- /dev/null
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) Scilab Enterprises - 2014 - Antoine ELIAS
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+
+//=============================================================================
+function bOK = dlwSetEnvVc12(msCompiler, bWin64)
+ bOK = %F;
+ MSVSDir = '';
+ select msCompiler
+ case 'msvc120pro'
+ MSVSDir = dlwGetVc12ProPath();
+ case 'msvc120express'
+ MSVSDir = dlwGetVc12ExpressPath();
+ else
+ return
+ end
+
+ // MS compiler path is wrong
+ if MSVSDir == [] then
+ return
+ end
+
+ IsExpress = (msCompiler == 'msvc120express');
+
+ VS110COMNTOOLS = MSVSDir + '\Common7\Tools\'
+ if ~setenv('VS120COMNTOOLS', VS110COMNTOOLS) then
+ bOK = %F;
+ return
+ end
+
+ bOK = dlwSetEnvCommonVc12(MSVSDir, IsExpress, bWin64);
+
+endfunction
+//=============================================================================
!ELSE
USE_F2C=NO
!ENDIF
+!IF "$(IFORT_COMPILER14)" == ""
+!ELSE
+USE_F2C=NO
+!ENDIF
#==================================================
# if USE_F2C is set to NO we will use the following Fortran compiler (i.e Intel Fortran 10.x)
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="maxi" xml:lang="ja">
- <refnamediv>
- <refname>maxi</refname>
- <refpurpose>最大値</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <title>呼び出し手順</title>
- <synopsis>[m [,k]]=maxi(A)
- [m [,k]]=maxi(A,'c')
- [m [,k]]=maxi(A,'r')
- [m [,k]]=maxi(A,'m')
- [m [,k]]=maxi(A1,A2,...,An)
- [m [,k]]=maxi(list(A1,A2,...,An))
- </synopsis>
- </refsynopsisdiv>
- <refsection>
- <title>パラメータ</title>
- <variablelist>
- <varlistentry>
- <term>A</term>
- <listitem>
- <para>実数ベクトルまたは行列.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>A1,...,An</term>
- <listitem>
- <para>実数ベクトルまたは行列の集合, 全て同じ大きさまたはスカラー.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsection>
- <refsection>
- <title>説明</title>
- <para>
- <literal>A</literal>が実数ベクトルまたは行列の場合,
- <literal>maxi(A)</literal> は<literal>A</literal>の最大要素となります.
- <literal>[m,k]=maxi(A)</literal> はこれに加えて最大値の添え字も出力します.
- 文字列型の2番目の引数に<literal>'r'</literal> または
- <literal>'c'</literal>を指定できます:
- <literal>'r'</literal>は<literal>m(j)</literal>が
- Aの<literal>j</literal>番目の列(<literal>A(:,j)</literal>)の最大値となる
- 行ベクトル<literal>m</literal>および
- <literal>k(j)</literal>が列<literal>j</literal>の最大値を
- 含む添え字を取得するために使用されます.
- <literal>'c'</literal> は<literal>A</literal>の行でこの二つの処理を
- 行うために使用されます.
- <literal>'m'</literal> は Matlabとの互換性維持のために使用されます.
- </para>
- <para>
- <literal>m=maxi(A1,A2,...,An)</literal>, ただし,
- <literal>Aj</literal>は全て同じ大きさの行列で,
- <literal>m(i)= maxi( Aj(i)), j=1,...,n</literal>とする時,
- 大きさ <literal>size(m)=size(A1)</literal>となる
- ベクトルまたは行列 <literal>m</literal> を返します.
- <literal>[m,k]=maxi(A1,A2,...,An)</literal> は加えてベクトルまたは行列
- <literal>k</literal>も返します.
- ある<literal>i</literal>について,<literal>k(i)</literal>は
- 最大値となる最初の<literal>Aj(i)</literal>の番号です.
- </para>
- <para>
- <literal>[m,k]=maxi(list(A1,...,An))</literal> は
- <literal>[m,k]=maxi(A1,A2,...,An)</literal>と等価な構文です.
- </para>
- </refsection>
- <refsection>
- <title>例</title>
- <programlisting role="example"><![CDATA[
-[m,n]=maxi([1,3,1])
-[m,n]=maxi([3,1,1],[1,3,1],[1,1,3])
-[m,n]=maxi([3,-2,1],1)
-[m,n]=maxi(list([3,1,1],[1,3,1],[1,1,3]))
-[m,n]=maxi(list(1,3,1))
- ]]></programlisting>
- </refsection>
- <refsection role="see also">
- <title>参照</title>
- <simplelist type="inline">
- <member>
- <link linkend="gsort">gsort</link>
- </member>
- <member>
- <link linkend="find">find</link>
- </member>
- <member>
- <link linkend="mini">mini</link>
- </member>
- </simplelist>
- </refsection>
-</refentry>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="mini" xml:lang="ja">
- <refnamediv>
- <refname>mini</refname>
- <refpurpose>最小値</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <title>呼出し手順</title>
- <synopsis>[m [,k]]=mini(A)
- [m [,k]]=mini(A,'c')
- [m [,k]]=mini(A,'r')
- [m [,k]]=mini(A,'m')
- [m [,k]]=mini(A1,A2,...,An)
- [m [,k]]=mini(list(A1,A2,...,An))
- </synopsis>
- </refsynopsisdiv>
- <refsection>
- <title>パラメータ</title>
- <variablelist>
- <varlistentry>
- <term>A</term>
- <listitem>
- <para>実数ベクトルまたは行列.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>A1,...,An</term>
- <listitem>
- <para>実数ベクトルまたは行列の集合, 全て同じ大きさまたはスカラー.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsection>
- <refsection>
- <title>説明</title>
- <para>
- <literal>A</literal>が実数のベクトルまたは行列の場合,
- <literal>mini(A)</literal>は<literal>A</literal>の最小要素となります.
- <literal>[m,k]=mini(A)</literal> は,オプションで最小値の添え字も出力します.
- 文字列型の2番目の引数に<literal>'r'</literal> または
- <literal>'c'</literal>を指定できます:
- <literal>'r'</literal>は<literal>m(j)</literal>が
- Aの<literal>j</literal>番目の列(<literal>A(:,j)</literal>)の最小値となる
- 行ベクトル<literal>m</literal>および
- <literal>k(j)</literal>が列<literal>j</literal>の最小値を
- 含む添え字を取得するために使用されます.
- <literal>'c'</literal> は<literal>A</literal>の行でこの二つの処理を
- 行うために使用されます.
- <literal>'m'</literal> は Matlabとの互換性維持のために使用されます.
- </para>
- <para>
- <literal>m=mini(A1,A2,...,An)</literal>, ただし,
- <literal>Aj</literal>は全て同じ大きさの行列で,
- <literal>m(i)= mini( Aj(i)), j=1,...,n</literal>とする時,
- 大きさ <literal>size(m)=size(A1)</literal>となる
- ベクトルまたは行列 <literal>m</literal> を返します.
- <literal>[m,k]=mini(A1,A2,...,An)</literal> は加えてベクトルまたは行列
- <literal>k</literal>も返します.
- ある<literal>i</literal>について,<literal>k(i)</literal>は
- 最小値となる最初の<literal>Aj(i)</literal>の番号です.
- </para>
- <para>
- <literal>[m,k]=mini(list(A1,...,An))</literal> は
- <literal>[m,k]=mini(A1,A2,...,An)</literal>と等価な構文です.
- </para>
- </refsection>
- <refsection>
- <title>例</title>
- <programlisting role="example"><![CDATA[
-[m,n]=mini([1,3,1])
-[m,n]=mini([3,1,1],[1,3,1],[1,1,3])
-[m,n]=mini([3,-2,1],1)
-[m,n]=mini(list([3,1,1],[1,3,1],[1,1,3]))
-[m,n]=mini(list(1,3,1))
- ]]></programlisting>
- </refsection>
- <refsection role="see also">
- <title>参照</title>
- <simplelist type="inline">
- <member>
- <link linkend="gsort">gsort</link>
- </member>
- <member>
- <link linkend="find">find</link>
- </member>
- <member>
- <link linkend="min">min</link>
- </member>
- </simplelist>
- </refsection>
-</refentry>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="sort" xml:lang="ja">
- <refnamediv>
- <refname>sort</refname>
- <refpurpose>"クイックソート" アルゴリズムによる安定なソート (古い関数, gsort参照)</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <title>呼び出し手順</title>
- <synopsis>
- [s, [k]]=sort(v)
- [s, [k]]=sort(v,'r')
- [s, [k]]=sort(v,'c')
- </synopsis>
- </refsynopsisdiv>
- <refsection>
- <title>パラメータ</title>
- <variablelist>
- <varlistentry>
- <term>v</term>
- <listitem>
- <para>実数または複素数のベクトル/行列; 疎ベクトル; 文字列ベクトル/行列
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>s</term>
- <listitem>
- <para>実数または複素数のベクトル/行列; 疎ベクトル; 文字列ベクトル/行列
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>k</term>
- <listitem>
- <para>整数のベクトルまたは行列</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsection>
- <refsection>
- <title>説明</title>
- <para>
- <literal>sort</literal> は "バブルソートアルゴリズム"を実装します.
- </para>
- <para> sort は Scilab 5.3で削除されます. gsortを参照ください. </para>
- <para>
- <literal>s=sort(v)</literal> は <literal>v</literal> を
- 降順にソートします.
- <literal>v</literal> が行列の場合, ソートは列方向に行われ,
- <literal>v</literal>はスタックされたベクトル<literal>v(:)</literal>
- とみなされます.
- <literal>[s,k]=sort(v)</literal>は
- <literal>v</literal>の中での<literal>s</literal>のエントリの添え字も
- 出力します.
- すなわち, <literal>v(k(:)) </literal>はベクトル
- <literal>s</literal>となります.
- </para>
- <para>
- <literal>s=sort(v,'r')</literal> は<literal>v</literal>の
- 行を降順にソートします.
- すなわち, <literal>s</literal>の各列は
- <literal>v</literal>の各列でこれを降順に並び替えることにより
- 得られます.
- <literal>[s,k]=sort(v,'r')</literal>は,
- 各列<literal>i</literal>について
- <literal>v(k(:,i),i)=s(:,i)</literal>となる添え字
- <literal>k</literal>も返します.
- </para>
- <para>
- <literal>s=sort(v,'c')</literal> は<literal>v</literal>の
- 列を降順にソートします.
- すなわち, <literal>s</literal>の各行は
- <literal>v</literal>の各行でこれを降順に並び替えることにより
- 得られます.
- <literal>[s,k]=sort(v,'c')</literal>は,
- 各行<literal>i</literal>について
- <literal>v(i,k(i,:))=s(i,:)</literal>となる添え字
- <literal>k</literal>も返します.
- </para>
- <para>複素数の行列またはベクトルはその大きさでソートされます. 列/行
- ソートは複素数行列では実装されていません.
- </para>
- <para>
- <literal>y=sort(A)</literal> は, <literal>A</literal> は
- 疎行列の場合でも使用可能です.
- 列/行ソートは疎行列では実装されていません.
- </para>
- <para>
- <emphasis role="bold">注意</emphasis> : <literal>sort </literal>is
- は古い関数とされており,
- <emphasis role="bold">
- <link linkend="gsort">gsort</link>で置き換えられています.
- </emphasis>
- </para>
- </refsection>
- <refsection>
- <title>例</title>
- <programlisting role="example"><![CDATA[
-[s,p]=sort(rand(1,10));
-//p is a random permutation of 1:10
-A=[1,2,5;3,4,2];
-[Asorted,q]=sort(A);A(q(:))-Asorted(:)
-v=1:10;
-sort(v)
-sort(v')
-sort(v,'r') //Does nothing for row vectors
-sort(v,'c')
- ]]></programlisting>
- </refsection>
- <refsection role="see also">
- <title>参照</title>
- <simplelist type="inline">
- <member>
- <link linkend="find">find</link>
- </member>
- <member>
- <link linkend="gsort">gsort</link>
- </member>
- </simplelist>
- </refsection>
-</refentry>
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_base2dec.c, line: 41
# File: sci_gateway/c/sci_base2dec.c, line: 54
#
# File: macros/bitcmp.sci, line: 75
# File: macros/bitget.sci, line: 83
-# File: macros/bitset.sci, line: 71
+# File: macros/bitset.sci, line: 74
#, c-format
msgid "%s: Wrong value for input argument #%d: Must be between %d and %d.\n"
msgstr ""
#
-# File: macros/bitset.sci, line: 32
-# File: macros/bitset.sci, line: 42
+# File: macros/bitset.sci, line: 31
+# File: macros/bitset.sci, line: 47
# File: macros/cross.sci, line: 24
#, c-format
msgid "%s: Wrong size for input arguments: Same sizes expected.\n"
msgstr ""
#
-# File: macros/bitset.sci, line: 51
-# File: macros/bitset.sci, line: 58
-# File: macros/bitxor.sci, line: 54
-# File: macros/bitxor.sci, line: 62
+# File: macros/bitset.sci, line: 40
+#, c-format
+msgid "%s: Wrong value for input argument #%d: 0 or 1 expected.\n"
+msgstr ""
+
+#
+# File: macros/bitset.sci, line: 55
+# File: macros/bitset.sci, line: 62
#, c-format
msgid ""
-"%s: Wrong type for input argument #%d: Scalar/matrix of unsigned integers "
-"expected.\n"
+"%s: Wrong type for input argument #%d: Scalar/matrix/hypermatrix of unsigned "
+"integers expected.\n"
msgstr ""
#
-# File: macros/bitset.sci, line: 80
+# File: macros/bitxor.sci, line: 54
+# File: macros/bitxor.sci, line: 62
#, c-format
-msgid "%s: Wrong value for input argument #%d: 0 or 1 expected\n"
+msgid ""
+"%s: Wrong type for input argument #%d: Scalar/matrix of unsigned integers "
+"expected.\n"
msgstr ""
#
msgstr ""
#
+# File: macros/permute.sci, line: 30
+#, c-format
+msgid ""
+"%s: Wrong value for input argument #%d: Must be a valid permutation vector.\n"
+msgstr ""
+
+#
# File: macros/permute.sci, line: 33
#, c-format
msgid ""
end
// case empty matrix
-
if isempty(x)
if ~isempty(pos) & prod(size(pos))<>1
error(msprintf(gettext("%s: Wrong size for input arguments: Same sizes expected.\n"),"bitset"));
end
end
- // check size
+ // check v value
+ if rhs == 3 & or(v <> 0 & v <> 1) then
+ error(msprintf(gettext("%s: Wrong value for input argument #%d: 0 or 1 expected.\n"),"bitset",3));
+ elseif rhs == 2 then
+ v = ones(x);
+ end
- if (size(x,"*")>1) & (size(pos,"*")>1) & (or(size(x)<>size(pos))) then
+ // check size
+ if or(size(x) <> size(pos)) | or(size(v) <> size(x)) then
error(msprintf(gettext("%s: Wrong size for input arguments: Same sizes expected.\n"),"bitset"));
end
// check type
-
- if (type(x)==1 & (x-floor(x)<>0 | x<0)) ..
- | (type(x)==8 & (inttype(x)<10)) ..
- | (type(x)<>1 & type(x)<>8) then
-
- error(msprintf(gettext("%s: Wrong type for input argument #%d: Scalar/matrix of unsigned integers expected.\n"),"bitset",1));
+ if (type(x) == 1 & (or(x-floor(x) <> 0) | or(x < 0))) ..
+ | (type(x) == 8 & (inttype(x) < 10)) ..
+ | (typeof(x) == "hypermat" & (or(x-floor(x) <> 0) | or(x < 0))) ..
+ | (type(x) <> 1 & type(x) <> 8 & typeof(x) <> "hypermat") then
+ error(msprintf(gettext("%s: Wrong type for input argument #%d: Scalar/matrix/hypermatrix of unsigned integers expected.\n"),"bitset",1));
end
- if (type(pos)==1 & (pos-floor(pos)<>0 | pos<0)) ..
- | (type(pos)==8 & (inttype(pos)<10)) ..
- | (type(pos)<>1 & type(pos)<>8) then
-
- error(msprintf(gettext("%s: Wrong type for input argument #%d: Scalar/matrix of unsigned integers expected.\n"),"bitset",2));
+ if (type(pos) == 1 & (or(pos-floor(pos) <> 0) | or(pos < 0))) ..
+ | (type(pos) == 8 & (inttype(pos) < 10)) ..
+ | (typeof(pos) == "hypermat" & (or(pos-floor(pos) <> 0) | or(pos < 0))) ..
+ | (type(pos) <> 1 & type(pos) <> 8 & typeof(pos) <> "hypermat") then
+ error(msprintf(gettext("%s: Wrong type for input argument #%d: Scalar/matrix/hypermatrix of unsigned integers expected.\n"),"bitset",2));
end
// check pos value
-
- select inttype(x)
+ select inttype(x(1))
case 0 then posmax = 52;
case 11 then posmax = 8;
case 12 then posmax = 16;
case 14 then posmax = 32;
end
- if (pos>posmax) | (pos<1) then
+ if or(pos > posmax) | or(pos < 1) then
error(msprintf(gettext("%s: Wrong value for input argument #%d: Must be between %d and %d.\n"),"bitset",2,1,posmax));
end
- // check v value
-
- if rhs == 3 & ..
- ( ((type(v)<>1) & (type(v)<>8)) ..
- | ((type(x)==8) & (inttype(x)<10)) ..
- | ((v<>0) & (v<>1)) ) then
- error(msprintf(gettext("%s: Wrong value for input argument #%d: 0 or 1 expected\n"),"bitset",3));
- end
-
// Algorithm
// =========================================================================
x = ones(pos)*x;
end
- if rhs<3 then
- v = 1;
- end
+ vZero = find(v == 0);
+ vOne = find(v == 1);
+ sz = size(x);
- if type(x)==8 then
+ if type(x(1)) == 8 then
- select inttype(x)
- case 11 then mask = uint8(2^(pos-1));
- case 12 then mask = uint16(2^(pos-1));
- case 14 then mask = uint32(2^(pos-1));
+ select inttype(x(1))
+ case 11 then mask = uint8(2^(pos(:)-1));
+ case 12 then mask = uint16(2^(pos(:)-1));
+ case 14 then mask = uint32(2^(pos(:)-1));
end
- if v==0 then
- y = x & (~mask);
- else
- y = x | mask;
- end
+ mask = matrix(mask, sz);
+ y(vZero) = x(vZero) & (~mask(vZero));
+ y(vOne) = x(vOne) | mask(vOne);
+ y = matrix(y, sz);
return;
else
-
// type == 1
-
a = 2^32;
mask = uint32(zeros(pos));
y_LSB = uint32( x - double(uint32(x/a)) * a ); // LSB Less Significant Bits
y_MSB = uint32( x/a ); // MSB Most Significant Bits
+ yMSB = y_MSB;
+ yLSB = y_LSB;
if or(pos<=32) then
- mask( pos<=32 ) = uint32( 2^(pos(pos<=32) -1 ));
- if v==0 then
- y_LSB( pos<=32 ) = y_LSB(pos<=32) & (~mask(pos<=32));
- else
- y_LSB( pos<=32 ) = y_LSB(pos<=32) | mask(pos<=32);
- end
+ mask(pos<=32) = uint32(2^(pos(pos<=32) -1));
+ yLSB = y_LSB(pos<=32);
+ ymask = mask(pos<=32);
+ // v == 0
+ yLSB(vZero) = yLSB(vZero) & (~ymask(vZero));
+ // v == 1
+ yLSB(vOne) = yLSB(vOne) | ymask(vOne);
+ yLSB = matrix(yLSB, sz);
end
if or(pos>32) then
- mask( pos>32 ) = uint32( 2^(pos(pos>32) -32 -1 ));
- if v==0 then
- y_MSB( pos>32 ) = y_MSB(pos>32) & (~ mask(pos>32));
- else
- y_MSB( pos>32 ) = y_MSB(pos>32) | mask(pos>32);
- end
+ mask(pos>32) = uint32(2^(pos(pos>32) -32 -1));
+ yMSB = y_MSB(pos>32);
+ ymask = mask(pos>32);
+ yMSB(vZero) = yMSB(vZero) & (~ymask(vZero));
+ yMSB(vOne) = yMSB(vOne) | ymask(vOne);
+ // v == 0
+ yMSB(vZero) = yMSB(vZero) & (~ymask(vZero));
+ // v == 1
+ yMSB(vOne) = yMSB(vOne) | ymask(vOne);
+ yMSB = matrix(yMSB, sz);
end
-
- y = double( a * y_MSB + y_LSB );
-
+ y = double(a * yMSB + yLSB);
end
endfunction
if (m.eq.0.or.n.eq.0) then
if (.not.cremat(fname,top,0,0,0,lr,lc)) return
+C switching back to the default randvalue
+ if ( irt.ge.1) then
+ ran(2)=iran1kp
+ endif
return
endif
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Charlotte HECQUET
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Non-regression test for bug 10336 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=10336
+//
+// <-- Short Description -->
+// Default key of rand is changed from "uniform" to "normal"
+x=rand(100,1);
+assert_checkequal(rand("info"), "uniform");
+x=rand(100,0,"norm");
+assert_checkequal(rand("info"), "uniform");
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Charlotte HECQUET
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Non-regression test for bug 10336 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=10336
+//
+// <-- Short Description -->
+// Default key of rand is changed from "uniform" to "normal"
+
+x=rand(100,1);
+assert_checkequal(rand("info"), "uniform");
+x=rand(100,0,"norm");
+assert_checkequal(rand("info"), "uniform");
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Vladislav TRUBKIN
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- Non-regression test for bug 13515 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13515
+//
+// <-- Short Description -->
+// there were wrong results for matrix/hypermatrix with bitset function
+//
+clear "checkBitset"
+function checkBitset(x, pos, v, isOne, typeOfx)
+ if isOne then
+ select typeOfx
+ case 0 // double
+ assert_checkequal(bitset(x, pos), dbRefOne);
+ assert_checkequal(bitset(x, pos, v), dbRefOne);
+ case 8 // uint8
+ assert_checkequal(bitset(x, pos), uint8RefOne);
+ assert_checkequal(bitset(x, pos, v), uint8RefOne);
+ case 16 // uint16
+ assert_checkequal(bitset(x, pos), uint16RefOne);
+ assert_checkequal(bitset(x, pos, v), uint16RefOne);
+ case 32 // uint32
+ assert_checkequal(bitset(x, pos), uint32RefOne);
+ assert_checkequal(bitset(x, pos, v), uint32RefOne);
+ end
+ else
+ select typeOfx
+ case 0
+ assert_checkequal(bitset(x, pos, v), dbRefZero);
+ case 8
+ assert_checkequal(bitset(x, pos, v), uint8RefZero);
+ case 16
+ assert_checkequal(bitset(x, pos, v), uint16RefZero);
+ case 32
+ assert_checkequal(bitset(x, pos, v), uint32RefZero);
+ end
+ end
+endfunction
+clear "createValues"
+function [dbValue, dbPos, dbBitValue, ...
+ uint8Value, uint8Pos, uint8BitValue, ...
+ uint16Value, uint16Pos, uint16BitValue, ...
+ uint32Value, uint32Pos, uint32BitValue] = createValues(value, pos, bitValue)
+ // double
+ dbValue = value;
+ dbPos = pos;
+ dbBitValue = bitValue
+ // uint8
+ uint8Value = uint8(value);
+ uint8Pos = uint8(pos);
+ uint8BitValue = uint8(bitValue);
+ // uint16
+ uint16Value = uint16(value);
+ uint16Pos = uint16(pos);
+ uint16BitValue = uint16(bitValue);
+ // uint32
+ uint32Value = uint32(value);
+ uint32Pos = uint32(pos);
+ uint32BitValue = uint32(bitValue);
+endfunction
+clear "createReference";
+function [dbRefOne, dbRefZero, ...
+ uint8RefOne, uint8RefZero, ...
+ uint16RefOne, uint16RefZero, ...
+ uint32RefOne, uint32RefZero] = createReference(refOne, refZero)
+ dbRefOne = refOne;
+ dbRefZero = refZero;
+ uint8RefOne = uint8(dbRefOne);
+ uint16RefOne = uint16(dbRefOne);
+ uint32RefOne = uint32(dbRefOne);
+ uint8RefZero = uint8(dbRefZero);
+ uint16RefZero = uint16(dbRefZero);
+ uint32RefZero = uint32(dbRefZero);
+endfunction
+// check input arguments
+lstr = gettext("%s: Wrong number of input argument(s): At least %d expected.\n");
+errmsg = msprintf (lstr, "bitset", 2);
+assert_checkerror("bitset(1)", errmsg);
+assert_checkerror("bitset()", errmsg);
+lstr = gettext("%s: Wrong size for input arguments: Same sizes expected.\n");
+errmsg = msprintf (lstr, "bitset");
+assert_checkerror("bitset([], [1, 2])", errmsg);
+lstr = gettext("%s: Wrong value for input argument #%d: 0 or 1 expected.\n");
+errmsg = msprintf (lstr, "bitset", 3);
+assert_checkerror("bitset(1, 1, 3)", errmsg);
+assert_checkerror("bitset(1, 1, %t)", errmsg);
+assert_checkerror("bitset([1, 2], [1, 1], [2, 0])", errmsg);
+assert_checkerror("bitset([1; 2; 3], [1; 1; 1], [0; 0; 4])", errmsg);
+lstr = gettext("%s: Wrong size for input arguments: Same sizes expected.\n");
+errmsg = msprintf (lstr, "bitset");
+assert_checkerror("bitset(1, [1, 2], 1)", errmsg);
+assert_checkerror("bitset([1, 2], [1, 2, 3], 1)", errmsg);
+assert_checkerror("bitset([1, 2, 3], [1, 2, 3], 1)", errmsg);
+lstr = gettext("%s: Wrong type for input argument #%d: Scalar/matrix/hypermatrix of unsigned integers expected.\n");
+errmsg = msprintf (lstr, "bitset", 1);
+assert_checkerror("bitset(""1"", 1, 1)", errmsg);
+assert_checkerror("bitset(poly(0,""s""), 1, 1)", errmsg);
+assert_checkerror("bitset([1, -1], [1, 0], [1, 0])", errmsg);
+assert_checkerror("bitset([0.5, 0.2], [1, 0], [1, 0])", errmsg);
+assert_checkerror("bitset([%t, %t], [1, 0], [1, 0])", errmsg);
+assert_checkerror("bitset(int32([1, 1]), [1, 0], [1, 0])", errmsg);
+assert_checkerror("bitset(int16([1, 1]), [1, 0], [1, 0])", errmsg);
+assert_checkerror("bitset(int8([1, 1]), [1, 0], [1, 0])", errmsg);
+errmsg = msprintf (lstr, "bitset", 2);
+assert_checkerror("bitset(1,""1"", 1)", errmsg);
+assert_checkerror("bitset(1, poly(0,""s""), 1)", errmsg);
+assert_checkerror("bitset([1, 0], [1, -1], [1, 0])", errmsg);
+assert_checkerror("bitset([1, 0], [0.5, 0.2], [1, 0])", errmsg);
+assert_checkerror("bitset([1; 0], [%t; %t], [1; 0])", errmsg);
+assert_checkerror("bitset([1, 0], int32([1, 1]), [1, 0])", errmsg);
+assert_checkerror("bitset([1, 0], int16([1, 1]), [1, 0])", errmsg);
+assert_checkerror("bitset([1, 0], int8([1, 1]), [1, 0])", errmsg);
+lstr = gettext("%s: Wrong value for input argument #%d: Must be between %d and %d.\n");
+errmsg = msprintf (lstr, "bitset", 2, 1, 52);
+assert_checkerror("bitset([1, 0], [1, 53], [1, 0])", errmsg);
+assert_checkerror("bitset([1, 0], [0, 5], [1, 0])", errmsg);
+errmsg = msprintf (lstr, "bitset", 2, 1, 8);
+assert_checkerror("bitset(uint8([1, 0; 1, 0]), [1, 2; 1, 9], [1, 0; 1, 1])", errmsg);
+assert_checkerror("bitset(uint8([1, 0; 1, 0]), [1, 0; 0, 1], [1, 0; 1, 1])", errmsg);
+errmsg = msprintf (lstr, "bitset", 2, 1, 16);
+assert_checkerror("bitset(uint16([1, 0; 1, 0]), [1, 17; 1, 9], [1, 0; 1, 1])", errmsg);
+assert_checkerror("bitset(uint16([1, 0; 1, 0]), [1, 0; 0, 1], [1, 0; 1, 1])", errmsg);
+errmsg = msprintf (lstr, "bitset", 2, 1, 32);
+assert_checkerror("bitset(uint32([1, 0; 1, 0]), [1, 17; 33, 1], [1, 0; 1, 1])", errmsg);
+assert_checkerror("bitset(uint32([1, 0; 1, 0]), [1, 1; 0, 1], [1, 0; 1, 1])", errmsg);
+// check results
+// create value to check
+value = [9, 10, 11, 12, 13, 14, 15];
+position = [2, 3, 4, 5, 6, 7, 8];
+bitValue = zeros(1:7);
+[dbValue, dbPos, dbBitValue, ...
+ uint8Value, uint8Pos, uint8BitValue, ...
+ uint16Value, uint16Pos, uint16BitValue, ...
+ uint32Value, uint32Pos, uint32BitValue] = createValues(value, position, bitValue);
+// create references
+refOne = [11, 14, 11, 28, 45, 78, 143];
+refZero = [9, 10, 3, 12, 13, 14, 15];
+[dbRefOne, dbRefZero, ...
+ uint8RefOne, uint8RefZero, ...
+ uint16RefOne, uint16RefZero, ...
+ uint32RefOne, uint32RefZero] = createReference(refOne, refZero);
+// check only the same types
+// only double
+checkBitset(dbValue, dbPos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, dbPos, dbBitValue, %f, 0);
+// only uint8
+checkBitset(uint8Value, uint8Pos, uint8BitValue + 1, %t, 8);
+checkBitset(uint8Value, uint8Pos, uint8BitValue, %f, 8);
+// only uint16
+checkBitset(uint16Value, uint16Pos, uint16BitValue + 1, %t, 16);
+checkBitset(uint16Value, uint16Pos, uint16BitValue, %f, 16);
+// only uint32
+checkBitset(uint32Value, uint32Pos, uint32BitValue + 1, %t, 32);
+checkBitset(uint32Value, uint32Pos, uint32BitValue, %f, 32);
+// check mixte types
+// double
+checkBitset(dbValue, uint8Pos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, uint8Pos, dbBitValue, %f, 0);
+checkBitset(dbValue, uint8Pos, uint8BitValue, %f, 0);
+checkBitset(dbValue, uint16Pos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, uint16Pos, dbBitValue, %f, 0);
+checkBitset(dbValue, uint16Pos, uint8BitValue, %f, 0);
+checkBitset(dbValue, uint32Pos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, uint32Pos, dbBitValue, %f, 0);
+// uint8
+checkBitset(uint8Value, dbPos, dbBitValue + 1, %t, 8);
+checkBitset(uint8Value, dbPos, dbBitValue, %f, 8);
+checkBitset(uint8Value, uint16Pos, uint16BitValue + 1, %t, 8);
+checkBitset(uint8Value, uint16Pos, dbBitValue, %f, 8);
+checkBitset(uint8Value, uint32Pos, uint8BitValue, %f, 8);
+checkBitset(uint8Value, uint32Pos, dbBitValue + 1, %t, 8);
+// uint16
+checkBitset(uint16Value, dbPos, dbBitValue + 1, %t, 16);
+checkBitset(uint16Value, dbPos, dbBitValue, %f, 16);
+checkBitset(uint16Value, uint8Pos, uint16BitValue + 1, %t, 16);
+checkBitset(uint16Value, uint8Pos, dbBitValue, %f, 16);
+checkBitset(uint16Value, uint32Pos, uint8BitValue, %f, 16);
+checkBitset(uint16Value, uint32Pos, dbBitValue + 1, %t, 16);
+// uint32
+checkBitset(uint32Value, dbPos, uint32BitValue + 1, %t, 32);
+checkBitset(uint32Value, dbPos, uint32BitValue, %f, 32);
+checkBitset(uint32Value, uint16Pos, uint16BitValue + 1, %t, 32);
+checkBitset(uint32Value, uint16Pos, dbBitValue, %f, 32);
+checkBitset(uint32Value, uint8Pos, uint8BitValue, %f, 32);
+checkBitset(uint32Value, uint8Pos, dbBitValue + 1, %t, 32);
+// create value to check
+value = [4; 5; 6];
+position = [1; 2; 3];
+bitValue = zeros(1:3)';
+[dbValue, dbPos, dbBitValue, ...
+ uint8Value, uint8Pos, uint8BitValue, ...
+ uint16Value, uint16Pos, uint16BitValue, ...
+ uint32Value, uint32Pos, uint32BitValue] = createValues(value, position, bitValue);
+// create references
+refOne = [5; 7; 6];
+refZero = [4; 5; 2];
+[dbRefOne, dbRefZero, ...
+ uint8RefOne, uint8RefZero, ...
+ uint16RefOne, uint16RefZero, ...
+ uint32RefOne, uint32RefZero] = createReference(refOne, refZero);
+// check values
+// double
+checkBitset(dbValue, dbPos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, dbPos, dbBitValue, %f, 0);
+// uint8
+checkBitset(uint8Value, uint8Pos, uint8BitValue + 1, %t, 8);
+checkBitset(uint8Value, uint8Pos, uint8BitValue, %f, 8);
+// uint16
+checkBitset(uint16Value, uint16Pos, uint16BitValue + 1, %t, 16);
+checkBitset(uint16Value, uint16Pos, uint16BitValue, %f, 16);
+// uint32
+checkBitset(uint32Value, uint32Pos, uint32BitValue + 1, %t, 32);
+checkBitset(uint32Value, uint32Pos, uint32BitValue, %f, 32);
+// create value to check
+value = [1, 2, 3; 4, 5, 6];
+position = [2, 2, 2; 3, 3, 3];
+bitValue = zeros(2, 3);
+[dbValue, dbPos, dbBitValue, ...
+ uint8Value, uint8Pos, uint8BitValue, ...
+ uint16Value, uint16Pos, uint16BitValue, ...
+ uint32Value, uint32Pos, uint32BitValue] = createValues(value, position, bitValue);
+// create references
+refOne = [3, 2, 3; 4, 5, 6];
+refZero = [1, 0, 1; 0, 1, 2];
+[dbRefOne, dbRefZero, ...
+ uint8RefOne, uint8RefZero, ...
+ uint16RefOne, uint16RefZero, ...
+ uint32RefOne, uint32RefZero] = createReference(refOne, refZero);
+// check values
+// double
+checkBitset(dbValue, dbPos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, dbPos, dbBitValue, %f, 0);
+// uint8
+checkBitset(uint8Value, uint8Pos, uint8BitValue + 1, %t, 8);
+checkBitset(uint8Value, uint8Pos, uint8BitValue, %f, 8);
+// uint16
+checkBitset(uint16Value, uint16Pos, uint16BitValue + 1, %t, 16);
+checkBitset(uint16Value, uint16Pos, uint16BitValue, %f, 16);
+// uint32
+checkBitset(uint32Value, uint32Pos, uint32BitValue + 1, %t, 32);
+checkBitset(uint32Value, uint32Pos, uint32BitValue, %f, 32);
+// create value to check
+value = hypermat([2 3 1 2], 1:12);
+position = ones(value)*3;
+position(1:6) = 4;
+bitValue = hypermat(size(value), zeros(1:12));
+[dbValue, dbPos, dbBitValue, ...
+ uint8Value, uint8Pos, uint8BitValue, ...
+ uint16Value, uint16Pos, uint16BitValue, ...
+ uint32Value, uint32Pos, uint32BitValue] = createValues(value, position, bitValue);
+// create references
+refOne = [9, 10, 11, 12, 13, 14, 7, 12, 13, 14, 15, 12];
+refZero = [1, 2, 3, 4, 5, 6, 3, 8, 9, 10, 11, 8];
+refOne = hypermat([2 3 1 2], refOne);
+refZero = hypermat([2 3 1 2], refZero);
+[dbRefOne, dbRefZero, ...
+ uint8RefOne, uint8RefZero, ...
+ uint16RefOne, uint16RefZero, ...
+ uint32RefOne, uint32RefZero] = createReference(refOne, refZero);
+// check values
+// double
+checkBitset(dbValue, dbPos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, dbPos, dbBitValue, %f, 0);
+// uint8
+checkBitset(uint8Value, uint8Pos, uint8BitValue + 1, %t, 8);
+checkBitset(uint8Value, uint8Pos, uint8BitValue, %f, 8);
+// uint16
+checkBitset(uint16Value, uint16Pos, uint16BitValue + 1, %t, 16);
+checkBitset(uint16Value, uint16Pos, uint16BitValue, %f, 16);
+// uint32
+checkBitset(uint32Value, uint32Pos, uint32BitValue + 1, %t, 32);
+checkBitset(uint32Value, uint32Pos, uint32BitValue, %f, 32);
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Vladislav TRUBKIN
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- Non-regression test for bug 13515 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13515
+//
+// <-- Short Description -->
+// there were wrong results for matrix/hypermatrix with bitset function
+//
+
+clear "checkBitset"
+function checkBitset(x, pos, v, isOne, typeOfx)
+ if isOne then
+ select typeOfx
+ case 0 // double
+ assert_checkequal(bitset(x, pos), dbRefOne);
+ assert_checkequal(bitset(x, pos, v), dbRefOne);
+ case 8 // uint8
+ assert_checkequal(bitset(x, pos), uint8RefOne);
+ assert_checkequal(bitset(x, pos, v), uint8RefOne);
+ case 16 // uint16
+ assert_checkequal(bitset(x, pos), uint16RefOne);
+ assert_checkequal(bitset(x, pos, v), uint16RefOne);
+ case 32 // uint32
+ assert_checkequal(bitset(x, pos), uint32RefOne);
+ assert_checkequal(bitset(x, pos, v), uint32RefOne);
+ end
+ else
+ select typeOfx
+ case 0
+ assert_checkequal(bitset(x, pos, v), dbRefZero);
+ case 8
+ assert_checkequal(bitset(x, pos, v), uint8RefZero);
+ case 16
+ assert_checkequal(bitset(x, pos, v), uint16RefZero);
+ case 32
+ assert_checkequal(bitset(x, pos, v), uint32RefZero);
+ end
+ end
+endfunction
+
+clear "createValues"
+function [dbValue, dbPos, dbBitValue, ...
+ uint8Value, uint8Pos, uint8BitValue, ...
+ uint16Value, uint16Pos, uint16BitValue, ...
+ uint32Value, uint32Pos, uint32BitValue] = createValues(value, pos, bitValue)
+ // double
+ dbValue = value;
+ dbPos = pos;
+ dbBitValue = bitValue
+ // uint8
+ uint8Value = uint8(value);
+ uint8Pos = uint8(pos);
+ uint8BitValue = uint8(bitValue);
+ // uint16
+ uint16Value = uint16(value);
+ uint16Pos = uint16(pos);
+ uint16BitValue = uint16(bitValue);
+ // uint32
+ uint32Value = uint32(value);
+ uint32Pos = uint32(pos);
+ uint32BitValue = uint32(bitValue);
+endfunction
+
+clear "createReference";
+function [dbRefOne, dbRefZero, ...
+ uint8RefOne, uint8RefZero, ...
+ uint16RefOne, uint16RefZero, ...
+ uint32RefOne, uint32RefZero] = createReference(refOne, refZero)
+ dbRefOne = refOne;
+ dbRefZero = refZero;
+ uint8RefOne = uint8(dbRefOne);
+ uint16RefOne = uint16(dbRefOne);
+ uint32RefOne = uint32(dbRefOne);
+ uint8RefZero = uint8(dbRefZero);
+ uint16RefZero = uint16(dbRefZero);
+ uint32RefZero = uint32(dbRefZero);
+endfunction
+
+// check input arguments
+lstr = gettext("%s: Wrong number of input argument(s): At least %d expected.\n");
+errmsg = msprintf (lstr, "bitset", 2);
+assert_checkerror("bitset(1)", errmsg);
+assert_checkerror("bitset()", errmsg);
+lstr = gettext("%s: Wrong size for input arguments: Same sizes expected.\n");
+errmsg = msprintf (lstr, "bitset");
+assert_checkerror("bitset([], [1, 2])", errmsg);
+lstr = gettext("%s: Wrong value for input argument #%d: 0 or 1 expected.\n");
+errmsg = msprintf (lstr, "bitset", 3);
+assert_checkerror("bitset(1, 1, 3)", errmsg);
+assert_checkerror("bitset(1, 1, %t)", errmsg);
+assert_checkerror("bitset([1, 2], [1, 1], [2, 0])", errmsg);
+assert_checkerror("bitset([1; 2; 3], [1; 1; 1], [0; 0; 4])", errmsg);
+lstr = gettext("%s: Wrong size for input arguments: Same sizes expected.\n");
+errmsg = msprintf (lstr, "bitset");
+assert_checkerror("bitset(1, [1, 2], 1)", errmsg);
+assert_checkerror("bitset([1, 2], [1, 2, 3], 1)", errmsg);
+assert_checkerror("bitset([1, 2, 3], [1, 2, 3], 1)", errmsg);
+lstr = gettext("%s: Wrong type for input argument #%d: Scalar/matrix/hypermatrix of unsigned integers expected.\n");
+errmsg = msprintf (lstr, "bitset", 1);
+assert_checkerror("bitset(""1"", 1, 1)", errmsg);
+assert_checkerror("bitset(poly(0,""s""), 1, 1)", errmsg);
+assert_checkerror("bitset([1, -1], [1, 0], [1, 0])", errmsg);
+assert_checkerror("bitset([0.5, 0.2], [1, 0], [1, 0])", errmsg);
+assert_checkerror("bitset([%t, %t], [1, 0], [1, 0])", errmsg);
+assert_checkerror("bitset(int32([1, 1]), [1, 0], [1, 0])", errmsg);
+assert_checkerror("bitset(int16([1, 1]), [1, 0], [1, 0])", errmsg);
+assert_checkerror("bitset(int8([1, 1]), [1, 0], [1, 0])", errmsg);
+errmsg = msprintf (lstr, "bitset", 2);
+assert_checkerror("bitset(1,""1"", 1)", errmsg);
+assert_checkerror("bitset(1, poly(0,""s""), 1)", errmsg);
+assert_checkerror("bitset([1, 0], [1, -1], [1, 0])", errmsg);
+assert_checkerror("bitset([1, 0], [0.5, 0.2], [1, 0])", errmsg);
+assert_checkerror("bitset([1; 0], [%t; %t], [1; 0])", errmsg);
+assert_checkerror("bitset([1, 0], int32([1, 1]), [1, 0])", errmsg);
+assert_checkerror("bitset([1, 0], int16([1, 1]), [1, 0])", errmsg);
+assert_checkerror("bitset([1, 0], int8([1, 1]), [1, 0])", errmsg);
+lstr = gettext("%s: Wrong value for input argument #%d: Must be between %d and %d.\n");
+errmsg = msprintf (lstr, "bitset", 2, 1, 52);
+assert_checkerror("bitset([1, 0], [1, 53], [1, 0])", errmsg);
+assert_checkerror("bitset([1, 0], [0, 5], [1, 0])", errmsg);
+errmsg = msprintf (lstr, "bitset", 2, 1, 8);
+assert_checkerror("bitset(uint8([1, 0; 1, 0]), [1, 2; 1, 9], [1, 0; 1, 1])", errmsg);
+assert_checkerror("bitset(uint8([1, 0; 1, 0]), [1, 0; 0, 1], [1, 0; 1, 1])", errmsg);
+errmsg = msprintf (lstr, "bitset", 2, 1, 16);
+assert_checkerror("bitset(uint16([1, 0; 1, 0]), [1, 17; 1, 9], [1, 0; 1, 1])", errmsg);
+assert_checkerror("bitset(uint16([1, 0; 1, 0]), [1, 0; 0, 1], [1, 0; 1, 1])", errmsg);
+errmsg = msprintf (lstr, "bitset", 2, 1, 32);
+assert_checkerror("bitset(uint32([1, 0; 1, 0]), [1, 17; 33, 1], [1, 0; 1, 1])", errmsg);
+assert_checkerror("bitset(uint32([1, 0; 1, 0]), [1, 1; 0, 1], [1, 0; 1, 1])", errmsg);
+
+// check results
+// create value to check
+value = [9, 10, 11, 12, 13, 14, 15];
+position = [2, 3, 4, 5, 6, 7, 8];
+bitValue = zeros(1:7);
+[dbValue, dbPos, dbBitValue, ...
+uint8Value, uint8Pos, uint8BitValue, ...
+uint16Value, uint16Pos, uint16BitValue, ...
+uint32Value, uint32Pos, uint32BitValue] = createValues(value, position, bitValue);
+
+// create references
+refOne = [11, 14, 11, 28, 45, 78, 143];
+refZero = [9, 10, 3, 12, 13, 14, 15];
+[dbRefOne, dbRefZero, ...
+uint8RefOne, uint8RefZero, ...
+uint16RefOne, uint16RefZero, ...
+uint32RefOne, uint32RefZero] = createReference(refOne, refZero);
+
+// check only the same types
+// only double
+checkBitset(dbValue, dbPos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, dbPos, dbBitValue, %f, 0);
+// only uint8
+checkBitset(uint8Value, uint8Pos, uint8BitValue + 1, %t, 8);
+checkBitset(uint8Value, uint8Pos, uint8BitValue, %f, 8);
+// only uint16
+checkBitset(uint16Value, uint16Pos, uint16BitValue + 1, %t, 16);
+checkBitset(uint16Value, uint16Pos, uint16BitValue, %f, 16);
+// only uint32
+checkBitset(uint32Value, uint32Pos, uint32BitValue + 1, %t, 32);
+checkBitset(uint32Value, uint32Pos, uint32BitValue, %f, 32);
+
+// check mixte types
+// double
+checkBitset(dbValue, uint8Pos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, uint8Pos, dbBitValue, %f, 0);
+checkBitset(dbValue, uint8Pos, uint8BitValue, %f, 0);
+checkBitset(dbValue, uint16Pos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, uint16Pos, dbBitValue, %f, 0);
+checkBitset(dbValue, uint16Pos, uint8BitValue, %f, 0);
+checkBitset(dbValue, uint32Pos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, uint32Pos, dbBitValue, %f, 0);
+// uint8
+checkBitset(uint8Value, dbPos, dbBitValue + 1, %t, 8);
+checkBitset(uint8Value, dbPos, dbBitValue, %f, 8);
+checkBitset(uint8Value, uint16Pos, uint16BitValue + 1, %t, 8);
+checkBitset(uint8Value, uint16Pos, dbBitValue, %f, 8);
+checkBitset(uint8Value, uint32Pos, uint8BitValue, %f, 8);
+checkBitset(uint8Value, uint32Pos, dbBitValue + 1, %t, 8);
+// uint16
+checkBitset(uint16Value, dbPos, dbBitValue + 1, %t, 16);
+checkBitset(uint16Value, dbPos, dbBitValue, %f, 16);
+checkBitset(uint16Value, uint8Pos, uint16BitValue + 1, %t, 16);
+checkBitset(uint16Value, uint8Pos, dbBitValue, %f, 16);
+checkBitset(uint16Value, uint32Pos, uint8BitValue, %f, 16);
+checkBitset(uint16Value, uint32Pos, dbBitValue + 1, %t, 16);
+// uint32
+checkBitset(uint32Value, dbPos, uint32BitValue + 1, %t, 32);
+checkBitset(uint32Value, dbPos, uint32BitValue, %f, 32);
+checkBitset(uint32Value, uint16Pos, uint16BitValue + 1, %t, 32);
+checkBitset(uint32Value, uint16Pos, dbBitValue, %f, 32);
+checkBitset(uint32Value, uint8Pos, uint8BitValue, %f, 32);
+checkBitset(uint32Value, uint8Pos, dbBitValue + 1, %t, 32);
+
+
+// create value to check
+value = [4; 5; 6];
+position = [1; 2; 3];
+bitValue = zeros(1:3)';
+[dbValue, dbPos, dbBitValue, ...
+uint8Value, uint8Pos, uint8BitValue, ...
+uint16Value, uint16Pos, uint16BitValue, ...
+uint32Value, uint32Pos, uint32BitValue] = createValues(value, position, bitValue);
+
+// create references
+refOne = [5; 7; 6];
+refZero = [4; 5; 2];
+[dbRefOne, dbRefZero, ...
+uint8RefOne, uint8RefZero, ...
+uint16RefOne, uint16RefZero, ...
+uint32RefOne, uint32RefZero] = createReference(refOne, refZero);
+
+// check values
+// double
+checkBitset(dbValue, dbPos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, dbPos, dbBitValue, %f, 0);
+// uint8
+checkBitset(uint8Value, uint8Pos, uint8BitValue + 1, %t, 8);
+checkBitset(uint8Value, uint8Pos, uint8BitValue, %f, 8);
+// uint16
+checkBitset(uint16Value, uint16Pos, uint16BitValue + 1, %t, 16);
+checkBitset(uint16Value, uint16Pos, uint16BitValue, %f, 16);
+// uint32
+checkBitset(uint32Value, uint32Pos, uint32BitValue + 1, %t, 32);
+checkBitset(uint32Value, uint32Pos, uint32BitValue, %f, 32);
+
+// create value to check
+value = [1, 2, 3; 4, 5, 6];
+position = [2, 2, 2; 3, 3, 3];
+bitValue = zeros(2, 3);
+[dbValue, dbPos, dbBitValue, ...
+uint8Value, uint8Pos, uint8BitValue, ...
+uint16Value, uint16Pos, uint16BitValue, ...
+uint32Value, uint32Pos, uint32BitValue] = createValues(value, position, bitValue);
+
+// create references
+refOne = [3, 2, 3; 4, 5, 6];
+refZero = [1, 0, 1; 0, 1, 2];
+[dbRefOne, dbRefZero, ...
+uint8RefOne, uint8RefZero, ...
+uint16RefOne, uint16RefZero, ...
+uint32RefOne, uint32RefZero] = createReference(refOne, refZero);
+
+// check values
+// double
+checkBitset(dbValue, dbPos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, dbPos, dbBitValue, %f, 0);
+// uint8
+checkBitset(uint8Value, uint8Pos, uint8BitValue + 1, %t, 8);
+checkBitset(uint8Value, uint8Pos, uint8BitValue, %f, 8);
+// uint16
+checkBitset(uint16Value, uint16Pos, uint16BitValue + 1, %t, 16);
+checkBitset(uint16Value, uint16Pos, uint16BitValue, %f, 16);
+// uint32
+checkBitset(uint32Value, uint32Pos, uint32BitValue + 1, %t, 32);
+checkBitset(uint32Value, uint32Pos, uint32BitValue, %f, 32);
+
+// create value to check
+value = hypermat([2 3 1 2], 1:12);
+position = ones(value)*3;
+position(1:6) = 4;
+bitValue = hypermat(size(value), zeros(1:12));
+[dbValue, dbPos, dbBitValue, ...
+uint8Value, uint8Pos, uint8BitValue, ...
+uint16Value, uint16Pos, uint16BitValue, ...
+uint32Value, uint32Pos, uint32BitValue] = createValues(value, position, bitValue);
+
+// create references
+refOne = [9, 10, 11, 12, 13, 14, 7, 12, 13, 14, 15, 12];
+refZero = [1, 2, 3, 4, 5, 6, 3, 8, 9, 10, 11, 8];
+refOne = hypermat([2 3 1 2], refOne);
+refZero = hypermat([2 3 1 2], refZero);
+[dbRefOne, dbRefZero, ...
+uint8RefOne, uint8RefZero, ...
+uint16RefOne, uint16RefZero, ...
+uint32RefOne, uint32RefZero] = createReference(refOne, refZero);
+
+// check values
+// double
+checkBitset(dbValue, dbPos, dbBitValue + 1, %t, 0);
+checkBitset(dbValue, dbPos, dbBitValue, %f, 0);
+// uint8
+checkBitset(uint8Value, uint8Pos, uint8BitValue + 1, %t, 8);
+checkBitset(uint8Value, uint8Pos, uint8BitValue, %f, 8);
+// uint16
+checkBitset(uint16Value, uint16Pos, uint16BitValue + 1, %t, 16);
+checkBitset(uint16Value, uint16Pos, uint16BitValue, %f, 16);
+// uint32
+checkBitset(uint32Value, uint32Pos, uint32BitValue + 1, %t, 32);
+checkBitset(uint32Value, uint32Pos, uint32BitValue, %f, 32);
+
assert_checkerror("bitset(""aze"")",[],10000);
assert_checkerror("bitset(-25, 5)",[],10000);
a=[170,82,24,89,92,59,220,141];
-assert_checkequal(bitset(a,1), [171,83,25,89,93,59,221,141]);
+assert_checkequal(bitset(a, ones(1:8)), [171,83,25,89,93,59,221,141]);
assert_checkerror("bitset(-25, 5)",[],10000);
a=[170,82,24,89,92,59,220,141];
-assert_checkequal(bitset(a,1), [171,83,25,89,93,59,221,141]);
+assert_checkequal(bitset(a, ones(1:8)), [171,83,25,89,93,59,221,141]);
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: includes/ScilabAbstractEnvironmentException.hxx, line: 108
msgid "Exception thrown in file"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/cpp/sci_jconvMatrixMethod.cpp, line: 35
#, c-format
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/gw_fftw.c, line: 49
#, c-format
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_basename.c, line: 45
# File: sci_gateway/c/sci_basename.c, line: 58
# File: sci_gateway/c/sci_basename.c, line: 121
# File: sci_gateway/c/sci_chdir.c, line: 53
# File: sci_gateway/c/sci_chdir.c, line: 70
-# File: sci_gateway/c/sci_copyfile.c, line: 56
-# File: sci_gateway/c/sci_copyfile.c, line: 70
+# File: sci_gateway/c/sci_copyfile.c, line: 54
+# File: sci_gateway/c/sci_copyfile.c, line: 68
# File: sci_gateway/c/sci_fileparts.c, line: 58
# File: sci_gateway/c/sci_fileparts.c, line: 81
# File: sci_gateway/c/sci_fprintfMat.c, line: 62
# File: sci_gateway/c/sci_isfile.c, line: 49
# File: sci_gateway/c/sci_mgetl.c, line: 52
# File: sci_gateway/c/sci_mgetl.c, line: 92
-# File: sci_gateway/c/sci_movefile.c, line: 56
-# File: sci_gateway/c/sci_movefile.c, line: 70
+# File: sci_gateway/c/sci_movefile.c, line: 54
+# File: sci_gateway/c/sci_movefile.c, line: 68
# File: sci_gateway/c/sci_mputl.c, line: 60
# File: sci_gateway/c/sci_mputl.c, line: 173
# File: sci_gateway/c/sci_mputl.c, line: 196
# File: sci_gateway/c/sci_chdir.c, line: 80
# File: sci_gateway/c/sci_chdir.c, line: 130
# File: sci_gateway/c/sci_chdir.c, line: 158
-# File: sci_gateway/c/sci_copyfile.c, line: 87
-# File: sci_gateway/c/sci_copyfile.c, line: 99
-# File: sci_gateway/c/sci_copyfile.c, line: 116
-# File: sci_gateway/c/sci_copyfile.c, line: 127
-# File: sci_gateway/c/sci_copyfile.c, line: 175
-# File: sci_gateway/c/sci_copyfile.c, line: 276
-# File: sci_gateway/c/sci_copyfile.c, line: 288
-# File: sci_gateway/c/sci_copyfile.c, line: 302
-# File: sci_gateway/c/sci_copyfile.c, line: 312
+# File: sci_gateway/c/sci_copyfile.c, line: 85
+# File: sci_gateway/c/sci_copyfile.c, line: 97
+# File: sci_gateway/c/sci_copyfile.c, line: 114
+# File: sci_gateway/c/sci_copyfile.c, line: 125
+# File: sci_gateway/c/sci_copyfile.c, line: 173
+# File: sci_gateway/c/sci_copyfile.c, line: 274
+# File: sci_gateway/c/sci_copyfile.c, line: 286
+# File: sci_gateway/c/sci_copyfile.c, line: 300
+# File: sci_gateway/c/sci_copyfile.c, line: 310
# File: sci_gateway/c/sci_fileparts.c, line: 126
# File: sci_gateway/c/sci_fileparts.c, line: 170
# File: sci_gateway/c/sci_fileparts.c, line: 201
# File: sci_gateway/c/sci_mgetl.c, line: 259
# File: sci_gateway/c/sci_mgetl.c, line: 270
# File: sci_gateway/c/sci_mgetl.c, line: 282
-# File: sci_gateway/c/sci_movefile.c, line: 87
-# File: sci_gateway/c/sci_movefile.c, line: 95
-# File: sci_gateway/c/sci_movefile.c, line: 149
-# File: sci_gateway/c/sci_movefile.c, line: 242
-# File: sci_gateway/c/sci_movefile.c, line: 254
-# File: sci_gateway/c/sci_movefile.c, line: 269
-# File: sci_gateway/c/sci_movefile.c, line: 279
+# File: sci_gateway/c/sci_movefile.c, line: 85
+# File: sci_gateway/c/sci_movefile.c, line: 93
+# File: sci_gateway/c/sci_movefile.c, line: 147
+# File: sci_gateway/c/sci_movefile.c, line: 240
+# File: sci_gateway/c/sci_movefile.c, line: 252
+# File: sci_gateway/c/sci_movefile.c, line: 267
+# File: sci_gateway/c/sci_movefile.c, line: 277
# File: sci_gateway/c/sci_mputl.c, line: 76
# File: sci_gateway/c/sci_mputl.c, line: 103
# File: sci_gateway/c/sci_pathconvert.c, line: 152
#
# File: sci_gateway/c/sci_chdir.c, line: 59
-# File: sci_gateway/c/sci_copyfile.c, line: 62
-# File: sci_gateway/c/sci_copyfile.c, line: 76
+# File: sci_gateway/c/sci_copyfile.c, line: 60
+# File: sci_gateway/c/sci_copyfile.c, line: 74
# File: sci_gateway/c/sci_fileparts.c, line: 64
# File: sci_gateway/c/sci_fileparts.c, line: 87
# File: sci_gateway/c/sci_fileparts.c, line: 95
# File: sci_gateway/c/sci_mget.c, line: 78
# File: sci_gateway/c/sci_mopen.c, line: 43
# File: sci_gateway/c/sci_mopen.c, line: 54
-# File: sci_gateway/c/sci_movefile.c, line: 62
-# File: sci_gateway/c/sci_movefile.c, line: 76
+# File: sci_gateway/c/sci_movefile.c, line: 60
+# File: sci_gateway/c/sci_movefile.c, line: 74
# File: sci_gateway/c/sci_mput.c, line: 58
# File: sci_gateway/c/sci_mputstr.c, line: 43
# File: sci_gateway/c/sci_pathconvert.c, line: 54
msgstr ""
#
-# File: sci_gateway/c/sci_copyfile.c, line: 189
-# File: sci_gateway/c/sci_copyfile.c, line: 205
-# File: sci_gateway/c/sci_movefile.c, line: 163
-# File: sci_gateway/c/sci_movefile.c, line: 171
+# File: sci_gateway/c/sci_copyfile.c, line: 187
+# File: sci_gateway/c/sci_copyfile.c, line: 203
+# File: sci_gateway/c/sci_movefile.c, line: 161
+# File: sci_gateway/c/sci_movefile.c, line: 169
#, c-format
msgid ""
"%s: Wrong value for input argument #%d: A valid filename or directory "
msgstr ""
#
-# File: sci_gateway/c/sci_copyfile.c, line: 197
+# File: sci_gateway/c/sci_copyfile.c, line: 195
#, c-format
msgid "%s: Wrong value(s) for input argument(s).\n"
msgstr ""
msgstr ""
#
-# File: src/c/mopen.c, line: 46
+# File: src/c/mopen.c, line: 47
#, c-format
msgid "Warning: file '%s' already opened in Scilab.\n"
msgstr ""
<!--
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
* Copyright (C) 2009 - DIGITEO - Allan CORNET
- *
+ *
* This file must be used under the terms of the CeCILL.
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at
+ * are also available at
* http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
*
-->
<refsection>
<title>Description</title>
<para>
- Utilisé
+ Utilisé
<emphasis role="bold">
<literal>uniquement</literal>
</emphasis>
<varlistentry>
<term>k = 2</term>
<listitem>
- <para>valeur par défaut retourné au prompt de scilab.</para>
+ <para>valeur par défaut retournée au prompt de scilab.</para>
<para>veuillez noter que ce mode ne doit pas etre utilisé au prompt mais seulement via un script ou une fonction.</para>
</listitem>
</varlistentry>
</refsection>
<refsection>
<title>Exemples</title>
- <programlisting role="exemple"><![CDATA[
+ <programlisting role="exemple"><![CDATA[
// copier - coller ces lignes dans scilab
function example_mode( level_mode )
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_exec.c, line: 52
# File: sci_gateway/c/sci_exec.c, line: 60
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: demos/GAIsing2ddemo.sce, line: 63
# File: demos/GAdemo.sce, line: 86
msgstr ""
#
-# File: macros/optim_ga.sci, line: 27
+# File: macros/optim_ga.sci, line: 29
#, c-format
msgid "%s: ga_f is mandatory"
msgstr ""
#
-# File: macros/optim_ga.sci, line: 54
-# File: macros/optim_moga.sci, line: 54
-# File: macros/optim_nsga.sci, line: 60
-# File: macros/optim_nsga2.sci, line: 52
-#, c-format
-msgid "%s: Initialization of the population\n"
+# File: macros/optim_moga.sci, line: 29
+# File: macros/optim_nsga.sci, line: 28
+msgid "optim_moga: ga_f is mandatory"
msgstr ""
#
-# File: macros/optim_ga.sci, line: 84
-# File: macros/optim_moga.sci, line: 94
-# File: macros/optim_nsga.sci, line: 94
+# File: macros/optim_moga.sci, line: 56
+# File: macros/optim_nsga.sci, line: 61
+# File: macros/optim_nsga2.sci, line: 53
#, c-format
-msgid "%s: iteration %d / %d"
+msgid "%s: Initialization of the population\n"
msgstr ""
#
-# File: macros/optim_ga.sci, line: 159
-# File: macros/optim_moga.sci, line: 207
-# File: macros/optim_nsga.sci, line: 227
-#, c-format
-msgid " - min / max value found = %f / %f\n"
+# File: macros/optim_nsga2.sci, line: 26
+msgid "optim_nsga2: ga_f is mandatory"
msgstr ""
#
-# File: macros/optim_moga.sci, line: 27
-# File: macros/optim_nsga.sci, line: 27
-msgid "optim_moga: ga_f is mandatory"
+# File: macros/output_ga_default.sci, line: 13
+# File: macros/output_moga_default.sci, line: 13
+# File: macros/output_nsga_default.sci, line: 13
+#, c-format
+msgid "%s: iteration %d / %d \n"
msgstr ""
#
-# File: macros/optim_nsga2.sci, line: 25
-msgid "optim_nsga2: ga_f is mandatory"
+# File: macros/output_ga_default.sci, line: 14
+# File: macros/output_moga_default.sci, line: 14
+# File: macros/output_nsga2_default.sci, line: 14
+# File: macros/output_nsga_default.sci, line: 14
+#, c-format
+msgid " min / max value found = %f / %f\n"
msgstr ""
#
-# File: macros/optim_nsga2.sci, line: 95
+# File: macros/output_nsga2_default.sci, line: 13
#, c-format
msgid "%s: iteration %d / %d\n"
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: src/java/org/scilab/modules/graph/utils/ScilabGraphMessages.java, line: 22
msgid "Copy"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/gw_graphic_export.c, line: 84
# File: src/nographic_export/nographic_export.c, line: 26
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: src/java/org/scilab/modules/graphic_objects/datatip/Datatip.java, line: 351
#, c-format
-msgid "Wrong value for ''%s'' property: A valid function name expected.\n"
+msgid "Wrong value for '%s' property: A valid function name expected.\n"
msgstr ""
#
}
}
- String errMsg = Messages.gettext("Wrong value for ''%s'' property: A valid function name expected.\n");
+ String errMsg = Messages.gettext("Wrong value for '%s' property: A valid function name expected.\n");
+ errMsg = errMsg.replace("'", "''");
+ errMsg = errMsg.replace("\n", "\\n");
String updateCommand = "try;" +
"GDZa786XBSq7899SHKp=getcallbackobject(" + getIdentifier() + ");" +
"set(GDZa786XBSq7899SHKp,\"text\"," + fnc + "(GDZa786XBSq7899SHKp));" +
b_f_expTxt = createBorderFont("", 12);
b_l_expTxt = createBorder("line", "navy", 1);
- b_expTxt = createBorder("titled", b_l_expTxt, _(""), "center", "top", b_f_expTxt, "navy");
+ b_expTxt = createBorder("titled", b_l_expTxt, "", "center", "top", b_f_expTxt, "navy");
// Border for the explanatory text frame
c = createConstraints("gridbag", [1 1 1 1], [1 1], "both", "upper");
<varlistentry>
<term>fontId</term>
<listitem>
- <para>an integer specifying the font type.</para>
+ <para>an integer specifying the font type. For more information, see <link linkend="graphics_fonts">graphics_fonts</link></para>
</listitem>
</varlistentry>
<varlistentry>
<term>fontSize</term>
<listitem>
- <para>an integer specifying the font size.</para>
+ <para>an integer specifying the font size. For more information, see <link linkend="graphics_fonts">graphics_fonts</link></para>
</listitem>
</varlistentry>
</variablelist>
</refsection>
<refsection>
<title>Examples</title>
- <programlisting role="example"><![CDATA[
-plot2d([0;1],[0;1],0)
-str=["$\underleftrightarrow{Scilab}$" "is";"not" "elisaB"]; // Only valid from Scilab 5.2
-r=xstringl(0.5,0.5,str)
-xrects([r(1) r(2)+r(4) r(3) r(4)]')
-xstring(r(1),r(2),str)
+ <programlisting role="example">
+<![CDATA[
+plot2d([0, 1], [0, 1], 0);
+str = ["$\underleftrightarrow{Scilab}$" "is"; "not" "elisaB"]; // Only valid from Scilab 5.2
+r = xstringl(0.5, 0.7, str);
+xrects([r(1) r(2)+r(4) r(3) r(4)]');
+xstring(r(1), r(2), str);
-plot2d([0;1],[0;1],0)
-str=["Scilab" "n''est ";"pas" "Matlab"];
-r2 = xstringl(0.5,0.5,str,2,5)
-xrects([r2(1) r2(2)+r2(4) r2(3) r2(4)]')
-xstring(r2(1),r2(2),str)
+str = ["Scilab" "is"; "not" "Matlab"];
+r2 = xstringl(0.2, 0.2, str, 5, 7);
+xrects([r2(1) r2(2)+r2(4) r2(3) r2(4)]');
+xstring(r2(1), r2(2), str)
+txt = gce();
+txt.font_size = 7;
+txt.font_style = 5;
+ ]]>
+ </programlisting>
+ <scilab:image>
+<![CDATA[
+plot2d([0, 1], [0, 1], 0);
+str = ["$\underleftrightarrow{Scilab}$" "is"; "not" "elisaB"]; // Only valid from Scilab 5.2
+r = xstringl(0.5, 0.7, str);
+xrects([r(1) r(2)+r(4) r(3) r(4)]');
+xstring(r(1), r(2), str);
-txt2=gce();
-txt2.font_size = 5;
-txt2.font_style = 2;
-
-plot2d([0;1],[0;1],0)
+str = ["Scilab" "is"; "not" "Matlab"];
+r2 = xstringl(0.2, 0.2, str, 5, 8);
+xrects([r2(1) r2(2)+r2(4) r2(3) r2(4)]');
+xstring(r2(1), r2(2), str)
+txt = gce();
+txt.font_size = 8;
+txt.font_style = 5;
+ ]]>
+ </scilab:image>
+ <programlisting role="example">
+<![CDATA[
+plot2d([0, 1], [0, 1], 0);
+// Only valid from Scilab 5.2
+mathml = "<mrow>" +..
+ "<mfrac>" +..
+ "<mrow>" +..
+ "<mi> d </mi>" +..
+ "<mi> y </mi>" +..
+ "</mrow>" +..
+ "<mrow>" +..
+ "<mi>d</mi>" +..
+ "<mi>x</mi>" +..
+ "</mrow>" +..
+ "</mfrac>" +..
+ "<mo> = </mo>" +..
+ "<mfrac>" +..
+ "<mn> 1 </mn>" +..
+ "<msup>" +..
+ "<mi> y </mi>" +..
+ "<mn> 2 </mn>" +..
+ "</msup>" +..
+ "</mfrac>" +..
+ "</mrow>";
+str=["SCILAB", "can write LaTeX :", "$\frac{abc}{xyz}$"; "or", "MathML :", mathml];
+r2 = xstringl(0.2, 0.4, str, 10, 4);
+xrects([r2(1) r2(2)+r2(4) r2(3) r2(4)]');
+xstring(r2(1), r2(2), str);
+txt = gce();
+txt.font_size = 4;
+txt.font_style = 10;
+ ]]>
+ </programlisting>
+ <scilab:image>
+ <![CDATA[
+plot2d([0, 1], [0, 1], 0);
// Only valid from Scilab 5.2
-mathml="<mrow> <mfrac> <mrow> <mi>d</mi> <mi>y</mi> </mrow> <mrow> <mi>d</mi> <mi>x</mi> </mrow> </mfrac> <mo>=</mo> <mfrac> <mn>1</mn> <msup> <mi>y</mi> <mn>2</mn> </msup> </mfrac> </mrow>";
-a=gca();
-a.margins=[0,0;0,0];
-str=["SCILAB","can write LaTeX :","$\frac{abc}{xyz}$";"or","MathML :",mathml] ;
-r2 = xstringl(0.5,0.5,str,2,5)
-xrects([r2(1) r2(2)+r2(4) r2(3) r2(4)]')
-xstring(r2(1),r2(2),str)
+mathml = "<mrow>" +..
+ "<mfrac>" +..
+ "<mrow>" +..
+ "<mi> d </mi>" +..
+ "<mi> y </mi>" +..
+ "</mrow>" +..
+ "<mrow>" +..
+ "<mi>d</mi>" +..
+ "<mi>x</mi>" +..
+ "</mrow>" +..
+ "</mfrac>" +..
+ "<mo> = </mo>" +..
+ "<mfrac>" +..
+ "<mn> 1 </mn>" +..
+ "<msup>" +..
+ "<mi> y </mi>" +..
+ "<mn> 2 </mn>" +..
+ "</msup>" +..
+ "</mfrac>" +..
+ "</mrow>";
+str=["SCILAB", "can write LaTeX :", "$\frac{abc}{xyz}$"; "or", "MathML :", mathml];
+r2 = xstringl(0.2, 0.4, str, 10, 4);
+xrects([r2(1) r2(2)+r2(4) r2(3) r2(4)]');
+xstring(r2(1), r2(2), str);
+txt = gce();
+txt.font_size = 4;
+txt.font_style = 10;
+ ]]>
+ </scilab:image>
+ <programlisting>
+<![CDATA[
+plot2d([0, 6],[0, 6], 0);
+str=["$\underleftrightarrow{\tiny{Scilab}}$"; "$\underleftrightarrow{\scriptsize{Scilab}}$";
+ "$\underleftrightarrow{\footnotesize{Scilab}}$"; "$\underleftrightarrow{\small{Scilab}}$";
+ "$\underleftrightarrow{\normalsize{Scilab}}$"; "$\underleftrightarrow{\large{Scilab}}$";
+ "$\underleftrightarrow{\Large{Scilab}}$"; "$\underleftrightarrow{\LARGE{Scilab}}$";
+ "$\underleftrightarrow{\huge{Scilab}}$"; "$\underleftrightarrow{\Huge{Scilab}}$"];
+r = xstringl(0.5, 0.5, str, 5, 3);
+xrects([r(1); r(2)+r(4); r(3); r(4)]);
+xstring(r(1), r(2), str);
+txt = gce();
+txt.font_size = 3;
+txt.font_style = 5;
+txt.font_color = 2;
+str = ["${\tiny{\frac{x}{y}}$", "${\scriptsize{\frac{x}{y}}$", ..
+ "${\footnotesize{\frac{x}{y}}$", "${\small{\frac{x}{y}}$", ..
+ "${\normalsize{\frac{x}{y}}$", "${\large{\frac{x}{y}}$", ..
+ "${\Large{\frac{x}{y}}$", "${\LARGE{\frac{x}{y}}$", ..
+ "${\huge{\frac{x}{y}}$", "$\Huge{\frac{x}{y}}$"];
+r = xstringl(2, 0.5, str, 0, 3);
+xrects([r(1); r(2)+r(4); r(3); r(4)]);
+xstring(r(1), r(2), str);
+txt = gce();
+txt.font_size = 3;
+txt.font_style = 0;
+txt.font_color = 2;
+]]>
+ </programlisting>
+ <scilab:image>
+<![CDATA[
+plot2d([0, 6],[0, 6], 0);
+str=["$\underleftrightarrow{\tiny{Scilab}}$"; "$\underleftrightarrow{\scriptsize{Scilab}}$";
+ "$\underleftrightarrow{\footnotesize{Scilab}}$"; "$\underleftrightarrow{\small{Scilab}}$";
+ "$\underleftrightarrow{\normalsize{Scilab}}$"; "$\underleftrightarrow{\large{Scilab}}$";
+ "$\underleftrightarrow{\Large{Scilab}}$"; "$\underleftrightarrow{\LARGE{Scilab}}$";
+ "$\underleftrightarrow{\huge{Scilab}}$"; "$\underleftrightarrow{\Huge{Scilab}}$"];
+r = xstringl(0.5, 0.5, str, 5, 3);
+xrects([r(1); r(2)+r(4); r(3); r(4)]);
+xstring(r(1), r(2), str);
+txt = gce();
+txt.font_size = 3;
+txt.font_style = 5;
+txt.font_color = 2;
- ]]></programlisting>
- <scilab:image>
- plot2d([0;1],[0;1],0)
- str=["$\underleftrightarrow{Scilab}$" "is";"not" "elisaB"];
- r=xstringl(0.5,0.5,str)
- xrects([r(1) r(2)+r(4) r(3) r(4)]')
- xstring(r(1),r(2),str)
+str = ["${\tiny{\frac{x}{y}}$", "${\scriptsize{\frac{x}{y}}$", ..
+ "${\footnotesize{\frac{x}{y}}$", "${\small{\frac{x}{y}}$", ..
+ "${\normalsize{\frac{x}{y}}$", "${\large{\frac{x}{y}}$", ..
+ "${\Large{\frac{x}{y}}$", "${\LARGE{\frac{x}{y}}$", ..
+ "${\huge{\frac{x}{y}}$", "$\Huge{\frac{x}{y}}$"];
+r = xstringl(2, 0.5, str, 0, 3);
+xrects([r(1); r(2)+r(4); r(3); r(4)]);
+xstring(r(1), r(2), str);
+txt = gce();
+txt.font_size = 3;
+txt.font_style = 0;
+txt.font_color = 2;
+]]>
</scilab:image>
-
</refsection>
<refsection role="see also">
<title>See Also</title>
<varlistentry>
<term>fonId</term>
<listitem>
- <para>un entier specifiant le type de la fonte.</para>
+ <para>un entier specifiant le type de la fonte. Pour plus d'informations, voir <link linkend="graphics_fonts">graphics_fonts</link></para>
</listitem>
</varlistentry>
<varlistentry>
<term>fontSize</term>
<listitem>
- <para>un entier specifiant la taille de la fonte.</para>
+ <para>un entier specifiant la taille de la fonte. Pour plus d'informations, voir <link linkend="graphics_fonts">graphics_fonts</link></para>
</listitem>
</varlistentry>
</variablelist>
</refsection>
<refsection>
<title>Exemples</title>
- <programlisting role="example"><![CDATA[
-plot2d([0;1],[0;1],0)
-str=["Scilab" "n''est ";"$\varinjlim pas$" "Matlab"]; // LaTeX rendering (>= Scilab 5.2)
-r=xstringl(0.5,0.5,str)
-xrects([r(1) r(2)+r(4) r(3) r(4)]')
-xstring(r(1),r(2),str)
+ <programlisting role="example">
+<![CDATA[
+plot2d([0, 1], [0, 1], 0);
+str = ["$\underleftrightarrow{Scilab}$" "is"; "not" "elisaB"];
+r = xstringl(0.5, 0.7, str);
+xrects([r(1) r(2)+r(4) r(3) r(4)]');
+xstring(r(1), r(2), str);
-plot2d([0;1],[0;1],0)
-str=["Scilab" "n''est ";"pas" "Matlab"];
-r2 = xstringl(0.5,0.5,str,2,5)
-xrects([r2(1) r2(2)+r2(4) r2(3) r2(4)]')
-xstring(r2(1),r2(2),str)
+str = ["Scilab" "n''est "; "pas" "Matlab"];
+r2 = xstringl(0.2, 0.2, str, 5, 7);
+xrects([r2(1) r2(2)+r2(4) r2(3) r2(4)]');
+xstring(r2(1), r2(2), str)
+txt = gce();
+txt.font_size = 7;
+txt.font_style = 5;
+ ]]>
+ </programlisting>
+ <scilab:image>
+ <![CDATA[
+plot2d([0, 1], [0, 1], 0);
+str = ["$\underleftrightarrow{Scilab}$" "is"; "not" "elisaB"];
+r = xstringl(0.5, 0.7, str);
+xrects([r(1) r(2)+r(4) r(3) r(4)]');
+xstring(r(1), r(2), str);
-txt2=gce();
-txt2.font_size = 5;
-txt2.font_style = 2;
- ]]></programlisting>
- <scilab:image>
- plot2d([0;1],[0;1],0)
- str=["$\underleftrightarrow{Scilab}$" "is";"not" "elisaB"];
- r=xstringl(0.5,0.5,str)
- xrects([r(1) r(2)+r(4) r(3) r(4)]')
- xstring(r(1),r(2),str)
- </scilab:image>
+str = ["Scilab" "n''est "; "pas" "Matlab"];
+r2 = xstringl(0.2, 0.2, str, 5, 8);
+xrects([r2(1) r2(2)+r2(4) r2(3) r2(4)]');
+xstring(r2(1), r2(2), str)
+txt = gce();
+txt.font_size = 8;
+txt.font_style = 5;
+ ]]>
+ </scilab:image>
+ <programlisting role="example">
+<![CDATA[
+plot2d([0, 1], [0, 1], 0);
+mathml = "<mrow>" +..
+ "<mfrac>" +..
+ "<mrow>" +..
+ "<mi> d </mi>" +..
+ "<mi> y </mi>" +..
+ "</mrow>" +..
+ "<mrow>" +..
+ "<mi>d</mi>" +..
+ "<mi>x</mi>" +..
+ "</mrow>" +..
+ "</mfrac>" +..
+ "<mo> = </mo>" +..
+ "<mfrac>" +..
+ "<mn> 1 </mn>" +..
+ "<msup>" +..
+ "<mi> y </mi>" +..
+ "<mn> 2 </mn>" +..
+ "</msup>" +..
+ "</mfrac>" +..
+ "</mrow>";
+str=["SCILAB", "peut écrire LaTeX :", "$\frac{abc}{xyz}$"; "ou", "MathML :", mathml];
+r2 = xstringl(0.2, 0.4, str, 10, 4);
+xrects([r2(1) r2(2)+r2(4) r2(3) r2(4)]');
+xstring(r2(1), r2(2), str);
+txt = gce();
+txt.font_size = 4;
+txt.font_style = 10;
+ ]]>
+ </programlisting>
+ <scilab:image>
+<![CDATA[
+plot2d([0, 1], [0, 1], 0);
+mathml = "<mrow>" +..
+ "<mfrac>" +..
+ "<mrow>" +..
+ "<mi> d </mi>" +..
+ "<mi> y </mi>" +..
+ "</mrow>" +..
+ "<mrow>" +..
+ "<mi>d</mi>" +..
+ "<mi>x</mi>" +..
+ "</mrow>" +..
+ "</mfrac>" +..
+ "<mo> = </mo>" +..
+ "<mfrac>" +..
+ "<mn> 1 </mn>" +..
+ "<msup>" +..
+ "<mi> y </mi>" +..
+ "<mn> 2 </mn>" +..
+ "</msup>" +..
+ "</mfrac>" +..
+ "</mrow>";
+str=["SCILAB", "peut écrire LaTeX :", "$\frac{abc}{xyz}$"; "ou", "MathML :", mathml];
+r2 = xstringl(0.2, 0.4, str, 10, 4);
+xrects([r2(1) r2(2)+r2(4) r2(3) r2(4)]');
+xstring(r2(1), r2(2), str);
+txt = gce();
+txt.font_size = 4;
+txt.font_style = 10;
+ ]]>
+ </scilab:image>
+ <programlisting>
+<![CDATA[
+plot2d([0, 6],[0, 6], 0);
+str=["$\underleftrightarrow{\tiny{Scilab}}$"; "$\underleftrightarrow{\scriptsize{Scilab}}$";
+ "$\underleftrightarrow{\footnotesize{Scilab}}$"; "$\underleftrightarrow{\small{Scilab}}$";
+ "$\underleftrightarrow{\normalsize{Scilab}}$"; "$\underleftrightarrow{\large{Scilab}}$";
+ "$\underleftrightarrow{\Large{Scilab}}$"; "$\underleftrightarrow{\LARGE{Scilab}}$";
+ "$\underleftrightarrow{\huge{Scilab}}$"; "$\underleftrightarrow{\Huge{Scilab}}$"];
+r = xstringl(0.5, 0.5, str, 5, 3);
+xrects([r(1); r(2)+r(4); r(3); r(4)]);
+xstring(r(1), r(2), str);
+txt = gce();
+txt.font_size = 3;
+txt.font_style = 5;
+txt.font_color = 2;
+
+str = ["${\tiny{\frac{x}{y}}$", "${\scriptsize{\frac{x}{y}}$", ..
+ "${\footnotesize{\frac{x}{y}}$", "${\small{\frac{x}{y}}$", ..
+ "${\normalsize{\frac{x}{y}}$", "${\large{\frac{x}{y}}$", ..
+ "${\Large{\frac{x}{y}}$", "${\LARGE{\frac{x}{y}}$", ..
+ "${\huge{\frac{x}{y}}$", "$\Huge{\frac{x}{y}}$"];
+r = xstringl(2, 0.5, str, 0, 3);
+xrects([r(1); r(2)+r(4); r(3); r(4)]);
+xstring(r(1), r(2), str);
+txt = gce();
+txt.font_size = 3;
+txt.font_style = 0;
+txt.font_color = 2;
+]]>
+ </programlisting>
+ <scilab:image>
+<![CDATA[
+plot2d([0, 6],[0, 6], 0);
+str=["$\underleftrightarrow{\tiny{Scilab}}$"; "$\underleftrightarrow{\scriptsize{Scilab}}$";
+ "$\underleftrightarrow{\footnotesize{Scilab}}$"; "$\underleftrightarrow{\small{Scilab}}$";
+ "$\underleftrightarrow{\normalsize{Scilab}}$"; "$\underleftrightarrow{\large{Scilab}}$";
+ "$\underleftrightarrow{\Large{Scilab}}$"; "$\underleftrightarrow{\LARGE{Scilab}}$";
+ "$\underleftrightarrow{\huge{Scilab}}$"; "$\underleftrightarrow{\Huge{Scilab}}$"];
+r = xstringl(0.5, 0.5, str, 5, 3);
+xrects([r(1); r(2)+r(4); r(3); r(4)]);
+xstring(r(1), r(2), str);
+txt = gce();
+txt.font_size = 3;
+txt.font_style = 5;
+txt.font_color = 2;
+
+str = ["${\tiny{\frac{x}{y}}$", "${\scriptsize{\frac{x}{y}}$", ..
+ "${\footnotesize{\frac{x}{y}}$", "${\small{\frac{x}{y}}$", ..
+ "${\normalsize{\frac{x}{y}}$", "${\large{\frac{x}{y}}$", ..
+ "${\Large{\frac{x}{y}}$", "${\LARGE{\frac{x}{y}}$", ..
+ "${\huge{\frac{x}{y}}$", "$\Huge{\frac{x}{y}}$"];
+r = xstringl(2, 0.5, str, 0, 3);
+xrects([r(1); r(2)+r(4); r(3); r(4)]);
+xstring(r(1), r(2), str);
+txt = gce();
+txt.font_size = 3;
+txt.font_style = 0;
+txt.font_color = 2;
+]]>
+ </scilab:image>
</refsection>
<refsection role="see also">
<title>Voir aussi</title>
#include "dynlib_graphics.h"
/**
- * Routine creating all needed objetcs for the module
+ * Routine creating all needed objects for the module
*/
GRAPHICS_IMPEXP void loadGraphicModule(void);
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/gw_graphics.c, line: 134
# File: src/nographics/nographics.c, line: 83
# File: sci_gateway/c/sci_xclick.c, line: 154
# File: sci_gateway/c/sci_xclick.c, line: 170
# File: sci_gateway/c/sci_xfarcs.c, line: 116
-# File: sci_gateway/c/sci_xfpolys.c, line: 185
+# File: sci_gateway/c/sci_xfpolys.c, line: 188
# File: sci_gateway/c/sci_xget.c, line: 133
# File: sci_gateway/c/sci_xgetmouse.c, line: 127
# File: sci_gateway/c/sci_xgetmouse.c, line: 161
# File: src/c/getHandleProperty/set_y_ticks_property.c, line: 72
# File: src/c/getHandleProperty/set_z_shift_property.c, line: 79
# File: src/c/getHandleProperty/set_z_ticks_property.c, line: 72
-# File: src/c/sciCall.c, line: 187
-# File: src/c/sciCall.c, line: 264
-# File: src/c/sciCall.c, line: 314
-# File: src/c/sciCall.c, line: 368
-# File: src/c/sciCall.c, line: 638
-# File: src/c/sciCall.c, line: 697
-# File: src/c/sciCall.c, line: 794
+# File: src/c/sciCall.c, line: 254
+# File: src/c/sciCall.c, line: 331
+# File: src/c/sciCall.c, line: 381
+# File: src/c/sciCall.c, line: 435
+# File: src/c/sciCall.c, line: 705
+# File: src/c/sciCall.c, line: 764
+# File: src/c/sciCall.c, line: 861
#, c-format
msgid "%s: No more memory.\n"
msgstr ""
# File: sci_gateway/c/sci_xarrows.c, line: 79
# File: sci_gateway/c/sci_xarrows.c, line: 112
# File: sci_gateway/c/sci_xarrows.c, line: 133
-# File: sci_gateway/c/sci_xarrows.c, line: 177
+# File: sci_gateway/c/sci_xarrows.c, line: 178
# File: sci_gateway/c/sci_xchange.c, line: 87
# File: sci_gateway/c/sci_xchange.c, line: 103
# File: sci_gateway/c/sci_xchange.c, line: 166
# File: sci_gateway/c/sci_xfpoly.c, line: 66
# File: sci_gateway/c/sci_xfpoly.c, line: 82
# File: sci_gateway/c/sci_xfpoly.c, line: 108
-# File: sci_gateway/c/sci_xfpolys.c, line: 87
-# File: sci_gateway/c/sci_xfpolys.c, line: 103
-# File: sci_gateway/c/sci_xfpolys.c, line: 136
+# File: sci_gateway/c/sci_xfpolys.c, line: 90
+# File: sci_gateway/c/sci_xfpolys.c, line: 106
+# File: sci_gateway/c/sci_xfpolys.c, line: 139
# File: sci_gateway/c/sci_xget.c, line: 110
# File: sci_gateway/c/sci_xgraduate.c, line: 54
# File: sci_gateway/c/sci_xgraduate.c, line: 77
#
# File: sci_gateway/c/sci_champ.c, line: 165
-# File: sci_gateway/c/sci_drawaxis.c, line: 315
-# File: sci_gateway/c/sci_drawaxis.c, line: 348
+# File: sci_gateway/c/sci_drawaxis.c, line: 318
+# File: sci_gateway/c/sci_drawaxis.c, line: 351
# File: sci_gateway/c/sci_fec.c, line: 126
# File: sci_gateway/c/sci_geom3d.c, line: 120
# File: sci_gateway/c/sci_geom3d.c, line: 127
# File: sci_gateway/c/sci_xchange.c, line: 110
# File: sci_gateway/c/sci_xchange.c, line: 189
# File: sci_gateway/c/sci_xfpoly.c, line: 89
-# File: sci_gateway/c/sci_xfpolys.c, line: 110
-# File: sci_gateway/c/sci_xfpolys.c, line: 146
+# File: sci_gateway/c/sci_xfpolys.c, line: 113
+# File: sci_gateway/c/sci_xfpolys.c, line: 149
# File: sci_gateway/c/sci_xgetmouse.c, line: 103
# File: sci_gateway/c/sci_xpoly.c, line: 100
# File: sci_gateway/c/sci_xpolys.c, line: 99
# File: sci_gateway/c/sci_grayplot.c, line: 165
# File: sci_gateway/c/sci_plot2d.c, line: 245
# File: sci_gateway/c/sci_plot2d1.c, line: 227
-# File: sci_gateway/c/sci_xfpolys.c, line: 170
+# File: sci_gateway/c/sci_xfpolys.c, line: 173
# File: sci_gateway/c/sci_xpolys.c, line: 148
#, c-format
msgid "%s: Wrong size for input arguments: Incompatible sizes.\n"
# File: sci_gateway/c/sci_grayplot.c, line: 103
# File: sci_gateway/c/sci_grayplot.c, line: 127
# File: sci_gateway/c/sci_xarcs.c, line: 111
-# File: sci_gateway/c/sci_xarrows.c, line: 184
+# File: sci_gateway/c/sci_xarrows.c, line: 185
# File: sci_gateway/c/sci_xfarcs.c, line: 98
-# File: sci_gateway/c/sci_xfpolys.c, line: 163
+# File: sci_gateway/c/sci_xfpolys.c, line: 166
# File: sci_gateway/c/sci_xpolys.c, line: 141
# File: sci_gateway/c/sci_xrects.c, line: 101
# File: sci_gateway/c/sci_xsegs.c, line: 157
msgstr ""
#
-# File: sci_gateway/c/sci_drawaxis.c, line: 88
-# File: sci_gateway/c/sci_drawaxis.c, line: 164
-# File: sci_gateway/c/sci_drawaxis.c, line: 277
+# File: sci_gateway/c/sci_drawaxis.c, line: 90
+# File: sci_gateway/c/sci_drawaxis.c, line: 166
+# File: sci_gateway/c/sci_drawaxis.c, line: 279
# File: sci_gateway/c/sci_matplot1.c, line: 296
# File: sci_gateway/c/sci_param3d1.c, line: 218
-# File: sci_gateway/c/sci_xarrows.c, line: 194
+# File: sci_gateway/c/sci_xarrows.c, line: 195
# File: sci_gateway/c/sci_xrect.c, line: 82
#, c-format
msgid "%s: Wrong size for input argument #%d: %d expected.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_drawaxis.c, line: 102
-# File: sci_gateway/c/sci_drawaxis.c, line: 121
-# File: sci_gateway/c/sci_drawaxis.c, line: 136
-# File: sci_gateway/c/sci_drawaxis.c, line: 150
-# File: sci_gateway/c/sci_drawaxis.c, line: 179
-# File: sci_gateway/c/sci_drawaxis.c, line: 306
-# File: sci_gateway/c/sci_drawaxis.c, line: 339
+# File: sci_gateway/c/sci_drawaxis.c, line: 104
+# File: sci_gateway/c/sci_drawaxis.c, line: 123
+# File: sci_gateway/c/sci_drawaxis.c, line: 138
+# File: sci_gateway/c/sci_drawaxis.c, line: 152
+# File: sci_gateway/c/sci_drawaxis.c, line: 181
+# File: sci_gateway/c/sci_drawaxis.c, line: 309
+# File: sci_gateway/c/sci_drawaxis.c, line: 342
# File: sci_gateway/c/sci_xarc.c, line: 79
# File: sci_gateway/c/sci_xarc.c, line: 102
# File: sci_gateway/c/sci_xarc.c, line: 125
msgstr ""
#
-# File: sci_gateway/c/sci_drawaxis.c, line: 268
+# File: sci_gateway/c/sci_drawaxis.c, line: 270
msgid "%: Wrong value for %s '%c': '%s', '%s' and '%s' expected.\n"
msgstr ""
msgstr ""
#
-# File: sci_gateway/c/sci_xarrows.c, line: 150
+# File: sci_gateway/c/sci_xarrows.c, line: 151
#, c-format
msgid "%s: Wrong number of input arguments: at least %d expected.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_xarrows.c, line: 158
+# File: sci_gateway/c/sci_xarrows.c, line: 159
#, c-format
msgid ""
"%s: Wrong size for input argument #%d: %d-by-%d matrix or a scalar "
msgstr ""
#
-# File: sci_gateway/c/sci_xfpolys.c, line: 154
+# File: sci_gateway/c/sci_xfpolys.c, line: 157
#, c-format
msgid "%s: Interpolated shading only works for polygons of size %d or %d\n"
msgstr ""
# File: src/c/getHandleProperty/set_data_bounds_property.c, line: 129
# File: src/c/getHandleProperty/set_data_bounds_property.c, line: 158
# File: src/c/getHandleProperty/set_data_mapping_property.c, line: 72
-# File: src/c/getHandleProperty/set_datatip_property.c, line: 48
-# File: src/c/getHandleProperty/set_datatip_property.c, line: 72
-# File: src/c/getHandleProperty/set_datatip_property.c, line: 97
-# File: src/c/getHandleProperty/set_datatip_property.c, line: 122
-# File: src/c/getHandleProperty/set_datatip_property.c, line: 146
-# File: src/c/getHandleProperty/set_datatip_property.c, line: 170
-# File: src/c/getHandleProperty/set_datatip_property.c, line: 193
+# File: src/c/getHandleProperty/set_datatip_property.c, line: 50
+# File: src/c/getHandleProperty/set_datatip_property.c, line: 74
+# File: src/c/getHandleProperty/set_datatip_property.c, line: 99
+# File: src/c/getHandleProperty/set_datatip_property.c, line: 124
+# File: src/c/getHandleProperty/set_datatip_property.c, line: 148
+# File: src/c/getHandleProperty/set_datatip_property.c, line: 172
+# File: src/c/getHandleProperty/set_datatip_property.c, line: 195
# File: src/c/getHandleProperty/set_default_axes_property.c, line: 38
# File: src/c/getHandleProperty/set_default_values_property.c, line: 63
# File: src/c/getHandleProperty/set_diffuse_color_property.c, line: 60
# File: src/c/getHandleProperty/set_cdata_mapping_property.c, line: 44
# File: src/c/getHandleProperty/set_clip_state_property.c, line: 43
# File: src/c/getHandleProperty/set_data_mapping_property.c, line: 46
-# File: src/c/getHandleProperty/set_datatip_property.c, line: 181
+# File: src/c/getHandleProperty/set_datatip_property.c, line: 183
# File: src/c/getHandleProperty/set_event_handler_property.c, line: 42
# File: src/c/getHandleProperty/set_figure_closerequestfcn_property.c, line: 30
# File: src/c/getHandleProperty/set_figure_name_property.c, line: 41
msgstr ""
#
-# File: src/c/sciCall.c, line: 597
+# File: src/c/sciCall.c, line: 664
#, c-format
msgid "%s: x vector is not monotonous.\n"
msgstr ""
#
-# File: src/c/sciCall.c, line: 627
+# File: src/c/sciCall.c, line: 694
#, c-format
msgid "%s: y vector is not monotonous.\n"
msgstr ""
#
-# File: src/c/sciCall.c, line: 832
+# File: src/c/sciCall.c, line: 899
msgid "Impossible case when building axis\n"
msgstr ""
msgstr ""
#
-# File: demos/cmplxfunc/demo_custom.dem.sce, line: 56
+# File: demos/cmplxfunc/demo_custom.dem.sce, line: 41
msgid "Customize your complex function"
msgstr ""
#
+# File: demos/cmplxfunc/demo_custom.dem.sce, line: 68
+msgid "Control panel"
+msgstr ""
+
+#
+# File: demos/cmplxfunc/demo_custom.dem.sce, line: 177
+msgid "Function definition"
+msgstr ""
+
+#
+# File: demos/cmplxfunc/demo_custom.dem.sce, line: 248
+msgid "Domain type"
+msgstr ""
+
+#
+# File: demos/cmplxfunc/demo_custom.dem.sce, line: 307
+msgid "Radius of the domain"
+msgstr ""
+
+#
+# File: demos/cmplxfunc/demo_custom.dem.sce, line: 364
+msgid "Cut on axes"
+msgstr ""
+
+#
+# File: demos/cmplxfunc/demo_custom.dem.sce, line: 467
+msgid "Function should contain z"
+msgstr ""
+
+#
+# File: demos/cmplxfunc/demo_custom.dem.sce, line: 477
+msgid "Wrong definition of f(z)"
+msgstr ""
+
+#
+# File: demos/cmplxfunc/demo_custom.dem.sce, line: 561
+# File: demos/cmplxfunc/demo_custom.dem.sce, line: 566
+msgid "Radius should be real and finite"
+msgstr ""
+
+#
# File: demos/datatips/datatip1.sce, line: 16
msgid "datatips on 2D curves"
msgstr ""
#
# File: macros/colordef.sci, line: 18
# File: macros/colordef.sci, line: 26
-# File: macros/getfont.sci, line: 19
# File: macros/legends.sci, line: 25
# File: macros/titlepage.sci, line: 21
#, c-format
#
# File: macros/contour.sci, line: 43
# File: macros/contour2d.sci, line: 21
-# File: macros/datatips/datatipInitStruct.sci, line: 18
# File: macros/datatips/datatipMove.sci, line: 14
# File: macros/datatips/datatipSetStyle.sci, line: 17
# File: macros/errbar.sci, line: 33
# File: macros/fcontour.sci, line: 49
# File: macros/fcontour2d.sci, line: 24
-# File: macros/fgrayplot.sci, line: 38
+# File: macros/fgrayplot.sci, line: 35
# File: macros/fplot2d.sci, line: 27
# File: macros/fplot3d.sci, line: 30
# File: macros/fplot3d1.sci, line: 32
# File: macros/contourf.sci, line: 67
# File: macros/contourf.sci, line: 79
# File: macros/contourf.sci, line: 100
-# File: macros/datatips/datatipInitStruct.sci, line: 40
#, c-format
msgid "%s: Wrong type for input argument #%d: Real matrix expected.\n"
msgstr ""
msgstr ""
#
-# File: macros/datatips/datatipContextMenu.sci, line: 17
-# File: macros/datatips/datatipContextMenu.sci, line: 25
-# File: macros/datatips/datatipContextMenu.sci, line: 32
-msgid "Delete all datatips"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 18
-# File: macros/datatips/datatipContextMenu.sci, line: 34
-msgid "Delete all datatips for the selected curve"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 19
-# File: macros/datatips/datatipContextMenu.sci, line: 36
-msgid "Delete nearest datatip"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 20
-# File: macros/datatips/datatipContextMenu.sci, line: 38
-msgid "Delete last datatip"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 21
-# File: macros/datatips/datatipContextMenu.sci, line: 26
-# File: macros/datatips/datatipContextMenu.sci, line: 44
-msgid "Delete selected datatip"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 22
-# File: macros/datatips/datatipContextMenu.sci, line: 60
-msgid "Open curve tip style editor"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 23
-# File: macros/datatips/datatipContextMenu.sci, line: 27
-# File: macros/datatips/datatipContextMenu.sci, line: 58
-msgid "Redraw all datatips"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 46
-msgid "Edit the curve tip display function"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 48
-msgid "select the curve tip display function"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 50
-msgid "Enable interpolation"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 52
-msgid "Disable interpolation"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 54
-msgid "Multiple datatips mode"
-msgstr ""
-
-#
-# File: macros/datatips/datatipContextMenu.sci, line: 56
-msgid "Unique datatip mode"
-msgstr ""
-
-#
# File: macros/datatips/datatipCreatePopupMenu.sci, line: 40
msgid "createPopupItems: found an empty cascading menu."
msgstr ""
#
-# File: macros/datatips/datatipEventhandler.sci, line: 138
-msgid "automatic"
-msgstr ""
-
-#
-# File: macros/datatips/datatipEventhandler.sci, line: 138
-msgid "lower left"
-msgstr ""
-
-#
-# File: macros/datatips/datatipEventhandler.sci, line: 138
-msgid "lower right"
-msgstr ""
-
-#
-# File: macros/datatips/datatipEventhandler.sci, line: 138
-msgid "upper left"
-msgstr ""
-
-#
-# File: macros/datatips/datatipEventhandler.sci, line: 138
-msgid "upper right"
-msgstr ""
-
-#
-# File: macros/datatips/datatipEventhandler.sci, line: 139
-msgid "Select tip orientation"
-msgstr ""
-
-#
-# File: macros/datatips/datatipEventhandler.sci, line: 200
-# File: macros/datatips/datatipEventhandler.sci, line: 273
# File: macros/datatips/datatipGetEntities.sci, line: 39
-# File: macros/datatips/datatipInitStruct.sci, line: 21
# File: macros/datatips/datatipMove.sci, line: 18
# File: macros/datatips/datatipMove.sci, line: 26
# File: macros/datatips/datatipSetOrientation.sci, line: 17
msgstr ""
#
-# File: macros/datatips/datatipEventhandler.sci, line: 255
-msgid "The selected file cannot be executed"
-msgstr ""
-
-#
-# File: macros/datatips/datatipEventhandler.sci, line: 261
-msgid "The selected file defines more than one function"
-msgstr ""
-
-#
# File: macros/datatips/datatipGetStruct.sci, line: 12
msgid "'datatips' property"
msgstr ""
msgstr ""
#
-# File: macros/datatips/datatipInitStruct.sci, line: 44
-#, c-format
-msgid "%s: Wrong size for input argument #%d: A %d elements array expected.\n"
-msgstr ""
-
-#
-# File: macros/datatips/datatipInitStruct.sci, line: 48
-#, c-format
-msgid "%s: Wrong value for input argument #%d(1): Must be between %d and %d.\n"
-msgstr ""
-
-#
-# File: macros/datatips/datatipInitStruct.sci, line: 52
-#, c-format
-msgid "%s: Wrong value for input argument #%d(2): Must be between %d and %d.\n"
-msgstr ""
-
-#
# File: macros/datatips/datatipManagerMode.sci, line: 45
#, c-format
msgid "%s: too many input arguments"
msgstr ""
#
-# File: macros/datatips/datatipRedraw.sci, line: 23
# File: macros/datatips/datatipRemoveAll.sci, line: 16
#, c-format
msgid ""
msgstr ""
#
-# File: macros/datatips/datatipRedraw.sci, line: 35
# File: macros/datatips/datatipRemoveAll.sci, line: 28
#, c-format
msgid ""
msgstr ""
#
-# File: macros/datatips/datatipRedraw.sci, line: 40
# File: macros/datatips/datatipRemoveAll.sci, line: 33
#, c-format
msgid ""
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 53
+# File: macros/datatips/datatipsGUI.sci, line: 50
# File: macros/getcolor.sci, line: 74
-# File: macros/getfont.sci, line: 43
-# File: macros/getlinestyle.sci, line: 19
-# File: macros/getmark.sci, line: 27
msgid "&File"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 54
+# File: macros/datatips/datatipsGUI.sci, line: 51
# File: macros/getcolor.sci, line: 75
-# File: macros/getfont.sci, line: 42
-# File: macros/getlinestyle.sci, line: 21
-# File: macros/getmark.sci, line: 29
msgid "&Tools"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 55
+# File: macros/datatips/datatipsGUI.sci, line: 52
# File: macros/getcolor.sci, line: 76
-# File: macros/getfont.sci, line: 41
-# File: macros/getlinestyle.sci, line: 20
-# File: macros/getmark.sci, line: 28
msgid "&Edit"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 56
+# File: macros/datatips/datatipsGUI.sci, line: 53
# File: macros/getcolor.sci, line: 77
-# File: macros/getlinestyle.sci, line: 22
-# File: macros/getmark.sci, line: 30
msgid "&?"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 62
+# File: macros/datatips/datatipsGUI.sci, line: 59
msgid "Datatips style"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 82
+# File: macros/datatips/datatipsGUI.sci, line: 79
msgid "Marker style:"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 96
+# File: macros/datatips/datatipsGUI.sci, line: 93
msgid "Square"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 119
+# File: macros/datatips/datatipsGUI.sci, line: 116
msgid "Arrow"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 146
+# File: macros/datatips/datatipsGUI.sci, line: 143
msgid "Labeled?"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 160
-# File: macros/datatips/datatipsGUI.sci, line: 225
-# File: macros/datatips/datatipsGUI.sci, line: 353
+# File: macros/datatips/datatipsGUI.sci, line: 157
+# File: macros/datatips/datatipsGUI.sci, line: 222
+# File: macros/datatips/datatipsGUI.sci, line: 350
msgid "Yes"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 183
-# File: macros/datatips/datatipsGUI.sci, line: 248
-# File: macros/datatips/datatipsGUI.sci, line: 376
+# File: macros/datatips/datatipsGUI.sci, line: 180
+# File: macros/datatips/datatipsGUI.sci, line: 245
+# File: macros/datatips/datatipsGUI.sci, line: 373
msgid "No"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 211
+# File: macros/datatips/datatipsGUI.sci, line: 208
msgid "Boxed?"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 275
+# File: macros/datatips/datatipsGUI.sci, line: 272
msgid "Positionning?"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 289
+# File: macros/datatips/datatipsGUI.sci, line: 286
msgid "Knots"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 312
+# File: macros/datatips/datatipsGUI.sci, line: 309
msgid "Interpolated"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 339
+# File: macros/datatips/datatipsGUI.sci, line: 336
msgid "Allow multiple datatips?"
msgstr ""
#
-# File: macros/datatips/datatipsGUI.sci, line: 404
+# File: macros/datatips/datatipsGUI.sci, line: 401
msgid "Edit label generator"
msgstr ""
#
+# File: macros/edit_curv.sci, line: 114
+msgid "File"
+msgstr ""
+
+#
+# File: macros/edit_curv.sci, line: 115
+msgid "Tools"
+msgstr ""
+
+#
+# File: macros/edit_curv.sci, line: 116
+msgid "Edit"
+msgstr ""
+
+#
+# File: macros/edit_curv.sci, line: 385
+msgid "Select a file to load"
+msgstr ""
+
+#
+# File: macros/edit_curv.sci, line: 401
+# File: macros/edit_curv.sci, line: 461
+# File: macros/edit_curv.sci, line: 472
+#, c-format
+msgid "%s: The file "
+msgstr ""
+
+#
+# File: macros/edit_curv.sci, line: 406
+# File: macros/edit_curv.sci, line: 414
+# File: macros/edit_curv.sci, line: 422
+#, c-format
+msgid "%s: Cannot open file "
+msgstr ""
+
+#
+# File: macros/edit_curv.sci, line: 427
+msgid "Error in file format."
+msgstr ""
+
+#
+# File: macros/edit_curv.sci, line: 438
+msgid "Select a file to write"
+msgstr ""
+
+#
# File: macros/fplot2d.sci, line: 42
#, c-format
msgid ""
msgstr ""
#
-# File: macros/plot.sci, line: 229
+# File: macros/plot.sci, line: 228
#, c-format
msgid "%s: Error : unable to evaluate input function '%s'."
msgstr ""
#
-# File: macros/plot.sci, line: 229
-# File: macros/plot.sci, line: 231
+# File: macros/plot.sci, line: 228
+# File: macros/plot.sci, line: 230
#, c-format
msgid "Error %d at line %d of the function: '%s"
msgstr ""
#
-# File: macros/plot.sci, line: 231
+# File: macros/plot.sci, line: 230
#, c-format
msgid "%s: Error : unable to evaluate input function."
msgstr ""
#
# File: macros/rotate.sci, line: 25
-# File: macros/surf.sci, line: 389
-# File: macros/surf.sci, line: 395
-# File: macros/surf.sci, line: 427
-# File: macros/surf.sci, line: 463
-# File: macros/surf.sci, line: 504
-# File: macros/surf.sci, line: 510
-# File: macros/surf.sci, line: 556
-# File: macros/surf.sci, line: 601
+# File: macros/surf.sci, line: 371
+# File: macros/surf.sci, line: 377
+# File: macros/surf.sci, line: 409
+# File: macros/surf.sci, line: 445
+# File: macros/surf.sci, line: 482
+# File: macros/surf.sci, line: 488
+# File: macros/surf.sci, line: 534
+# File: macros/surf.sci, line: 579
#, c-format
msgid "%s: Wrong size for input argument '%s': A vector of size %d expected.\n"
msgstr ""
msgstr ""
#
-# File: macros/surf.sci, line: 48
+# File: macros/surf.sci, line: 47
#, c-format
msgid "%s: Wrong type for input argument #%d: An 'Axes' handle expected.\n"
msgstr ""
#
-# File: macros/surf.sci, line: 93
-# File: macros/surf.sci, line: 109
+# File: macros/surf.sci, line: 92
+# File: macros/surf.sci, line: 108
#, c-format
msgid ""
"%s: Wrong size for input argument #%d: A matrix of size greater than %d-by-"
msgstr ""
#
-# File: macros/surf.sci, line: 115
-# File: macros/surf.sci, line: 155
+# File: macros/surf.sci, line: 114
+# File: macros/surf.sci, line: 154
#, c-format
msgid ""
"%s: Wrong size for input argument #%d: A %d-by-%d or %d-by-%d matrix "
msgstr ""
#
-# File: macros/surf.sci, line: 189
-# File: macros/surf.sci, line: 201
-# File: macros/surf.sci, line: 213
+# File: macros/surf.sci, line: 186
+# File: macros/surf.sci, line: 198
+# File: macros/surf.sci, line: 210
#, c-format
msgid "%s: Wrong type for input argument '%s': A Real matrix expected.\n"
msgstr ""
#
-# File: macros/surf.sci, line: 218
+# File: macros/surf.sci, line: 215
#, c-format
msgid ""
"%s: Wrong size for input argument '%s': A matrix of size greater than %d-by-"
msgstr ""
#
-# File: macros/surf.sci, line: 408
-# File: macros/surf.sci, line: 414
-# File: macros/surf.sci, line: 433
-# File: macros/surf.sci, line: 457
-# File: macros/surf.sci, line: 530
-# File: macros/surf.sci, line: 536
-# File: macros/surf.sci, line: 562
-# File: macros/surf.sci, line: 595
-# File: macros/surf.sci, line: 631
+# File: macros/surf.sci, line: 390
+# File: macros/surf.sci, line: 396
+# File: macros/surf.sci, line: 415
+# File: macros/surf.sci, line: 439
+# File: macros/surf.sci, line: 508
+# File: macros/surf.sci, line: 514
+# File: macros/surf.sci, line: 540
+# File: macros/surf.sci, line: 573
+# File: macros/surf.sci, line: 609
#, c-format
msgid ""
"%s: Wrong size for input arguments '%s' and '%s': Matrices of same size "
msgstr ""
#
-# File: macros/surf.sci, line: 485
+# File: macros/surf.sci, line: 467
#, c-format
msgid "%s: Wrong size for input arguments '%s' and '%s': Same size expected.\n"
msgstr ""
// convert corners into position and size
// position, upper-left point
rect(1) = corners (1,2); // x
- rect(2) = corners (2,2); // y
+ rect(2) = corners (2,1); // y
// size width, height
rect(3) = abs(corners(1,3) - corners(1,1));
rect(4) = abs(corners(2,3) - corners(2,1));
-
endfunction
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/gw_gui.c, line: 89
#, c-format
# File: sci_gateway/c/sci_progressionbar.c, line: 165
# File: sci_gateway/c/sci_toolbar.c, line: 219
# File: sci_gateway/c/sci_uicontextmenu.c, line: 51
-# File: sci_gateway/c/sci_uicontrol.c, line: 202
+# File: sci_gateway/c/sci_uicontrol.c, line: 203
# File: sci_gateway/c/sci_uicontrol.c, line: 700
# File: sci_gateway/c/sci_uigetcolor.c, line: 331
# File: sci_gateway/c/sci_uigetcolor.c, line: 346
# File: sci_gateway/c/sci_setmenu.c, line: 228
# File: sci_gateway/c/sci_toolbar.c, line: 169
# File: sci_gateway/c/sci_toolbar.c, line: 198
-# File: sci_gateway/c/sci_uicontrol.c, line: 176
+# File: sci_gateway/c/sci_uicontrol.c, line: 177
# File: sci_gateway/c/sci_uicontrol.c, line: 406
# File: sci_gateway/c/sci_uicontrol.c, line: 525
# File: sci_gateway/c/sci_uigetcolor.c, line: 122
#
# File: sci_gateway/c/sci_ClipBoard.c, line: 246
# File: sci_gateway/c/sci_ClipBoard.c, line: 263
-# File: sci_gateway/c/sci_figure.c, line: 106
-# File: sci_gateway/c/sci_figure.c, line: 154
-# File: sci_gateway/c/sci_uicontrol.c, line: 183
+# File: sci_gateway/c/sci_figure.c, line: 110
+# File: sci_gateway/c/sci_figure.c, line: 159
+# File: sci_gateway/c/sci_uicontrol.c, line: 184
# File: sci_gateway/c/sci_uicontrol.c, line: 285
# File: sci_gateway/cpp/sci_getinstalledlookandfeels.cpp, line: 82
# File: sci_gateway/cpp/sci_getlookandfeel.cpp, line: 76
msgstr ""
#
-# File: sci_gateway/c/sci_figure.c, line: 94
-# File: sci_gateway/c/sci_figure.c, line: 142
-# File: sci_gateway/c/sci_figure.c, line: 178
-# File: sci_gateway/c/sci_figure.c, line: 208
-# File: sci_gateway/c/sci_figure.c, line: 446
-# File: sci_gateway/c/sci_figure.c, line: 478
+# File: sci_gateway/c/sci_figure.c, line: 98
+# File: sci_gateway/c/sci_figure.c, line: 147
+# File: sci_gateway/c/sci_figure.c, line: 183
+# File: sci_gateway/c/sci_figure.c, line: 214
+# File: sci_gateway/c/sci_figure.c, line: 447
+# File: sci_gateway/c/sci_figure.c, line: 480
# File: sci_gateway/c/sci_uicontrol.c, line: 160
# File: sci_gateway/cpp/sci_datatip_manager_mode.cpp, line: 137
# File: sci_gateway/cpp/sci_datatip_manager_mode.cpp, line: 163
msgstr ""
#
-# File: sci_gateway/c/sci_figure.c, line: 100
-# File: sci_gateway/c/sci_figure.c, line: 148
+# File: sci_gateway/c/sci_figure.c, line: 104
+# File: sci_gateway/c/sci_figure.c, line: 153
#, c-format
msgid "%s: Wrong type for input argument #%d: An integer value expected.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_figure.c, line: 184
-# File: sci_gateway/c/sci_figure.c, line: 228
-# File: sci_gateway/c/sci_figure.c, line: 257
-# File: sci_gateway/c/sci_figure.c, line: 452
-# File: sci_gateway/c/sci_figure.c, line: 516
+# File: sci_gateway/c/sci_figure.c, line: 189
+# File: sci_gateway/c/sci_figure.c, line: 234
+# File: sci_gateway/c/sci_figure.c, line: 263
+# File: sci_gateway/c/sci_figure.c, line: 453
+# File: sci_gateway/c/sci_figure.c, line: 518
#, c-format
msgid "%s: Wrong size for input argument #%d: A single string expected.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_figure.c, line: 218
-# File: sci_gateway/c/sci_figure.c, line: 244
-# File: sci_gateway/c/sci_figure.c, line: 274
-# File: sci_gateway/c/sci_figure.c, line: 287
-# File: sci_gateway/c/sci_figure.c, line: 297
-# File: sci_gateway/c/sci_figure.c, line: 382
-# File: sci_gateway/c/sci_figure.c, line: 392
-# File: sci_gateway/c/sci_figure.c, line: 402
+# File: sci_gateway/c/sci_figure.c, line: 224
+# File: sci_gateway/c/sci_figure.c, line: 250
+# File: sci_gateway/c/sci_figure.c, line: 280
+# File: sci_gateway/c/sci_figure.c, line: 293
+# File: sci_gateway/c/sci_figure.c, line: 303
+# File: sci_gateway/c/sci_figure.c, line: 388
+# File: sci_gateway/c/sci_figure.c, line: 398
+# File: sci_gateway/c/sci_figure.c, line: 408
+# File: sci_gateway/c/sci_figure.c, line: 418
#, c-format
msgid "Wrong value for '%s' property: '%s' or '%s' expected."
msgstr ""
#
-# File: sci_gateway/c/sci_figure.c, line: 308
-# File: sci_gateway/c/sci_figure.c, line: 325
+# File: sci_gateway/c/sci_figure.c, line: 314
+# File: sci_gateway/c/sci_figure.c, line: 331
#, c-format
msgid "%s: Wrong type for input argument #%d: A double vector expected.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_figure.c, line: 315
-# File: sci_gateway/c/sci_figure.c, line: 332
-# File: sci_gateway/c/sci_figure.c, line: 346
+# File: sci_gateway/c/sci_figure.c, line: 321
+# File: sci_gateway/c/sci_figure.c, line: 338
+# File: sci_gateway/c/sci_figure.c, line: 352
#, c-format
msgid "Wrong size for '%s' property: %d elements expected.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_figure.c, line: 364
-# File: sci_gateway/c/sci_figure.c, line: 373
+# File: sci_gateway/c/sci_figure.c, line: 370
+# File: sci_gateway/c/sci_figure.c, line: 379
# File: src/cpp/SetUicontrolPosition.cpp, line: 43
#, c-format
msgid ""
# File: sci_gateway/c/sci_mpopup.c, line: 49
# File: sci_gateway/c/sci_mpopup.c, line: 50
# File: sci_gateway/c/sci_mpopup.c, line: 51
-# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 576
-# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 785
+# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 575
+# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 781
# File: src/java/org/scilab/modules/gui/ged/MessagesGED.java, line: 88
msgid "Warning"
msgstr ""
msgstr ""
#
-# File: sci_gateway/c/sci_uicontrol.c, line: 192
+# File: sci_gateway/c/sci_uicontrol.c, line: 193
# File: sci_gateway/cpp/sci_loadGui.cpp, line: 75
#, c-format
msgid "%s: can not read file %s.\n"
#
# File: scilab_fake_localization_file.c, line: 100
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 90
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 92
# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 298
msgid "Cut"
msgstr ""
#
# File: scilab_fake_localization_file.c, line: 101
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 97
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 99
# File: src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowserViewer.java, line: 593
# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 296
msgid "Copy"
#
# File: scilab_fake_localization_file.c, line: 102
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 104
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 106
# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 300
msgid "Paste"
msgstr ""
#
# File: scilab_fake_localization_file.c, line: 103
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 77
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 118
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 79
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 120
msgid "Clear Console"
msgstr ""
# File: src/cpp/SetUicontrolFontUnits.cpp, line: 60
# File: src/cpp/SetUicontrolFontWeight.cpp, line: 59
# File: src/cpp/SetUicontrolHorizontalAlignment.cpp, line: 58
-# File: src/cpp/SetUicontrolIcon.cpp, line: 54
+# File: src/cpp/SetUicontrolIcon.cpp, line: 66
# File: src/cpp/SetUicontrolListboxTop.cpp, line: 82
# File: src/cpp/SetUicontrolMax.cpp, line: 37
# File: src/cpp/SetUicontrolMax.cpp, line: 81
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 78
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 80
msgid "Are you sure you want to clear the console ?"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 79
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 81
# File: src/java/org/scilab/modules/gui/utils/ClosingOperationsManager.java, line: 58
msgid "Do not show this message again"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 111
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 113
msgid "Clear History"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 125
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 127
# File: src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowserViewer.java, line: 603
msgid "Select All"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 133
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 135
msgid "Help on a selected keyword"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 142
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 144
# File: src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowserViewer.java, line: 624
msgid "Help about a selected text"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 148
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 150
# File: src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowserViewer.java, line: 630
msgid "Help about '"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 155
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 157
msgid "Evaluate selection with echo"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 168
+# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 170
msgid "Evaluate selection with no echo"
msgstr ""
#
# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 57
-msgid "FIG image"
-msgstr ""
-
-#
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 58
msgid "PDF image"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 59
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 58
msgid "SVG image"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 60
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 59
# File: src/java/org/scilab/modules/gui/utils/SciFileFilter.java, line: 80
msgid "All files"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 103
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 101
msgid "Untitled-export"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 120
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 121
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 117
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 118
msgid "Export"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 141
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 138
msgid "Preview selected image file"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 197
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 194
# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabFileChooser.java, line: 185
msgid "Replace existing file?"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 198
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 195
# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabFileChooser.java, line: 186
msgid "File already exists"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 251
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 230
msgid "Please specify a file format"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 252
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 277
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 231
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 254
msgid "Error on export"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 277
+# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 254
#, c-format
msgid ""
"Unrecognized extension '%s'.\n"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 151
+# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 152
# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 318
msgid "Insert"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 152
+# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 153
msgid "Insert a new point here"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 153
+# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 154
# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 320
msgid "Remove"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 154
+# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 155
msgid "Remove this point"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 155
+# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 156
# File: src/java/org/scilab/modules/gui/utils/ClosingOperationsManager.java, line: 60
msgid "Exit"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 156
+# File: src/java/org/scilab/modules/gui/editor/DataEditor.java, line: 157
msgid "Leave data editor mode"
msgstr ""
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 663
-# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 689
+# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 661
+# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 686
msgid "Enter the text"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 664
+# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 662
msgid "Set label text"
msgstr ""
#
-# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 690
+# File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 687
msgid "Set legend text"
msgstr ""
msgstr ""
#
-# File: src/nogui/nogui.c, line: 35
-# File: src/nogui/nogui.c, line: 174
-# File: src/nogui/nogui.c, line: 179
+# File: src/nogui/nogui.c, line: 34
+# File: src/nogui/nogui.c, line: 173
+# File: src/nogui/nogui.c, line: 178
#, c-format
msgid "Scilab '%s' module not installed.\n"
msgstr ""
#
-# File: src/nogui/nogui.c, line: 63
+# File: src/nogui/nogui.c, line: 62
#, c-format
msgid "%s: Only available under 'STANDARD' mode.\n"
msgstr ""
#
-# File: src/nogui/nogui.c, line: 127
+# File: src/nogui/nogui.c, line: 126
msgid "Error. A signal has been caught.\n"
msgstr ""
msgstr ""
#
-# File: demos/cb_uicontrol_plot3d.dem.sci, line: 61
+# File: demos/cb_uicontrol_plot3d.dem.sci, line: 55
msgid "Rotation angle"
msgstr ""
#
-# File: demos/cb_uicontrol_plot3d.dem.sci, line: 84
+# File: demos/cb_uicontrol_plot3d.dem.sci, line: 72
msgid "Colormap"
msgstr ""
#
-# File: demos/cb_uicontrol_plot3d.dem.sci, line: 149
+# File: demos/cb_uicontrol_plot3d.dem.sci, line: 125
msgid "Show / Hide"
msgstr ""
msgstr ""
#
-# File: demos/uicontrol_LaTeX.dem.sce, line: 15
+# File: demos/uicontrol_LaTeX.dem.sce, line: 16
msgid "Uicontrols demo with LaTeX"
msgstr ""
msgstr ""
#
-# File: macros/oldfigure.sci, line: 107
-# File: macros/oldfigure.sci, line: 134
-#, c-format
-msgid ""
-"%s: Wrong size for input argument #%d: A 'Figure' handle or a real "
-"expected.\n"
-msgstr ""
-
-#
# File: macros/tree/uiConcatTree.sci, line: 26
# File: macros/tree/uiConcatTree.sci, line: 33
# File: macros/tree/uiCreateTree.sci, line: 34
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2014 - Scilab Enterprises - Antoine ELIAS
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ *
+ */
package org.scilab.modules.gui.utils;
import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_LINE_THICKNESS__;
public static Border getBorder(Integer borderId) {
GraphicController controller = GraphicController.getController();
Integer styleInt = (Integer) controller.getProperty(borderId, __GO_UI_FRAME_BORDER_STYLE__);
+ FrameBorderType style;
+
if (styleInt == null) {
- controller.getProperty(borderId, __GO_UI_FRAME_BORDER_STYLE__);
+ // Default border : NONE
+ style = FrameBorderType.NONE;
+ } else {
+ style = FrameBorderType.intToEnum(styleInt);
}
+
Border border = null;
- FrameBorderType style = FrameBorderType.intToEnum(styleInt);
switch (style) {
case BEVEL: {
BorderType type = BorderType.intToEnum((Integer) controller.getProperty(borderId, __GO_UI_FRAME_BORDER_TYPE__));
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/cpp/sci_export_to_hdf5.cpp, line: 103
#, c-format
<br/><br/><div class="refsection">
<h3 class="title">Что нового в Scilab 5.6.0?</h3>
<p class="para">
- <a href="http://www.scilab.org/community/news/20140411/release_notes">Смотрите примечания к релизу Scilab 5.6.0.</a>
- </p>
+ <a href="http://www.scilab.org/community/news/20140411/release_notes">Смотрите примечания к релизу Scilab 5.6.0.</a>
+ </p>
</div>
<hr width="50%" align="left">
<div class="refsection">
_LaTeX_erfi.xml_1.png=98b6a64c2482c6be60499c854c70a678
_LaTeX_fft.xml_1.png=30d788e922f7acbb3ef6f5d2d70bb96b
_LaTeX_fft.xml_2.png=4b7b41681f5cfbcb0af74e4cc3ab99fc
+_LaTeX_filter.xml_1.png=f5eab130f2e7fd10b80a402952421a05
_LaTeX_floor.xml_ru_RU_1.png=1d5ba78bbbafd3226f371146bc348363
_LaTeX_grand.xml_1.png=75aef00d49dd8d9dfff15c7a1bb3d0eb
_LaTeX_grand.xml_2.png=dd59088e24bed7a6af5a6ccd16e58616
xsetech_3.png=702ac81ee5024ba15ab34176ebce2e73
xstring_1.png=6b33769d0916b641755a0fa056f10378
xstringb_1.png=c7c1db7aee55fde60cc5c0d5314f9ce5
-xstringl_1.png=7a318325ae28e851a48d79d70312683a
+xstringl_1.png=77cf3298ae33ee0458bb4bedd536377a
+xstringl_2.png=e8b53d8536f460722b24fd87537a03bb
+xstringl_3.png=88b6cd599658f1be8239b1e88ea28bce
xtitle_1.png=91a652a9e42e4f149b0d206313acce42
yulewalk_1.png=54e2dafd6ca56415ef58029a25f134a3
yulewalk_2.png=8b62c274c3250a6037f45a22e0e3c066
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/gw_helptools.c, line: 39
#, c-format
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/gw_history_browser.c, line: 37
# File: src/nohistory_browser/nohistory_browser.c, line: 25
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_addhistory.c, line: 83
#, c-format
msgstr ""
#
-# File: sci_gateway/c/sci_historysize.c, line: 36
+# File: sci_gateway/c/sci_historysize.c, line: 37
#, c-format
msgid "%s: Can not read input argument #%d.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_historysize.c, line: 55
+# File: sci_gateway/c/sci_historysize.c, line: 56
#, c-format
msgid "%s: Wrong value for input argument #%d: \"%s\" expected.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_historysize.c, line: 63
+# File: sci_gateway/c/sci_historysize.c, line: 64
#, c-format
msgid "%s: Memory allocation error.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_historysize.c, line: 68
-# File: sci_gateway/c/sci_historysize.c, line: 91
+# File: sci_gateway/c/sci_historysize.c, line: 70
+# File: sci_gateway/c/sci_historysize.c, line: 93
#, c-format
msgid "%s: Wrong size for input argument #%d.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_historysize.c, line: 84
+# File: sci_gateway/c/sci_historysize.c, line: 86
#, c-format
msgid "%s: Wrong value for input argument #%d.\n"
msgstr ""
#
-# File: sci_gateway/c/sci_historysize.c, line: 97
+# File: sci_gateway/c/sci_historysize.c, line: 99
#, c-format
msgid "%s: Wrong type for input argument #%d.\n"
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_iconvert.c, line: 37
# File: sci_gateway/c/sci_iconvert.c, line: 51
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_bsplin3val.c, line: 62
# File: sci_gateway/c/sci_cshep2d.c, line: 50
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_file.c, line: 61
# File: sci_gateway/c/sci_file.c, line: 69
msgstr ""
#
-# File: macros/%_sodload.sci, line: 347
+# File: macros/%_sodload.sci, line: 355
#, c-format
msgid "%s: Legend does not fit with the current context. Skipped\n"
msgstr ""
#
-# File: macros/%_sodload.sci, line: 934
+# File: macros/%_sodload.sci, line: 942
#, c-format
msgid "%s: Wrong number of input arguments: %d expected.\n"
msgstr ""
#
-# File: macros/%_sodload.sci, line: 966
+# File: macros/%_sodload.sci, line: 974
#, c-format
msgid "%s: variable '%s' does not exist in '%s'.\n"
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/gw_jvm.c, line: 47
msgid "JVM interface disabled in -nogui or -nwni modes.\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_backslash.c, line: 66
# File: sci_gateway/c/sci_backslash.c, line: 87
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_addlocalizationdomain.c, line: 51
# File: sci_gateway/c/sci_addlocalizationdomain.c, line: 72
#
# File: sci_gateway/c/sci_addlocalizationdomain.c, line: 96
-# File: sci_gateway/c/sci_addlocalizationdomain.c, line: 103
+# File: sci_gateway/c/sci_addlocalizationdomain.c, line: 105
#, c-format
msgid "%s: Unable to add new domain %s.\n"
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: macros/buildmacros.sce, line: 18
#, c-format
msgstr ""
#
+# File: macros/cb_m2sci_gui.sci, line: 31
+# File: macros/m2sci_gui.sci, line: 280
+msgid "Input file"
+msgstr ""
+
+#
+# File: macros/cb_m2sci_gui.sci, line: 46
+msgid "Input directory"
+msgstr ""
+
+#
# File: macros/cb_m2sci_gui.sci, line: 61
msgid "Select the directory to convert"
msgstr ""
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 25
-msgid "&File"
-msgstr ""
-
-#
-# File: macros/m2sci_gui.sci, line: 26
-msgid "&Tools"
-msgstr ""
-
-#
-# File: macros/m2sci_gui.sci, line: 27
-msgid "&Edit"
-msgstr ""
-
-#
-# File: macros/m2sci_gui.sci, line: 28
-msgid "&?"
-msgstr ""
-
-#
-# File: macros/m2sci_gui.sci, line: 31
+# File: macros/m2sci_gui.sci, line: 30
msgid "File"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 32
+# File: macros/m2sci_gui.sci, line: 31
msgid "Close"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 34
+# File: macros/m2sci_gui.sci, line: 33
msgid "?"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 35
+# File: macros/m2sci_gui.sci, line: 34
msgid "Mfile2sci help page"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 36
+# File: macros/m2sci_gui.sci, line: 35
msgid "Translatepaths help page"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 37
+# File: macros/m2sci_gui.sci, line: 36
msgid "About M2SCI tools..."
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 52
+# File: macros/m2sci_gui.sci, line: 49
msgid "Convert"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 63
+# File: macros/m2sci_gui.sci, line: 58
msgid "Cancel"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 86
+# File: macros/m2sci_gui.sci, line: 72
msgid "Options"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 96
+# File: macros/m2sci_gui.sci, line: 78
msgid "Generate pretty printed code: "
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 103
-# File: macros/m2sci_gui.sci, line: 195
-# File: macros/m2sci_gui.sci, line: 229
+# File: macros/m2sci_gui.sci, line: 85
+# File: macros/m2sci_gui.sci, line: 177
+# File: macros/m2sci_gui.sci, line: 211
msgid "Yes"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 115
-# File: macros/m2sci_gui.sci, line: 207
-# File: macros/m2sci_gui.sci, line: 241
+# File: macros/m2sci_gui.sci, line: 97
+# File: macros/m2sci_gui.sci, line: 189
+# File: macros/m2sci_gui.sci, line: 223
msgid "No"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 130
+# File: macros/m2sci_gui.sci, line: 112
msgid "Verbose mode: "
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 137
+# File: macros/m2sci_gui.sci, line: 119
msgid "0"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 149
+# File: macros/m2sci_gui.sci, line: 131
msgid "1"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 161
+# File: macros/m2sci_gui.sci, line: 143
msgid "2"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 173
+# File: macros/m2sci_gui.sci, line: 155
msgid "3"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 188
+# File: macros/m2sci_gui.sci, line: 170
msgid "Only double values used: "
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 222
+# File: macros/m2sci_gui.sci, line: 204
msgid "Recursive conversion: "
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 269
+# File: macros/m2sci_gui.sci, line: 243
msgid "Output directory"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 277
-# File: macros/m2sci_gui.sci, line: 338
+# File: macros/m2sci_gui.sci, line: 247
+# File: macros/m2sci_gui.sci, line: 286
msgid "Directory name: "
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 293
-# File: macros/m2sci_gui.sci, line: 357
-# File: macros/m2sci_gui.sci, line: 386
+# File: macros/m2sci_gui.sci, line: 263
+# File: macros/m2sci_gui.sci, line: 304
+# File: macros/m2sci_gui.sci, line: 331
msgid "Browse"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 317
-msgid "Input directory"
-msgstr ""
-
-#
-# File: macros/m2sci_gui.sci, line: 327
-msgid "Input file"
-msgstr ""
-
-#
-# File: macros/m2sci_gui.sci, line: 368
+# File: macros/m2sci_gui.sci, line: 314
msgid "File name: "
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 377
+# File: macros/m2sci_gui.sci, line: 323
msgid "<enter a file name>"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 410
+# File: macros/m2sci_gui.sci, line: 346
msgid "Conversion mode"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 420
+# File: macros/m2sci_gui.sci, line: 350
msgid "Convert a single file"
msgstr ""
#
-# File: macros/m2sci_gui.sci, line: 432
+# File: macros/m2sci_gui.sci, line: 362
msgid "Convert a whole directory"
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_matfile_close.c, line: 63
# File: sci_gateway/c/sci_matfile_listvar.c, line: 63
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: includes/mex.h, line: 87
msgid "mexPutFull failed\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: macros/tbx_build_blocks.sci, line: 21
-# File: macros/tbx_build_pal_loader.sci, line: 12
+# File: macros/tbx_build_pal_loader.sci, line: 13
#, c-format
msgid "%s: Wrong number of input arguments: At least %d expected.\n"
msgstr ""
# File: macros/tbx_build_localization.sci, line: 26
# File: macros/tbx_build_macros.sci, line: 26
# File: macros/tbx_build_macros.sci, line: 41
-# File: macros/tbx_build_pal_loader.sci, line: 16
-# File: macros/tbx_build_pal_loader.sci, line: 24
-# File: macros/tbx_build_pal_loader.sci, line: 41
+# File: macros/tbx_build_pal_loader.sci, line: 17
+# File: macros/tbx_build_pal_loader.sci, line: 25
+# File: macros/tbx_build_pal_loader.sci, line: 42
# File: macros/tbx_builder_gateway.sci, line: 26
# File: macros/tbx_builder_gateway_lang.sci, line: 48
# File: macros/tbx_builder_help.sci, line: 26
# File: macros/tbx_build_localization.sci, line: 30
# File: macros/tbx_build_macros.sci, line: 30
# File: macros/tbx_build_macros.sci, line: 45
-# File: macros/tbx_build_pal_loader.sci, line: 19
-# File: macros/tbx_build_pal_loader.sci, line: 27
-# File: macros/tbx_build_pal_loader.sci, line: 44
+# File: macros/tbx_build_pal_loader.sci, line: 20
+# File: macros/tbx_build_pal_loader.sci, line: 28
+# File: macros/tbx_build_pal_loader.sci, line: 45
# File: macros/tbx_builder_gateway.sci, line: 30
# File: macros/tbx_builder_gateway_lang.sci, line: 52
# File: macros/tbx_builder_help.sci, line: 30
# File: macros/tbx_build_localization.sci, line: 34
# File: macros/tbx_build_localization.sci, line: 42
# File: macros/tbx_build_macros.sci, line: 49
-# File: macros/tbx_build_pal_loader.sci, line: 30
-# File: macros/tbx_build_pal_loader.sci, line: 50
+# File: macros/tbx_build_pal_loader.sci, line: 31
+# File: macros/tbx_build_pal_loader.sci, line: 51
# File: macros/tbx_builder_gateway.sci, line: 34
# File: macros/tbx_builder_gateway_lang.sci, line: 56
# File: macros/tbx_builder_gateway_lang.sci, line: 66
#
# File: macros/tbx_build_localization.sci, line: 19
-# File: macros/tbx_build_pal_loader.sci, line: 35
+# File: macros/tbx_build_pal_loader.sci, line: 36
# File: macros/tbx_builder.sci, line: 14
# File: macros/tbx_builder_gateway_lang.sci, line: 37
# File: macros/tbx_builder_help_lang.sci, line: 27
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_mpi_bcast.c, line: 42
# File: sci_gateway/c/sci_mpi_bcast.c, line: 56
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_qld.c, line: 86
# File: sci_gateway/c/sci_qld.c, line: 112
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_mprintf.c, line: 66
# File: sci_gateway/c/sci_msprintf.c, line: 156
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: macros/%0_i_st.sci, line: 19
#, c-format
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/cpp/sci_parallel_run.cpp, line: 547
#, c-format
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: src/c/parameters.c, line: 144
# File: src/c/parameters.c, line: 571
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: demos/polynomials.dem.gateway.sce, line: 10
msgid "Polynomials"
<?xml version="1.0" encoding="utf-8"?>
-<interface version="0.17" path="1/" width="800" height="600">
+<interface version="0.18" path="1/" width="800" height="600">
<general/>
<web/>
<preference/>
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/gw_preferences.c, line: 38
#, c-format
msgstr ""
#
-# File: src/java/org/scilab/modules/preferences/ScilabPreferences.java, line: 66
+# File: src/java/org/scilab/modules/preferences/ScilabPreferences.java, line: 58
msgid "Invalid path:"
msgstr ""
#
-# File: src/java/org/scilab/modules/preferences/ScilabPreferences.java, line: 70
+# File: src/java/org/scilab/modules/preferences/ScilabPreferences.java, line: 62
msgid "Invalid preferences file:"
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-04-01 12:32+0100\n"
+"Revision-Date: 2014-08-27 10:50+0100\n"
# File: sci_gateway/c/sci_grand.c, line: 156
# File: sci_gateway/c/sci_grand.c, line: 511
projects / scilab.git / commitdiff
