Merge remote-tracking branch 'origin/master' into YaSp 92/10192/1
Sylvestre Ledru [Fri, 11 Jan 2013 09:05:18 +0000 (10:05 +0100)]
Change-Id: I0b5b271489da7b6e64b82e505448c82835712aee

81 files changed:
scilab/CHANGES_5.4.X
scilab/modules/action_binding/locales/action_binding.pot
scilab/modules/api_scilab/locales/api_scilab.pot
scilab/modules/arnoldi/locales/arnoldi.pot
scilab/modules/arnoldi/src/c/eigs.c
scilab/modules/arnoldi/src/c/eigs_dependencies.c
scilab/modules/atoms/locales/atoms.pot
scilab/modules/boolean/locales/boolean.pot
scilab/modules/cacsd/locales/cacsd.pot
scilab/modules/commons/locales/commons.pot
scilab/modules/commons/src/c/core_Import.def
scilab/modules/compatibility_functions/locales/compatibility_functions.pot
scilab/modules/completion/locales/completion.pot
scilab/modules/console/locales/console.pot
scilab/modules/core/locales/core.pot
scilab/modules/data_structures/locales/data_structures.pot
scilab/modules/demo_tools/locales/demo_tools.pot
scilab/modules/development_tools/locales/development_tools.pot
scilab/modules/differential_equations/demos/dae/dae2/pendg1_gateway.sce [deleted file]
scilab/modules/differential_equations/locales/differential_equations.pot
scilab/modules/dynamic_link/locales/dynamic_link.pot
scilab/modules/elementary_functions/locales/elementary_functions.pot
scilab/modules/external_objects/locales/external_objects.pot
scilab/modules/fftw/locales/fftw.pot
scilab/modules/fileio/locales/fileio.pot
scilab/modules/functions/locales/functions.pot
scilab/modules/genetic_algorithms/locales/genetic_algorithms.pot
scilab/modules/graph/locales/graph.pot
scilab/modules/graphic_export/locales/graphic_export.pot
scilab/modules/graphic_objects/locales/graphic_objects.pot
scilab/modules/graphics/locales/graphics.pot
scilab/modules/gui/locales/gui.pot
scilab/modules/hdf5/locales/hdf5.pot
scilab/modules/helptools/locales/helptools.pot
scilab/modules/history_browser/locales/history_browser.pot
scilab/modules/history_manager/locales/history_manager.pot
scilab/modules/integer/locales/integer.pot
scilab/modules/interpolation/locales/interpolation.pot
scilab/modules/io/locales/io.pot
scilab/modules/jvm/locales/jvm.pot
scilab/modules/linear_algebra/locales/linear_algebra.pot
scilab/modules/localization/locales/localization.pot
scilab/modules/m2sci/locales/m2sci.pot
scilab/modules/matio/locales/matio.pot
scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
scilab/modules/matio/tests/nonreg_tests/bug_12168.dia.ref [new file with mode: 0644]
scilab/modules/matio/tests/nonreg_tests/bug_12168.tst [new file with mode: 0644]
scilab/modules/mexlib/locales/mexlib.pot
scilab/modules/modules_manager/locales/modules_manager.pot
scilab/modules/optimization/locales/optimization.pot
scilab/modules/output_stream/locales/output_stream.pot
scilab/modules/overloading/locales/overloading.pot
scilab/modules/parallel/locales/parallel.pot
scilab/modules/parameters/locales/parameters.pot
scilab/modules/polynomials/locales/polynomials.pot
scilab/modules/preferences/locales/preferences.pot
scilab/modules/randlib/locales/randlib.pot
scilab/modules/scicos/locales/scicos.pot
scilab/modules/scicos/macros/scicos_auto/lincos.sci
scilab/modules/scicos_blocks/locales/scicos_blocks.pot
scilab/modules/scinotes/locales/scinotes.pot
scilab/modules/signal_processing/locales/signal_processing.pot
scilab/modules/simulated_annealing/locales/simulated_annealing.pot
scilab/modules/sound/locales/sound.pot
scilab/modules/sparse/locales/sparse.pot
scilab/modules/special_functions/locales/special_functions.pot
scilab/modules/spreadsheet/locales/spreadsheet.pot
scilab/modules/statistics/locales/statistics.pot
scilab/modules/string/locales/string.pot
scilab/modules/symbolic/locales/symbolic.pot
scilab/modules/tclsci/locales/tclsci.pot
scilab/modules/time/locales/time.pot
scilab/modules/types/locales/types.pot
scilab/modules/ui_data/locales/ui_data.pot
scilab/modules/umfpack/locales/umfpack.pot
scilab/modules/windows_tools/locales/windows_tools.pot
scilab/modules/xcos/locales/xcos.pot
scilab/modules/xcos/tests/nonreg_tests/bug_11193.dia.ref [new file with mode: 0644]
scilab/modules/xcos/tests/nonreg_tests/bug_11193.tst [new file with mode: 0644]
scilab/modules/xcos/tests/nonreg_tests/bug_11193.zcos [new file with mode: 0644]
scilab/modules/xml/locales/xml.pot

index aeb7c7e..a6e6e07 100644 (file)
@@ -106,6 +106,8 @@ Xcos
 
 * Bug #10660 fixed - model2blk and callblk crashed Scilab on 64-bit platforms.
 
+* Bug #11193 fixed - Lincos did not honor context values.
+
 * Bug #11775 fixed - xcos.tst crashed on Linux and MacOS X.
 
 * Bug #11821 fixed - Running XcosPalAdd example from help led to deadlock
@@ -263,6 +265,8 @@ Bug fixes
 
 * Bug #12166 fixed - There was a bad label with drawaxis.
 
+* Bug #12168 fixed - matfile_listvar crashed when listing variables of a closed MAT-file.
+
 * Bug #12179 fixed - Fix an incompatibility with MPI version of HDF5.
 
 * Bug #12184 fixed - Performances of the function 'derivat' improved.
index 875d83d..2922688 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/cpp/sci_notify.cpp, line: 46
 # File: sci_gateway/cpp/sci_notify.cpp, line: 54
index 03e812f..594abed 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: src/cpp/api_boolean.cpp, line: 35
 # File: src/cpp/api_boolean_sparse.cpp, line: 33
index d4c699d..d8d37dd 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_dnaupd.c, line: 84
 # File: sci_gateway/c/sci_znaupd.c, line: 85
@@ -83,32 +83,32 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 113
-# File: sci_gateway/c/sci_eigs.c, line: 163
-# File: sci_gateway/c/sci_eigs.c, line: 225
-# File: sci_gateway/c/sci_eigs.c, line: 265
-# File: sci_gateway/c/sci_eigs.c, line: 331
-# File: sci_gateway/c/sci_eigs.c, line: 351
-# File: sci_gateway/c/sci_eigs.c, line: 376
-# File: sci_gateway/c/sci_eigs.c, line: 400
-# File: sci_gateway/c/sci_eigs.c, line: 433
-# File: sci_gateway/c/sci_eigs.c, line: 453
-# File: sci_gateway/c/sci_eigs.c, line: 504
-# File: sci_gateway/c/sci_eigs.c, line: 538
-# File: sci_gateway/c/sci_eigs.c, line: 549
-# File: sci_gateway/c/sci_eigs.c, line: 561
+# File: sci_gateway/c/sci_eigs.c, line: 117
+# File: sci_gateway/c/sci_eigs.c, line: 167
+# File: sci_gateway/c/sci_eigs.c, line: 229
+# File: sci_gateway/c/sci_eigs.c, line: 269
+# File: sci_gateway/c/sci_eigs.c, line: 333
+# File: sci_gateway/c/sci_eigs.c, line: 353
+# File: sci_gateway/c/sci_eigs.c, line: 377
+# File: sci_gateway/c/sci_eigs.c, line: 401
+# File: sci_gateway/c/sci_eigs.c, line: 434
+# File: sci_gateway/c/sci_eigs.c, line: 454
+# File: sci_gateway/c/sci_eigs.c, line: 553
+# File: sci_gateway/c/sci_eigs.c, line: 587
+# File: sci_gateway/c/sci_eigs.c, line: 598
+# File: sci_gateway/c/sci_eigs.c, line: 610
 #, c-format
 msgid "%s: Can not read input argument #%d.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 121
