Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Apr 2010 20:43:00 GMT
From:      Rob Farmer <rfarmer@predatorlabs.net>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/146050: [MAINTAINER] [PATCH] math/scilab Update to 5.2.2
Message-ID:  <201004252043.o3PKh0Vn093729@www.freebsd.org>
Resent-Message-ID: <201004252050.o3PKo40I023977@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         146050
>Category:       ports
>Synopsis:       [MAINTAINER] [PATCH] math/scilab Update to 5.2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 25 20:50:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Rob Farmer
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD pentium4.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Fri Apr 23 04:17:21 PDT 2010     rfarmer@pentium4.predatorlabs.net:/usr/obj/usr/src/sys/PENTIUM4  i386
>Description:
Update to 5.2.2

This is a bugfix release. Most notable change:

Performance
   Regression which was slowing down loops in some
   cases, fixed.
Performances can be improved up to 50 %.

Full changelog:
http://www.scilab.org/content/download/1273/12237/file/changes5.2-5.2.2.pdf

On the FreeBSD end:
* The Ocaml-based modelica compiler now builds and is available as an option
* WITHOUT_UMFPACK knob is fixed and added to the options dialog
* Sync DESKTOP_ENTRIES with COMMENT
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/math/scilab/Makefile,v
retrieving revision 1.65
diff -u -r1.65 Makefile
--- Makefile	23 Mar 2010 23:36:10 -0000	1.65
+++ Makefile	25 Apr 2010 20:38:33 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scilab
-PORTVERSION=	5.2.1
-PORTREVISION=	1
+PORTVERSION=	5.2.2
 CATEGORIES=	math cad parallel java
 MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/
 EXTRACT_SUFX=	-src.tar.gz
@@ -29,8 +28,6 @@
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=	--without-ocaml
-
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 OPTIONS=	ATLAS "Use Atlas instead of Blas" OFF \
@@ -38,8 +35,10 @@
 		GUI "Build GUI (requires Java and required for docs)" ON \
 		NLS "Build localization" OFF \
 		MATIO "Matlab compatibility" OFF \
+		OCAML "Build ocaml modelica compiler (requires GUI)" OFF \
 		PVM "Parallel Virtual Machine support" OFF \
-		TK "TCL/TK support" OFF
+		TK "TCL/TK support" OFF \
+		UMFPACK "Build with umfpack" ON
 
 .include <bsd.port.options.mk>
 
@@ -137,7 +136,8 @@
 CONFIGURE_ARGS+=	--with-jdk=${JAVA_HOME} \
 			--with-docbook=${LOCALBASE}/share/xsl/docbook
 
-DESKTOP_ENTRIES=	"SciLab" "A free Matlab clone by INRIA & ENPC" \
+DESKTOP_ENTRIES=	"SciLab" \
+			"Scientific software package for numerical computations" \
 			"${DATADIR}/icons/scilab.xpm" "scilab" \
 			"Application;Education;Math;" false
 
@@ -187,24 +187,31 @@
 PLIST_SUB+=	MATIO=""
 .endif
 
+.if defined(WITHOUT_OCAML)
+CONFIGURE_ARGS+=	--without-ocaml
+PLIST_SUB+=	OCAML="@comment "
+.else
+BUILD_DEPENDS+=	ocaml:${PORTSDIR}/lang/ocaml
+RUN_DEPENDS+=	ocaml:${PORTSDIR}/lang/ocaml
+PLIST_SUB+=	OCAML=""
+.endif
+
 post-patch:
 	# Configure fixes
-	${REINPLACE_CMD} -e 's|/usr/share/java|${JAVALIBDIR}|g' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|/usr/lib/jni|${LOCALBASE}/lib/|g' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|/usr/lib/java|${JAVALIBDIR}|g' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|/usr/lib64/jni|${LOCALBASE}/lib/|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-ldl | |' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|-lmatio|-lmatio -lgfortran|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-L$$with_umfpack_library|-L$$with_umfpack_library -lgfortran|' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-lumfpack|-lumfpack -lamd -L$$with_umfpack_library -lgfortran|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|TCLTK_LIBS=" -ldl"|TCLTK_LIBS=" "|' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|batik-all|batik|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|$$jardir/batik.jar|${LOCALBASE}/share/java/batik/batik.jar|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|$$jardir/fop.jar|${LOCALBASE}/share/java/fop/build/fop.jar|' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|$$jardir/jeuclid-core*.jar|${LOCALBASE}/share/java/jeuclid/repo/jeuclid-core*.jar|' ${WRKSRC}/configure
 	# Build fixes
-	${REINPLACE_CMD} -e 's|$$FFLAGS -DNDEBUG|$$FFLAGS -DNDEBUG -fPIC|' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|$$(CFLAGS:-O%=)|-I${LOCALBASE}/include -L${LOCALBASE}/lib|' ${WRKSRC}/modules/elementary_functions/Makefile.in
 	${REINPLACE_CMD} -e 's|freebsd|__FreeBSD__|g' ${WRKSRC}/modules/sparse/includes/spConfig.h
-	${REINPLACE_CMD} -e 1730d ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's|exp10(|pow(10., |g' ${WRKSRC}/modules/graphics/src/c/Format.c \
+		${WRKSRC}/modules/graphics/src/c/getHandleProperty/set_log_flags_property.c
 	@# malloc.h -> stdlib.h conversions
 	@${GREP} -lr "<malloc.h>" ${WRKSRC} \
 		| ${XARGS} ${REINPLACE_CMD} -e \
