Upgrade to 1.13.0-1.

4 files changed, 276 insertions, 428 deletions

diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index d7d2eb572fc9..812cbd911917 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	eficas
-DISTVERSION=	1.12.0-1
-PORTREVISION=	1
-CATEGORIES=	french cad python
-MASTER_SITES=	http://www.code-aster.org/FICHIERS/
+DISTVERSION=	1.13.0-1
+CATEGORIES=	french cad
+MASTER_SITES=	http://www.code-aster.org/V2/IMG/gz/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ASter Command FIle Editor
@@ -38,21 +37,24 @@ EF_LANG=	ang
 .endif
 
 ENV2PYTHON=	Misc/Cyclops.py Aster/eficas_aster.py convert/Parserv5/Translate.py
+FIXSH=		bureau.py cataediteur.py panels.py
 
 post-extract:
-	@${MV} ${WRKSRC}/Aster/Doc ${WRKDIR}
+	${MV} ${WRKSRC}/Aster/Doc ${WRKDIR}
 
 pre-configure:
-	@${RM} ${WRKSRC}/convert/Parserv5/Translate.py.orig	\
-		${WRKSRC}/Editeur/bureau.py.orig
-	@${RM} -r ${WRKSRC}/Pmw	# Use our ported Pmw
+	${RM} ${WRKSRC}/convert/Parserv5/Translate.py.orig
+	${RM} -r ${WRKSRC}/Pmw	# Use our ported Pmw
 .for FILE in ${ENV2PYTHON}
-	@${REINPLACE_CMD} -e "s|^#!*./usr/bin/env python|#!${PYTHON_CMD}|"	\
+	${REINPLACE_CMD} -e "s|^#!*./usr/bin/env python|#!${PYTHON_CMD}|"	\
 		-e "s|^#!*./bin/env python|#!${PYTHON_CMD}|" ${WRKSRC}/${FILE}
 .endfor
-	@${REINPLACE_CMD} -e "s#lang='fr'#lang='${EF_LANG}'#"			\
+.for FILE in ${FIXSH}
+	${REINPLACE_CMD} -e "s|/usr/bin/sh|/bin/sh|" ${WRKSRC}/InterfaceTK/${FILE}
+.endfor
+	${REINPLACE_CMD} -e "s#lang='fr'#lang='${EF_LANG}'#"			\
 		${WRKSRC}/Aster/prefs.py
-	@${REINPLACE_CMD} -e "s#os.path.join(rep_cata,'..','Doc')#\"${DOCSDIR}\"#"	\
+	${REINPLACE_CMD} -e "s#os.path.join(rep_cata,'..','Doc')#\"${DOCSDIR}\"#"	\
 		-e "s#os.path.join(prefs.REPINI,'../Pmw')#'${PYTHON_SITELIBDIR}/Pmw'#"	\
 		${WRKSRC}/Aster/editeur.ini
 
diff --git a/french/eficas/distinfo b/french/eficas/distinfo
index 26afbddd46ce..fa99d69fd42e 100644
--- a/french/eficas/distinfo
+++ b/french/eficas/distinfo
@@ -1,3 +1,3 @@
-MD5 (eficas-1.12.0-1.tar.gz) = 17b9092ab0bfb965786268ca05a37209
-SHA256 (eficas-1.12.0-1.tar.gz) = e969e2d0e13f16666e682a2154f2ac4cb81f2b8fd2b8ea5784a6cd9cacdd8dc5
-SIZE (eficas-1.12.0-1.tar.gz) = 66392289
+MD5 (eficas-1.13.0-1.tar.gz) = bc8a50d293f6d7d9da251b22053397e7
+SHA256 (eficas-1.13.0-1.tar.gz) = f8a12fc209080340604ef3dc7250504fd039d68703007e8f65a52f5d244f047f
+SIZE (eficas-1.13.0-1.tar.gz) = 38440702
diff --git a/french/eficas/files/patch-Editeur_bureau.py b/french/eficas/files/patch-Editeur_bureau.py
deleted file mode 100644
index 019d5e0a2711..000000000000
--- a/french/eficas/files/patch-Editeur_bureau.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- Editeur/bureau.py.orig	Tue Jan  3 18:02:45 2006
-+++ Editeur/bureau.py	Mon Jan  9 22:26:41 2006
-@@ -638,7 +638,7 @@
-           if os.name == 'nt':
-               os.spawnv(os.P_NOWAIT,commande,(commande,fichier,))
-           elif os.name == 'posix':
--              script ="#!/usr/bin/sh \n%s %s&" %(commande,fichier)
-+              script ="#! /bin/sh \n%s %s&" %(commande,fichier)
-               pid = os.system(script)
-       except AttributeError:
-           traceback.print_exc()
diff --git a/french/eficas/pkg-plist b/french/eficas/pkg-plist
index ec2d526f9ed1..7bb43a477bcd 100644
--- a/french/eficas/pkg-plist
+++ b/french/eficas/pkg-plist
@@ -451,6 +451,9 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/exec_logiciel_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/exec_logiciel_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/exec_logiciel_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/externe_mess.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/externe_mess.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/externe_mess.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/fiabilite_fichier.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/fiabilite_fichier.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/fiabilite_fichier.pyo
@@ -925,6 +928,9 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_prof_vgen.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_prof_vgen.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_prof_vgen.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_proj_mesu.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_proj_mesu.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_proj_mesu.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_proj_modal.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_proj_modal.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_proj_modal.pyo
@@ -994,6 +1000,9 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_vect_elem.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_vect_elem.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_vect_elem.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_xfem.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_xfem.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_xfem.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/utilsd.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/utilsd.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/utilsd.pyo
@@ -1008,14 +1017,17 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA9/ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9c_clefs_docu
+%%EFICASDIR%%/Aster/__init__.py
+%%EFICASDIR%%/Aster/__init__.pyc
+%%EFICASDIR%%/Aster/__init__.pyo
 %%EFICASDIR%%/Aster/aster.py
 %%EFICASDIR%%/Aster/aster.pyc
 %%EFICASDIR%%/Aster/aster.pyo
 %%EFICASDIR%%/Aster/editeur.ini
