Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

debian/agpl-3

@@ -0,0 +1,662 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
+

debian/compat

@@ -0,0 +1 @@
+11

debian/control

@@ -0,0 +1,14 @@
+Source: rougail
+Section: admin
+Priority: extra
+Maintainer: Cadoles <contact@cadoles.com>
+Build-depends: debhelper (>=11), python3-all, python3-setuptools, dh-python
+Standards-Version: 3.9.4
+Homepage: https://forge.cadoles.com/Infra/rougail
+
+Package: python3-rougail
+Architecture: any
+Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
+Depends: ${python:Depends}, ${misc:Depends}, python3-cheetah, python3-tiramisu3
+Description: configuration manager
+

debian/copyright

@@ -0,0 +1,22 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: risotto
+Upstream-Contact: Cadoles <contact@cadoles.com>
+Source: https://forge.cadoles.com/Infra/rougail
+
+Files: *
+Copyright: 2019-2020 Cadoles <contact@cadoles.com>
+License: AGPL-3+
+
+License: AGPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+ .
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <https://www.gnu.org/licenses/>.

debian/rougail.dirs

@@ -0,0 +1,3 @@
+/var/rougail/patches
+/var/rougail/templates
+/var/rougail/manifests

debian/rules

@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+export PYBUILD_NAME = rougail
+export PYBUILD_DISABLE_python3 = test
+
+%:
+	dh $@ --with python3 --buildsystem=pybuild

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

doc/README.md

