Merge remote-tracking branch 'origin/master' into YaSp 15/16315/3
Vincent COUVERT [Thu, 2 Apr 2015 15:23:47 +0000 (17:23 +0200)]
Conflicts:
scilab/modules/cacsd/sci_gateway/c/sci_ricc2.c
scilab/modules/cacsd/tests/nonreg_tests/bug_9836.win.dia.ref
scilab/modules/fileio/sci_gateway/c/sci_mfprintf.c
scilab/modules/fileio/src/c/mputl.c
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/optimization/tests/nonreg_tests/bug_12702.win.dia.ref
scilab/modules/optimization/tests/nonreg_tests/bug_9690.win.dia.ref
scilab/modules/statistics/tests/nonreg_tests/bug_8031.dia.ref
scilab/modules/statistics/tests/nonreg_tests/bug_8031.tst

Change-Id: I7b6928f6c041d1c8ca3a839b34a5370b5dc6f752

21 files changed:
1  2 
scilab/modules/cacsd/sci_gateway/c/sci_ricc.c
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/fileio/locales/fileio.pot
scilab/modules/fileio/sci_gateway/cpp/sci_mfprintf.cpp
scilab/modules/fileio/src/c/createdirectory.c
scilab/modules/fileio/src/cpp/mputl.cpp
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/sci_gateway/c/sci_drawaxis.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d.c
scilab/modules/graphics/sci_gateway/c/sci_plot3d.c
scilab/modules/graphics/sci_gateway/cpp/graphics_gw.cpp
scilab/modules/graphics/sci_gateway/cpp/sci_contour2dm.cpp
scilab/modules/hdf5/src/cpp/H5DataFactory.cpp
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/statistics/tests/nonreg_tests/bug_8031.dia.ref
scilab/modules/statistics/tests/nonreg_tests/bug_8031.tst

index 2e8646d,0000000..01e9f5b
mode 100644,000000..100644
--- /dev/null
@@@ -1,372 -1,0 +1,372 @@@
 +/*
 + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 + * Copyright (C) 2012 - Scilab Enterprises - Cedric DELAMARRE
 + *
 + * 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
 + *
 + */
 +#include <string.h>
 +#include "gw_cacsd.h"
 +#include "sci_rankqr.h"
 +#include "api_scilab.h"
 +#include "Scierror.h"
 +#include "localization.h"
 +
 +extern int C2F(riccsl)();
 +extern int C2F(riccms)();
 +extern int C2F(ricdsl)();
 +extern int C2F(ricdmf)();
 +
 +int sci_ricc(char *fname, void* pvApiCtx)
 +{
 +    SciErr sciErr;
 +
 +    int* piAddrlA   = NULL;
 +    double* lA      = NULL;
 +    int* piAddrlD   = NULL;
 +    double* lD      = NULL;
 +    int* piAddrlC   = NULL;
 +    double* lC      = NULL;
 +    char* lTYPE     = NULL;
 +    char* lMETHOD   = NULL;
 +    double* lX      = NULL;
 +    double* lWR     = NULL;
 +    double* lWI     = NULL;
 +    double* lRCOND  = NULL;
 +    double* lFERR   = NULL;
 +    int* lIWORK     = NULL;
 +    int* lBWORK     = NULL;
 +    double* lDWORK  = NULL;
 +
 +    int* piAddrlTYPE = NULL;
 +    int* piAddrlMETHOD = NULL;
 +
 +    BOOL WANTC = 0, WANTD = 0, WSCHUR = 0, WSIGN = 0, WINVF = 0;
 +
 +    int minrhs = 4;
 +    int maxrhs = 5;
 +    int minLhs = 1;
 +    int maxLhs = 3;
 +
 +    int N = 0, LWORKMIN = 0, INFO = 0;
 +    int MA = 0, NA = 0;
 +    int MC = 0, NC = 0;
 +    int MD = 0, ND = 0;
 +    int M1 = 0, N1 = 0;
 +
 +    int iOne = 1, iSize = 0, k = 0;
 +
 +    CheckInputArgument(pvApiCtx, minrhs, maxrhs);
 +    CheckOutputArgument(pvApiCtx, minLhs, maxLhs);
 +
 +    sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddrlA);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        return 1;
 +    }
 +
 +    // Retrieve a matrix of double at position 1.
 +    sciErr = getMatrixOfDouble(pvApiCtx, piAddrlA, &MA, &NA, &lA);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        Scierror(202, _("%s: Wrong type for argument %d: A real expected.\n"), fname, 1);
 +        return 1;
 +    }
 +
 +    if (MA != NA)
 +    {
 +        Scierror(999, _("%s: A must be a square matrix.\n"), fname);
 +        return 1;
 +    }
 +
 +    sciErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddrlD);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        return 1;
 +    }
 +
 +    // Retrieve a matrix of double at position 2.
 +    sciErr = getMatrixOfDouble(pvApiCtx, piAddrlD, &MD, &ND, &lD);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        Scierror(202, _("%s: Wrong type for argument %d: A real expected.\n"), fname, 2);
 +        return 1;
 +    }
 +
 +    if (MD != ND)
 +    {
 +        Scierror(999, _("%s: D must be a square matrix.\n"), fname);
 +        return 1;
 +    }
 +
 +    sciErr = getVarAddressFromPosition(pvApiCtx, 3, &piAddrlC);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        return 1;
 +    }
 +
 +    // Retrieve a matrix of double at position 3.
 +    sciErr = getMatrixOfDouble(pvApiCtx, piAddrlC, &MC, &NC, &lC);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        Scierror(202, _("%s: Wrong type for argument %d: A real expected.\n"), fname, 3);
 +        return 1;
 +    }
 +
 +    if (MC != NC)
 +    {
 +        Scierror(999, _("%s: C must be a square matrix.\n"), fname);
 +        return 1;
 +    }
 +
 +    if (MA != MC || MC != MD || MA != MD)
 +    {
 +        Scierror(999, _("%s: The matrices A, C and D must have the same order.\n"), fname);
 +        return 1;
 +    }
 +
 +    N = MA;
 +
 +    sciErr = getVarAddressFromPosition(pvApiCtx, 4, &piAddrlTYPE);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        return 1;
 +    }
 +
 +    // Retrieve a matrix of double at position 4.
 +    if (getAllocatedSingleString(pvApiCtx, piAddrlTYPE, &lTYPE))
 +    {
 +        Scierror(202, _("%s: Wrong type for argument #%d: A string expected.\n"), fname, 4);
 +        return 1;
 +    }
 +
 +    WANTC = (strcmp((lTYPE), "cont") == 0 || strcmp((lTYPE), "CONT") == 0);
 +    WANTD = (strcmp((lTYPE), "disc") == 0 || strcmp((lTYPE), "DISC") == 0);
 +    freeAllocatedSingleString(lTYPE);
 +
 +    if (WANTC == FALSE && WANTD == FALSE)
 +    {
 +        Scierror(999, _("%s: Wrong value for input argument #%d: Type must be continuous or discrete.\n"), fname, 4);
 +        return 1;
 +    }
 +
 +    k = 5;
 +    WSCHUR = TRUE;
 +    if (nbInputArgument(pvApiCtx) == 5)
 +    {
 +        sciErr = getVarAddressFromPosition(pvApiCtx, 5, &piAddrlMETHOD);
 +        if (sciErr.iErr)
 +        {
 +            printError(&sciErr, 0);
 +            return 1;
 +        }
 +
 +        // Retrieve a matrix of double at position 5.
 +        if (getAllocatedSingleString(pvApiCtx, piAddrlMETHOD, &lMETHOD))
 +        {
 +            Scierror(202, _("%s: Wrong type for argument #%d: A string expected.\n"), fname, 5);
 +            return 1;
 +        }
 +
 +        WSCHUR = (strcmp((lMETHOD), "schr") == 0 || strcmp((lMETHOD), "SCHR") == 0);
 +        if (WANTC)
 +        {
 +            WSIGN  = (strcmp((lMETHOD), "sign") == 0 || strcmp((lMETHOD), "SIGN") == 0);
 +            if (WSCHUR == FALSE && WSIGN == FALSE)
 +            {
 +                freeAllocatedSingleString(lMETHOD);
 +                Scierror(999, _("%s: Wrong value for input argument #%d: Method must be schur or sign.\n"), fname, 5);
 +                return 1;
 +            }
 +        }
 +        else
 +        {
-             WSIGN  = (strcmp((lMETHOD), "invf") == 0 || strcmp((lMETHOD), "INVF") == 0);
++            WINVF  = (strcmp((lMETHOD), "invf") == 0 || strcmp((lMETHOD), "INVF") == 0);
 +            if (WSCHUR == FALSE && WINVF == FALSE)
 +            {
 +                freeAllocatedSingleString(lMETHOD);
 +                Scierror(999, _("%s: Wrong value for input argument #%d: Method must be schur or invf.\n"), fname, 5);
 +                return 1;
 +            }
 +        }
 +
 +        k = 6;
 +        freeAllocatedSingleString(lMETHOD);
 +    }
 +
 +    sciErr = allocMatrixOfDouble(pvApiCtx, k, N, N, &lX);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        Scierror(999, _("%s: Memory allocation error.\n"), fname);
 +        return 1;
 +    }
 +
 +    sciErr = allocMatrixOfDouble(pvApiCtx, k + 1, N, iOne, &lWR);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        Scierror(999, _("%s: Memory allocation error.\n"), fname);
 +        return 1;
 +    }
 +
 +    sciErr = allocMatrixOfDouble(pvApiCtx, k + 2, N, iOne, &lWI);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        Scierror(999, _("%s: Memory allocation error.\n"), fname);
 +        return 1;
 +    }
 +
 +    sciErr = allocMatrixOfDouble(pvApiCtx, k + 3, iOne, iOne, &lRCOND);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        Scierror(999, _("%s: Memory allocation error.\n"), fname);
 +        return 1;
 +    }
 +
 +    sciErr = allocMatrixOfDouble(pvApiCtx, k + 4, iOne, iOne, &lFERR);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        Scierror(999, _("%s: Memory allocation error.\n"), fname);
 +        return 1;
 +    }
 +
 +    iSize = Max(2 * N, N * N);
 +    sciErr = allocMatrixOfDoubleAsInteger(pvApiCtx, k + 5, iOne, iSize, &lIWORK);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        Scierror(999, _("%s: Memory allocation error.\n"), fname);
 +        return 1;
 +    }
 +
 +    iSize = 2 * N;
 +    sciErr = allocMatrixOfDoubleAsInteger(pvApiCtx, k + 6, iOne, iSize, &lBWORK);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        Scierror(999, _("%s: Memory allocation error.\n"), fname);
 +        return 1;
 +    }
 +
 +    if (WANTC)
 +    {
 +        if (WSCHUR)
 +        {
 +            LWORKMIN = 9 * N * N + 4 * N + Max(1, 6 * N);
 +        }
 +        else if (WSIGN)
 +        {
 +            LWORKMIN = 9 * N * N + 7 * N + 1;
 +        }
 +    }
 +    else
 +    {
 +        if (WSCHUR)
 +        {
 +            LWORKMIN = 12 * N * N + 22 * N + Max(16, 4 * N);
 +        }
 +        else if (WINVF)
 +        {
 +            LWORKMIN = 28 * N * N + 2 * N + Max(1, 2 * N);
 +        }
 +    }
 +
 +    sciErr = allocMatrixOfDouble(pvApiCtx, k + 7, iOne, LWORKMIN, &lDWORK);
 +    if (sciErr.iErr)
 +    {
 +        printError(&sciErr, 0);
 +        Scierror(999, _("%s: Memory allocation error.\n"), fname);
 +        return 1;
 +    }
 +
 +    if (WANTC)
 +    {
 +        if (WSCHUR)
 +        {
 +            C2F(riccsl)("N", &N, lA, &N, "U", lC, &N, lD,
 +                        &N, lX, &N, lWR, lWI, lRCOND,
 +                        lFERR, lDWORK, &LWORKMIN, lIWORK,
 +                        lBWORK, &INFO);
 +
 +            if (INFO != 0)
 +            {
 +                Scierror(999, _("%s: RICCSL exit with info = %d.\n"), fname, INFO);
 +                return 1;
 +            }
 +        }
 +        else if (WSIGN)
 +        {
 +            C2F(riccms)("N", &N, lA, &N, "U", lC, &N, lD,
 +                        &N, lX, &N, lWR, lWI, lRCOND,
 +                        lFERR, lDWORK, &LWORKMIN, lIWORK, &INFO);
 +
 +            if (INFO != 0)
 +            {
 +                Scierror(999, _("%s: RICCMS exit with info = %d.\n"), fname, INFO);
 +                return 1;
 +            }
 +        }
 +    }
 +    else
 +    {
 +        if (WSCHUR)
 +        {
 +            C2F(ricdsl)("N", &N, lA, &N, "U", lC, &N, lD,
 +                        &N, lX, &N, lWR, lWI, lRCOND,
 +                        lFERR, lDWORK, &LWORKMIN, lIWORK,
 +                        lBWORK, &INFO);
 +
 +            if (INFO != 0)
 +            {
 +                Scierror(999, _("%s: RICDSL exit with info = %d.\n"), fname, INFO);
 +                return 1;
 +            }
 +        }
 +        else if (WINVF)
 +        {
 +            C2F(ricdmf)("N", &N, lA, &N, "U", lC, &N, lD,
 +                        &N, lX, &N, lWR, lWI, lRCOND,
 +                        lFERR, lDWORK, &LWORKMIN, lIWORK, &INFO);
 +
 +            if (INFO != 0)
 +            {
 +                Scierror(999, _("%s: RICDMF exit with info = %d.\n"), fname, INFO);
 +                return 1;
 +            }
 +        }
 +    }
 +
 +    if (nbOutputArgument(pvApiCtx) == 1)
 +    {
 +        AssignOutputVariable(pvApiCtx, 1) = k;
 +    }
 +    else if (nbOutputArgument(pvApiCtx) == 2)
 +    {
 +        AssignOutputVariable(pvApiCtx, 1) = k;
 +        AssignOutputVariable(pvApiCtx, 2) = k + 3;
 +    }
 +    else if (nbOutputArgument(pvApiCtx) == 3)
 +    {
 +        AssignOutputVariable(pvApiCtx, 1) = k;
 +        AssignOutputVariable(pvApiCtx, 2) = k + 3;
 +        AssignOutputVariable(pvApiCtx, 3) = k + 4;
 +    }
 +
 +    ReturnArguments(pvApiCtx);
 +    return 0;
 +}
index 500dabe,0000000..c1ccc92
mode 100644,000000..100644
--- /dev/null
@@@ -1,246 -1,0 +1,246 @@@
 +/*
 +* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 +* Copyright (C) 2006 - INRIA - Allan CORNET
 +* Copyright (C) 2009 - DIGITEO - Allan CORNET
 +* Copyright (C) 2010 - DIGITEO - Antoine ELIAS
 +* Copyright (C) 2011 - DIGITEO - Cedric DELAMARRE
 +*
 +* This file must be used under the terms of the CeCILL.
 +* This source file is licensed as described in the file COPYING, which
 +* you should have received as part of this distribution.  The terms
 +* are also available at
 +* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 +*
 +*/
 +/*--------------------------------------------------------------------------*/
 +#include "filemanager.hxx"
 +#include "fileio_gw.hxx"
 +#include "function.hxx"
 +#include "double.hxx"
 +#include "string.hxx"
 +#include "scilab_sprintf.hxx"
 +#include "overload.hxx"
 +#include "execvisitor.hxx"
 +
 +extern "C"
 +{
 +#include <stdio.h>
 +#include "localization.h"
 +#include "Scierror.h"
 +#include "sci_malloc.h"
 +#include "configvariable_interface.h"
 +#include "mputl.h"
 +}
 +/*--------------------------------------------------------------------------*/
 +#ifdef _MSC_VER
 +static BOOL forceSTDERRredirect = TRUE;
 +#endif
 +
 +using namespace types;
 +using namespace ast;
 +/*--------------------------------------------------------------------------*/
 +
 +Function::ReturnValue sci_mfprintf(types::typed_list &in, int _iRetCount, types::typed_list &out)
 +{
 +    BOOL isSTD                      = FALSE;
 +    BOOL isSTDErr                   = FALSE;
 +    int iFile                       = -1; //default file : last opened file
 +    unsigned int iNumberPercent     = 0;
 +    unsigned int iNumberCols        = 0;
 +    int nbrOfLines                  = 0;
 +    int ifileMode                   = 0;
 +    wchar_t* wcsInput               = NULL;
 +    wchar_t** wcsStringToWrite      = NULL;
 +    ArgumentPosition* pArgs         = NULL;
 +
 +    if (in.size() < 2)
 +    {
 +        Scierror(77, _("%s: Wrong number of input argument(s): At least %d expected.\n"), "mfprintf", 2);
 +        return types::Function::Error;
 +    }
 +
 +    if (in[0]->isDouble() == false)
 +    {
 +        Scierror(999, _("%s: Wrong type for input argument #%d: A Real expected.\n"), "mfprintf", 1);
 +        return types::Function::Error;
 +    }
 +
 +    types::Double* pFileId = in[0]->getAs<types::Double>();
 +    if (pFileId->isScalar() == false || pFileId->isComplex())
 +    {
 +        Scierror(999, _("%s: Wrong type for input argument #%d: A Real expected.\n"), "mfprintf", 1);
 +        return types::Function::Error;
 +    }
 +
 +    if (in[1]->isString() == false)
 +    {
 +        Scierror(999, _("%s: Wrong type for input argument #%d: A String expected.\n"), "mfprintf", 2);
 +        return types::Function::Error;
 +    }
 +
 +    types::String* pFileStr = in[1]->getAs<types::String>();
 +    if (pFileStr->isScalar() == false)
 +    {
 +        Scierror(999, _("%s: Wrong type for input argument #%d: A String expected.\n"), "mfprintf", 2);
 +        return types::Function::Error;
 +    }
 +
 +    for (unsigned int i = 2 ; i < in.size() ; i++)
 +    {
 +        if (in[i]->isDouble() == false && in[i]->isString() == false)
 +        {
 +            ast::ExecVisitor exec;
 +            std::wstring wstFuncName = L"%" + in[i]->getShortTypeStr() + L"_mfprintf";
 +            return Overload::call(wstFuncName, in, _iRetCount, out, &exec);
 +        }
 +    }
 +
 +    // checking ID of file
 +    iFile = static_cast<int>(pFileId->get(0));
 +
 +    if (FileManager::getFile(iFile) == NULL)
 +    {
 +        Scierror(999, _("%s: Wrong file descriptor: %d.\n"), "mfprintf", iFile);
 +        return types::Function::Error;
 +    }
 +
 +    switch (iFile)
 +    {
 +        case 0:
 +#ifdef _MSC_VER
 +            if ((getScilabMode()  == SCILAB_STD) && (forceSTDERRredirect == TRUE))
 +            {
 +                //  Console redirect stderr --> CONOUT$
 +                freopen("CONOUT$", "wb", stderr);
 +                forceSTDERRredirect = FALSE;
 +            }
 +#endif
 +            isSTDErr = TRUE;
 +        case 6:
 +            isSTD = TRUE;
 +            break;
 +        case 5:
 +            Scierror(999, _("%s: Wrong file descriptor: %d.\n"), "mfprintf", iFile);
 +            return types::Function::Error;
 +        default:
 +            isSTD = FALSE;
 +            types::File* pFile = FileManager::getFile(iFile);
 +            // file opened with fortran open function
 +            if (pFile->getFileType() == 1)
 +            {
 +                Scierror(999, _("%s: Wrong file descriptor: %d.\n"), "mfprintf", iFile);
 +                return types::Function::Error;
 +            }
 +            ifileMode = pFile->getFileModeAsInt();
 +            break;
 +    }
 +
 +    /* checks file mode */
 +    /* bug 3898 */
 +    /* read only attrib 1xx*/
-     if ((ifileMode >= 100) && (ifileMode < 200) && !isSTD)
++    if ((ifileMode >= 100) && (ifileMode < 200) && ((ifileMode % 100) < 10) /* check that it is not r+ */ && !isSTD)
 +    {
 +        Scierror(999, _("%s: Wrong file mode: READ only.\n"), "mfprintf");
 +        return types::Function::Error;
 +    }
 +
 +    // Checking input string to write in file
 +    wcsInput = pFileStr->get(0);
 +
 +    for (int i = 0; i < (int)wcslen(wcsInput); i++)
 +    {
 +        if (wcsInput[i] == '%')
 +        {
 +            iNumberPercent++;
 +            if (wcsInput[i + 1] == '%')
 +            {
 +                iNumberPercent--;
 +                i++;
 +            }
 +        }
 +    }
 +
 +    //Input values must be less or equal than excepted
 +    if ((in.size() - 2) > iNumberPercent)
 +    {
 +        Scierror(999, _("%s: Wrong number of input arguments: at most %d expected.\n"), "mprintf", iNumberPercent);
 +        return types::Function::Error;
 +    }
 +
 +    //determine if imput values are ... multiple values
 +
 +    if ( in.size() > 2 )
 +    {
 +        int iRefRows = in[2]->getAs<GenericType>()->getRows();
 +        for (unsigned int i = 2 ; i < in.size() ; i++)
 +        {
 +            //all arguments must have the same numbers of rows !
 +            if (iRefRows != in[i]->getAs<GenericType>()->getRows())
 +            {
 +                Scierror(999, _("%s: Wrong number of input arguments: data doesn't fit with format.\n"), "mprintf");
 +                return types::Function::Error;
 +            }
 +
 +            iNumberCols += in[i]->getAs<GenericType>()->getCols();
 +        }
 +    }
 +
 +    if (iNumberCols != iNumberPercent)
 +    {
 +        Scierror(999, _("%s: Wrong number of input arguments: data doesn't fit with format.\n"), "mprintf");
 +        return types::Function::Error;
 +    }
 +
 +    //fill ArgumentPosition structure
 +    pArgs = new ArgumentPosition[iNumberPercent];
 +    int idx = 0;
 +    for (unsigned int i = 2 ; i < in.size() ; i++)
 +    {
 +        for (int j = 0 ; j < in[i]->getAs<GenericType>()->getCols() ; j++)
 +        {
 +            pArgs[idx].iArg = i;
 +            pArgs[idx].iPos = j;
 +            pArgs[idx].type = in[i]->getType();
 +            idx++;
 +        }
 +    }
 +
 +    int iNewLine = 0;
 +    wcsStringToWrite = scilab_sprintf("mfprintf", wcsInput, in, pArgs, iNumberPercent, &nbrOfLines, &iNewLine);
 +
 +    if (isSTD)
 +    {
 +        for (int i = 0; i < nbrOfLines; i++)
 +        {
 +            if (isSTDErr)
 +            {
 +                std::wcerr << wcsStringToWrite[i];
 +            }
 +            else
 +            {
 +                scilabForcedWriteW(wcsStringToWrite[i]);
 +            }
 +        }
 +        scilabForcedWriteW(L"\n");
 +    }
 +    else
 +    {
 +        int iRet = mputl(iFile, wcsStringToWrite, nbrOfLines, (BOOL)iNewLine); // FALSE = don't add the "\n" at the end.
 +        if (iRet)
 +        {
 +            Scierror(999, _("%s: Error while writing in file: disk full or deleted file.\n"), "mprintf");
 +            return types::Function::Error;
 +        }
 +    }
 +
 +    for (int i = 0; i < nbrOfLines; i++)
 +    {
 +        FREE(wcsStringToWrite[i]);
 +    }
 +
 +    FREE(wcsStringToWrite);
 +    delete[] pArgs;
 +
 +    return types::Function::OK;
 +}
 +/*--------------------------------------------------------------------------*/
  #include <dirent.h>
  #else
  #include <Windows.h>
