46 files changed, 351 insertions, 71 deletions
diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib
new file mode 100644
index 00000000..ae21cfc5
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/lib
diff --git a/2.3-1/macros/ASTManagement/names b/2.3-1/macros/ASTManagement/names
new file mode 100644
index 00000000..43522229
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/names
@@ -0,0 +1,55 @@
+%comment_string
+%cste_string
+%equal_string
+%for_string
+%funcall_string
+%ifthenel_string
+%operatio_string
+%program_p
+%program_string
+%variable_string
+%while_string
+AST2Ccode
+AST_CheckCommonInOutArgs
+AST_CheckLastFunc
+AST_CheckLineLength
+AST_CheckPrecSpecifier
+AST_DisplayStack
+AST_ExtractNameAndScope
+AST_GetASTFile
+AST_GetFuncallPrm
+AST_GetPrecAndLhsArg
+AST_HandleEOL
+AST_HandleEndFor
+AST_HandleEndGenFun
+AST_HandleEndProgram
+AST_HandleEndWhile
+AST_HandleFor
+AST_HandleForStatem
+AST_HandleHeader
+AST_HandleIfElse
+AST_HandleWhileExpr
+AST_HandleWhileStatem
+AST_ParseEqualStruct
+AST_ParseFuncallStruct
+AST_ParseIfExprStruct
+AST_ParseOperStruct
+AST_PopASTStack
+AST_PushASTStack
+AST_ReadASTHeader
+AST_ReadEqualRhsNames
+GenOutArgNames
+Operator2FunName
+SciFile2ASTFile
+_comment_string
+_cste_string
+_equal_string
+_for_string
+_funcall_string
+_ifthenel_string
+_operatio_string
+_program_p
+_program_string
+_variable_string
+_while_string
+objectlist2string
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
index 07891c56..7dfb4da4 100644
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
+++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
@@ -71,31 +71,20 @@ else
 	  PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
     PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
     PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi',FileInfo.MakefileFilename,'file','y','y');
-    if(SharedInfo.OpenCVUsed == %T)
-      PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y');
-      PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y');
-      PrintStringInfo('LDFLAGS += -lopencv_objdetect -lopencv_ocl -lopencv_photo -lopencv_stitching -lopencv_superres',FileInfo.MakefileFilename,'file','y','y');
-      PrintStringInfo('LDFLAGS += -lopencv_ts -lopencv_video -lopencv_videostab -lopencv_core -lrt -lpthread -lm -ldl', FileInfo.MakefileFilename,'file','y','y');
-      PrintStringInfo('LDFLAGS += -lIlmImf -ljpeg -ljasper -ltiff -lpng -lzlib -lstdc++',FileInfo.MakefileFilename,'file','y','y');
-    end
   else
 		PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
     PrintStringInfo('CXX     = g++',FileInfo.MakefileFilename,'file','y','y');
     PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
     PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
 	  PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
-    if(SharedInfo.OpenCVUsed == %T)
-      //PrintStringInfo('LDFLAGS += `pkg-config --libs opencv`',FileInfo.MakefileFilename,'file','y','y');
-      //PrintStringInfo('CFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y');
-      //PrintStringInfo('CXXFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y');
+  end 
+	if(SharedInfo.OpenCVUsed == %T)
       PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y');
       PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y');
       PrintStringInfo('LDFLAGS += -lopencv_objdetect -lopencv_ocl -lopencv_photo -lopencv_stitching -lopencv_superres',FileInfo.MakefileFilename,'file','y','y');
       PrintStringInfo('LDFLAGS += -lopencv_ts -lopencv_video -lopencv_videostab -lopencv_core -lrt -lpthread -lm -ldl', FileInfo.MakefileFilename,'file','y','y');
       PrintStringInfo('LDFLAGS += -lIlmImf -ljpeg -ljasper -ltiff -lpng -lzlib -lstdc++',FileInfo.MakefileFilename,'file','y','y');
-    end
-  end 
-	
+  end
 end
 //If ode function is used, add libgsl.
 if(size(SharedInfo.Includelist) <> 0)
