r35445 - in /packages/scilab/trunk/debian: changelog patches/series patches/xmltoformat-2.diff patches/xmltoformat.diff
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Wed Jan 28 13:03:00 UTC 2009
Author: sylvestre-guest
Date: Wed Jan 28 13:03:00 2009
New Revision: 35445
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35445
Log:
* Add a backported patch from upstream to be able to build the
documentation without the french localization installed on the
system
Added:
packages/scilab/trunk/debian/patches/xmltoformat-2.diff
packages/scilab/trunk/debian/patches/xmltoformat.diff
Modified:
packages/scilab/trunk/debian/changelog
packages/scilab/trunk/debian/patches/series
Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=35445&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Wed Jan 28 13:03:00 2009
@@ -1,3 +1,11 @@
+scilab (5.0.3-5) experimental; urgency=low
+
+ * Add a backported patch from upstream to be able to build the
+ documentation without the french localization installed on the
+ system
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Wed, 28 Jan 2009 14:02:06 +0100
+
scilab (5.0.3-4) experimental; urgency=low
* scilab.desktop wasn't install (thanks again to Christoph Korn) and
Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=35445&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Wed Jan 28 13:03:00 2009
@@ -8,3 +8,5 @@
malloc.diff
unused-classpath.diff
installicons.diff
+xmltoformat.diff
+xmltoformat-2.diff
Added: packages/scilab/trunk/debian/patches/xmltoformat-2.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/xmltoformat-2.diff?rev=35445&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/xmltoformat-2.diff (added)
+++ packages/scilab/trunk/debian/patches/xmltoformat-2.diff Wed Jan 28 13:03:00 2009
@@ -1,0 +1,905 @@
+commit 16cdb522b83823e849a2ee7ae33df6cd1db2d955
+Author: Pierre MARECHAL <pierre.marechal at scilab.org>
+Date: Fri Jan 23 10:20:11 2009 +0100
+
+ - replace the getlanguage() and getdefaultlanguage() with the right language
+ - Homogenize & Cosmetic
+
+diff --git a/scilab/modules/action_binding/help/en_US/addchapter.sce b/scilab/modules/action_binding/help/en_US/addchapter.sce
+index 1f723d6..c784c86 100644
+--- a/scilab/modules/action_binding/help/en_US/addchapter.sce
++++ b/scilab/modules/action_binding/help/en_US/addchapter.sce
+@@ -1,6 +1,5 @@
+-
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at inria.fr>
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at scilab.org>
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -8,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help action_binding module
+-// Add chapter
+-// ====================================================================
+-
+-// path = SCI+'/modules/action_binding/help/'+getdefaultlanguage();
++// path = SCI+"/modules/action_binding/help/en_US";
+ // add_help_chapter("action_binding",path,%T);
+ // clear path add_help_chapter;
+diff --git a/scilab/modules/action_binding/help/fr_FR/addchapter.sce b/scilab/modules/action_binding/help/fr_FR/addchapter.sce
+index 5faefa8..1431515 100644
+--- a/scilab/modules/action_binding/help/fr_FR/addchapter.sce
++++ b/scilab/modules/action_binding/help/fr_FR/addchapter.sce
+@@ -1,6 +1,5 @@
+-
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at inria.fr>
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at scilab.org>
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -8,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help action_binding module
+-// Add chapter
+-// ====================================================================
+-
+-// path = SCI+'/modules/action_binding/help/'+getlanguage();
++// path = SCI+"/modules/action_binding/help/fr_FR";
+ // add_help_chapter("Action Binding",path,%T);
+ // clear path add_help_chapter;
+diff --git a/scilab/modules/arnoldi/help/en_US/addchapter.sce b/scilab/modules/arnoldi/help/en_US/addchapter.sce
+index 6c667e7..bac8c83 100644
+--- a/scilab/modules/arnoldi/help/en_US/addchapter.sce
++++ b/scilab/modules/arnoldi/help/en_US/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help arnoldi module
+-// Add chapter
+-// ====================================================================
+-path = SCI+'/modules/arnoldi/help/'+getdefaultlanguage();
++path = SCI+"/modules/arnoldi/help/en_US";
+ add_help_chapter("ARnoldi PACKage",path,%T);
+ clear path add_help_chapter;
+-// ====================================================================
+diff --git a/scilab/modules/arnoldi/help/fr_FR/addchapter.sce b/scilab/modules/arnoldi/help/fr_FR/addchapter.sce
+index 25210a7..234597a 100644
+--- a/scilab/modules/arnoldi/help/fr_FR/addchapter.sce
++++ b/scilab/modules/arnoldi/help/fr_FR/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help arnoldi module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/arnoldi/help/'+getlanguage();
++path = SCI+"/modules/arnoldi/help/fr_FR";
+ add_help_chapter("ARnoldi PACKage",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/boolean/help/en_US/addchapter.sce b/scilab/modules/boolean/help/en_US/addchapter.sce
+index c789f83..75359bc 100644
+--- a/scilab/modules/boolean/help/en_US/addchapter.sce
++++ b/scilab/modules/boolean/help/en_US/addchapter.sce
+@@ -1,16 +1,12 @@
+-// ====================================================================
+-// help boolean module
+-// Add chapter
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) INRIA - Allan CORNET
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+ // you should have received as part of this distribution. The terms
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+-// ====================================================================
+-path = SCI+'/modules/boolean/help/'+getdefaultlanguage();
++
++path = SCI+"/modules/boolean/help/en_US";
+ add_help_chapter("Boolean",path,%T);
+ clear path add_help_chapter;
+-// ====================================================================
+diff --git a/scilab/modules/boolean/help/fr_FR/addchapter.sce b/scilab/modules/boolean/help/fr_FR/addchapter.sce
+index 45a9911..7fa44b4 100644
+--- a/scilab/modules/boolean/help/fr_FR/addchapter.sce
++++ b/scilab/modules/boolean/help/fr_FR/addchapter.sce
+@@ -1,16 +1,12 @@
+-// ====================================================================
+-// help boolean module
+-// Add chapter
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) INRIA - Allan CORNET
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+ // you should have received as part of this distribution. The terms
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+-// ====================================================================
+-path = SCI+'/modules/boolean/help/'+getlanguage();
++
++path = SCI+"/modules/boolean/help/fr_FR";
+ add_help_chapter("Booléens",path,%T);
+ clear path add_help_chapter;
+-// ====================================================================
+diff --git a/scilab/modules/cacsd/help/en_US/addchapter.sce b/scilab/modules/cacsd/help/en_US/addchapter.sce
+index 73b5ac3..c52f6d9 100644
+--- a/scilab/modules/cacsd/help/en_US/addchapter.sce
++++ b/scilab/modules/cacsd/help/en_US/addchapter.sce
+@@ -1,8 +1,5 @@
+-// ====================================================================
+-// help cacsd module
+-// Add chapter
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) INRIA - Allan CORNET
++// Copyright (C) 2007 - INRIA - Allan CORNET
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -10,8 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-path = SCI+'/modules/cacsd/help/'+getdefaultlanguage();
++path = SCI+"/modules/cacsd/help/en_US";
+ add_help_chapter("CACSD",path,%T);
+ clear path add_help_chapter;
+-// ====================================================================
+diff --git a/scilab/modules/cacsd/help/fr_FR/addchapter.sce b/scilab/modules/cacsd/help/fr_FR/addchapter.sce
+index 5819fe6..146508a 100644
+--- a/scilab/modules/cacsd/help/fr_FR/addchapter.sce
++++ b/scilab/modules/cacsd/help/fr_FR/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help cacsd module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/cacsd/help/'+getlanguage();
++path = SCI+"/modules/cacsd/help/fr_FR";
+ add_help_chapter("CACSD",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/compatibility_functions/help/en_US/addchapter.sce b/scilab/modules/compatibility_functions/help/en_US/addchapter.sce
+index f138302..2528401 100644
+--- a/scilab/modules/compatibility_functions/help/en_US/addchapter.sce
++++ b/scilab/modules/compatibility_functions/help/en_US/addchapter.sce
+@@ -7,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help compatibility_functions module
+-// Add chapter
+-// ====================================================================
+-path = SCI+'/modules/compatibility_functions/help/'+getdefaultlanguage();
++path = SCI+"/modules/compatibility_functions/help/en_US";
+ add_help_chapter("Compatibility Functions",path,%T);
+ clear path add_help_chapter;
+-// ====================================================================
+diff --git a/scilab/modules/compatibility_functions/help/fr_FR/addchapter.sce b/scilab/modules/compatibility_functions/help/fr_FR/addchapter.sce
+index 5b74316..86c1326 100644
+--- a/scilab/modules/compatibility_functions/help/fr_FR/addchapter.sce
++++ b/scilab/modules/compatibility_functions/help/fr_FR/addchapter.sce
+@@ -7,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help compatibility_functions module
+-// Add chapter
+-// ====================================================================
+-path = SCI+'/modules/compatibility_functions/help/'+getlanguage();
++path = SCI+"/modules/compatibility_functions/help/fr_FR";
+ add_help_chapter("Fonctions de compatibilité",path,%T);
+ clear path add_help_chapter;
+-// ====================================================================
+diff --git a/scilab/modules/completion/help/en_US/addchapter.sce b/scilab/modules/completion/help/en_US/addchapter.sce
+index 3b2160e..53502e7 100644
+--- a/scilab/modules/completion/help/en_US/addchapter.sce
++++ b/scilab/modules/completion/help/en_US/addchapter.sce
+@@ -7,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help completion module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/completion/help/'+getdefaultlanguage();
++path = SCI+"/modules/completion/help/en_US";
+ add_help_chapter("Completion",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/console/help/en_US/addchapter.sce b/scilab/modules/console/help/en_US/addchapter.sce
+--- a/scilab/modules/console/help/en_US/addchapter.sce 2009-01-28 11:09:44.000000000 +0100
++++ b/scilab/modules/console/help/en_US/addchapter.sce 2009-01-28 11:09:58.000000000 +0100
+@@ -1,6 +1,7 @@
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ // Copyright (C) 2007-2008 - INRIA - Allan CORNET
+ // Copyright (C) 2007-2008 - INRIA - Vincent COUVERT
++// Copyright (C) 2009 - DIGITEO
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -8,12 +9,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help console module
+-// Add chapter
+-// ====================================================================
+-//path = SCI+'/modules/console/help/'+getdefaultlanguage();
+-//add_help_chapter("console",path,%T);
+-//clear path add_help_chapter;
+-// ====================================================================
++path = SCI+"/modules/console/help/en_US";
++add_help_chapter("Console",path,%T);
++clear path add_help_chapter;
+diff --git a/scilab/modules/console/help/fr_FR/addchapter.sce b/scilab/modules/console/help/fr_FR/addchapter.sce
+--- a/scilab/modules/console/help/fr_FR/addchapter.sce 2009-01-28 11:13:36.000000000 +0100
++++ b/scilab/modules/console/help/fr_FR/addchapter.sce 2009-01-28 11:11:25.000000000 +0100
+@@ -1,6 +1,7 @@
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ // Copyright (C) 2007-2008 - INRIA - Allan CORNET
+ // Copyright (C) 2007-2008 - INRIA - Vincent COUVERT
++// Copyright (C) 2009 - DIGITEO
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -8,12 +9,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help console module
+-// Add chapter
+-// ====================================================================
+-//path = SCI+'/modules/console/help/'+getlanguage();
+-//add_help_chapter("Console",path,%T);
+-//clear path add_help_chapter;
+-// ====================================================================
++path = SCI+"/modules/console/help/fr_FR";
++add_help_chapter("Console",path,%T);
++clear path add_help_chapter;
+
+diff --git a/scilab/modules/core/help/en_US/addchapter.sce b/scilab/modules/core/help/en_US/addchapter.sce
+index 5eb27c1..f75879a 100644
+--- a/scilab/modules/core/help/en_US/addchapter.sce
++++ b/scilab/modules/core/help/en_US/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help core module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/core/help/'+getdefaultlanguage();
++path = SCI+"/modules/core/help/en_US";
+ add_help_chapter("Scilab",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/core/help/fr_FR/addchapter.sce b/scilab/modules/core/help/fr_FR/addchapter.sce
+index 1049df5..3039a8c 100644
+--- a/scilab/modules/core/help/fr_FR/addchapter.sce
++++ b/scilab/modules/core/help/fr_FR/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help core module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/core/help/'+getlanguage();
++path = SCI+"/modules/core/help/fr_FR";
+ add_help_chapter("Scilab",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/data_structures/help/en_US/addchapter.sce b/scilab/modules/data_structures/help/en_US/addchapter.sce
+index 665de8c..b8c1327 100644
+--- a/scilab/modules/data_structures/help/en_US/addchapter.sce
++++ b/scilab/modules/data_structures/help/en_US/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help data_structures module
+-// Add chapter
+-// ====================================================================
+-path = SCI+'/modules/data_structures/help/'+getdefaultlanguage();
++path = SCI+"/modules/data_structures/help/en_US";
+ add_help_chapter("Data Structures",path,%T);
+ clear path add_help_chapter;
+-// ====================================================================
+diff --git a/scilab/modules/data_structures/help/fr_FR/addchapter.sce b/scilab/modules/data_structures/help/fr_FR/addchapter.sce
+index bc7fa5e..de0aa35 100644
+--- a/scilab/modules/data_structures/help/fr_FR/addchapter.sce
++++ b/scilab/modules/data_structures/help/fr_FR/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help data_structures module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/data_structures/help/'+getlanguage();
++path = SCI+"/modules/data_structures/help/fr_FR";
+ add_help_chapter("Structures",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/demo_tools/help/en_US/addchapter.sce b/scilab/modules/demo_tools/help/en_US/addchapter.sce
+index 5db2005..9330b07 100644
+--- a/scilab/modules/demo_tools/help/en_US/addchapter.sce
++++ b/scilab/modules/demo_tools/help/en_US/addchapter.sce
+@@ -1,4 +1,3 @@
+-
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ // Copyright (C) 2007-2008 - INRIA - Pierre MARECHAL <pierre.marechal at inria.fr>
+ //
+@@ -8,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// =============================================================================
+-// help demo_tools module
+-// Add chapter
+-// =============================================================================
+-
+-path = SCI+'/modules/demo_tools/help/'+getdefaultlanguage();
++path = SCI+"/modules/demo_tools/help/en_US";
+ add_help_chapter("Demo Tools",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/demo_tools/help/fr_FR/addchapter.sce b/scilab/modules/demo_tools/help/fr_FR/addchapter.sce
+index 7ba46f3..0b4a57d 100644
+--- a/scilab/modules/demo_tools/help/fr_FR/addchapter.sce
++++ b/scilab/modules/demo_tools/help/fr_FR/addchapter.sce
+@@ -1,4 +1,3 @@
+-
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ // Copyright (C) 2007-2008 - INRIA - Pierre MARECHAL <pierre.marechal at inria.fr>
+ //
+@@ -8,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// =============================================================================
+-// help demo_tools module
+-// Add chapter
+-// =============================================================================
+-
+-path = SCI+'/modules/demo_tools/help/'+getlanguage();
++path = SCI+"/modules/demo_tools/help/fr_FR";
+ add_help_chapter("Outils pour les démonstrations",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/development_tools/help/en_US/addchapter.sce b/scilab/modules/development_tools/help/en_US/addchapter.sce
+index ed031ed..cd94405 100644
+--- a/scilab/modules/development_tools/help/en_US/addchapter.sce
++++ b/scilab/modules/development_tools/help/en_US/addchapter.sce
+@@ -1,6 +1,5 @@
+-
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at inria.fr>
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at scilab.org>
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -8,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help development_tools module
+-// Add chapter
+-// ====================================================================
+-
+ path = SCI+"/modules/development_tools/help/"+getdefaultlanguage();
+ add_help_chapter("Development tools",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/development_tools/help/fr_FR/addchapter.sce b/scilab/modules/development_tools/help/fr_FR/addchapter.sce
+index 640526b..b6b2a7f 100644
+--- a/scilab/modules/development_tools/help/fr_FR/addchapter.sce
++++ b/scilab/modules/development_tools/help/fr_FR/addchapter.sce
+@@ -1,6 +1,5 @@
+-
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at inria.fr>
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at scilab.org>
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -8,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help development_tools module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/development_tools/help/'+getlanguage();
++path = SCI+"/modules/development_tools/help/fr_FR";
+ add_help_chapter("Outils de développement",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/differential_equations/help/en_US/addchapter.sce b/scilab/modules/differential_equations/help/en_US/addchapter.sce
+index 4599cb1..615e9df 100644
+--- a/scilab/modules/differential_equations/help/en_US/addchapter.sce
++++ b/scilab/modules/differential_equations/help/en_US/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help differential_equations module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/differential_equations/help/'+getdefaultlanguage();
++path = SCI+"/modules/differential_equations/help/en_US";
+ add_help_chapter("Differential Equations",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/differential_equations/help/fr_FR/addchapter.sce b/scilab/modules/differential_equations/help/fr_FR/addchapter.sce
+index e1055c5..7931a8e 100644
+--- a/scilab/modules/differential_equations/help/fr_FR/addchapter.sce
++++ b/scilab/modules/differential_equations/help/fr_FR/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help differential_equations module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/differential_equations/help/'+getlanguage();
++path = SCI+"/modules/differential_equations/help/fr_FR";
+ add_help_chapter("Equations Differentielles",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/double/help/en_US/addchapter.sce b/scilab/modules/double/help/en_US/addchapter.sce
+index 2c060df..c3ea592 100644
+--- a/scilab/modules/double/help/en_US/addchapter.sce
++++ b/scilab/modules/double/help/en_US/addchapter.sce
+@@ -1,6 +1,5 @@
+-
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at inria.fr>
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at scilab.org>
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -8,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help double module
+-// Add chapter
+-// ====================================================================
+-
+-// path = SCI+'/modules/double/help/'+getdefaultlanguage();
++// path = SCI+"/modules/double/help/en_US";
+ // add_help_chapter("Doubles",path,%T);
+ // clear path add_help_chapter;
+diff --git a/scilab/modules/double/help/fr_FR/addchapter.sce b/scilab/modules/double/help/fr_FR/addchapter.sce
+index ea19b27..6286843 100644
+--- a/scilab/modules/double/help/fr_FR/addchapter.sce
++++ b/scilab/modules/double/help/fr_FR/addchapter.sce
+@@ -1,6 +1,5 @@
+-
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at inria.fr>
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at scilab.org>
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -8,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help double module
+-// Add chapter
+-// ====================================================================
+-
+-// path = SCI+'/modules/double/help/'+getlanguage();
++// path = SCI+"/modules/double/help/fr_FR";
+ // add_help_chapter("Doubles",path,%T);
+ // clear path add_help_chapter;
+diff --git a/scilab/modules/dynamic_link/help/en_US/addchapter.sce b/scilab/modules/dynamic_link/help/en_US/addchapter.sce
+index 59c065c..10fe78e 100644
+--- a/scilab/modules/dynamic_link/help/en_US/addchapter.sce
++++ b/scilab/modules/dynamic_link/help/en_US/addchapter.sce
+@@ -1,8 +1,5 @@
+-// ====================================================================
+-// help dynamic_link module
+-// Add chapter
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) INRIA - Allan CORNET
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -10,9 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-path = SCI+'/modules/dynamic_link/help/'+getdefaultlanguage();
++path = SCI+"/modules/dynamic_link/help/en_US";
+ add_help_chapter("Dynamic/incremental Link",path,%T);
+ clear path add_help_chapter;
+-// ====================================================================
+diff --git a/scilab/modules/dynamic_link/help/fr_FR/addchapter.sce b/scilab/modules/dynamic_link/help/fr_FR/addchapter.sce
+index 56c50a6..ecda4ad 100644
+--- a/scilab/modules/dynamic_link/help/fr_FR/addchapter.sce
++++ b/scilab/modules/dynamic_link/help/fr_FR/addchapter.sce
+@@ -1,8 +1,5 @@
+-// ====================================================================
+-// help dynamic_link module
+-// Add chapter
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) INRIA - Allan CORNET
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -10,9 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-path = SCI+'/modules/dynamic_link/help/'+getlanguage();
++path = SCI+"/modules/dynamic_link/help/fr_FR";
+ add_help_chapter("Link dynamique/incremental",path,%T);
+ clear path add_help_chapter;
+-// ====================================================================
+diff --git a/scilab/modules/elementary_functions/help/en_US/addchapter.sce b/scilab/modules/elementary_functions/help/en_US/addchapter.sce
+index 71699c9..e0e1daf 100644
+--- a/scilab/modules/elementary_functions/help/en_US/addchapter.sce
++++ b/scilab/modules/elementary_functions/help/en_US/addchapter.sce
+@@ -7,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help elementary_functions module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/elementary_functions/help/'+getdefaultlanguage();
++path = SCI+"/modules/elementary_functions/help/en_US";
+ add_help_chapter("Elementary Functions",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/elementary_functions/help/fr_FR/addchapter.sce b/scilab/modules/elementary_functions/help/fr_FR/addchapter.sce
+index e809aa9..6882b25 100644
+--- a/scilab/modules/elementary_functions/help/fr_FR/addchapter.sce
++++ b/scilab/modules/elementary_functions/help/fr_FR/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help elementary_functions module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/elementary_functions/help/'+getlanguage();
++path = SCI+"/modules/elementary_functions/help/fr_FR";
+ add_help_chapter("Fonctions Elémentaires",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/fftw/help/en_US/addchapter.sce b/scilab/modules/fftw/help/en_US/addchapter.sce
+index f45de3c..d865d0e 100644
+--- a/scilab/modules/fftw/help/en_US/addchapter.sce
++++ b/scilab/modules/fftw/help/en_US/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help fftw module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/fftw/help/'+getdefaultlanguage();
++path = SCI+"/modules/fftw/help/en_US";
+ add_help_chapter("FFTW",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/fftw/help/fr_FR/addchapter.sce b/scilab/modules/fftw/help/fr_FR/addchapter.sce
+index 741118d..aeb07de 100644
+--- a/scilab/modules/fftw/help/fr_FR/addchapter.sce
++++ b/scilab/modules/fftw/help/fr_FR/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help fftw module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/fftw/help/'+getlanguage();
++path = SCI+"/modules/fftw/help/fr_FR";
+ add_help_chapter("FFTW",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/fileio/help/en_US/addchapter.sce b/scilab/modules/fileio/help/en_US/addchapter.sce
+index e2afbc5..63df1fb 100644
+--- a/scilab/modules/fileio/help/en_US/addchapter.sce
++++ b/scilab/modules/fileio/help/en_US/addchapter.sce
+@@ -1,5 +1,5 @@
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at inria.fr>
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at scilab.org>
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -7,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help history_manager module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/fileio/help/'+getdefaultlanguage();
++path = SCI+"/modules/fileio/help/en_US";
+ add_help_chapter("Files : Input/Output functions",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/fileio/help/fr_FR/addchapter.sce b/scilab/modules/fileio/help/fr_FR/addchapter.sce
+index 1242dbc..5d2d4c7 100644
+--- a/scilab/modules/fileio/help/fr_FR/addchapter.sce
++++ b/scilab/modules/fileio/help/fr_FR/addchapter.sce
+@@ -7,12 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help fileio module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/fileio/help/'+getlanguage();
++path = SCI+"/modules/fileio/help/fr_FR";
+ add_help_chapter("Entrées/Sorties [fichiers]",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/functions/help/en_US/addchapter.sce b/scilab/modules/functions/help/en_US/addchapter.sce
+index 550aa9c..ca4b58a 100644
+--- a/scilab/modules/functions/help/en_US/addchapter.sce
++++ b/scilab/modules/functions/help/en_US/addchapter.sce
+@@ -1,6 +1,5 @@
+-
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at inria.fr>
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at scilab.org>
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -8,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help functions module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/functions/help/'+getdefaultlanguage();
++path = SCI+"/modules/functions/help/en_US";
+ add_help_chapter("Functions",path,%T);
+ clear path add_help_chapter;
+diff --git a/scilab/modules/functions/help/fr_FR/addchapter.sce b/scilab/modules/functions/help/fr_FR/addchapter.sce
+index e7f23c5..c9a40ea 100644
+--- a/scilab/modules/functions/help/fr_FR/addchapter.sce
++++ b/scilab/modules/functions/help/fr_FR/addchapter.sce
+@@ -1,6 +1,5 @@
+-
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at inria.fr>
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at scilab.org>
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -8,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help functions module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+'/modules/functions/help/'+getlanguage();
++path = SCI+"/modules/functions/help/fr_FR";
+ add_help_chapter("Fonctions",path,%T);
+ clear path add_help_chapter;
+--- a/scilab/modules/genetic_algorithms/help/fr_FR/addchapter.sce 2009-01-28 12:05:33.000000000 +0100
++++ b/scilab/modules/genetic_algorithms/help/fr_FR/addchapter.sce 2009-01-28 12:06:07.000000000 +0100
+@@ -1,16 +1,12 @@
+-// ====================================================================
+-// help genetic_algorithms module
+-// Add chapter
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ // Copyright (C) 2008 - INRIA
+-//
++//
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+ // you should have received as part of this distribution. The terms
+-// are also available at
++// are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+-// ====================================================================
+
+-path = SCI+"/modules/genetic_algorithms/help/"+getlanguage();
++path = SCI+"/modules/genetic_algorithms/help/fr_FR";
+ add_help_chapter("Algorithmes génétiques",path,%T);
+ clear path add_help_chapter;
+--- a/scilab/modules/graphic_export/help/fr_FR/addchapter.sce 2009-01-28 12:05:33.000000000 +0100
++++ b/scilab/modules/graphic_export/help/fr_FR/addchapter.sce 2009-01-28 12:06:07.000000000 +0100
+@@ -1,5 +1,6 @@
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ // Copyright (C) 2008 - INRIA - Allan Cornet
++// Copyright (C) 2009 - DIGITEO
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -7,12 +8,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-
+-// ====================================================================
+-// help graphic_export module
+-// Add chapter
+-// ====================================================================
+-
+-path = SCI+"/modules/graphic_export/help/"+getlanguage();
++path = SCI+"/modules/graphic_export/help/fr_FR";
+ add_help_chapter("Graphics : export et impression",path,%T);
+ clear path add_help_chapter;
+--- a/scilab/modules/matio/help/fr_FR/addchapter.sce 2009-01-28 12:05:33.000000000 +0100
++++ b/scilab/modules/matio/help/fr_FR/addchapter.sce 2009-01-28 12:06:07.000000000 +0100
+@@ -7,11 +7,6 @@
+ // are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-// help matio module
+-// Add chapter
+-// ====================================================================
+-path = SCI+"/modules/matio/help/"+getlanguage();
++path = SCI+"/modules/matio/help/fr_FR";
+ add_help_chapter("Lecture/Ecriture de fichiers binaires Matlab",path,%T);
+ clear path add_help_chapter;
+-// ====================================================================
+--- a/scilab/modules/parameters/help/fr_FR/addchapter.sce 2009-01-28 12:05:33.000000000 +0100
++++ b/scilab/modules/parameters/help/fr_FR/addchapter.sce 2009-01-28 12:06:07.000000000 +0100
+@@ -1,16 +1,12 @@
+-// ====================================================================
+-// help parameters module
+-// Add chapter
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ // Copyright (C) 2008 - INRIA
+-//
++//
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+ // you should have received as part of this distribution. The terms
+-// are also available at
++// are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+-// ====================================================================
+
+-path = SCI+"/modules/parameters/help/"+getlanguage();
++path = SCI+"/modules/parameters/help/fr_FR";
+ add_help_chapter("Parameters",path,%T);
+ clear path add_help_chapter;
+--- a/scilab/modules/renderer/help/fr_FR/addchapter.sce 2009-01-28 12:05:33.000000000 +0100
++++ b/scilab/modules/renderer/help/fr_FR/addchapter.sce 2009-01-28 12:06:07.000000000 +0100
+@@ -1,10 +1,13 @@
+-// ====================================================================
+-// help renderer module
+-// Add chapter
+-// Copyright INRIA 2007
+-// Allan CORNET
+-// ====================================================================
+-path = SCI+'/modules/renderer/help/'+getdefaultlanguage();
+-add_help_chapter("Renderer",path,%T);
+-clear path add_help_chapter;
+-// ====================================================================
++// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
++// Copyright (C) 2007 - INRIA
++// Copyright (C) 2009 - DIGITEO
++//
++// This file must be used under the terms of the CeCILL.
++// This source file is licensed as described in the file COPYING, which
++// you should have received as part of this distribution. The terms
++// are also available at
++// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
++
++// path = SCI+"/modules/renderer/help/fr_FR";
++// add_help_chapter("Renderer",path,%T);
++// clear path add_help_chapter;
+--- a/scilab/modules/scicos/help/fr_FR/addchapter.sce 2009-01-28 12:05:33.000000000 +0100
++++ b/scilab/modules/scicos/help/fr_FR/addchapter.sce 2009-01-28 12:06:07.000000000 +0100
+@@ -1,14 +1,13 @@
+-
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet at inria.fr>
+-//
++// Copyright (C) 2007-2008 - INRIA - Allan CORNET
++// Copyright (C) 2009 - DIGITEO
++//
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+ // you should have received as part of this distribution. The terms
+-// are also available at
++// are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+-// ====================================================================
+-path = SCI+'/modules/scicos/help/'+getlanguage();
++path = SCI+"/modules/scicos/help/" + getlanguage();
+ add_help_chapter("Scicos",path,%F);
+ clear path add_help_chapter;
+--- a/scilab/modules/simulated_annealing/help/fr_FR/addchapter.sce 2009-01-28 12:05:33.000000000 +0100
++++ b/scilab/modules/simulated_annealing/help/fr_FR/addchapter.sce 2009-01-28 12:06:07.000000000 +0100
+@@ -1,16 +1,12 @@
+-// ====================================================================
+-// help simulated_annealing module
+-// Add chapter
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ // Copyright (C) 2008 - INRIA
+-//
++//
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+ // you should have received as part of this distribution. The terms
+-// are also available at
++// are also available at
+ // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+-// ====================================================================
+
+-path = SCI+"/modules/simulated_annealing/help/"+getlanguage();
++path = SCI+"/modules/simulated_annealing/help/fr_FR";
+ add_help_chapter("Simulated Annealing",path,%T);
+ clear path add_help_chapter;
Added: packages/scilab/trunk/debian/patches/xmltoformat.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/xmltoformat.diff?rev=35445&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/xmltoformat.diff (added)
+++ packages/scilab/trunk/debian/patches/xmltoformat.diff Wed Jan 28 13:03:00 2009
@@ -1,0 +1,974 @@
+--- scilab-5.0.3.orig/modules/helptools/macros/xmltoformat.sci 2008-11-05 18:42:14.000000000 +0100
++++ scilab-5.0.3/modules/helptools/macros/xmltoformat.sci 2009-01-28 10:50:10.000000000 +0100
+@@ -1,5 +1,7 @@
+ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ // Copyright (C) 2008 INRIA - Pierre MARECHAL <pierre.marechal at inria.fr>
++// Copyright (C) 2008-2009 DIGITEO - Pierre MARECHAL <pierre.marechal at scilab.org>
++// Copyright (C) 2009 DIGITEO - Vincent COUVERT <vincent.couvert at scilab.org>
+ //
+ // This file must be used under the terms of the CeCILL.
+ // This source file is licensed as described in the file COPYING, which
+@@ -43,18 +45,15 @@
+ %helps_save = %helps;
+ %helps_modules_save = %helps_modules;
+
+- //------------------------------------------------------------------
+- // Patch because scicos is not written in xml
+- //------------------------------------------------------------------
+- %helps(grep(%helps,filesep()+"modules"+filesep()+"scicos"+filesep()),:) = [];
++ generated_files = [];
+
+ all_scilab_help = %F;
++ my_wanted_language = getlanguage(); // This variable is only need when
++ // build all scilab help
+
+ [lhs,rhs] = argn(0);
+
+- generated_files = [];
+-
+- // Trop de param�tres
++ // Too much parameters
+ // ---------------------------------------------------------------------
+
+ if rhs > 5 | rhs < 1 then
+@@ -63,20 +62,30 @@
+
+ // Transformation du %helps_modules jar => help/language
+
+- // Cas par d�faut : construction de l'aide en ligne de Scilab
++ // Default case : construction de l'aide en ligne de Scilab
+ // ---------------------------------------------------------------------
+
+- if (rhs <= 1) | ((rhs == 2) & (dirs == [])) then
+-
+- all_scilab_help = %T;
++ if ( (rhs <= 1) ..
++ | ((rhs == 2) & (dirs == [])) ..
++ | ((rhs == 3) & (dirs == []) & (titles == [])) ..
++ | ((rhs == 4) & (dirs == []) & (titles == [])) ) then
++
++ all_scilab_help = %T;
++
++ // "directory_language" input argument is defined !
++ if rhs == 4 then
++ my_wanted_language = directory_language;
++ reset_help_modules_var(my_wanted_language);
++ %HELPS=[%helps_modules;%helps];
++ end
+
+ dirs_to_build = %HELPS;
+ dirs_to_build_m = %helps_modules;
+ dirs_to_build_c = %helps;
+
+- dirs = get_xml_path(dirs_to_build(:,1));
+- dirs_m = get_xml_path(dirs_to_build_m(:,1));
+- dirs_c = get_xml_path(dirs_to_build_c(:,1));
++ dirs = get_xml_path(dirs_to_build(:,1),my_wanted_language);
++ dirs_m = get_xml_path(dirs_to_build_m(:,1),my_wanted_language);
++ dirs_c = get_xml_path(dirs_to_build_c(:,1),my_wanted_language);
+
+ titles = dirs_to_build(:,2);
+ titles_m = dirs_to_build_m(:,2);
+@@ -101,38 +110,38 @@
+ language_system_m = []; // a help directory needs to be completed
+ language_system_c = []; // with the default language
+
+- if getlanguage() == getdefaultlanguage() then
++ if my_wanted_language == getdefaultlanguage() then
+ for k=1:size(dirs,'*')
+- directory_language = [directory_language;getdefaultlanguage()];
++ directory_language = [directory_language;my_wanted_language];
+ language_system = [language_system;%F];
+ end
+ for k=1:size(dirs_m,'*')
+- directory_language_m = [directory_language_m;getdefaultlanguage()];
++ directory_language_m = [directory_language_m;my_wanted_language];
+ language_system_m = [language_system_m;%F];
+ end
+ for k=1:size(dirs_c,'*')
+- directory_language_c = [directory_language_c;getdefaultlanguage()];
++ directory_language_c = [directory_language_c;my_wanted_language];
+ language_system_c = [language_system_c;%F];
+ end
+ else
+ for k=1:size(dirs,'*')
+- directory_language = [directory_language;getlanguage()];
++ directory_language = [directory_language;my_wanted_language];
+ default_language = [default_language;getdefaultlanguage()];
+ language_system = [language_system;%T]; // Enable the language system
+ end
+ for k=1:size(dirs_m,'*')
+- directory_language_m = [directory_language_m;getlanguage()];
++ directory_language_m = [directory_language_m;my_wanted_language];
+ default_language_m = [default_language_m;getdefaultlanguage()];
+ language_system_m = [language_system_m;%T]; // Enable the language system
+ end
+ for k=1:size(dirs_c,'*')
+- directory_language_c = [directory_language_c;getlanguage()];
++ directory_language_c = [directory_language_c;my_wanted_language];
+ default_language_c = [default_language_c;getdefaultlanguage()];
+ language_system_c = [language_system_c;%T]; // Enable the language system
+ end
+ end
+
+- // Cas ou seulement le ou les r�pertoires sont pr�cis�s
++ // Only directories are precised
+ // ---------------------------------------------------------------------
+
+ elseif (rhs == 2) & (dirs <> []) then
+@@ -154,8 +163,7 @@
+ end
+ end
+
+- // Cas ou seulement le ou les r�pertoires ainsi que le ou les titres
+- // sont pr�cis�s
++ // Only directories and title are precised
+ // ---------------------------------------------------------------------
+
+ elseif rhs == 3 then
+@@ -175,8 +183,7 @@
+ end
+ end
+
+- // Cas les r�pertoires,les titres ainsi que la
+- // langue du r�pertoire sont pr�cis�s
++ // Directories, title and languages are specified
+ // ---------------------------------------------------------------------
+
+ elseif rhs == 4 then
+@@ -194,7 +201,7 @@
+ end
+ end
+
+- // Cas o� tous est pr�cis�
++ // All is specified
+ // ---------------------------------------------------------------------
+
+ elseif rhs == 5 then
+@@ -213,7 +220,7 @@
+
+ end
+
+- // On transforme le ou les chemins donn�s en chemin absolu
++ // Convert paths into absolute paths
+ // ---------------------------------------------------------------------
+
+ for k=1:size(dirs,'*');
+@@ -259,7 +266,7 @@
+ end
+
+ //----------------------------------------------------------------------
+- // On �tablit la liste des r�pertoires n�c�ssitants d'�tre reconstruit
++ // Make out the list of directories that need to be (re)build
+ //----------------------------------------------------------------------
+
+ need_to_be_build_tab = [];
+@@ -296,7 +303,7 @@
+ return;
+ end
+
+- // Nombre de r�pertoire ayant besoin d'une modification
++ // Number of directories that need to be (re)build
+ // ---------------------------------------------------------------------
+
+ nb_dir = size( find(need_to_be_build_tab == %T) , '*' );
+@@ -370,11 +377,11 @@
+
+ if all_scilab_help then
+
+- master_doc = SCI+"/modules/helptools/master_"+getlanguage()+"_help.xml";
++ master_doc = SCI+"/modules/helptools/master_"+my_wanted_language+"_help.xml";
+
+ if or(need_to_be_build_tab_m) then
+- mprintf(_("\nBuilding the Scilab manual master document for %s.\n"),getlanguage());
+- create_MD(dirs_m,titles_m,master_doc,getlanguage());
++ mprintf(_("\nBuilding the Scilab manual master document for %s.\n"),my_wanted_language);
++ create_MD(dirs_m,titles_m,master_doc,my_wanted_language);
+
+ end
+
+@@ -382,7 +389,11 @@
+ for k=1:size(dirs_c,"*")
+ if need_to_be_build_tab_c(k) then
+ mprintf(_("\nBuilding the master document: %s\n"),titles_c(k));
+- create_MD_dir(dirs_c(k),titles_c(k),dirs_c(k)+"/master_help.xml",directory_language_c(k));
++ if getshortpathname(dirs_c(k)) == getshortpathname(pathconvert(SCI + "/modules/scicos/help/" + directory_language_c(k),%f,%f)) then
++ create_MD_scicos(dirs_c(k), dirs_c(k)+"/master_help.xml", directory_language_c(k))
++ else
++ create_MD_dir(dirs_c(k),titles_c(k),dirs_c(k)+"/master_help.xml",directory_language_c(k));
++ end
+ end
+ end
+ end
+@@ -394,14 +405,18 @@
+ if need_to_be_build_tab(k) then
+ if nb_dir > 1 then
+ if displaydone == 0 then
+- mprintf(_("\nBuilding the master document for %s.\n"),getlanguage());
++ mprintf(_("\nBuilding the master document for %s.\n"),my_wanted_language);
+ displaydone = 1;
+ end
+ mprintf(_("\t%s\n"),strsubst(dirs(k),SCI_long,"SCI"));
+ else
+ mprintf(_("\nBuilding the master document in %s\n"),strsubst(dirs(k),SCI_long,"SCI"));
+ end
+- create_MD_dir(dirs(k),titles(k),dirs(k)+"/master_help.xml",directory_language(k));
++ if getshortpathname(dirs(k))==getshortpathname(pathconvert(SCI + "/modules/scicos/help/" + directory_language(k),%f,%f)) then
++ create_MD_scicos(dirs(k), dirs(k)+"/master_help.xml", directory_language(k))
++ else
++ create_MD_dir(dirs(k),titles(k),dirs(k)+"/master_help.xml",directory_language(k));
++ end
+ end
+ end
+
+@@ -421,10 +436,7 @@
+
+ if all_scilab_help then
+
+- mprintf(_("\nBuilding the scilab manual file ["+output_format+"] (Please wait building ... this can take up to 10 minutes)\n"));
+-
+- // Define and create the path of buildDoc working directory
+- buildDoc_dir = pathconvert(dirs_c(k) + "/scilab_" + getlanguage() + "_help",%t,%f);
++ mprintf(_("\nBuilding the scilab manual file ["+output_format+"] (Please wait building ... this can take a while)\n"));
+
+ // Define and create the final output directory if does not exist
+ final_output_dir = pathconvert(SCI+"/modules/helptools/"+output_format_ext,%f,%f);
+@@ -434,7 +446,7 @@
+ end
+
+ if is_html then
+- final_output_dir = pathconvert(final_output_dir+"/"+getlanguage(),%f,%f);
++ final_output_dir = pathconvert(final_output_dir+"/"+my_wanted_language,%f,%f);
+ if ~isdir(final_output_dir) then
+ mkdir(final_output_dir);
+ end
+@@ -444,11 +456,11 @@
+ if is_html then
+ final_help_file = pathconvert(final_output_dir+"/index.html",%f,%f);
+ else
+- final_help_file = pathconvert(final_output_dir+"/scilab_" + getlanguage() + "_help." + output_format_ext,%f,%f);
++ final_help_file = pathconvert(final_output_dir+"/scilab_" + my_wanted_language + "_help." + output_format_ext,%f,%f);
+ end
+
+ // Define and create the path of buildDoc working directory
+- buildDoc_dir = pathconvert(SCI+"/modules/helptools/"+ output_format + "/scilab_" + getlanguage() + "_help",%t,%f);
++ buildDoc_dir = pathconvert(SCI+"/modules/helptools/"+ output_format + "/scilab_" + my_wanted_language + "_help",%t,%f);
+ if ~isdir(pathconvert(SCI+"/modules/helptools/"+output_format,%f,%f)) then
+ mkdir(pathconvert(SCI+"/modules/helptools/"+output_format,%f,%f));
+ end
+@@ -457,8 +469,10 @@
+ end
+
+ // Define the path of the generated file created by buildDoc
+- if ~is_html then
+- buildDoc_file = pathconvert(buildDoc_dir + "scilab_" + getlanguage() + "_help." + output_format_ext,%f,%f);
++ if is_html then
++ buildDoc_file = pathconvert(buildDoc_dir + "index.html",%f,%f);
++ else
++ buildDoc_file = pathconvert(buildDoc_dir + "scilab_" + my_wanted_language + "_help." + output_format_ext,%f,%f);
+ end
+
+ // Save the current directory
+@@ -470,7 +484,7 @@
+ end
+
+ // process the build
+- buildDoc(output_format);
++ buildDoc(output_format,master_doc,my_wanted_language);
+
+ // Check if the help file has been generated
+ if fileinfo(buildDoc_file)==[] then
+@@ -506,7 +520,7 @@
+ for k=1:size(dirs_c,"*");
+ if need_to_be_build_tab_c(k) then
+
+- mprintf(_("\nBuilding the manual file [%s] in %s. (Please wait building ... this can take up to 10 minutes)\n"),output_format,strsubst(dirs_c(k),SCI_long,"SCI"));
++ mprintf(_("\nBuilding the manual file [%s] in %s. (Please wait building ... this can take a while)\n"),output_format,strsubst(dirs_c(k),SCI_long,"SCI"));
+
+ // Define and create the final output directory if does not exist
+ final_output_dir = pathconvert(dirs_c(k)+"/../../"+output_format_ext,%f,%f);
+@@ -536,7 +550,9 @@
+ end
+
+ // Define the path of the generated file created by buildDoc
+- if ~is_html then
++ if is_html then
++ buildDoc_file = pathconvert(buildDoc_dir + "index.html",%f,%f);
++ else
+ buildDoc_file = pathconvert(buildDoc_dir + "scilab_" + directory_language_c(k) + "_help." + output_format_ext,%f,%f);
+ end
+
+@@ -593,12 +609,12 @@
+
+ if nb_dir > 1 then
+ if displaydone == 0 then
+- mprintf(_("\nBuilding the manual file [%s]. (Please wait building ... this can take up to 10 minutes)\n"),output_format);
++ mprintf(_("\nBuilding the manual file [%s]. (Please wait building ... this can take a while)\n"),output_format);
+ displaydone = 1;
+ end
+ mprintf(_("\t%s\n"),strsubst(dirs(k),SCI_long,"SCI"));
+ else
+- mprintf(_("\nBuilding the manual file [%s] in %s. (Please wait building ... this can take up to 10 minutes)\n"),output_format,strsubst(dirs(k),SCI_long,"SCI"));
++ mprintf(_("\nBuilding the manual file [%s] in %s. (Please wait building ... this can take a while)\n"),output_format,strsubst(dirs(k),SCI_long,"SCI"));
+ end
+
+ // Define and create the final output directory if does not exist
+@@ -741,7 +757,7 @@
+ end
+
+ //----------------------------------------------------------------------
+- // Cr�ation du fichier "directory/.last_successful_build_output_format"
++ // Create the file "directory/.last_successful_build_output_format"
+ //----------------------------------------------------------------------
+
+ for k=1:size(dirs,'*');
+@@ -769,20 +785,20 @@
+ // Copyright INRIA
+ // Date : 26, july 2006
+ //
+- // Cette macro compl�te un r�pertoire dont certaines aides en ligne sont manquantes
+- // Elle le compl�te avec les aides en ligne de la langue par d�faut
++ // This macro fill a directory which some online help are missing
++ // It fill it with the online help written in the default language
+ //
+ // macro non-visible de l'utilisateur
+ //--------------------------------------------------------------------------
+
+- // Directory trait�e
++ // Handled directory
+ directory = pathconvert(directory,%f,%f);
+
+ //--------------------------------------------------------------------------
+- // Nettoyage du r�pertoire
++ // Directory cleaning
+ // Si il existe un fichier .list_<directory_language> (fichier contenant tous les
+- // fichiers traduits dans la langue du r�pertoire), on supprime dans l'ordre :
+- // 1. Tous les fichiers n'appartenant pas � la liste contenue dans .list_<directory_language>
++ // fichiers traduits dans la langue du répertoire), on supprime dans l'ordre :
++ // 1. Tous les fichiers n'appartenant pas à la liste contenue dans .list_<directory_language>
+ // 2. Tous les fichiers de la forme .list_<language>
+ //--------------------------------------------------------------------------
+
+@@ -792,8 +808,8 @@
+ end
+
+ //--------------------------------------------------------------------------
+- // Construction du fichier list_<directory_language> contenant la liste des
+- // fichiers traduits dans la langue associ�e au r�pertoire
++ // Make out the list of the translated file in the language linked with this
++ // directory and put this list in the file list_<directory_language>
+ //--------------------------------------------------------------------------
+
+ dir_language_xml_files = basename(listfiles(directory+"/*.xml"));
+@@ -805,23 +821,23 @@
+
+ //--------------------------------------------------------------------------
+ // Construction du fichier list_<default_language> contenant la liste des fichiers
+- // non traduits dans la langue associ�e au r�pertoire qui seront r�cup�r�s depuis le
+- // r�pertoire de la langue par d�faut
++ // non traduits dans la langue associée au répertoire qui seront récupérés depuis le
++ // répertoire de la langue par défaut
+ //--------------------------------------------------------------------------
+
+ // Tous les fichiers contenus dans <directory>/../<default_language> pour commencer
+ // On afinnera par la suite
+ df_lang_xml_files = basename(listfiles(pathconvert(directory+"/../"+default_language+"/*.xml",%f,%f)));
+
+- // On supprime de "df_lang_xml_files" tous les �l�ment contenus dans
+- // "dir_language_xml_files", c'est � dire tous les fichiers d�ja traduit dans la langue
+- // associ�e au r�pertoire.
++ // On supprime de "df_lang_xml_files" tous les élément contenus dans
++ // "dir_language_xml_files", c'est à dire tous les fichiers déja traduit dans la langue
++ // associée au répertoire.
+
+ for i=1:size(dir_language_xml_files,'*');
+ df_lang_xml_files(find(df_lang_xml_files==dir_language_xml_files(i)))=[];
+ end
+
+- // Cr�ation du fichier
++ // Création du fichier
+ if df_lang_xml_files <> [] then
+ mputl(df_lang_xml_files,pathconvert(directory+"/.list_"+default_language,%f,%f));
+ else
+@@ -848,25 +864,25 @@
+ // Copyright INRIA
+ // Date : 26, july 2006
+ //
+- // Cette macro d�truit tous les fichiers xml qui ne sont pas traduit dans
+- // la langue associ�e au r�pertoire
++ // Cette macro détruit tous les fichiers xml qui ne sont pas traduit dans
++ // la langue associée au répertoire
+ //
+ // macro non-visible de l'utilisateur
+ //--------------------------------------------------------------------------
+
+- // Directory trait�e
++ // Directory traitée
+ directory = pathconvert(directory,%f,%t);
+
+ if listfiles(pathconvert(directory+"/.list_"+directory_language,%f,%f)) <> [] then
+
+- // R�cup�ration de la liste des fichiers xml copi�s depuis le r�pertoire de la langue par d�faut
++ // Récupération de la liste des fichiers xml copiés depuis le répertoire de la langue par défaut
+ dir_language_xml_files = mgetl(pathconvert(directory+"/.list_"+directory_language,%f,%f));
+
+- // Liste de tous les fichiers xml contenu dans le r�pertoire
++ // Liste de tous les fichiers xml contenu dans le répertoire
+ all_files = basename(listfiles(directory+"/*.xml"));
+
+- // On retire de "all_files" tous les �l�ments appartenant � "xml_directory_language_files"
+- // Ce sont les aides en ligne traduite dans la langue associ�e r�pertoire
++ // On retire de "all_files" tous les éléments appartenant à "xml_directory_language_files"
++ // Ce sont les aides en ligne traduite dans la langue associée répertoire
+ for i=1:size(dir_language_xml_files,'*');
+ all_files(find(all_files==dir_language_xml_files(i)))=[];
+ end
+@@ -888,33 +904,33 @@
+ // Copyright INRIA
+ // Date : 27, july 2006
+ //
+- // Cette fonction a pour but de d�terminer si le r�pertoire a besoin d'�tre
++ // Cette fonction a pour but de déterminer si le répertoire a besoin d'être
+ // reconstruit ou pas.
+ //
+- // On d�termine la date de derni�re modification la plus r�cente parmi les
+- // dates de derni�re modification suivantes :
+- // - date de derni�re modification du r�pertoire "directory".
+- // - dates de derni�re modification des fichiers XML du r�pertoire "directory".
+- // - date de derni�re modification du r�pertoire "directory/../<default_language>"
+- // si le syst�me de multilinguisme est utilis�
+- // - dates de derni�re modification des fichiers XML du r�pertoire
+- // "directory/../<default_language>" si le syst�me de multilinguisme est utilis�
++ // On détermine la date de dernière modification la plus récente parmi les
++ // dates de dernière modification suivantes :
++ // - date de dernière modification du répertoire "directory".
++ // - dates de dernière modification des fichiers XML du répertoire "directory".
++ // - date de dernière modification du répertoire "directory/../<default_language>"
++ // si le système de multilinguisme est utilisé
++ // - dates de dernière modification des fichiers XML du répertoire
++ // "directory/../<default_language>" si le système de multilinguisme est utilisé
+ //
+- // Ensuite cette valeur est compar�e � la valeur contenue dans le fichier
++ // Ensuite cette valeur est comparée à la valeur contenue dans le fichier
+ // "directory/.last_successful_build". Si elle est plus grande,
+ // need_to_be_build renvoie %T
+ //
+- // Si le fichier "directory/.last_successful_build" n'existe pas, l'aide n'a jamais �t�
++ // Si le fichier "directory/.last_successful_build" n'existe pas, l'aide n'a jamais été
+ // construite donc need_to_be_build renvoie %T
+ //
+ //--------------------------------------------------------------------------
+
+ [lhs,rhs]=argn(0);
+
+- // S'il n'y a pas de fichiers XML dans le r�pertoire ni dans son homologue,
+- // Le r�pertoire n'a pas besoin d'�tre construit.
+- // Cela est une s�curit� pour �viter de detruire les whatis des versions binaires
+- // o� il n'y a pas de fichiers XML
++ // S'il n'y a pas de fichiers XML dans le répertoire ni dans son homologue,
++ // Le répertoire n'a pas besoin d'être construit.
++ // Cela est une sécurité pour éviter de detruire les whatis des versions binaires
++ // où il n'y a pas de fichiers XML
+
+ xml_file_list = listfiles(directory+"/*.xml");
+
+@@ -1003,17 +1019,20 @@
+ "<!--Begin Entities-->"];
+ xml_files = listfiles(dirs+"/*.xml");
+
++ filesbasename = basename(xml_files);
+ if MSDOS then
+- xml_files = "file:///"+xml_files;
++ for j=1:size(xml_files,'*')
++ xml_files(j) = "file:///"+ getshortpathname(xml_files(j));
++ end
+ end
+
+ master_document = [master_document; ..
+- "<!ENTITY "+basename(xml_files)+" SYSTEM """+xml_files+""">"];
++ "<!ENTITY "+ filesbasename+" SYSTEM """+xml_files+""">"];
+
+ master_document = [ master_document; ..
+ "<!--End Entities-->"; ..
+ "]>"; ..
+- "<book version=""5.0-subset Scilab"" xml:lang="""+getlanguage()+""""; ..
++ "<book version=""5.0-subset Scilab"" xml:lang="""+language+""""; ..
+ " xmlns=""http://docbook.org/ns/docbook"""; ..
+ " xmlns:xlink=""http://www.w3.org/1999/xlink"""; ..
+ " xmlns:xi=""http://www.w3.org/2001/XInclude"""; ..
+@@ -1076,7 +1095,9 @@
+ xml_files(grep(xml_files,"master_help.xml")) = [];
+
+ if MSDOS then
+- xml_files_tmp = "file:///"+xml_files;
++ for j=1:size(xml_files,'*')
++ xml_files_tmp(j) = "file:///"+ getshortpathname(xml_files(j));
++ end
+ else
+ xml_files_tmp = xml_files;
+ end
+@@ -1120,62 +1141,62 @@
+ category = mytitle;
+ category = strsubst(category , "&" , "_" );
+
+- category = strsubst(category , "�" , "A" );
+- category = strsubst(category , "�" , "A" );
+- category = strsubst(category , "�" , "A" );
+- category = strsubst(category , "�" , "A" );
+- category = strsubst(category , "�" , "A" );
+- category = strsubst(category , "�" , "A" );
+- category = strsubst(category , "�" , "AE");
+- category = strsubst(category , "�" , "C" );
+- category = strsubst(category , "�" , "E" );
+- category = strsubst(category , "�" , "E" );
+- category = strsubst(category , "�" , "E" );
+- category = strsubst(category , "�" , "E" );
+- category = strsubst(category , "�" , "I" );
+- category = strsubst(category , "�" , "I" );
+- category = strsubst(category , "�" , "I" );
+- category = strsubst(category , "�" , "I" );
+- category = strsubst(category , "�" , "D" );
+- category = strsubst(category , "�" , "N" );
+- category = strsubst(category , "�" , "O" );
+- category = strsubst(category , "�" , "O" );
+- category = strsubst(category , "�" , "O" );
+- category = strsubst(category , "�" , "O" );
+- category = strsubst(category , "�" , "O" );
+- category = strsubst(category , "�" , "U" );
+- category = strsubst(category , "�" , "U" );
+- category = strsubst(category , "�" , "U" );
+- category = strsubst(category , "�" , "U" );
+- category = strsubst(category , "�" , "Y" );
+- category = strsubst(category , "�" , "a" );
+- category = strsubst(category , "�" , "a" );
+- category = strsubst(category , "�" , "a" );
+- category = strsubst(category , "�" , "a" );
+- category = strsubst(category , "�" , "a" );
+- category = strsubst(category , "�" , "a" );
+- category = strsubst(category , "�" , "ae");
+- category = strsubst(category , "�" , "c" );
+- category = strsubst(category , "�" , "e" );
+- category = strsubst(category , "�" , "e" );
+- category = strsubst(category , "�" , "e" );
+- category = strsubst(category , "�" , "e" );
+- category = strsubst(category , "�" , "i" );
+- category = strsubst(category , "�" , "i" );
+- category = strsubst(category , "�" , "i" );
+- category = strsubst(category , "�" , "i" );
+- category = strsubst(category , "�" , "n" );
+- category = strsubst(category , "�" , "o" );
+- category = strsubst(category , "�" , "o" );
+- category = strsubst(category , "�" , "o" );
+- category = strsubst(category , "�" , "o" );
+- category = strsubst(category , "�" , "o" );
+- category = strsubst(category , "�" , "u" );
+- category = strsubst(category , "�" , "u" );
+- category = strsubst(category , "�" , "u" );
+- category = strsubst(category , "�" , "u" );
+- category = strsubst(category , "�" , "y" );
+- category = strsubst(category , "�" , "y" );
++ category = strsubst(category , "À" , "A" );
++ category = strsubst(category , "Ã" , "A" );
++ category = strsubst(category , "Â" , "A" );
++ category = strsubst(category , "Ã" , "A" );
++ category = strsubst(category , "Ä" , "A" );
++ category = strsubst(category , "Ã
" , "A" );
++ category = strsubst(category , "Æ" , "AE");
++ category = strsubst(category , "Ç" , "C" );
++ category = strsubst(category , "È" , "E" );
++ category = strsubst(category , "É" , "E" );
++ category = strsubst(category , "Ê" , "E" );
++ category = strsubst(category , "Ë" , "E" );
++ category = strsubst(category , "Ì" , "I" );
++ category = strsubst(category , "Ã" , "I" );
++ category = strsubst(category , "ÃŽ" , "I" );
++ category = strsubst(category , "Ã" , "I" );
++ category = strsubst(category , "Ã" , "D" );
++ category = strsubst(category , "Ñ" , "N" );
++ category = strsubst(category , "Ã’" , "O" );
++ category = strsubst(category , "Ó" , "O" );
++ category = strsubst(category , "Ô" , "O" );
++ category = strsubst(category , "Õ" , "O" );
++ category = strsubst(category , "Ö" , "O" );
++ category = strsubst(category , "Ù" , "U" );
++ category = strsubst(category , "Ú" , "U" );
++ category = strsubst(category , "Û" , "U" );
++ category = strsubst(category , "Ü" , "U" );
++ category = strsubst(category , "Ã" , "Y" );
++ category = strsubst(category , "Ã " , "a" );
++ category = strsubst(category , "á" , "a" );
++ category = strsubst(category , "â" , "a" );
++ category = strsubst(category , "ã" , "a" );
++ category = strsubst(category , "ä" , "a" );
++ category = strsubst(category , "Ã¥" , "a" );
++ category = strsubst(category , "æ" , "ae");
++ category = strsubst(category , "ç" , "c" );
++ category = strsubst(category , "è" , "e" );
++ category = strsubst(category , "é" , "e" );
++ category = strsubst(category , "ê" , "e" );
++ category = strsubst(category , "ë" , "e" );
++ category = strsubst(category , "ì" , "i" );
++ category = strsubst(category , "Ã" , "i" );
++ category = strsubst(category , "î" , "i" );
++ category = strsubst(category , "ï" , "i" );
++ category = strsubst(category , "ñ" , "n" );
++ category = strsubst(category , "ò" , "o" );
++ category = strsubst(category , "ó" , "o" );
++ category = strsubst(category , "ô" , "o" );
++ category = strsubst(category , "õ" , "o" );
++ category = strsubst(category , "ö" , "o" );
++ category = strsubst(category , "ù" , "u" );
++ category = strsubst(category , "ú" , "u" );
++ category = strsubst(category , "û" , "u" );
++ category = strsubst(category , "ü" , "u" );
++ category = strsubst(category , "ý" , "y" );
++ category = strsubst(category , "ÿ" , "y" );
+
+ category = strsubst(category , ":" , "" );
+ category = strsubst(category , "\" , "_" );
+@@ -1200,73 +1221,73 @@
+ //
+ // out = strsubst(out , """" , """ );
+ // out = strsubst(out , "&" , "&" );
+-// out = strsubst(out , "?" , "€" );
+-// out = strsubst(out , "�" , "À" );
+-// out = strsubst(out , "�" , "Á" );
+-// out = strsubst(out , "�" , "Â" );
+-// out = strsubst(out , "�" , "Ã" );
+-// out = strsubst(out , "�" , "Ä" );
+-// out = strsubst(out , "�" , "Å" );
+-// out = strsubst(out , "�" , "&Aelig" );
+-// out = strsubst(out , "�" , "Ç" );
+-// out = strsubst(out , "�" , "È" );
+-// out = strsubst(out , "�" , "É" );
+-// out = strsubst(out , "�" , "Ê" );
+-// out = strsubst(out , "�" , "Ë" );
+-// out = strsubst(out , "�" , "Ì" );;
+-// out = strsubst(out , "�" , "Í" );
+-// out = strsubst(out , "�" , "Î" );
+-// out = strsubst(out , "�" , "Ï" );
+-// out = strsubst(out , "�" , "ð" );
+-// out = strsubst(out , "�" , "Ñ" );
+-// out = strsubst(out , "�" , "Ò" );
+-// out = strsubst(out , "�" , "Ó" );
+-// out = strsubst(out , "�" , "Ô" );
+-// out = strsubst(out , "�" , "Õ" );
+-// out = strsubst(out , "�" , "Ö" );
+-// out = strsubst(out , "�" , "Ù" );
+-// out = strsubst(out , "�" , "Ú" );
+-// out = strsubst(out , "�" , "Û" );
+-// out = strsubst(out , "�" , "Ü" );
+-// out = strsubst(out , "�" , "Ý" );
+-// out = strsubst(out , "�" , "þ" );
+-// out = strsubst(out , "�" , "ß" );
+-// out = strsubst(out , "�" , "à" );
+-// out = strsubst(out , "�" , "á" );
+-// out = strsubst(out , "�" , "â" );
+-// out = strsubst(out , "�" , "ã" );
+-// out = strsubst(out , "�" , "ä" );
+-// out = strsubst(out , "�" , "å" );
+-// out = strsubst(out , "�" , "æ" );
+-// out = strsubst(out , "�" , "ç" );
+-// out = strsubst(out , "�" , "è" );;
+-// out = strsubst(out , "�" , "é" );
+-// out = strsubst(out , "�" , "ê" );
+-// out = strsubst(out , "�" , "ë" );
+-// out = strsubst(out , "�" , "ì" );;
+-// out = strsubst(out , "�" , "í" );
+-// out = strsubst(out , "�" , "î" );
+-// out = strsubst(out , "�" , "ï" );
+-// out = strsubst(out , "�" , "ð" );
+-// out = strsubst(out , "�" , "ñ" );
+-// out = strsubst(out , "�" , "ò" );
+-// out = strsubst(out , "�" , "ó" );
+-// out = strsubst(out , "�" , "ô" );
+-// out = strsubst(out , "�" , "õ" );
+-// out = strsubst(out , "�" , "ö" );
+-// out = strsubst(out , "�" , "ù" );
+-// out = strsubst(out , "�" , "ú" );
+-// out = strsubst(out , "�" , "û" );
+-// out = strsubst(out , "�" , "ü" );
+-// out = strsubst(out , "�" , "ý" );
+-// out = strsubst(out , "�" , "þ" );
+-// out = strsubst(out , "�" , "ÿ" );
+-// out = strsubst(out , "�" , "µ" );
++// out = strsubst(out , "€" , "€" );
++// out = strsubst(out , "À" , "À" );
++// out = strsubst(out , "Ã" , "Á" );
++// out = strsubst(out , "Â" , "Â" );
++// out = strsubst(out , "Ã" , "Ã" );
++// out = strsubst(out , "Ä" , "Ä" );
++// out = strsubst(out , "Ã
" , "Å" );
++// out = strsubst(out , "Æ" , "&Aelig" );
++// out = strsubst(out , "Ç" , "Ç" );
++// out = strsubst(out , "È" , "È" );
++// out = strsubst(out , "É" , "É" );
++// out = strsubst(out , "Ê" , "Ê" );
++// out = strsubst(out , "Ë" , "Ë" );
++// out = strsubst(out , "ÃŒ" , "Ì" );;
++// out = strsubst(out , "Ã" , "Í" );
++// out = strsubst(out , "ÃŽ" , "Î" );
++// out = strsubst(out , "Ã" , "Ï" );
++// out = strsubst(out , "Ã" , "ð" );
++// out = strsubst(out , "Ñ" , "Ñ" );
++// out = strsubst(out , "Ã’" , "Ò" );
++// out = strsubst(out , "Ó" , "Ó" );
++// out = strsubst(out , "Ô" , "Ô" );
++// out = strsubst(out , "Õ" , "Õ" );
++// out = strsubst(out , "Ö" , "Ö" );
++// out = strsubst(out , "Ù" , "Ù" );
++// out = strsubst(out , "Ú" , "Ú" );
++// out = strsubst(out , "Û" , "Û" );
++// out = strsubst(out , "Ãœ" , "Ü" );
++// out = strsubst(out , "Ã" , "Ý" );
++// out = strsubst(out , "Þ" , "þ" );
++// out = strsubst(out , "ß" , "ß" );
++// out = strsubst(out , "Ã " , "à" );
++// out = strsubst(out , "á" , "á" );
++// out = strsubst(out , "â" , "â" );
++// out = strsubst(out , "ã" , "ã" );
++// out = strsubst(out , "ä" , "ä" );
++// out = strsubst(out , "Ã¥" , "å" );
++// out = strsubst(out , "æ" , "æ" );
++// out = strsubst(out , "ç" , "ç" );
++// out = strsubst(out , "è" , "è" );;
++// out = strsubst(out , "é" , "é" );
++// out = strsubst(out , "ê" , "ê" );
++// out = strsubst(out , "ë" , "ë" );
++// out = strsubst(out , "ì" , "ì" );;
++// out = strsubst(out , "Ã" , "í" );
++// out = strsubst(out , "î" , "î" );
++// out = strsubst(out , "ï" , "ï" );
++// out = strsubst(out , "ð" , "ð" );
++// out = strsubst(out , "ñ" , "ñ" );
++// out = strsubst(out , "ò" , "ò" );
++// out = strsubst(out , "ó" , "ó" );
++// out = strsubst(out , "ô" , "ô" );
++// out = strsubst(out , "õ" , "õ" );
++// out = strsubst(out , "ö" , "ö" );
++// out = strsubst(out , "ù" , "ù" );
++// out = strsubst(out , "ú" , "ú" );
++// out = strsubst(out , "û" , "û" );
++// out = strsubst(out , "ü" , "ü" );
++// out = strsubst(out , "ý" , "ý" );
++// out = strsubst(out , "þ" , "þ" );
++// out = strsubst(out , "ÿ" , "ÿ" );
++// out = strsubst(out , "µ" , "µ" );
+
+ endfunction
+
+
+-function dirs_out = get_xml_path(dirs_in)
++function dirs_out = get_xml_path(dirs_in,my_wanted_language)
+
+ dirs_out = [];
+
+@@ -1276,10 +1297,10 @@
+
+ help_basepath = part(dirs_in(k),1:length(dirs_in(k))-4) + filesep() + "help";
+
+- if isdir(help_basepath + filesep() +getlanguage()) then
+- dirs_out(k) = help_basepath + filesep() + getlanguage();
++ if isdir(help_basepath + filesep() +my_wanted_language) then
++ dirs_out(k) = help_basepath + filesep() + my_wanted_language;
+ elseif isdir(help_basepath+filesep()+getdefaultlanguage()) then
+- dirs_out(k) = help_basepath+filesep()+getlanguage();
++ dirs_out(k) = help_basepath+filesep()+getdefaultlanguage();
+ else
+ dirs_out(k) = "";
+ end
+@@ -1304,3 +1325,194 @@
+ end
+
+ endfunction
++
++////////////////////////////////
++// FUNCTIONS USED FOR SCICOS DOC
++////////////////////////////////
++
++function create_MD_scicos(basedir, masterdoc, language)
++
++// Encoding management
++if language == "fr_FR" then
++ encoding = "ISO-8859-1";
++else
++ encoding = "UTF-8";
++end
++
++// TODO this function should use localization
++if language=="fr_FR" then
++ aboutscicos = "A propos de Scicos";
++ scicosmanual = "Manuel Scicos";
++else
++ aboutscicos = gettext("About Scicos");
++ scicosmanual = gettext("Scicos Manual");
++end
++
++// Make the list of all files including subdirectories
++xmlfiles = subDirXmlFiles(basedir);
++
++master_document = ["<?xml version=""1.0"" encoding="""+encoding+"""?>";..
++ "<!DOCTYPE book [";
++ "<!--Begin Entities-->"];
++
++filesbasename = basename(xmlfiles);
++if MSDOS then
++ for j=1:size(xmlfiles,"*")
++ xmlfiles(j) = "file:///"+ getshortpathname(xmlfiles(j));
++ end
++end
++
++master_document = [master_document; ..
++ "<!ENTITY "+ filesbasename+" SYSTEM """+xmlfiles+""">"];
++
++master_document = [ master_document; ..
++ "<!--End Entities-->"; ..
++ "]>"; ..
++ "<book version=""5.0-subset Scilab"" xml:lang="""+language+""""; ..
++ " xmlns=""http://docbook.org/ns/docbook"""; ..
++ " xmlns:xlink=""http://www.w3.org/1999/xlink"""; ..
++ " xmlns:xi=""http://www.w3.org/2001/XInclude"""; ..
++ " xmlns:svg=""http://www.w3.org/2000/svg"""; ..
++ " xmlns:mml=""http://www.w3.org/1998/Math/MathML"""; ..
++ " xmlns:html=""http://www.w3.org/1999/xhtml"""; ..
++ " xmlns:db=""http://docbook.org/ns/docbook"">"; ..
++ " <info xml:id=''scicos_manual''>"; ..
++ " <title>"+scicosmanual+"</title>"; ..
++ " </info>"; ..
++ ""];
++
++master_document = [ master_document; ..
++ "<!--Begin Reference-->"];
++
++reference = []
++
++[tmpref, tmpent] = subDirReference(basedir, 0, language);
++
++if ~isempty(tmpref) then
++ reference = [reference;tmpref];
++end
++if ~isempty(tmpent) then
++ reference = [reference;
++ "<part xml:id=''about_scicos_category''>";
++ "<title>"+aboutscicos+"</title>";
++ "&"+gsort(basename(tmpent),"lr","i")+";";
++ "</part>"];
++end
++
++master_document = [master_document; reference; ..
++ " <!--End Reference-->"; ..
++ "</book>" ];
++
++mputl(master_document, masterdoc);
++
++endfunction
++
++function files = subDirXmlFiles(directory)
++// Find all files and directories inside a directory
++
++files = [];
++tmpfiles = listfiles(directory + "/*");
++for k=1:size(tmpfiles, "*")
++ if ~isdir(tmpfiles(k)) then
++ files($+1) = tmpfiles(k);
++ else
++ files = [files; subDirXmlFiles(tmpfiles(k))];
++ end
++end
++endfunction
++
++function [ref, entries] = subDirReference(directory,level, language)
++// Create master document contents recursively
++
++entries = [];
++ref = [];
++
++docbooktags = ["part", "chapter", "reference"];
++
++level = level + 1;
++
++tmpfiles = gsort(listfiles(directory + "/*"),"lr","i");
++
++for k=1:size(tmpfiles, "*")
++ // Files to be ignored
++ longpathval = getlongpathname(tmpfiles(k));
++ if ~isempty(strindex(longpathval, "master_help.xml")) | ~isempty(strindex(longpathval, "addchapter.sce")) | ..
++ ~isempty(strindex(longpathval, ".list_")) | ~isempty(strindex(longpathval, ".last_")) | ..
++ ~isempty(strindex(longpathval, "scilab_"+language+"_help")) | ~isempty(strindex(longpathval, ".jar")) then
++ continue
++ end
++
++ if ~isdir(tmpfiles(k)) then // Each file is an entry in the reference
++ entries($+1) = tmpfiles(k);
++ else // Each dir is a new part under the reference
++ category = tokens(tmpfiles(k), filesep() );
++ category = category($);
++
++ ref = [ref;
++ "<"+docbooktags(level)+" xml:id=''" + category + "''>";
++ "<title>" + dirToCat(category) + "</title>"];
++
++ // Browse subdirs
++ [tmpref, tmpent] = subDirReference(tmpfiles(k),level, language);
++ if ~isempty(tmpent) then // Some entries found
++ ref = [ref;
++ "&"+gsort(basename(tmpent),"lr","i")+";"];
++ end
++ if ~isempty(tmpref) then // Some parts found
++ ref = [ref;
++ tmpref];
++ end
++
++ ref = [ref;
++ "</"+docbooktags(level)+">"];
++ end
++end
++
++endfunction
++
++function category = dirToCat(directory, language)
++// Get a category name using a directory name
++
++// TODO this function should use localization
++
++alldirs = ["batch_functions","editor", "sources_pal", "linear_pal", "non_linear_pal", "branching_pal", "others_pal", "threshold_pal", "sinks_pal", "events_pal", "electrical_pal", "thermohydraulics_pal", "matrix_pal", "integer_pal", "demoblocks_pal", "abcd_blocks", "c_computational_functions", "scilab_computational_functions", "utilities_functions", "programming_scicos_blocks", "scilab_utilities_functions", "diagram", "blocks", "links", "compilation_simulation", "scilab_data_structures","palettes","oldblocks_pal"];
++if language == "fr_FR" then
++ allcategories = ["Fonctions en ligne de commande", "Editeur", "Palette Sources", ..
++ "Palette Linéaire", "Palette Non-linéaire", "Palette Branchements", "Palette Divers", ..
++ "Palette Détection", "Palette Affichage", "Palette Evènements", "Palette des Composants Electriques", ..
++ "Palette des Composants Thermohydrauliques", "Palette d''Opérations Matricielles", "Palette Integer", ..
++ "Palette des Blocks de Démonstration", "Blocs par Ordre Alphabétique", "Fonctions de Calcul en C", ..
++ "Fonctions de Calcul Scilab", "Fonctions Utilitaires", "Programmation des Blocs Scicos", ..
++ "Fonctions Utilitaires Scilab", "Diagramme", "Blocs", "Liens", "Compilation/Simulation", "Structures de Données Scilab", "Palettes", "Palette des Anciens Blocs"];
++else
++ allcategories = [_("Batch functions"), _("Editor"), _("Sources Palette"), ..
++ _("Linear Palette"), _("Non-linear Palette"), _("Branching Palette"), _("Others Palettes"), ..
++ _("Threshold Palette"), _("Sinks Palette"), _("Events Palette"), _("Electrical Palette"), ..
++ _("Thermohydraulics Palette"), _("Matrix Palette"), _("Integer Palette"), _("Demoblocks Palette"), ..
++ _("ABCD Blocks"), _("C Computational Functions"), _("Scilab Computational Functions"), ..
++ _("Utilities Functions"), _("Programming Scicos Blocks"), _("Scilab Utilities Functions"), ..
++ _("Diagram"), _("Blocks"), _("Links"), _("Compilation/Simulation"), _("Scilab Data Structures"), _("Palettes"), _("Old Blocks Palette")];
++end
++category = allcategories(find(alldirs==directory));
++endfunction
++
++
++function reset_help_modules_var(language)
++
++ global %helps_modules;
++
++ // Reset the variable in hand
++ %helps_modules = [];
++
++ // Get module list
++ module_list = getmodules();
++
++ // Loop on modules
++ for k=1:size(module_list,'*');
++ addchapter_path = getlongpathname(SCI+"/modules/"+module_list(k)+"/help/"+language+"/addchapter.sce");
++ if fileinfo(addchapter_path)<>[] then
++ exec(addchapter_path,-1);
++ end
++ end
++
++endfunction
More information about the debian-science-commits
mailing list