+ #include <stdio.h>
  #endif
  #include "charEncoding.h"
 -#include "MALLOC.h"
 +#include "sci_malloc.h"
  #include "createdirectory.h"
  #include "isdir.h"
  #include "splitpath.h"
index 68cf2ed,0000000..4dd3be8
mode 100644,000000..100644
--- /dev/null
@@@ -1,87 -1,0 +1,87 @@@
 +/*
 +* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 +* Copyright (C) 2010 - 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
 +* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 +*
 +*/
 +/*--------------------------------------------------------------------------*/
 +#include <string.h>
 +#include <stdio.h>
 +#include "filemanager.hxx"
 +#include "sciprint.h"
 +#include <fcntl.h>
 +
 +extern "C"
 +{
 +#include "mputl.h"
 +#include "sci_malloc.h"
 +#include "charEncoding.h"
 +}
 +/*--------------------------------------------------------------------------*/
 +#define MPUTL_FORMAT "%s\n"
 +/*--------------------------------------------------------------------------*/
 +mputlError mputl(int _iFileId, wchar_t **pstStrings, int _iSizeStrings, BOOL _CR)
 +{
 +    int i = 0;
 +    types::File* pF = NULL;
 +
 +    if (pstStrings == NULL)
 +    {
 +        return MPUTL_ERROR;
 +    }
 +
 +    if (_iFileId == STDIN_ID)
 +    {
 +        return MPUTL_INVALID_FILE_DESCRIPTOR;
 +    }
 +    else
 +    {
 +        pF = FileManager::getFile(_iFileId);
 +        if (pF)
 +        {
 +            // file opened with fortran open function
 +            if (pF->getFileType() == 1)
 +            {
 +                return MPUTL_ERROR;
 +            }
 +
-             if (pF->getFileModeAsInt() >= 100 && pF->getFileModeAsInt() < 200)
++            if ((pF->getFileModeAsInt() >= 100) && (pF->getFileModeAsInt() < 200) && ((pF->getFileModeAsInt() % 100) < 10) /* not r+ */)
 +            {
 +                return MPUTL_NO_WRITE_RIGHT;
 +            }
 +        }
 +        else
 +        {
 +            return MPUTL_INVALID_FILE_DESCRIPTOR;
 +        }
 +    }
 +
 +    for (i = 0; i < _iSizeStrings; i++)
 +    {
 +        char* pstTemp = NULL;
 +        pstTemp = wide_string_to_UTF8(pstStrings[i]);
 +        int iRet = fputs(pstTemp, pF->getFiledesc());
 +        FREE(pstTemp);
 +        if (iRet == -1)
 +        {
 +            return MPUTL_ERROR;
 +        }
 +        if (_CR)
 +        {
 +            iRet = fputs("\n", pF->getFiledesc());
 +            if (iRet == -1)
 +            {
 +                return MPUTL_ERROR;
 +            }
 +        }
 +    }
 +
 +    return MPUTL_NO_ERROR;
 +}
 +/*--------------------------------------------------------------------------*/
 +