@@ -28,7 +28,6 @@ Rougail est un bibliothèque python3 qui permet de charger des dictionnaires (fi
   - [Les calcules automatiques](fill/README.md)
   - [Les vérifications des valeurs](check/README.md)
   - [Les conditions](condition/README.md)
-  - [Les variables meneuses ou suiveuses](variable/leadership.md)
 
 ## Les templates
 

doc/family/README.md

@@ -2,4 +2,5 @@
 
   - [Une famille](simple.md)
   - [Famille crée dynamiquement](auto.md)
+  - [Les variables meneuses ou suiveuses](leadership.md)
 

doc/family/leadership.md

@@ -0,0 +1,56 @@
+# Variable meneuse ou suiveuse
+
+## Variable meneuse
+
+Une variable meneuse est une variable qui va guider la longueur d'autre variables (appelé variables suiveuse).
+
+Une variable meneuse est une [variable](../variable/README.md) qui est obligatoirement de type multiple.
+
+Une variable meneuse peut être obligatoire.
+
+Le [mode](../mode.md) par défaut correspond au plus petit mode définit par l'utilisateur des variables suiveuses.
+
+## Variable suiveuse
+
+Une variable suiveuse est une variable donc la longueur n'est pas déterminé par elle-même, mais est identique à celle de la variable meneuse dont elle dépend.
+
+Une variable suiveuse est une variable placer juste derrière une variable meneuse ou une autre variable suiveuse.
+
+L'ordre de définition des variables suiveuses est important.
+
+Cette variable peut être de type multiple. Dans ce cas, pour un index determiné, il est possible de mettre plusieurs valeurs à une même variable.
+
+Une variable suiveuse peut être obligatoire. Cela signifie que lorsqu'une variable meneuse est renseigné, il faut obligatoirement que la variable suiveuse est également une valeur à l'index considéré.
+Si aucune valeur n'est définit pour la variable meneuse, aucune valeur n'est a spécifié pour la variable suiveuse.
+
+Le [mode](../mode.md) par défaut d'une variable suiveuse correspond au [mode](../mode.md) de la variable meneuse.
+
+Si une variable meneuse est caché ou désactivé, les variables suiveuses le seront également.
+
+## Définition des variables meneuse et suiveuse
+
+Les variables meneuses et suiveuses doivent dans une famille de type "leadership".
+
+Voici un exemple de définition d'une variable meneuse et de deux variables meneuses :
+
+```
+<variables>
+    <family name="family" leadership='True'>
+        <variable name="leader" multi='True'/>
+        <variable name="follower1"/>
+        <variable name="follower2" multi='True'/>
+    </family>
+</variables>
+```
+
+## Ajout d'une nouvelle variable suiveuse
+
+Pour ajouter, dans un nouveau dictionnaire, une variable suiveuse à notre groupe, rien de plus simple, il suffit définir une ou des nouvelles variables dans la famille :
+
+```
+<variables>
+    <family name="family">
+        <variable name="follower3"/>
+    </family>
+</variables>
+```

doc/fill/value.md

@@ -49,8 +49,8 @@ Si une condition "hidden_if_in" est spécifié à la variable, la valeur sera mo
 
 ## Variable meneuse ou suiveuse avec valeur calculé
 
-Une [variable suiveuse](../variable/leadership.md) ne peut pas être calculé automatiquement.
-Une [variable meneuse](../variable/leadership.md) peut être calculé automatiquement.
+Une [variable suiveuse](../family/leadership.md) ne peut pas être calculé automatiquement.
+Une [variable meneuse](../family/leadership.md) peut être calculé automatiquement.
 Si la variable n'est pas multiple, il ne faut pas que le calcule retourne une liste.
 
 ## Variable dynamique avec une valeur calculée

doc/param/variable.md

@@ -6,7 +6,7 @@ Imaginons que la variable "my_variable" pré-existe. La valeur de la variable se
 <param type="variable">my_variable</param>
 ```
 
-[Les variables meneuses ou suiveuses](../variable/leadership.md) peuvent être utilisé sans soucis comme paramètre.
+[Les variables meneuses ou suiveuses](../family/leadership.md) peuvent être utilisé sans soucis comme paramètre.
 
 ## Paramètre avec variable potentiellement non existante
 

doc/variable/README.md

@@ -1,4 +1,255 @@
 # Variable
 
-  - [Une variable](simple.md)
-  - [Variable meneuse ou suiveuse](leadership.md)
+## Un variable
+
+Une variable est forcement dans [variables](../variables.md) ou dans une [famille](../family/README.md).
+
+Une variable est déjà un nom. C'est à dire qu'on pourra utiliser plus tard la variable via ce nom.
+
+```
+<variables>
+    <variable name="my_variable"/>
+    <family name="my_family">
+        <variable name="my_family_variable"/>
+    </variable>
+</variables>
+```
+
+## Description et aide sur la variable
+
+En plus d'un nom, il est possible de mettre une "description" à la variable. C'est une information "utilisateur" qui nous permettra d'avoir des informations complémentaires sur le contenu de cette variable :
+
+```
+<variable name="my_variable" description="This is a greate variable"/>
+```
+
+En plus de la description, il est possible de préciser une aide complémentaire :
+
+```
+<variable name="my_variable" help="This is a greate variable"/>
+```
+
+Cette aide peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
+
+## Le type de la variable
+
+Une variable a un type. Ce type permet de définir les valeurs acceptées par cette variable :
+
+- string : chaine de caractère (type par défaut)
+- number : un nombre
+- float : un chiffre flottant
+- boolean : "True" ou "False", si aucune valeur n'est défini la valeur par défaut de cette variable sera "True", ces variables sont également obligatoire par défaut
+- password : un mot de passe
+- mail : une adresse mail
+- filename : nom de fichier au sens Unix (exemple : "/etc/passwd")
+- date : une date au format "%Y-%m-%d" (exemple : "2021-01-30")
+- unix_user : nom d'utilisateur au sens Unix
+- ip : n'importe quelle adresse IPv4
+- cidr : n'importe quelle adresse IPv4 au format CIDR
+- local_ip : adresse IPv4 sur un réseau local, si l'adresse IPv4 n'est pas local, un warning sera afficher mais la valeur sera accepté tout de même
+- netmask : masque d'une adresse IPv4
+- network : adresse réseau
+- network_cidr : adresse réseau au format CIDR
+- broadcast : adresse de diffusion
+- netbios : nom netbios
+- domain : nom de domaine
+- hostname : nom d'hôte
+- web_address : adresse web (http://www.cadoles.com/)
+- port : port
+- mac : adresse MAC
+- schedule : périodicité du schedule, les valeurs possibles sont "none", "daily", "weekly" ou "monthly"
+- schedulemod : type de schedule, les valeurs possibles sont "pre" ou "post"
+
+Pour définir le type d'une variable :
+
+```
+<variable name="my_variable" type="number"/>
+```
+
+## Variable à valeur multiple
+
+Par défaut une variable ne peut acceuillir qu'une seule valeur. Il peut être utile de pouvoir spécifier plusieurs valeurs à une même variable.
+
+Pour définir une variable à valeur multiple :
+
+```
+<variable name="my_variable" multi="True"/>
+```
+
+## Variable invisible
+
+Il est possible de cacher une variable.
+
+Cacher une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service.
+Par contre cette variable sera accessibles lorsqu'on va l'utiliser.
+
+Pour cacher une variable :
+
+```
+<variable name="my_variable" hidden="True"/>
+```
+
+## Variable désactive
+
+Il est possible de désactiver une variable.
+
+Désactiver une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service mais également lorsqu'on va l'utiliser.
+
+Pour désactiver une variable :
+
+```
+<variable name="my_variable" disabled="True"/>
+```
+
+## Variable obligatoire
+
+Variable dont une valeur est requise :
+
+```
+<variable name="my_variable" mandatory="True"/>
+```
+
+Les variables booléans sont par défaut obligatoire. Pour qu'une variable booléan ne soit pas obligatoire il faut le préciser explicitement :
+
+```
+<variable name="my_variable" type="boolean" mandatory="False"/>
+```
+
+Les variables avec une valeur par défaut (non calculée) sont également automatiquement obligatoire.
+[Les variables à choix](../check/valid_enum.md) sans choix "None" sont également automatiquement obligatoire.
+
+## Valeur par défaut d'une variable
+
+Il est possible de fixer les valeurs par défaut d'une variable :
+
+```
+<variable name="my_variable">
+    <value>value</value>
+</variable>
+```
+
+Pour une variable multiple, il est possible de préciser plusieurs valeurs :
+
+```
+<variable name="my_variable" multi="True">
+    <value>value 1</value>
+    <value>value 2</value>
+</variable>
+```
+
+Si la variable n'est pas pas une [variable meneuse](../family/leadership.md), la première valeur défini dans cette liste sera également la valeur par défaut proposé si on ajoute une nouvelle valeur à cette variable.
+
+Une valeur par défaut peut également être [une valeur calculer](../fill/README.md).
+
+## Redéfinir une variable
+
+Il est possible de définir une variable dans un dictionnaire et de changer son comportement dans une second dictionnaire.
+
+Attention trois attributs ne sont redéfinisable :
+
+- name
+- type
+- multi
+
+Créons notre variable :
+
+    <variable name="my_variable"/>
+
+Et redéfinisons là :
+
+```
+<variable name="my_variable" redefine="True" description="New description"/>
+```
+
+## Créer une variable inexistante
+
+Il est parfois utile de créer une variable si elle n'existe pas dans un autre dictionnaire :
+
+```
+<variable name="my_variable" exists="False"/>
+```
+
+Si cette variable existe dans un autre dictionnaire, elle ne sera pas modifié ni recréé
+
+## Redéfinir une variable si elle existe
+
+Parfois on veut pouvoir redéfinir une variable mais seulement dans le cas où elle existe déjà :
+
+```
+<variable name="my_variable" redefine="True" exists="True" hidden="True"/>
+```
+
+## Variable à valeur automatiquement modifiée
+
+Une variable avec valeur automatiquement modifiée est une variable dont la valeur sera considéré comme modifié quand la propriété global "force_store_value" de Tiramisu est mise.
+
+Voici une variable a valeur automatiquement modifiée :
+
+```
+<variable name="my_variable" auto_save="True">
+    <value>my_value</value>
+</variable>
+```
+
+Dans ce cas la valeur est fixée à la valeur actuelle.
+Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
+
+Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont automatiquement modifiées que si elles ont une valeurs.
+
+Une [variable meneuse ou suiveuse](../family/leadership.md) ne peut pas avoir la propriété auto_save.
+
+## Variable à valeur en lecture seule automatique
+
+Une variable avec valeur en lecture seule automatique est une variable dont la valeur ne sera plus modifiable par l'utilisateur quand la [variable "server_deployed" passe à "True"](../dev/config.md).
+
+Voici un variable à valeur en lecture seule automatique :
+
+```
+<variable name="server_deployed" type="boolean">
+    <value>False</value>
+</variable>
+<variable name="my_variable" auto_freeze="True"/>
+```
+
+Dans ce cas la valeur est fixée à la valeur actuelle et elle ne sera plus modifiable par l'utilisateur.
+Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
+
+Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont en lecteur seul que si elles ont une valeurs.
+
+Une [variable meneuse ou suiveuse](../family/leadership.md) ne peut pas avoir la propriété auto_freeze.
+
+## Information "test"
+
+L'attribut "test" est un attribut spécial qui permet aux concepteurs d'un dictionnaire d'influancer le robot de test en précisant de valeurs utile à tester.
+
+Concrêtement, le contenu de cet attribut est enregister dans une "information" de l'option Tiramisu correspondante.
+
+Exemple :
+
+```
+<variable name="my_variable" test="yes"/>
+```
+
+Il est possible de préciser plusieurs valeurs avec le séparateur "|" :
+
+```
+<variable name="my_variable" test="yes|no"/>
+```
+
+Cette valeur peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
+
+## Mode de la variable
+
+Le [mode](../mode.md) par défaut d'une variable correspond au [mode](../mode.md) de la [famille](../family/README.md).
+
+Cas particuliers :
+
+- une variable à valeur automatiquement modifiée ou une variable en lecture seule automatique est par défaut en mode "basic".
+- si la variable n'est pas dans une famille, la variable aura le mode "normal" par défaut.
+- une variable obligatoire sans valeur par défaut (calculer ou non) aura le mode "basic".
+
+Pour définir le [mode](../mode.md) :
+
+```
+<variable name="my_variable" mode="expert"/>
+```

doc/variable/leadership.md

@@ -74,15 +74,15 @@ Voici un exemple de définition d'une variable meneuse et de deux variables mene
 </variables>
 <constraints>
     <group leader="example.family.leader">
-        <follower>example.family.follower1</follower>
-        <follower>example.family.follower2</follower>
+        <follower>follower1</follower>
+        <follower>follower2</follower>
     </group>
 </constraints>
 ```
 
-Le chemin de la variable meneuse est traditionnel, par contre le chemin des variables suiveuses n'est pas le chemin définitif de la variable.
+Le chemin de la variable meneuse est traditionnel, par contre le chemin des variables suiveuses est le chemin relatif de la variable.
 
-Le chemin d'une variable suiveuse est normalement "example.family.leader.follower1" mais la variable n'est pas encore une variable suiveuse à ce moment là du traitement. C'est pour cela qu'il ne faut, uniquement dans les groupes, mettre le nom de la variable meneuse dans le chemin.
+Le chemin d'une variable suiveuse est normalement "example.family.leader.follower1" mais la variable n'est pas encore une variable suiveuse à ce moment là du traitement. C'est pour cela qu'il ne faut, uniquement dans les groupes, mettre le nom de la variable suiveuse.
 
 ## Ajout d'une nouvelle variable suiveuse
 

doc/variable/simple.md

@@ -1,255 +0,0 @@
-# Variable
-
-## Un variable
-
-Une variable est forcement dans [variables](../variables.md) ou dans une [famille](../family/README.md).
-
-Une variable est déjà un nom. C'est à dire qu'on pourra utiliser plus tard la variable via ce nom.
-
-```
-<variables>
-    <variable name="my_variable"/>
-    <family name="my_family">
-        <variable name="my_family_variable"/>
-    </variable>
-</variables>
-```
-
-## Description et aide sur la variable
-
-En plus d'un nom, il est possible de mettre une "description" à la variable. C'est une information "utilisateur" qui nous permettra d'avoir des informations complémentaires sur le contenu de cette variable :
-
-```
-<variable name="my_variable" description="This is a greate variable"/>
-```
-
-En plus de la description, il est possible de préciser une aide complémentaire :
-
-```
-<variable name="my_variable" help="This is a greate variable"/>
-```
-
-Cette aide peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
-
-## Le type de la variable
-
-Une variable a un type. Ce type permet de définir les valeurs acceptées par cette variable :
-
-- string : chaine de caractère (type par défaut)
-- number : un nombre
-- float : un chiffre flottant
-- boolean : "True" ou "False", si aucune valeur n'est défini la valeur par défaut de cette variable sera "True", ces variables sont également obligatoire par défaut
-- password : un mot de passe
-- mail : une adresse mail
-- filename : nom de fichier au sens Unix (exemple : "/etc/passwd")
-- date : une date au format "%Y-%m-%d" (exemple : "2021-01-30")
-- unix_user : nom d'utilisateur au sens Unix
-- ip : n'importe quelle adresse IPv4
-- cidr : n'importe quelle adresse IPv4 au format CIDR
-- local_ip : adresse IPv4 sur un réseau local, si l'adresse IPv4 n'est pas local, un warning sera afficher mais la valeur sera accepté tout de même
-- netmask : masque d'une adresse IPv4
-- network : adresse réseau
-- network_cidr : adresse réseau au format CIDR
-- broadcast : adresse de diffusion
-- netbios : nom netbios
-- domain : nom de domaine
-- hostname : nom d'hôte
-- web_address : adresse web (http://www.cadoles.com/)
-- port : port
-- mac : adresse MAC
-- schedule : périodicité du schedule, les valeurs possibles sont "none", "daily", "weekly" ou "monthly"
-- schedulemod : type de schedule, les valeurs possibles sont "pre" ou "post"
-
-Pour définir le type d'une variable :
-
-```
-<variable name="my_variable" type="number"/>
-```
-
-## Variable à valeur multiple
-
-Par défaut une variable ne peut acceuillir qu'une seule valeur. Il peut être utile de pouvoir spécifier plusieurs valeurs à une même variable.
-
-Pour définir une variable à valeur multiple :
-
-```
-<variable name="my_variable" multi="True"/>
-```
-
-## Variable invisible
-
-Il est possible de cacher une variable.
-
-Cacher une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service.
-Par contre cette variable sera accessibles lorsqu'on va l'utiliser.
-
-Pour cacher une variable :
-
-```
-<variable name="my_variable" hidden="True"/>
-```
-
-## Variable désactive
-
-Il est possible de désactiver une variable.
-
-Désactiver une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service mais également lorsqu'on va l'utiliser.
-
-Pour désactiver une variable :
-
-```
-<variable name="my_variable" disabled="True"/>
-```
-
-## Variable obligatoire
-
-Variable dont une valeur est requise :
-
-```
-<variable name="my_variable" mandatory="True"/>
-```
-
-Les variables booléans sont par défaut obligatoire. Pour qu'une variable booléan ne soit pas obligatoire il faut le préciser explicitement :
-
-```
-<variable name="my_variable" type="boolean" mandatory="False"/>
-```
-
-Les variables avec une valeur par défaut (non calculée) sont également automatiquement obligatoire.
-[Les variables à choix](../check/valid_enum.md) sans choix "None" sont également automatiquement obligatoire.
-
-## Valeur par défaut d'une variable
-
-Il est possible de fixer les valeurs par défaut d'une variable :
-
-```
-<variable name="my_variable">
-    <value>value</value>
-</variable>
-```
-
-Pour une variable multiple, il est possible de préciser plusieurs valeurs :
-
-```
-<variable name="my_variable" multi="True">
-    <value>value 1</value>
-    <value>value 2</value>
-</variable>
-```
-
-Si la variable n'est pas pas une [variable meneuse](leadership.md), la première valeur défini dans cette liste sera également la valeur par défaut proposé si on ajoute une nouvelle valeur à cette variable.
-
-Une valeur par défaut peut également être [une valeur calculer](../fill/README.md).
-
-## Redéfinir une variable
-
-Il est possible de définir une variable dans un dictionnaire et de changer son comportement dans une second dictionnaire.
-
-Attention trois attributs ne sont redéfinisable :
-
-- name
-- type
-- multi
-
-Créons notre variable :
-
-    <variable name="my_variable"/>
-
-Et redéfinisons là :
-
-```
-<variable name="my_variable" redefine="True" description="New description"/>
-```
-
-## Créer une variable inexistante
-
-Il est parfois utile de créer une variable si elle n'existe pas dans un autre dictionnaire :
-
-```
-<variable name="my_variable" exists="False"/>
-```
-
-Si cette variable existe dans un autre dictionnaire, elle ne sera pas modifié ni recréé
-
-## Redéfinir une variable si elle existe
-
-Parfois on veut pouvoir redéfinir une variable mais seulement dans le cas où elle existe déjà :
-
-```
-<variable name="my_variable" redefine="True" exists="True" hidden="True"/>
-```
-
-## Variable à valeur automatiquement modifiée
-
-Une variable avec valeur automatiquement modifiée est une variable dont la valeur sera considéré comme modifié quand la propriété global "force_store_value" de Tiramisu est mise.
-
-Voici une variable a valeur automatiquement modifiée :
-
-```
-<variable name="my_variable" auto_save="True">
-    <value>my_value</value>
-</variable>
-```
-
-Dans ce cas la valeur est fixée à la valeur actuelle.
-Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
-
-Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont automatiquement modifiées que si elles ont une valeurs.
-
-Une [variable meneuse ou suiveuse](leadership.md) ne peut pas avoir la propriété auto_save.
-
-## Variable à valeur en lecture seule automatique
-
-Une variable avec valeur en lecture seule automatique est une variable dont la valeur ne sera plus modifiable par l'utilisateur quand la [variable "server_deployed" passe à "True"](../dev/config.md).
-
-Voici un variable à valeur en lecture seule automatique :
-
-```
-<variable name="server_deployed" type="boolean">
-    <value>False</value>
-</variable>
-<variable name="my_variable" auto_freeze="True"/>
-```
-
-Dans ce cas la valeur est fixée à la valeur actuelle et elle ne sera plus modifiable par l'utilisateur.
-Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
-
-Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont en lecteur seul que si elles ont une valeurs.
-
-Une [variable meneuse ou suiveuse](leadership.md) ne peut pas avoir la propriété auto_freeze.
-
-## Information "test"
-
-L'attribut "test" est un attribut spécial qui permet aux concepteurs d'un dictionnaire d'influancer le robot de test en précisant de valeurs utile à tester.
-
-Concrêtement, le contenu de cet attribut est enregister dans une "information" de l'option Tiramisu correspondante.
-
-Exemple :
-
-```
-<variable name="my_variable" test="yes"/>
-```
-
-Il est possible de préciser plusieurs valeurs avec le séparateur "|" :
-
-```
-<variable name="my_variable" test="yes|no"/>
-```
-
-Cette valeur peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
-
-## Mode de la variable
-
-Le [mode](../mode.md) par défaut d'une variable correspond au [mode](../mode.md) de la [famille](../family/README.md).
-
-Cas particuliers :
-
-- une variable à valeur automatiquement modifiée ou une variable en lecture seule automatique est par défaut en mode "basic".
-- si la variable n'est pas dans une famille, la variable aura le mode "normal" par défaut.
-- une variable obligatoire sans valeur par défaut (calculer ou non) aura le mode "basic".
-
-Pour définir le [mode](../mode.md) :
-
-```
-<variable name="my_variable" mode="expert"/>
-```

src/rougail/annotator/__init__.py

@@ -24,34 +24,59 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from .group import GroupAnnotator
-from .service import ServiceAnnotator
-from .variable import VariableAnnotator, CONVERT_OPTION
-from .check import CheckAnnotator
-from .value import ValueAnnotator
-from .condition import ConditionAnnotator
-from .fill import FillAnnotator
-from .family import FamilyAnnotator
-from .property import PropertyAnnotator
+from .variable import CONVERT_OPTION
+import importlib.resources
+from os.path import dirname, join
+from ..utils import load_modules
+
+
+ANNOTATORS = None
+
+
+if not 'files' in dir(importlib.resources):
+    # old python version
+    class fake_files:
+        def __init__(self, package):
+            self.mod = []
+            dir_package = dirname(importlib.resources._get_package(package).__file__)
+            for mod in importlib.resources.contents(package):
+                self.mod.append(join(dir_package, mod))
+
+        def iterdir(self):
+            return self.mod
+    importlib.resources.files = fake_files
+
+
+def get_level(module):
+    return module.level
+
+
+def get_annotators(annotators, module_name):
+    annotators[module_name] = []
+    for pathobj in importlib.resources.files(module_name).iterdir():
+        path = str(pathobj)
+        if not path.endswith('__') and not path.endswith('__.py'):
+            module = load_modules(path)
+            if 'Annotator' in dir(module):
+                annotators[module_name].append(module.Annotator)
+
 
 class SpaceAnnotator:  # pylint: disable=R0903
     """Transformations applied on a object instance
     """
     def __init__(self, objectspace, eosfunc_file):
-        self.objectspace = objectspace
-        GroupAnnotator(objectspace)
-        ServiceAnnotator(objectspace)
-        VariableAnnotator(objectspace)
-        CheckAnnotator(objectspace,
-                       eosfunc_file,
-                       )
-        ConditionAnnotator(objectspace)
-        FillAnnotator(objectspace,
-                      eosfunc_file,
-                      )
-        ValueAnnotator(objectspace)
-        FamilyAnnotator(objectspace)
-        PropertyAnnotator(objectspace)
+        global ANNOTATORS
+        if ANNOTATORS is None:
+            ANNOTATORS = {}
+            get_annotators(ANNOTATORS, 'rougail.annotator')
+            for extra_annotator in objectspace.rougailconfig['extra_annotators']:
+                get_annotators(ANNOTATORS, extra_annotator)
+        annotators = ANNOTATORS['rougail.annotator'].copy()
+        for extra_annotator in objectspace.rougailconfig['extra_annotators']:
+            annotators.extend(ANNOTATORS[extra_annotator])
+        annotators = sorted(annotators, key=get_level)
+        for annotator in annotators:
+            annotator(objectspace, eosfunc_file)
 
 
 __all__ = ('SpaceAnnotator', 'CONVERT_OPTION')

src/rougail/annotator/check.py

@@ -26,21 +26,23 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 from typing import List, Any
 
-from .target import TargetAnnotator
-from .param import ParamAnnotator
+from rougail.annotator.target import TargetAnnotator
+from rougail.annotator.param import ParamAnnotator
 
-from ..utils import load_modules
-from ..i18n import _
-from ..error import DictConsistencyError, display_xmlfiles
+from rougail.utils import load_modules
+from rougail.i18n import _
+from rougail.error import DictConsistencyError, display_xmlfiles
 
 INTERNAL_FUNCTIONS = ['valid_enum', 'valid_in_network', 'valid_differ', 'valid_entier']
 
-class CheckAnnotator(TargetAnnotator, ParamAnnotator):
+class Annotator(TargetAnnotator, ParamAnnotator):
     """Annotate check
     """
+    level = 40
     def __init__(self,
                  objectspace,
                  eosfunc_file,
+                 *args,
                  ):
         if not hasattr(objectspace.space, 'constraints') or \
                 not hasattr(objectspace.space.constraints, 'check'):

src/rougail/annotator/condition.py

@@ -27,19 +27,21 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from typing import List
 
 
-from ..i18n import _
-from ..error import DictConsistencyError
+from rougail.i18n import _
+from rougail.error import DictConsistencyError
 
-from .target import TargetAnnotator
-from .param import ParamAnnotator
-from .variable import Walk
+from rougail.annotator.target import TargetAnnotator
+from rougail.annotator.param import ParamAnnotator
+from rougail.annotator.variable import Walk
 
 
-class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
+class Annotator(TargetAnnotator, ParamAnnotator, Walk):
     """Annotate condition
     """
+    level = 50
     def __init__(self,
                  objectspace,
+                 *args,
                  ):
         self.objectspace = objectspace
         self.force_service_value = {}
@@ -162,13 +164,12 @@ class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
                 return target.name, [target.name]
             # it's a leader, so apply property to leadership
             family_name = self.objectspace.paths.get_variable_family_path(target.name.path)
-            family = self.objectspace.paths.get_family(family_name,
-                                                       target.name.namespace,
-                                                       )
-            return family, family.variable
-        # it's a family
-        variable = self.objectspace.paths.get_family(target.name.path,
-                                                     target.namespace,
+            namespace = target.name.namespace
+        else:
+            family_name = target.name.path
+            namespace = target.namespace
+        variable = self.objectspace.paths.get_family(family_name,
+                                                     namespace,
                                                      )
         if hasattr(variable, 'variable'):
             return variable, list(variable.variable.values())

src/rougail/annotator/family.py

@@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from ..i18n import _
-from ..error import DictConsistencyError
-from .variable import Walk
+from rougail.i18n import _
+from rougail.error import DictConsistencyError
+from rougail.annotator.variable import Walk
 
 
 class Mode:  # pylint: disable=R0903
@@ -43,11 +43,13 @@ class Mode:  # pylint: disable=R0903
         return other.level < self.level
 
 
-class FamilyAnnotator(Walk):
+class Annotator(Walk):
     """Annotate family
     """
+    level = 80
     def __init__(self,
                  objectspace,
+                 *args,
                  ):
         self.objectspace = objectspace
         if not hasattr(self.objectspace.space, 'variables'):
@@ -74,6 +76,7 @@ class FamilyAnnotator(Walk):
     def remove_empty_families(self) -> None:
         """Remove all families without any variable
         """
+        #FIXME pas sous family
         for families in self.objectspace.space.variables.values():
             removed_families = []
             for family_name, family in families.variable.items():
@@ -117,7 +120,7 @@ class FamilyAnnotator(Walk):
                    obj,
                    ) -> None:
         modes_level = self.objectspace.rougailconfig['modes_level']
-        if hasattr(obj, 'mode') and obj.mode not in modes_level:
+        if self._has_mode(obj) and obj.mode not in modes_level:
             msg = _(f'mode "{obj.mode}" for "{obj.name}" is not a valid mode, '
                     f'valid modes are {modes_level}')
             raise DictConsistencyError(msg, 71, obj.xmlfiles)
@@ -125,23 +128,29 @@ class FamilyAnnotator(Walk):
     def _set_default_mode(self,
                          family: 'self.objectspace.family',
                          ) -> None:
-        if hasattr(family, 'mode') and 'mode' in vars(family):
+        if not hasattr(family, 'variable'):
+            return
+        if self._has_mode(family):
             family_mode = family.mode
         else:
             family_mode = None
-        if not hasattr(family, 'variable'):
-            return
+        leader = None
         for variable in family.variable.values():
-            self.valid_mode(variable)
+            if leader is None and hasattr(family, 'leadership') and family.leadership:
+                leader = variable
             if isinstance(variable, self.objectspace.family):
+                # set default mode a subfamily
                 if family_mode and not self._has_mode(variable):
                     self._set_auto_mode(variable, family_mode)
-                continue
-            if isinstance(variable, self.objectspace.leadership):
-                func = self._set_default_mode_leader
             else:
-                func = self._set_default_mode_variable
-            func(variable, family_mode)
+                # set default mode to a variable
+                self.valid_mode(variable)
+                if leader:
+                    self._set_default_mode_leader(leader, variable)
+                self._set_default_mode_variable(variable, family_mode)
+        if leader:
+            # here because follower can change leader mode
+            self._set_auto_mode(family, leader.mode)
 
     @staticmethod
     def _has_mode(obj) -> bool:
@@ -171,88 +180,80 @@ class FamilyAnnotator(Walk):
         obj.mode_auto = True
 
     def _set_default_mode_leader(self,
-                                 leadership: 'self.objectspace.leadership',
-                                 family_mode: str,
+                                 leader: 'self.objectspace.variable',
+                                 follower: 'self.objectspace.variable',
                                  ) -> None:
-        leader_mode = None
-        for follower in leadership.variable:
-            self.valid_mode(follower)
-            if follower.auto_save is True:
-                msg = _(f'leader/followers "{follower.name}" could not be auto_save')
-                raise DictConsistencyError(msg, 29, leadership.xmlfiles)
-            if follower.auto_freeze is True:
-                msg = f'leader/followers "{follower.name}" could not be auto_freeze'
-                raise DictConsistencyError(_(msg), 30, leadership.xmlfiles)
-            if leader_mode is not None:
-                if hasattr(follower, 'mode'):
-                    follower_mode = follower.mode
-                else:
-                    follower_mode = self.objectspace.rougailconfig['default_variable_mode']
-                if self.modes[leader_mode] > self.modes[follower_mode]:
-                    if self._has_mode(follower) and not self._has_mode(leadership.variable[0]):
-                        # if follower has mode but not the leader
-                        self._set_auto_mode(leadership.variable[0], follower_mode)
-                    else:
-                        # leader's mode is minimum level
-                        if self._has_mode(follower):
-                            msg = _(f'the follower "{follower.name}" is in "{follower_mode}" mode '
-                                    f'but leader have the higher mode "{leader_mode}"')
-                            raise DictConsistencyError(msg, 63, follower.xmlfiles)
-                        self._set_auto_mode(follower, leader_mode)
-            self._set_default_mode_variable(follower,
-                                            family_mode,
-                                            )
-            if leader_mode is None:
-                if hasattr(leadership.variable[0], 'mode'):
-                    leader_mode = leadership.variable[0].mode
-                else:
-                    leader_mode = self.objectspace.rougailconfig['default_variable_mode']
-        if hasattr(leadership.variable[0], 'mode'):
-            leader_mode = leadership.variable[0].mode
-        self._set_auto_mode(leadership, leader_mode)
+        if follower.auto_save is True:
+            msg = _(f'leader/followers "{follower.name}" could not be auto_save')
+            raise DictConsistencyError(msg, 29, follower.xmlfiles)
+        if follower.auto_freeze is True:
+            msg = f'leader/followers "{follower.name}" could not be auto_freeze'
+            raise DictConsistencyError(_(msg), 30, follower.xmlfiles)
+        if leader == follower:
+            # it's a leader
+            if not hasattr(leader, 'mode'):
+                self._set_auto_mode(leader, self.objectspace.rougailconfig['default_variable_mode'])
+            return
+        if self._has_mode(follower):
+            follower_mode = follower.mode
+        else:
+            follower_mode = self.objectspace.rougailconfig['default_variable_mode']
+        if self.modes[leader.mode] > self.modes[follower_mode]:
+            if self._has_mode(follower) and not self._has_mode(leader):
+                # if follower has mode but not the leader
+                self._set_auto_mode(leader, follower_mode)
+            else:
+                # leader's mode is minimum level
+                if self._has_mode(follower):
+                    msg = _(f'the follower "{follower.name}" is in "{follower_mode}" mode '
+                            f'but leader have the higher mode "{leader.mode}"')
+                    raise DictConsistencyError(msg, 63, follower.xmlfiles)
+                self._set_auto_mode(follower, leader.mode)
 
     def _change_family_mode(self,
-                           family: 'self.objectspace.family',
-                           ) -> None:
+                            family: 'self.objectspace.family',
+                            ) -> None:
         if hasattr(family, 'mode'):
             family_mode = family.mode
         else:
             family_mode = self.objectspace.rougailconfig['default_family_mode']
         min_variable_mode = self.objectspace.rougailconfig['modes_level'][-1]
         # change variable mode, but not if variables are not in a family
+        is_leadership = hasattr(family, 'leadership') and family.leadership
         if hasattr(family, 'variable'):
-            for variable in family.variable.values():
-                if not isinstance(variable, self.objectspace.family):
-                    if isinstance(variable, self.objectspace.leadership):
-                        func = self._change_variable_mode_leader
-                    else:
-                        func = self._change_variable_mode
-                    func(variable,
-                         family_mode,
-                         )
-                elif not hasattr(variable, 'mode'):
-                    variable.mode = self.objectspace.rougailconfig['default_family_mode']
+            for idx, variable in enumerate(family.variable.values()):
+                if isinstance(variable, self.objectspace.family):
+                    if not hasattr(variable, 'mode'):
+                        variable.mode = self.objectspace.rougailconfig['default_family_mode']
+                elif idx == 0 and is_leadership:
+                    variable.mode = None
+                    continue
+                else:
+                    self._change_variable_mode(variable, family_mode, is_leadership)
                 if self.modes[min_variable_mode] > self.modes[variable.mode]:
                     min_variable_mode = variable.mode
-        if isinstance(family, self.objectspace.family) and \
-                (not hasattr(family, 'mode') or family.mode != min_variable_mode):
+        if not isinstance(family, self.objectspace.family) or is_leadership:
+            # it's Variable, Service, ... and leadership
+            return
+        if not hasattr(family, 'mode'):
             # set the lower variable mode to family
-            if self._has_mode(family):
-                msg = _(f'the family "{family.name}" is in "{family.mode}" mode but variables and '
-                        f'families inside have the higher modes "{min_variable_mode}"')
-                raise DictConsistencyError(msg, 62, family.xmlfiles)
             self._set_auto_mode(family, min_variable_mode)
+        if family.mode != min_variable_mode:
+            msg = _(f'the family "{family.name}" is in "{family.mode}" mode but variables and '
+                    f'families inside have the higher modes "{min_variable_mode}"')
+            raise DictConsistencyError(msg, 62, family.xmlfiles)
 
     def _change_variable_mode(self,
                              variable,
                              family_mode: str,
+                             is_follower: bool,
                              ) -> None:
         if hasattr(variable, 'mode'):
             variable_mode = variable.mode
         else:
             variable_mode = self.objectspace.rougailconfig['default_variable_mode']
         # none basic variable in high level family has to be in high level
-        if self.modes[variable_mode] < self.modes[family_mode]:
+        if not is_follower and self.modes[variable_mode] < self.modes[family_mode]:
             if self._has_mode(variable):
                 msg = _(f'the variable "{variable.name}" is in "{variable_mode}" mode '
                         f'but family has the higher family mode "{family_mode}"')
@@ -261,16 +262,6 @@ class FamilyAnnotator(Walk):
         if not hasattr(variable, 'mode'):
             variable.mode = variable_mode
 
-    def _change_variable_mode_leader(self,
-                                     leadership,
-                                     family_mode: str,
-                                     ) -> None:
-        for follower in leadership.variable:
-            self._change_variable_mode(follower,
-                                      family_mode,
-                                      )
-        leadership.variable[0].mode = None
-
     def dynamic_families(self):
         """link dynamic families to object
         """
@@ -284,7 +275,7 @@ class FamilyAnnotator(Walk):
                         f'to multi variable')
                 raise DictConsistencyError(msg, 16, family.xmlfiles)
             for variable in family.variable.values():