@@ -213,7 +220,6 @@
 	${MV} ${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/My\ Project/ \
 		${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/My_Project/
 	${REINPLACE_CMD} -e 's|My Project|My_Project|g' ${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.vbproj
-	${REINPLACE_CMD} -e 319d ${WRKSRC}/contrib/Makefile.in
 	${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e '/%%PORTDOCS%%/d' ${WRKSRC}/Makefile.in
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/math/scilab/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo	3 Mar 2010 06:40:46 -0000	1.16
+++ distinfo	24 Apr 2010 12:55:32 -0000
@@ -1,3 +1,3 @@
-MD5 (scilab-5.2.1-src.tar.gz) = 47beab7be09516d89167e9a67a3be856
-SHA256 (scilab-5.2.1-src.tar.gz) = f85aa3b7fde0e523f7f0159613da7cca7bd2d125860b50fa2ed00394c97075e0
-SIZE (scilab-5.2.1-src.tar.gz) = 54855137
+MD5 (scilab-5.2.2-src.tar.gz) = 35e8a22edb348f405360d3a07ed4faab
+SHA256 (scilab-5.2.2-src.tar.gz) = 6f8800bc8ac9128187d1f9a98a5e459bbfa2b66967caed8ab659ff2ba51f1cf2
+SIZE (scilab-5.2.2-src.tar.gz) = 54088580
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/math/scilab/pkg-plist,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist
--- pkg-plist	23 Mar 2010 23:36:10 -0000	1.18
+++ pkg-plist	25 Apr 2010 05:33:40 -0000
@@ -1,4 +1,5 @@
 bin/intersci
+%%OCAML%%bin/modelicac
 bin/scilab
 bin/scilab-adv-cli
 bin/scilab-bin
@@ -184,6 +185,12 @@
 lib/scilab/libscihashtable.la
 lib/scilab/libscihashtable.so
 lib/scilab/libscihashtable.so.5
+%%GUI%%lib/scilab/libscihdf5-forceload-disable.la
+%%GUI%%lib/scilab/libscihdf5-forceload-disable.so
+%%GUI%%lib/scilab/libscihdf5-forceload-disable.so.5
+%%GUI%%lib/scilab/libscihdf5-forceload.la
+%%GUI%%lib/scilab/libscihdf5-forceload.so
+%%GUI%%lib/scilab/libscihdf5-forceload.so.5
 lib/scilab/libscihdf5.la
 lib/scilab/libscihdf5.so
 lib/scilab/libscihdf5.so.5
@@ -247,9 +254,6 @@
 lib/scilab/libscirandlib.la
 lib/scilab/libscirandlib.so
 lib/scilab/libscirandlib.so.5
-lib/scilab/libscirenderer-disable.la
-lib/scilab/libscirenderer-disable.so
-lib/scilab/libscirenderer-disable.so.5
 %%GUI%%lib/scilab/libscirenderer.la
 %%GUI%%lib/scilab/libscirenderer.so
 %%GUI%%lib/scilab/libscirenderer.so.5
@@ -313,12 +317,6 @@
 %%GUI%%lib/scilab/libscixpad.la
 %%GUI%%lib/scilab/libscixpad.so
 %%GUI%%lib/scilab/libscixpad.so.5
-%%GUI%%lib/scilab/libscihdf5-forceload-disable.so
-%%GUI%%lib/scilab/libscihdf5-forceload.la
-%%GUI%%lib/scilab/libscihdf5-forceload-disable.so.5
-%%GUI%%lib/scilab/libscihdf5-forceload-disable.la
-%%GUI%%lib/scilab/libscihdf5-forceload.so
-%%GUI%%lib/scilab/libscihdf5-forceload.so.5
 libdata/pkgconfig/scilab.pc
 %%NLS%%share/locale/ca_ES/LC_MESSAGES/scilab.mo
 %%NLS%%share/locale/de_DE/LC_MESSAGES/scilab.mo
@@ -418,6 +416,7 @@
 %%DATADIR%%/modules/action_binding/license.txt
 %%DATADIR%%/modules/action_binding/macros/buildmacros.sce
 %%DATADIR%%/modules/action_binding/readme.txt
+%%DATADIR%%/modules/action_binding/tests/nonreg_tests/bug_6743.tst
 %%DATADIR%%/modules/action_binding/version.xml
 %%DATADIR%%/modules/api_scilab/changelog.txt
 %%DATADIR%%/modules/api_scilab/etc/api_scilab.quit
@@ -1130,6 +1129,10 @@
 %%DATADIR%%/modules/cacsd/tests/nonreg_tests/bug_549.tst
 %%DATADIR%%/modules/cacsd/tests/nonreg_tests/bug_68.dia.ref
 %%DATADIR%%/modules/cacsd/tests/nonreg_tests/bug_68.tst
+%%DATADIR%%/modules/cacsd/tests/nonreg_tests/bug_6829.dia.ref
+%%DATADIR%%/modules/cacsd/tests/nonreg_tests/bug_6829.tst
+%%DATADIR%%/modules/cacsd/tests/nonreg_tests/bug_6883.dia.ref
+%%DATADIR%%/modules/cacsd/tests/nonreg_tests/bug_6883.tst
 %%DATADIR%%/modules/cacsd/tests/unit_tests/arma.dia.ref
 %%DATADIR%%/modules/cacsd/tests/unit_tests/arma.tst
 %%DATADIR%%/modules/cacsd/tests/unit_tests/bode.dia.ref
@@ -1646,6 +1649,8 @@
 %%DATADIR%%/modules/completion/tests/nonreg_tests/bug_4838.tst
 %%DATADIR%%/modules/completion/tests/nonreg_tests/bug_5105.dia.ref
 %%DATADIR%%/modules/completion/tests/nonreg_tests/bug_5105.tst
+%%DATADIR%%/modules/completion/tests/nonreg_tests/bug_6739.dia.ref
+%%DATADIR%%/modules/completion/tests/nonreg_tests/bug_6739.tst
 %%DATADIR%%/modules/completion/tests/unit_tests/completeline.dia.ref
 %%DATADIR%%/modules/completion/tests/unit_tests/completeline.tst
 %%DATADIR%%/modules/completion/tests/unit_tests/completion.dia.ref
@@ -1744,6 +1749,8 @@
 %%DATADIR%%/modules/core/macros/with_javasci.sci
 %%DATADIR%%/modules/core/macros/with_macros_source.bin
 %%DATADIR%%/modules/core/macros/with_macros_source.sci
+%%DATADIR%%/modules/core/macros/with_pvm.bin
+%%DATADIR%%/modules/core/macros/with_pvm.sci
 %%DATADIR%%/modules/core/macros/with_texmacs.bin
 %%DATADIR%%/modules/core/macros/with_texmacs.sci
 %%DATADIR%%/modules/core/macros/with_tk.bin
@@ -1899,6 +1906,8 @@
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_4282.tst
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_4542.dia.ref
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_4542.tst
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_4599.dia.ref
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_4599.tst
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_4611.dia.ref
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_4611.tst
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_4666.dia.ref
@@ -1933,6 +1942,10 @@
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_6521.tst
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_6586.dia.ref
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_6586.tst
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_6730.dia.ref
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_6730.tst
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_6816.dia.ref
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_6816.tst
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_71.dia.ref
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_71.tst
 %%DATADIR%%/modules/core/tests/nonreg_tests/bug_743.dia.ref
@@ -2125,6 +2138,8 @@
 %%DATADIR%%/modules/data_structures/tests/nonreg_tests/bug_568.tst
 %%DATADIR%%/modules/data_structures/tests/nonreg_tests/bug_570.dia.ref
 %%DATADIR%%/modules/data_structures/tests/nonreg_tests/bug_570.tst
+%%DATADIR%%/modules/data_structures/tests/nonreg_tests/bug_6792.dia.ref
+%%DATADIR%%/modules/data_structures/tests/nonreg_tests/bug_6792.tst
 %%DATADIR%%/modules/data_structures/tests/unit_tests/fieldnames.dia.ref
 %%DATADIR%%/modules/data_structures/tests/unit_tests/fieldnames.tst
 %%DATADIR%%/modules/data_structures/tests/unit_tests/hypermat.dia.ref
@@ -2664,6 +2679,8 @@
 %%DATADIR%%/modules/dynamic_link/tests/nonreg_tests/bug_5484.c
 %%DATADIR%%/modules/dynamic_link/tests/nonreg_tests/bug_5484.dia.ref
 %%DATADIR%%/modules/dynamic_link/tests/nonreg_tests/bug_5484.tst
+%%DATADIR%%/modules/dynamic_link/tests/nonreg_tests/bug_6902.dia.ref
+%%DATADIR%%/modules/dynamic_link/tests/nonreg_tests/bug_6902.tst
 %%DATADIR%%/modules/dynamic_link/tests/unit_tests/G_make.tst
 %%DATADIR%%/modules/dynamic_link/tests/unit_tests/G_make.unix.dia.ref
 %%DATADIR%%/modules/dynamic_link/tests/unit_tests/G_make.win.dia.ref
@@ -3585,6 +3602,8 @@
 %%DATADIR%%/modules/functions/tests/nonreg_tests/bug_610.tst
 %%DATADIR%%/modules/functions/tests/nonreg_tests/bug_670.dia.ref
 %%DATADIR%%/modules/functions/tests/nonreg_tests/bug_670.tst
+%%DATADIR%%/modules/functions/tests/nonreg_tests/bug_6841.dia.ref
+%%DATADIR%%/modules/functions/tests/nonreg_tests/bug_6841.tst
 %%DATADIR%%/modules/functions/tests/nonreg_tests/bug_731.dia.ref
 %%DATADIR%%/modules/functions/tests/nonreg_tests/bug_731.tst
 %%DATADIR%%/modules/functions/tests/unit_tests/bytecode.dia.ref
@@ -3742,6 +3761,10 @@
 %%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_4944.dia.ref
 %%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_4944.tst
 %%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_5436.tst
+%%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_6718.dia.ref
+%%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_6718.tst
+%%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_6735.tst
+%%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_6738.tst
 %%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_685.dia.ref
 %%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_685.tst
 %%DATADIR%%/modules/graphic_export/tests/unit_tests/bmp_non_empty_file.dia.ref
@@ -4691,6 +4714,13 @@
 %%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_625.tst
 %%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_6420.dia.ref
 %%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_6420.tst
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_6531.dia.ref
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_6531.tst
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_6641.tst
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_6665.dia.ref
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_6665.tst
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_6720.dia.ref
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_6720.tst
 %%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_711.dia.ref
 %%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_711.tst
 %%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_805.dia.ref
@@ -4732,6 +4762,8 @@
 %%DATADIR%%/modules/graphics/tests/unit_tests/is_handle_valid.tst
 %%DATADIR%%/modules/graphics/tests/unit_tests/legends.dia.ref
 %%DATADIR%%/modules/graphics/tests/unit_tests/legends.tst
+%%DATADIR%%/modules/graphics/tests/unit_tests/line_style.dia.ref
+%%DATADIR%%/modules/graphics/tests/unit_tests/line_style.tst
 %%DATADIR%%/modules/graphics/tests/unit_tests/load_old_file.dia.ref
 %%DATADIR%%/modules/graphics/tests/unit_tests/load_old_file.scg
 %%DATADIR%%/modules/graphics/tests/unit_tests/load_old_file.tst
@@ -4961,6 +4993,11 @@
 %%DATADIR%%/modules/gui/tests/nonreg_tests/bug_6436.tst
 %%DATADIR%%/modules/gui/tests/nonreg_tests/bug_6441.tst
 %%DATADIR%%/modules/gui/tests/nonreg_tests/bug_6547.tst
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_6675.dia.ref
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_6675.tst
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_6787.tst
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_6788.tst
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_6790.tst
 %%DATADIR%%/modules/gui/tests/unit_tests/addmenu.dia.ref
 %%DATADIR%%/modules/gui/tests/unit_tests/addmenu.tst
 %%DATADIR%%/modules/gui/tests/unit_tests/checkbox.dia.ref
@@ -5012,9 +5049,9 @@
 %%DATADIR%%/modules/hdf5/changelog.txt
 %%DATADIR%%/modules/hdf5/etc/hdf5.quit
 %%DATADIR%%/modules/hdf5/etc/hdf5.start
+%%GUI%%%%DATADIR%%/modules/hdf5/jar/org.scilab.modules.hdf5.jar
 %%DATADIR%%/modules/hdf5/license.txt
 %%DATADIR%%/modules/hdf5/macros/buildmacros.sce
-%%GUI%%%%DATADIR%%/modules/hdf5/jar/org.scilab.modules.hdf5.jar
 %%DATADIR%%/modules/hdf5/readme.txt
 %%DATADIR%%/modules/hdf5/sci_gateway/hdf5_gateway.xml
 %%DATADIR%%/modules/hdf5/tests/unit_tests/testScilabBoolean.java
@@ -5691,6 +5728,8 @@
 %%DATADIR%%/modules/jvm/tests/unit_tests/system_setproperty.dia.ref
 %%DATADIR%%/modules/jvm/tests/unit_tests/system_setproperty.tst
 %%DATADIR%%/modules/jvm/version.xml
+%%DATADIR%%/modules/jvm/xml/classpath.dtd
+%%DATADIR%%/modules/jvm/xml/librarypath.dtd
 %%DATADIR%%/modules/linear_algebra/changelog.txt
 %%DATADIR%%/modules/linear_algebra/etc/linear_algebra.quit
 %%DATADIR%%/modules/linear_algebra/etc/linear_algebra.start
@@ -5850,6 +5889,8 @@
 %%DATADIR%%/modules/linear_algebra/tests/nonreg_tests/bug_4759.dia.ref
 %%DATADIR%%/modules/linear_algebra/tests/nonreg_tests/bug_4759.tst
 %%DATADIR%%/modules/linear_algebra/tests/nonreg_tests/bug_545.tst
+%%DATADIR%%/modules/linear_algebra/tests/nonreg_tests/bug_6783.dia.ref
+%%DATADIR%%/modules/linear_algebra/tests/nonreg_tests/bug_6783.tst
 %%DATADIR%%/modules/linear_algebra/tests/nonreg_tests/bug_F.dia.ref
 %%DATADIR%%/modules/linear_algebra/tests/nonreg_tests/bug_F.tst
 %%DATADIR%%/modules/linear_algebra/tests/unit_tests/balanc.dia.ref
@@ -6772,6 +6813,9 @@
 %%DATADIR%%/modules/m2sci/tests/nonreg_tests/bug_2333.tst
 %%DATADIR%%/modules/m2sci/tests/nonreg_tests/bug_2341.dia.ref
 %%DATADIR%%/modules/m2sci/tests/nonreg_tests/bug_2341.tst
+%%DATADIR%%/modules/m2sci/tests/nonreg_tests/bug_2395.dia.ref
+%%DATADIR%%/modules/m2sci/tests/nonreg_tests/bug_2395.m
+%%DATADIR%%/modules/m2sci/tests/nonreg_tests/bug_2395.tst
 %%DATADIR%%/modules/m2sci/tests/nonreg_tests/bug_2428.dia.ref
 %%DATADIR%%/modules/m2sci/tests/nonreg_tests/bug_2428.tst
 %%DATADIR%%/modules/m2sci/tests/nonreg_tests/bug_2656.dia.ref
@@ -6858,6 +6902,8 @@
 %%DATADIR%%/modules/matio/tests/nonreg_tests/bug_4926.tst
 %%DATADIR%%/modules/matio/tests/nonreg_tests/bug_5462.dia.ref
 %%DATADIR%%/modules/matio/tests/nonreg_tests/bug_5462.tst
+%%DATADIR%%/modules/matio/tests/nonreg_tests/bug_5466.dia.ref
+%%DATADIR%%/modules/matio/tests/nonreg_tests/bug_5466.tst
 %%DATADIR%%/modules/matio/tests/nonreg_tests/t-circle.mat
 %%DATADIR%%/modules/matio/tests/unit_tests/arraycell-v6.mat
 %%DATADIR%%/modules/matio/tests/unit_tests/arraycell-v7.mat
@@ -7654,6 +7700,8 @@
 %%DATADIR%%/modules/output_stream/tests/nonreg_tests/bug_5263.tst
 %%DATADIR%%/modules/output_stream/tests/nonreg_tests/bug_557.dia.ref
 %%DATADIR%%/modules/output_stream/tests/nonreg_tests/bug_557.tst
+%%DATADIR%%/modules/output_stream/tests/nonreg_tests/bug_6728.dia.ref
+%%DATADIR%%/modules/output_stream/tests/nonreg_tests/bug_6728.tst
 %%DATADIR%%/modules/output_stream/tests/nonreg_tests/bug_871.dia.ref
 %%DATADIR%%/modules/output_stream/tests/nonreg_tests/bug_871.tst
 %%DATADIR%%/modules/output_stream/tests/unit_tests/basout.dia.ref
@@ -8971,6 +9019,8 @@
 %%DATADIR%%/modules/overloading/tests/nonreg_tests/bug_4646.tst
 %%DATADIR%%/modules/overloading/tests/nonreg_tests/bug_4826.dia.ref
 %%DATADIR%%/modules/overloading/tests/nonreg_tests/bug_4826.tst
+%%DATADIR%%/modules/overloading/tests/nonreg_tests/bug_6698.dia.ref
+%%DATADIR%%/modules/overloading/tests/nonreg_tests/bug_6698.tst
 %%DATADIR%%/modules/overloading/tests/unit_tests/c_a_c.dia.ref
 %%DATADIR%%/modules/overloading/tests/unit_tests/c_a_c.tst
 %%DATADIR%%/modules/overloading/tests/unit_tests/rational.dia.ref
@@ -9111,6 +9161,7 @@
 %%DATADIR%%/modules/polynomials/tests/unit_tests/poly_roots.dia.ref
 %%DATADIR%%/modules/polynomials/tests/unit_tests/poly_roots.tst
 %%DATADIR%%/modules/polynomials/version.xml
+%%PVM%%%%DATADIR%%/modules/pvm/changelog.txt
 %%DATADIR%%/modules/pvm/demos/pvm.dem
 %%DATADIR%%/modules/pvm/demos/pvm1.sce
 %%DATADIR%%/modules/pvm/demos/script.sce
@@ -9119,19 +9170,16 @@
 %%DATADIR%%/modules/pvm/help/en_US/addchapter.sce
 %%DATADIR%%/modules/pvm/help/fr_FR/addchapter.sce
 %%DATADIR%%/modules/pvm/help/pt_BR/addchapter.sce
+%%PVM%%%%DATADIR%%/modules/pvm/license.txt
 %%DATADIR%%/modules/pvm/macros/buildmacros.sce
+%%PVM%%%%DATADIR%%/modules/pvm/macros/configure_pvm.bin
 %%DATADIR%%/modules/pvm/macros/configure_pvm.sci
-%%DATADIR%%/modules/pvm/macros/with_pvm.sci
-%%DATADIR%%/modules/pvm/tests/unit_tests/pvm.dia.ref
-%%DATADIR%%/modules/pvm/tests/unit_tests/pvm.tst
-%%PVM%%%%DATADIR%%/modules/pvm/changelog.txt
 %%PVM%%%%DATADIR%%/modules/pvm/macros/lib
-%%PVM%%%%DATADIR%%/modules/pvm/macros/with_pvm.bin
-%%PVM%%%%DATADIR%%/modules/pvm/macros/configure_pvm.bin
 %%PVM%%%%DATADIR%%/modules/pvm/macros/names
-%%PVM%%%%DATADIR%%/modules/pvm/sci_gateway/pvm_gateway.xml
 %%PVM%%%%DATADIR%%/modules/pvm/readme.txt
-%%PVM%%%%DATADIR%%/modules/pvm/license.txt
+%%PVM%%%%DATADIR%%/modules/pvm/sci_gateway/pvm_gateway.xml
+%%DATADIR%%/modules/pvm/tests/unit_tests/pvm.dia.ref
+%%DATADIR%%/modules/pvm/tests/unit_tests/pvm.tst
 %%PVM%%%%DATADIR%%/modules/pvm/version.xml
 %%DATADIR%%/modules/randlib/changelog.txt
 %%DATADIR%%/modules/randlib/demos/binomial.dem.sce
@@ -9180,6 +9228,7 @@
 %%DATADIR%%/modules/renderer/tests/nonreg_tests/bug_4055.dia.ref
 %%DATADIR%%/modules/renderer/tests/nonreg_tests/bug_4055.tst
 %%DATADIR%%/modules/renderer/tests/nonreg_tests/bug_6558.tst
+%%DATADIR%%/modules/renderer/tests/nonreg_tests/bug_6870.tst
 %%DATADIR%%/modules/renderer/version.xml
 %%GUI%%%%DATADIR%%/modules/scicos/changelog.txt
 %%DATADIR%%/modules/scicos/demos/Bouncing_ball.cosf
@@ -10640,82 +10689,111 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Branching/names
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CCS.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CCS.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CCS.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CCS.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CVS.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CVS.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CVS.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CVS.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Capacitor.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Capacitor.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Capacitor.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Capacitor.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/ConstantVoltage.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/ConstantVoltage.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/ConstantVoltage.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/ConstantVoltage.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CurrentSensor.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CurrentSensor.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CurrentSensor.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/CurrentSensor.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Diode.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Diode.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Diode.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Diode.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/ExternFunction.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/ExternFunction.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Ground.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Ground.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Ground.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Ground.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Gyrator.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Gyrator.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Gyrator.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Gyrator.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/IdealTransformer.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/IdealTransformer.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/IdealTransformer.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/IdealTransformer.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/InPutPort.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/InPutPort.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Inductor.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Inductor.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Inductor.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Inductor.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/MOTOR.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/MOTOR.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Maths.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/NMOS.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/NMOS.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/NMOS.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/NMOS.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/NPN.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/NPN.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/NPN.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/NPN.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/OpAmp.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/OpAmp.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/OpAmp.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/OpAmp.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/OutPort.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/OutPort.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/OutPutPort.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/OutPutPort.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PMOS.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PMOS.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PMOS.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PMOS.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PNP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PNP.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PNP.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PNP.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Pin.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Pin.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PotentialSensor.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PotentialSensor.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PotentialSensor.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/PotentialSensor.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Resistor.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Resistor.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Resistor.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Resistor.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/SineVoltage.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/SineVoltage.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/SineVoltage.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/SineVoltage.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Switch.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Switch.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Switch.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/Switch.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VVsourceAC.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VVsourceAC.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VVsourceAC.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VVsourceAC.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VariableResistor.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VariableResistor.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VariableResistor.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VariableResistor.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VoltageSensor.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VoltageSensor.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VoltageSensor.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VoltageSensor.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VsourceAC.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VsourceAC.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VsourceAC.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VsourceAC.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VsourceDC.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/VsourceDC.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/buildmacros.sce
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/lib
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Electrical/names
@@ -10723,18 +10801,12 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/ANDBLK.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/ANDLOG_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/ANDLOG_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/CCS.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/CLKSOMV_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/CLKSOMV_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/CLKSOM_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/CLKSOM_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/CLKSPLIT_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/CLKSPLIT_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/CVS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/Capacitor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/ConstantVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/CurrentSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/Diode.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/END_c.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/END_c.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/EVTDLY_c.bin
@@ -10745,40 +10817,16 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/EVTGEN_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/EVTVARDLY.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/EVTVARDLY.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/ExternFunction.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/Ground.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/Gyrator.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/HALT_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/HALT_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/IFTHEL_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/IFTHEL_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/IdealTransformer.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/InPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/Inductor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/MCLOCK_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/MCLOCK_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/MFCLCK_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/MFCLCK_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/M_freq.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/M_freq.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/Maths.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/NMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/NPN.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/OpAmp.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/OutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/OutPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/PMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/PNP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/Pin.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/PotentialSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/Resistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/SineVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/Switch.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/VVsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/VariableResistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/VoltageSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/VsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/VsourceDC.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/buildmacros.sce
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/freq_div.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/freq_div.sci
@@ -10786,52 +10834,30 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Events/names
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Bache.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Bache.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Bache.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Bache.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/CCS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/CVS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Capacitor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/ConstantVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/CurrentSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Diode.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/ExternFunction.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Ground.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Gyrator.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/IdealTransformer.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/InPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Inductor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Maths.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/NMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/NPN.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/OpAmp.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/OutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/OutPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PNP.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PerteDP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PerteDP.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PerteDP.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PerteDP.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Pin.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PortPHQ1.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PortPHQ1.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PortPHQ2.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PotentialSensor.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PortPHQ2.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Puits.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Puits.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PuitsP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/PuitsP.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Resistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/SineVoltage.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Source.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Source.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/SourceP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/SourceP.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/Switch.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/ThermoCarre.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/VVsourceAC.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/ThermoCarre.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/VanneReglante.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/VanneReglante.mo
+%%OCAML%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/VanneReglante.moc
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/VanneReglante.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/VariableResistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/VoltageSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/VsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/VsourceDC.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/bache_draw_ports.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/bache_draw_ports.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Hydraulics/bache_inputs.bin
@@ -10859,69 +10885,29 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/BITCLEAR.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/BITSET.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/BITSET.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Bache.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/CCS.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/CONVERT.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/CONVERT.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/CVS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Capacitor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/ConstantVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/CurrentSensor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/DFLIPFLOP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/DFLIPFLOP.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/DLATCH.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/DLATCH.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Diode.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/EXTRACTBITS.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/EXTRACTBITS.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/ExternFunction.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Ground.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Gyrator.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/INTMUL.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/INTMUL.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/IdealTransformer.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/InPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Inductor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/JKFLIPFLOP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/JKFLIPFLOP.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/LOGIC.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/LOGIC.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Maths.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/NMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/NPN.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/OpAmp.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/OutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/OutPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/PMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/PNP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/PerteDP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Pin.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/PortPHQ1.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/PortPHQ2.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/PotentialSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Puits.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Resistor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/SHIFT.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/SHIFT.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/SRFLIPFLOP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/SRFLIPFLOP.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/SineVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Source.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/Switch.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/ThermoCarre.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/VVsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/VanneReglante.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/VariableResistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/VoltageSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/VsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/VsourceDC.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/buildmacros.sce
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/lib
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/IntegerOp/names
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/BIGSOM_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/BIGSOM_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Bache.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/CCS.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/CLINDUMMY_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/CLINDUMMY_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/CLR.bin
@@ -10932,10 +10918,6 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/CLSS.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/CLSS_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/CLSS_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/CVS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Capacitor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/ConstantVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/CurrentSensor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/DELAYV_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/DELAYV_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/DELAY_f.bin
@@ -10956,46 +10938,24 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/DOLLAR_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/DOLLAR_m.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/DOLLAR_m.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Diode.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/ExternFunction.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/GAINBLK.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/GAINBLK.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/GAINBLK_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/GAINBLK_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/GAIN_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/GAIN_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Ground.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Gyrator.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/INTEGRAL.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/INTEGRAL.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/INTEGRAL_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/INTEGRAL_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/INTEGRAL_m.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/INTEGRAL_m.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/IdealTransformer.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/InPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Inductor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Maths.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/NMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/NPN.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/OpAmp.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/OutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/OutPutPort.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/PID.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/PID.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/PMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/PNP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/PerteDP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Pin.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/PortPHQ1.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/PortPHQ2.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/PotentialSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Puits.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/REGISTER.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/REGISTER.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/REGISTER_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/REGISTER_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Resistor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/SAMPHOLD.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/SAMPHOLD.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/SAMPHOLD_m.bin
@@ -11008,46 +10968,23 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/SUMMATION.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/SUM_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/SUM_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/SineVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Source.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/Switch.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/TCLSS.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/TCLSS.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/TCLSS_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/TCLSS_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/TIME_DELAY.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/TIME_DELAY.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/ThermoCarre.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/VARIABLE_DELAY.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/VARIABLE_DELAY.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/VVsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/VanneReglante.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/VariableResistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/VoltageSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/VsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/VsourceDC.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/buildmacros.sce
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/lib
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Linear/names
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Bache.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/CCS.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/CUMSUM.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/CUMSUM.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/CVS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Capacitor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/ConstantVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/CurrentSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Diode.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/EXTRACT.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/EXTRACT.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/EXTTRI.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/ExternFunction.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Ground.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Gyrator.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/IdealTransformer.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/InPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Inductor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/MATBKSL.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/MATBKSL.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/MATCATH.bin
@@ -11086,39 +11023,14 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/MATZCONJ.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/MATZREIM.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/MATZREIM.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Maths.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/NMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/NPN.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/OpAmp.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/OutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/OutPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/PMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/PNP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/PerteDP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Pin.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/PortPHQ1.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/PortPHQ2.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/PotentialSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Puits.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/RICC.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/RICC.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/ROOTCOEF.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/ROOTCOEF.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Resistor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/SQRT.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/SQRT.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/SUBMAT.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/SUBMAT.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/SineVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Source.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/Switch.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/ThermoCarre.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/VVsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/VanneReglante.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/VariableResistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/VoltageSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/VsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/VsourceDC.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/buildmacros.sce
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/lib
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/MatrixOp/names
@@ -11132,16 +11044,10 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/BOUNCEXY.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/BPLATFORM.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/BPLATFORM.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Bache.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/CBLOCK.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/CBLOCK.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/CCS.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/CONSTRAINT_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/CONSTRAINT_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/CVS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Capacitor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/ConstantVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/CurrentSensor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/DEADBAND.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/DEADBAND.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/DEBUG_SCICOS.bin
@@ -11150,7 +11056,6 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/DIFF_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/DSUPER.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/DSUPER.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Diode.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/EDGETRIGGER.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/EDGETRIGGER.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/EDGE_TRIGGER.bin
@@ -11159,59 +11064,28 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/ENDBLK.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/EXPRESSION.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/EXPRESSION.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/ExternFunction.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Extract_Activation.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Extract_Activation.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Ground.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Gyrator.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/HYSTHERESIS.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/HYSTHERESIS.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/IMPSPLIT_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/IMPSPLIT_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/IdealTransformer.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/InPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Inductor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/LOGICAL_OP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/MBLOCK.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/MBLOCK.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/MEMORY_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/MEMORY_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Maths.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/NMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/NPN.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/OpAmp.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/OutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/OutPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/PMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/PNP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/PerteDP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Pin.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/PortPHQ1.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/PortPHQ2.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/PotentialSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Puits.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/RATELIMITER.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/RATELIMITER.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/RELATIONALOP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/RELATIONALOP.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Resistor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/SPLIT_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/SPLIT_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/SUPER_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/SUPER_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/SineVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Source.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/Switch.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/TEXT_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/TEXT_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/ThermoCarre.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/VVsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/VanneReglante.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/VariableResistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/VoltageSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/VsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/VsourceDC.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/bplatform2.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/bplatform2.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Misc/buildmacros.sce
@@ -11239,26 +11113,16 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/ABSBLK_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/ABS_VALUE.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/ABS_VALUE.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Bache.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/CCS.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/COSBLK_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/COSBLK_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/CVS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Capacitor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/ConstantVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/CurrentSensor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/DLRADAPT_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/DLRADAPT_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Diode.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/EXPBLK_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/EXPBLK_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/EXPBLK_m.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/EXPBLK_m.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/ExternFunction.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/FSV_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/FSV_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Ground.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Gyrator.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/INTRP2BLK_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/INTRP2BLK_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/INTRPLBLK_f.bin
@@ -11267,9 +11131,6 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/INVBLK.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/INVBLK_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/INVBLK_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/IdealTransformer.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/InPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Inductor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/LOGBLK_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/LOGBLK_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/LOOKUP_f.bin
@@ -11280,29 +11141,14 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/MAX_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/MIN_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/MIN_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Maths.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/NMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/NPN.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/OpAmp.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/OutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/OutPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/PMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/PNP.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/POWBLK_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/POWBLK_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/PRODUCT.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/PRODUCT.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/PROD_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/PROD_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/PerteDP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Pin.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/PortPHQ1.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/PortPHQ2.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/PotentialSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Puits.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/QUANT_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/QUANT_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Resistor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/SATURATION.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/SATURATION.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/SAT_f.bin
@@ -11311,73 +11157,25 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/SIGNUM.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/SINBLK_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/SINBLK_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/SineVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Source.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/Switch.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/TANBLK_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/TANBLK_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/ThermoCarre.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/TrigFun.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/TrigFun.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/VVsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/VanneReglante.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/VariableResistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/VoltageSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/VsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/VsourceDC.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/buildmacros.sce
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/lib
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/NonLinear/names
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Bache.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/CCS.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/CFORTREDP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/CFORTREDP.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/CVS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Capacitor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/ConstantVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/CurrentSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Diode.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Disc2_5_FVM1d.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Disc2_5_FVM1d.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Disc_diff_oper2.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Disc_diff_oper2.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Disc_diff_oper45.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Disc_diff_oper45.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/ExternFunction.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Ground.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Gyrator.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/IHM_EDP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/IHM_EDP.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/IdealTransformer.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/InPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Inductor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Maths.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/NMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/NPN.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/OpAmp.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/OutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/OutPutPort.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/PDE.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/PDE.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/PMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/PNP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/PerteDP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Pin.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/PortPHQ1.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/PortPHQ2.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/PotentialSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Puits.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Resistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/SineVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Source.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/Switch.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/ThermoCarre.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/VVsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/VanneReglante.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/VariableResistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/VoltageSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/VsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/VsourceDC.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/addf_mat.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/addf_mat.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/PDE/addfv.bin
@@ -11457,12 +11255,10 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/AFFICH_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/AFFICH_m.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/AFFICH_m.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Bache.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CANIMXY.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CANIMXY.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CANIMXY3D.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CANIMXY3D.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CCS.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CEVENTSCOPE.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CEVENTSCOPE.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CFSCOPE.bin
@@ -11483,50 +11279,14 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CSCOPXY.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CSCOPXY3D.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CSCOPXY3D.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CVS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Capacitor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/ConstantVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/CurrentSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Diode.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/ExternFunction.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Ground.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Gyrator.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/IdealTransformer.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/InPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Inductor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Maths.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/NMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/NPN.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/OUTIMPL_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/OUTIMPL_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/OUT_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/OUT_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/OpAmp.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/OutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/OutPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/PMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/PNP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/PerteDP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Pin.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/PortPHQ1.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/PortPHQ2.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/PotentialSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Puits.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Resistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/SineVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Source.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/Switch.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/TOWS_c.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/TOWS_c.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/TRASH_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/TRASH_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/ThermoCarre.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/VVsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/VanneReglante.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/VariableResistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/VoltageSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/VsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/VsourceDC.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/WFILE.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/WFILE.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/WFILE_f.bin
@@ -11538,8 +11298,6 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/buildmacros.sce
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/lib
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sinks/names
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Bache.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/CCS.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/CLKINV_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/CLKINV_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/CLKIN_f.bin
@@ -11558,14 +11316,8 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/CURVE_c.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/CURV_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/CURV_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/CVS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Capacitor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/ConstantVoltage.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Counter.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Counter.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/CurrentSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Diode.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/ExternFunction.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/FROMWSB.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/FROMWSB.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/FROMWS_c.bin
@@ -11574,31 +11326,12 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/GENSIN_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/GENSQR_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/GENSQR_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Ground.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Gyrator.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/INIMPL_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/INIMPL_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/IN_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/IN_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/IdealTransformer.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/InPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Inductor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Maths.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Modulo_Count.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Modulo_Count.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/NMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/NPN.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/OpAmp.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/OutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/OutPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/PMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/PNP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/PerteDP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Pin.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/PortPHQ1.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/PortPHQ2.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/PotentialSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Puits.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/RAMP.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/RAMP.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/RAND_f.bin
@@ -11613,7 +11346,6 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/RFILE.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/RFILE_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/RFILE_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Resistor.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/SAWTOOTH_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/SAWTOOTH_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/SLIDER_f.bin
@@ -11626,67 +11358,19 @@
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/SampleCLK.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Sigbuilder.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Sigbuilder.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/SineVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Source.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/Switch.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/TIME_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/TIME_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/TKSCALE.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/TKSCALE.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/ThermoCarre.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/VVsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/VanneReglante.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/VariableResistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/VoltageSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/VsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/VsourceDC.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/buildmacros.sce
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/lib
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Sources/names
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Bache.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/CCS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/CVS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Capacitor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/ConstantVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/CurrentSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Diode.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/ExternFunction.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/GENERAL_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/GENERAL_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Ground.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Gyrator.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/IdealTransformer.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/InPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Inductor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Maths.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/NEGTOPOS_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/NEGTOPOS_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/NMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/NPN.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/OpAmp.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/OutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/OutPutPort.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/PMOS.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/PNP.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/POSTONEG_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/POSTONEG_f.sci
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/PerteDP.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Pin.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/PortPHQ1.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/PortPHQ2.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/PotentialSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Puits.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Resistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/SineVoltage.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Source.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/Switch.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/ThermoCarre.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/VVsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/VanneReglante.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/VariableResistor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/VoltageSensor.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/VsourceAC.mo
-%%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/VsourceDC.mo
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/ZCROSS_f.bin
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/ZCROSS_f.sci
 %%GUI%%%%DATADIR%%/modules/scicos_blocks/macros/Threshold/buildmacros.sce
@@ -12193,6 +11877,8 @@
 %%DATADIR%%/modules/spreadsheet/tests/nonreg_tests/bug_1858.tst
 %%DATADIR%%/modules/spreadsheet/tests/nonreg_tests/bug_5615.dia.ref
 %%DATADIR%%/modules/spreadsheet/tests/nonreg_tests/bug_5615.tst
+%%DATADIR%%/modules/spreadsheet/tests/nonreg_tests/bug_6734.dia.ref
+%%DATADIR%%/modules/spreadsheet/tests/nonreg_tests/bug_6734.tst
 %%DATADIR%%/modules/spreadsheet/tests/unit_tests/readwrite_csv.dia.ref
 %%DATADIR%%/modules/spreadsheet/tests/unit_tests/readwrite_csv.tst
 %%DATADIR%%/modules/spreadsheet/tests/unit_tests/readxls.dia.ref
@@ -12679,35 +12365,35 @@
 %%DATADIR%%/modules/tclsci/help/fr_FR/addchapter.sce
 %%DATADIR%%/modules/tclsci/help/pt_BR/addchapter.sce
 %%DATADIR%%/modules/tclsci/license.txt
+%%TK%%%%DATADIR%%/modules/tclsci/macros/TCL_CreateSlave.bin
 %%DATADIR%%/modules/tclsci/macros/TCL_CreateSlave.sci
+%%TK%%%%DATADIR%%/modules/tclsci/macros/browsevar.bin
 %%DATADIR%%/modules/tclsci/macros/browsevar.sci
 %%DATADIR%%/modules/tclsci/macros/buildmacros.sce
+%%TK%%%%DATADIR%%/modules/tclsci/macros/config.bin
 %%DATADIR%%/modules/tclsci/macros/config.sci
+%%TK%%%%DATADIR%%/modules/tclsci/macros/editvar.bin
 %%DATADIR%%/modules/tclsci/macros/editvar.sci
+%%TK%%%%DATADIR%%/modules/tclsci/macros/editvar_get.bin
 %%DATADIR%%/modules/tclsci/macros/editvar_get.sci
+%%TK%%%%DATADIR%%/modules/tclsci/macros/editvar_set_values.bin
 %%DATADIR%%/modules/tclsci/macros/editvar_set_values.sci
+%%TK%%%%DATADIR%%/modules/tclsci/macros/gettklib.bin
 %%DATADIR%%/modules/tclsci/macros/gettklib.sci
+%%TK%%%%DATADIR%%/modules/tclsci/macros/lib
+%%TK%%%%DATADIR%%/modules/tclsci/macros/names
+%%TK%%%%DATADIR%%/modules/tclsci/macros/sciGUI_init.bin
 %%DATADIR%%/modules/tclsci/macros/sciGUI_init.sci
+%%TK%%%%DATADIR%%/modules/tclsci/macros/tk_choose.bin
 %%DATADIR%%/modules/tclsci/macros/tk_choose.sci
+%%TK%%%%DATADIR%%/modules/tclsci/macros/tk_getdir.bin
 %%DATADIR%%/modules/tclsci/macros/tk_getdir.sci
+%%TK%%%%DATADIR%%/modules/tclsci/macros/tk_savefile.bin
 %%DATADIR%%/modules/tclsci/macros/tk_savefile.sci
+%%TK%%%%DATADIR%%/modules/tclsci/macros/winclose.bin
 %%DATADIR%%/modules/tclsci/macros/winclose.sci
-%%DATADIR%%/modules/tclsci/macros/winlist.sci
-%%TK%%%%DATADIR%%/modules/tclsci/macros/gettklib.bin
-%%TK%%%%DATADIR%%/modules/tclsci/macros/editvar.bin
-%%TK%%%%DATADIR%%/modules/tclsci/macros/sciGUI_init.bin
-%%TK%%%%DATADIR%%/modules/tclsci/macros/tk_choose.bin
-%%TK%%%%DATADIR%%/modules/tclsci/macros/config.bin
-%%TK%%%%DATADIR%%/modules/tclsci/macros/editvar_set_values.bin
 %%TK%%%%DATADIR%%/modules/tclsci/macros/winlist.bin
-%%TK%%%%DATADIR%%/modules/tclsci/macros/browsevar.bin
-%%TK%%%%DATADIR%%/modules/tclsci/macros/names
-%%TK%%%%DATADIR%%/modules/tclsci/macros/winclose.bin
-%%TK%%%%DATADIR%%/modules/tclsci/macros/TCL_CreateSlave.bin
-%%TK%%%%DATADIR%%/modules/tclsci/macros/tk_getdir.bin
-%%TK%%%%DATADIR%%/modules/tclsci/macros/lib
-%%TK%%%%DATADIR%%/modules/tclsci/macros/editvar_get.bin
-%%TK%%%%DATADIR%%/modules/tclsci/macros/tk_savefile.bin
+%%DATADIR%%/modules/tclsci/macros/winlist.sci
 %%DATADIR%%/modules/tclsci/readme.txt
 %%DATADIR%%/modules/tclsci/sci_gateway/tclsci_gateway.xml
 %%DATADIR%%/modules/tclsci/tcl/BWidget-1.8.0/BWman/ArrowButton.html
@@ -13043,29 +12729,29 @@
 %%DATADIR%%/modules/umfpack/help/fr_FR/addchapter.sce
 %%DATADIR%%/modules/umfpack/help/pt_BR/addchapter.sce
 %%DATADIR%%/modules/umfpack/license.txt
-%%DATADIR%%/modules/umfpack/macros/PlotSparse.bin
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/macros/PlotSparse.bin
 %%DATADIR%%/modules/umfpack/macros/PlotSparse.sci
-%%DATADIR%%/modules/umfpack/macros/ReadHBSparse.bin
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/macros/ReadHBSparse.bin
 %%DATADIR%%/modules/umfpack/macros/ReadHBSparse.sci
-%%DATADIR%%/modules/umfpack/macros/ana_style.bin
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/macros/ana_style.bin
 %%DATADIR%%/modules/umfpack/macros/ana_style.sci
 %%DATADIR%%/modules/umfpack/macros/buildmacros.sce
-%%DATADIR%%/modules/umfpack/macros/cond2sp.bin
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/macros/cond2sp.bin
 %%DATADIR%%/modules/umfpack/macros/cond2sp.sci
-%%DATADIR%%/modules/umfpack/macros/condestsp.bin
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/macros/condestsp.bin
 %%DATADIR%%/modules/umfpack/macros/condestsp.sci
-%%DATADIR%%/modules/umfpack/macros/lib
-%%DATADIR%%/modules/umfpack/macros/names
-%%DATADIR%%/modules/umfpack/macros/rafiter.bin
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/macros/lib
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/macros/names
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/macros/rafiter.bin
 %%DATADIR%%/modules/umfpack/macros/rafiter.sci
-%%DATADIR%%/modules/umfpack/macros/replace_Ix_by_Fx.bin
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/macros/replace_Ix_by_Fx.bin
 %%DATADIR%%/modules/umfpack/macros/replace_Ix_by_Fx.sci
-%%DATADIR%%/modules/umfpack/macros/scisptdemo.bin
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/macros/scisptdemo.bin
 %%DATADIR%%/modules/umfpack/macros/scisptdemo.sci
-%%DATADIR%%/modules/umfpack/macros/test_on_columns.bin
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/macros/test_on_columns.bin
 %%DATADIR%%/modules/umfpack/macros/test_on_columns.sci
 %%DATADIR%%/modules/umfpack/readme.txt
-%%DATADIR%%/modules/umfpack/sci_gateway/umfpack_gateway.xml
+%%UMFPACK%%%%DATADIR%%/modules/umfpack/sci_gateway/umfpack_gateway.xml
 %%DATADIR%%/modules/umfpack/tests/unit_tests/condestsp.dia.ref
 %%DATADIR%%/modules/umfpack/tests/unit_tests/condestsp.tst
 %%DATADIR%%/modules/umfpack/tests/unit_tests/res_with_prec.dia.ref
@@ -13550,6 +13236,8 @@
 %%DATADIR%%/modules/xcos/macros/xcos_compile.sci
 %%GUI%%%%DATADIR%%/modules/xcos/macros/xcos_open.bin
 %%DATADIR%%/modules/xcos/macros/xcos_open.sci
+%%GUI%%%%DATADIR%%/modules/xcos/macros/xcos_run.bin
+%%DATADIR%%/modules/xcos/macros/xcos_run.sci
 %%GUI%%%%DATADIR%%/modules/xcos/macros/xcos_simulate.bin
 %%DATADIR%%/modules/xcos/macros/xcos_simulate.sci
 %%DATADIR%%/modules/xcos/readme.txt
@@ -13585,6 +13273,8 @@
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5444.tst
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5444.xcos
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5508.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5638.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5638.xcos
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5701.tst
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5701.xcos
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6386.tst
@@ -13592,8 +13282,16 @@
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6474.tst
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6517.tst
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6517.xcos
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6541.tst
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6578.tst
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6578.xcos
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6671.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6699.dia.ref
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6699.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6797.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6797.xcos
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6799.dia.ref
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6799.tst
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/constant.unix.err.ref
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/constant.unix.log.ref
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/constant.unix.out.ref
@@ -13808,6 +13506,8 @@
 %%DATADIR%%/modules/xcos/tests/nonreg_tests/xcos_nonreg.sci
 %%DATADIR%%/modules/xcos/tests/unit_tests/PENDULUM_ANIM.sci
 %%DATADIR%%/modules/xcos/tests/unit_tests/anim_pen.sci
+%%DATADIR%%/modules/xcos/tests/unit_tests/blocks_set.dia.ref
+%%DATADIR%%/modules/xcos/tests/unit_tests/blocks_set.tst
 %%DATADIR%%/modules/xcos/tests/unit_tests/buildouttb.dia.ref
 %%DATADIR%%/modules/xcos/tests/unit_tests/buildouttb.tst
 %%DATADIR%%/modules/xcos/tests/unit_tests/end_scicosim.dia.ref
@@ -13816,6 +13516,8 @@
 %%DATADIR%%/modules/xcos/tests/unit_tests/getscicosvars.tst
 %%DATADIR%%/modules/xcos/tests/unit_tests/lincos.dia.ref
 %%DATADIR%%/modules/xcos/tests/unit_tests/lincos.tst
+%%DATADIR%%/modules/xcos/tests/unit_tests/pending_mux.tst
+%%DATADIR%%/modules/xcos/tests/unit_tests/pending_mux.xcos
 %%DATADIR%%/modules/xcos/tests/unit_tests/pendulum_anim45.xcos
 %%DATADIR%%/modules/xcos/tests/unit_tests/phase_simulation.dia.ref
 %%DATADIR%%/modules/xcos/tests/unit_tests/phase_simulation.tst
@@ -13997,7 +13699,7 @@
 @dirrm %%DATADIR%%/modules/windows_tools
 @dirrm %%DATADIR%%/modules/umfpack/tests/unit_tests
 @dirrm %%DATADIR%%/modules/umfpack/tests
-@dirrm %%DATADIR%%/modules/umfpack/sci_gateway
+%%UMFPACK%%@dirrm %%DATADIR%%/modules/umfpack/sci_gateway
 @dirrm %%DATADIR%%/modules/umfpack/macros
 @dirrm %%DATADIR%%/modules/umfpack/help/pt_BR
 @dirrm %%DATADIR%%/modules/umfpack/help/fr_FR
@@ -14386,6 +14088,7 @@
 @dirrm %%DATADIR%%/modules/linear_algebra
 @dirrm %%DATADIR%%/modules/libst/macros
 @dirrm %%DATADIR%%/modules/libst
+@dirrm %%DATADIR%%/modules/jvm/xml
 @dirrm %%DATADIR%%/modules/jvm/tests/unit_tests
 @dirrm %%DATADIR%%/modules/jvm/tests/nonreg_tests
 @dirrm %%DATADIR%%/modules/jvm/tests
@@ -14518,8 +14221,8 @@
 @dirrm %%DATADIR%%/modules/hdf5/tests
 @dirrm %%DATADIR%%/modules/hdf5/sci_gateway
 @dirrm %%DATADIR%%/modules/hdf5/macros
-@dirrm %%DATADIR%%/modules/hdf5/etc
 %%GUI%%@dirrm %%DATADIR%%/modules/hdf5/jar
+@dirrm %%DATADIR%%/modules/hdf5/etc
 @dirrm %%DATADIR%%/modules/hdf5
 @dirrm %%DATADIR%%/modules/hashtable/macros
 @dirrm %%DATADIR%%/modules/hashtable
@@ -14891,6 +14594,8 @@
 @dirrm %%DATADIR%%/modules/api_scilab/help
 @dirrm %%DATADIR%%/modules/api_scilab/etc
 @dirrm %%DATADIR%%/modules/api_scilab
+@dirrm %%DATADIR%%/modules/action_binding/tests/nonreg_tests
+@dirrm %%DATADIR%%/modules/action_binding/tests
 @dirrm %%DATADIR%%/modules/action_binding/sci_gateway
 @dirrm %%DATADIR%%/modules/action_binding/macros
 %%GUI%%@dirrm %%DATADIR%%/modules/action_binding/jar
Index: files/patch-modules-xcos-src-java-org-scilab-modules-graph-ScilabCanvas.java
===================================================================
RCS file: files/patch-modules-xcos-src-java-org-scilab-modules-graph-ScilabCanvas.java
diff -N files/patch-modules-xcos-src-java-org-scilab-modules-graph-ScilabCanvas.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-modules-xcos-src-java-org-scilab-modules-graph-ScilabCanvas.java	24 Apr 2010 12:55:32 -0000
@@ -0,0 +1,11 @@
+--- modules/xcos/src/java/org/scilab/modules/graph/ScilabCanvas.java.orig	2010-04-21 20:20:59.000000000 -0700
++++ modules/xcos/src/java/org/scilab/modules/graph/ScilabCanvas.java	2010-04-21 20:21:25.000000000 -0700
+@@ -265,7 +265,7 @@
+ 				boolean dashed = mxUtils.isTrue(style,
+ 						mxConstants.STYLE_DASHED, false);
+ 				drawConnector(pts, penWidth, penColor, startMarker, startSize,
+-						endMarker, endSize, dashed, rounded);
++						endMarker, endSize, rounded, style);
+ 				
+ 				Object centerMarker = style.get(ScilabConstants.STYLE_CENTERARROW);
+ 				if (centerMarker != null) {


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004252043.o3PKh0Vn093729>