@@@ -27,481 -25,463 +27,483 @@@ libscigraphics_la_etc_DATA = 
  #### graphics : datatips sub-module ####
  MACROSDIRSEXT = macros/datatips
  
 -GRAPHICS_C_SOURCES = src/c/GetCommandArg.c \
 -src/c/loadTextRenderingAPI.c \
 -src/c/getHandleProperty/get_figure_position_property.c \
 -src/c/getHandleProperty/get_figure_size_property.c \
 -src/c/getHandleProperty/get_visible_property.c \
 -src/c/getHandleProperty/get_old_style_property.c \
 -src/c/getHandleProperty/get_figures_id_property.c \
 -src/c/getHandleProperty/get_figure_style_property.c \
 -src/c/getHandleProperty/get_pixel_drawing_mode_property.c \
 -src/c/getHandleProperty/get_line_mode_property.c \
 -src/c/getHandleProperty/get_axes_size_property.c \
 -src/c/getHandleProperty/get_thickness_property.c \
 -src/c/getHandleProperty/get_font_foreground_property.c \
 -src/c/getHandleProperty/get_bar_layout_property.c \
 -src/c/getHandleProperty/get_current_axes_property.c \
 -src/c/getHandleProperty/get_bar_width_property.c \
 -src/c/getHandleProperty/get_datatips_property.c \
 -src/c/getHandleProperty/get_font_color_property.c \
 -src/c/getHandleProperty/set_default_axes_property.c \
 -src/c/getHandleProperty/get_default_axes_property.c \
 -src/c/getHandleProperty/get_y_shift_property.c \
 -src/c/getHandleProperty/get_immediate_drawing_property.c \
 -src/c/getHandleProperty/get_current_entity_property.c \
 -src/c/getHandleProperty/get_background_property.c \
 -src/c/getHandleProperty/get_rotation_style_property.c \
 -src/c/getHandleProperty/get_type_property.c \
 -src/c/getHandleProperty/get_current_figure_property.c \
 -src/c/getHandleProperty/get_mark_foreground_property.c \
 -src/c/getHandleProperty/get_default_figure_property.c \
 -src/c/getHandleProperty/get_children_property.c \
 -src/c/getHandleProperty/get_parent_property.c \
 -src/c/getHandleProperty/get_surface_mode_property.c \
 -src/c/getHandleProperty/get_figure_id_property.c \
 -src/c/getHandleProperty/get_mark_mode_property.c \
 -src/c/getHandleProperty/get_interp_color_mode.c \
 -src/c/getHandleProperty/get_font_size_property.c \
 -src/c/getHandleProperty/get_x_shift_property.c \
 -src/c/getHandleProperty/get_z_shift_property.c \
 -src/c/getHandleProperty/get_line_style_property.c \
 -src/c/getHandleProperty/get_foreground_property.c \
 -src/c/getHandleProperty/get_mark_style_property.c \
 -src/c/getHandleProperty/get_color_map_property.c \
 -src/c/getHandleProperty/get_polyline_style_property.c \
 -src/c/getHandleProperty/get_font_angle_property.c \
 -src/c/getHandleProperty/get_interp_color_vector.c \
 -src/c/getHandleProperty/get_figure_name_property.c \
 -src/c/getHandleProperty/get_arrow_size_factor_property.c \
 -src/c/getHandleProperty/get_mark_size_unit_property.c \
 -src/c/getHandleProperty/get_mark_size_property.c \
 -src/c/getHandleProperty/get_mark_offset_property.c \
 -src/c/getHandleProperty/get_mark_stride_property.c \
 -src/c/getHandleProperty/get_mark_background_property.c \
 -src/c/getHandleProperty/get_auto_resize_property.c \
 -src/c/getHandleProperty/get_fill_mode_property.c \
 -src/c/getHandleProperty/get_tight_limits_property.c \
 -src/c/getHandleProperty/get_auto_ticks_property.c \
 -src/c/getHandleProperty/get_x_label_property.c \
 -src/c/getHandleProperty/get_auto_scale_property.c \
 -src/c/getHandleProperty/get_auto_dimensionning_property.c \
 -src/c/getHandleProperty/get_text_box_property.c \
 -src/c/getHandleProperty/get_clip_box_property.c \
 -src/c/getHandleProperty/get_tics_direction_property.c \
 -src/c/getHandleProperty/get_position_property.c \
 -src/c/getHandleProperty/get_y_label_property.c \
 -src/c/getHandleProperty/get_data_property.c \
 -src/c/getHandleProperty/get_auto_clear_property.c \
 -src/c/getHandleProperty/get_title_property.c \
 -src/c/getHandleProperty/get_zoom_state_property.c \
 -src/c/getHandleProperty/get_zoom_box_property.c \
 -src/c/getHandleProperty/get_log_flags_property.c \
 -src/c/getHandleProperty/get_x_location_property.c \
 -src/c/getHandleProperty/get_text_box_mode_property.c \
 -src/c/getHandleProperty/get_y_location_property.c \
 -src/c/getHandleProperty/get_z_label_property.c \
 -src/c/getHandleProperty/get_alignment_property.c \
 -src/c/getHandleProperty/get_font_style_property.c \
 -src/c/getHandleProperty/get_auto_rotation_property.c \
 -src/c/getHandleProperty/get_clip_state_property.c \
 -src/c/getHandleProperty/get_callback_property.c \
 -src/c/getHandleProperty/get_auto_position_property.c \
 -src/c/getHandleProperty/get_closed_property.c \
 -src/c/getHandleProperty/get_text_property.c \
 -src/c/getHandleProperty/get_margins_property.c \
 -src/c/getHandleProperty/get_view_property.c \
 -src/c/getHandleProperty/get_data_bounds_property.c \
 -src/c/getHandleProperty/get_axes_reverse_property.c \
 -src/c/getHandleProperty/get_tics_color_property.c \
 -src/c/getHandleProperty/get_axes_bounds_property.c \
 -src/c/getHandleProperty/get_tics_style_property.c \
 -src/c/getHandleProperty/get_user_data_property.c \
 -src/c/getHandleProperty/get_xtics_coord_property.c \
 -src/c/getHandleProperty/get_color_mode_property.c \
 -src/c/getHandleProperty/get_z_bounds_property.c \
 -src/c/getHandleProperty/get_data_mapping_property.c \
 -src/c/getHandleProperty/get_arrow_size_property.c \
 -src/c/getHandleProperty/get_rotation_angles_property.c \
 -src/c/getHandleProperty/get_callback_type_property.c \
 -src/c/getHandleProperty/get_format_n_property.c \
 -src/c/getHandleProperty/get_color_flag_property.c \
 -src/c/getHandleProperty/get_sub_tics_property.c \
 -src/c/getHandleProperty/get_hidden_axis_color_property.c \
 -src/c/getHandleProperty/get_ytics_coord_property.c \
 -src/c/getHandleProperty/get_labels_font_size_property.c \
 -src/c/getHandleProperty/get_isoview_property.c \
 -src/c/getHandleProperty/get_grid_property.c \
 -src/c/getHandleProperty/get_grid_thickness_property.c \
 -src/c/getHandleProperty/get_grid_style_property.c \
 -src/c/getHandleProperty/get_box_property.c \
 -src/c/getHandleProperty/get_hidden_color_property.c \
 -src/c/getHandleProperty/get_handle_visible_property.c \
 -src/c/getHandleProperty/get_labels_font_color_property.c \
 -src/c/getHandleProperty/get_surface_color_property.c \
 -src/c/getHandleProperty/get_tics_label_property.c \
 -src/c/getHandleProperty/get_labels_font_style_property.c \
 -src/c/getHandleProperty/get_axes_visible_property.c \
 -src/c/getHandleProperty/get_cube_scaling_property.c \
 -src/c/getHandleProperty/get_tics_segment_property.c \
 -src/c/getHandleProperty/get_cdata_mapping_property.c \
 -src/c/getHandleProperty/get_colored_property.c \
 -src/c/getHandleProperty/get_triangles_property.c \
 -src/c/getHandleProperty/get_viewport_property.c \
 -src/c/getHandleProperty/get_info_message_property.c \
 -src/c/getHandleProperty/get_y_ticks_property.c \
 -src/c/getHandleProperty/get_z_ticks_property.c \
 -src/c/getHandleProperty/get_x_ticks_property.c \
 -src/c/getHandleProperty/get_ticks_format_property.c \
 -src/c/getHandleProperty/get_ticks_st_property.c \
 -src/c/getHandleProperty/setGetHashTable.c \
 -src/c/getHandleProperty/get_segs_color_property.c \
 -src/c/getHandleProperty/get_screen_position_property.c \
 -src/c/getHandleProperty/get_event_handler_property.c \
 -src/c/getHandleProperty/get_event_handler_enable_property.c \
 -src/c/getHandleProperty/get_arc_drawing_method_property.c \
 -src/c/getHandleProperty/get_fractional_font_property.c \
 -src/c/getHandleProperty/get_links_property.c \
 -src/c/getHandleProperty/get_legend_location_property.c \
 -src/c/getHandleProperty/get_filled_property.c \
 -src/c/getHandleProperty/get_color_range_property.c \
 -src/c/getHandleProperty/get_outside_colors_property.c \
 -src/c/getHandleProperty/get_grid_position_property.c \
 -src/c/getHandleProperty/get_anti_aliasing_property.c \
 -src/c/getHandleProperty/get_tag_property.c \
 -src/c/getHandleProperty/get_image_type_property.c \
 -src/c/getHandleProperty/get_resize_property.c \
 -src/c/getHandleProperty/get_toolbar_property.c \
 -src/c/getHandleProperty/get_menubar_property.c \
 -src/c/getHandleProperty/get_infobar_property.c \
 -src/c/getHandleProperty/get_dockable_property.c \
 -src/c/getHandleProperty/get_rect_property.c \
 -src/c/getHandleProperty/GetHashTable.c \
 -src/c/graphicModuleLoad.c \
 -src/c/getHandleProperty/set_old_style_property.c \
 -src/c/getHandleProperty/set_figure_name_property.c \
 -src/c/getHandleProperty/getPropertyAssignedValue.c \
 -src/c/getHandleProperty/set_visible_property.c \
 -src/c/getHandleProperty/set_pixel_drawing_mode_property.c \
 -src/c/getHandleProperty/set_interp_color_vector_property.c \
 -src/c/getHandleProperty/set_immediate_drawing_property.c \
 -src/c/getHandleProperty/set_figure_size_property.c \
 -src/c/getHandleProperty/set_background_property.c \
 -src/c/getHandleProperty/set_rotation_style_property.c \
 -src/c/getHandleProperty/set_current_figure_property.c \
 -src/c/getHandleProperty/set_axes_size_property.c \
 -src/c/getHandleProperty/set_default_values_property.c \
 -src/c/getHandleProperty/set_figure_position_property.c \
 -src/c/getHandleProperty/set_color_map_property.c \
 -src/c/getHandleProperty/set_auto_resize_property.c \
 -src/c/getHandleProperty/set_current_axes_property.c \
 -src/c/getHandleProperty/set_current_entity_property.c \
 -src/c/getHandleProperty/set_figure_id_property.c \
 -src/c/getHandleProperty/set_figure_style_property.c \
 -src/c/getHandleProperty/set_mark_size_property.c \
 -src/c/getHandleProperty/set_mark_offset_property.c \
 -src/c/getHandleProperty/set_mark_stride_property.c \
 -src/c/getHandleProperty/set_y_shift_property.c \
 -src/c/getHandleProperty/set_auto_scale_property.c \
 -src/c/getHandleProperty/set_auto_dimensionning_property.c \
 -src/c/getHandleProperty/set_text_box_property.c \
 -src/c/getHandleProperty/set_text_property.c \
 -src/c/getHandleProperty/set_mark_mode_property.c \
 -src/c/getHandleProperty/set_clip_box_property.c \
 -src/c/getHandleProperty/set_z_shift_property.c \
 -src/c/getHandleProperty/set_line_style_property.c \
 -src/c/getHandleProperty/set_polyline_style_property.c \
 -src/c/getHandleProperty/set_line_mode_property.c \
 -src/c/getHandleProperty/set_thickness_property.c \
 -src/c/getHandleProperty/set_font_foreground_property.c \
 -src/c/getHandleProperty/set_text_box_mode_property.c \
 -src/c/getHandleProperty/set_bar_layout_property.c \
 -src/c/getHandleProperty/set_bar_width_property.c \
 -src/c/getHandleProperty/set_datatips_property.c \
 -src/c/getHandleProperty/SetPropertyStatus.c \
 -src/c/getHandleProperty/set_font_style_property.c \
 -src/c/getHandleProperty/set_surface_mode_property.c \
 -src/c/getHandleProperty/set_font_size_property.c \
 -src/c/getHandleProperty/set_mark_style_property.c \
 -src/c/getHandleProperty/set_mark_background_property.c \
 -src/c/getHandleProperty/set_interp_color_mode_property.c \
 -src/c/getHandleProperty/set_data_property.c \
 -src/c/getHandleProperty/set_font_angle_property.c \
 -src/c/getHandleProperty/set_auto_clear_property.c \
 -src/c/getHandleProperty/set_arrow_size_factor_property.c \
 -src/c/getHandleProperty/set_mark_size_unit_property.c \
 -src/c/getHandleProperty/set_zoom_state_property.c \
 -src/c/getHandleProperty/set_fill_mode_property.c \
 -src/c/getHandleProperty/set_zoom_box_property.c \
 -src/c/getHandleProperty/set_font_color_property.c \
 -src/c/getHandleProperty/set_alignment_property.c \
 -src/c/getHandleProperty/set_mark_foreground_property.c \
 -src/c/getHandleProperty/set_clip_state_property.c \
 -src/c/getHandleProperty/set_x_shift_property.c \
 -src/c/getHandleProperty/set_foreground_property.c \
 -src/c/getHandleProperty/set_tics_direction_property.c \
 -src/c/getHandleProperty/set_title_property.c \
 -src/c/getHandleProperty/set_x_location_property.c \
 -src/c/getHandleProperty/set_auto_position_property.c \
 -src/c/getHandleProperty/set_tight_limits_property.c \
 -src/c/getHandleProperty/set_x_label_property.c \
 -src/c/getHandleProperty/set_y_label_property.c \
 -src/c/getHandleProperty/set_y_location_property.c \
 -src/c/getHandleProperty/set_z_label_property.c \
 -src/c/getHandleProperty/set_auto_rotation_property.c \
 -src/c/getHandleProperty/set_callback_property.c \
 -src/c/getHandleProperty/set_closed_property.c \
 -src/c/getHandleProperty/set_cdata_mapping_property.c \
 -src/c/getHandleProperty/set_y_ticks_property.c \
 -src/c/getHandleProperty/set_z_bounds_property.c \
 -src/c/getHandleProperty/set_position_property.c \
 -src/c/getHandleProperty/set_z_ticks_property.c \
 -src/c/getHandleProperty/set_axes_bounds_property.c \
 -src/c/getHandleProperty/set_tics_style_property.c \
 -src/c/getHandleProperty/SetHashTable.c \
 -src/c/getHandleProperty/set_handle_visible_property.c \
 -src/c/getHandleProperty/set_labels_font_color_property.c \
 -src/c/getHandleProperty/set_parent_property.c \
 -src/c/getHandleProperty/set_axes_visible_property.c \
 -src/c/getHandleProperty/set_triangles_property.c \
 -src/c/getHandleProperty/set_tics_color_property.c \
 -src/c/getHandleProperty/set_color_flag_property.c \
 -src/c/getHandleProperty/set_labels_font_size_property.c \
 -src/c/getHandleProperty/set_tics_segment_property.c \
 -src/c/getHandleProperty/set_user_data_property.c \
 -src/c/getHandleProperty/set_view_property.c \
 -src/c/getHandleProperty/set_arrow_size_property.c \
 -src/c/getHandleProperty/set_children_property.c \
 -src/c/getHandleProperty/set_axes_reverse_property.c \
 -src/c/getHandleProperty/set_grid_property.c \
 -src/c/getHandleProperty/set_grid_thickness_property.c \
 -src/c/getHandleProperty/set_grid_style_property.c \
 -src/c/getHandleProperty/set_log_flags_property.c \
 -src/c/getHandleProperty/set_cube_scaling_property.c \
 -src/c/getHandleProperty/set_colored_property.c \
 -src/c/getHandleProperty/set_margins_property.c \
 -src/c/getHandleProperty/set_auto_ticks_property.c \
 -src/c/getHandleProperty/set_xtics_coord_property.c \
 -src/c/getHandleProperty/set_color_mode_property.c \
 -src/c/getHandleProperty/set_data_bounds_property.c \
 -src/c/getHandleProperty/set_tics_labels_property.c \
 -src/c/getHandleProperty/set_data_mapping_property.c \
 -src/c/getHandleProperty/set_rotation_angles_property.c \
 -src/c/getHandleProperty/set_callback_type_property.c \
 -src/c/getHandleProperty/set_segs_color_property.c \
 -src/c/getHandleProperty/set_format_n_property.c \
 -src/c/getHandleProperty/set_sub_tics_property.c \
 -src/c/getHandleProperty/set_hidden_axis_color_property.c \
 -src/c/getHandleProperty/set_isoview_property.c \
 -src/c/getHandleProperty/set_box_property.c \
 -src/c/getHandleProperty/set_hidden_color_property.c \
 -src/c/getHandleProperty/set_label_font_style_property.c \
 -src/c/getHandleProperty/set_surface_color_property.c \
 -src/c/getHandleProperty/set_yticks_coord_property.c \
 -src/c/getHandleProperty/CheckTicksProperty.c \
 -src/c/getHandleProperty/set_x_ticks_property.c \
 -src/c/getHandleProperty/set_ticks_format_property.c \
 -src/c/getHandleProperty/set_ticks_st_property.c \
 -src/c/getHandleProperty/set_viewport_property.c \
 -src/c/getHandleProperty/set_info_message_property.c \
 -src/c/getHandleProperty/set_screen_position_property.c \
 -src/c/getHandleProperty/set_event_handler_property.c \
 -src/c/getHandleProperty/set_event_handler_enable_property.c \
 -src/c/getHandleProperty/set_arc_drawing_method_property.c \
 -src/c/getHandleProperty/set_fractional_font_property.c \
 -src/c/getHandleProperty/set_links_property.c \
 -src/c/getHandleProperty/set_legend_location_property.c \
 -src/c/getHandleProperty/set_filled_property.c \
 -src/c/getHandleProperty/set_color_range_property.c \
 -src/c/getHandleProperty/set_outside_colors_property.c \
 -src/c/getHandleProperty/set_grid_position_property.c \
 -src/c/getHandleProperty/set_anti_aliasing_property.c \
 -src/c/getHandleProperty/set_tag_property.c \
 -src/c/getHandleProperty/set_figure_resizefcn_property.c \
 -src/c/getHandleProperty/get_figure_resizefcn_property.c \
 -src/c/getHandleProperty/set_figure_closerequestfcn_property.c \
 -src/c/getHandleProperty/get_figure_closerequestfcn_property.c \
 -src/c/getHandleProperty/get_datatip_property.c \
 -src/c/getHandleProperty/set_datatip_property.c \
 -src/c/getHandleProperty/set_image_type_property.c \
 -src/c/getHandleProperty/get_display_function_data_property.c \
 -src/c/getHandleProperty/set_display_function_data_property.c \
 -src/c/getHandleProperty/set_resize_property.c \
 -src/c/getHandleProperty/set_toolbar_property.c \
 -src/c/getHandleProperty/set_menubar_property.c \
 -src/c/getHandleProperty/set_infobar_property.c \
 -src/c/getHandleProperty/set_dockable_property.c \
 -src/c/getHandleProperty/get_layout_property.c \
 -src/c/getHandleProperty/set_layout_property.c \
 -src/c/getHandleProperty/get_constraints_property.c \
 -src/c/getHandleProperty/set_constraints_property.c \
 -src/c/getHandleProperty/set_rect_property.c \
 -src/c/getHandleProperty/get_layout_options_property.c \
 -src/c/getHandleProperty/set_layout_options_property.c \
 -src/c/getHandleProperty/get_border_property.c \
 -src/c/getHandleProperty/set_border_property.c \
 -src/c/getHandleProperty/get_groupname_property.c \
 -src/c/getHandleProperty/set_groupname_property.c \
 -src/c/getHandleProperty/get_tabtitle_property.c \
 -src/c/getHandleProperty/set_tabtitle_property.c \
 -src/c/getHandleProperty/get_scrollable_property.c \
 -src/c/getHandleProperty/set_scrollable_property.c \
 -src/c/getHandleProperty/get_marks_count_property.c \
 -src/c/getHandleProperty/set_marks_count_property.c \
 -src/c/getHandleProperty/get_line_width_property.c \
 -src/c/getHandleProperty/set_line_width_property.c \
 -src/c/DefaultCommandArg.c \
 -src/c/Axes.c \
 -src/c/sciMatrix.c \
 -src/c/DrawObjects.c \
 -src/c/GetProperty.c \
 -src/c/Contour.c \
 -src/c/SetProperty.c \
 -src/c/BasicAlgos.c \
 -src/c/BuildObjects.c \
 -src/c/sciCall.c \
 -src/c/CloneObjects.c \
 -src/c/InitObjects.c \
 -src/c/pixel_mode.c \
 -src/c/Format.c \
 -src/c/Champ.c \
 -src/c/StringMatrix.c \
 -src/c/FeC.c \
 -src/c/Plo2dEch.c \
 -src/c/Plo2dn.c \
 -src/c/Gray.c \
 -src/c/DestroyObjects.c \
 -src/c/math_graphics.c \
 -src/c/Interaction.c \
 -src/c/StringBox.c \
 -src/c/axesScale.c \
 -src/c/TerminateGraphics.c \
 -src/c/periEmpty.c \
 -src/c/scitokenize.c \
 -src/c/get_ticks_utils.c \
 -src/c/getHandleProperty/get_ambient_color_property.c \
 -src/c/getHandleProperty/get_diffuse_color_property.c \
 -src/c/getHandleProperty/get_specular_color_property.c \
 -src/c/getHandleProperty/get_use_color_material_property.c \
 -src/c/getHandleProperty/get_material_shininess_property.c \
 -src/c/getHandleProperty/get_light_type_property.c \
 -src/c/getHandleProperty/get_direction_property.c \
 -src/c/getHandleProperty/set_ambient_color_property.c \
 -src/c/getHandleProperty/set_diffuse_color_property.c \
 -src/c/getHandleProperty/set_specular_color_property.c \
 -src/c/getHandleProperty/set_use_color_material_property.c \
 -src/c/getHandleProperty/set_material_shininess_property.c \
 -src/c/getHandleProperty/set_light_type_property.c \
 -src/c/getHandleProperty/set_direction_property.c \
 -src/c/getHandleProperty/set_auto_margins_property.c \
 -src/c/getHandleProperty/get_auto_margins_property.c \
 -src/c/name2rgb.c \
 -src/c/addColor.c
 +GRAPHICS_C_SOURCES = \
 +    src/c/GetCommandArg.c \
 +    src/c/loadTextRenderingAPI.c \
 +    src/c/getHandleProperty/get_figure_position_property.c \
 +    src/c/getHandleProperty/get_figure_size_property.c \
 +    src/c/getHandleProperty/get_visible_property.c \
 +    src/c/getHandleProperty/get_old_style_property.c \
 +    src/c/getHandleProperty/get_figures_id_property.c \
 +    src/c/getHandleProperty/get_figure_style_property.c \
 +    src/c/getHandleProperty/get_pixel_drawing_mode_property.c \
 +    src/c/getHandleProperty/get_line_mode_property.c \
 +    src/c/getHandleProperty/get_axes_size_property.c \
 +    src/c/getHandleProperty/get_thickness_property.c \
 +    src/c/getHandleProperty/get_font_foreground_property.c \
 +    src/c/getHandleProperty/get_bar_layout_property.c \
 +    src/c/getHandleProperty/get_current_axes_property.c \
 +    src/c/getHandleProperty/get_bar_width_property.c \
 +    src/c/getHandleProperty/get_datatips_property.c \
 +    src/c/getHandleProperty/get_font_color_property.c \
 +    src/c/getHandleProperty/set_default_axes_property.c \
 +    src/c/getHandleProperty/get_default_axes_property.c \
 +    src/c/getHandleProperty/get_y_shift_property.c \
 +    src/c/getHandleProperty/get_immediate_drawing_property.c \
 +    src/c/getHandleProperty/get_current_entity_property.c \
 +    src/c/getHandleProperty/get_background_property.c \
 +    src/c/getHandleProperty/get_rotation_style_property.c \
 +    src/c/getHandleProperty/get_type_property.c \
 +    src/c/getHandleProperty/get_current_figure_property.c \
 +    src/c/getHandleProperty/get_mark_foreground_property.c \
 +    src/c/getHandleProperty/get_default_figure_property.c \
 +    src/c/getHandleProperty/get_children_property.c \
 +    src/c/getHandleProperty/get_parent_property.c \
 +    src/c/getHandleProperty/get_surface_mode_property.c \
 +    src/c/getHandleProperty/get_figure_id_property.c \
 +    src/c/getHandleProperty/get_mark_mode_property.c \
 +    src/c/getHandleProperty/get_interp_color_mode.c \
 +    src/c/getHandleProperty/get_font_size_property.c \
 +    src/c/getHandleProperty/get_x_shift_property.c \
 +    src/c/getHandleProperty/get_z_shift_property.c \
 +    src/c/getHandleProperty/get_line_style_property.c \
 +    src/c/getHandleProperty/get_foreground_property.c \
 +    src/c/getHandleProperty/get_mark_style_property.c \
 +    src/c/getHandleProperty/get_color_map_property.c \
 +    src/c/getHandleProperty/get_polyline_style_property.c \
 +    src/c/getHandleProperty/get_font_angle_property.c \
 +    src/c/getHandleProperty/get_interp_color_vector.c \
 +    src/c/getHandleProperty/get_figure_name_property.c \
 +    src/c/getHandleProperty/get_arrow_size_factor_property.c \
 +    src/c/getHandleProperty/get_mark_size_unit_property.c \
 +    src/c/getHandleProperty/get_mark_size_property.c \
 +    src/c/getHandleProperty/get_mark_offset_property.c \
 +    src/c/getHandleProperty/get_mark_stride_property.c \
 +    src/c/getHandleProperty/get_mark_background_property.c \
 +    src/c/getHandleProperty/get_auto_resize_property.c \
 +    src/c/getHandleProperty/get_fill_mode_property.c \
 +    src/c/getHandleProperty/get_tight_limits_property.c \
 +    src/c/getHandleProperty/get_auto_ticks_property.c \
 +    src/c/getHandleProperty/get_x_label_property.c \
 +    src/c/getHandleProperty/get_auto_scale_property.c \
 +    src/c/getHandleProperty/get_auto_dimensionning_property.c \
 +    src/c/getHandleProperty/get_text_box_property.c \
 +    src/c/getHandleProperty/get_clip_box_property.c \
 +    src/c/getHandleProperty/get_tics_direction_property.c \
 +    src/c/getHandleProperty/get_position_property.c \
 +    src/c/getHandleProperty/get_y_label_property.c \
 +    src/c/getHandleProperty/get_data_property.c \
 +    src/c/getHandleProperty/get_auto_clear_property.c \
 +    src/c/getHandleProperty/get_title_property.c \
 +    src/c/getHandleProperty/get_zoom_state_property.c \
 +    src/c/getHandleProperty/get_zoom_box_property.c \
 +    src/c/getHandleProperty/get_log_flags_property.c \
 +    src/c/getHandleProperty/get_x_location_property.c \
 +    src/c/getHandleProperty/get_text_box_mode_property.c \
 +    src/c/getHandleProperty/get_y_location_property.c \
 +    src/c/getHandleProperty/get_z_label_property.c \
 +    src/c/getHandleProperty/get_alignment_property.c \
 +    src/c/getHandleProperty/get_font_style_property.c \
 +    src/c/getHandleProperty/get_auto_rotation_property.c \
 +    src/c/getHandleProperty/get_clip_state_property.c \
 +    src/c/getHandleProperty/get_callback_property.c \
 +    src/c/getHandleProperty/get_auto_position_property.c \
 +    src/c/getHandleProperty/get_closed_property.c \
 +    src/c/getHandleProperty/get_text_property.c \
 +    src/c/getHandleProperty/get_margins_property.c \
 +    src/c/getHandleProperty/get_view_property.c \
 +    src/c/getHandleProperty/get_data_bounds_property.c \
 +    src/c/getHandleProperty/get_axes_reverse_property.c \
 +    src/c/getHandleProperty/get_tics_color_property.c \
 +    src/c/getHandleProperty/get_axes_bounds_property.c \
 +    src/c/getHandleProperty/get_tics_style_property.c \
 +    src/c/getHandleProperty/get_user_data_property.c \
 +    src/c/getHandleProperty/get_xtics_coord_property.c \
 +    src/c/getHandleProperty/get_color_mode_property.c \
 +    src/c/getHandleProperty/get_z_bounds_property.c \
 +    src/c/getHandleProperty/get_data_mapping_property.c \
 +    src/c/getHandleProperty/get_arrow_size_property.c \
 +    src/c/getHandleProperty/get_rotation_angles_property.c \
 +    src/c/getHandleProperty/get_callback_type_property.c \
 +    src/c/getHandleProperty/get_format_n_property.c \
 +    src/c/getHandleProperty/get_color_flag_property.c \
 +    src/c/getHandleProperty/get_sub_tics_property.c \
 +    src/c/getHandleProperty/get_hidden_axis_color_property.c \
 +    src/c/getHandleProperty/get_ytics_coord_property.c \
 +    src/c/getHandleProperty/get_labels_font_size_property.c \
 +    src/c/getHandleProperty/get_isoview_property.c \
 +    src/c/getHandleProperty/get_grid_property.c \
 +    src/c/getHandleProperty/get_grid_thickness_property.c \
 +    src/c/getHandleProperty/get_grid_style_property.c \
 +    src/c/getHandleProperty/get_box_property.c \
 +    src/c/getHandleProperty/get_hidden_color_property.c \
 +    src/c/getHandleProperty/get_handle_visible_property.c \
 +    src/c/getHandleProperty/get_labels_font_color_property.c \
 +    src/c/getHandleProperty/get_surface_color_property.c \
 +    src/c/getHandleProperty/get_tics_label_property.c \
 +    src/c/getHandleProperty/get_labels_font_style_property.c \
 +    src/c/getHandleProperty/get_axes_visible_property.c \
 +    src/c/getHandleProperty/get_cube_scaling_property.c \
 +    src/c/getHandleProperty/get_tics_segment_property.c \
 +    src/c/getHandleProperty/get_cdata_mapping_property.c \
 +    src/c/getHandleProperty/get_colored_property.c \
 +    src/c/getHandleProperty/get_triangles_property.c \
 +    src/c/getHandleProperty/get_viewport_property.c \
 +    src/c/getHandleProperty/get_info_message_property.c \
 +    src/c/getHandleProperty/get_y_ticks_property.c \
 +    src/c/getHandleProperty/get_z_ticks_property.c \
 +    src/c/getHandleProperty/get_x_ticks_property.c \
 +    src/c/getHandleProperty/get_ticks_format_property.c \
 +    src/c/getHandleProperty/get_ticks_st_property.c \
 +    src/c/getHandleProperty/setGetHashTable.c \
 +    src/c/getHandleProperty/get_segs_color_property.c \
 +    src/c/getHandleProperty/get_screen_position_property.c \
 +    src/c/getHandleProperty/get_event_handler_property.c \
 +    src/c/getHandleProperty/get_event_handler_enable_property.c \
 +    src/c/getHandleProperty/get_arc_drawing_method_property.c \
 +    src/c/getHandleProperty/get_fractional_font_property.c \
 +    src/c/getHandleProperty/get_links_property.c \
 +    src/c/getHandleProperty/get_legend_location_property.c \
 +    src/c/getHandleProperty/get_filled_property.c \
 +    src/c/getHandleProperty/get_color_range_property.c \
 +    src/c/getHandleProperty/get_outside_colors_property.c \
 +    src/c/getHandleProperty/get_grid_position_property.c \
 +    src/c/getHandleProperty/get_anti_aliasing_property.c \
 +    src/c/getHandleProperty/get_tag_property.c \
 +    src/c/getHandleProperty/get_image_type_property.c \
 +    src/c/getHandleProperty/get_resize_property.c \
 +    src/c/getHandleProperty/get_toolbar_property.c \
 +    src/c/getHandleProperty/get_menubar_property.c \
 +    src/c/getHandleProperty/get_infobar_property.c \
 +    src/c/getHandleProperty/get_dockable_property.c \
 +    src/c/getHandleProperty/get_rect_property.c \
 +    src/c/getHandleProperty/GetHashTable.c \
 +    src/c/graphicModuleLoad.c \
 +    src/c/getHandleProperty/set_old_style_property.c \
 +    src/c/getHandleProperty/set_figure_name_property.c \
 +    src/c/getHandleProperty/getPropertyAssignedValue.c \
 +    src/c/getHandleProperty/set_visible_property.c \
 +    src/c/getHandleProperty/set_pixel_drawing_mode_property.c \
 +    src/c/getHandleProperty/set_interp_color_vector_property.c \
 +    src/c/getHandleProperty/set_immediate_drawing_property.c \
 +    src/c/getHandleProperty/set_figure_size_property.c \
 +    src/c/getHandleProperty/set_background_property.c \
 +    src/c/getHandleProperty/set_rotation_style_property.c \
 +    src/c/getHandleProperty/set_current_figure_property.c \
 +    src/c/getHandleProperty/set_axes_size_property.c \
 +    src/c/getHandleProperty/set_default_values_property.c \
 +    src/c/getHandleProperty/set_figure_position_property.c \
 +    src/c/getHandleProperty/set_color_map_property.c \
 +    src/c/getHandleProperty/set_auto_resize_property.c \
 +    src/c/getHandleProperty/set_current_axes_property.c \
 +    src/c/getHandleProperty/set_current_entity_property.c \
 +    src/c/getHandleProperty/set_figure_id_property.c \
 +    src/c/getHandleProperty/set_figure_style_property.c \
 +    src/c/getHandleProperty/set_mark_size_property.c \
 +    src/c/getHandleProperty/set_mark_offset_property.c \
 +    src/c/getHandleProperty/set_mark_stride_property.c \
 +    src/c/getHandleProperty/set_y_shift_property.c \
 +    src/c/getHandleProperty/set_auto_scale_property.c \
 +    src/c/getHandleProperty/set_auto_dimensionning_property.c \
 +    src/c/getHandleProperty/set_text_box_property.c \
 +    src/c/getHandleProperty/set_text_property.c \
 +    src/c/getHandleProperty/set_mark_mode_property.c \
 +    src/c/getHandleProperty/set_clip_box_property.c \
 +    src/c/getHandleProperty/set_z_shift_property.c \
 +    src/c/getHandleProperty/set_line_style_property.c \
 +    src/c/getHandleProperty/set_polyline_style_property.c \
 +    src/c/getHandleProperty/set_line_mode_property.c \
 +    src/c/getHandleProperty/set_thickness_property.c \
 +    src/c/getHandleProperty/set_font_foreground_property.c \
 +    src/c/getHandleProperty/set_text_box_mode_property.c \
 +    src/c/getHandleProperty/set_bar_layout_property.c \
 +    src/c/getHandleProperty/set_bar_width_property.c \
 +    src/c/getHandleProperty/set_datatips_property.c \
 +    src/c/getHandleProperty/SetPropertyStatus.c \
 +    src/c/getHandleProperty/set_font_style_property.c \
 +    src/c/getHandleProperty/set_surface_mode_property.c \
 +    src/c/getHandleProperty/set_font_size_property.c \
 +    src/c/getHandleProperty/set_mark_style_property.c \
 +    src/c/getHandleProperty/set_mark_background_property.c \
 +    src/c/getHandleProperty/set_interp_color_mode_property.c \
 +    src/c/getHandleProperty/set_font_angle_property.c \
 +    src/c/getHandleProperty/set_auto_clear_property.c \
 +    src/c/getHandleProperty/set_arrow_size_factor_property.c \
 +    src/c/getHandleProperty/set_mark_size_unit_property.c \
 +    src/c/getHandleProperty/set_zoom_state_property.c \
 +    src/c/getHandleProperty/set_fill_mode_property.c \
 +    src/c/getHandleProperty/set_zoom_box_property.c \
 +    src/c/getHandleProperty/set_font_color_property.c \
 +    src/c/getHandleProperty/set_alignment_property.c \
 +    src/c/getHandleProperty/set_mark_foreground_property.c \
 +    src/c/getHandleProperty/set_clip_state_property.c \
 +    src/c/getHandleProperty/set_x_shift_property.c \
 +    src/c/getHandleProperty/set_foreground_property.c \
 +    src/c/getHandleProperty/set_tics_direction_property.c \
 +    src/c/getHandleProperty/set_title_property.c \
 +    src/c/getHandleProperty/set_x_location_property.c \
 +    src/c/getHandleProperty/set_auto_position_property.c \
 +    src/c/getHandleProperty/set_tight_limits_property.c \
 +    src/c/getHandleProperty/set_x_label_property.c \
 +    src/c/getHandleProperty/set_y_label_property.c \
 +    src/c/getHandleProperty/set_y_location_property.c \
 +    src/c/getHandleProperty/set_z_label_property.c \
 +    src/c/getHandleProperty/set_auto_rotation_property.c \
 +    src/c/getHandleProperty/set_callback_property.c \
 +    src/c/getHandleProperty/set_closed_property.c \
 +    src/c/getHandleProperty/set_cdata_mapping_property.c \
 +    src/c/getHandleProperty/set_y_ticks_property.c \
 +    src/c/getHandleProperty/set_z_bounds_property.c \
 +    src/c/getHandleProperty/set_position_property.c \
 +    src/c/getHandleProperty/set_z_ticks_property.c \
 +    src/c/getHandleProperty/set_axes_bounds_property.c \
 +    src/c/getHandleProperty/set_tics_style_property.c \
 +    src/c/getHandleProperty/SetHashTable.c \
 +    src/c/getHandleProperty/set_handle_visible_property.c \
 +    src/c/getHandleProperty/set_labels_font_color_property.c \
 +    src/c/getHandleProperty/set_parent_property.c \
 +    src/c/getHandleProperty/set_axes_visible_property.c \
 +    src/c/getHandleProperty/set_triangles_property.c \
 +    src/c/getHandleProperty/set_tics_color_property.c \
 +    src/c/getHandleProperty/set_color_flag_property.c \
 +    src/c/getHandleProperty/set_labels_font_size_property.c \
 +    src/c/getHandleProperty/set_tics_segment_property.c \
 +    src/c/getHandleProperty/set_user_data_property.c \
 +    src/c/getHandleProperty/set_view_property.c \
 +    src/c/getHandleProperty/set_arrow_size_property.c \
 +    src/c/getHandleProperty/set_children_property.c \
 +    src/c/getHandleProperty/set_axes_reverse_property.c \
 +    src/c/getHandleProperty/set_grid_property.c \
 +    src/c/getHandleProperty/set_grid_thickness_property.c \
 +    src/c/getHandleProperty/set_grid_style_property.c \
 +    src/c/getHandleProperty/set_log_flags_property.c \
 +    src/c/getHandleProperty/set_cube_scaling_property.c \
 +    src/c/getHandleProperty/set_colored_property.c \
 +    src/c/getHandleProperty/set_margins_property.c \
 +    src/c/getHandleProperty/set_auto_ticks_property.c \
 +    src/c/getHandleProperty/set_xtics_coord_property.c \
 +    src/c/getHandleProperty/set_color_mode_property.c \
 +    src/c/getHandleProperty/set_data_bounds_property.c \
 +    src/c/getHandleProperty/set_tics_labels_property.c \
 +    src/c/getHandleProperty/set_data_mapping_property.c \
 +    src/c/getHandleProperty/set_rotation_angles_property.c \
 +    src/c/getHandleProperty/set_callback_type_property.c \
 +    src/c/getHandleProperty/set_segs_color_property.c \
 +    src/c/getHandleProperty/set_format_n_property.c \
 +    src/c/getHandleProperty/set_sub_tics_property.c \
 +    src/c/getHandleProperty/set_hidden_axis_color_property.c \
 +    src/c/getHandleProperty/set_isoview_property.c \
 +    src/c/getHandleProperty/set_box_property.c \
 +    src/c/getHandleProperty/set_hidden_color_property.c \
 +    src/c/getHandleProperty/set_label_font_style_property.c \
 +    src/c/getHandleProperty/set_surface_color_property.c \
 +    src/c/getHandleProperty/set_yticks_coord_property.c \
 +    src/c/getHandleProperty/CheckTicksProperty.c \
 +    src/c/getHandleProperty/set_x_ticks_property.c \
 +    src/c/getHandleProperty/set_ticks_format_property.c \
 +    src/c/getHandleProperty/set_ticks_st_property.c \
 +    src/c/getHandleProperty/set_viewport_property.c \
 +    src/c/getHandleProperty/set_info_message_property.c \
 +    src/c/getHandleProperty/set_screen_position_property.c \
 +    src/c/getHandleProperty/set_event_handler_property.c \
 +    src/c/getHandleProperty/set_event_handler_enable_property.c \
 +    src/c/getHandleProperty/set_arc_drawing_method_property.c \
 +    src/c/getHandleProperty/set_fractional_font_property.c \
 +    src/c/getHandleProperty/set_links_property.c \
 +    src/c/getHandleProperty/set_legend_location_property.c \
 +    src/c/getHandleProperty/set_filled_property.c \
 +    src/c/getHandleProperty/set_color_range_property.c \
 +    src/c/getHandleProperty/set_outside_colors_property.c \
 +    src/c/getHandleProperty/set_grid_position_property.c \
 +    src/c/getHandleProperty/set_anti_aliasing_property.c \
 +    src/c/getHandleProperty/set_tag_property.c \
 +    src/c/getHandleProperty/set_figure_resizefcn_property.c \
 +    src/c/getHandleProperty/get_figure_resizefcn_property.c \
 +    src/c/getHandleProperty/set_figure_closerequestfcn_property.c \
 +    src/c/getHandleProperty/get_figure_closerequestfcn_property.c \
 +    src/c/getHandleProperty/get_datatip_property.c \
 +    src/c/getHandleProperty/set_datatip_property.c \
 +    src/c/getHandleProperty/set_image_type_property.c \
 +    src/c/getHandleProperty/get_display_function_data_property.c \
 +    src/c/getHandleProperty/set_display_function_data_property.c \
 +    src/c/getHandleProperty/set_resize_property.c \
 +    src/c/getHandleProperty/set_toolbar_property.c \
 +    src/c/getHandleProperty/set_menubar_property.c \
 +    src/c/getHandleProperty/set_infobar_property.c \
 +    src/c/getHandleProperty/set_dockable_property.c \
 +    src/c/getHandleProperty/get_layout_property.c \
 +    src/c/getHandleProperty/set_layout_property.c \
 +    src/c/getHandleProperty/get_constraints_property.c \
 +    src/c/getHandleProperty/set_constraints_property.c \
 +    src/c/getHandleProperty/set_rect_property.c \
 +    src/c/getHandleProperty/get_layout_options_property.c \
 +    src/c/getHandleProperty/set_layout_options_property.c \
 +    src/c/getHandleProperty/get_border_property.cpp \
 +    src/c/getHandleProperty/set_border_property.c \
 +    src/c/getHandleProperty/get_groupname_property.c \
 +    src/c/getHandleProperty/set_groupname_property.c \
 +    src/c/getHandleProperty/get_tabtitle_property.c \
 +    src/c/getHandleProperty/set_tabtitle_property.c \
 +    src/c/getHandleProperty/get_scrollable_property.c \
 +    src/c/getHandleProperty/set_scrollable_property.c \
 +    src/c/getHandleProperty/get_marks_count_property.c \
 +    src/c/getHandleProperty/set_marks_count_property.c \
 +    src/c/getHandleProperty/get_line_width_property.c \
 +    src/c/getHandleProperty/set_line_width_property.c \
 +    src/c/DefaultCommandArg.c \
 +    src/c/Axes.c \
 +    src/c/sciMatrix.c \
 +    src/c/DrawObjects.c \
 +    src/c/GetProperty.c \
 +    src/c/Contour.c \
 +    src/c/SetProperty.c \
 +    src/c/BasicAlgos.c \
 +    src/c/BuildObjects.c \
 +    src/c/sciCall.c \
 +    src/c/CloneObjects.c \
 +    src/c/InitObjects.c \
 +    src/c/pixel_mode.c \
 +    src/c/Format.c \
 +    src/c/Champ.c \
 +    src/c/StringMatrix.c \
 +    src/c/FeC.c \
 +    src/c/Plo2dEch.c \
 +    src/c/Plo2dn.c \
 +    src/c/Gray.c \
 +    src/c/DestroyObjects.c \
 +    src/c/math_graphics.c \
 +    src/c/Interaction.c \
 +    src/c/StringBox.c \
 +    src/c/axesScale.c \
 +    src/c/TerminateGraphics.c \
 +    src/c/periEmpty.c \
 +    src/c/scitokenize.c \
 +    src/c/get_ticks_utils.c \
 +    src/c/getHandleProperty/get_ambient_color_property.c \
 +    src/c/getHandleProperty/get_diffuse_color_property.c \
 +    src/c/getHandleProperty/get_specular_color_property.c \
 +    src/c/getHandleProperty/get_use_color_material_property.c \
 +    src/c/getHandleProperty/get_material_shininess_property.c \
 +    src/c/getHandleProperty/get_light_type_property.c \
 +    src/c/getHandleProperty/get_direction_property.c \
 +    src/c/getHandleProperty/set_ambient_color_property.c \
 +    src/c/getHandleProperty/set_diffuse_color_property.c \
 +    src/c/getHandleProperty/set_specular_color_property.c \
 +    src/c/getHandleProperty/set_use_color_material_property.c \
 +    src/c/getHandleProperty/set_material_shininess_property.c \
 +    src/c/getHandleProperty/set_light_type_property.c \
 +    src/c/getHandleProperty/set_direction_property.c \
 +    src/c/getHandleProperty/set_auto_margins_property.c \
 +    src/c/getHandleProperty/get_auto_margins_property.c \
 +    src/c/name2rgb.c \
 +    src/c/addColor.c
  
 -GATEWAY_C_SOURCES = sci_gateway/c/sci_swap_handles.c \
 -sci_gateway/c/sci_grayplot.c \
 -sci_gateway/c/sci_matplot1.c \
 -sci_gateway/c/sci_xfpolys.c \
 -sci_gateway/c/sci_xget.c \
 -sci_gateway/c/sci_newaxes.c \
 -sci_gateway/c/sci_xlfont.c \
 -sci_gateway/c/sci_xgraduate.c \
 -sci_gateway/c/sci_xgrid.c \
 -sci_gateway/c/sci_xclick.c \
 -sci_gateway/c/sci_geom3d.c \
 -sci_gateway/c/sci_xset.c \
 -sci_gateway/c/sci_unzoom.c \
 -sci_gateway/c/sci_xsegs.c \
 -sci_gateway/c/sci_glue.c \
 -sci_gateway/c/sci_xarc.c \
 -sci_gateway/c/sci_xpolys.c \
 -sci_gateway/c/sci_xstring.c \
 -sci_gateway/c/sci_xstringb.c \
 -sci_gateway/c/sci_show_window.c \
 -sci_gateway/c/sci_param3d1.c \
 -sci_gateway/c/sci_xname.c \
 -sci_gateway/c/sci_xpoly.c \
 -sci_gateway/c/sci_xchange.c \
 -sci_gateway/c/sci_matplot.c \
 -sci_gateway/c/sci_drawaxis.c \
 -sci_gateway/c/sci_demo.c \
 -sci_gateway/c/sci_plot2d1.c \
 -sci_gateway/c/sci_xrect.c \
 -sci_gateway/c/sci_xarrows.c \
 -sci_gateway/c/sci_plot3d.c \
 -sci_gateway/c/sci_move.c \
 -sci_gateway/c/sci_copy.c \
 -sci_gateway/c/sci_get.c \
 -sci_gateway/c/sci_xarcs.c \
 -sci_gateway/c/sci_xfpoly.c \
 -sci_gateway/c/sci_drawlater.c \
 -sci_gateway/c/sci_champ.c \
 -sci_gateway/c/sci_set.c \
 -sci_gateway/c/sci_unglue.c \
 -sci_gateway/c/gw_graphics.c \
 -sci_gateway/c/sci_zoom_rect.c \
 -sci_gateway/c/sci_delete.c \
 -sci_gateway/c/sci_plot2d.c \
 -sci_gateway/c/sci_xrects.c \
 -sci_gateway/c/sci_xtitle.c \
 -sci_gateway/c/sci_StringBox.c \
 -sci_gateway/c/sci_xgetmouse.c \
 -sci_gateway/c/sci_drawnow.c \
 -sci_gateway/c/sci_xfarcs.c \
 -sci_gateway/c/sci_param3d.c \
 -sci_gateway/c/sci_contour2di.c \
 -sci_gateway/c/sci_xdel.c \
 -sci_gateway/c/sci_winsid.c \
 -sci_gateway/c/sci_fec.c \
 -sci_gateway/c/sci_rubberbox.c \
 -sci_gateway/c/sci_rotate_axes.c \
 -sci_gateway/c/sci_is_handle_valid.c \
 -sci_gateway/c/sci_Legend.c \
 -sci_gateway/c/sci_light.c \
 -sci_gateway/c/sci_color.c \
 -sci_gateway/c/sci_name2rgb.c \
 -sci_gateway/c/sci_addcolor.c
 +GRAPHICS_CXX_SOURCES = \
 +    src/cpp/configgraphicvariable.cpp \