+%%EFICASDIR%%/Aster/editeur_salome.ini
 %%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
@@ -1028,9 +1040,6 @@
 %%EFICASDIR%%/Aster/test_eficas.py
 %%EFICASDIR%%/Aster/test_eficas.pyc
 %%EFICASDIR%%/Aster/test_eficas.pyo
-%%EFICASDIR%%/Editeur/Interp.py
-%%EFICASDIR%%/Editeur/Interp.pyc
-%%EFICASDIR%%/Editeur/Interp.pyo
 %%EFICASDIR%%/Editeur/Objecttreeitem.py
 %%EFICASDIR%%/Editeur/Objecttreeitem.pyc
 %%EFICASDIR%%/Editeur/Objecttreeitem.pyo
@@ -1044,124 +1053,23 @@
 %%EFICASDIR%%/Editeur/Patrons/thermique.salome.comm
 %%EFICASDIR%%/Editeur/Patrons/tradir_3D.comm
 %%EFICASDIR%%/Editeur/Patrons/tramod_3D.comm
-%%EFICASDIR%%/Editeur/TroisDPal.py
-%%EFICASDIR%%/Editeur/TroisDPal.pyc
-%%EFICASDIR%%/Editeur/TroisDPal.pyo
 %%EFICASDIR%%/Editeur/__init__.py
 %%EFICASDIR%%/Editeur/__init__.pyc
 %%EFICASDIR%%/Editeur/__init__.pyo
 %%EFICASDIR%%/Editeur/analyse_catalogue.py
 %%EFICASDIR%%/Editeur/analyse_catalogue.pyc
 %%EFICASDIR%%/Editeur/analyse_catalogue.pyo
-%%EFICASDIR%%/Editeur/appli.py
-%%EFICASDIR%%/Editeur/appli.pyc
-%%EFICASDIR%%/Editeur/appli.pyo
 %%EFICASDIR%%/Editeur/autre_analyse_cata.py
 %%EFICASDIR%%/Editeur/autre_analyse_cata.pyc
 %%EFICASDIR%%/Editeur/autre_analyse_cata.pyo
-%%EFICASDIR%%/Editeur/basestyle.py
-%%EFICASDIR%%/Editeur/basestyle.pyc
-%%EFICASDIR%%/Editeur/basestyle.pyo
-%%EFICASDIR%%/Editeur/browser.py
-%%EFICASDIR%%/Editeur/browser.pyc
-%%EFICASDIR%%/Editeur/browser.pyo
-%%EFICASDIR%%/Editeur/bureau.py
-%%EFICASDIR%%/Editeur/bureau.pyc
-%%EFICASDIR%%/Editeur/bureau.pyo
-%%EFICASDIR%%/Editeur/catabrowser.py
-%%EFICASDIR%%/Editeur/catabrowser.pyc
-%%EFICASDIR%%/Editeur/catabrowser.pyo
-%%EFICASDIR%%/Editeur/cataediteur.py
-%%EFICASDIR%%/Editeur/cataediteur.pyc
-%%EFICASDIR%%/Editeur/cataediteur.pyo
-%%EFICASDIR%%/Editeur/centerwindow.py
-%%EFICASDIR%%/Editeur/centerwindow.pyc
-%%EFICASDIR%%/Editeur/centerwindow.pyo
-%%EFICASDIR%%/Editeur/change_comm.py
-%%EFICASDIR%%/Editeur/change_comm.pyc
-%%EFICASDIR%%/Editeur/change_comm.pyo
+%%EFICASDIR%%/Editeur/bureau.py.rej
 %%EFICASDIR%%/Editeur/comploader.py
 %%EFICASDIR%%/Editeur/comploader.pyc
 %%EFICASDIR%%/Editeur/comploader.pyo