-                if isinstance(variable, self.objectspace.family):
+                if isinstance(variable, self.objectspace.family) and not variable.leadership:
                     msg = _(f'dynamic family "{family.name}" cannot contains another family')
                     raise DictConsistencyError(msg, 22, family.xmlfiles)
 

src/rougail/annotator/fill.py

@@ -24,28 +24,30 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from ..utils import load_modules
-from ..i18n import _
-from ..error import DictConsistencyError
+from rougail.utils import load_modules
+from rougail.i18n import _
+from rougail.error import DictConsistencyError
 
-from .target import TargetAnnotator
-from .param import ParamAnnotator
+from rougail.annotator.target import TargetAnnotator
+from rougail.annotator.param import ParamAnnotator
 
 
 CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename')
 
 
-class FillAnnotator(TargetAnnotator, ParamAnnotator):
+class Annotator(TargetAnnotator, ParamAnnotator):
     """Fill annotator
     """
+    level = 60
     def __init__(self,
                  objectspace,
                  eosfunc_file,
+                 *args,
                  ):
-        self.objectspace = objectspace
         if not hasattr(objectspace.space, 'constraints') or \
-                not hasattr(self.objectspace.space.constraints, 'fill'):
+                not hasattr(objectspace.space.constraints, 'fill'):
             return