-     src/cpp/set_data_property.cpp
++    src/cpp/set_data_property.cpp \
++    src/cpp/ContourOnMesh.cpp
  
 -GRAPHICS_CXX_SOURCES = src/cpp/ContourOnMesh.cpp
 +GATEWAY_C_SOURCES = \
 +    sci_gateway/c/sci_swap_handles.c \
 +    sci_gateway/c/sci_grayplot.c \
 +    sci_gateway/c/sci_xfpolys.c \
 +    sci_gateway/c/sci_newaxes.c \
 +    sci_gateway/c/sci_xlfont.c \
 +    sci_gateway/c/sci_xgraduate.c \
 +    sci_gateway/c/sci_xgrid.c \
 +    sci_gateway/c/sci_xclick.c \
 +    sci_gateway/c/sci_geom3d.c \
 +    sci_gateway/c/sci_unzoom.c \
 +    sci_gateway/c/sci_xsegs.c \
 +    sci_gateway/c/sci_glue.c \
 +    sci_gateway/c/sci_xarc.c \
 +    sci_gateway/c/sci_xpolys.c \
 +    sci_gateway/c/sci_xstring.c \
 +    sci_gateway/c/sci_xstringb.c \
 +    sci_gateway/c/sci_show_window.c \
 +    sci_gateway/c/sci_param3d1.c \
 +    sci_gateway/c/sci_xname.c \
 +    sci_gateway/c/sci_xpoly.c \
 +    sci_gateway/c/sci_xchange.c \
 +    sci_gateway/c/sci_drawaxis.c \
 +    sci_gateway/c/sci_demo.c \
 +    sci_gateway/c/sci_plot2d1.c \
 +    sci_gateway/c/sci_xrect.c \
 +    sci_gateway/c/sci_xarrows.c \
 +    sci_gateway/c/sci_plot3d.c \
 +    sci_gateway/c/sci_move.c \
 +    sci_gateway/c/sci_copy.c \
 +    sci_gateway/c/sci_xarcs.c \
 +    sci_gateway/c/sci_xfpoly.c \
 +    sci_gateway/c/sci_drawlater.c \
 +    sci_gateway/c/sci_champ.c \
 +    sci_gateway/c/sci_unglue.c \
 +    sci_gateway/c/gw_graphics.c \
 +    sci_gateway/c/sci_zoom_rect.c \
 +    sci_gateway/c/sci_delete.c \
 +    sci_gateway/c/sci_plot2d.c \
 +    sci_gateway/c/sci_xrects.c \
 +    sci_gateway/c/sci_xtitle.c \
 +    sci_gateway/c/sci_StringBox.c \
 +    sci_gateway/c/sci_xgetmouse.c \
 +    sci_gateway/c/sci_drawnow.c \
 +    sci_gateway/c/sci_xfarcs.c \
 +    sci_gateway/c/sci_param3d.c \
 +    sci_gateway/c/sci_contour2di.c \
 +    sci_gateway/c/sci_xdel.c \
 +    sci_gateway/c/sci_fec.c \
 +    sci_gateway/c/sci_set.c \
 +    sci_gateway/c/sci_rubberbox.c \
 +    sci_gateway/c/sci_rotate_axes.c \
 +    sci_gateway/c/sci_is_handle_valid.c \
 +    sci_gateway/c/sci_Legend.c \
 +    sci_gateway/c/sci_light.c \
 +    sci_gateway/c/sci_color.c \
 +    sci_gateway/c/sci_name2rgb.c \
 +    sci_gateway/c/sci_addcolor.c
  
 -GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_contour2dm.cpp
 +GATEWAY_CXX_SOURCES = \
 +    sci_gateway/cpp/graphics_gw.cpp \
 +    sci_gateway/cpp/sci_get.cpp \
 +    sci_gateway/cpp/sci_xget.cpp \
 +    sci_gateway/cpp/sci_xset.cpp \
 +    sci_gateway/cpp/sci_matplot.cpp \
 +    sci_gateway/cpp/sci_matplot1.cpp \
-     sci_gateway/cpp/sci_winsid.cpp
++    sci_gateway/cpp/sci_winsid.cpp \
++    sci_gateway/cpp/sci_contour2dm.cpp
  
  libscigraphics_la_CPPFLAGS = \
 -      -I$(srcdir)/includes/ \
 -      -I$(srcdir)/src/c/ \
 -      -I$(srcdir)/src/cpp/ \
 -      -I$(srcdir)/src/c/getHandleProperty/ \
 -      -I$(top_srcdir)/modules/action_binding/includes/ \
 -      -I$(top_srcdir)/modules/api_scilab/includes/ \
 -      -I$(top_srcdir)/modules/elementary_functions/includes/ \
 -      -I$(top_srcdir)/modules/fileio/includes/ \
 -      -I$(top_srcdir)/modules/graphic_export/includes/ \
 -      -I$(top_srcdir)/modules/graphic_objects/includes/ \
 -      -I$(top_srcdir)/modules/gui/includes/ \
 -      -I$(top_srcdir)/modules/jvm/includes/ \
 -      -I$(top_srcdir)/modules/localization/includes/ \
 -      -I$(top_srcdir)/modules/output_stream/includes/ \
 -      -I$(top_srcdir)/modules/renderer/includes/ \
 -      -I$(top_srcdir)/modules/string/includes/ \
 -      $(AM_CPPFLAGS)
 +    -I$(srcdir)/includes/ \
 +    -I$(srcdir)/src/c/ \
 +    -I$(srcdir)/src/cpp/ \
 +    -I$(srcdir)/src/c/getHandleProperty/ \
 +    -I$(top_srcdir)/modules/ast/includes/ast/ \
 +    -I$(top_srcdir)/modules/ast/includes/exps/ \
 +    -I$(top_srcdir)/modules/ast/includes/operations/ \
 +    -I$(top_srcdir)/modules/ast/includes/parse/ \
 +    -I$(top_srcdir)/modules/ast/includes/symbol/ \
 +    -I$(top_srcdir)/modules/ast/includes/system_env/ \
 +    -I$(top_srcdir)/modules/ast/includes/types/ \
 +    -I$(top_srcdir)/modules/ast/includes/analysis/ \
 +    -I$(top_srcdir)/modules/action_binding/includes/ \
 +    -I$(top_srcdir)/modules/api_scilab/includes/ \
 +    -I$(top_srcdir)/modules/elementary_functions/includes/ \
 +    -I$(top_srcdir)/modules/fileio/includes/ \
 +    -I$(top_srcdir)/modules/graphic_export/includes/ \
 +    -I$(top_srcdir)/modules/graphic_objects/includes/ \
 +    -I$(top_srcdir)/modules/gui/includes/ \
 +    -I$(top_srcdir)/modules/jvm/includes/ \
 +    -I$(top_srcdir)/modules/localization/includes/ \
 +    -I$(top_srcdir)/modules/output_stream/includes/ \
 +    -I$(top_srcdir)/modules/renderer/includes/ \
 +    -I$(top_srcdir)/modules/string/includes/ \
 +    -I$(top_srcdir)/modules/localization/includes/ \
 +    -I$(top_srcdir)/modules/threads/includes/ \
 +    -I$(top_srcdir)/modules/console/includes/ \
 +    -I$(top_srcdir)/modules/dynamic_link/includes \
 +    $(TCL_INC_PATH) \
 +    $(TK_INC_PATH) \
 +    $(AM_CPPFLAGS)
  
  libscigraphics_algo_la_SOURCES = $(GRAPHICS_C_SOURCES) $(GRAPHICS_CXX_SOURCES)
  libscigraphics_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
@@@ -542,9 -542,7 +542,10 @@@ am__objects_1 = src/c/libscigraphics_al
        src/c/getHandleProperty/libscigraphics_algo_la-get_auto_margins_property.lo \
        src/c/libscigraphics_algo_la-name2rgb.lo \
        src/c/libscigraphics_algo_la-addColor.lo
 -am__objects_2 = src/cpp/libscigraphics_algo_la-ContourOnMesh.lo
 +am__objects_2 =  \
 +      src/cpp/libscigraphics_algo_la-configgraphicvariable.lo \
-       src/cpp/libscigraphics_algo_la-set_data_property.lo
++      src/cpp/libscigraphics_algo_la-set_data_property.lo \
++      src/cpp/libscigraphics_algo_la-ContourOnMesh.lo
  am_libscigraphics_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
  libscigraphics_algo_la_OBJECTS = $(am_libscigraphics_algo_la_OBJECTS)
  AM_V_lt = $(am__v_lt_@AM_V@)
@@@ -616,13 -619,7 +617,14 @@@ am__objects_3 = sci_gateway/c/libscigra
        sci_gateway/c/libscigraphics_la-sci_color.lo \
        sci_gateway/c/libscigraphics_la-sci_name2rgb.lo \
        sci_gateway/c/libscigraphics_la-sci_addcolor.lo
 -am__objects_4 = sci_gateway/cpp/libscigraphics_la-sci_contour2dm.lo
 +am__objects_4 = sci_gateway/cpp/libscigraphics_la-graphics_gw.lo \
 +      sci_gateway/cpp/libscigraphics_la-sci_get.lo \
 +      sci_gateway/cpp/libscigraphics_la-sci_xget.lo \
 +      sci_gateway/cpp/libscigraphics_la-sci_xset.lo \
 +      sci_gateway/cpp/libscigraphics_la-sci_matplot.lo \
 +      sci_gateway/cpp/libscigraphics_la-sci_matplot1.lo \
-       sci_gateway/cpp/libscigraphics_la-sci_winsid.lo
++      sci_gateway/cpp/libscigraphics_la-sci_winsid.lo \
++      sci_gateway/cpp/libscigraphics_la-sci_contour2dm.lo
  am_libscigraphics_la_OBJECTS = $(am__objects_3) $(am__objects_4)
  libscigraphics_la_OBJECTS = $(am_libscigraphics_la_OBJECTS)
  @GUI_TRUE@am_libscigraphics_la_rpath = -rpath $(pkglibdir)