-%%EFICASDIR%%/Editeur/compobase.py
-%%EFICASDIR%%/Editeur/compobase.pyc
-%%EFICASDIR%%/Editeur/compobase.pyo
-%%EFICASDIR%%/Editeur/compobloc.py
-%%EFICASDIR%%/Editeur/compobloc.pyc
-%%EFICASDIR%%/Editeur/compobloc.pyo
-%%EFICASDIR%%/Editeur/compocomm.py
-%%EFICASDIR%%/Editeur/compocomm.pyc
-%%EFICASDIR%%/Editeur/compocomm.pyo
-%%EFICASDIR%%/Editeur/compocommandecomm.py
-%%EFICASDIR%%/Editeur/compocommandecomm.pyc
-%%EFICASDIR%%/Editeur/compocommandecomm.pyo
-%%EFICASDIR%%/Editeur/compoerror.py
-%%EFICASDIR%%/Editeur/compoerror.pyc
-%%EFICASDIR%%/Editeur/compoerror.pyo
-%%EFICASDIR%%/Editeur/compofact.py
-%%EFICASDIR%%/Editeur/compofact.pyc
-%%EFICASDIR%%/Editeur/compofact.pyo
-%%EFICASDIR%%/Editeur/compoformule.py
-%%EFICASDIR%%/Editeur/compoformule.pyc
-%%EFICASDIR%%/Editeur/compoformule.pyo
-%%EFICASDIR%%/Editeur/compojdc.py
-%%EFICASDIR%%/Editeur/compojdc.pyc
-%%EFICASDIR%%/Editeur/compojdc.pyo
-%%EFICASDIR%%/Editeur/compomacro.py
-%%EFICASDIR%%/Editeur/compomacro.pyc
-%%EFICASDIR%%/Editeur/compomacro.pyo
-%%EFICASDIR%%/Editeur/compomclist.py
-%%EFICASDIR%%/Editeur/compomclist.pyc
-%%EFICASDIR%%/Editeur/compomclist.pyo
-%%EFICASDIR%%/Editeur/componiveau.py
-%%EFICASDIR%%/Editeur/componiveau.pyc
-%%EFICASDIR%%/Editeur/componiveau.pyo
-%%EFICASDIR%%/Editeur/componuplet.py
-%%EFICASDIR%%/Editeur/componuplet.pyc
-%%EFICASDIR%%/Editeur/componuplet.pyo
-%%EFICASDIR%%/Editeur/compooper.py
-%%EFICASDIR%%/Editeur/compooper.pyc
-%%EFICASDIR%%/Editeur/compooper.pyo
-%%EFICASDIR%%/Editeur/compoparam.py
-%%EFICASDIR%%/Editeur/compoparam.pyc
-%%EFICASDIR%%/Editeur/compoparam.pyo
-%%EFICASDIR%%/Editeur/compoparameval.py
-%%EFICASDIR%%/Editeur/compoparameval.pyc
-%%EFICASDIR%%/Editeur/compoparameval.pyo
-%%EFICASDIR%%/Editeur/compoproc.py
-%%EFICASDIR%%/Editeur/compoproc.pyc
-%%EFICASDIR%%/Editeur/compoproc.pyo
-%%EFICASDIR%%/Editeur/composimp.py
-%%EFICASDIR%%/Editeur/composimp.pyc
-%%EFICASDIR%%/Editeur/composimp.pyo
 %%EFICASDIR%%/Editeur/configuration.py
 %%EFICASDIR%%/Editeur/configuration.pyc
 %%EFICASDIR%%/Editeur/configuration.pyo
-%%EFICASDIR%%/Editeur/definition_cata.py
-%%EFICASDIR%%/Editeur/definition_cata.pyc
-%%EFICASDIR%%/Editeur/definition_cata.pyo
-%%EFICASDIR%%/Editeur/eficas.py
-%%EFICASDIR%%/Editeur/eficas.pyc
-%%EFICASDIR%%/Editeur/eficas.pyo
-%%EFICASDIR%%/Editeur/eficas_go.py
-%%EFICASDIR%%/Editeur/eficas_go.pyc
-%%EFICASDIR%%/Editeur/eficas_go.pyo
-%%EFICASDIR%%/Editeur/eficas_test.py
-%%EFICASDIR%%/Editeur/eficas_test.pyc
-%%EFICASDIR%%/Editeur/eficas_test.pyo
-%%EFICASDIR%%/Editeur/faq.py
-%%EFICASDIR%%/Editeur/faq.pyc
-%%EFICASDIR%%/Editeur/faq.pyo
 %%EFICASDIR%%/Editeur/faqs.txt
-%%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
 %%EFICASDIR%%/Editeur/icons/About24.gif
 %%EFICASDIR%%/Editeur/icons/Copy24.gif
 %%EFICASDIR%%/Editeur/icons/Cut24.gif
@@ -1193,6 +1101,7 @@
 %%EFICASDIR%%/Editeur/icons/ast-yel-los.gif
 %%EFICASDIR%%/Editeur/icons/ast-yel-percent.gif
 %%EFICASDIR%%/Editeur/icons/ast-yel-square.gif
+%%EFICASDIR%%/Editeur/icons/ast-yellow-square.gif
 %%EFICASDIR%%/Editeur/icons/ast-yellow-text.gif
 %%EFICASDIR%%/Editeur/icons/code_aster.gif
 %%EFICASDIR%%/Editeur/icons/code_descartes.gif
@@ -1200,111 +1109,21 @@
 %%EFICASDIR%%/Editeur/icons/logo_edf.gif
 %%EFICASDIR%%/Editeur/icons/minusnode.gif
 %%EFICASDIR%%/Editeur/icons/plusnode.gif