+        self.objectspace = objectspace
         self.functions = dir(load_modules(eosfunc_file))
         self.functions.extend(self.objectspace.rougailconfig['internal_functions'])
         self.target_is_uniq = True
@@ -68,12 +70,11 @@ class FillAnnotator(TargetAnnotator, ParamAnnotator):
         """valid and manage <fill>
         """
         for fill in self.objectspace.space.constraints.fill:
+            # test if the function exists
+            if fill.name not in self.functions:
+                msg = _(f'cannot find fill function "{fill.name}"')
+                raise DictConsistencyError(msg, 25, fill.xmlfiles)
             for target in fill.target:
-                # test if the function exists
-                if fill.name not in self.functions:
-                    msg = _(f'cannot find fill function "{fill.name}"')
-                    raise DictConsistencyError(msg, 25, fill.xmlfiles)
-
                 # create an object value
                 value = self.objectspace.value(fill.xmlfiles)
                 value.type = 'calculation'
@@ -87,7 +88,6 @@ class FillAnnotator(TargetAnnotator, ParamAnnotator):
                     target.name.default = value
                 else:
                     target.name.value = [value]
-
                 # manage params
                 if hasattr(fill, 'param') and fill.param:
                     value.param = fill.param

src/rougail/annotator/group.py

@@ -24,137 +24,54 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from ..i18n import _
-from ..error import DictConsistencyError
-from ..utils import normalize_family
+from rougail.i18n import _
+from rougail.error import DictConsistencyError
+from rougail.utils import normalize_family
+from rougail.annotator.variable import Walk
 
 
-class GroupAnnotator:
+class Annotator(Walk):
     """Annotate group
     """