@@@ -1013,481 -999,461 +1015,483 @@@ libscigraphics_la_etc_DATA = 
  
  #### graphics : datatips sub-module ####
  MACROSDIRSEXT = macros/datatips
 -GRAPHICS_C_SOURCES = src/c/GetCommandArg.c \
 -src/c/loadTextRenderingAPI.c \
 -src/c/getHandleProperty/get_figure_position_property.c \
 -src/c/getHandleProperty/get_figure_size_property.c \
 -src/c/getHandleProperty/get_visible_property.c \
 -src/c/getHandleProperty/get_old_style_property.c \
 -src/c/getHandleProperty/get_figures_id_property.c \
 -src/c/getHandleProperty/get_figure_style_property.c \
 -src/c/getHandleProperty/get_pixel_drawing_mode_property.c \
 -src/c/getHandleProperty/get_line_mode_property.c \
 -src/c/getHandleProperty/get_axes_size_property.c \
 -src/c/getHandleProperty/get_thickness_property.c \
 -src/c/getHandleProperty/get_font_foreground_property.c \
 -src/c/getHandleProperty/get_bar_layout_property.c \
 -src/c/getHandleProperty/get_current_axes_property.c \
 -src/c/getHandleProperty/get_bar_width_property.c \
 -src/c/getHandleProperty/get_datatips_property.c \
 -src/c/getHandleProperty/get_font_color_property.c \
 -src/c/getHandleProperty/set_default_axes_property.c \
 -src/c/getHandleProperty/get_default_axes_property.c \
 -src/c/getHandleProperty/get_y_shift_property.c \
 -src/c/getHandleProperty/get_immediate_drawing_property.c \
 -src/c/getHandleProperty/get_current_entity_property.c \
 -src/c/getHandleProperty/get_background_property.c \
 -src/c/getHandleProperty/get_rotation_style_property.c \
 -src/c/getHandleProperty/get_type_property.c \
 -src/c/getHandleProperty/get_current_figure_property.c \
 -src/c/getHandleProperty/get_mark_foreground_property.c \
 -src/c/getHandleProperty/get_default_figure_property.c \
 -src/c/getHandleProperty/get_children_property.c \
 -src/c/getHandleProperty/get_parent_property.c \
 -src/c/getHandleProperty/get_surface_mode_property.c \
 -src/c/getHandleProperty/get_figure_id_property.c \
 -src/c/getHandleProperty/get_mark_mode_property.c \
 -src/c/getHandleProperty/get_interp_color_mode.c \
 -src/c/getHandleProperty/get_font_size_property.c \
 -src/c/getHandleProperty/get_x_shift_property.c \
 -src/c/getHandleProperty/get_z_shift_property.c \
 -src/c/getHandleProperty/get_line_style_property.c \
 -src/c/getHandleProperty/get_foreground_property.c \
 -src/c/getHandleProperty/get_mark_style_property.c \
 -src/c/getHandleProperty/get_color_map_property.c \
 -src/c/getHandleProperty/get_polyline_style_property.c \
 -src/c/getHandleProperty/get_font_angle_property.c \
 -src/c/getHandleProperty/get_interp_color_vector.c \
 -src/c/getHandleProperty/get_figure_name_property.c \
 -src/c/getHandleProperty/get_arrow_size_factor_property.c \
 -src/c/getHandleProperty/get_mark_size_unit_property.c \
 -src/c/getHandleProperty/get_mark_size_property.c \
 -src/c/getHandleProperty/get_mark_offset_property.c \
 -src/c/getHandleProperty/get_mark_stride_property.c \
 -src/c/getHandleProperty/get_mark_background_property.c \
 -src/c/getHandleProperty/get_auto_resize_property.c \
 -src/c/getHandleProperty/get_fill_mode_property.c \
 -src/c/getHandleProperty/get_tight_limits_property.c \
 -src/c/getHandleProperty/get_auto_ticks_property.c \
 -src/c/getHandleProperty/get_x_label_property.c \
 -src/c/getHandleProperty/get_auto_scale_property.c \
 -src/c/getHandleProperty/get_auto_dimensionning_property.c \
 -src/c/getHandleProperty/get_text_box_property.c \
 -src/c/getHandleProperty/get_clip_box_property.c \
 -src/c/getHandleProperty/get_tics_direction_property.c \
 -src/c/getHandleProperty/get_position_property.c \
 -src/c/getHandleProperty/get_y_label_property.c \
 -src/c/getHandleProperty/get_data_property.c \
 -src/c/getHandleProperty/get_auto_clear_property.c \
 -src/c/getHandleProperty/get_title_property.c \
 -src/c/getHandleProperty/get_zoom_state_property.c \
 -src/c/getHandleProperty/get_zoom_box_property.c \
 -src/c/getHandleProperty/get_log_flags_property.c \
 -src/c/getHandleProperty/get_x_location_property.c \
 -src/c/getHandleProperty/get_text_box_mode_property.c \
 -src/c/getHandleProperty/get_y_location_property.c \
 -src/c/getHandleProperty/get_z_label_property.c \
 -src/c/getHandleProperty/get_alignment_property.c \
 -src/c/getHandleProperty/get_font_style_property.c \
 -src/c/getHandleProperty/get_auto_rotation_property.c \
 -src/c/getHandleProperty/get_clip_state_property.c \
 -src/c/getHandleProperty/get_callback_property.c \
 -src/c/getHandleProperty/get_auto_position_property.c \
 -src/c/getHandleProperty/get_closed_property.c \
 -src/c/getHandleProperty/get_text_property.c \
 -src/c/getHandleProperty/get_margins_property.c \
 -src/c/getHandleProperty/get_view_property.c \
 -src/c/getHandleProperty/get_data_bounds_property.c \
 -src/c/getHandleProperty/get_axes_reverse_property.c \
 -src/c/getHandleProperty/get_tics_color_property.c \
 -src/c/getHandleProperty/get_axes_bounds_property.c \
 -src/c/getHandleProperty/get_tics_style_property.c \
 -src/c/getHandleProperty/get_user_data_property.c \
 -src/c/getHandleProperty/get_xtics_coord_property.c \
 -src/c/getHandleProperty/get_color_mode_property.c \
 -src/c/getHandleProperty/get_z_bounds_property.c \
 -src/c/getHandleProperty/get_data_mapping_property.c \
 -src/c/getHandleProperty/get_arrow_size_property.c \
 -src/c/getHandleProperty/get_rotation_angles_property.c \
 -src/c/getHandleProperty/get_callback_type_property.c \
 -src/c/getHandleProperty/get_format_n_property.c \
 -src/c/getHandleProperty/get_color_flag_property.c \
 -src/c/getHandleProperty/get_sub_tics_property.c \
 -src/c/getHandleProperty/get_hidden_axis_color_property.c \
 -src/c/getHandleProperty/get_ytics_coord_property.c \
 -src/c/getHandleProperty/get_labels_font_size_property.c \
 -src/c/getHandleProperty/get_isoview_property.c \
 -src/c/getHandleProperty/get_grid_property.c \
 -src/c/getHandleProperty/get_grid_thickness_property.c \
 -src/c/getHandleProperty/get_grid_style_property.c \
 -src/c/getHandleProperty/get_box_property.c \
 -src/c/getHandleProperty/get_hidden_color_property.c \
 -src/c/getHandleProperty/get_handle_visible_property.c \
 -src/c/getHandleProperty/get_labels_font_color_property.c \
 -src/c/getHandleProperty/get_surface_color_property.c \
 -src/c/getHandleProperty/get_tics_label_property.c \
 -src/c/getHandleProperty/get_labels_font_style_property.c \
 -src/c/getHandleProperty/get_axes_visible_property.c \
 -src/c/getHandleProperty/get_cube_scaling_property.c \
 -src/c/getHandleProperty/get_tics_segment_property.c \
 -src/c/getHandleProperty/get_cdata_mapping_property.c \
 -src/c/getHandleProperty/get_colored_property.c \
 -src/c/getHandleProperty/get_triangles_property.c \
 -src/c/getHandleProperty/get_viewport_property.c \
 -src/c/getHandleProperty/get_info_message_property.c \
 -src/c/getHandleProperty/get_y_ticks_property.c \
 -src/c/getHandleProperty/get_z_ticks_property.c \
 -src/c/getHandleProperty/get_x_ticks_property.c \
 -src/c/getHandleProperty/get_ticks_format_property.c \
 -src/c/getHandleProperty/get_ticks_st_property.c \
 -src/c/getHandleProperty/setGetHashTable.c \
 -src/c/getHandleProperty/get_segs_color_property.c \
 -src/c/getHandleProperty/get_screen_position_property.c \
 -src/c/getHandleProperty/get_event_handler_property.c \
 -src/c/getHandleProperty/get_event_handler_enable_property.c \
 -src/c/getHandleProperty/get_arc_drawing_method_property.c \
 -src/c/getHandleProperty/get_fractional_font_property.c \
 -src/c/getHandleProperty/get_links_property.c \
 -src/c/getHandleProperty/get_legend_location_property.c \
 -src/c/getHandleProperty/get_filled_property.c \
 -src/c/getHandleProperty/get_color_range_property.c \
 -src/c/getHandleProperty/get_outside_colors_property.c \
 -src/c/getHandleProperty/get_grid_position_property.c \
 -src/c/getHandleProperty/get_anti_aliasing_property.c \
 -src/c/getHandleProperty/get_tag_property.c \
 -src/c/getHandleProperty/get_image_type_property.c \
 -src/c/getHandleProperty/get_resize_property.c \
 -src/c/getHandleProperty/get_toolbar_property.c \
 -src/c/getHandleProperty/get_menubar_property.c \
 -src/c/getHandleProperty/get_infobar_property.c \
 -src/c/getHandleProperty/get_dockable_property.c \
 -src/c/getHandleProperty/get_rect_property.c \
 -src/c/getHandleProperty/GetHashTable.c \
 -src/c/graphicModuleLoad.c \
 -src/c/getHandleProperty/set_old_style_property.c \
 -src/c/getHandleProperty/set_figure_name_property.c \
 -src/c/getHandleProperty/getPropertyAssignedValue.c \
 -src/c/getHandleProperty/set_visible_property.c \
 -src/c/getHandleProperty/set_pixel_drawing_mode_property.c \
 -src/c/getHandleProperty/set_interp_color_vector_property.c \
 -src/c/getHandleProperty/set_immediate_drawing_property.c \
 -src/c/getHandleProperty/set_figure_size_property.c \
 -src/c/getHandleProperty/set_background_property.c \
 -src/c/getHandleProperty/set_rotation_style_property.c \
 -src/c/getHandleProperty/set_current_figure_property.c \
 -src/c/getHandleProperty/set_axes_size_property.c \
 -src/c/getHandleProperty/set_default_values_property.c \
 -src/c/getHandleProperty/set_figure_position_property.c \
 -src/c/getHandleProperty/set_color_map_property.c \
 -src/c/getHandleProperty/set_auto_resize_property.c \
 -src/c/getHandleProperty/set_current_axes_property.c \
 -src/c/getHandleProperty/set_current_entity_property.c \
 -src/c/getHandleProperty/set_figure_id_property.c \
 -src/c/getHandleProperty/set_figure_style_property.c \
 -src/c/getHandleProperty/set_mark_size_property.c \
 -src/c/getHandleProperty/set_mark_offset_property.c \
 -src/c/getHandleProperty/set_mark_stride_property.c \
 -src/c/getHandleProperty/set_y_shift_property.c \
 -src/c/getHandleProperty/set_auto_scale_property.c \
 -src/c/getHandleProperty/set_auto_dimensionning_property.c \
 -src/c/getHandleProperty/set_text_box_property.c \
 -src/c/getHandleProperty/set_text_property.c \
 -src/c/getHandleProperty/set_mark_mode_property.c \
 -src/c/getHandleProperty/set_clip_box_property.c \
 -src/c/getHandleProperty/set_z_shift_property.c \
 -src/c/getHandleProperty/set_line_style_property.c \
 -src/c/getHandleProperty/set_polyline_style_property.c \
 -src/c/getHandleProperty/set_line_mode_property.c \
 -src/c/getHandleProperty/set_thickness_property.c \
 -src/c/getHandleProperty/set_font_foreground_property.c \
 -src/c/getHandleProperty/set_text_box_mode_property.c \
 -src/c/getHandleProperty/set_bar_layout_property.c \
 -src/c/getHandleProperty/set_bar_width_property.c \
 -src/c/getHandleProperty/set_datatips_property.c \
 -src/c/getHandleProperty/SetPropertyStatus.c \
 -src/c/getHandleProperty/set_font_style_property.c \
 -src/c/getHandleProperty/set_surface_mode_property.c \
 -src/c/getHandleProperty/set_font_size_property.c \
 -src/c/getHandleProperty/set_mark_style_property.c \
 -src/c/getHandleProperty/set_mark_background_property.c \
 -src/c/getHandleProperty/set_interp_color_mode_property.c \
 -src/c/getHandleProperty/set_data_property.c \
 -src/c/getHandleProperty/set_font_angle_property.c \
 -src/c/getHandleProperty/set_auto_clear_property.c \
 -src/c/getHandleProperty/set_arrow_size_factor_property.c \
 -src/c/getHandleProperty/set_mark_size_unit_property.c \
 -src/c/getHandleProperty/set_zoom_state_property.c \
 -src/c/getHandleProperty/set_fill_mode_property.c \
 -src/c/getHandleProperty/set_zoom_box_property.c \
 -src/c/getHandleProperty/set_font_color_property.c \
 -src/c/getHandleProperty/set_alignment_property.c \
 -src/c/getHandleProperty/set_mark_foreground_property.c \
 -src/c/getHandleProperty/set_clip_state_property.c \
 -src/c/getHandleProperty/set_x_shift_property.c \
 -src/c/getHandleProperty/set_foreground_property.c \
 -src/c/getHandleProperty/set_tics_direction_property.c \
 -src/c/getHandleProperty/set_title_property.c \
 -src/c/getHandleProperty/set_x_location_property.c \
 -src/c/getHandleProperty/set_auto_position_property.c \
 -src/c/getHandleProperty/set_tight_limits_property.c \
 -src/c/getHandleProperty/set_x_label_property.c \
 -src/c/getHandleProperty/set_y_label_property.c \
 -src/c/getHandleProperty/set_y_location_property.c \
 -src/c/getHandleProperty/set_z_label_property.c \
 -src/c/getHandleProperty/set_auto_rotation_property.c \
 -src/c/getHandleProperty/set_callback_property.c \
 -src/c/getHandleProperty/set_closed_property.c \
 -src/c/getHandleProperty/set_cdata_mapping_property.c \
 -src/c/getHandleProperty/set_y_ticks_property.c \
 -src/c/getHandleProperty/set_z_bounds_property.c \
 -src/c/getHandleProperty/set_position_property.c \
 -src/c/getHandleProperty/set_z_ticks_property.c \
 -src/c/getHandleProperty/set_axes_bounds_property.c \
 -src/c/getHandleProperty/set_tics_style_property.c \
 -src/c/getHandleProperty/SetHashTable.c \
 -src/c/getHandleProperty/set_handle_visible_property.c \
 -src/c/getHandleProperty/set_labels_font_color_property.c \
 -src/c/getHandleProperty/set_parent_property.c \
 -src/c/getHandleProperty/set_axes_visible_property.c \
 -src/c/getHandleProperty/set_triangles_property.c \
 -src/c/getHandleProperty/set_tics_color_property.c \
 -src/c/getHandleProperty/set_color_flag_property.c \
 -src/c/getHandleProperty/set_labels_font_size_property.c \
 -src/c/getHandleProperty/set_tics_segment_property.c \
 -src/c/getHandleProperty/set_user_data_property.c \
 -src/c/getHandleProperty/set_view_property.c \
 -src/c/getHandleProperty/set_arrow_size_property.c \
 -src/c/getHandleProperty/set_children_property.c \
 -src/c/getHandleProperty/set_axes_reverse_property.c \
 -src/c/getHandleProperty/set_grid_property.c \
 -src/c/getHandleProperty/set_grid_thickness_property.c \
 -src/c/getHandleProperty/set_grid_style_property.c \
 -src/c/getHandleProperty/set_log_flags_property.c \
 -src/c/getHandleProperty/set_cube_scaling_property.c \
 -src/c/getHandleProperty/set_colored_property.c \
 -src/c/getHandleProperty/set_margins_property.c \
 -src/c/getHandleProperty/set_auto_ticks_property.c \
 -src/c/getHandleProperty/set_xtics_coord_property.c \
 -src/c/getHandleProperty/set_color_mode_property.c \
 -src/c/getHandleProperty/set_data_bounds_property.c \
 -src/c/getHandleProperty/set_tics_labels_property.c \
 -src/c/getHandleProperty/set_data_mapping_property.c \
 -src/c/getHandleProperty/set_rotation_angles_property.c \
 -src/c/getHandleProperty/set_callback_type_property.c \
 -src/c/getHandleProperty/set_segs_color_property.c \
 -src/c/getHandleProperty/set_format_n_property.c \
 -src/c/getHandleProperty/set_sub_tics_property.c \
 -src/c/getHandleProperty/set_hidden_axis_color_property.c \
 -src/c/getHandleProperty/set_isoview_property.c \
 -src/c/getHandleProperty/set_box_property.c \
 -src/c/getHandleProperty/set_hidden_color_property.c \
 -src/c/getHandleProperty/set_label_font_style_property.c \
 -src/c/getHandleProperty/set_surface_color_property.c \
 -src/c/getHandleProperty/set_yticks_coord_property.c \
 -src/c/getHandleProperty/CheckTicksProperty.c \
 -src/c/getHandleProperty/set_x_ticks_property.c \
 -src/c/getHandleProperty/set_ticks_format_property.c \
 -src/c/getHandleProperty/set_ticks_st_property.c \
 -src/c/getHandleProperty/set_viewport_property.c \
 -src/c/getHandleProperty/set_info_message_property.c \
 -src/c/getHandleProperty/set_screen_position_property.c \
 -src/c/getHandleProperty/set_event_handler_property.c \
 -src/c/getHandleProperty/set_event_handler_enable_property.c \
 -src/c/getHandleProperty/set_arc_drawing_method_property.c \
 -src/c/getHandleProperty/set_fractional_font_property.c \
 -src/c/getHandleProperty/set_links_property.c \
 -src/c/getHandleProperty/set_legend_location_property.c \
 -src/c/getHandleProperty/set_filled_property.c \
 -src/c/getHandleProperty/set_color_range_property.c \
 -src/c/getHandleProperty/set_outside_colors_property.c \
 -src/c/getHandleProperty/set_grid_position_property.c \
 -src/c/getHandleProperty/set_anti_aliasing_property.c \
 -src/c/getHandleProperty/set_tag_property.c \
 -src/c/getHandleProperty/set_figure_resizefcn_property.c \
 -src/c/getHandleProperty/get_figure_resizefcn_property.c \
 -src/c/getHandleProperty/set_figure_closerequestfcn_property.c \
 -src/c/getHandleProperty/get_figure_closerequestfcn_property.c \
 -src/c/getHandleProperty/get_datatip_property.c \
 -src/c/getHandleProperty/set_datatip_property.c \
 -src/c/getHandleProperty/set_image_type_property.c \
 -src/c/getHandleProperty/get_display_function_data_property.c \
 -src/c/getHandleProperty/set_display_function_data_property.c \
 -src/c/getHandleProperty/set_resize_property.c \
 -src/c/getHandleProperty/set_toolbar_property.c \
 -src/c/getHandleProperty/set_menubar_property.c \
 -src/c/getHandleProperty/set_infobar_property.c \
 -src/c/getHandleProperty/set_dockable_property.c \
 -src/c/getHandleProperty/get_layout_property.c \
 -src/c/getHandleProperty/set_layout_property.c \
 -src/c/getHandleProperty/get_constraints_property.c \
 -src/c/getHandleProperty/set_constraints_property.c \
 -src/c/getHandleProperty/set_rect_property.c \
 -src/c/getHandleProperty/get_layout_options_property.c \
 -src/c/getHandleProperty/set_layout_options_property.c \
 -src/c/getHandleProperty/get_border_property.c \
 -src/c/getHandleProperty/set_border_property.c \
 -src/c/getHandleProperty/get_groupname_property.c \
 -src/c/getHandleProperty/set_groupname_property.c \
 -src/c/getHandleProperty/get_tabtitle_property.c \
 -src/c/getHandleProperty/set_tabtitle_property.c \
 -src/c/getHandleProperty/get_scrollable_property.c \
 -src/c/getHandleProperty/set_scrollable_property.c \
 -src/c/getHandleProperty/get_marks_count_property.c \
 -src/c/getHandleProperty/set_marks_count_property.c \
 -src/c/getHandleProperty/get_line_width_property.c \
 -src/c/getHandleProperty/set_line_width_property.c \
 -src/c/DefaultCommandArg.c \
 -src/c/Axes.c \
 -src/c/sciMatrix.c \
 -src/c/DrawObjects.c \
 -src/c/GetProperty.c \
 -src/c/Contour.c \
 -src/c/SetProperty.c \
 -src/c/BasicAlgos.c \
 -src/c/BuildObjects.c \
 -src/c/sciCall.c \
 -src/c/CloneObjects.c \
 -src/c/InitObjects.c \
 -src/c/pixel_mode.c \
 -src/c/Format.c \
 -src/c/Champ.c \
 -src/c/StringMatrix.c \
 -src/c/FeC.c \
 -src/c/Plo2dEch.c \
 -src/c/Plo2dn.c \
 -src/c/Gray.c \
 -src/c/DestroyObjects.c \
 -src/c/math_graphics.c \
 -src/c/Interaction.c \
 -src/c/StringBox.c \
 -src/c/axesScale.c \
 -src/c/TerminateGraphics.c \
 -src/c/periEmpty.c \
 -src/c/scitokenize.c \
 -src/c/get_ticks_utils.c \
 -src/c/getHandleProperty/get_ambient_color_property.c \
 -src/c/getHandleProperty/get_diffuse_color_property.c \
 -src/c/getHandleProperty/get_specular_color_property.c \
 -src/c/getHandleProperty/get_use_color_material_property.c \
 -src/c/getHandleProperty/get_material_shininess_property.c \
 -src/c/getHandleProperty/get_light_type_property.c \
 -src/c/getHandleProperty/get_direction_property.c \
 -src/c/getHandleProperty/set_ambient_color_property.c \
 -src/c/getHandleProperty/set_diffuse_color_property.c \
 -src/c/getHandleProperty/set_specular_color_property.c \
 -src/c/getHandleProperty/set_use_color_material_property.c \
 -src/c/getHandleProperty/set_material_shininess_property.c \
 -src/c/getHandleProperty/set_light_type_property.c \
 -src/c/getHandleProperty/set_direction_property.c \
 -src/c/getHandleProperty/set_auto_margins_property.c \
 -src/c/getHandleProperty/get_auto_margins_property.c \
 -src/c/name2rgb.c \
 -src/c/addColor.c
 -
 -GATEWAY_C_SOURCES = sci_gateway/c/sci_swap_handles.c \
 -sci_gateway/c/sci_grayplot.c \
 -sci_gateway/c/sci_matplot1.c \
 -sci_gateway/c/sci_xfpolys.c \
 -sci_gateway/c/sci_xget.c \
 -sci_gateway/c/sci_newaxes.c \
 -sci_gateway/c/sci_xlfont.c \
 -sci_gateway/c/sci_xgraduate.c \
 -sci_gateway/c/sci_xgrid.c \
 -sci_gateway/c/sci_xclick.c \
 -sci_gateway/c/sci_geom3d.c \
 -sci_gateway/c/sci_xset.c \
 -sci_gateway/c/sci_unzoom.c \
 -sci_gateway/c/sci_xsegs.c \
 -sci_gateway/c/sci_glue.c \
 -sci_gateway/c/sci_xarc.c \
 -sci_gateway/c/sci_xpolys.c \
 -sci_gateway/c/sci_xstring.c \
 -sci_gateway/c/sci_xstringb.c \
 -sci_gateway/c/sci_show_window.c \
 -sci_gateway/c/sci_param3d1.c \
 -sci_gateway/c/sci_xname.c \
 -sci_gateway/c/sci_xpoly.c \
 -sci_gateway/c/sci_xchange.c \
 -sci_gateway/c/sci_matplot.c \
 -sci_gateway/c/sci_drawaxis.c \
 -sci_gateway/c/sci_demo.c \
 -sci_gateway/c/sci_plot2d1.c \
 -sci_gateway/c/sci_xrect.c \
 -sci_gateway/c/sci_xarrows.c \
 -sci_gateway/c/sci_plot3d.c \
 -sci_gateway/c/sci_move.c \
 -sci_gateway/c/sci_copy.c \
 -sci_gateway/c/sci_get.c \
 -sci_gateway/c/sci_xarcs.c \
 -sci_gateway/c/sci_xfpoly.c \
 -sci_gateway/c/sci_drawlater.c \
 -sci_gateway/c/sci_champ.c \
 -sci_gateway/c/sci_set.c \
 -sci_gateway/c/sci_unglue.c \
 -sci_gateway/c/gw_graphics.c \
 -sci_gateway/c/sci_zoom_rect.c \
 -sci_gateway/c/sci_delete.c \
 -sci_gateway/c/sci_plot2d.c \
 -sci_gateway/c/sci_xrects.c \
 -sci_gateway/c/sci_xtitle.c \
 -sci_gateway/c/sci_StringBox.c \
 -sci_gateway/c/sci_xgetmouse.c \
 -sci_gateway/c/sci_drawnow.c \
 -sci_gateway/c/sci_xfarcs.c \
 -sci_gateway/c/sci_param3d.c \
 -sci_gateway/c/sci_contour2di.c \
 -sci_gateway/c/sci_xdel.c \
 -sci_gateway/c/sci_winsid.c \
 -sci_gateway/c/sci_fec.c \
 -sci_gateway/c/sci_rubberbox.c \
 -sci_gateway/c/sci_rotate_axes.c \
 -sci_gateway/c/sci_is_handle_valid.c \
 -sci_gateway/c/sci_Legend.c \
 -sci_gateway/c/sci_light.c \
 -sci_gateway/c/sci_color.c \
 -sci_gateway/c/sci_name2rgb.c \
 -sci_gateway/c/sci_addcolor.c
 -
 -GRAPHICS_CXX_SOURCES = src/cpp/ContourOnMesh.cpp
 -GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_contour2dm.cpp
 +GRAPHICS_C_SOURCES = \
 +    src/c/GetCommandArg.c \
 +    src/c/loadTextRenderingAPI.c \
 +    src/c/getHandleProperty/get_figure_position_property.c \
 +    src/c/getHandleProperty/get_figure_size_property.c \
 +    src/c/getHandleProperty/get_visible_property.c \
 +    src/c/getHandleProperty/get_old_style_property.c \
 +    src/c/getHandleProperty/get_figures_id_property.c \
 +    src/c/getHandleProperty/get_figure_style_property.c \
 +    src/c/getHandleProperty/get_pixel_drawing_mode_property.c \
 +    src/c/getHandleProperty/get_line_mode_property.c \
 +    src/c/getHandleProperty/get_axes_size_property.c \
 +    src/c/getHandleProperty/get_thickness_property.c \
 +    src/c/getHandleProperty/get_font_foreground_property.c \
 +    src/c/getHandleProperty/get_bar_layout_property.c \
 +    src/c/getHandleProperty/get_current_axes_property.c \
 +    src/c/getHandleProperty/get_bar_width_property.c \
 +    src/c/getHandleProperty/get_datatips_property.c \
 +    src/c/getHandleProperty/get_font_color_property.c \
 +    src/c/getHandleProperty/set_default_axes_property.c \
 +    src/c/getHandleProperty/get_default_axes_property.c \
 +    src/c/getHandleProperty/get_y_shift_property.c \
 +    src/c/getHandleProperty/get_immediate_drawing_property.c \
 +    src/c/getHandleProperty/get_current_entity_property.c \
 +    src/c/getHandleProperty/get_background_property.c \
 +    src/c/getHandleProperty/get_rotation_style_property.c \
 +    src/c/getHandleProperty/get_type_property.c \
 +    src/c/getHandleProperty/get_current_figure_property.c \
 +    src/c/getHandleProperty/get_mark_foreground_property.c \
 +    src/c/getHandleProperty/get_default_figure_property.c \
 +    src/c/getHandleProperty/get_children_property.c \
 +    src/c/getHandleProperty/get_parent_property.c \
 +    src/c/getHandleProperty/get_surface_mode_property.c \
 +    src/c/getHandleProperty/get_figure_id_property.c \
 +    src/c/getHandleProperty/get_mark_mode_property.c \
 +    src/c/getHandleProperty/get_interp_color_mode.c \
 +    src/c/getHandleProperty/get_font_size_property.c \
 +    src/c/getHandleProperty/get_x_shift_property.c \
 +    src/c/getHandleProperty/get_z_shift_property.c \
 +    src/c/getHandleProperty/get_line_style_property.c \
 +    src/c/getHandleProperty/get_foreground_property.c \
 +    src/c/getHandleProperty/get_mark_style_property.c \
 +    src/c/getHandleProperty/get_color_map_property.c \
 +    src/c/getHandleProperty/get_polyline_style_property.c \
 +    src/c/getHandleProperty/get_font_angle_property.c \
 +    src/c/getHandleProperty/get_interp_color_vector.c \
 +    src/c/getHandleProperty/get_figure_name_property.c \
 +    src/c/getHandleProperty/get_arrow_size_factor_property.c \
 +    src/c/getHandleProperty/get_mark_size_unit_property.c \
 +    src/c/getHandleProperty/get_mark_size_property.c \
 +    src/c/getHandleProperty/get_mark_offset_property.c \
 +    src/c/getHandleProperty/get_mark_stride_property.c \
 +    src/c/getHandleProperty/get_mark_background_property.c \
 +    src/c/getHandleProperty/get_auto_resize_property.c \
 +    src/c/getHandleProperty/get_fill_mode_property.c \
 +    src/c/getHandleProperty/get_tight_limits_property.c \
 +    src/c/getHandleProperty/get_auto_ticks_property.c \
 +    src/c/getHandleProperty/get_x_label_property.c \
 +    src/c/getHandleProperty/get_auto_scale_property.c \
 +    src/c/getHandleProperty/get_auto_dimensionning_property.c \
 +    src/c/getHandleProperty/get_text_box_property.c \
 +    src/c/getHandleProperty/get_clip_box_property.c \
 +    src/c/getHandleProperty/get_tics_direction_property.c \
 +    src/c/getHandleProperty/get_position_property.c \
 +    src/c/getHandleProperty/get_y_label_property.c \
 +    src/c/getHandleProperty/get_data_property.c \
 +    src/c/getHandleProperty/get_auto_clear_property.c \
 +    src/c/getHandleProperty/get_title_property.c \
 +    src/c/getHandleProperty/get_zoom_state_property.c \
 +    src/c/getHandleProperty/get_zoom_box_property.c \
 +    src/c/getHandleProperty/get_log_flags_property.c \
 +    src/c/getHandleProperty/get_x_location_property.c \
 +    src/c/getHandleProperty/get_text_box_mode_property.c \
 +    src/c/getHandleProperty/get_y_location_property.c \
 +    src/c/getHandleProperty/get_z_label_property.c \
 +    src/c/getHandleProperty/get_alignment_property.c \
 +    src/c/getHandleProperty/get_font_style_property.c \
 +    src/c/getHandleProperty/get_auto_rotation_property.c \
 +    src/c/getHandleProperty/get_clip_state_property.c \
 +    src/c/getHandleProperty/get_callback_property.c \
 +    src/c/getHandleProperty/get_auto_position_property.c \
 +    src/c/getHandleProperty/get_closed_property.c \
 +    src/c/getHandleProperty/get_text_property.c \
 +    src/c/getHandleProperty/get_margins_property.c \
 +    src/c/getHandleProperty/get_view_property.c \
 +    src/c/getHandleProperty/get_data_bounds_property.c \
 +    src/c/getHandleProperty/get_axes_reverse_property.c \
 +    src/c/getHandleProperty/get_tics_color_property.c \
 +    src/c/getHandleProperty/get_axes_bounds_property.c \
 +    src/c/getHandleProperty/get_tics_style_property.c \
 +    src/c/getHandleProperty/get_user_data_property.c \
 +    src/c/getHandleProperty/get_xtics_coord_property.c \
 +    src/c/getHandleProperty/get_color_mode_property.c \
 +    src/c/getHandleProperty/get_z_bounds_property.c \
 +    src/c/getHandleProperty/get_data_mapping_property.c \
 +    src/c/getHandleProperty/get_arrow_size_property.c \
 +    src/c/getHandleProperty/get_rotation_angles_property.c \
 +    src/c/getHandleProperty/get_callback_type_property.c \
 +    src/c/getHandleProperty/get_format_n_property.c \
 +    src/c/getHandleProperty/get_color_flag_property.c \
 +    src/c/getHandleProperty/get_sub_tics_property.c \
 +    src/c/getHandleProperty/get_hidden_axis_color_property.c \
 +    src/c/getHandleProperty/get_ytics_coord_property.c \
 +    src/c/getHandleProperty/get_labels_font_size_property.c \
 +    src/c/getHandleProperty/get_isoview_property.c \
 +    src/c/getHandleProperty/get_grid_property.c \
 +    src/c/getHandleProperty/get_grid_thickness_property.c \
 +    src/c/getHandleProperty/get_grid_style_property.c \
 +    src/c/getHandleProperty/get_box_property.c \
 +    src/c/getHandleProperty/get_hidden_color_property.c \
 +    src/c/getHandleProperty/get_handle_visible_property.c \
 +    src/c/getHandleProperty/get_labels_font_color_property.c \
 +    src/c/getHandleProperty/get_surface_color_property.c \
 +    src/c/getHandleProperty/get_tics_label_property.c \
 +    src/c/getHandleProperty/get_labels_font_style_property.c \
 +    src/c/getHandleProperty/get_axes_visible_property.c \
 +    src/c/getHandleProperty/get_cube_scaling_property.c \
 +    src/c/getHandleProperty/get_tics_segment_property.c \
 +    src/c/getHandleProperty/get_cdata_mapping_property.c \
 +    src/c/getHandleProperty/get_colored_property.c \
 +    src/c/getHandleProperty/get_triangles_property.c \
 +    src/c/getHandleProperty/get_viewport_property.c \
 +    src/c/getHandleProperty/get_info_message_property.c \
 +    src/c/getHandleProperty/get_y_ticks_property.c \
 +    src/c/getHandleProperty/get_z_ticks_property.c \
 +    src/c/getHandleProperty/get_x_ticks_property.c \
 +    src/c/getHandleProperty/get_ticks_format_property.c \
 +    src/c/getHandleProperty/get_ticks_st_property.c \
 +    src/c/getHandleProperty/setGetHashTable.c \
 +    src/c/getHandleProperty/get_segs_color_property.c \
 +    src/c/getHandleProperty/get_screen_position_property.c \
 +    src/c/getHandleProperty/get_event_handler_property.c \
 +    src/c/getHandleProperty/get_event_handler_enable_property.c \
 +    src/c/getHandleProperty/get_arc_drawing_method_property.c \
 +    src/c/getHandleProperty/get_fractional_font_property.c \
 +    src/c/getHandleProperty/get_links_property.c \
 +    src/c/getHandleProperty/get_legend_location_property.c \
 +    src/c/getHandleProperty/get_filled_property.c \
 +    src/c/getHandleProperty/get_color_range_property.c \
 +    src/c/getHandleProperty/get_outside_colors_property.c \
 +    src/c/getHandleProperty/get_grid_position_property.c \
 +    src/c/getHandleProperty/get_anti_aliasing_property.c \
 +    src/c/getHandleProperty/get_tag_property.c \
 +    src/c/getHandleProperty/get_image_type_property.c \
 +    src/c/getHandleProperty/get_resize_property.c \
 +    src/c/getHandleProperty/get_toolbar_property.c \
 +    src/c/getHandleProperty/get_menubar_property.c \
 +    src/c/getHandleProperty/get_infobar_property.c \
 +    src/c/getHandleProperty/get_dockable_property.c \
 +    src/c/getHandleProperty/get_rect_property.c \
 +    src/c/getHandleProperty/GetHashTable.c \
 +    src/c/graphicModuleLoad.c \
 +    src/c/getHandleProperty/set_old_style_property.c \
 +    src/c/getHandleProperty/set_figure_name_property.c \
 +    src/c/getHandleProperty/getPropertyAssignedValue.c \
 +    src/c/getHandleProperty/set_visible_property.c \
 +    src/c/getHandleProperty/set_pixel_drawing_mode_property.c \
 +    src/c/getHandleProperty/set_interp_color_vector_property.c \
 +    src/c/getHandleProperty/set_immediate_drawing_property.c \
 +    src/c/getHandleProperty/set_figure_size_property.c \
 +    src/c/getHandleProperty/set_background_property.c \
 +    src/c/getHandleProperty/set_rotation_style_property.c \
 +    src/c/getHandleProperty/set_current_figure_property.c \
 +    src/c/getHandleProperty/set_axes_size_property.c \
 +    src/c/getHandleProperty/set_default_values_property.c \
 +    src/c/getHandleProperty/set_figure_position_property.c \
 +    src/c/getHandleProperty/set_color_map_property.c \
 +    src/c/getHandleProperty/set_auto_resize_property.c \
 +    src/c/getHandleProperty/set_current_axes_property.c \
 +    src/c/getHandleProperty/set_current_entity_property.c \
 +    src/c/getHandleProperty/set_figure_id_property.c \
 +    src/c/getHandleProperty/set_figure_style_property.c \
 +    src/c/getHandleProperty/set_mark_size_property.c \
 +    src/c/getHandleProperty/set_mark_offset_property.c \
 +    src/c/getHandleProperty/set_mark_stride_property.c \
 +    src/c/getHandleProperty/set_y_shift_property.c \
 +    src/c/getHandleProperty/set_auto_scale_property.c \
 +    src/c/getHandleProperty/set_auto_dimensionning_property.c \
 +    src/c/getHandleProperty/set_text_box_property.c \
 +    src/c/getHandleProperty/set_text_property.c \
 +    src/c/getHandleProperty/set_mark_mode_property.c \
 +    src/c/getHandleProperty/set_clip_box_property.c \
 +    src/c/getHandleProperty/set_z_shift_property.c \
 +    src/c/getHandleProperty/set_line_style_property.c \
 +    src/c/getHandleProperty/set_polyline_style_property.c \
 +    src/c/getHandleProperty/set_line_mode_property.c \
 +    src/c/getHandleProperty/set_thickness_property.c \
 +    src/c/getHandleProperty/set_font_foreground_property.c \
 +    src/c/getHandleProperty/set_text_box_mode_property.c \
 +    src/c/getHandleProperty/set_bar_layout_property.c \
 +    src/c/getHandleProperty/set_bar_width_property.c \
 +    src/c/getHandleProperty/set_datatips_property.c \
 +    src/c/getHandleProperty/SetPropertyStatus.c \
 +    src/c/getHandleProperty/set_font_style_property.c \
 +    src/c/getHandleProperty/set_surface_mode_property.c \
 +    src/c/getHandleProperty/set_font_size_property.c \
 +    src/c/getHandleProperty/set_mark_style_property.c \
 +    src/c/getHandleProperty/set_mark_background_property.c \
 +    src/c/getHandleProperty/set_interp_color_mode_property.c \
 +    src/c/getHandleProperty/set_font_angle_property.c \
 +    src/c/getHandleProperty/set_auto_clear_property.c \
 +    src/c/getHandleProperty/set_arrow_size_factor_property.c \
 +    src/c/getHandleProperty/set_mark_size_unit_property.c \
 +    src/c/getHandleProperty/set_zoom_state_property.c \
 +    src/c/getHandleProperty/set_fill_mode_property.c \
 +    src/c/getHandleProperty/set_zoom_box_property.c \
 +    src/c/getHandleProperty/set_font_color_property.c \
 +    src/c/getHandleProperty/set_alignment_property.c \
 +    src/c/getHandleProperty/set_mark_foreground_property.c \
 +    src/c/getHandleProperty/set_clip_state_property.c \
 +    src/c/getHandleProperty/set_x_shift_property.c \
 +    src/c/getHandleProperty/set_foreground_property.c \
 +    src/c/getHandleProperty/set_tics_direction_property.c \
 +    src/c/getHandleProperty/set_title_property.c \
 +    src/c/getHandleProperty/set_x_location_property.c \
 +    src/c/getHandleProperty/set_auto_position_property.c \
 +    src/c/getHandleProperty/set_tight_limits_property.c \
 +    src/c/getHandleProperty/set_x_label_property.c \
 +    src/c/getHandleProperty/set_y_label_property.c \
 +    src/c/getHandleProperty/set_y_location_property.c \
 +    src/c/getHandleProperty/set_z_label_property.c \
 +    src/c/getHandleProperty/set_auto_rotation_property.c \
 +    src/c/getHandleProperty/set_callback_property.c \
 +    src/c/getHandleProperty/set_closed_property.c \
 +    src/c/getHandleProperty/set_cdata_mapping_property.c \
 +    src/c/getHandleProperty/set_y_ticks_property.c \
 +    src/c/getHandleProperty/set_z_bounds_property.c \
 +    src/c/getHandleProperty/set_position_property.c \
 +    src/c/getHandleProperty/set_z_ticks_property.c \
 +    src/c/getHandleProperty/set_axes_bounds_property.c \
 +    src/c/getHandleProperty/set_tics_style_property.c \
 +    src/c/getHandleProperty/SetHashTable.c \
 +    src/c/getHandleProperty/set_handle_visible_property.c \
 +    src/c/getHandleProperty/set_labels_font_color_property.c \
 +    src/c/getHandleProperty/set_parent_property.c \
 +    src/c/getHandleProperty/set_axes_visible_property.c \
 +    src/c/getHandleProperty/set_triangles_property.c \
 +    src/c/getHandleProperty/set_tics_color_property.c \
 +    src/c/getHandleProperty/set_color_flag_property.c \
 +    src/c/getHandleProperty/set_labels_font_size_property.c \
 +    src/c/getHandleProperty/set_tics_segment_property.c \
 +    src/c/getHandleProperty/set_user_data_property.c \
 +    src/c/getHandleProperty/set_view_property.c \
 +    src/c/getHandleProperty/set_arrow_size_property.c \
 +    src/c/getHandleProperty/set_children_property.c \
 +    src/c/getHandleProperty/set_axes_reverse_property.c \
 +    src/c/getHandleProperty/set_grid_property.c \
 +    src/c/getHandleProperty/set_grid_thickness_property.c \
 +    src/c/getHandleProperty/set_grid_style_property.c \
 +    src/c/getHandleProperty/set_log_flags_property.c \
 +    src/c/getHandleProperty/set_cube_scaling_property.c \
 +    src/c/getHandleProperty/set_colored_property.c \
 +    src/c/getHandleProperty/set_margins_property.c \
 +    src/c/getHandleProperty/set_auto_ticks_property.c \
 +    src/c/getHandleProperty/set_xtics_coord_property.c \
 +    src/c/getHandleProperty/set_color_mode_property.c \
 +    src/c/getHandleProperty/set_data_bounds_property.c \
 +    src/c/getHandleProperty/set_tics_labels_property.c \
 +    src/c/getHandleProperty/set_data_mapping_property.c \
 +    src/c/getHandleProperty/set_rotation_angles_property.c \
 +    src/c/getHandleProperty/set_callback_type_property.c \
 +    src/c/getHandleProperty/set_segs_color_property.c \
 +    src/c/getHandleProperty/set_format_n_property.c \
 +    src/c/getHandleProperty/set_sub_tics_property.c \
 +    src/c/getHandleProperty/set_hidden_axis_color_property.c \
 +    src/c/getHandleProperty/set_isoview_property.c \
 +    src/c/getHandleProperty/set_box_property.c \
 +    src/c/getHandleProperty/set_hidden_color_property.c \
 +    src/c/getHandleProperty/set_label_font_style_property.c \
 +    src/c/getHandleProperty/set_surface_color_property.c \
 +    src/c/getHandleProperty/set_yticks_coord_property.c \
 +    src/c/getHandleProperty/CheckTicksProperty.c \
 +    src/c/getHandleProperty/set_x_ticks_property.c \
 +    src/c/getHandleProperty/set_ticks_format_property.c \
 +    src/c/getHandleProperty/set_ticks_st_property.c \
 +    src/c/getHandleProperty/set_viewport_property.c \
 +    src/c/getHandleProperty/set_info_message_property.c \
 +    src/c/getHandleProperty/set_screen_position_property.c \
 +    src/c/getHandleProperty/set_event_handler_property.c \
 +    src/c/getHandleProperty/set_event_handler_enable_property.c \
 +    src/c/getHandleProperty/set_arc_drawing_method_property.c \
 +    src/c/getHandleProperty/set_fractional_font_property.c \
 +    src/c/getHandleProperty/set_links_property.c \
 +    src/c/getHandleProperty/set_legend_location_property.c \
 +    src/c/getHandleProperty/set_filled_property.c \
 +    src/c/getHandleProperty/set_color_range_property.c \
 +    src/c/getHandleProperty/set_outside_colors_property.c \
 +    src/c/getHandleProperty/set_grid_position_property.c \
 +    src/c/getHandleProperty/set_anti_aliasing_property.c \
 +    src/c/getHandleProperty/set_tag_property.c \
 +    src/c/getHandleProperty/set_figure_resizefcn_property.c \
 +    src/c/getHandleProperty/get_figure_resizefcn_property.c \
 +    src/c/getHandleProperty/set_figure_closerequestfcn_property.c \
 +    src/c/getHandleProperty/get_figure_closerequestfcn_property.c \
 +    src/c/getHandleProperty/get_datatip_property.c \
 +    src/c/getHandleProperty/set_datatip_property.c \
 +    src/c/getHandleProperty/set_image_type_property.c \
 +    src/c/getHandleProperty/get_display_function_data_property.c \
 +    src/c/getHandleProperty/set_display_function_data_property.c \
 +    src/c/getHandleProperty/set_resize_property.c \
 +    src/c/getHandleProperty/set_toolbar_property.c \
 +    src/c/getHandleProperty/set_menubar_property.c \
 +    src/c/getHandleProperty/set_infobar_property.c \
 +    src/c/getHandleProperty/set_dockable_property.c \
 +    src/c/getHandleProperty/get_layout_property.c \
 +    src/c/getHandleProperty/set_layout_property.c \
 +    src/c/getHandleProperty/get_constraints_property.c \
 +    src/c/getHandleProperty/set_constraints_property.c \
 +    src/c/getHandleProperty/set_rect_property.c \
 +    src/c/getHandleProperty/get_layout_options_property.c \
 +    src/c/getHandleProperty/set_layout_options_property.c \
 +    src/c/getHandleProperty/get_border_property.cpp \
 +    src/c/getHandleProperty/set_border_property.c \
 +    src/c/getHandleProperty/get_groupname_property.c \
 +    src/c/getHandleProperty/set_groupname_property.c \
 +    src/c/getHandleProperty/get_tabtitle_property.c \
 +    src/c/getHandleProperty/set_tabtitle_property.c \
 +    src/c/getHandleProperty/get_scrollable_property.c \
 +    src/c/getHandleProperty/set_scrollable_property.c \
 +    src/c/getHandleProperty/get_marks_count_property.c \
 +    src/c/getHandleProperty/set_marks_count_property.c \
 +    src/c/getHandleProperty/get_line_width_property.c \
 +    src/c/getHandleProperty/set_line_width_property.c \
 +    src/c/DefaultCommandArg.c \
 +    src/c/Axes.c \
 +    src/c/sciMatrix.c \
 +    src/c/DrawObjects.c \
 +    src/c/GetProperty.c \
 +    src/c/Contour.c \
 +    src/c/SetProperty.c \
 +    src/c/BasicAlgos.c \
 +    src/c/BuildObjects.c \
 +    src/c/sciCall.c \
 +    src/c/CloneObjects.c \
 +    src/c/InitObjects.c \
 +    src/c/pixel_mode.c \
 +    src/c/Format.c \
 +    src/c/Champ.c \
 +    src/c/StringMatrix.c \
 +    src/c/FeC.c \
 +    src/c/Plo2dEch.c \
 +    src/c/Plo2dn.c \
 +    src/c/Gray.c \
 +    src/c/DestroyObjects.c \
 +    src/c/math_graphics.c \
 +    src/c/Interaction.c \
 +    src/c/StringBox.c \
 +    src/c/axesScale.c \
 +    src/c/TerminateGraphics.c \
 +    src/c/periEmpty.c \
 +    src/c/scitokenize.c \
 +    src/c/get_ticks_utils.c \
 +    src/c/getHandleProperty/get_ambient_color_property.c \
 +    src/c/getHandleProperty/get_diffuse_color_property.c \
 +    src/c/getHandleProperty/get_specular_color_property.c \
 +    src/c/getHandleProperty/get_use_color_material_property.c \
 +    src/c/getHandleProperty/get_material_shininess_property.c \
 +    src/c/getHandleProperty/get_light_type_property.c \
 +    src/c/getHandleProperty/get_direction_property.c \
 +    src/c/getHandleProperty/set_ambient_color_property.c \
 +    src/c/getHandleProperty/set_diffuse_color_property.c \
 +    src/c/getHandleProperty/set_specular_color_property.c \
 +    src/c/getHandleProperty/set_use_color_material_property.c \
 +    src/c/getHandleProperty/set_material_shininess_property.c \
 +    src/c/getHandleProperty/set_light_type_property.c \
 +    src/c/getHandleProperty/set_direction_property.c \
 +    src/c/getHandleProperty/set_auto_margins_property.c \
 +    src/c/getHandleProperty/get_auto_margins_property.c \
 +    src/c/name2rgb.c \
 +    src/c/addColor.c
 +
 +GRAPHICS_CXX_SOURCES = \
 +    src/cpp/configgraphicvariable.cpp \
