3 files changed, 164 insertions, 95 deletions

diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index fcbb573e41e5..8e46b8b41307 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eficas
-PORTVERSION=	1.5.3
+PORTVERSION=	1.6.1
 CATEGORIES=	french cad python
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
@@ -16,6 +16,7 @@ COMMENT=	ASter Command FIle Editor
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/pmw		\
 		${PYTHON_SITELIBDIR}/mx:${PORTSDIR}/lang/py-mx-base		\
+		${PYNUMERIC}							\
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 USE_PYTHON=	yes
@@ -23,7 +24,7 @@ USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/EficasV1_5b3AsterSTA7
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 LEFICASDIR?=	apps/${PORTNAME}
 EFICASDIR=	${PREFIX}/${LEFICASDIR}
@@ -44,8 +45,7 @@ post-patch:
 .endfor
 	@${REINPLACE_CMD} -e "s#lang='fr'#lang='${EF_LANG}'#"			\
 		${WRKSRC}/Aster/prefs.py
-	@${REINPLACE_CMD} -e "s#/usr/bin/acroread#${LOCALBASE}/bin/acroread#"	\
-			-e "s#os.path.join(rep_cata,'..','Doc')#\"${DOCSDIR}\"#"	\
+	@${REINPLACE_CMD} -e "s#os.path.join(rep_cata,'..','Doc')#\"${DOCSDIR}\"#"	\
 		${WRKSRC}/Aster/editeur.ini
 
 pre-install:
diff --git a/french/eficas/distinfo b/french/eficas/distinfo
index 568b08724ec4..e1f3e9fdd341 100644
--- a/french/eficas/distinfo
+++ b/french/eficas/distinfo
@@ -1,2 +1,2 @@
-MD5 (eficas-1.5.3-1.tar.gz) = e110284f10050c932abf27f9bf56ab01
-SIZE (eficas-1.5.3-1.tar.gz) = 22727930
+MD5 (eficas-1.6.1-1.tar.gz) = 1909c559bd13139d62995006fcb47618
+SIZE (eficas-1.6.1-1.tar.gz) = 27198873
diff --git a/french/eficas/pkg-plist b/french/eficas/pkg-plist
index a1d880dd9054..80c554717173 100644
--- a/french/eficas/pkg-plist
+++ b/french/eficas/pkg-plist
@@ -121,9 +121,21 @@ bin/eficas
 %%EFICASDIR%%/Aster/Cata/Macro/defi_cable_bp_ops.py
 %%EFICASDIR%%/Aster/Cata/Macro/defi_cable_bp_ops.pyc
 %%EFICASDIR%%/Aster/Cata/Macro/defi_cable_bp_ops.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_fichier.py
+%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_fichier.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_fichier.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_mefisto.py
+%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_mefisto.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_mefisto.pyo
 %%EFICASDIR%%/Aster/Cata/Macro/macr_adap_mail_ops.py
 %%EFICASDIR%%/Aster/Cata/Macro/macr_adap_mail_ops.pyc
 %%EFICASDIR%%/Aster/Cata/Macro/macr_adap_mail_ops.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_calc_ops.py
+%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_calc_ops.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_calc_ops.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_mail_ops.py
+%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_mail_ops.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_mail_ops.pyo
 %%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_calc_ops.py
 %%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_calc_ops.pyc
 %%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_calc_ops.pyo
@@ -136,6 +148,12 @@ bin/eficas
 %%EFICASDIR%%/Aster/Cata/Macro/macr_cara_poutre_ops.py
 %%EFICASDIR%%/Aster/Cata/Macro/macr_cara_poutre_ops.pyc
 %%EFICASDIR%%/Aster/Cata/Macro/macr_cara_poutre_ops.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/macr_fiab_impr_ops.py
+%%EFICASDIR%%/Aster/Cata/Macro/macr_fiab_impr_ops.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/macr_fiab_impr_ops.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/macr_fiabilite_ops.py
+%%EFICASDIR%%/Aster/Cata/Macro/macr_fiabilite_ops.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/macr_fiabilite_ops.pyo
 %%EFICASDIR%%/Aster/Cata/Macro/macr_lign_coupe_ops.py
 %%EFICASDIR%%/Aster/Cata/Macro/macr_lign_coupe_ops.pyc
 %%EFICASDIR%%/Aster/Cata/Macro/macr_lign_coupe_ops.pyo