+# File: sci_gateway/c/sci_eigs.c, line: 125
 #, c-format
 msgid "%s: Wrong type for input argument #%d: A square matrix expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 171
+# File: sci_gateway/c/sci_eigs.c, line: 175
 #, c-format
 msgid ""
 "%s: Wrong type for input argument #%d: An empty matrix or full or sparse "
@@ -116,36 +116,36 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 178
+# File: sci_gateway/c/sci_eigs.c, line: 183
 #, c-format
 msgid ""
 "%s: Wrong dimension for input argument #%d: B must have the same size as A.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 233
-# File: sci_gateway/c/sci_eigs.c, line: 239
-# File: sci_gateway/c/sci_eigs.c, line: 272
-# File: sci_gateway/c/sci_eigs.c, line: 323
+# File: sci_gateway/c/sci_eigs.c, line: 237
+# File: sci_gateway/c/sci_eigs.c, line: 243
+# File: sci_gateway/c/sci_eigs.c, line: 276
+# File: sci_gateway/c/sci_eigs.c, line: 326
 #, c-format
 msgid "%s: Wrong type for input argument #%d: A scalar expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 245
+# File: sci_gateway/c/sci_eigs.c, line: 249
 #, c-format
 msgid "%s: Wrong type for input argument #%d: k must be a positive integer.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 251
+# File: sci_gateway/c/sci_eigs.c, line: 255
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: k must be in the range 1 to N.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 289
+# File: sci_gateway/c/sci_eigs.c, line: 293
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: Unrecognized sigma value.\n"
@@ -153,7 +153,7 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 295
+# File: sci_gateway/c/sci_eigs.c, line: 299
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: Unrecognized sigma value.\n"
@@ -162,31 +162,31 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 303
+# File: sci_gateway/c/sci_eigs.c, line: 307
 #, c-format
 msgid "%s: Invalid sigma value for complex or non symmetric problem.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 309
+# File: sci_gateway/c/sci_eigs.c, line: 313
 #, c-format
 msgid "%s: Invalid sigma value for real symmetric problem.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 337
+# File: sci_gateway/c/sci_eigs.c, line: 339
 #, c-format
 msgid "%s: Wrong type for input argument #%d: sigma must be a real.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 359
+# File: sci_gateway/c/sci_eigs.c, line: 360
 #, c-format
 msgid "%s: Wrong type for input argument #%d: %s must be a scalar.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 365
+# File: sci_gateway/c/sci_eigs.c, line: 366
 #, c-format
 msgid ""
 "%s: Wrong type for input argument #%d: %s must be an integer positive "
@@ -194,25 +194,25 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 383
-# File: sci_gateway/c/sci_eigs.c, line: 389
+# File: sci_gateway/c/sci_eigs.c, line: 384
+# File: sci_gateway/c/sci_eigs.c, line: 390
 #, c-format
 msgid "%s: Wrong type for input argument #%d: %s must be a real scalar.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 408
-# File: sci_gateway/c/sci_eigs.c, line: 415
-# File: sci_gateway/c/sci_eigs.c, line: 423
-# File: sci_gateway/c/sci_eigs.c, line: 439
+# File: sci_gateway/c/sci_eigs.c, line: 409
+# File: sci_gateway/c/sci_eigs.c, line: 416
+# File: sci_gateway/c/sci_eigs.c, line: 424
+# File: sci_gateway/c/sci_eigs.c, line: 440
 #, c-format
 msgid "%s: Wrong type for input argument #%d: %s must be an integer scalar.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 460
-# File: sci_gateway/c/sci_eigs.c, line: 469
-# File: sci_gateway/c/sci_eigs.c, line: 486
+# File: sci_gateway/c/sci_eigs.c, line: 461
+# File: sci_gateway/c/sci_eigs.c, line: 470
+# File: sci_gateway/c/sci_eigs.c, line: 487
 #, c-format
 msgid ""
 "%s: Wrong type for input argument #%d: %s must be an integer scalar or a "
@@ -220,28 +220,42 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 475
-# File: sci_gateway/c/sci_eigs.c, line: 492
+# File: sci_gateway/c/sci_eigs.c, line: 476
+# File: sci_gateway/c/sci_eigs.c, line: 493
 #, c-format
 msgid "%s: Wrong value for input argument #%d: %s must be %s or %s.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 512
+# File: sci_gateway/c/sci_eigs.c, line: 508
+# File: sci_gateway/c/sci_eigs.c, line: 530
+#, c-format
+msgid "%s: B is not positive definite. Try with sigma='SM' or sigma=scalar.\n"
+msgstr ""
+
+#
+# File: sci_gateway/c/sci_eigs.c, line: 515
+# File: sci_gateway/c/sci_eigs.c, line: 537
+#, c-format
+msgid "%s: If opts.cholB is true, B should be upper triangular.\n"
+msgstr ""
+
+#
+# File: sci_gateway/c/sci_eigs.c, line: 561
 #, c-format
 msgid ""
 "%s: Wrong type for input argument #%d: A real or complex matrix expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 520
+# File: sci_gateway/c/sci_eigs.c, line: 569
 #, c-format
 msgid ""
 "%s: Wrong dimension for input argument #%d: Start vector %s must be N by 1.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 529
+# File: sci_gateway/c/sci_eigs.c, line: 578
 #, c-format
 msgid ""
 "%s: Wrong type for input argument #%d: Start vector %s must be real for real "
@@ -249,13 +263,13 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 568
+# File: sci_gateway/c/sci_eigs.c, line: 617
 #, c-format
 msgid "%s: Wrong type for input argument #%d: An integer expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 593
+# File: sci_gateway/c/sci_eigs.c, line: 651
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: For real symmetric problems, NCV "
@@ -263,7 +277,7 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 599
+# File: sci_gateway/c/sci_eigs.c, line: 657
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: For real non symmetric problems, NCV "
@@ -271,7 +285,7 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 603
+# File: sci_gateway/c/sci_eigs.c, line: 661
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: For complex problems, NCV must be k "
@@ -279,7 +293,7 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 612
+# File: sci_gateway/c/sci_eigs.c, line: 670
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: For real symmetric problems, k must "
@@ -287,7 +301,7 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 616
+# File: sci_gateway/c/sci_eigs.c, line: 674
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: For real non symmetric or complex "
@@ -295,36 +309,43 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 622
+# File: sci_gateway/c/sci_eigs.c, line: 680
 #, c-format
 msgid ""