-     src/cpp/set_data_property.cpp
++    src/cpp/set_data_property.cpp \
++    src/cpp/ContourOnMesh.cpp
 +
 +GATEWAY_C_SOURCES = \
 +    sci_gateway/c/sci_swap_handles.c \
 +    sci_gateway/c/sci_grayplot.c \
 +    sci_gateway/c/sci_xfpolys.c \
 +    sci_gateway/c/sci_newaxes.c \
 +    sci_gateway/c/sci_xlfont.c \
 +    sci_gateway/c/sci_xgraduate.c \
 +    sci_gateway/c/sci_xgrid.c \
 +    sci_gateway/c/sci_xclick.c \
 +    sci_gateway/c/sci_geom3d.c \
 +    sci_gateway/c/sci_unzoom.c \
 +    sci_gateway/c/sci_xsegs.c \
 +    sci_gateway/c/sci_glue.c \
 +    sci_gateway/c/sci_xarc.c \
 +    sci_gateway/c/sci_xpolys.c \
 +    sci_gateway/c/sci_xstring.c \
 +    sci_gateway/c/sci_xstringb.c \
 +    sci_gateway/c/sci_show_window.c \
 +    sci_gateway/c/sci_param3d1.c \
 +    sci_gateway/c/sci_xname.c \
 +    sci_gateway/c/sci_xpoly.c \
 +    sci_gateway/c/sci_xchange.c \
 +    sci_gateway/c/sci_drawaxis.c \
 +    sci_gateway/c/sci_demo.c \
 +    sci_gateway/c/sci_plot2d1.c \
 +    sci_gateway/c/sci_xrect.c \
 +    sci_gateway/c/sci_xarrows.c \
 +    sci_gateway/c/sci_plot3d.c \
 +    sci_gateway/c/sci_move.c \
 +    sci_gateway/c/sci_copy.c \
 +    sci_gateway/c/sci_xarcs.c \
 +    sci_gateway/c/sci_xfpoly.c \
 +    sci_gateway/c/sci_drawlater.c \
 +    sci_gateway/c/sci_champ.c \
 +    sci_gateway/c/sci_unglue.c \
 +    sci_gateway/c/gw_graphics.c \
 +    sci_gateway/c/sci_zoom_rect.c \
 +    sci_gateway/c/sci_delete.c \
 +    sci_gateway/c/sci_plot2d.c \
 +    sci_gateway/c/sci_xrects.c \
 +    sci_gateway/c/sci_xtitle.c \
 +    sci_gateway/c/sci_StringBox.c \
 +    sci_gateway/c/sci_xgetmouse.c \
 +    sci_gateway/c/sci_drawnow.c \
 +    sci_gateway/c/sci_xfarcs.c \
 +    sci_gateway/c/sci_param3d.c \
 +    sci_gateway/c/sci_contour2di.c \
 +    sci_gateway/c/sci_xdel.c \
 +    sci_gateway/c/sci_fec.c \
 +    sci_gateway/c/sci_set.c \
 +    sci_gateway/c/sci_rubberbox.c \
 +    sci_gateway/c/sci_rotate_axes.c \
 +    sci_gateway/c/sci_is_handle_valid.c \
 +    sci_gateway/c/sci_Legend.c \
 +    sci_gateway/c/sci_light.c \
 +    sci_gateway/c/sci_color.c \
 +    sci_gateway/c/sci_name2rgb.c \
 +    sci_gateway/c/sci_addcolor.c
 +
 +GATEWAY_CXX_SOURCES = \
 +    sci_gateway/cpp/graphics_gw.cpp \
 +    sci_gateway/cpp/sci_get.cpp \
 +    sci_gateway/cpp/sci_xget.cpp \
 +    sci_gateway/cpp/sci_xset.cpp \
 +    sci_gateway/cpp/sci_matplot.cpp \
 +    sci_gateway/cpp/sci_matplot1.cpp \