-%%EFICASDIR%%/Editeur/images.py
-%%EFICASDIR%%/Editeur/images.pyc
-%%EFICASDIR%%/Editeur/images.pyo
 %%EFICASDIR%%/Editeur/import_code.py
 %%EFICASDIR%%/Editeur/import_code.pyc
 %%EFICASDIR%%/Editeur/import_code.pyo
-%%EFICASDIR%%/Editeur/jdcdisplay.py
-%%EFICASDIR%%/Editeur/jdcdisplay.pyc
-%%EFICASDIR%%/Editeur/jdcdisplay.pyo
-%%EFICASDIR%%/Editeur/listeFichiers.py
-%%EFICASDIR%%/Editeur/listeFichiers.pyc
-%%EFICASDIR%%/Editeur/listeFichiers.pyo
 %%EFICASDIR%%/Editeur/listePatrons.py
 %%EFICASDIR%%/Editeur/listePatrons.pyc
 %%EFICASDIR%%/Editeur/listePatrons.pyo
-%%EFICASDIR%%/Editeur/macrodisplay.py
-%%EFICASDIR%%/Editeur/macrodisplay.pyc
-%%EFICASDIR%%/Editeur/macrodisplay.pyo
-%%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/session.py
 %%EFICASDIR%%/Editeur/session.pyc
 %%EFICASDIR%%/Editeur/session.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
-%%EFICASDIR%%/Editeur/statusbar.py
-%%EFICASDIR%%/Editeur/statusbar.pyc
-%%EFICASDIR%%/Editeur/statusbar.pyo
-%%EFICASDIR%%/Editeur/styles.py
-%%EFICASDIR%%/Editeur/styles.pyc
-%%EFICASDIR%%/Editeur/styles.pyo
-%%EFICASDIR%%/Editeur/toolbar.py
-%%EFICASDIR%%/Editeur/toolbar.pyc
-%%EFICASDIR%%/Editeur/toolbar.pyo
-%%EFICASDIR%%/Editeur/tooltip.py
-%%EFICASDIR%%/Editeur/tooltip.pyc
-%%EFICASDIR%%/Editeur/tooltip.pyo
-%%EFICASDIR%%/Editeur/treeitemincanvas.py
-%%EFICASDIR%%/Editeur/treeitemincanvas.pyc
-%%EFICASDIR%%/Editeur/treeitemincanvas.pyo
-%%EFICASDIR%%/Editeur/treewidget.py
-%%EFICASDIR%%/Editeur/treewidget.pyc
-%%EFICASDIR%%/Editeur/treewidget.pyo
 %%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
-%%EFICASDIR%%/Editeur/widgets.py
-%%EFICASDIR%%/Editeur/widgets.pyc
-%%EFICASDIR%%/Editeur/widgets.pyo
 %%EFICASDIR%%/Extensions/__init__.py
 %%EFICASDIR%%/Extensions/__init__.pyc
 %%EFICASDIR%%/Extensions/__init__.pyo
@@ -1426,6 +1245,207 @@
 %%EFICASDIR%%/Ihm/__init__.py
 %%EFICASDIR%%/Ihm/__init__.pyc
 %%EFICASDIR%%/Ihm/__init__.pyo