-"%s: Wrong type for input argument #%d: B must be symmetric or hermitian, "
-"definite, semi positive.\n"
+"%s: Error with input argument #%d: B is not positive definite. Try with "
+"sigma='SM' or sigma=scalar.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 631
-# File: sci_gateway/c/sci_eigs.c, line: 635
-# File: sci_gateway/c/sci_eigs.c, line: 640
-# File: sci_gateway/c/sci_eigs.c, line: 669
-# File: sci_gateway/c/sci_eigs.c, line: 673
-# File: sci_gateway/c/sci_eigs.c, line: 678
+# File: sci_gateway/c/sci_eigs.c, line: 689
+# File: sci_gateway/c/sci_eigs.c, line: 693
+# File: sci_gateway/c/sci_eigs.c, line: 698
+# File: sci_gateway/c/sci_eigs.c, line: 727
+# File: sci_gateway/c/sci_eigs.c, line: 731
+# File: sci_gateway/c/sci_eigs.c, line: 736
 #, c-format
 msgid "%s: Error with %s: info = %d \n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 650
-# File: sci_gateway/c/sci_eigs.c, line: 654
-# File: sci_gateway/c/sci_eigs.c, line: 659
+# File: sci_gateway/c/sci_eigs.c, line: 708
+# File: sci_gateway/c/sci_eigs.c, line: 712
+# File: sci_gateway/c/sci_eigs.c, line: 717
 #, c-format
 msgid "%s: Error with %s: unknown mode returned.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_eigs.c, line: 691
-# File: sci_gateway/c/sci_eigs.c, line: 710
-# File: sci_gateway/c/sci_eigs.c, line: 718
+# File: sci_gateway/c/sci_eigs.c, line: 742
+#, c-format
+msgid ""
+"%s: A - sigma * B is not inversible, try with a different value of sigma.\n"
+msgstr ""
+
+#
+# File: sci_gateway/c/sci_eigs.c, line: 763
+# File: sci_gateway/c/sci_eigs.c, line: 798
+# File: sci_gateway/c/sci_eigs.c, line: 815
 #, c-format
 msgid "%s: Memory allocation error.\n"
 msgstr ""
@@ -424,6 +445,15 @@ msgid ""
 msgstr ""
 
 #
+# File: macros/eigs.sci, line: 548
+# File: macros/eigs.sci, line: 984
+#, c-format
+msgid ""
+"%s: Wrong type for input argument #%d: B must be symmetric or hermitian, "
+"definite, semi positive.\n"
+msgstr ""
+
+#
 # File: macros/eigs.sci, line: 561
 # File: macros/eigs.sci, line: 992
 #, c-format
index e42e9c5..13830b3 100644 (file)
 /*--------------------------------------------------------------------------*/
 
 /*--------------------------------------------------------------------------*/
-// dgemm performs one of the matrix-matrix operations
-extern int C2F(dgemm)(char* transa, char* transb, int* m, int* n, int* k,
-                      double* alpha, double* A, int* lda, double* B, int* ldb,
-                      double* beta, double* C, int* ldc);
-// zgemm performs one of the matrix-matrix operations
-extern int C2F(zgemm)(char* transa, char* transb, int* m, int* n, int* k,
-                      doublecomplex* alpha, doublecomplex* A, int* lda, doublecomplex* B,
-                      int* ldb, doublecomplex* beta, doublecomplex* C, int* ldc);
-
 // dgemv performs matrix-vector operations
 extern int C2F(dgemv) (char* trans, int* m, int* n, double* alpha, double* A, int* lda,
                        double* x, int* incx, double* beta, double* y, int* incy);
@@ -121,6 +112,18 @@ extern int C2F(zneupd)(int * rvec, char * howmny, int * select,
                        int * lworkl, double * rwork, int * info);
 /*--------------------------------------------------------------------------*/
 
+/*--------------------------------------------------------------------------*/
+extern int C2F(dsymv)(char* UPLO, int* N, double* ALPHA, double* A, int* LDA, double* X, int* INCX, double* BETA, double* Y, int* INCY);
+/*--------------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------------*/
+extern int C2F(daxpy)(int* N, double* DA, double* DX, int* INCX, double* DY, int* INCY);
+/*--------------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------------*/
+extern int C2F(zaxpy)(int* N, doublecomplex* ZA, doublecomplex* ZX, int* INCX, doublecomplex* ZY, int* INCY);
+/*--------------------------------------------------------------------------*/
+
 static double alpha = 1.;
 static double beta = 0.;
 