@@ -148,6 +166,9 @@ bin/eficas
 %%EFICASDIR%%/Aster/Cata/Macro/macro_elas_mult_ops.py
 %%EFICASDIR%%/Aster/Cata/Macro/macro_elas_mult_ops.pyc
 %%EFICASDIR%%/Aster/Cata/Macro/macro_elas_mult_ops.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/macro_matr_ajou_ops.py
+%%EFICASDIR%%/Aster/Cata/Macro/macro_matr_ajou_ops.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/macro_matr_ajou_ops.pyo
 %%EFICASDIR%%/Aster/Cata/Macro/macro_matr_asse_ops.py
 %%EFICASDIR%%/Aster/Cata/Macro/macro_matr_asse_ops.pyc
 %%EFICASDIR%%/Aster/Cata/Macro/macro_matr_asse_ops.pyo
@@ -175,12 +196,19 @@ bin/eficas
 %%EFICASDIR%%/Aster/Cata/Macro/recal.py
 %%EFICASDIR%%/Aster/Cata/Macro/recal.pyc
 %%EFICASDIR%%/Aster/Cata/Macro/recal.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/stanley_ops.py
+%%EFICASDIR%%/Aster/Cata/Macro/stanley_ops.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/stanley_ops.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/test_fichier_ops.py
+%%EFICASDIR%%/Aster/Cata/Macro/test_fichier_ops.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/test_fichier_ops.pyo
 %%EFICASDIR%%/Aster/Cata/__init__.py
 %%EFICASDIR%%/Aster/Cata/__init__.pyc
 %%EFICASDIR%%/Aster/Cata/__init__.pyo
 %%EFICASDIR%%/Aster/Cata/cata_STA7.py
 %%EFICASDIR%%/Aster/Cata/cata_STA7.pyc
 %%EFICASDIR%%/Aster/Cata/cata_STA7.pyo
+%%EFICASDIR%%/Aster/Cata/cata_STA7_clefs_docu
 %%EFICASDIR%%/Aster/Cata/ops.py
 %%EFICASDIR%%/Aster/Cata/ops.pyc
 %%EFICASDIR%%/Aster/Cata/ops.pyo
@@ -188,6 +216,7 @@ bin/eficas
 %%EFICASDIR%%/Aster/eficas_aster.py
 %%EFICASDIR%%/Aster/eficas_aster.pyc
 %%EFICASDIR%%/Aster/eficas_aster.pyo
+%%EFICASDIR%%/Aster/materiau/A42_REF_A.NOMI
 %%EFICASDIR%%/Aster/prefs.py
 %%EFICASDIR%%/Aster/prefs.pyc
 %%EFICASDIR%%/Aster/prefs.pyo
@@ -291,6 +320,9 @@ bin/eficas
 %%EFICASDIR%%/Editeur/fenetre_mc_inconnus.py
 %%EFICASDIR%%/Editeur/fenetre_mc_inconnus.pyc
 %%EFICASDIR%%/Editeur/fenetre_mc_inconnus.pyo
+%%EFICASDIR%%/Editeur/fonctionpanel.py
+%%EFICASDIR%%/Editeur/fonctionpanel.pyc
+%%EFICASDIR%%/Editeur/fonctionpanel.pyo
 %%EFICASDIR%%/Editeur/fontes.py
 %%EFICASDIR%%/Editeur/fontes.pyc
 %%EFICASDIR%%/Editeur/fontes.pyo
@@ -346,18 +378,39 @@ bin/eficas
 %%EFICASDIR%%/Editeur/menubar.py
 %%EFICASDIR%%/Editeur/menubar.pyc
 %%EFICASDIR%%/Editeur/menubar.pyo
+%%EFICASDIR%%/Editeur/newsimppanel.py
+%%EFICASDIR%%/Editeur/newsimppanel.pyc
+%%EFICASDIR%%/Editeur/newsimppanel.pyo
 %%EFICASDIR%%/Editeur/options.py
 %%EFICASDIR%%/Editeur/options.pyc
 %%EFICASDIR%%/Editeur/options.pyo
 %%EFICASDIR%%/Editeur/panels.py
 %%EFICASDIR%%/Editeur/panels.pyc
 %%EFICASDIR%%/Editeur/panels.pyo