+    level = 10
     def __init__(self,
                  objectspace,
+                 *args,
                  ):
-        self.objectspace = objectspace
-        if not hasattr(self.objectspace.space, 'constraints') or \
-                not hasattr(self.objectspace.space.constraints, 'group'):
+        if not hasattr(objectspace.space, 'variables'):
             return
+        self.objectspace = objectspace
         self.convert_groups()
 
     def convert_groups(self):  # pylint: disable=C0111
         """convert groups
         """
         # store old leaders family name
-        cache_paths = {}
-        for group in self.objectspace.space.constraints.group:
-            if group.leader in cache_paths:
-                leader_fam_path = cache_paths[group.leader]
-            else:
-                leader_fam_path = self.objectspace.paths.get_variable_family_path(group.leader, group.xmlfiles)
-                cache_paths[group.leader] = leader_fam_path
-            follower_names = list(group.follower.keys())
-            leader = self.objectspace.paths.get_variable(group.leader)
-            if '.' not in leader_fam_path:
-                # it's a namespace
-                ori_leader_family = self.objectspace.space.variables[leader_fam_path]
-            else:
-                # it's a sub family
-                ori_leader_family = self.objectspace.paths.get_family(leader_fam_path,
-                                                                      leader.namespace,
-                                                                      )
-            has_a_leader = False
-            for variable in list(ori_leader_family.variable.values()):
-                if isinstance(variable, self.objectspace.leadership) and \
-                        variable.variable[0].name == leader.name:
-                    # append follower to an existed leadership
-                    leader_space = variable
-                    has_a_leader = True
-                elif variable.name == leader.name:
+        for family in self.get_families():
+            if not isinstance(family, self.objectspace.family):
+                continue
+            if not family.leadership:
+                continue
+            if hasattr(family, 'dynamic'):
+                msg = _(f'the family "{family.name}" cannot be leadership and dynamic together')
+                raise DictConsistencyError(msg, 31, family.xmlfiles)
+            for idx, variable in enumerate(family.variable.values()):
+                if idx == 0:
                     # it's a leader
-                    leader_space = self.manage_leader(variable,
-                                                      group,
-                                                      ori_leader_family,
-                                                      )
-                    has_a_leader = True
-                elif has_a_leader:
-                    # it's should be a follower
-                    self.manage_follower(follower_names.pop(0),
-                                         leader_fam_path,
-                                         variable,
-                                         leader_space,
-                                         )
-                    # this variable is not more in ori_leader_family
-                    ori_leader_family.variable.pop(normalize_family(variable.name))
-                    if follower_names == []:
-                        # no more follower
-                        break
-            else:
-                joined = '", "'.join(follower_names)
-                msg = _(f'when parsing leadership, we espect to find those followers "{joined}"')
-                raise DictConsistencyError(msg, 31, variable.xmlfiles)
-        del self.objectspace.space.constraints.group
-
-    def manage_leader(self,
-                      variable: 'Variable',
-                      group: 'Group',
-                      ori_leader_family,
-                      ) -> 'Leadership':
-        """manage leader's variable
-        """
-        if variable.multi is not True:
-            msg = _(f'the variable "{variable.name}" in a group must be multi')
-            raise DictConsistencyError(msg, 32, variable.xmlfiles)
-        if hasattr(group, 'name'):
-            ori_leadership_name = group.name
-        else:
-            ori_leadership_name = variable.name
-        leadership_name = normalize_family(ori_leadership_name)
-        leader_space = self.objectspace.leadership(variable.xmlfiles)
-        leader_space.variable = []
-        leader_space.name = leadership_name
-        leader_space.hidden = variable.hidden
-        if variable.hidden:
-            variable.frozen = True
-            variable.force_default_on_freeze = True
-        variable.hidden = None
-        if hasattr(group, 'description'):
-            leader_space.doc = group.description
-        elif variable.name == leadership_name and hasattr(variable, 'description'):
-            leader_space.doc = variable.description
-        else:
-            leader_space.doc = ori_leadership_name
-        leadership_path = ori_leader_family.path + '.' + leadership_name
-        self.objectspace.paths.add_leadership(variable.namespace,
-                                              leadership_path,
-                                              leader_space,
-                                              )
-        ori_leader_family.variable[normalize_family(variable.name)] = leader_space
-        leader_space.variable.append(variable)
-        self.objectspace.paths.set_leader(variable.namespace,
-                                          ori_leader_family.path,
-                                          leadership_name,
-                                          normalize_family(variable.name),
-                                          )
-        return leader_space
-
-    def manage_follower(self,
-                        follower_name: str,
-                        leader_family_name: str,
-                        variable: 'Variable',
-                        leader_space: 'Leadership',
-                        ) -> None:
-        """manage follower
-        """
-        if variable.name != follower_name:
-            msg = _('when parsing leadership, we expect to find the follower '
-                    f'"{follower_name}" but we found "{variable.name}"')
-            raise DictConsistencyError(msg, 33, variable.xmlfiles)
-        self.objectspace.paths.set_leader(variable.namespace,
-                                          leader_family_name,
-                                          leader_space.name,
-                                          normalize_family(variable.name),
-                                          )
-        if leader_space.hidden:
-            variable.frozen = True
-            variable.force_default_on_freeze = True
-        leader_space.variable.append(variable)
+                    if variable.multi is not True:
+                        msg = _(f'the variable "{variable.name}" in a leadership must be multi')
+                        raise DictConsistencyError(msg, 32, variable.xmlfiles)
+                    family.hidden = variable.hidden
+                    if variable.hidden:
+                        variable.frozen = True
+                        variable.force_default_on_freeze = True
+                    variable.hidden = None
+                else:
+                    # it's a follower
+                    if family.hidden:
+                        variable.frozen = True
+                        variable.force_default_on_freeze = True
+                    if variable.multi is True:
+                        variable.multi = 'submulti'
+                    else:
+                        variable.multi = True

src/rougail/annotator/param.py

@@ -29,10 +29,10 @@ try:
 except ModuleNotFoundError:
     import tiramisu
 
-from .variable import CONVERT_OPTION
+from rougail.annotator.variable import CONVERT_OPTION
 
-from ..i18n import _
-from ..error import DictConsistencyError
+from rougail.i18n import _
+from rougail.error import DictConsistencyError
 
 
 class ParamAnnotator:

src/rougail/annotator/property.py

@@ -24,19 +24,23 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from ..i18n import _
-from ..error import DictConsistencyError
-from .variable import Walk
+from rougail.i18n import _
+from rougail.error import DictConsistencyError
+from rougail.annotator.variable import Walk
 
 
 PROPERTIES = ('hidden', 'frozen', 'force_default_on_freeze',
               'force_store_value', 'disabled', 'mandatory')
 
 
-class PropertyAnnotator(Walk):
+class Annotator(Walk):
     """Annotate properties
     """
-    def __init__(self, objectspace):
+    level = 90
+    def __init__(self,
+                 objectspace,
+                 *args
+                 ) -> None:
         self.objectspace = objectspace
         if hasattr(self.objectspace.space, 'services'):
             self.convert_services()
@@ -102,8 +106,5 @@ class PropertyAnnotator(Walk):
     def convert_variable(self) -> None:
         """convert variables
         """
-        for variable in self.get_variables(with_leadership=True):
-            if isinstance(variable, self.objectspace.leadership):
-                for follower in variable.variable:
-                    self.convert_property(follower)
+        for variable in self.get_variables():
             self.convert_property(variable)

src/rougail/annotator/service.py

@@ -27,9 +27,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from os.path import basename
 from typing import Tuple
 