+%%EFICASDIR%%/InterfaceTK/Interp.py
+%%EFICASDIR%%/InterfaceTK/Interp.pyc
+%%EFICASDIR%%/InterfaceTK/Interp.pyo
+%%EFICASDIR%%/InterfaceTK/TroisDPal.py
+%%EFICASDIR%%/InterfaceTK/TroisDPal.pyc
+%%EFICASDIR%%/InterfaceTK/TroisDPal.pyo
+%%EFICASDIR%%/InterfaceTK/__init__.py
+%%EFICASDIR%%/InterfaceTK/__init__.pyc
+%%EFICASDIR%%/InterfaceTK/__init__.pyo
+%%EFICASDIR%%/InterfaceTK/appli.py
+%%EFICASDIR%%/InterfaceTK/appli.pyc
+%%EFICASDIR%%/InterfaceTK/appli.pyo
+%%EFICASDIR%%/InterfaceTK/basestyle.py
+%%EFICASDIR%%/InterfaceTK/basestyle.pyc
+%%EFICASDIR%%/InterfaceTK/basestyle.pyo
+%%EFICASDIR%%/InterfaceTK/browser.py
+%%EFICASDIR%%/InterfaceTK/browser.pyc
+%%EFICASDIR%%/InterfaceTK/browser.pyo
+%%EFICASDIR%%/InterfaceTK/bureau.py
+%%EFICASDIR%%/InterfaceTK/bureau.pyc
+%%EFICASDIR%%/InterfaceTK/bureau.pyo
+%%EFICASDIR%%/InterfaceTK/catabrowser.py
+%%EFICASDIR%%/InterfaceTK/catabrowser.pyc
+%%EFICASDIR%%/InterfaceTK/catabrowser.pyo
+%%EFICASDIR%%/InterfaceTK/cataediteur.py
+%%EFICASDIR%%/InterfaceTK/cataediteur.pyc
+%%EFICASDIR%%/InterfaceTK/cataediteur.pyo
+%%EFICASDIR%%/InterfaceTK/centerwindow.py
+%%EFICASDIR%%/InterfaceTK/centerwindow.pyc
+%%EFICASDIR%%/InterfaceTK/centerwindow.pyo
+%%EFICASDIR%%/InterfaceTK/change_comm.py
+%%EFICASDIR%%/InterfaceTK/change_comm.pyc
+%%EFICASDIR%%/InterfaceTK/change_comm.pyo
+%%EFICASDIR%%/InterfaceTK/compobase.py
+%%EFICASDIR%%/InterfaceTK/compobase.pyc
+%%EFICASDIR%%/InterfaceTK/compobase.pyo
+%%EFICASDIR%%/InterfaceTK/compobloc.py
+%%EFICASDIR%%/InterfaceTK/compobloc.pyc
+%%EFICASDIR%%/InterfaceTK/compobloc.pyo
+%%EFICASDIR%%/InterfaceTK/compocomm.py
+%%EFICASDIR%%/InterfaceTK/compocomm.pyc
+%%EFICASDIR%%/InterfaceTK/compocomm.pyo
+%%EFICASDIR%%/InterfaceTK/compocommandecomm.py
+%%EFICASDIR%%/InterfaceTK/compocommandecomm.pyc
+%%EFICASDIR%%/InterfaceTK/compocommandecomm.pyo
+%%EFICASDIR%%/InterfaceTK/compoerror.py
+%%EFICASDIR%%/InterfaceTK/compoerror.pyc
+%%EFICASDIR%%/InterfaceTK/compoerror.pyo
+%%EFICASDIR%%/InterfaceTK/compofact.py
+%%EFICASDIR%%/InterfaceTK/compofact.pyc
+%%EFICASDIR%%/InterfaceTK/compofact.pyo
+%%EFICASDIR%%/InterfaceTK/compoformule.py
+%%EFICASDIR%%/InterfaceTK/compoformule.pyc
+%%EFICASDIR%%/InterfaceTK/compoformule.pyo
+%%EFICASDIR%%/InterfaceTK/compojdc.py
+%%EFICASDIR%%/InterfaceTK/compojdc.pyc
+%%EFICASDIR%%/InterfaceTK/compojdc.pyo
+%%EFICASDIR%%/InterfaceTK/compomacro.py
+%%EFICASDIR%%/InterfaceTK/compomacro.pyc
+%%EFICASDIR%%/InterfaceTK/compomacro.pyo
+%%EFICASDIR%%/InterfaceTK/compomclist.py
+%%EFICASDIR%%/InterfaceTK/compomclist.pyc
+%%EFICASDIR%%/InterfaceTK/compomclist.pyo
+%%EFICASDIR%%/InterfaceTK/componiveau.py
+%%EFICASDIR%%/InterfaceTK/componiveau.pyc
+%%EFICASDIR%%/InterfaceTK/componiveau.pyo
+%%EFICASDIR%%/InterfaceTK/componuplet.py
+%%EFICASDIR%%/InterfaceTK/componuplet.pyc
+%%EFICASDIR%%/InterfaceTK/componuplet.pyo
+%%EFICASDIR%%/InterfaceTK/compooper.py
+%%EFICASDIR%%/InterfaceTK/compooper.pyc
+%%EFICASDIR%%/InterfaceTK/compooper.pyo
+%%EFICASDIR%%/InterfaceTK/compoparam.py
+%%EFICASDIR%%/InterfaceTK/compoparam.pyc
+%%EFICASDIR%%/InterfaceTK/compoparam.pyo
+%%EFICASDIR%%/InterfaceTK/compoparameval.py
+%%EFICASDIR%%/InterfaceTK/compoparameval.pyc
+%%EFICASDIR%%/InterfaceTK/compoparameval.pyo
+%%EFICASDIR%%/InterfaceTK/compoproc.py
+%%EFICASDIR%%/InterfaceTK/compoproc.pyc
+%%EFICASDIR%%/InterfaceTK/compoproc.pyo
+%%EFICASDIR%%/InterfaceTK/composimp.py
+%%EFICASDIR%%/InterfaceTK/composimp.pyc
+%%EFICASDIR%%/InterfaceTK/composimp.pyo
+%%EFICASDIR%%/InterfaceTK/definition_cata.py
+%%EFICASDIR%%/InterfaceTK/definition_cata.pyc
+%%EFICASDIR%%/InterfaceTK/definition_cata.pyo
+%%EFICASDIR%%/InterfaceTK/eficas.py
+%%EFICASDIR%%/InterfaceTK/eficas.pyc
+%%EFICASDIR%%/InterfaceTK/eficas.pyo
+%%EFICASDIR%%/InterfaceTK/eficas_go.py
+%%EFICASDIR%%/InterfaceTK/eficas_go.pyc
+%%EFICASDIR%%/InterfaceTK/eficas_go.pyo
+%%EFICASDIR%%/InterfaceTK/eficas_test.py
+%%EFICASDIR%%/InterfaceTK/eficas_test.pyc
+%%EFICASDIR%%/InterfaceTK/eficas_test.pyo
+%%EFICASDIR%%/InterfaceTK/faq.py
+%%EFICASDIR%%/InterfaceTK/faq.pyc
+%%EFICASDIR%%/InterfaceTK/faq.pyo
+%%EFICASDIR%%/InterfaceTK/fenetre_mc_inconnus.py
+%%EFICASDIR%%/InterfaceTK/fenetre_mc_inconnus.pyc
+%%EFICASDIR%%/InterfaceTK/fenetre_mc_inconnus.pyo
+%%EFICASDIR%%/InterfaceTK/fonctionpanel.py
+%%EFICASDIR%%/InterfaceTK/fonctionpanel.pyc
+%%EFICASDIR%%/InterfaceTK/fonctionpanel.pyo
+%%EFICASDIR%%/InterfaceTK/fontes.py
+%%EFICASDIR%%/InterfaceTK/fontes.pyc
+%%EFICASDIR%%/InterfaceTK/fontes.pyo
+%%EFICASDIR%%/InterfaceTK/images.py
+%%EFICASDIR%%/InterfaceTK/images.pyc
+%%EFICASDIR%%/InterfaceTK/images.pyo
+%%EFICASDIR%%/InterfaceTK/jdcdisplay.py
+%%EFICASDIR%%/InterfaceTK/jdcdisplay.pyc
+%%EFICASDIR%%/InterfaceTK/jdcdisplay.pyo
+%%EFICASDIR%%/InterfaceTK/listeFichiers.py
+%%EFICASDIR%%/InterfaceTK/listeFichiers.pyc
+%%EFICASDIR%%/InterfaceTK/listeFichiers.pyo
+%%EFICASDIR%%/InterfaceTK/listePatronsTK.py
+%%EFICASDIR%%/InterfaceTK/listePatronsTK.pyc
+%%EFICASDIR%%/InterfaceTK/listePatronsTK.pyo
+%%EFICASDIR%%/InterfaceTK/macrodisplay.py
+%%EFICASDIR%%/InterfaceTK/macrodisplay.pyc
+%%EFICASDIR%%/InterfaceTK/macrodisplay.pyo
+%%EFICASDIR%%/InterfaceTK/menubar.py
+%%EFICASDIR%%/InterfaceTK/menubar.pyc
+%%EFICASDIR%%/InterfaceTK/menubar.pyo
+%%EFICASDIR%%/InterfaceTK/newsimppanel.py
+%%EFICASDIR%%/InterfaceTK/newsimppanel.pyc
+%%EFICASDIR%%/InterfaceTK/newsimppanel.pyo
+%%EFICASDIR%%/InterfaceTK/options.py
+%%EFICASDIR%%/InterfaceTK/options.pyc
+%%EFICASDIR%%/InterfaceTK/options.pyo
+%%EFICASDIR%%/InterfaceTK/panels.py
+%%EFICASDIR%%/InterfaceTK/panels.pyc
+%%EFICASDIR%%/InterfaceTK/panels.pyo
+%%EFICASDIR%%/InterfaceTK/panelsSalome.py
+%%EFICASDIR%%/InterfaceTK/panelsSalome.pyc
+%%EFICASDIR%%/InterfaceTK/panelsSalome.pyo
+%%EFICASDIR%%/InterfaceTK/patches.py
+%%EFICASDIR%%/InterfaceTK/patches.pyc
+%%EFICASDIR%%/InterfaceTK/patches.pyo
+%%EFICASDIR%%/InterfaceTK/plusieursassdpanel.py
+%%EFICASDIR%%/InterfaceTK/plusieursassdpanel.pyc
+%%EFICASDIR%%/InterfaceTK/plusieursassdpanel.pyo
+%%EFICASDIR%%/InterfaceTK/plusieursbasepanel.py
+%%EFICASDIR%%/InterfaceTK/plusieursbasepanel.pyc
+%%EFICASDIR%%/InterfaceTK/plusieursbasepanel.pyo
+%%EFICASDIR%%/InterfaceTK/plusieursintopanel.py
+%%EFICASDIR%%/InterfaceTK/plusieursintopanel.pyc
+%%EFICASDIR%%/InterfaceTK/plusieursintopanel.pyo
+%%EFICASDIR%%/InterfaceTK/plusieurspanel.py
+%%EFICASDIR%%/InterfaceTK/plusieurspanel.pyc
+%%EFICASDIR%%/InterfaceTK/plusieurspanel.pyo
+%%EFICASDIR%%/InterfaceTK/readercata.py
+%%EFICASDIR%%/InterfaceTK/readercata.pyc
+%%EFICASDIR%%/InterfaceTK/readercata.pyo
+%%EFICASDIR%%/InterfaceTK/shellpanel.py
+%%EFICASDIR%%/InterfaceTK/shellpanel.pyc
+%%EFICASDIR%%/InterfaceTK/shellpanel.pyo
+%%EFICASDIR%%/InterfaceTK/splash.py
+%%EFICASDIR%%/InterfaceTK/splash.pyc
+%%EFICASDIR%%/InterfaceTK/splash.pyo
+%%EFICASDIR%%/InterfaceTK/statusbar.py
+%%EFICASDIR%%/InterfaceTK/statusbar.pyc
+%%EFICASDIR%%/InterfaceTK/statusbar.pyo
+%%EFICASDIR%%/InterfaceTK/styles.py
+%%EFICASDIR%%/InterfaceTK/styles.pyc
+%%EFICASDIR%%/InterfaceTK/styles.pyo
+%%EFICASDIR%%/InterfaceTK/toolbar.py
+%%EFICASDIR%%/InterfaceTK/toolbar.pyc
+%%EFICASDIR%%/InterfaceTK/toolbar.pyo
+%%EFICASDIR%%/InterfaceTK/tooltip.py
+%%EFICASDIR%%/InterfaceTK/tooltip.pyc
+%%EFICASDIR%%/InterfaceTK/tooltip.pyo
+%%EFICASDIR%%/InterfaceTK/treeitemincanvas.py
+%%EFICASDIR%%/InterfaceTK/treeitemincanvas.pyc
+%%EFICASDIR%%/InterfaceTK/treeitemincanvas.pyo
+%%EFICASDIR%%/InterfaceTK/treewidget.py
+%%EFICASDIR%%/InterfaceTK/treewidget.pyc
+%%EFICASDIR%%/InterfaceTK/treewidget.pyo
+%%EFICASDIR%%/InterfaceTK/uniqueassdpanel.py
+%%EFICASDIR%%/InterfaceTK/uniqueassdpanel.pyc
+%%EFICASDIR%%/InterfaceTK/uniqueassdpanel.pyo
+%%EFICASDIR%%/InterfaceTK/uniquebasepanel.py
+%%EFICASDIR%%/InterfaceTK/uniquebasepanel.pyc
+%%EFICASDIR%%/InterfaceTK/uniquebasepanel.pyo
+%%EFICASDIR%%/InterfaceTK/uniquecomppanel.py
+%%EFICASDIR%%/InterfaceTK/uniquecomppanel.pyc
+%%EFICASDIR%%/InterfaceTK/uniquecomppanel.pyo
+%%EFICASDIR%%/InterfaceTK/uniqueintopanel.py
+%%EFICASDIR%%/InterfaceTK/uniqueintopanel.pyc
+%%EFICASDIR%%/InterfaceTK/uniqueintopanel.pyo
+%%EFICASDIR%%/InterfaceTK/uniquepanel.py
+%%EFICASDIR%%/InterfaceTK/uniquepanel.pyc
+%%EFICASDIR%%/InterfaceTK/uniquepanel.pyo
+%%EFICASDIR%%/InterfaceTK/uniquesdcopanel.py
+%%EFICASDIR%%/InterfaceTK/uniquesdcopanel.pyc
+%%EFICASDIR%%/InterfaceTK/uniquesdcopanel.pyo
+%%EFICASDIR%%/InterfaceTK/widgets.py
+%%EFICASDIR%%/InterfaceTK/widgets.pyc
+%%EFICASDIR%%/InterfaceTK/widgets.pyo
 %%EFICASDIR%%/LICENSE.TERMS
 %%EFICASDIR%%/Misc/Cyclops.py
 %%EFICASDIR%%/Misc/Cyclops.pyc