@@ -181,7 +184,7 @@ int eigs(double *AR, doublecomplex *AC, int N, int Acomplex, int Asym,
     double* WORKEV                     = NULL;
     doublecomplex* WORKEVC     = NULL;
 
-    doublecomplex mSIGMA = {.r = -SIGMA.r, .i = -SIGMA.i };
+    doublecomplex mSIGMA = { -SIGMA.r, -SIGMA.i };
 
     double* R         = NULL;
     doublecomplex* RC = NULL;
index 419def3..f4695c7 100644 (file)
@@ -45,10 +45,8 @@ void process_dneupd_data(double* DR, double* DI, double* Z, int N, int nev, doub
             if (DI[i] == 0)
             {
                 C2F(dgemv) ("n", &N, &N, &alpha, AR, &N, Z + N * i, &iOne, &beta, temp1, &iOne);
-                eigenvalue[i] = (doublecomplex)
-                {
-                    C2F(ddot) (&N, Z + N * i, &iOne, temp1, &iOne), 0
-                };
+                eigenvalue[i].r = C2F(ddot) (&N, Z + N * i, &iOne, temp1, &iOne);
+                eigenvalue[i].i = 0;
                 i = i + 1;
             }
             else
@@ -59,14 +57,10 @@ void process_dneupd_data(double* DR, double* DI, double* Z, int N, int nev, doub
                             C2F(ddot) (&N, Z + N * (i + 1), &iOne, temp2, &iOne);
                 imag_part = C2F(ddot) (&N, Z + N * i, &iOne, temp2, &iOne) - \
                             C2F(ddot) (&N, Z + N * (i + 1), &iOne, temp1, &iOne);
-                eigenvalue[i] = (doublecomplex)
-                {
-                    real_part, imag_part
-                };
-                eigenvalue[i + 1] = (doublecomplex)
-                {
-                    real_part, -imag_part
-                };
+                eigenvalue[i].r = real_part;
+                eigenvalue[i].i = imag_part;
+                eigenvalue[i + 1].r = real_part;
+                eigenvalue[i + 1].i = -imag_part;
                 i = i + 2;
             }
         }
@@ -77,10 +71,8 @@ void process_dneupd_data(double* DR, double* DI, double* Z, int N, int nev, doub
     {
         for (i = 0; i < nev + 1; i++)
         {
-            eigenvalue[i] = (doublecomplex)
-            {
-                DR[i], DI[i]
-            };
+            eigenvalue[i].r = DR[i];
+            eigenvalue[i].i = DI[i];
         }
     }
 
@@ -94,26 +86,22 @@ void process_dneupd_data(double* DR, double* DI, double* Z, int N, int nev, doub
             {
                 for (j = 0; j < N; j++)
                 {
-                    eigenvector[i * N + j] = (doublecomplex)
-                    {
-                        Z[i * N + j], Z[(i + 1) * N + j]
-                    };
-                    eigenvector[(i + 1) * N + j] = (doublecomplex)
-                    {
-                        Z[i * N + j], -Z[(i + 1) * N + j]
-                    };
+                    eigenvector[i * N + j].r = Z[i * N + j];
+                    eigenvector[i * N + j].i = Z[(i + 1) * N + j];
+                    eigenvector[(i + 1) * N + j].r = Z[i * N + j];
+                    eigenvector[(i + 1) * N + j].i = -Z[(i + 1) * N + j];
                 }
+
                 i = i + 2;
             }
             else
             {
                 for (j = 0; j < N; j++)
                 {
-                    eigenvector[i * N + j] = (doublecomplex)
-                    {
-                        Z[i * N + j], 0
-                    };
+                    eigenvector[i * N + j].r = Z[i * N + j];
+                    eigenvector[i * N + j].i = 0;
                 }
+
                 i = i + 1;
             }
         }
index fe65972..89df7b1 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:57+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: macros/atomsAutoload.sci, line: 47
 # File: macros/atomsLoad.sci, line: 38
index d819ed3..49ee0f1 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_and.c, line: 40
 # File: sci_gateway/c/sci_and.c, line: 58
index 31d2d60..0de8e06 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: sci_gateway/c/sci_contr.c, line: 72
 # File: sci_gateway/c/sci_contr.c, line: 78
index 17e3977..e74f4eb 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: src/java/org/scilab/modules/commons/xml/ScilabXMLUtilities.java, line: 59
 msgid "Could not save file: "
index 205a234..bd45335 100644 (file)
@@ -14,3 +14,4 @@ getScilabVersionMajor
 getScilabVersionMinor
 getScilabVersionMaintenance
 getScilabVersionTimestamp
+getScilabVersionAsString
index ee7873d..809d055 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: macros/%b_cumprod.sci, line: 19
 # File: macros/%b_cumsum.sci, line: 19
index 64618a0..b00606e 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_completion.c, line: 43
 # File: sci_gateway/c/sci_completion.c, line: 83
index 89e01f3..000f70e 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_clc.c, line: 41
 # File: sci_gateway/c/sci_lines.c, line: 205
index bfdb0f7..7aef551 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: examples/capi/call_scifunction/sci_call_scifunc.c, line: 37
 # File: examples/capi/call_scifunction/sci_call_scifunc.c, line: 55
@@ -1738,21 +1738,21 @@ msgid ""
 msgstr ""
 
 #
-# File: src/java/org/scilab/modules/core/ConsoleTab.java, line: 43
+# File: src/java/org/scilab/modules/core/ConsoleTab.java, line: 44
 msgid ""
 "No available console !\n"
 "Please use STD mode."
 msgstr ""
 
 #
-# File: src/java/org/scilab/modules/core/ConsoleTab.java, line: 44
+# File: src/java/org/scilab/modules/core/ConsoleTab.java, line: 45
 msgid "Empty tab"
 msgstr ""
 
 #
 # File: src/java/org/scilab/modules/core/ConsoleTab.java, line: 90
-# File: src/java/org/scilab/modules/core/ConsoleTab.java, line: 92
-msgid "Scilab Console"
+#, c-format
+msgid "Scilab %s Console"
 msgstr ""
 
 #
@@ -1778,41 +1778,41 @@ msgid "  loading initial environment"
 msgstr ""
 
 #
-# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 151
+# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 157
 msgid "&File"
 msgstr ""
 
 #
-# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 152
+# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 158
 msgid "&Edit"
 msgstr ""
 
 #
-# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 153
+# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 159
 msgid "&Preferences"
 msgstr ""
 
 #
-# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 154
+# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 160
 msgid "&Control"
 msgstr ""
 
 #
-# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 155
-# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 157
-# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 160
+# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 161
 # File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 163
 # File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 166
+# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 169
+# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 172
 msgid "&Applications"
 msgstr ""
 
 #
-# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 168
+# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 174
 msgid "&?"
 msgstr ""
 
 #
-# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 169
+# File: /home/sylvestre/dev/git/scilab/scilab/etc/scilab.start, line: 175
 msgid "&Toolboxes"
 msgstr ""
 
index 15c775b..c2f72b5 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_mlist.c, line: 35
 # File: sci_gateway/c/sci_tlist.c, line: 35
@@ -42,36 +42,36 @@ msgid "%s: Can not create a tlist with input argument #%d.\n"
 msgstr ""
 
 #
-# File: src/c/hmops.c, line: 780
+# File: src/c/hmops.c, line: 778
 msgid " An hypermatrix extraction must have at least 2 arguments. "
 msgstr ""
 
 #
-# File: src/c/hmops.c, line: 786
-# File: src/c/hmops.c, line: 993
+# File: src/c/hmops.c, line: 784
+# File: src/c/hmops.c, line: 991
 msgid " Argument is not an hypermatrix. "
 msgstr ""
 
 #
-# File: src/c/hmops.c, line: 799
+# File: src/c/hmops.c, line: 797
 msgid " Incompatible hypermatrix extraction. "
 msgstr ""
 
 #
-# File: src/c/hmops.c, line: 827
+# File: src/c/hmops.c, line: 825
 #, c-format
 msgid "Bad (%d th) index in hypermatrix extraction. "
 msgstr ""
 
 #
-# File: src/c/hmops.c, line: 986
+# File: src/c/hmops.c, line: 984
 msgid " An hypermatrix insertion must have at least 3 arguments. "
 msgstr ""
 
 #
-# File: src/c/hmops.c, line: 1060
-# File: src/c/hmops.c, line: 1078
-# File: src/c/hmops.c, line: 1088
+# File: src/c/hmops.c, line: 1058
+# File: src/c/hmops.c, line: 1076
+# File: src/c/hmops.c, line: 1086
 msgid " Bad hypermatrix insertion. "
 msgstr ""
 
index c41e8b5..fc1125c 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: macros/add_demo.sci, line: 38
 #, c-format
index 7ec3327..d5aa194 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: macros/assert/assert_checkalmostequal.sci, line: 16
 # File: macros/assert/assert_checkfilesequal.sci, line: 15
diff --git a/scilab/modules/differential_equations/demos/dae/dae2/pendg1_gateway.sce b/scilab/modules/differential_equations/demos/dae/dae2/pendg1_gateway.sce
deleted file mode 100644 (file)
index a441519..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008 - INRIA - Pierre MARECHAL <pierre.marechal@scilab.org>
-//
-// This file is distributed under the same license as the Scilab package.
-//
-
-//
-// Sliding pendulum, curve #1
-//
-
-exec("SCI/demos/simulation/dae/dae2/pendg.sci")
-exec("SCI/demos/simulation/dae/dae2/pendc1.sci")
-
-exec('SCI/demos/demos_lib/demo_message.sci');
-exec('SCI/demos/demos_lib/demo_run.sci');
-
-demo_message('SCI/demos/simulation/dae/dae2/pendg1_1.sce');
-
-demo_run('SCI/demos/simulation/dae/dae2/pendg1_1.sce');
index 0400532..453a125 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: demos/bike/macros/velo1.sci, line: 26
 msgid "bike simulation, stable trajectory"
index cfc763f..be380c3 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_addinter.c, line: 46
 # File: sci_gateway/c/sci_addinter.c, line: 58
index 2bec591..0aa5258 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_base2dec.c, line: 41
 # File: sci_gateway/c/sci_base2dec.c, line: 54
index 1e2e678..92825af 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: includes/ScilabAbstractEnvironmentException.hxx, line: 96
 msgid "Exception thrown in file"
index b722007..8206077 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_fftw.c, line: 49
 #, c-format
index 48e1ecf..a90fd1b 100644 (file)
@@ -14,22 +14,22 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
-
-# File: sci_gateway/c/sci_basename.c, line: 50
-# File: sci_gateway/c/sci_basename.c, line: 58
-# File: sci_gateway/c/sci_basename.c, line: 72
-# File: sci_gateway/c/sci_basename.c, line: 80
-# File: sci_gateway/c/sci_basename.c, line: 104
-# File: sci_gateway/c/sci_basename.c, line: 112
-# File: sci_gateway/c/sci_basename.c, line: 126
-# File: sci_gateway/c/sci_basename.c, line: 140
-# File: sci_gateway/c/sci_basename.c, line: 151
-# File: sci_gateway/c/sci_basename.c, line: 159
-# File: sci_gateway/c/sci_basename.c, line: 169
-# File: sci_gateway/c/sci_basename.c, line: 199
-# File: sci_gateway/c/sci_basename.c, line: 217
-# File: sci_gateway/c/sci_basename.c, line: 248
+"Revision-Date: 2013-01-10 17:04+0100\n"
+
+# File: sci_gateway/c/sci_basename.c, line: 49
+# File: sci_gateway/c/sci_basename.c, line: 57
+# File: sci_gateway/c/sci_basename.c, line: 71
+# File: sci_gateway/c/sci_basename.c, line: 79
+# File: sci_gateway/c/sci_basename.c, line: 103
+# File: sci_gateway/c/sci_basename.c, line: 111
+# File: sci_gateway/c/sci_basename.c, line: 125
+# File: sci_gateway/c/sci_basename.c, line: 139
+# File: sci_gateway/c/sci_basename.c, line: 149
+# File: sci_gateway/c/sci_basename.c, line: 157
+# File: sci_gateway/c/sci_basename.c, line: 167
+# File: sci_gateway/c/sci_basename.c, line: 197
+# File: sci_gateway/c/sci_basename.c, line: 215
+# File: sci_gateway/c/sci_basename.c, line: 246
 # File: sci_gateway/c/sci_chdir.c, line: 53
 # File: sci_gateway/c/sci_chdir.c, line: 61
 # File: sci_gateway/c/sci_chdir.c, line: 76
@@ -78,9 +78,9 @@ msgstr ""
 # File: sci_gateway/c/sci_movefile.c, line: 56
 # File: sci_gateway/c/sci_movefile.c, line: 77
 # File: sci_gateway/c/sci_mputl.c, line: 60
-# File: sci_gateway/c/sci_mputl.c, line: 174
-# File: sci_gateway/c/sci_mputl.c, line: 210
-# File: sci_gateway/c/sci_mputl.c, line: 249
+# File: sci_gateway/c/sci_mputl.c, line: 173
+# File: sci_gateway/c/sci_mputl.c, line: 209
+# File: sci_gateway/c/sci_mputl.c, line: 248
 # File: sci_gateway/c/sci_pathconvert.c, line: 54
 # File: sci_gateway/c/sci_pathconvert.c, line: 62
 # File: sci_gateway/c/sci_pathconvert.c, line: 76
@@ -107,8 +107,8 @@ msgid "%s: Can not read input argument #%d.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_basename.c, line: 64
-# File: sci_gateway/c/sci_basename.c, line: 118
+# File: sci_gateway/c/sci_basename.c, line: 63
+# File: sci_gateway/c/sci_basename.c, line: 117
 # File: sci_gateway/c/sci_pathconvert.c, line: 162
 # File: sci_gateway/c/sci_pathconvert.c, line: 216
 #, c-format
@@ -116,8 +116,8 @@ msgid "%s: Wrong type for input argument #%d: A boolean expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_basename.c, line: 86
-# File: sci_gateway/c/sci_basename.c, line: 132
+# File: sci_gateway/c/sci_basename.c, line: 85
+# File: sci_gateway/c/sci_basename.c, line: 131
 # File: sci_gateway/c/sci_pathconvert.c, line: 176
 # File: sci_gateway/c/sci_pathconvert.c, line: 230
 #, c-format
@@ -125,12 +125,12 @@ msgid "%s: Wrong size for input argument #%d: A boolean expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_basename.c, line: 179
-# File: sci_gateway/c/sci_basename.c, line: 206
-# File: sci_gateway/c/sci_basename.c, line: 225
-# File: sci_gateway/c/sci_basename.c, line: 236
-# File: sci_gateway/c/sci_basename.c, line: 257
-# File: sci_gateway/c/sci_basename.c, line: 270
+# File: sci_gateway/c/sci_basename.c, line: 177
+# File: sci_gateway/c/sci_basename.c, line: 204
+# File: sci_gateway/c/sci_basename.c, line: 223
+# File: sci_gateway/c/sci_basename.c, line: 234
+# File: sci_gateway/c/sci_basename.c, line: 255
+# File: sci_gateway/c/sci_basename.c, line: 268
 # File: sci_gateway/c/sci_chdir.c, line: 89
 # File: sci_gateway/c/sci_chdir.c, line: 162
 # File: sci_gateway/c/sci_chdir.c, line: 195
@@ -182,7 +182,7 @@ msgstr ""
 # File: sci_gateway/c/sci_movefile.c, line: 334
 # File: sci_gateway/c/sci_movefile.c, line: 344
 # File: sci_gateway/c/sci_mputl.c, line: 80
-# File: sci_gateway/c/sci_mputl.c, line: 161
+# File: sci_gateway/c/sci_mputl.c, line: 160
 # File: sci_gateway/c/sci_pathconvert.c, line: 97
 # File: sci_gateway/c/sci_pathconvert.c, line: 277
 # File: sci_gateway/c/sci_pathconvert.c, line: 302
@@ -196,8 +196,8 @@ msgid "%s: Memory allocation error.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_basename.c, line: 188
-# File: sci_gateway/c/sci_basename.c, line: 285
+# File: sci_gateway/c/sci_basename.c, line: 186
+# File: sci_gateway/c/sci_basename.c, line: 283
 # File: sci_gateway/c/sci_pathconvert.c, line: 286
 #, c-format
 msgid "%s: Wrong type for input argument #%d: String array expected.\n"
@@ -327,12 +327,12 @@ msgstr ""
 # File: sci_gateway/c/sci_mfscanf.c, line: 131
 # File: sci_gateway/c/sci_mgetl.c, line: 167
 # File: sci_gateway/c/sci_mopen.c, line: 121
-# File: sci_gateway/c/sci_mputl.c, line: 129
-# File: sci_gateway/c/sci_mputl.c, line: 202
-# File: sci_gateway/c/sci_mputl.c, line: 219
-# File: sci_gateway/c/sci_mputl.c, line: 234
-# File: sci_gateway/c/sci_mscanf.c, line: 126
-# File: sci_gateway/c/sci_mscanf.c, line: 137
+# File: sci_gateway/c/sci_mputl.c, line: 128
+# File: sci_gateway/c/sci_mputl.c, line: 201
+# File: sci_gateway/c/sci_mputl.c, line: 218
+# File: sci_gateway/c/sci_mputl.c, line: 233
+# File: sci_gateway/c/sci_mscanf.c, line: 125
+# File: sci_gateway/c/sci_mscanf.c, line: 136
 # File: sci_gateway/c/sci_msscanf.c, line: 105
 # File: sci_gateway/c/sci_msscanf.c, line: 119
 #, c-format
@@ -367,7 +367,7 @@ msgstr ""
 #
 # File: sci_gateway/c/sci_findfiles.c, line: 79
 # File: sci_gateway/c/sci_fullpath.c, line: 61
-# File: sci_gateway/c/sci_mputl.c, line: 180
+# File: sci_gateway/c/sci_mputl.c, line: 179
 # File: sci_gateway/c/sci_newest.c, line: 66
 # File: sci_gateway/c/sci_newest.c, line: 82
 # File: sci_gateway/c/sci_newest.c, line: 98
@@ -589,7 +589,7 @@ msgstr ""
 #
 # File: sci_gateway/c/sci_mfscanf.c, line: 112
 # File: sci_gateway/c/sci_mscanf.c, line: 82
-# File: sci_gateway/c/sci_mscanf.c, line: 119
+# File: sci_gateway/c/sci_mscanf.c, line: 118
 # File: sci_gateway/c/sci_msscanf.c, line: 98
 #, c-format
 msgid "%s: Data mismatch.\n"
@@ -617,7 +617,7 @@ msgstr ""
 
 #
 # File: sci_gateway/c/sci_mgetl.c, line: 140
-# File: sci_gateway/c/sci_mputl.c, line: 115
+# File: sci_gateway/c/sci_mputl.c, line: 114
 #, c-format
 msgid "%s: Too many files opened!\n"
 msgstr ""
@@ -625,14 +625,14 @@ msgstr ""
 #
 # File: sci_gateway/c/sci_mgetl.c, line: 151
 # File: sci_gateway/c/sci_mopen.c, line: 112
-# File: sci_gateway/c/sci_mputl.c, line: 121
+# File: sci_gateway/c/sci_mputl.c, line: 120
 #, c-format
 msgid "%s: Cannot open file %s.\n"
 msgstr ""
 
 #
 # File: sci_gateway/c/sci_mgetl.c, line: 173
-# File: sci_gateway/c/sci_mputl.c, line: 137
+# File: sci_gateway/c/sci_mputl.c, line: 136
 #, c-format
 msgid "%s: invalid filename %s.\n"
 msgstr ""
@@ -640,7 +640,7 @@ msgstr ""
 #
 # File: sci_gateway/c/sci_mgetl.c, line: 190
 # File: sci_gateway/c/sci_mopen.c, line: 135
-# File: sci_gateway/c/sci_mputl.c, line: 151
+# File: sci_gateway/c/sci_mputl.c, line: 150
 #, c-format
 msgid "%s: invalid status.\n"
 msgstr ""
@@ -663,7 +663,7 @@ msgstr ""
 
 #
 # File: sci_gateway/c/sci_mopen.c, line: 128
-# File: sci_gateway/c/sci_mputl.c, line: 142
+# File: sci_gateway/c/sci_mputl.c, line: 141
 #, c-format
 msgid "%s: invalid filename.\n"
 msgstr ""
@@ -675,13 +675,13 @@ msgid "%s: Wrong size for input argument #%d: String expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_mputl.c, line: 167
+# File: sci_gateway/c/sci_mputl.c, line: 166
 #, c-format
 msgid "%s: Wrong type for input argument #%d: a String or Integer expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_mputl.c, line: 193
+# File: sci_gateway/c/sci_mputl.c, line: 192
 #, c-format
 msgid ""
 "%s: Wrong size for input argument #%d: A 1-by-n or m-by-1 array expected.\n"
@@ -695,12 +695,12 @@ msgstr ""
 
 #
 # File: sci_gateway/c/sci_msscanf.c, line: 66
-# File: src/c/do_xxscanf.c, line: 148
-# File: src/c/do_xxscanf.c, line: 160
-# File: src/c/do_xxscanf.c, line: 202
-# File: src/c/do_xxscanf.c, line: 224
-# File: src/c/do_xxscanf.c, line: 301
-# File: src/c/do_xxscanf.c, line: 317
+# File: src/c/do_xxscanf.c, line: 146
+# File: src/c/do_xxscanf.c, line: 158
+# File: src/c/do_xxscanf.c, line: 200
+# File: src/c/do_xxscanf.c, line: 222
+# File: src/c/do_xxscanf.c, line: 299
+# File: src/c/do_xxscanf.c, line: 315
 #, c-format
 msgid "%s: An error occurred: %s\n"
 msgstr ""
@@ -737,45 +737,45 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/do_xxscanf.c, line: 148
-# File: src/c/do_xxscanf.c, line: 160
+# File: src/c/do_xxscanf.c, line: 146
+# File: src/c/do_xxscanf.c, line: 158
 msgid "unclosed [ directive."
 msgstr ""
 
 #
-# File: src/c/do_xxscanf.c, line: 177
+# File: src/c/do_xxscanf.c, line: 175
 #, c-format
 msgid "%s: An error occurred: too many (> %d) conversion required.\n"
 msgstr ""
 
 #
-# File: src/c/do_xxscanf.c, line: 189
+# File: src/c/do_xxscanf.c, line: 187
 #, c-format
 msgid "%s: An error occurred: field %d is too long (> %d) for %%[ directive.\n"
 msgstr ""
 
 #
-# File: src/c/do_xxscanf.c, line: 202
-# File: src/c/do_xxscanf.c, line: 224
-# File: src/c/do_xxscanf.c, line: 301
-# File: src/c/do_xxscanf.c, line: 317
+# File: src/c/do_xxscanf.c, line: 200
+# File: src/c/do_xxscanf.c, line: 222
+# File: src/c/do_xxscanf.c, line: 299
+# File: src/c/do_xxscanf.c, line: 315
 msgid "Bad conversion."
 msgstr ""
 
 #
-# File: src/c/do_xxscanf.c, line: 210
+# File: src/c/do_xxscanf.c, line: 208
 #, c-format
 msgid "%s: An error occurred: field %d is too long (< %d) for %%s directive.\n"
 msgstr ""
 
 #
-# File: src/c/do_xxscanf.c, line: 235
+# File: src/c/do_xxscanf.c, line: 233
 #, c-format
 msgid "%s: An error occurred: field %d is too long (< %d) for %%c directive.\n"
 msgstr ""
 
 #
-# File: src/c/do_xxscanf.c, line: 345
+# File: src/c/do_xxscanf.c, line: 343
 #, c-format
 msgid "%s: An error occurred: format is too long (> %d).\n"
 msgstr ""
@@ -860,33 +860,33 @@ msgstr ""
 
 #
 # File: src/c/mput.c, line: 67
-# File: src/c/mput.c, line: 156
+# File: src/c/mput.c, line: 155
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d (%s): '%s' or '%s' or '%s' expected.\n"
 msgstr ""
 
 #
-# File: src/c/mput.c, line: 199
+# File: src/c/mput.c, line: 198
 #, c-format
 msgid ""
 "%s: Wrong size for input argument #%d ('%s'): Non-empty string expected.\n"
 msgstr ""
 
 #
-# File: src/c/mput.c, line: 206
+# File: src/c/mput.c, line: 205
 #, c-format
 msgid "%s: No File opened in Scilab.\n"
 msgstr ""
 
 #
-# File: src/c/mput.c, line: 217
+# File: src/c/mput.c, line: 216
 #, c-format
 msgid "%s: Wrong value for input argument #%d ('%s'): Format not recognized.\n"
 msgstr ""
 
 #
-# File: src/c/mput.c, line: 224
+# File: src/c/mput.c, line: 223
 # File: src/c/mputstr.c, line: 29
 # File: src/c/mseek.c, line: 45
 # File: src/c/mtell.c, line: 28
index 86c14ff..f62de34 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:57+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_exec.c, line: 52
 # File: sci_gateway/c/sci_exec.c, line: 60
index 9aab9a2..88d9699 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: demos/GAIsing2ddemo.sce, line: 63
 # File: demos/GAdemo.sce, line: 86
index 1541118..7c76528 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: src/java/org/scilab/modules/graph/utils/ScilabGraphMessages.java, line: 22
 msgid "Copy"
index b321d3f..20c7cba 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: sci_gateway/c/gw_graphic_export.c, line: 76
 msgid "Scilab graphic module disabled -nogui or -nwni mode.\n"
index 3a5ec25..eb92ccb 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_graphic_objects.c, line: 33
 #, c-format
index 60d9b35..b3c5897 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_graphics.c, line: 135
 msgid "Scilab graphic module disabled -nogui or -nwni mode.\n"
index 964436a..d23f6e6 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_gui.c, line: 73
 #, c-format
index 5f417c0..571f83a 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: sci_gateway/cpp/sci_export_to_hdf5.cpp, line: 98
 #, c-format
index ba0da0f..aef63ea 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_helptools.c, line: 38
 #, c-format
index 49af804..c75882f 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: src/java/org/scilab/modules/history_browser/CommandHistory.java, line: 124
 msgid "History loading in progress..."
index 0b0b4f0..cb8c203 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_addhistory.c, line: 40
 #, c-format
index 665d524..91c39ad 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_iconvert.c, line: 37
 # File: sci_gateway/c/sci_iconvert.c, line: 51
index f8d70d1..0f61bab 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_bsplin3val.c, line: 62
 # File: sci_gateway/c/sci_cshep2d.c, line: 50
index 1f83f3a..a2d1cef 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_file.c, line: 65
 # File: sci_gateway/c/sci_file.c, line: 73
index 8163be6..0db2f39 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_jvm.c, line: 48
 msgid "JVM interface disabled in -nogui or -nwni modes.\n"
index 0630fec..73d5c55 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_backslash.c, line: 62
 # File: sci_gateway/c/sci_backslash.c, line: 83
index d1188cb..e392d95 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_dgettext.c, line: 42
 # File: sci_gateway/c/sci_dgettext.c, line: 49
index 787bb48..d689469 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: macros/buildmacros.sce, line: 18
 #, c-format
index e1a7af6..bb517c2 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_matfile_close.c, line: 54
 # File: sci_gateway/c/sci_matfile_listvar.c, line: 60
index 13d8c7a..5003527 100644 (file)
@@ -68,7 +68,12 @@ int sci_matfile_listvar(char* fname, void* pvApiCtx)
 
   /* Gets the corresponding matfile */
   matfile_manager(MATFILEMANAGER_GETFILE, &fileIndex, &matfile);
-
+  if (matfile == NULL)
+  {
+      Scierror(999, _("%s: Invalid file identifier.\n"), fname);
+      return FALSE;
+  }
+  
   /* Back to the beginning of the file */
   if (Mat_Rewind(matfile) != 0)
     {
diff --git a/scilab/modules/matio/tests/nonreg_tests/bug_12168.dia.ref b/scilab/modules/matio/tests/nonreg_tests/bug_12168.dia.ref
new file mode 100644 (file)
index 0000000..bed0857
--- /dev/null
@@ -0,0 +1,23 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Vincent COUVERT
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Non-regression test for bug 12168 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=12168
+//
+// <-- Short Description -->
+// Segfault when listing a closed matfile.
+A = rand(10,10);
+testfile = fullfile(TMPDIR, "bug_12168.mat");
+savematfile(testfile, "A", "-v6");
+fd = matfile_open(testfile);
+matfile_close(fd);
+refMsg = msprintf(_("%s: Invalid file identifier.\n"), "matfile_listvar");
+assert_checkerror("matfile_listvar(fd);", refMsg);
diff --git a/scilab/modules/matio/tests/nonreg_tests/bug_12168.tst b/scilab/modules/matio/tests/nonreg_tests/bug_12168.tst
new file mode 100644 (file)
index 0000000..478def4
--- /dev/null
@@ -0,0 +1,25 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Vincent COUVERT
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Non-regression test for bug 12168 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=12168
+//
+// <-- Short Description -->
+// Segfault when listing a closed matfile.
+
+
+A = rand(10,10);
+testfile = fullfile(TMPDIR, "bug_12168.mat");
+savematfile(testfile, "A", "-v6");
+fd = matfile_open(testfile);
+matfile_close(fd);
+refMsg = msprintf(_("%s: Invalid file identifier.\n"), "matfile_listvar");
+assert_checkerror("matfile_listvar(fd);", refMsg);
index 43ed352..489559f 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: includes/mex.h, line: 86
 msgid "mexPutFull failed\n"
index bd741cc..6fa5003 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: macros/tbx_build_blocks.sci, line: 21
 #, c-format
index 7c11bea..ab0bc0e 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_qld.c, line: 62
 #, c-format
index 88d8934..cc7e170 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: sci_gateway/c/sci_mprintf.c, line: 64
 # File: sci_gateway/c/sci_msprintf.c, line: 156
@@ -82,7 +82,7 @@ msgstr ""
 # File: sci_gateway/c/sci_msprintf.c, line: 110
 # File: sci_gateway/c/sci_msprintf.c, line: 116
 # File: sci_gateway/c/sci_msprintf.c, line: 129
-# File: sci_gateway/c/sci_msprintf.c, line: 413
+# File: sci_gateway/c/sci_msprintf.c, line: 412
 # File: sci_gateway/cpp/sci_diary.cpp, line: 104
 # File: sci_gateway/cpp/sci_diary.cpp, line: 122
 # File: sci_gateway/cpp/sci_diary.cpp, line: 136
@@ -126,10 +126,10 @@ msgstr ""
 # File: sci_gateway/c/sci_msprintf.c, line: 254
 # File: sci_gateway/c/sci_msprintf.c, line: 268
 # File: sci_gateway/c/sci_msprintf.c, line: 288
-# File: sci_gateway/c/sci_msprintf.c, line: 324
-# File: sci_gateway/c/sci_msprintf.c, line: 339
-# File: sci_gateway/c/sci_msprintf.c, line: 354
-# File: sci_gateway/c/sci_msprintf.c, line: 374
+# File: sci_gateway/c/sci_msprintf.c, line: 323
+# File: sci_gateway/c/sci_msprintf.c, line: 338
+# File: sci_gateway/c/sci_msprintf.c, line: 353
+# File: sci_gateway/c/sci_msprintf.c, line: 373
 # File: src/c/sciprint_full.c, line: 50
 # File: src/c/sciprint_full.c, line: 60
 #, c-format
index 2cfd184..f6cf5a1 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: macros/%0_i_st.sci, line: 19
 msgid "Invalid index.\n"
index 6b6a95e..6ed7500 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/cpp/sci_parallel_run.cpp, line: 542
 #, c-format
index 8cdfb52..940a947 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: src/c/parameters.c, line: 143
 # File: src/c/parameters.c, line: 569
index 875a9f3..59d6bec 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: demos/polynomials.dem.gateway.sce, line: 10
 msgid "Polynomials"
index 92edebb..fccb77e 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_preferences.c, line: 38
 #, c-format
index d83d186..6ddb6d1 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: sci_gateway/c/sci_grand.c, line: 143
 # File: sci_gateway/c/sci_grand.c, line: 412
index ef43b47..c11ee10 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_buildouttb.c, line: 95
 #, c-format
@@ -126,13 +126,13 @@ msgid "%s: Memory allocation error.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_callblk.c, line: 170
+# File: sci_gateway/c/sci_callblk.c, line: 169
 #, c-format
 msgid "%s : Second argument must be scalar.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_callblk.c, line: 182
+# File: sci_gateway/c/sci_callblk.c, line: 181
 #, c-format
 msgid "%s : Third argument must be scalar.\n"
 msgstr ""
index 3d1380b..48bb727 100644 (file)
@@ -90,6 +90,20 @@ if typeof(scs_m)<>"diagram" then
   error(msprintf(gettext("%s: Wrong type for input argument #%d: A diagram expected.\n"), "lincos", 1));
 end
 
+// Propagate context through all blocks
+%state0     = list();
+needcompile = 4;
+%cpr        = struct();
+%cpr.state  = %state0;
+%scicos_context = struct();
+context = scs_m.props.context;
+
+[%scicos_context, ierr] = script2var(context, %scicos_context);
+[scs_m,%cpr,needcompile,ok] = do_eval(scs_m, %cpr, %scicos_context);
+if ~ok then
+    error(msprintf(gettext("%s: Error during block parameters evaluation.\n"), "lincos"));
+end
+
 IN  = [];
 OUT = [];
 
index 042bf04..fa27318 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: src/c/convert.c, line: 769
 # File: src/c/convert.c, line: 784
index 82c37da..f5b6095 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_scinotes.c, line: 37
 #, c-format
index a30410d..d733141 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: sci_gateway/c/sci_conv2.c, line: 38
 # File: sci_gateway/c/sci_conv2.c, line: 99
index 9b477be..817025c 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: demos/SAIsing2ddemo.sce, line: 10
 # File: demos/SAdemo.sce, line: 10
index 94e2e33..9be416d 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_PlaySound.c, line: 48
 # File: sci_gateway/c/sci_PlaySound.c, line: 56
index f11d962..e2e5cef 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: includes/spDefs.h, line: 379
 #, c-format
index 9e4d654..9544f4c 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_beta.c, line: 53
 #, c-format
index e4be65c..a1d0647 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_csv_helpers.c, line: 72
 # File: sci_gateway/c/gw_csv_helpers.c, line: 128
@@ -349,7 +349,7 @@ msgid "%s: End of file.\n"
 msgstr ""
 
 #
-# File: src/c/csvRead.c, line: 360
+# File: src/c/csvRead.c, line: 359
 #, c-format
 msgid ""
 "%s: Inconsistency found in the columns. At line %d, found %d columns while "
index a2cf1ac..5e7a02c 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: sci_gateway/c/sci_cdfbet.c, line: 45
 msgid "X,Y,A and B"
index a2894e9..e801b46 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_ascii.c, line: 250
 msgid "WARNING : \n"
index 67637c6..ed3660e 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_symbolic.c, line: 33
 #, c-format
index 0853422..60bda6a 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_tclsci.c, line: 72
 msgid "Warning: Problem(s) with TCL/TK interface. Interface not enabled.\n"
index 0a916c2..0d12389 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: sci_gateway/c/sci_calendar.c, line: 59
 # File: sci_gateway/c/sci_calendar.c, line: 65
index 3ff0807..648d88a 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: src/java/org/scilab/modules/types/ScilabTypeEnumDescription.java, line: 24
 msgid "Double"
index 628b9cd..308cf37 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_ui_data.c, line: 39
 #, c-format
index 7d578f9..fe1be8f 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:03+0100\n"
 
 # File: sci_gateway/c/sci_res_with_prec.c, line: 63
 #, c-format
index 6d41abc..79d77f4 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/sci_chartooem.c, line: 31
 # File: sci_gateway/c/sci_oemtochar.c, line: 31
index e75d207..6dad65f 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/c/gw_xcos.c, line: 56
 #, c-format
diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_11193.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_11193.dia.ref
new file mode 100644 (file)
index 0000000..cdea0cc
--- /dev/null
@@ -0,0 +1,46 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2012 - Scilab Enterprises - Alexandre HERISSE
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- XCOS TEST -->
+//
+// <-- Non-regression test for bug 11193 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=11193
+//
+// <-- Short Description -->
+// Lincos did not honor context values.
+loadXcosLibs();
+// First test with B = 3.0;
+B = 3.0;
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_11193.zcos"));
+// looking for the Superblock to linearize
+for i=1:length(scs_m.objs)
+    if typeof(scs_m.objs(i))=="Block" & scs_m.objs(i).gui=="SUPER_f" then
+        scs_m = scs_m.objs(i).model.rpar;
+        break;
+    end
+end
+sys = lincos(scs_m);
+assert_checkequal(sys.A, []);
+assert_checkequal(sys.B, []);
+assert_checkequal(sys.C, []);
+assert_checkequal(sys.D, 3.0);
+// Second test with B = 7.0
+B = 7.0;
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_11193.zcos"));
+// looking for the Superblock to linearize
+for i=1:length(scs_m.objs)
+    if typeof(scs_m.objs(i))=="Block" & scs_m.objs(i).gui=="SUPER_f" then
+        scs_m = scs_m.objs(i).model.rpar;
+        break;
+    end
+end
+sys = lincos(scs_m);
+assert_checkequal(sys.A, []);
+assert_checkequal(sys.B, []);
+assert_checkequal(sys.C, []);
+assert_checkequal(sys.D, 7.0);
diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_11193.tst b/scilab/modules/xcos/tests/nonreg_tests/bug_11193.tst
new file mode 100644 (file)
index 0000000..fd0294b
--- /dev/null
@@ -0,0 +1,56 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2012 - Scilab Enterprises - Alexandre HERISSE
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- XCOS TEST -->
+//
+// <-- Non-regression test for bug 11193 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=11193
+//
+// <-- Short Description -->
+// Lincos did not honor context values.
+
+loadXcosLibs();
+
+// First test with B = 3.0;
+B = 3.0;
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_11193.zcos"));
+
+// looking for the Superblock to linearize
+for i=1:length(scs_m.objs)
+    if typeof(scs_m.objs(i))=="Block" & scs_m.objs(i).gui=="SUPER_f" then
+        scs_m = scs_m.objs(i).model.rpar;
+        break;
+    end
+end
+
+sys = lincos(scs_m);
+assert_checkequal(sys.A, []);
+assert_checkequal(sys.B, []);
+assert_checkequal(sys.C, []);
+assert_checkequal(sys.D, 3.0);
+
+// Second test with B = 7.0
+B = 7.0;
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_11193.zcos"));
+
+// looking for the Superblock to linearize
+for i=1:length(scs_m.objs)
+    if typeof(scs_m.objs(i))=="Block" & scs_m.objs(i).gui=="SUPER_f" then
+        scs_m = scs_m.objs(i).model.rpar;
+        break;
+    end
+end
+
+sys = lincos(scs_m);
+assert_checkequal(sys.A, []);
+assert_checkequal(sys.B, []);
+assert_checkequal(sys.C, []);
+assert_checkequal(sys.D, 7.0);
+
+
diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_11193.zcos b/scilab/modules/xcos/tests/nonreg_tests/bug_11193.zcos
new file mode 100644 (file)
index 0000000..b4e0fd1
Binary files /dev/null and b/scilab/modules/xcos/tests/nonreg_tests/bug_11193.zcos differ
index 1c12603..e7faf1f 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-01-07 15:56+0100\n"
+"Revision-Date: 2013-01-10 17:04+0100\n"
 
 # File: sci_gateway/cpp/sci_percent_XMLAttr_e.cpp, line: 53
 # File: sci_gateway/cpp/sci_percent_XMLAttr_e.cpp, line: 87