-     sci_gateway/cpp/sci_winsid.cpp
++    sci_gateway/cpp/sci_winsid.cpp \
++    sci_gateway/cpp/sci_contour2dm.cpp
 +
  libscigraphics_la_CPPFLAGS = \
 -      -I$(srcdir)/includes/ \
 -      -I$(srcdir)/src/c/ \
 -      -I$(srcdir)/src/cpp/ \
 -      -I$(srcdir)/src/c/getHandleProperty/ \
 -      -I$(top_srcdir)/modules/action_binding/includes/ \
 -      -I$(top_srcdir)/modules/api_scilab/includes/ \
 -      -I$(top_srcdir)/modules/elementary_functions/includes/ \
 -      -I$(top_srcdir)/modules/fileio/includes/ \
 -      -I$(top_srcdir)/modules/graphic_export/includes/ \
 -      -I$(top_srcdir)/modules/graphic_objects/includes/ \
 -      -I$(top_srcdir)/modules/gui/includes/ \
 -      -I$(top_srcdir)/modules/jvm/includes/ \
 -      -I$(top_srcdir)/modules/localization/includes/ \
 -      -I$(top_srcdir)/modules/output_stream/includes/ \
 -      -I$(top_srcdir)/modules/renderer/includes/ \
 -      -I$(top_srcdir)/modules/string/includes/ \
 -      $(AM_CPPFLAGS)
 +    -I$(srcdir)/includes/ \
 +    -I$(srcdir)/src/c/ \
 +    -I$(srcdir)/src/cpp/ \
 +    -I$(srcdir)/src/c/getHandleProperty/ \
 +    -I$(top_srcdir)/modules/ast/includes/ast/ \
 +    -I$(top_srcdir)/modules/ast/includes/exps/ \
 +    -I$(top_srcdir)/modules/ast/includes/operations/ \
 +    -I$(top_srcdir)/modules/ast/includes/parse/ \
 +    -I$(top_srcdir)/modules/ast/includes/symbol/ \
 +    -I$(top_srcdir)/modules/ast/includes/system_env/ \
 +    -I$(top_srcdir)/modules/ast/includes/types/ \
 +    -I$(top_srcdir)/modules/ast/includes/analysis/ \
 +    -I$(top_srcdir)/modules/action_binding/includes/ \
 +    -I$(top_srcdir)/modules/api_scilab/includes/ \
 +    -I$(top_srcdir)/modules/elementary_functions/includes/ \
 +    -I$(top_srcdir)/modules/fileio/includes/ \
 +    -I$(top_srcdir)/modules/graphic_export/includes/ \
 +    -I$(top_srcdir)/modules/graphic_objects/includes/ \
 +    -I$(top_srcdir)/modules/gui/includes/ \
 +    -I$(top_srcdir)/modules/jvm/includes/ \
 +    -I$(top_srcdir)/modules/localization/includes/ \
 +    -I$(top_srcdir)/modules/output_stream/includes/ \
 +    -I$(top_srcdir)/modules/renderer/includes/ \
 +    -I$(top_srcdir)/modules/string/includes/ \
 +    -I$(top_srcdir)/modules/localization/includes/ \
 +    -I$(top_srcdir)/modules/threads/includes/ \
 +    -I$(top_srcdir)/modules/console/includes/ \
 +    -I$(top_srcdir)/modules/dynamic_link/includes \
 +    $(TCL_INC_PATH) \
 +    $(TK_INC_PATH) \
 +    $(AM_CPPFLAGS)
  
  libscigraphics_algo_la_SOURCES = $(GRAPHICS_C_SOURCES) $(GRAPHICS_CXX_SOURCES)
  libscigraphics_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
@@@ -2817,10 -2772,8 +2821,12 @@@ src/cpp/$(am__dirstamp)
  src/cpp/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) src/cpp/$(DEPDIR)
        @: > src/cpp/$(DEPDIR)/$(am__dirstamp)
 +src/cpp/libscigraphics_algo_la-configgraphicvariable.lo:  \
 +      src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp)
 +src/cpp/libscigraphics_algo_la-set_data_property.lo:  \
 +      src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp)
+ src/cpp/libscigraphics_algo_la-ContourOnMesh.lo:  \
+       src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp)
  
  libscigraphics-algo.la: $(libscigraphics_algo_la_OBJECTS) $(libscigraphics_algo_la_DEPENDENCIES) $(EXTRA_libscigraphics_algo_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK) $(am_libscigraphics_algo_la_rpath) $(libscigraphics_algo_la_OBJECTS) $(libscigraphics_algo_la_LIBADD) $(LIBS)
@@@ -3022,27 -2990,9 +3028,30 @@@ sci_gateway/cpp/$(am__dirstamp)
  sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp/$(DEPDIR)
        @: > sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 +sci_gateway/cpp/libscigraphics_la-graphics_gw.lo:  \
 +      sci_gateway/cpp/$(am__dirstamp) \
 +      sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 +sci_gateway/cpp/libscigraphics_la-sci_get.lo:  \
 +      sci_gateway/cpp/$(am__dirstamp) \
 +      sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 +sci_gateway/cpp/libscigraphics_la-sci_xget.lo:  \
 +      sci_gateway/cpp/$(am__dirstamp) \
 +      sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 +sci_gateway/cpp/libscigraphics_la-sci_xset.lo:  \
 +      sci_gateway/cpp/$(am__dirstamp) \
 +      sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 +sci_gateway/cpp/libscigraphics_la-sci_matplot.lo:  \
 +      sci_gateway/cpp/$(am__dirstamp) \
 +      sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 +sci_gateway/cpp/libscigraphics_la-sci_matplot1.lo:  \
 +      sci_gateway/cpp/$(am__dirstamp) \
 +      sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 +sci_gateway/cpp/libscigraphics_la-sci_winsid.lo:  \
 +      sci_gateway/cpp/$(am__dirstamp) \
 +      sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+ sci_gateway/cpp/libscigraphics_la-sci_contour2dm.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
  
  libscigraphics.la: $(libscigraphics_la_OBJECTS) $(libscigraphics_la_DEPENDENCIES) $(EXTRA_libscigraphics_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK) $(am_libscigraphics_la_rpath) $(libscigraphics_la_OBJECTS) $(libscigraphics_la_LIBADD) $(LIBS)
@@@ -3122,13 -3078,7 +3131,14 @@@ distclean-compile
  @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_xstringb.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_xtitle.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_zoom_rect.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-graphics_gw.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_contour2dm.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_get.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_matplot.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_matplot1.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_winsid.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_xget.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_xset.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscigraphics_algo_la-Axes.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscigraphics_algo_la-BasicAlgos.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscigraphics_algo_la-BuildObjects.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_z_ticks_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_zoom_box_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_zoom_state_property.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphics_algo_la-ContourOnMesh.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphics_algo_la-configgraphicvariable.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphics_algo_la-set_data_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@src/nographics/$(DEPDIR)/libscigraphics_disable_la-nographics.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@src/nographics/$(DEPDIR)/libscigraphics_disable_la-nographics_gw.Plo@am__quote@
  
  .c.o:
  @am__fastdepCC_TRUE@  $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@@ -6533,83 -6538,20 +6544,97 @@@ sci_gateway/c/libscigraphics_la-sci_add
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
  
 +src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo: src/c/getHandleProperty/get_border_property.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_border_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo `test -f 'src/c/getHandleProperty/get_border_property.cpp' || echo '$(srcdir)/'`src/c/getHandleProperty/get_border_property.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_border_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_border_property.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/c/getHandleProperty/get_border_property.cpp' object='src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo `test -f 'src/c/getHandleProperty/get_border_property.cpp' || echo '$(srcdir)/'`src/c/getHandleProperty/get_border_property.cpp
 +
 +src/cpp/libscigraphics_algo_la-configgraphicvariable.lo: src/cpp/configgraphicvariable.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphics_algo_la-configgraphicvariable.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphics_algo_la-configgraphicvariable.Tpo -c -o src/cpp/libscigraphics_algo_la-configgraphicvariable.lo `test -f 'src/cpp/configgraphicvariable.cpp' || echo '$(srcdir)/'`src/cpp/configgraphicvariable.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libscigraphics_algo_la-configgraphicvariable.Tpo src/cpp/$(DEPDIR)/libscigraphics_algo_la-configgraphicvariable.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/cpp/configgraphicvariable.cpp' object='src/cpp/libscigraphics_algo_la-configgraphicvariable.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphics_algo_la-configgraphicvariable.lo `test -f 'src/cpp/configgraphicvariable.cpp' || echo '$(srcdir)/'`src/cpp/configgraphicvariable.cpp
 +
 +src/cpp/libscigraphics_algo_la-set_data_property.lo: src/cpp/set_data_property.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphics_algo_la-set_data_property.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphics_algo_la-set_data_property.Tpo -c -o src/cpp/libscigraphics_algo_la-set_data_property.lo `test -f 'src/cpp/set_data_property.cpp' || echo '$(srcdir)/'`src/cpp/set_data_property.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libscigraphics_algo_la-set_data_property.Tpo src/cpp/$(DEPDIR)/libscigraphics_algo_la-set_data_property.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/cpp/set_data_property.cpp' object='src/cpp/libscigraphics_algo_la-set_data_property.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphics_algo_la-set_data_property.lo `test -f 'src/cpp/set_data_property.cpp' || echo '$(srcdir)/'`src/cpp/set_data_property.cpp
 +
+ src/cpp/libscigraphics_algo_la-ContourOnMesh.lo: src/cpp/ContourOnMesh.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphics_algo_la-ContourOnMesh.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphics_algo_la-ContourOnMesh.Tpo -c -o src/cpp/libscigraphics_algo_la-ContourOnMesh.lo `test -f 'src/cpp/ContourOnMesh.cpp' || echo '$(srcdir)/'`src/cpp/ContourOnMesh.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libscigraphics_algo_la-ContourOnMesh.Tpo src/cpp/$(DEPDIR)/libscigraphics_algo_la-ContourOnMesh.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/cpp/ContourOnMesh.cpp' object='src/cpp/libscigraphics_algo_la-ContourOnMesh.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphics_algo_la-ContourOnMesh.lo `test -f 'src/cpp/ContourOnMesh.cpp' || echo '$(srcdir)/'`src/cpp/ContourOnMesh.cpp
 +src/nographics/libscigraphics_disable_la-nographics_gw.lo: src/nographics/nographics_gw.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/nographics/libscigraphics_disable_la-nographics_gw.lo -MD -MP -MF src/nographics/$(DEPDIR)/libscigraphics_disable_la-nographics_gw.Tpo -c -o src/nographics/libscigraphics_disable_la-nographics_gw.lo `test -f 'src/nographics/nographics_gw.cpp' || echo '$(srcdir)/'`src/nographics/nographics_gw.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/nographics/$(DEPDIR)/libscigraphics_disable_la-nographics_gw.Tpo src/nographics/$(DEPDIR)/libscigraphics_disable_la-nographics_gw.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/nographics/nographics_gw.cpp' object='src/nographics/libscigraphics_disable_la-nographics_gw.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/nographics/libscigraphics_disable_la-nographics_gw.lo `test -f 'src/nographics/nographics_gw.cpp' || echo '$(srcdir)/'`src/nographics/nographics_gw.cpp
 +
 +sci_gateway/cpp/libscigraphics_la-graphics_gw.lo: sci_gateway/cpp/graphics_gw.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigraphics_la-graphics_gw.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-graphics_gw.Tpo -c -o sci_gateway/cpp/libscigraphics_la-graphics_gw.lo `test -f 'sci_gateway/cpp/graphics_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/graphics_gw.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-graphics_gw.Tpo sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-graphics_gw.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='sci_gateway/cpp/graphics_gw.cpp' object='sci_gateway/cpp/libscigraphics_la-graphics_gw.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigraphics_la-graphics_gw.lo `test -f 'sci_gateway/cpp/graphics_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/graphics_gw.cpp
 +
 +sci_gateway/cpp/libscigraphics_la-sci_get.lo: sci_gateway/cpp/sci_get.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigraphics_la-sci_get.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_get.Tpo -c -o sci_gateway/cpp/libscigraphics_la-sci_get.lo `test -f 'sci_gateway/cpp/sci_get.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_get.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_get.Tpo sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_get.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='sci_gateway/cpp/sci_get.cpp' object='sci_gateway/cpp/libscigraphics_la-sci_get.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigraphics_la-sci_get.lo `test -f 'sci_gateway/cpp/sci_get.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_get.cpp
 +
 +sci_gateway/cpp/libscigraphics_la-sci_xget.lo: sci_gateway/cpp/sci_xget.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigraphics_la-sci_xget.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_xget.Tpo -c -o sci_gateway/cpp/libscigraphics_la-sci_xget.lo `test -f 'sci_gateway/cpp/sci_xget.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xget.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_xget.Tpo sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_xget.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='sci_gateway/cpp/sci_xget.cpp' object='sci_gateway/cpp/libscigraphics_la-sci_xget.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigraphics_la-sci_xget.lo `test -f 'sci_gateway/cpp/sci_xget.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xget.cpp
 +
 +sci_gateway/cpp/libscigraphics_la-sci_xset.lo: sci_gateway/cpp/sci_xset.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigraphics_la-sci_xset.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_xset.Tpo -c -o sci_gateway/cpp/libscigraphics_la-sci_xset.lo `test -f 'sci_gateway/cpp/sci_xset.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xset.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_xset.Tpo sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_xset.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='sci_gateway/cpp/sci_xset.cpp' object='sci_gateway/cpp/libscigraphics_la-sci_xset.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigraphics_la-sci_xset.lo `test -f 'sci_gateway/cpp/sci_xset.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xset.cpp
 +
 +sci_gateway/cpp/libscigraphics_la-sci_matplot.lo: sci_gateway/cpp/sci_matplot.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigraphics_la-sci_matplot.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_matplot.Tpo -c -o sci_gateway/cpp/libscigraphics_la-sci_matplot.lo `test -f 'sci_gateway/cpp/sci_matplot.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_matplot.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_matplot.Tpo sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_matplot.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='sci_gateway/cpp/sci_matplot.cpp' object='sci_gateway/cpp/libscigraphics_la-sci_matplot.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigraphics_la-sci_matplot.lo `test -f 'sci_gateway/cpp/sci_matplot.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_matplot.cpp
 +
 +sci_gateway/cpp/libscigraphics_la-sci_matplot1.lo: sci_gateway/cpp/sci_matplot1.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigraphics_la-sci_matplot1.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_matplot1.Tpo -c -o sci_gateway/cpp/libscigraphics_la-sci_matplot1.lo `test -f 'sci_gateway/cpp/sci_matplot1.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_matplot1.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_matplot1.Tpo sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_matplot1.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='sci_gateway/cpp/sci_matplot1.cpp' object='sci_gateway/cpp/libscigraphics_la-sci_matplot1.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigraphics_la-sci_matplot1.lo `test -f 'sci_gateway/cpp/sci_matplot1.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_matplot1.cpp
 +
 +sci_gateway/cpp/libscigraphics_la-sci_winsid.lo: sci_gateway/cpp/sci_winsid.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigraphics_la-sci_winsid.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_winsid.Tpo -c -o sci_gateway/cpp/libscigraphics_la-sci_winsid.lo `test -f 'sci_gateway/cpp/sci_winsid.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_winsid.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_winsid.Tpo sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_winsid.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='sci_gateway/cpp/sci_winsid.cpp' object='sci_gateway/cpp/libscigraphics_la-sci_winsid.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigraphics_la-sci_winsid.lo `test -f 'sci_gateway/cpp/sci_winsid.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_winsid.cpp
 +
+ sci_gateway/cpp/libscigraphics_la-sci_contour2dm.lo: sci_gateway/cpp/sci_contour2dm.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigraphics_la-sci_contour2dm.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_contour2dm.Tpo -c -o sci_gateway/cpp/libscigraphics_la-sci_contour2dm.lo `test -f 'sci_gateway/cpp/sci_contour2dm.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_contour2dm.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_contour2dm.Tpo sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_contour2dm.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='sci_gateway/cpp/sci_contour2dm.cpp' object='sci_gateway/cpp/libscigraphics_la-sci_contour2dm.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigraphics_la-sci_contour2dm.lo `test -f 'sci_gateway/cpp/sci_contour2dm.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_contour2dm.cpp
  mostlyclean-libtool:
        -rm -f *.lo
  
    </PropertyGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>includes;includes/handleDrawing;src/c;src/c/getHandleProperty;../../libs/intl;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../elementary_functions/includes;../graphic_objects/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;../threads/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes/handleDrawing;includes;src/cpp;src/c;src/c/getHandleProperty;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;includes/handleDrawing;src/cpp;src/c;src/c/getHandleProperty;../../libs/intl;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../elementary_functions/includes;../graphic_objects/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;../threads/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -117,15 -109,10 +117,15 @@@ lib /DEF:"$(ProjectDir)elementary_funct
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>includes;includes/handleDrawing;src/c;src/c/getHandleProperty;../../libs/intl;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../elementary_functions/includes;../graphic_objects/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;../threads/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes/handleDrawing;includes;src/cpp;src/c;src/c/getHandleProperty;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;includes/handleDrawing;src/cpp;src/c;src/c/getHandleProperty;../../libs/intl;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../elementary_functions/includes;../graphic_objects/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;../threads/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -149,11 -134,8 +149,11 @@@ lib /DEF:"$(ProjectDir)elementary_funct
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
      <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-       <AdditionalIncludeDirectories>includes;includes/handleDrawing;src/c;src/c/getHandleProperty;../../libs/intl;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../elementary_functions/includes;../graphic_objects/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;../threads/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes/handleDrawing;includes;src/cpp;src/c;src/c/getHandleProperty;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;includes/handleDrawing;src/cpp;src/c;src/c/getHandleProperty;../../libs/intl;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../elementary_functions/includes;../graphic_objects/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;../threads/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -196,10 -168,8 +196,10 @@@ lib /DEF:"$(ProjectDir)elementary_funct
        <TargetEnvironment>X64</TargetEnvironment>
      </Midl>
      <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-       <AdditionalIncludeDirectories>includes;includes/handleDrawing;src/c;src/c/getHandleProperty;../../libs/intl;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../elementary_functions/includes;../graphic_objects/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;../threads/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes/handleDrawing;includes;src/cpp;src/c;src/c/getHandleProperty;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;includes/handleDrawing;src/cpp;src/c;src/c/getHandleProperty;../../libs/intl;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../renderer/includes;../jvm/includes;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../elementary_functions/includes;../graphic_objects/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;../threads/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -238,12 -198,12 +238,14 @@@ lib /DEF:"$(ProjectDir)elementary_funct
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
 +    <ClCompile Include="src\cpp\configgraphicvariable.cpp" />