@@ -110,28 +99,8 @@ PrintStringInfo('EXEFILE = $(SCI2CDIR)/$(EXEFILENAME)', FileInfo.MakefileFilenam
 
 // Sources
 //Check the output format selected and insert files according to it
-target = SharedInfo.Target;
 PrintStringInfo('SRC = $(wildcard $(CSRCDIR)/*.c)', FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('SRCC = $(wildcard $(CSRCDIR)/*.cpp)', FileInfo.MakefileFilename,'file','y','y');
-// allSources = getAllSources(SharedInfo);
-// nbSources = size(allSources);
-
-// for i = 1:(nbSources(1) - 1)
-//   [tmppath,tmpfile,tmpext] = fileparts(allSources(i));
-  
-//   if(~isempty(strstr(allSources(i),'dode')))
-//     if(size(SharedInfo.Includelist) <> 0)
-//         if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T))
-//           PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y');
-//         end
-//     end
-//   else
-//     PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y');
-//   end
-// end
-
-// [tmppath,tmpfile,tmpext] = fileparts(allSources(nbSources(1)));
-// PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext, FileInfo.MakefileFilename,'file','y','y');
 
 // Objects
 PrintStringInfo('OBJ = $(SRC:.c=.o)', FileInfo.MakefileFilename,'file','y','y');
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.sci
index b49a2c31..00ffb63c 100644
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.sci
+++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.sci
@@ -24,6 +24,8 @@ MakefileFilename = FileInfo.MakefileFilename + '.mak';
 PrintStepInfo('Generating Builder '+MakefileFilename,...
    FileInfo.GeneralReport,'both');
 
+target = SharedInfo.Target;
+
 PrintStringInfo('# SCI2C Makefile (Visual Studio 2008)',MakefileFilename,'file','y','y');
 PrintStringInfo('# hArtes EU Project.',MakefileFilename,'file','y','y');
 PrintStringInfo('# Authors: PoliBa & Inria & DIGITEO',MakefileFilename,'file','y','y');
@@ -35,37 +37,54 @@ PrintStringInfo('# --- DIRECTORIES AND FILES ---',MakefileFilename,'file','y','y
 makecsrcdir  = pathconvert('src/c', %f, %f, 'u');
 makehsrcdir  = pathconvert('includes', %f, %f, 'u');
 makeisrcdir  = pathconvert('interfaces', %f, %f, 'u');
+makelibdir   = pathconvert('libraries', %f, %f, 'u');
 makesci2cdir = FileInfo.CStyleOutCCCodeDir;
+
 PrintStringInfo('CSRCDIR     = '+makecsrcdir,MakefileFilename,'file','y','y');
 PrintStringInfo('HSRCDIR     = '+makehsrcdir,MakefileFilename,'file','y','y');
 PrintStringInfo('ISRCDIR     = '+makeisrcdir,MakefileFilename,'file','y','y');
 PrintStringInfo('SCI2CDIR    = .',MakefileFilename,'file','y','y');
 
 PrintStringInfo('DIR_OBJ=Release',MakefileFilename,'file','y','y');
-PrintStringInfo('LAPACK_LIB =$(SCI2CDIR)/external-libs/lapack.lib',MakefileFilename,'file','y','y');
-PrintStringInfo('BLAS_LIB = $(SCI2CDIR)/external-libs/blasplus.lib',MakefileFilename,'file','y','y');
+//PrintStringInfo('LAPACK_LIB =$(SCI2CDIR)/libraries/lapack.lib',MakefileFilename,'file','y','y');
+//PrintStringInfo('BLAS_LIB = $(SCI2CDIR)/libraries/blasplus.lib',MakefileFilename,'file','y','y');
+PrintStringInfo('LIB_PATH = $(SCI2CDIR)/libraries',MakefileFilename,'file','y','y');
+PrintStringInfo('LIBS = lapack.lib blasplus.lib',MakefileFilename,'file','y','y');
+PrintStringInfo('LIBS = $(LIBS) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib',MakefileFilename,'file','y','y');
 PrintStringInfo('CC = cl',MakefileFilename,'file','y','y');
 PrintStringInfo('LINKER = link',MakefileFilename,'file','y','y');
 PrintStringInfo('LINKER_OPTIMISATION_MODE=/RELEASE ',MakefileFilename,'file','y','y');
-PrintStringInfo('CC__OPTIMISATION_MODE=-Z7 -O2 -MD',MakefileFilename,'file','y','y');
+PrintStringInfo('CC__OPTIMISATION_MODE=-Z7 -O2 -MT',MakefileFilename,'file','y','y');
 PrintStringInfo('CC_OPTIONS = $(CC_COMMON) -W3 -Gd $(CC__OPTIMISATION_MODE) /Fo""$(DIR_OBJ)/"" /Fd""$(DIR_OBJ)/"" ',MakefileFilename,'file','y','y');
 PrintStringInfo('CFLAGS =  $(CC_OPTIONS) -I""$(HSRCDIR)"" -I""$(ISRCDIR)"" /EHsc /TP ',MakefileFilename,'file','y','y');
-PrintStringInfo('EXEFILENAME = mytest',MakefileFilename,'file','y','y');
+PrintStringInfo('EXEFILENAME = '+SharedInfo.SCIMainFunName,MakefileFilename,'file','y','y');
 PrintStringInfo('EXEFILE = $(SCI2CDIR)\\$(EXEFILENAME)',MakefileFilename,'file','y','y');
 PrintStringInfo('MAIN_SRC = $(SCI2CDIR)/main.c',MakefileFilename,'file','y','y');
 
-// Sources
-PrintStringInfo('SRC = \\', MakefileFilename,'file','y','y');
-allSources = getAllSources();
-nbSources = size(allSources);
-for i = 1:(nbSources(1) - 1)
-  [tmppath,tmpfile,tmpext] = fileparts(allSources(i));
-  PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext+' \\', MakefileFilename,'file','y','y');
+if(SharedInfo.OpenCVUsed == %T)
+	PrintStringInfo('LIBS = $(LIBS) opencv_calib3d2413.lib opencv_contrib2413.lib opencv_features2d2413.lib',MakefileFilename,'file','y','y');
+	PrintStringInfo('LIBS = $(LIBS) opencv_flann2413.lib opencv_gpu2413.lib opencv_highgui2413.lib ',MakefileFilename,'file','y','y');
+	PrintStringInfo('LIBS = $(LIBS) opencv_imgproc2413.lib opencv_legacy2413.lib opencv_ml2413.lib opencv_nonfree2413.lib',MakefileFilename,'file','y','y');
+	PrintStringInfo('LIBS = $(LIBS) opencv_objdetect2413.lib opencv_ocl2413.lib opencv_photo2413.lib opencv_stitching2413.lib',MakefileFilename,'file','y','y');
+	PrintStringInfo('LIBS = $(LIBS) opencv_superres2413.lib opencv_ts2413.lib opencv_video2413.lib opencv_videostab2413.lib opencv_core2413.lib',MakefileFilename,'file','y','y');
+	PrintStringInfo('LIBS = $(LIBS) IlmImf.lib libjpeg.lib libjasper.lib libtiff.lib libpng.lib zlib.lib',MakefileFilename,'file','y','y');
 end
-[tmppath,tmpfile,tmpext] = fileparts(allSources(nbSources(1)));
-PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext, MakefileFilename,'file','y','y');
+// Sources
+PrintStringInfo('SRC = $(CSRCDIR)/*.c', MakefileFilename,'file','y','y');
+PrintStringInfo('SRCC = $(CSRCDIR)/*.cpp', MakefileFilename,'file','y','y');
+
+//PrintStringInfo('SRC = \\', MakefileFilename,'file','y','y');
+//allSources = getAllSources();
+//nbSources = size(allSources);
+//for i = 1:(nbSources(1) - 1)
+//  [tmppath,tmpfile,tmpext] = fileparts(allSources(i));
+//  PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext+' \\', MakefileFilename,'file','y','y');
+//end
+//[tmppath,tmpfile,tmpext] = fileparts(allSources(nbSources(1)));
+//PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext, MakefileFilename,'file','y','y');
 
 PrintStringInfo('OBJ = $(SRC:.c=.obj) $(MAIN_SRC:.c=.obj)',MakefileFilename,'file','y','y');
+PrintStringInfo('OBJC = $(SRCC:.cpp=.o)', MakefileFilename,'file','y','y');
 PrintStringInfo('# ---------------',MakefileFilename,'file','y','y');
 PrintStringInfo('# --- TARGETS ---',MakefileFilename,'file','y','y');
 PrintStringInfo('# ---------------',MakefileFilename,'file','y','y');
@@ -75,12 +94,14 @@ PrintStringInfo('\t@echo ""============================""',MakefileFilename,'fil
 PrintStringInfo('\t@echo ""Generation of the executable""',MakefileFilename,'file','y','y');
 PrintStringInfo('\t@echo ""============================""',MakefileFilename,'file','y','y');
 PrintStringInfo('\t-IF NOT EXIST  $(DIR_OBJ) mkdir $(DIR_OBJ)',MakefileFilename,'file','y','y');
-PrintStringInfo('\t$(CC) $(CFLAGS) $(SRC) $(MAIN_SRC) /link $(LAPACK_LIB) $(BLAS_LIB) /out:$(EXEFILE).exe',MakefileFilename,'file','y','y');
+PrintStringInfo('\t$(CC) $(CFLAGS) $(SRC) $(SRCC) $(MAIN_SRC) /link /LIBPATH:$(LIB_PATH) $(LIBS) /out:$(EXEFILE).exe',MakefileFilename,'file','y','y');
 PrintStringInfo('\t@echo "" ""',MakefileFilename,'file','y','y');
-PrintStringInfo('\t@echo ""==============""',MakefileFilename,'file','y','y');
-PrintStringInfo('\t@echo ""Executing code""',MakefileFilename,'file','y','y');
-PrintStringInfo('\t@echo ""==============""',MakefileFilename,'file','y','y');
-PrintStringInfo('\t$(EXEFILE).exe',MakefileFilename,'file','y','y');
+if(target == "StandAlone")
+	PrintStringInfo('\t@echo ""==============""',MakefileFilename,'file','y','y');
+	PrintStringInfo('\t@echo ""Executing code""',MakefileFilename,'file','y','y');
+	PrintStringInfo('\t@echo ""==============""',MakefileFilename,'file','y','y');
+	PrintStringInfo('\t$(EXEFILE).exe',MakefileFilename,'file','y','y');
+end
 PrintStringInfo('clean:',MakefileFilename,'file','y','y');
 PrintStringInfo('\t@echo "" ""',MakefileFilename,'file','y','y');
 PrintStringInfo('\t@echo ""=============================""',MakefileFilename,'file','y','y');
diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib
new file mode 100644
index 00000000..ef0ea492
--- /dev/null
+++ b/2.3-1/macros/CCodeGeneration/lib
diff --git a/2.3-1/macros/CCodeGeneration/names b/2.3-1/macros/CCodeGeneration/names
new file mode 100644
index 00000000..efbb400a
--- /dev/null
+++ b/2.3-1/macros/CCodeGeneration/names
@@ -0,0 +1,23 @@
+C_FinalizeCode
+C_ForExpression
+C_Funcall
+C_GenDeclarations
+C_GenerateFunName
+C_GenerateLaunchScript
+C_GenerateMakefile
+C_GenerateMakefile_msvc
+C_GenerateSCI2CHeader
+C_IfElseBlocks
+C_IfExpression
+C_IndentBlanks
+C_InitHeader
+C_MemAllocOutTempVars
+C_SCI2CHeader
+C_Type
+C_WhileExpression
+GenCFunDatFiles
+GetClsFileName
+GetSymbolDimension
+GetWhileCondVariable
+JoinDeclarAndCcode
+Sci2AnnotationFile
diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib
new file mode 100644
index 00000000..5b1667c2
--- /dev/null
+++ b/2.3-1/macros/ErrorMessages/lib
diff --git a/2.3-1/macros/ErrorMessages/names b/2.3-1/macros/ErrorMessages/names
new file mode 100644
index 00000000..f55e8f8b
--- /dev/null
+++ b/2.3-1/macros/ErrorMessages/names
@@ -0,0 +1,3 @@
+EM_NanSize
+EM_UnknownStep
+EM_ZeroSize
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci
index c5f39abd..4cd6467d 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci
@@ -12,7 +12,7 @@ if (isnum(in1val)) then
     //disp(out);
 
 else
-    error(36, "Wrong input argument '+in1val+'.");
+    error(36, "Wrong input argument "+in1val+".");
 
 end
 if (in2_num>10) then
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci
index fc205254..75d0cb07 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci
@@ -9,7 +9,7 @@ if (isnum(inval)) then
     //disp(out);
 
 else
-    error(36, "Wrong input argument '+inval+'.");
+    error(36, "Wrong input argument "+inval+".");
 
 end
 
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci
index 688e1da4..c1e07773 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci
@@ -9,7 +9,7 @@ if (isnum(inval)) then
     //disp(out);
 
 else
-    error(36, "Wrong input argument '+inval+'.");
+    error(36, "Wrong input argument "+inval+".");
 
 end
 
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci
index 44544ccc..056d333d 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci
@@ -9,7 +9,7 @@ if (isnum(inval)) then
     //disp(out);
 
 else
-    error(36, "Wrong input argument '+inval+'.");
+    error(36, "Wrong input argument "+inval+".");
 
 end
 
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci
index e44f036a..d816ff75 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci
@@ -9,7 +9,7 @@ if (isnum(inval)) then
     //disp(out);
 
 else
-    error(36, "Wrong input argument '+inval+'.");
+    error(36, "Wrong input argument "+inval+".");
 
 end
 
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci
index bb02b985..5ff03a60 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci
@@ -33,4 +33,4 @@ else
 end
 
 
-endfunction:
+endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci
index 69a816cc..86f2aa7d 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci
@@ -30,4 +30,4 @@ SCI2CNInArgCheck(argn(1),1,1);
 
     in1num = string(eval(insize(1)));
     outsize = in1num;  
-endfunction:
+endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci
index 7b945310..5a450686 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci
@@ -9,7 +9,7 @@ if (isnum(inval)) then
     //disp(out);
 
 else
-    error(36, "Wrong input argument '+inval+'.");
+    error(36, "Wrong input argument "+inval+".");
 
 end
 
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
index f99d156e..50b897e0 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
@@ -44,7 +44,7 @@ elseif(inval == '2') then
     outsize(1) = string(in1num_c);
     outsize(2) = string(in1num_c + in2num_c);
 else
-     error(36, "Wrong input argument '+inval+'. Use 1 or 2 as first argument in cat command.");
+     error(36, "Wrong input argument "+inval+". Use 1 or 2 as first argument in cat command.");
 end
 
 endfunction 
diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib
new file mode 100644
index 00000000..d9cc4762
--- /dev/null
+++ b/2.3-1/macros/FunctionAnnotation/lib
diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names
new file mode 100644
index 00000000..8962de09
--- /dev/null
+++ b/2.3-1/macros/FunctionAnnotation/names
@@ -0,0 +1,74 @@
+FA_ADD
+FA_DIV
+FA_GetDefaultPrecision
+FA_GetFunAnn
+FA_GetOutArgInfo
+FA_GetResizeApproach
+FA_INT
+FA_MAX
+FA_MIN
+FA_MUL
+FA_REAL
+FA_SCHUR_SZ
+FA_SCHUR_TP
+FA_SUB
+FA_SZ_1
+FA_SZ_2
+FA_SZ_COLUMN_DIAG
+FA_SZ_COL_DIAG_IN_EX
+FA_SZ_DEC2BASE
+FA_SZ_DEC2BIN
+FA_SZ_DEC2HEX
+FA_SZ_DEC2OCT
+FA_SZ_DIFF
+FA_SZ_FACTOR
+FA_SZ_FROM_VAL
+FA_SZ_LINSPACE_ROW
+FA_SZ_LQE
+FA_SZ_LQR
+FA_SZ_OBSCNT
+FA_SZ_OPAPEX
+FA_SZ_OPBACKSLASH
+FA_SZ_OPCC
+FA_SZ_OPDOTAPEX
+FA_SZ_OPDOTBACKSLASH
+FA_SZ_OPDOTHAT
+FA_SZ_OPDOTSLASH
+FA_SZ_OPDOTSTAR
+FA_SZ_OPHAT
+FA_SZ_OPLOGAND
+FA_SZ_OPLOGEQ
+FA_SZ_OPLOGGE
+FA_SZ_OPLOGGT
+FA_SZ_OPLOGLE
+FA_SZ_OPLOGLT
+FA_SZ_OPLOGNE
+FA_SZ_OPLOGNOT
+FA_SZ_OPLOGOR
+FA_SZ_OPMINUS
+FA_SZ_OPPLUS
+FA_SZ_OPPLUSA
+FA_SZ_OPRC
+FA_SZ_OPSLASH
+FA_SZ_OPSTAR
+FA_SZ_PRIMES
+FA_SZ_ROW_COLUMN_CAT
+FA_SZ_ROW_DIAG
+FA_SZ_ROW_DIAG_INS_EXT
+FA_SZ_SEL1
+FA_SZ_SEL2
+FA_TP_C
+FA_TP_COMPLEX
+FA_TP_CVIMAGE
+FA_TP_D
+FA_TP_I
+FA_TP_INT16
+FA_TP_INT8
+FA_TP_MAX
+FA_TP_MIN_REAL
+FA_TP_REAL
+FA_TP_S
+FA_TP_UINT16
+FA_TP_UINT8
+FA_TP_USER
+FA_TP_Z
diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib
new file mode 100644
index 00000000..fc8038c9
--- /dev/null
+++ b/2.3-1/macros/FunctionList/lib
diff --git a/2.3-1/macros/FunctionList/names b/2.3-1/macros/FunctionList/names
new file mode 100644
index 00000000..c40e30ca
--- /dev/null
+++ b/2.3-1/macros/FunctionList/names
@@ -0,0 +1,6 @@
+FL_ExistCFunction
+FL_ExtractFuncList
+FL_GetFunctionClass
+FL_InOutArgs2CFunNames
+FL_UpdateConverted
+FL_UpdateToBeConv
diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib
new file mode 100644
index 00000000..1c78f72c
--- /dev/null
+++ b/2.3-1/macros/GeneralFunctions/lib
diff --git a/2.3-1/macros/GeneralFunctions/names b/2.3-1/macros/GeneralFunctions/names
new file mode 100644
index 00000000..eb8300a1
--- /dev/null
+++ b/2.3-1/macros/GeneralFunctions/names
@@ -0,0 +1,28 @@
+Array2String
+ConvertPathMat2C
+File2StringArray
+FunName2SciFileName
+IsNanSize
+KeyStr2FileStrPos
+PrintStepInfo
+PrintStringInfo
+ReadStringCard
+SCI2CCreateDir
+SCI2CFindFile
+SCI2CNInArgCheck
+SCI2COpenFileRead
+SCI2COpenFileWrite
+SCI2CTemplate
+SCI2Ccopyfile
+SCI2Cfileexist
+SCI2Cflipud
+SCI2Cmdelete
+SCI2Cresize
+SCI2Cstring
+SCI2Cstrncmp
+SCI2Cstrncmps1size
+SizeInByte
+dispina
+filenamefprintf
+float
+squeezestrings
diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib
new file mode 100644
index 00000000..16d9e3ea
--- /dev/null
+++ b/2.3-1/macros/Hardware/AVR/lib
diff --git a/2.3-1/macros/Hardware/AVR/names b/2.3-1/macros/Hardware/AVR/names
new file mode 100644
index 00000000..8fcfdb75
--- /dev/null
+++ b/2.3-1/macros/Hardware/AVR/names
@@ -0,0 +1,22 @@
+AVRADCSetup
+AVRDigitalIn
+AVRDigitalOut
+AVRDigitalPortSetup
+AVRDigitalSetup
+AVRGetTimerValue
+AVRPWM0SetDuty
+AVRPWM0Setup
+AVRPWM1SetDuty
+AVRPWM1Setup
+AVRPWM2SetDuty
+AVRPWM2Setup
+AVRReadADC
+AVRSleep
+AVRTimerSetup
+AVRUARTReceive
+AVRUARTSetup
+AVRUARTTransmit
+GetAVRSupportFunctions
+GetPeripheral
+InsertPeripheralInList
+IsAVRSupportFunction
diff --git a/2.3-1/macros/Hardware/RasberryPi/lib b/2.3-1/macros/Hardware/RasberryPi/lib
new file mode 100644
index 00000000..b92a6ea7
--- /dev/null
+++ b/2.3-1/macros/Hardware/RasberryPi/lib
diff --git a/2.3-1/macros/Hardware/RasberryPi/names b/2.3-1/macros/Hardware/RasberryPi/names
new file mode 100644
index 00000000..fa647761
--- /dev/null
+++ b/2.3-1/macros/Hardware/RasberryPi/names
@@ -0,0 +1,21 @@
+GetRPISupportFunctions
+IsRPISupportFunction
+RPI_DelayMicro
+RPI_DelayMilli
+RPI_DigitalIn
+RPI_DigitalOut
+RPI_DigitalSetup
+RPI_GetMicros
+RPI_GetMillis
+RPI_HardPWMSetClock
+RPI_HardPWMSetMode
+RPI_HardPWMSetRange
+RPI_HardPWMWrite
+RPI_PinISR
+RPI_SerialClose
+RPI_SerialFlush
+RPI_SerialGetChar
+RPI_SerialSendChar
+RPI_SerialSendData
+RPI_SerialSetup
+u16RPISerialDataAvail
diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib
new file mode 100644
index 00000000..87c0f305
--- /dev/null
+++ b/2.3-1/macros/ImageProcessing/core/lib
diff --git a/2.3-1/macros/ImageProcessing/core/names b/2.3-1/macros/ImageProcessing/core/names
new file mode 100644
index 00000000..f56c951c
--- /dev/null
+++ b/2.3-1/macros/ImageProcessing/core/names
@@ -0,0 +1,2 @@
+CV_CreateImage
+CV_GetImgSize
diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib
new file mode 100644
index 00000000..8f5561e0
--- /dev/null
+++ b/2.3-1/macros/ImageProcessing/highgui/lib
diff --git a/2.3-1/macros/ImageProcessing/highgui/names b/2.3-1/macros/ImageProcessing/highgui/names
new file mode 100644
index 00000000..a717164a
--- /dev/null
+++ b/2.3-1/macros/ImageProcessing/highgui/names
@@ -0,0 +1,4 @@
+CV_LoadImage
+CV_SaveImage
+CV_ShowImage
+CV_WaitKey
diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib
new file mode 100644
index 00000000..c8b45d34
--- /dev/null
+++ b/2.3-1/macros/ImageProcessing/imgproc/lib
diff --git a/2.3-1/macros/ImageProcessing/imgproc/names b/2.3-1/macros/ImageProcessing/imgproc/names
new file mode 100644
index 00000000..16240f53
--- /dev/null
+++ b/2.3-1/macros/ImageProcessing/imgproc/names
@@ -0,0 +1,11 @@
+CV_AdaptiveThreshold
+CV_Blur
+CV_Canny
+CV_CornerHarris
+CV_CvtColor
+CV_Dilate
+CV_DistanceTransform
+CV_Erode
+CV_GaussianBlur
+CV_MedianBlur
+CV_Threshold
diff --git a/2.3-1/macros/Scilab-Arduino/lib b/2.3-1/macros/Scilab-Arduino/lib
new file mode 100644
index 00000000..da395a36
--- /dev/null
+++ b/2.3-1/macros/Scilab-Arduino/lib
diff --git a/2.3-1/macros/Scilab-Arduino/names b/2.3-1/macros/Scilab-Arduino/names
new file mode 100644
index 00000000..55eb6fef
--- /dev/null
+++ b/2.3-1/macros/Scilab-Arduino/names
@@ -0,0 +1,6 @@
+GenerateSetupFunction
+GetArduinoFunctions
+GetArduinoSetupFunctions
+InsertSetupInList
+IsArduinoFunction
+IsArduinoSetupFunction
diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib
new file mode 100644
index 00000000..f10d8ee9
--- /dev/null
+++ b/2.3-1/macros/SymbolTable/lib
diff --git a/2.3-1/macros/SymbolTable/names b/2.3-1/macros/SymbolTable/names
new file mode 100644
index 00000000..b5a7d65f
--- /dev/null
+++ b/2.3-1/macros/SymbolTable/names
@@ -0,0 +1,12 @@
+ST_AnalyzeScope
+ST_Del
+ST_FindPos
+ST_Get
+ST_GetInArgInfo
+ST_GetSymbolInfo
+ST_InsForCntVars
+ST_InsOutArg
+ST_Load
+ST_MatchSymbol
+ST_Save
+ST_Set
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 0bd402ac..8c5aee70 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -6581,18 +6581,14 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
 PrintStringInfo('NIN=         3',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1), ...
-					IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1), ...
-					IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
 
 PrintStringInfo('NIN=         3',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         2',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1), ...
-					IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1), ...
-					IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
 PrintStringInfo('OUT(2).TP=    ''d''',ClassFileName,'file','y');
 PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
 PrintStringInfo('OUT(2).SZ(2)= ''2''',ClassFileName,'file','y');
diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib
new file mode 100644
index 00000000..439f3abf
--- /dev/null
+++ b/2.3-1/macros/ToolInitialization/lib
diff --git a/2.3-1/macros/ToolInitialization/names b/2.3-1/macros/ToolInitialization/names
new file mode 100644
index 00000000..71a724d3
--- /dev/null
+++ b/2.3-1/macros/ToolInitialization/names
@@ -0,0 +1,14 @@
+INIT_CreateDirs
+INIT_FillSCI2LibCDirs
+INIT_GenAnnFLFunctions
+INIT_GenFileInfo
+INIT_GenLibraries
+INIT_GenSharedInfo
+INIT_LoadLibraries
+INIT_RemoveDirs
+INIT_SCI2C
+INIT_SharedInfoEqual
+ManageNextConversion
+UpdateSCI2CInfo
+doublecomplex
+floatcomplex
diff --git a/2.3-1/macros/findDeps/getAllLibraries.sci b/2.3-1/macros/findDeps/getAllLibraries.sci
index 73923773..14fc020a 100644
--- a/2.3-1/macros/findDeps/getAllLibraries.sci
+++ b/2.3-1/macros/findDeps/getAllLibraries.sci
@@ -65,7 +65,7 @@ function allLibraries = getAllLibraries(SharedInfo)
       allLibraries = cat(1,allLibraries,RPi_cvlibs)  
     end
   elseif Target == "StandAlone"
-    allLibraries =[];
+    allLibraries =["thirdparty/lib/pc/windows/x64/Lapack"];
     if (SharedInfo.OpenCVUsed == %T)
       os_arch = system_getproperty('os.arch');
       if(getos() == 'Linux' & os_arch == 'amd64')
diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib
new file mode 100644
index 00000000..25edeed7
--- /dev/null
+++ b/2.3-1/macros/findDeps/lib
diff --git a/2.3-1/macros/findDeps/names b/2.3-1/macros/findDeps/names
new file mode 100644
index 00000000..2b8c551b
--- /dev/null
+++ b/2.3-1/macros/findDeps/names
@@ -0,0 +1,7 @@
+Scilab2CDeps
+findDeps
+getAllHeaders
+getAllInterfaces
+getAllLibraries
+getAllSources
+getArduinoFiles
diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib
new file mode 100644
index 00000000..fcbd1b8d
--- /dev/null
+++ b/2.3-1/macros/lib
diff --git a/2.3-1/macros/names b/2.3-1/macros/names
new file mode 100644
index 00000000..a126347e
--- /dev/null
+++ b/2.3-1/macros/names
@@ -0,0 +1,6 @@
+cb_sci2c_gui
+getScilab2cVersion
+runsci2c
+runscicode
+sci2c_gui
+scilab2c
diff --git a/2.3-1/macros/runsci2c.sci b/2.3-1/macros/runsci2c.sci
index b5baa15b..eb32a4b5 100644
--- a/2.3-1/macros/runsci2c.sci
+++ b/2.3-1/macros/runsci2c.sci
@@ -187,7 +187,7 @@ else
      copyBlasLapackLibs(FileInfo,SharedInfo);   //Previously .dll files and blas,lapack library not creating for cygwin  by additing this works fine
    end
    if BuildTool == "nmake"
-      copyBlasLapackLibs(FileInfo,SharedInfo);
+      //copyBlasLapackLibs(FileInfo,SharedInfo);
       C_GenerateMakefile_msvc(FileInfo,SharedInfo);
    end
 end