+%%EFICASDIR%%/Editeur/panelsSalome.py
+%%EFICASDIR%%/Editeur/panelsSalome.pyc
+%%EFICASDIR%%/Editeur/panelsSalome.pyo
 %%EFICASDIR%%/Editeur/patches.py
 %%EFICASDIR%%/Editeur/patches.pyc
 %%EFICASDIR%%/Editeur/patches.pyo
+%%EFICASDIR%%/Editeur/plusieursassdpanel.py
+%%EFICASDIR%%/Editeur/plusieursassdpanel.pyc
+%%EFICASDIR%%/Editeur/plusieursassdpanel.pyo
+%%EFICASDIR%%/Editeur/plusieursbasepanel.py
+%%EFICASDIR%%/Editeur/plusieursbasepanel.pyc
+%%EFICASDIR%%/Editeur/plusieursbasepanel.pyo
+%%EFICASDIR%%/Editeur/plusieursintopanel.py
+%%EFICASDIR%%/Editeur/plusieursintopanel.pyc
+%%EFICASDIR%%/Editeur/plusieursintopanel.pyo
+%%EFICASDIR%%/Editeur/plusieurspanel.py
+%%EFICASDIR%%/Editeur/plusieurspanel.pyc
+%%EFICASDIR%%/Editeur/plusieurspanel.pyo
 %%EFICASDIR%%/Editeur/readercata.py
 %%EFICASDIR%%/Editeur/readercata.pyc
 %%EFICASDIR%%/Editeur/readercata.pyo
+%%EFICASDIR%%/Editeur/shellpanel.py
+%%EFICASDIR%%/Editeur/shellpanel.pyc
+%%EFICASDIR%%/Editeur/shellpanel.pyo
 %%EFICASDIR%%/Editeur/splash.py
 %%EFICASDIR%%/Editeur/splash.pyc
 %%EFICASDIR%%/Editeur/splash.pyo
@@ -379,6 +432,24 @@ bin/eficas
 %%EFICASDIR%%/Editeur/uiinfo.py
 %%EFICASDIR%%/Editeur/uiinfo.pyc
 %%EFICASDIR%%/Editeur/uiinfo.pyo
+%%EFICASDIR%%/Editeur/uniqueassdpanel.py
+%%EFICASDIR%%/Editeur/uniqueassdpanel.pyc
+%%EFICASDIR%%/Editeur/uniqueassdpanel.pyo
+%%EFICASDIR%%/Editeur/uniquebasepanel.py
+%%EFICASDIR%%/Editeur/uniquebasepanel.pyc
+%%EFICASDIR%%/Editeur/uniquebasepanel.pyo
+%%EFICASDIR%%/Editeur/uniquecomppanel.py
+%%EFICASDIR%%/Editeur/uniquecomppanel.pyc
+%%EFICASDIR%%/Editeur/uniquecomppanel.pyo
+%%EFICASDIR%%/Editeur/uniqueintopanel.py
+%%EFICASDIR%%/Editeur/uniqueintopanel.pyc
+%%EFICASDIR%%/Editeur/uniqueintopanel.pyo
+%%EFICASDIR%%/Editeur/uniquepanel.py
+%%EFICASDIR%%/Editeur/uniquepanel.pyc
+%%EFICASDIR%%/Editeur/uniquepanel.pyo
+%%EFICASDIR%%/Editeur/uniquesdcopanel.py
+%%EFICASDIR%%/Editeur/uniquesdcopanel.pyc
+%%EFICASDIR%%/Editeur/uniquesdcopanel.pyo
 %%EFICASDIR%%/Editeur/utils.py
 %%EFICASDIR%%/Editeur/utils.pyc
 %%EFICASDIR%%/Editeur/utils.pyo
@@ -730,25 +801,21 @@ bin/eficas
 %%EFICASDIR%%/generator/generator_python.py
 %%EFICASDIR%%/generator/generator_python.pyc
 %%EFICASDIR%%/generator/generator_python.pyo