-from ..i18n import _
-from ..utils import normalize_family
-from ..error import DictConsistencyError
+from rougail.i18n import _
+from rougail.utils import normalize_family
+from rougail.error import DictConsistencyError
 # a object's attribute has some annotations
 # that shall not be present in the exported (flatened) XML
 ERASED_ATTRIBUTES = ('redefine', 'exists', 'optional', 'remove_check', 'namespace',
@@ -39,7 +39,7 @@ ERASED_ATTRIBUTES = ('redefine', 'exists', 'optional', 'remove_check', 'namespac
 ALLOW_ATTRIBUT_NOT_MANAGE = ['file']
 
 
-class ServiceAnnotator:
+class Annotator:
     """Manage service's object
     for example::
         <services>
@@ -49,7 +49,11 @@ class ServiceAnnotator:
             </service>
         </services>
     """
-    def __init__(self, objectspace):
+    level = 20
+    def __init__(self,
+                 objectspace,
+                 *args,
+                 ) -> None:
         self.objectspace = objectspace
         self.uniq_overrides = []
         if 'network_type' not in self.objectspace.types:

src/rougail/annotator/target.py

@@ -24,8 +24,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from ..i18n import _
-from ..error import DictConsistencyError
+from rougail.i18n import _
+from rougail.error import DictConsistencyError
 
 
 class TargetAnnotator:

src/rougail/annotator/value.py

@@ -24,16 +24,18 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from .variable import Walk
+from rougail.annotator.variable import Walk
 
-from ..i18n import _
-from ..error import DictConsistencyError
+from rougail.i18n import _
+from rougail.error import DictConsistencyError
 
-class ValueAnnotator(Walk):  # pylint: disable=R0903
+class Annotator(Walk):  # pylint: disable=R0903
     """Annotate value
     """
+    level = 70
     def __init__(self,
                  objectspace,
+                 *args,
                  ) -> None:
         if not hasattr(objectspace.space, 'variables'):
             return
@@ -43,20 +45,11 @@ class ValueAnnotator(Walk):  # pylint: disable=R0903
     def convert_value(self) -> None:
         """convert value
         """
-        for variable in self.get_variables(with_leadership=True):
-            if isinstance(variable, self.objectspace.leadership):
-                variable_type = 'leader'
-                for follower in variable.variable:
-                    self._convert_value(follower,
-                                        variable_type,
-                                        )
-                    variable_type = 'follower'
-            else:
-                self._convert_value(variable)
+        for variable in self.get_variables():
+            self._convert_value(variable)
 
     def _convert_value(self,
                        variable,
-                       variable_type: str=None,
                        ) -> None:
         # a boolean must have value, the default value is "True"
         if not hasattr(variable, 'value') and variable.type == 'boolean':
@@ -80,19 +73,18 @@ class ValueAnnotator(Walk):  # pylint: disable=R0903
             return
         if variable.value[0].type == 'calculation':
             variable.default = variable.value[0]
+        elif variable.multi:
+            if not self.objectspace.paths.is_follower(variable.path):
+                variable.default = [value.name for value in variable.value]
+            if not self.objectspace.paths.is_leader(variable.path):
+                if variable.multi == 'submulti':
+                    variable.default_multi = [value.name for value in variable.value]
+                else:
+                    variable.default_multi = variable.value[0].name
         else:
-            if variable.multi:
-                if variable_type != 'follower':
-                    variable.default = [value.name for value in variable.value]
-                if variable_type != 'leader':
-                    if variable.multi == 'submulti':
-                        variable.default_multi = [value.name for value in variable.value]
-                    else:
-                        variable.default_multi = variable.value[0].name
-            else:
-                if len(variable.value) > 1:
-                    msg = _(f'the non multi variable "{variable.name}" cannot have '
-                            'more than one value')
-                    raise DictConsistencyError(msg, 68, variable.xmlfiles)
-                variable.default = variable.value[0].name
+            if len(variable.value) > 1:
+                msg = _(f'the non multi variable "{variable.name}" cannot have '
+                        'more than one value')
+                raise DictConsistencyError(msg, 68, variable.xmlfiles)
+            variable.default = variable.value[0].name
         del variable.value

src/rougail/annotator/variable.py

@@ -25,9 +25,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-from ..i18n import _
-from ..error import DictConsistencyError
-from ..objspace import convert_boolean
+from rougail.i18n import _
+from rougail.error import DictConsistencyError
+from rougail.objspace import convert_boolean
 
 
 CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
@@ -72,27 +72,21 @@ class Walk:
     """
     objectspace = None
 
-    def get_variables(self,
-                      with_leadership: bool=False,
-                      ):
+    def get_variables(self):
         """Iter all variables from the objectspace
         """
         for family in self.objectspace.space.variables.values():
-            yield from self._get_variables(family, with_leadership)
+            yield from self._get_variables(family)
 
     def _get_variables(self,
                        family: 'self.objectspace.family',
-                       with_leadership: bool
                        ):
-        if hasattr(family, 'variable'):
-            for variable in family.variable.values():
-                if isinstance(variable, self.objectspace.family):
-                    yield from self._get_variables(variable, with_leadership)
-                    continue
-                if not with_leadership and isinstance(variable, self.objectspace.leadership):
-                    for follower in variable.variable:
-                        yield follower
-                    continue
+        if not hasattr(family, 'variable'):
+            return
+        for variable in family.variable.values():
+            if isinstance(variable, self.objectspace.family):
+                yield from self._get_variables(variable)
+            else:
                 yield variable
 
     def get_families(self):
@@ -105,17 +99,20 @@ class Walk:
                       family: 'self.objectspace.family',
                       ):
         yield family
-        if hasattr(family, 'variable'):
-            for fam in family.variable.values():
-                if isinstance(fam, self.objectspace.family):
-                    yield from self._get_families(fam)
+        if not hasattr(family, 'variable'):
+            return
+        for fam in family.variable.values():
+            if isinstance(fam, self.objectspace.family):
+                yield from self._get_families(fam)
 
 
-class VariableAnnotator(Walk):  # pylint: disable=R0903
+class Annotator(Walk):  # pylint: disable=R0903
     """Annotate variable
     """
+    level = 30
     def __init__(self,
                  objectspace,
+                 *args,
                  ):
         if not hasattr(objectspace.space, 'variables'):
             return
@@ -130,23 +127,11 @@ class VariableAnnotator(Walk):  # pylint: disable=R0903
     def convert_variable(self):
         """convert variable
         """
-        for variable in self.get_variables(with_leadership=True):
-            if isinstance(variable, self.objectspace.leadership):
-                # first variable is a leader, others are follower
-                variable_type = 'leader'
-                for follower in variable.variable:
-                    self._convert_variable(follower,
-                                           variable_type,
-                                           )
-                    variable_type = 'follower'
-            else:
-                self._convert_variable(variable,
-                                       'variable',
-                                       )
+        for variable in self.get_variables():
+            self._convert_variable(variable)
 
     def _convert_variable(self,
                           variable,
-                          variable_type: str,
                           ) -> None:
         if variable.namespace == self.objectspace.rougailconfig['variable_namespace'] and \
                 variable.name in self.forbidden_name:
@@ -171,11 +156,6 @@ class VariableAnnotator(Walk):  # pylint: disable=R0903
                 del variable.value
         variable.doc = variable.description
         del variable.description
-        if variable_type == 'follower':
-            if variable.multi is True:
-                variable.multi = 'submulti'
-            else:
-                variable.multi = True
         self._convert_valid_enum(variable)
 
     def _convert_valid_enum(self,
@@ -209,21 +189,19 @@ class VariableAnnotator(Walk):  # pylint: disable=R0903
         """Convert variable tests value
         """
         for variable in self.get_variables():
-            if not hasattr(variable, 'test'):
+            if not hasattr(variable, 'test') or not variable.test:
+                # with we want remove test, we set "" has test value
                 continue
-            if variable.test:
-                if not hasattr(variable, 'information'):
-                    variable.information = self.objectspace.information(variable.xmlfiles)
-                values = variable.test.split('|')
-                new_values = []
-                for value in values:
-                    if value == '':
-                        value = None
-                    else:
-                        value = CONVERT_OPTION.get(variable.type, {}).get('func', str)(value)
-                    new_values.append(value)
-                variable.information.test = tuple(new_values)
-            del variable.test
+            new_values = []
+            for value in variable.test.split('|'):
+                if value == '':
+                    value = None
+                else:
+                    value = CONVERT_OPTION.get(variable.type, {}).get('func', str)(value)
+                new_values.append(value)
+            if not hasattr(variable, 'information'):
+                variable.information = self.objectspace.information(variable.xmlfiles)
+            variable.information.test = tuple(new_values)
 
     def convert_help(self):
         """Convert variable help

src/rougail/config.py

@@ -43,6 +43,7 @@ RougailConfig = {'dictionaries_dir': [join(ROUGAILROOT, 'dictionaries')],
                  'variable_namespace': 'rougail',
                  'auto_freeze_variable': 'server_deployed',
                  'internal_functions': [],
+                 'extra_annotators': [],
                  'modes_level': ['basic', 'normal', 'expert'],
                  'default_family_mode': 'basic',
                  'default_variable_mode': 'normal',

src/rougail/data/rougail.dtd

@@ -38,7 +38,7 @@
 <!-- =============== -->
 
 <!ELEMENT rougail (services|variables|constraints)*>
-<!ATTLIST rougail version (0.9) #REQUIRED>
+<!ATTLIST rougail version (0.10) #REQUIRED>
 
 <!-- ============== -->
 <!-- files element  -->
@@ -83,7 +83,8 @@
 <!ATTLIST family mode CDATA #IMPLIED>
 <!ATTLIST family hidden (True|False) "False">
 <!ATTLIST family dynamic CDATA #IMPLIED>
-<!ATTLIST family public CDATA #IMPLIED>
+<!ATTLIST family leadership (True|False) "False">
+<!ATTLIST family provider CDATA #IMPLIED>
 
 <!ELEMENT variable (value*)>
 <!ATTLIST variable name CDATA #REQUIRED>
@@ -102,12 +103,12 @@
 <!ATTLIST variable remove_check (True|False) "False">
 <!ATTLIST variable remove_condition (True|False) "False">
 <!ATTLIST variable remove_fill (True|False) "False">
-<!ATTLIST variable public CDATA #IMPLIED>
+<!ATTLIST variable provider CDATA #IMPLIED>
 <!ATTLIST variable test CDATA #IMPLIED>
 
 <!ELEMENT value (#PCDATA)>
 
-<!ELEMENT constraints ((fill*|check*|condition*|group*)*)>
+<!ELEMENT constraints ((fill*|check*|condition*)*)>
 
 <!ELEMENT fill ((target|param)+)>
 <!ATTLIST fill name CDATA #REQUIRED>
@@ -131,10 +132,3 @@
 <!ELEMENT target (#PCDATA)>
 <!ATTLIST target type (variable|family|servicelist|filelist|iplist) "variable">
 <!ATTLIST target optional (True|False) "False">
-
-<!ELEMENT group (follower+)>
-<!ATTLIST group leader CDATA #REQUIRED>
-<!ATTLIST group name CDATA #IMPLIED>
-<!ATTLIST group description CDATA #IMPLIED>
-
-<!ELEMENT follower (#PCDATA)>

src/rougail/objspace.py

@@ -38,9 +38,9 @@ FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables')
 # RougailObjSpace's elements that shall be forced to the UnRedefinable type
 FORCE_UNREDEFINABLES = ('value',)
 # RougailObjSpace's elements that shall not be modify
-UNREDEFINABLE = ('multi', 'type')
+UNREDEFINABLE = ('multi', 'type',)
 # RougailObjSpace's elements that did not created automaticly
-FORCE_ELEMENTS = ('choice', 'property_', 'leadership', 'information')
+FORCE_ELEMENTS = ('choice', 'property_', 'information')
 # XML text are convert has name
 FORCED_TEXT_ELTS_AS_NAME = ('choice', 'property', 'value',)
 
@@ -474,16 +474,21 @@ class RougailObjSpace:
             else:
                 family_name = namespace
 
+            if isinstance(space, self.family) and space.leadership:
+                leader = space.path
+            else:
+                leader = None
             self.paths.add_variable(namespace,
                                     variableobj.name,
                                     space.path,
                                     document.attrib.get('dynamic') is not None,
                                     variableobj,
+                                    leader,
                                     )
         elif isinstance(variableobj, self.family):  # pylint: disable=E1101
             family_name = variableobj.name
             if namespace != self.rougailconfig['variable_namespace']:
-                family_name = namespace + '.' + family_name
+                family_name = space.path + '.' + family_name
             self.paths.add_family(namespace,
                                   family_name,
                                   variableobj,

src/rougail/path.py

@@ -77,19 +77,6 @@ class Path:
                                         )
         variableobj.path = full_name
 
-    def add_leadership(self,
-                       namespace: str,
-                       path: str,
-                       variableobj: str,
-                       ) -> str:  # pylint: disable=C0111
-        """add a new leadership
-        """
-        self.families[path] = dict(name=path,
-                                   namespace=namespace,
-                                   variableobj=variableobj,
-                                   )
-        variableobj.path = path
-
     def get_family(self,
                    name: str,
                    current_namespace: str,
@@ -109,26 +96,6 @@ class Path:
             raise DictConsistencyError(msg, 38, [])
         return dico['variableobj']
 
-    # Leadership
-    def set_leader(self,
-                   namespace: str,
-                   leader_family_name: str,
-                   leadership_name: str,
-                   name: str,
-                   ) -> None:  # pylint: disable=C0111
-        """set a variable a leadership member
-        """
-        # need rebuild path and move object in new path
-        old_path = leader_family_name + '.' + name
-        leadership_path = leader_family_name + '.' + leadership_name
-        new_path = leadership_path + '.' + name
-        self.variables[new_path] = self.variables.pop(old_path)
-        self.variables[new_path]['leader'] = leadership_path
-        self.variables[new_path]['variableobj'].path = new_path
-        self.variables[new_path]['family'] = leadership_path
-        if namespace == self.variable_namespace:
-            self.full_paths_variables[name] = new_path
-
     def is_leader(self, path):  # pylint: disable=C0111
         """Is the variable is a leader
         """
@@ -136,7 +103,7 @@ class Path:
         if not variable['leader']:
             return False
         leadership = self.get_family(variable['leader'], variable['variableobj'].namespace)
-        return leadership.variable[0].path == path
+        return next(iter(leadership.variable.values())).path == path
 
     def is_follower(self, path):
         """Is the variable is a follower
@@ -145,7 +112,7 @@ class Path:
         if not variable['leader']:
             return False
         leadership = self.get_family(variable['leader'], variable['variableobj'].namespace)
-        return leadership.variable[0].path != path
+        return next(iter(leadership.variable.values())).path != path
 
     # Variable
     def add_variable(self,  # pylint: disable=R0913
@@ -154,6 +121,7 @@ class Path:
                      family: str,
                      is_dynamic: bool,
                      variableobj,
+                     leader: 'self.objectspace.family'=None,
                      ) -> str:  # pylint: disable=C0111
         """Add a new variable (with path)
         """
@@ -169,7 +137,7 @@ class Path:
             raise DictConsistencyError(msg, 57, variableobj.xmlfiles)
         self.variables[full_path] = dict(name=name,
                                          family=family,
-                                         leader=None,
+                                         leader=leader,
                                          is_dynamic=is_dynamic,
                                          variableobj=variableobj,
                                          )

src/rougail/template/base.py

@@ -122,10 +122,11 @@ class RougailLeader:
     For examples: %%leader, %%leader[0].follower1
     """
     def __init__(self,
+                 leader_name,
                  value,
                  ) -> None:
         self._value = value
-        self._follower = {}
+        self._follower = {leader_name: value}
 
     def __getitem__(self, index):
         """Get a leader.follower at requested index.
@@ -393,8 +394,9 @@ class RougailBaseTemplate:
                 if await option.option.isleadership():
                     for idx, suboption in enumerate(await option.list('all')):
                         if idx == 0:
-                            leader = RougailLeader(await suboption.value.get())
                             leader_name = await suboption.option.name()
+                            leader = RougailLeader(leader_name, await suboption.value.get())
+                            leadership_name = await option.option.name()
                             if is_variable_namespace:
                                 self.rougail_variables_dict[await suboption.option.name()] = leader
                         else:
@@ -402,7 +404,7 @@ class RougailBaseTemplate:
                                                        await suboption.option.name(),
                                                        await suboption.option.path(),
                                                        )
-                    variables[leader_name] = leader
+                    variables[leadership_name] = leader
                 else:
                     if is_service_namespace == 'root':
                         new_is_service_namespace = 'service_name'

src/rougail/tiramisureflector.py

@@ -251,7 +251,11 @@ class Common:
         if param.type == 'variable':
             return self.build_option_param(param)
         if param.type == 'information':
-            return f'ParamInformation("{param.text}", None)'
+            if hasattr(self.elt, 'multi') and self.elt.multi:
+                default = []
+            else:
+                default = None
+            return f'ParamInformation("{param.text}", {default})'
         if param.type == 'target_information':
             return f'ParamSelfInformation("{param.text}", None)'
         if param.type == 'suffix':
@@ -371,7 +375,7 @@ class Family(Common):
         if hasattr(self.elt, 'suffixes'):
             self.objectspace.has_dyn_option = True
             self.object_type = 'ConvertDynOptionDescription'
-        elif isinstance(self.elt, self.objectspace.leadership):
+        elif hasattr(self.elt, 'leadership') and self.elt.leadership:
             self.object_type = 'Leadership'
         else:
             self.object_type = 'OptionDescription'

src/rougail/update.py

@@ -31,10 +31,11 @@ from .i18n import _
 from .error import UpgradeError
 
 from .utils import normalize_family
+from .config import RougailConfig
 
 
 VERSIONS = {'creole': ['1'],
-            'rougail': ['0.9'],
+            'rougail': ['0.9', '0.10'],
             }
 
 
@@ -47,16 +48,24 @@ FUNCTION_VERSIONS = [(root, version, get_function_name(root, version)) for root,
 
 
 class RougailUpgrade:
-    def __init__(self, test=False, upgrade_help=None):
+    def __init__(self,
+                 test=False,
+                 upgrade_help=None,
+                 rougailconfig: RougailConfig=None,
+                 ) -> None:
         self.test = test
         if upgrade_help is None:
             upgrade_help = {}
         self.upgrade_help = upgrade_help
+        if rougailconfig is None:
+            rougailconfig = RougailConfig
+        self.rougailconfig = rougailconfig
 
     def load_xml_from_folders(self,
                               srcfolder: str,
                               dstfolder: str,
                               namespace: str,
+                              display: bool=True,
                               ):
         """Loads all the XML files located in the xmlfolders' list
 
@@ -67,6 +76,8 @@ class RougailUpgrade:
         for filename in filenames:
             xmlsrc = join(srcfolder, filename)
             xmldst = join(dstfolder, filename)
+            if isfile(xmldst):
+                raise Exception(f'cannot update "{xmlsrc}" destination file "{xmldst}" already exists')
             try:
                 parser = XMLParser(remove_blank_text=True)
                 document = parse(xmlsrc, parser)
@@ -77,13 +88,15 @@ class RougailUpgrade:
             function_found = False
             for root_name, version, function_version in FUNCTION_VERSIONS:
                 if function_found and hasattr(self, function_version):
-                    print(f'  - convert {filename} to version {version}')
+                    if display:
+                        print(f'  - convert {filename} to version {version}')
                     upgrade_help = self.upgrade_help.get(function_version, {}).get(filename, {})
                     if upgrade_help.get('remove') is True:
                         continue
                     root = getattr(self, function_version)(root, upgrade_help, namespace)
                 if function_version == search_function_name:
                     function_found = True
+                root.attrib['version'] = version
             with open(xmldst, 'wb') as xmlfh:
                 xmlfh.write(tostring(root, pretty_print=True, encoding="UTF-8", xml_declaration=True))
     #            if
@@ -94,6 +107,90 @@ class RougailUpgrade:
     #            yield xmlfile, document.getroot()
 
 
+    def update_rougail_0_10(self,
+                           root: 'Element',
+                           upgrade_help: dict,
+                           namespace: str,
+                           ) -> 'Element':
+        variables = root.find('variables')
+        if variables is None:
+            return root
+        constraints = root.find('constraints')
+        if constraints is None:
+            return root
+        groups = []
+        for constraint in constraints:
+            if constraint.tag == 'group':
+                constraints.remove(constraint)
+                groups.append(constraint)
+        if not groups:
+            return root
+        paths = self._get_path_variables(variables,
+                                         namespace == self.rougailconfig['variable_namespace'],
+                                         namespace,
+                                         )
+        for group in groups:
+            if group.attrib['leader'] in paths:
+                leader_obj = paths[group.attrib['leader']]
+                #FIXME name peut avoir "." il faut le virer
+                #FIXME si extra c'est un follower !
+                if 'name' in group.attrib:
+                    name = group.attrib['name']
+                    if 'description' in group.attrib:
+                        description = group.attrib['description']
+                    else:
+                        description = name
+                else:
+                    name = leader_obj['variable'].attrib['name']
+                    if '.' in name:
+                        name = name.rsplit('.', 1)[-1]
+                    if 'description' in group.attrib:
+                        description = group.attrib['description']
+                    elif 'description' in leader_obj['variable'].attrib:
+                        description = leader_obj['variable'].attrib['description']
+                    else:
+                        description = name
+                family = SubElement(leader_obj['parent'], 'family', name=name, description=description, leadership="True")
+                leader_obj['parent'].remove(leader_obj['variable'])
+                family.append(leader_obj['variable'])
+            else:
+                # append in group
+                follower = next(iter(group))
+                leader_name = group.attrib['leader']
+                if '.' in leader_name:
+                    leader_path = leader_name.rsplit('.', 1)[0]
+                    follower_path = leader_path + '.' + follower.text
+                else:
+                    follower_path = follower.text
+                obj = paths[follower_path]
+                family = SubElement(obj['parent'], 'family', name=leader_name, leadership="True")
+            for follower in group:
+                leader_name = group.attrib['leader']
+                if '.' in leader_name:
+                    leader_path = leader_name.rsplit('.', 1)[0]
+                    follower_path = leader_path + '.' + follower.text
+                else:
+                    follower_path = follower.text
+                follower_obj = paths[follower_path]
+                follower_obj['parent'].remove(follower_obj['variable'])
+                family.append(follower_obj['variable'])
+        return root
+
+    def _get_path_variables(self, variables, is_variable_namespace, path, dico=None):
+        if dico is None:
+            dico = {}
+        for variable in variables:
+            if not is_variable_namespace and path:
+                subpath = path + '.'
+            else:
+                subpath = ''
+            subpath += variable.attrib['name']
+            if variable.tag == 'family':
+                self._get_path_variables(variable, is_variable_namespace, subpath, dico)
+            elif variable.tag == 'variable':
+                dico[subpath] = {'variable': variable, 'parent': variables}
+        return dico
+
     def update_rougail_0_9(self,
                            root: 'Element',
                            upgrade_help: dict,
@@ -101,7 +198,6 @@ class RougailUpgrade:
                            ) -> 'Element':
         # rename root
         root.tag = 'rougail'
-        root.attrib['version'] = '0.9'
         variables_auto_valid_enum = {}
         variables_help = {}
         families_help = {}
@@ -146,7 +242,7 @@ class RougailUpgrade:
                             subsubsubelement.attrib['mandatory'] = 'True'
                         if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('type', {}):
                             subsubsubelement.attrib['type'] = upgrade_help.get('variables', {}).get('type', {})[subsubsubelement.attrib['name']]
-                        if namespace == 'configuration':
+                        if namespace == self.rougailconfig['variable_namespace']:
                             path = subsubsubelement.attrib['name']
                             npath = normalize_family(subsubsubelement.attrib['name'])
                         else:

tests/dictionaries/00empty/00_base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="tata">
+<rougail version="0.10">
+  <services>
+    <service name="tata">
         </service>
-    </services>
+  </services>
 </rougail>

tests/dictionaries/00load_autofreeze/00-base.xml

@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="myvar" auto_freeze="True">
-            <value>no</value>
-        </variable>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="myvar" auto_freeze="True">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/00load_autofreezeexpert/00-base.xml

@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_var" auto_freeze="True" mode="expert">
-            <value>no</value>
-        </variable>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_var" auto_freeze="True" mode="expert">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/00load_autosave/00-base.xml

@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/00load_autosaveexpert/00-base.xml

@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True" mode="expert">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True" mode="expert">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/00load_comment/00-base.xml

@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <!-- this is a comment -->
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <!-- this is a comment -->
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/00load_notype/00-base.xml

@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="without_type">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="without_type">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/00load_save/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/00load_subfolder/99-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/00load_subfolder/subfolder/00-base.xml

@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif1' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01auto_autofreeze/00-base.xml

@@ -1,19 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean">
-            <value>no</value>
-        </variable>
-        <variable name="my_variable" auto_freeze="True" hidden="True">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>yes</param>
-            <target>my_variable</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean">
+      <value>no</value>
+    </variable>
+    <variable name="my_variable" auto_freeze="True" hidden="True">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>yes</param>
+      <target>my_variable</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01auto_base/00-base.xml

@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01auto_withoutparam/00-base.xml

@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_domainname/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="domain" type="domainname" description="Description">
-                <value>my.domain.name</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="domain" type="domainname" description="Description">
+        <value>my.domain.name</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_file/00-base.xml

@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_file_include/00-base.xml

@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_file_include_content/00-base.xml

@@ -1,21 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-            <file included="content">/etc/dir/incfile</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+      <file included="content">/etc/dir/incfile</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_file_include_name/00-base.xml

@@ -1,21 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-            <file included="name">/etc/dir/incfile</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+      <file included="name">/etc/dir/incfile</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_file_patch/00-base.xml

@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_file_utfchar/00-base.xml

@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/systemd-makefs@dev-disk-by\x2dpartlabel</file>
-            <file engine="jinja2">/etc/systemd-makefs@dev-disk-by\x2dpartlabel2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/systemd-makefs@dev-disk-by\x2dpartlabel</file>
+      <file engine="jinja2">/etc/systemd-makefs@dev-disk-by\x2dpartlabel2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_float/00-base.xml

@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="float" type="float" description="Description">
-                <value>0.527</value>
-            </variable>
-            <variable name="float_multi" type="float" description="Description" multi="True">
-                <value>0.527</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="float" type="float" description="Description">
+        <value>0.527</value>
+      </variable>
+      <variable name="float_multi" type="float" description="Description" multi="True">
+        <value>0.527</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_help_quote/00-base.xml

@@ -1,11 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" help="message with '"/>
-            <variable name="mode_conteneur_actif1" type="string" description="Redefine description" help='message with "'/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" help="message with '"/>
+      <variable name="mode_conteneur_actif1" type="string" description="Redefine description" help="message with &quot;"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_multi/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_value_doublequote/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote"</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_value_doublequote2/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote'"</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote'"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_value_doublequote3/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote\"\'</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote\"\'</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_value_multi_doublequote/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>quote"</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_value_multi_doublequote2/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>quote'"</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote'"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_value_multi_quote/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>quote'</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote'</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_value_quote/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote'</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote'</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01base_var_name_same_family/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="general" type="string" description="description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="general" type="string" description="description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01boolean_no_mandatory/00-base.xml

@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_variable" type="boolean" mandatory="False"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_variable" type="boolean" mandatory="False"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01family_description/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="Other description">
-            <variable name="mode_conteneur_actif">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="Other description">
+      <variable name="mode_conteneur_actif">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01fill_autofreeze/00-base.xml

@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_var1" auto_freeze="True">
-            <value>no</value>
-        </variable>
-        <variable name="my_var2">
-            <value>no</value>
-        </variable>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">my_var2</param>
-            <target>my_var1</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_var1" auto_freeze="True">
+      <value>no</value>
+    </variable>
+    <variable name="my_var2">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">my_var2</param>
+      <target>my_var1</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01fill_autosave/00-base.xml

@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01fill_base/00-base.xml

@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01fill_mandatory/00-base.xml

@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="basic">
-            <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True" mode="expert"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="basic">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True" mode="expert"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01fill_number/00-base.xml

@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="number" description="No change" hidden="True"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="number">3</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="number" description="No change" hidden="True"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="number">3</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01fill_only_optional/00-base.xml

@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable" optional="True">mode_conteneur_actif4</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable" optional="True">mode_conteneur_actif4</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01fill_optional/00-base.xml

@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable" optional="True">mode_conteneur_actif4</param>
-            <param type="variable">mode_conteneur_actif1</param>
-            <param type="variable" optional="True">mode_conteneur_actif3</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable" optional="True">mode_conteneur_actif4</param>
+      <param type="variable">mode_conteneur_actif1</param>
+      <param type="variable" optional="True">mode_conteneur_actif3</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01fill_quote/00-base.xml

@@ -1,32 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif2" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif3" type="string" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param>quote'</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-        <fill name="calc_val">
-            <param>quote"</param>
-            <target>mode_conteneur_actif1</target>
-        </fill>
-        <fill name="calc_val">
-            <param>quote"'</param>
-            <target>mode_conteneur_actif2</target>
-        </fill>
-        <fill name="calc_val">
-            <param>quote"\'</param>
-            <target>mode_conteneur_actif3</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif2" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif3" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>quote'</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"</param>
+      <target>mode_conteneur_actif1</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"'</param>
+      <target>mode_conteneur_actif2</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"\'</param>
+      <target>mode_conteneur_actif3</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01fill_target_optional/00-base.xml

@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target optional="True">mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target optional="True">mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml

@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-        <variable name="my_var" type="string" auto_freeze="True">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>yes</param>
-            <target>my_var</target>
-        </fill>
-        <condition name="hidden_if_in" source="server_deployed">
-            <param>True</param>
-            <target type="variable">my_var</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+    <variable name="my_var" type="string" auto_freeze="True">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>yes</param>
+      <target>my_var</target>
+    </fill>
+    <condition name="hidden_if_in" source="server_deployed">
+      <param>True</param>
+      <target type="variable">my_var</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01test/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01test_multi/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test1|test2">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test1|test2">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01test_multi_none/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="|test1|test2">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="|test1|test2">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01test_redefine/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01test_redefine/10-base.xml

@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" test="test1"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" test="test1"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01test_redefine_base/00-base.xml

@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_variable"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_variable"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01test_redefine_base/10-base.xml

@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_variable" redefine="True" test="test1"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_variable" redefine="True" test="test1"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01test_redefine_remove/00-base.xml

@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01test_redefine_remove/10-base.xml

@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" test=""/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" test=""/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml

@@ -1,24 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="autosavevar" type="string" description="autosave variable" auto_save="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>oui</param>
-            <target>autosavevar</target>
-        </fill>
-        <condition name="hidden_if_in" source="mode_conteneur_actif">
-             <param>oui</param>
-             <target type="variable">autosavevar</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="autosavevar" type="string" description="autosave variable" auto_save="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>oui</param>
+      <target>autosavevar</target>
+    </fill>
+    <condition name="hidden_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="variable">autosavevar</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/02fill_multi_calc_val/00-base.xml

@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="var1">
-            <value>no</value>
-        </variable>
-        <variable name="var2" multi='True'/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_value">
-            <param type="variable">var1</param>
-            <param type="boolean" name="multi">True</param>
-            <target>var2</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="var1">
+      <value>no</value>
+    </variable>
+    <variable name="var2" multi="True"/>
+  </variables>
+  <constraints>
+    <fill name="calc_value">
+      <param type="variable">var1</param>
+      <param type="boolean" name="multi">True</param>
+      <target>var2</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml

@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="var1" multi='True'>
-            <value>no</value>
-            <value>yes</value>
-            <value>maybe</value>
-        </variable>
-        <variable name="var2" multi='True'/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_value">
-            <param type="variable">var1</param>
-            <target>var2</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="var1" multi="True">
+      <value>no</value>
+      <value>yes</value>
+      <value>maybe</value>
+    </variable>
+    <variable name="var2" multi="True"/>
+  </variables>
+  <constraints>
+    <fill name="calc_value">
+      <param type="variable">var1</param>
+      <target>var2</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/10autosave_hidden/00-base.xml

@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="autosavevar" type="string" description="autosave variable" hidden="True" auto_save="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param>oui</param>
-            <target>autosavevar</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="autosavevar" type="string" description="autosave variable" hidden="True" auto_save="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>oui</param>
+      <target>autosavevar</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/10check_base/00-base.xml

@@ -1,20 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini" type="number">0</param>
-            <param name="maxi" type="number">100</param>
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="number">100</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/10check_base_target_optional/00-base.xml

@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_variable"/>
-    </variables>
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini" type="number">0</param>
-            <param name="maxi" type="number">100</param>
-            <target optional="True">int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_variable"/>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="number">100</param>
+      <target optional="True">int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/10check_no_param/00-base.xml

@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_lower">
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_lower">
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/10check_option/00-base.xml

@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int2" type="number" description="No change">
-                <value>100</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_lower">
-            <param name="mini" type="number">0</param>
-            <param name="maxi" type="variable">int2</param>
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int2" type="number" description="No change">
+        <value>100</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_lower">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="variable">int2</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/10check_optional/00-base.xml

@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-            <variable name="int2" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable" optional="True">int2</param>
-            <target>int</target>
-        </check>
-        <check name="valid_differ">
-            <param type="variable" optional="True">int3</param>
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+      <variable name="int2" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable" optional="True">int2</param>
+      <target>int</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable" optional="True">int3</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/10check_valid_differ/00-base.xml

@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/10check_valid_differ_add/00-base.xml

@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/10check_valid_differ_add/01-base.xml

@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif3" redefine="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif2</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif3" redefine="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif2</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/10check_valid_differ_removecheck/00-base.xml

@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/10check_valid_differ_removecheck/01-base.xml

@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif3" redefine="True" remove_check="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif2</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif3" redefine="True" remove_check="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif2</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->