@@ -1442,6 +1462,9 @@
 %%EFICASDIR%%/Misc/timing.py
 %%EFICASDIR%%/Misc/timing.pyc
 %%EFICASDIR%%/Misc/timing.pyo
+%%EFICASDIR%%/Misc/traced.py
+%%EFICASDIR%%/Misc/traced.pyc
+%%EFICASDIR%%/Misc/traced.pyo
 %%EFICASDIR%%/NEWS
 %%EFICASDIR%%/Noyau/N_ASSD.py
 %%EFICASDIR%%/Noyau/N_ASSD.pyc
@@ -1452,6 +1475,9 @@
 %%EFICASDIR%%/Noyau/N_CO.py
 %%EFICASDIR%%/Noyau/N_CO.pyc
 %%EFICASDIR%%/Noyau/N_CO.pyo
+%%EFICASDIR%%/Noyau/N_CONVERT.py
+%%EFICASDIR%%/Noyau/N_CONVERT.pyc
+%%EFICASDIR%%/Noyau/N_CONVERT.pyo
 %%EFICASDIR%%/Noyau/N_CR.py
 %%EFICASDIR%%/Noyau/N_CR.pyc
 %%EFICASDIR%%/Noyau/N_CR.pyo
@@ -1750,393 +1776,224 @@
 %%EFICASDIR%%/generator/generator_vers3DSalome.pyc
 %%EFICASDIR%%/generator/generator_vers3DSalome.pyo
 bin/eficas