-%%PORTDOCS%%%%DOCSDIR%%/U40000f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U40201g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U41101g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41102g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41103g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41201e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41202b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41301f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41302f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41303f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41401e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41102h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41103h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41203a1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41301g1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41304a1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41401f1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U41501e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42101g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42201f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42201g1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U42301f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42302d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42302e1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U42303f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42304d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42401f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42304e1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42401g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U42501e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43101g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43102g.pdf
@@ -756,68 +823,70 @@ bin/eficas
 %%PORTDOCS%%%%DOCSDIR%%/U43104f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43105e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43106a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43107a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43201e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43107b1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43201f1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43202f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43203f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43204f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43301e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43204h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43301f1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43302a1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43401g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43402g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43501d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43502d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43601f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43602f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43603f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43604f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43603g1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43605f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43606a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43607a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44101g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44201g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44202d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44203f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44204a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44301g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44302b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44303g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44101h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44201h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44202e1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44203g1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44204c1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44205a1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44301h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44302c1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44303h1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44304f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44305b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44401g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44401h1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44402g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44403f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44403g1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44404f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44405d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44412e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44412f1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44421f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44422b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44422c1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44431d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45101g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45101h1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45102d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45103f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45103g1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45201g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45202d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45203f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45203g1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45204g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45205f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45211f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45212d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45213d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45213f1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45214f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45301f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45302g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45301g1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45302h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45303a2.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45311f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45321f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45322e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45322f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45323d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45401g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45402e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45401h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45402f1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45403c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45501g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45502g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45503f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45504f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46101g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46101h1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46102g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46103f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46111g.pdf
@@ -828,8 +897,8 @@ bin/eficas
 %%PORTDOCS%%%%DOCSDIR%%/U46202f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46301f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46311d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46312f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46313f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46312g1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46313g1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46314d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46321f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46322d.pdf
@@ -837,7 +906,7 @@ bin/eficas
 %%PORTDOCS%%%%DOCSDIR%%/U46402f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46501e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46502e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46503e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46503f1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46504e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46505e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46601d.pdf
@@ -845,87 +914,87 @@ bin/eficas
 %%PORTDOCS%%%%DOCSDIR%%/U46603a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46611c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46621d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47102b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47102c1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47103f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47104c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47105a1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47201g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47202g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47203f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47204b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47205d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47204c1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47205e1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47206c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47207a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47301b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47302a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47401a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48101g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48102f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48103g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47401b1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48101h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48102g1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48103h1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48111f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48112f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48121e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48122e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48112g1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48113b1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48121f1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48122f1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48131a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48201f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48202e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48203f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48204f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48205b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48202f1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48203g1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48204g1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48205c1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48206b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48207a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48301d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48302d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48311d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48321b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48301e1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48302e2.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48311e1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48321c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48331d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48401e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48401f1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48402e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48403d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48403e1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48404e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48405d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48501b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49101g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U49102d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49103d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49111g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49121g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49201g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49103e1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49111h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49121h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49201h1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U49202f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49203c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49203d1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U49211c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4cf10b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4cf20b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4gj10b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4gj20b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4gj30b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4mk10e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4mk20d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4mk30d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4mk10f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4mk20e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4mk30e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4pc10b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4pc20b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70001b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70101g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70102e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70111g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70201d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70202b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70203a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70101h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70111h1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70121b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70131b1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70201e1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70202c1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70203b1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70211b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70231d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70301b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70302b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70301c1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70302c1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70311b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70321c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70401b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70401c1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70411d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70421b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70431c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70432d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70432e1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70433d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70532b1.pdf
 @dirrm %%EFICASDIR%%/AIDE/fichiers
 @dirrm %%EFICASDIR%%/AIDE
 @dirrm %%EFICASDIR%%/Accas
 @dirrm %%EFICASDIR%%/Aster/Cata/Macro
 @dirrm %%EFICASDIR%%/Aster/Cata
+@dirrm %%EFICASDIR%%/Aster/materiau
 @dirrm %%EFICASDIR%%/Aster
 @dirrm %%EFICASDIR%%/Editeur/icons
 @dirrm %%EFICASDIR%%/Editeur