+     <ClCompile Include="sci_gateway\cpp\sci_contour2dm.cpp" />
      <ClCompile Include="sci_gateway\c\sci_addcolor.c" />
      <ClCompile Include="sci_gateway\c\sci_color.c" />
      <ClCompile Include="sci_gateway\c\sci_light.c" />
      <ClCompile Include="sci_gateway\c\sci_name2rgb.c" />
 +    <ClCompile Include="src\cpp\set_data_property.cpp" />
+     <ClCompile Include="src\cpp\ContourOnMesh.cpp" />
      <ClCompile Include="src\c\addColor.c" />
      <ClCompile Include="src\c\Axes.c" />
      <ClCompile Include="src\c\axesScale.c" />
      <ClInclude Include="includes\BasicAlgos.h" />
      <ClInclude Include="includes\BuildObjects.h" />
      <ClInclude Include="includes\Champ.h" />
 +    <ClInclude Include="src\cpp\configgraphicvariable.hxx" />
      <ClInclude Include="includes\Light.h" />
      <ClInclude Include="includes\name2rgb.h" />
+     <ClInclude Include="src\cpp\ContourOnMesh.hxx" />
      <ClInclude Include="src\c\CheckScilabXgc.h" />
      <ClInclude Include="src\c\getHandleProperty\AnchorType.h" />
      <ClInclude Include="src\c\getHandleProperty\BarType.h" />
      <ClCompile Include="sci_gateway\c\sci_color.c">
        <Filter>Source Files</Filter>
      </ClCompile>
+     <ClCompile Include="sci_gateway\cpp\sci_contour2dm.cpp">
+       <Filter>Source Files</Filter>
+     </ClCompile>
+     <ClCompile Include="src\cpp\ContourOnMesh.cpp">
+       <Filter>Source Files</Filter>
+     </ClCompile>
 +    <ClCompile Include="src\c\getHandleProperty\get_border_property.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="src\cpp\set_data_property.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="src\c\getHandleProperty\set_datatip_property.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="includes\Axes.h">
      <None Include="Elementary_functions_f_Import.def">
        <Filter>Libraries Dependencies\Imports</Filter>
      </None>
 +    <None Include="locales\graphics.pot" />
 +    <None Include="locales\graphics.pot" />
 +    <None Include="locales\graphics.pot" />
 +    <None Include="locales\graphics.pot" />
 +    <None Include="locales\graphics.pot" />
 +    <None Include="locales\graphics.pot" />
 +    <None Include="locales\graphics.pot" />
 +    <None Include="locales\graphics.pot" />
 +    <None Include="locales\graphics.pot" />
 +    <None Include="locales\graphics.pot" />
++    <None Include="locales\graphics.pot" />
    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="graphic.rc">
  /*--------------------------------------------------------------------------*/
  GRAPHICS_IMPEXP int gw_graphics(void);
  
 -GRAPHICS_IMPEXP int sci_addcb(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_champ(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_champ1(char *fname, unsigned long fname_len);
 +GRAPHICS_IMPEXP int sci_addcb(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_champ(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_champ1(char *fname, void *pvApiCtx);
  GRAPHICS_IMPEXP int sci_champ_G(char *fname,
                                  int (*func) (double *, double *, double *, double *, int *, int *, char *, double *, double *, int),
 -                                unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xarc(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xarcs(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_zoom_rect(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xtitle(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xstringb(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xstring(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xsetech(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xset(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xsegs(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xrects(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xrect(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xpolys(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xpoly(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xname(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xlfont(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xgrid(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xgraduate(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xgetmouse(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xgetech(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xget(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xfpolys(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xfpoly(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xfarcs(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xdel(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xclick(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xchange(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_xarrows(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_winsid(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_unzoom(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_unglue(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_swap_handles(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_stringbox(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_show_window(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_set(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_rubberbox(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_rotate_axes(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_plot3d(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_plot2d1(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_plot2d1_1(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_plot2d1_2(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_plot2d1_3(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_plot2d1_4(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_plot2d2(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_plot2d3(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_plot2d4(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_plot2d1_G(char *fname, int ptype, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_plot2d(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_param3d1(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_param3d(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_newaxes(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_move(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_matlot1(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_matplot1(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_matlot(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_matplot(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_Legend(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_is_handle_valid(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_grayplot(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_glue(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_get(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_geom3d(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_fec(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_drawnow(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_drawlater(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_drawaxis(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_demo(char *fname, int fname_len);
 -GRAPHICS_IMPEXP int sci_delete(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_copy(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_contour2di(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_light(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_addcolor(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_name2rgb(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_color(char *fname, unsigned long fname_len);
 -GRAPHICS_IMPEXP int sci_contour2dm(char *fname, unsigned long fname_len);
 -
 +                                void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xarc(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xarcs(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_zoom_rect(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xtitle(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xstringb(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xstring(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xsetech(char *fname, void *pvApiCtx);
 +//GRAPHICS_IMPEXP int sci_xset(char *fname, void *pvApiCtx); => c++
 +GRAPHICS_IMPEXP int sci_xsegs(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xrects(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xrect(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xpolys(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xpoly(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xname(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xlfont(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xgrid(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xgraduate(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xgetmouse(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xgetech(char *fname, void *pvApiCtx);
 +//GRAPHICS_IMPEXP int sci_xget(char *fname, void *pvApiCtx); => c++
 +GRAPHICS_IMPEXP int sci_xfpolys(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xfpoly(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xfarcs(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xdel(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xclick(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xchange(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_xarrows(char *fname, void *pvApiCtx);
 +//GRAPHICS_IMPEXP int sci_winsid(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_unzoom(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_unglue(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_swap_handles(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_stringbox(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_show_window(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_set(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_rubberbox(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_rotate_axes(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_plot3d(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_plot2d1(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_plot2d1_1(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_plot2d1_2(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_plot2d1_3(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_plot2d1_4(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_plot2d2(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_plot2d3(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_plot2d4(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_plot2d1_G(char *fname, int ptype, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_plot2d(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_param3d1(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_param3d(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_newaxes(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_move(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_matlot1(char *fname, void *pvApiCtx);
 +//GRAPHICS_IMPEXP int sci_matplot1(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_matlot(char *fname, void *pvApiCtx);
 +//GRAPHICS_IMPEXP int sci_matplot(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_Legend(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_is_handle_valid(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_grayplot(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_glue(char *fname, void *pvApiCtx);
 +//GRAPHICS_IMPEXP int sci_get(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_geom3d(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_fec(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_drawnow(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_drawlater(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_drawaxis(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_demo(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_delete(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_copy(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_contour2di(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_light(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_addcolor(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_name2rgb(char *fname, void *pvApiCtx);
 +GRAPHICS_IMPEXP int sci_color(char *fname, void *pvApiCtx);
++GRAPHICS_IMPEXP int sci_contour2dm(char *fname, void *pvApiCtx);
  /*--------------------------------------------------------------------------*/
  #endif /* __INTGRAPHICS__ */
  /*--------------------------------------------------------------------------*/
index 9ae54a4,0000000..af33c66
mode 100644,000000..100644
--- /dev/null
@@@ -1,111 -1,0 +1,112 @@@
 +/*
 + *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 + *  Copyright (C) 2012 - 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-en.txt
 + *
 + */
 +
 +#pragma comment(lib,"../../../../bin/libintl.lib")
 +
 +#include "graphics_gw.hxx"
 +#include "function.hxx"
 +#include "context.hxx"
 +
 +#define MODULE_NAME L"graphics"
 +extern "C"
 +{
 +#include "gw_graphics.h"
 +#include "loadOnUseClassPath.h"
 +}
 +
 +using namespace types;
 +
 +bool GraphicsModule::loadedDep = false;
 +
 +void GraphicsModule::LoadDeps(std::wstring _functionName)
 +{
 +    if (loadedDep == false)
 +    {
 +        loadOnUseClassPath("graphics");
 +        loadedDep = true;
 +    }
 +}
 +
 +
 +int GraphicsModule::Load()
 +{
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"champ", &sci_champ, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"champ1", &sci_champ1, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"fec", &sci_fec, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"geom3d", &sci_geom3d, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"grayplot", &sci_grayplot, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"Matplot", &sci_matplot, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"Matplot1", &sci_matplot1, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"contour2di", &sci_contour2di, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"param3d", &sci_param3d, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"param3d1", &sci_param3d1, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xstringb", &sci_xstringb, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot2d", &sci_plot2d, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot2d1", &sci_plot2d1_1, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot2d2", &sci_plot2d1_2, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot2d3", &sci_plot2d1_3, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot2d4", &sci_plot2d1_4, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot3d", &sci_plot3d, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot3d1", &sci_plot3d, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"winsid", &sci_winsid, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xarc", &sci_xarc, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xarcs", &sci_xarcs, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xarrows", &sci_xarrows, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"drawaxis", &sci_drawaxis, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xchange", &sci_xchange, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xclick", &sci_xclick, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xdel", &sci_xdel, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xfarc", &sci_xarc, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xfarcs", &sci_xfarcs, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xfpoly", &sci_xfpoly, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xfpolys", &sci_xfpolys, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xfrect", &sci_xrect, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xget", &sci_xget, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xgetmouse", &sci_xgetmouse, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xgrid", &sci_xgrid, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xlfont", &sci_xlfont, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xpoly", &sci_xpoly, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xpolys", &sci_xpolys, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xrect", &sci_xrect, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xrects", &sci_xrects, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xsegs", &sci_xsegs, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"show_window", &sci_show_window, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xset", &sci_xset, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xstring", &sci_xstring, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xtitle", &sci_xtitle, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xgraduate", &sci_xgraduate, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xname", &sci_xname, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"zoom_rect", &sci_zoom_rect, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"unzoom", &sci_unzoom, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"stringbox", &sci_stringbox, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"move", &sci_move, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"glue", &sci_glue, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"unglue", &sci_unglue, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"drawnow", &sci_drawnow, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"drawlater", &sci_drawlater, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"copy", &sci_copy, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"delete", &sci_delete, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"get", &sci_get, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"set", &sci_set, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"newaxes", &sci_newaxes, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"swap_handles", &sci_swap_handles, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"rubberbox", &sci_rubberbox, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"rotate_axes", &sci_rotate_axes, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"is_handle_valid", &sci_is_handle_valid, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"captions", &sci_Legend, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"light", &sci_light, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"addcolor", &sci_addcolor, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"name2rgb", &sci_name2rgb, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"color", &sci_color, &GraphicsModule::LoadDeps, MODULE_NAME));
++    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"contour2dm", &sci_contour2dm, &GraphicsModule::LoadDeps, MODULE_NAME));
 +    return 1;
 +}
index 0000000,139a0ce..5f1657d
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,232 +1,232 @@@
+ #include "ContourOnMesh.hxx"
+ extern "C"
+ {
+ #include "gw_graphics.h"
+ #include "Scierror.h"
+ #include "api_scilab.h"
+ #include "localization.h"
+ #include "math_graphics.h"
+ }
 -int sci_contour2dm(char * fname, unsigned long fname_len)
++int sci_contour2dm(char * fname, void *pvApiCtx)
+ {
+     SciErr sciErr;
+     int m1 = 0, n1 = 0, m2 = 0, n2 = 0, m3 = 0, n3 = 0, m4 = 0, n4 = 0, m5 = 0, n5 = 0, mn1 = 0;
+     int iType1 = 0, iType2 = 0, iType3 = 0, iType4 = 0, iType5 = 0;
+     int* piAddr1 = NULL;
+     int* piAddr2 = NULL;
+     int* piAddr3 = NULL;
+     int* piAddr4 = NULL;
+     int* piAddr5 = NULL;
+     double* l1 = NULL;
+     double* l2 = NULL;
+     double* l3 = NULL;
+     double* l4 = NULL;
+     double* l5 = NULL;
+     bool l5alloc = false;
+     std::vector<double> xC;
+     std::vector<double> yC;
+     CheckInputArgument(pvApiCtx, 5, 5);
+     CheckOutputArgument(pvApiCtx, 2, 2);
+     //get variable address
+     sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr1);
+     if (sciErr.iErr)
+     {
+         printError(&sciErr, 0);
+         return 1;
+     }
+     //check type
+     sciErr = getVarType(pvApiCtx, piAddr1, &iType1);
+     if (sciErr.iErr || iType1 != sci_matrix)
+     {
+         Scierror(202, _("%s: Wrong type for argument #%d: A real expected.\n"), fname, 1);
+         printError(&sciErr, 0);
+         return 1;
+     }
+     // Retrieve a matrix of double at position 1.
+     sciErr = getMatrixOfDouble(pvApiCtx, piAddr1, &m1, &n1, &l1);
+     if (sciErr.iErr)
+     {
+         Scierror(202, _("%s: Wrong type for argument #%d: A real expected.\n"), fname, 1);
+         printError(&sciErr, 0);
+         return 1;
+     }
+     //get variable address
+     sciErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddr2);
+     if (sciErr.iErr)
+     {
+         printError(&sciErr, 0);
+         return 1;
+     }
+     //check type
+     sciErr = getVarType(pvApiCtx, piAddr2, &iType2);
+     if (sciErr.iErr || iType2 != sci_matrix)
+     {
+         Scierror(202, _("%s: Wrong type for argument #%d: A real expected.\n"), fname, 2);
+         printError(&sciErr, 0);
+         return 1;
+     }
+     // Retrieve a matrix of double at position 2.
+     sciErr = getMatrixOfDouble(pvApiCtx, piAddr2, &m2, &n2, &l2);
+     if (sciErr.iErr)
+     {
+         Scierror(202, _("%s: Wrong type for argument #%d: A real expected.\n"), fname, 2);
+         printError(&sciErr, 0);
+         return 1;
+     }
+     //CheckSameDims
+     if (m1 != m2 || n1 != n2)
+     {
+         Scierror(999, _("%s: Wrong size for input argument #%d: %d-by-%d matrix expected.\n"), fname, 2, m1, n1);
+         return 1;
+     }
+     //get variable address
+     sciErr = getVarAddressFromPosition(pvApiCtx, 3, &piAddr3);
+     if (sciErr.iErr)
+     {
+         printError(&sciErr, 0);
+         return 1;
+     }
+     //check type
+     sciErr = getVarType(pvApiCtx, piAddr3, &iType3);
+     if (sciErr.iErr || iType3 != sci_matrix)
+     {
+         Scierror(202, _("%s: Wrong type for argument #%d: A real expected.\n"), fname, 3);
+         printError(&sciErr, 0);
+         return 1;
+     }
+     // Retrieve a matrix of double at position 3.
+     sciErr = getMatrixOfDouble(pvApiCtx, piAddr3, &m3, &n3, &l3);
+     if (sciErr.iErr)
+     {
+         Scierror(202, _("%s: Wrong type for argument #%d: A real expected.\n"), fname, 3);
+         printError(&sciErr, 0);
+         return 1;
+     }
+     if (n3 < 5)
+     {
+         Scierror(999, _("%s: Wrong number of columns for input argument #%d: at least %d expected.\n"), fname, 3, 5);
+         return 0;
+     }
+     // remove number and flag
+     n3 -= 2;
+     //get variable address
+     sciErr = getVarAddressFromPosition(pvApiCtx, 4, &piAddr4);
+     if (sciErr.iErr)
+     {
+         printError(&sciErr, 0);
+         return 1;
+     }
+     //check type
+     sciErr = getVarType(pvApiCtx, piAddr4, &iType4);
+     if (sciErr.iErr || iType4 != sci_matrix)
+     {
+         Scierror(202, _("%s: Wrong type for argument #%d: A real expected.\n"), fname, 4);
+         printError(&sciErr, 0);
+         return 1;
+     }
+     // Retrieve a matrix of double at position 4.
+     sciErr = getMatrixOfDouble(pvApiCtx, piAddr4, &m4, &n4, &l4);
+     if (sciErr.iErr)
+     {
+         Scierror(202, _("%s: Wrong type for argument #%d: A real expected.\n"), fname, 4);
+         printError(&sciErr, 0);
+         return 1;
+     }
+     sciErr = getVarAddressFromPosition(pvApiCtx, 5, &piAddr5);
+     if (sciErr.iErr)
+     {
+         printError(&sciErr, 0);
+         return 1;
+     }
+     //check type
+     sciErr = getVarType(pvApiCtx, piAddr5, &iType5);
+     if (sciErr.iErr || iType5 != sci_matrix)
+     {
+         Scierror(202, _("%s: Wrong type for argument #%d: A real expected.\n"), fname, 5);
+         printError(&sciErr, 0);
+         return 1;
+     }
+     // Retrieve a matrix of double at position 5.
+     sciErr = getMatrixOfDouble(pvApiCtx, piAddr5, &m5, &n5, &l5);
+     if (sciErr.iErr)
+     {
+         Scierror(202, _("%s: Wrong type for argument #%d: A real expected.\n"), fname, 5);
+         printError(&sciErr, 0);
+         return 1;
+     }
+     if (m1 * n1 == 0 || m3 == 0)
+     {
+         AssignOutputVariable(pvApiCtx, 1) = 0;
+         ReturnArguments(pvApiCtx);
+         return 0;
+     }
+     // If z is a scalar
+     if (m5 * n5 == 1)
+     {
+         double zmin = (double) Mini(l4, m4 * n4);
+         double zmax = (double) Maxi(l4, m4 * n4);
+         int nb = l5[0];
+         l5 = new double[nb];
+         l5alloc = true;
+         for (int i = 0; i < nb; ++i)
+         {
+             l5[i] = zmin + (i + 1) * (zmax - zmin) / (nb + 1);
+         }
+         m5 = 1;
+         n5 = nb;
+     }
+     bool res = org_modules_graphics::LevelCurve::compute(m1 * n1, l1, l2, l4, m3, n3, l3, m5 * n5, l5, xC, yC);
+     if (l5alloc)
+     {
+         delete[] l5;
+     }
+     if (!res)
+     {
+         // error in index
+         Scierror(999, _("%s: Invalid vertex index.\n"), fname, 3);
+         printError(&sciErr, 0);
+         return 1;
+     }
+     sciErr = createMatrixOfDouble(pvApiCtx, 6, 1, xC.size(), &(xC[0]));
+     if (sciErr.iErr)
+     {
+         printError(&sciErr, 0);
+         Scierror(999, _("%s: Memory allocation error.\n"), fname);
+         return 1;
+     }
+     sciErr = createMatrixOfDouble(pvApiCtx, 7, 1, yC.size(), &(yC[0]));
+     if (sciErr.iErr)
+     {
+         printError(&sciErr, 0);
+         Scierror(999, _("%s: Memory allocation error.\n"), fname);
+         return 1;
+     }
+     AssignOutputVariable(pvApiCtx, 1) = 6;
+     AssignOutputVariable(pvApiCtx, 2) = 7;
+     ReturnArguments(pvApiCtx);
+     return 0;
+ }
      <br/>
      <br/>
  
 -    <!-- Scilab 5.6.0 -->
      <div class="refsection">
-       <h3 class="title">What's new in Scilab 6.0.0?</h3>
-       <p class="para">
-         <a href="http://www.scilab.org/community/news/XXXXXXXX/release_notes">See Scilab 6.0.0 release notes.</a>
-       </p>
+       <h3 class="title">What's new?</h3>
 -      <h2 class="title">Scilab 5.6.0</h2>
 -      Scilab 5.6.0 is ...
++      <h2 class="title">Scilab 6.0.0</h2>
++      Scilab 6.0.0 is ...
+       <br/><br/>
 -      <a href="http://www.scilab.org/community/news/20140411/release_notes">See Scilab 5.6.0 release notes.</a>
++      <a href="http://www.scilab.org/community/news/XXXXXXXX/release_notes">See Scilab 6.0.0 release notes.</a>
        <br/>
      </div>
  
      <br/>
      <br/>
  
 -    <!-- Scilab 5.6.0 -->
 +    <!-- Scilab 6.0.0 -->
      <div class="refsection">
-       <h3 class="title">Nouveautés de Scilab 6.0.0</h3>
-       <p class="para">
-         <a href="http://www.scilab.org/community/news/XXXXXXXX/release_notes">Voir les notes de version de Scilab 6.0.0 (anglais).</a>
-       </p>
+       <h3 class="title">Nouveautés</h3>
 -      <h2>Scilab 5.6.0</h2>
 -      Scilab 5.6.0 est ...
++      <h2>Scilab 6.0.0</h2>
++      Scilab 6.0.0 est ...
+       <br/><br/>
 -      <a href="http://www.scilab.org/community/news/XXXXXXXX/release_notes">Voir les notes de version de Scilab 5.6.0 (anglais)</a>
++      <a href="http://www.scilab.org/community/news/XXXXXXXX/release_notes">Voir les notes de version de Scilab 6.0.0 (anglais)</a>
        <br/>
      </div>
  
@@@ -18,5 -18,5 +18,5 @@@ rate = 1
  p = 1.12837916D-150;
  q = 1;
  x = 0;
- refMsg = msprintf(_("%s: Answer appears to be lower than lowest search bound %g"), "cdfgam", 1e-300);
 -refMsg = msprintf(_("Answer appears to be lower than lowest search bound %g\n"), 1e-300);
++refMsg = msprintf(_("%s: Answer appears to be lower than lowest search bound %g\n"), "cdfgam", 1e-300);
  assert_checkerror("shape1 = cdfgam(""Shape"", shape, p, q, x);", refMsg);
@@@ -22,5 -22,5 +22,5 @@@ p = 1.12837916D-150
  q = 1;
  x = 0;
  
- refMsg = msprintf(_("%s: Answer appears to be lower than lowest search bound %g"), "cdfgam", 1e-300);
 -refMsg = msprintf(_("Answer appears to be lower than lowest search bound %g\n"), 1e-300);
++refMsg = msprintf(_("%s: Answer appears to be lower than lowest search bound %g\n"), "cdfgam", 1e-300);
  assert_checkerror("shape1 = cdfgam(""Shape"", shape, p, q, x);", refMsg);