-%%PORTDOCS%%%%DOCSDIR%%/U40201h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U40201i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U40301e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U40301f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41101h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41102h.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41101i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U41102i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41103h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U41103i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41203a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U41203b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41301g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U41301h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41304a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U41304b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41401f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U41401g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U41501f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U41501g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42101h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U42101i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42201g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U42201h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42301g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U42301h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42302e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42302f1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42303g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42302f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U42303h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42304e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U42304f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U42305a1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42401h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U42501f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42401i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U42501g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43101h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43101i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43102h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43102i1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43103h.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43102i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43103i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43105f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43105g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43106b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43106c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43107b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43107c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43201f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43201g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43202g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43202h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43203g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43203h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43204h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43204i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43205a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43301f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43211a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43301g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43302a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43302b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43303a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43401h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43402h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43501e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43401i.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43402i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43501f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43502e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43502f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43601g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43601h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43602g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43602h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43603g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43603h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43605g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43605h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43606b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43606c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U43607b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44101h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44101i2.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44111a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43607c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44101i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44111b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44201h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44201i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44202e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44202f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44203g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44203h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44204c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44204d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44205a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44301h.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44205b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44301i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44302c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44302d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44303h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44303i2.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44304g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44303i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44304h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44305c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44306a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44306b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44401h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44401i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44402h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44402i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44403g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44403h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44404g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44405e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44405f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44412f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44412g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44414a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44414b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44421g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44421h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44422c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44422d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U44431e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44431f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45001e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45001f2.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45002b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45001f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45002c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45101h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45101i1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45101i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45102e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45102f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45103g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45103h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45111a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45111b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45201h.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45112a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45201i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45202e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45202f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45203g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45203h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45204h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45204i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45205g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45205h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45211g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45211h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45212e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45212f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45213f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45213g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45214g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45214h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45215a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45301g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45301h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45302h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45302i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45303a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45303b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45311g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45311h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45321g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45321h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45322g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45322h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45323e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45323f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45401h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45401i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45402f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45402g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45403d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45403e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45501h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45501i1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45502h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45502i1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45503g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45501i.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45502i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45503h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U45504g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U45504h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46101h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46102h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46103g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46103h1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46111h.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46101i.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46102i.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46103h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46111i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46121e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46121f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46122h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46122i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46123h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46201g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46123i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46201h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46202g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46202h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46301g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46301h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46311e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46311f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46312g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46312h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46313g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46313h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46314e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46314f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46321g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46321h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46322e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46322f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46401g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46401h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46402g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46402h1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46501f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46501g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46502f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46502g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46503f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46503g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46504f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46504g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46505f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46505g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46601e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46601f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46602f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46602g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46603b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46603c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46611d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46611e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U46621e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U46621f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47102c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47103g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47102d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47103h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47104d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47104e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47105a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47201h.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47105b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47201i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47202h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47203g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47204c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47204d1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47205e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47204d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47205g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47206d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47206e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47301c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47301d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47302b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47302c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U47401b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U47401c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48101h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48101i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48102g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48102h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48103h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48103i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48111g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48111h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48112g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48112h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48113b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48113c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48121f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48121g1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48122f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48122g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48131b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48131c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48201g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48201h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48202f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48202g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48203g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48203h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48204g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48204h1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48205c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48205d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48206c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48206d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48207b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48207c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48208a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48208b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48211a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48221a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48222a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48230a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48231a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48301e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48301f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48302e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48302f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48311e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48311f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48321d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48321e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48331e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48331f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48401f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48401g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48402f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48402g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48403e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48403f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48404f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48404g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48405f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48501c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48405g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48501d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49101h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49102e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49101i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U49102f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49103e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49111h.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49103f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U49111i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49121h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U49121i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49201h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U49201i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49202g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U49202h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49203d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49203e1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49204a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49203e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U49204b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U49211d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4cb10a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4cb20a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4cf10c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49211e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4cb10b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4cb20b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4cf10d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4cf20c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4cf20d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4mk10g.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4mk10h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4mk20f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4mk30f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4pc10c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4pc10d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U4pc20c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U4pc20d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70001c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70001d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70101h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70101i.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70111h.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70121c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70131b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70111i.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70121d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70131c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70201e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70201f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70202c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70202d1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70203b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70202d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70203c.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70211c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70211d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70231e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70231f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70232a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70233a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70301c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70301d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70302c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70302d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70311c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70311e.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70331a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70401c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70331b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70411e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70411f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70421c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70421d.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70432e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70432f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70433e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70433g.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70441a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70441b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70451a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70451b.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70501h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70501i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70511i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70511j.pdf
@@ -2156,21 +2013,21 @@ bin/eficas
 @dirrm %%EFICASDIR%%/Tools
 @dirrm %%EFICASDIR%%/Noyau
 @dirrm %%EFICASDIR%%/Misc
+@dirrm %%EFICASDIR%%/InterfaceTK
 @dirrm %%EFICASDIR%%/Ihm
 @dirrm %%EFICASDIR%%/Extensions
 @dirrm %%EFICASDIR%%/Editeur/icons
 @dirrm %%EFICASDIR%%/Editeur/Patrons
 @dirrm %%EFICASDIR%%/Editeur
-@dirrm %%EFICASDIR%%/Aster/materiau
+@dirrm %%EFICASDIR%%/Aster/Cata/cataSTA9/materiau
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA9/SD
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro
-@dirrm %%EFICASDIR%%/Aster/Cata/cataSTA9/materiau
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA9
-@dirrm %%EFICASDIR%%/Aster/Cata/cataSTA8/Macro
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA8/materiau
+@dirrm %%EFICASDIR%%/Aster/Cata/cataSTA8/Macro
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA8
-@dirrm %%EFICASDIR%%/Aster/Cata/cataSTA7/Macro
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA7/materiau
+@dirrm %%EFICASDIR%%/Aster/Cata/cataSTA7/Macro
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA7
 @dirrm %%EFICASDIR%%/Aster/Cata
 @dirrm %%EFICASDIR%%/Aster