name in family or variable must be valid

src/rougail/annotator/family.py

@@ -26,7 +26,6 @@ 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 .variable import Walk
 
 
@@ -91,7 +90,6 @@ class FamilyAnnotator(Walk):
                 family.description = family.name
             family.doc = family.description
             del family.description
-            family.name = normalize_family(family.name)
 
     def change_modes(self):
         """change the mode of variables

src/rougail/annotator/variable.py

@@ -28,7 +28,6 @@ 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 ..utils import normalize_family
 
 
 CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
@@ -171,7 +170,6 @@ class VariableAnnotator(Walk):  # pylint: disable=R0903
             if not variable.value:
                 del variable.value
         variable.doc = variable.description
-        variable.name = normalize_family(variable.name)
         del variable.description
         if variable_type == 'follower':
             if variable.multi is True:

src/rougail/objspace.py

@@ -29,7 +29,7 @@ from typing import Optional
 
 from .i18n import _
 from .xmlreflector import XMLReflector
-from .utils import normalize_family
+from .utils import valid_variable_family_name
 from .error import SpaceObjShallNotBeUpdated, DictConsistencyError
 from .path import Path
 
@@ -197,7 +197,7 @@ class RougailObjSpace:
             if child.tag == 'family':
                 if child.attrib['name'] in family_names:
                     msg = _(f'Family "{child.attrib["name"]}" is set several times')
-                    raise DictConsistencyError(msg, 44, xmlfile)
+                    raise DictConsistencyError(msg, 44, [xmlfile])
                 family_names.append(child.attrib['name'])
             try:
                 # variable objects creation
@@ -296,6 +296,7 @@ class RougailObjSpace:
         """A redefinable object could be created or updated
         """
         existed_var = self.get_existed_obj(name,
+                                           xmlfile,
                                            space,
                                            child,
                                            namespace,
@@ -337,6 +338,7 @@ class RougailObjSpace:
 
     def get_existed_obj(self,
                         name: str,
+                        xmlfile: str,
                         space: str,
                         child,
                         namespace: str,
@@ -344,7 +346,7 @@ class RougailObjSpace:
         """if an object exists, return it
         """
         if child.tag in ['variable', 'family']:
-            name = normalize_family(name)
+            valid_variable_family_name(name, [xmlfile])
         if child.tag == 'variable':  # pylint: disable=E1101
             if namespace != self.rougailconfig['variable_namespace']:
                 name = space.path + '.' + name
@@ -468,18 +470,18 @@ class RougailObjSpace:
         """
         if isinstance(variableobj, self.variable):  # pylint: disable=E1101
             if 'name' in document.attrib:
-                family_name = normalize_family(document.attrib['name'])
+                family_name = document.attrib['name']
             else:
                 family_name = namespace
 
             self.paths.add_variable(namespace,
-                                    normalize_family(variableobj.name),
+                                    variableobj.name,
                                     space.path,
                                     document.attrib.get('dynamic') is not None,
                                     variableobj,
                                     )
         elif isinstance(variableobj, self.family):  # pylint: disable=E1101
-            family_name = normalize_family(variableobj.name)
+            family_name = variableobj.name
             if namespace != self.rougailconfig['variable_namespace']:
                 family_name = namespace + '.' + family_name
             self.paths.add_family(namespace,
@@ -502,8 +504,6 @@ class RougailObjSpace:
         if isinstance(variableobj, Redefinable):
             name = variableobj.name
             tag = FORCE_TAG.get(child.tag, child.tag)
-            if child.tag in ['family', 'variable']:
-                name = normalize_family(name)
             getattr(space, tag)[name] = variableobj
         elif isinstance(variableobj, UnRedefinable):
             getattr(space, child.tag).append(variableobj)

src/rougail/utils.py

@@ -26,10 +26,26 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 from typing import List
 from unicodedata import normalize, combining
+import re
 
 from importlib.machinery import SourceFileLoader
 from importlib.util import spec_from_loader, module_from_spec
 
+from .i18n import _
+from .error import DictConsistencyError
+
+NAME_REGEXP = re.compile(r"^[a-z0-9_]*$")
+
+
+def valid_variable_family_name(name: str,
+                               xmlfiles: List[str],
+                               ) -> None:
+    match = NAME_REGEXP.search(name)
+    if not match:
+        msg = _(f'invalid variable or family name "{name}" must only contains '
+                'lowercase ascii character, number or _')
+        raise DictConsistencyError(msg, 76, xmlfiles)
+
 
 def normalize_family(family_name: str) -> str:
     """replace space, accent, uppercase, ... by valid character

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

@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <variables>
         <variable name="server_deployed" type="boolean"/>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
                 <value>non</value>
             </variable>

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

@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <variables>
         <variable name="server_deployed" type="boolean"/>
-        <family name="général">
+        <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>

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <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>

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

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

@@ -2,7 +2,7 @@
 
 <rougail version="0.9">
     <variables>
-        <family name='général'>
+        <family name="general" description="général">
             <variable name='mode_conteneur_actif1' type='string' description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/01fill_baseaccent/makedict/after.json

@@ -1,10 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general.mode_conteneur_actif1": {
-        "owner": "default",
-        "value": "non"
-    }
-}

tests/dictionaries/01fill_baseaccent/makedict/base.json

@@ -1,4 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": "non",
-    "rougail.general.mode_conteneur_actif1": "non"
-}

tests/dictionaries/01fill_baseaccent/makedict/before.json

@@ -1,10 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general.mode_conteneur_actif1": {
-        "owner": "default",
-        "value": "non"
-    }
-}

tests/dictionaries/01fill_baseaccent/tiramisu/base.py

@@ -1,18 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
-option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4], properties=frozenset({"normal"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <variables>
         <variable name="server_deployed" type="boolean"/>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

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

@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <variables>
         <variable name="server_deployed" type="boolean"/>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/10leadership_accent/makedict/after.json

@@ -1,18 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general1.leader.leader": {
-        "owner": "default",
-        "value": []
-    },
-    "rougail.general1.leader.follower1": {
-        "owner": [],
-        "value": []
-    },
-    "rougail.general1.leader.follower2": {
-        "owner": [],
-        "value": []
-    }
-}

tests/dictionaries/10leadership_accent/makedict/base.json

@@ -1,4 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": "non",
-    "rougail.general1.leader.leader": []
-}

tests/dictionaries/10leadership_accent/makedict/before.json

@@ -1,18 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general1.leader.leader": {
-        "owner": "default",
-        "value": []
-    },
-    "rougail.general1.leader.follower1": {
-        "owner": [],
-        "value": []
-    },
-    "rougail.general1.leader.follower2": {
-        "owner": [],
-        "value": []
-    }
-}

tests/dictionaries/10leadership_accent/tiramisu/base.py

@@ -1,22 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
-option_6 = StrOption(name="leader", doc="leader", multi=True)
-option_7 = StrOption(name="follower1", doc="Followér1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
-option_8 = StrOption(name="follower2", doc="Followér2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), properties=frozenset({"normal"}))
-option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
-option_4 = OptionDescription(name="general1", doc="general1", children=[option_5], properties=frozenset({"normal"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/10leadership_accent_leader/makedict/after.json

@@ -1,18 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general1.leader.leader": {
-        "owner": "default",
-        "value": []
-    },
-    "rougail.general1.leader.follower1": {
-        "owner": [],
-        "value": []
-    },
-    "rougail.general1.leader.follower2": {
-        "owner": [],
-        "value": []
-    }
-}

tests/dictionaries/10leadership_accent_leader/makedict/base.json

@@ -1,4 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": "non",
-    "rougail.general1.leader.leader": []
-}

tests/dictionaries/10leadership_accent_leader/makedict/before.json

@@ -1,18 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general1.leader.leader": {
-        "owner": "default",
-        "value": []
-    },
-    "rougail.general1.leader.follower1": {
-        "owner": [],
-        "value": []
-    },
-    "rougail.general1.leader.follower2": {
-        "owner": [],
-        "value": []
-    }
-}

tests/dictionaries/10leadership_accent_leader/tiramisu/base.py

@@ -1,22 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
-option_6 = StrOption(name="leader", doc="Léader", multi=True)
-option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
-option_8 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), properties=frozenset({"normal"}))
-option_5 = Leadership(name="leader", doc="Léader", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
-option_4 = OptionDescription(name="general1", doc="general1", children=[option_5], properties=frozenset({"normal"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/10leadership_familyaccent/makedict/after.json

@@ -1,18 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general.leader.leader": {
-        "owner": "default",
-        "value": []
-    },
-    "rougail.general.leader.follower1": {
-        "owner": [],
-        "value": []
-    },
-    "rougail.general.leader.follower2": {
-        "owner": [],
-        "value": []
-    }
-}

tests/dictionaries/10leadership_familyaccent/makedict/base.json

@@ -1,4 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": "non",
-    "rougail.general.leader.leader": []
-}

tests/dictionaries/10leadership_familyaccent/makedict/before.json

@@ -1,18 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general.leader.leader": {
-        "owner": "default",
-        "value": []
-    },
-    "rougail.general.leader.follower1": {
-        "owner": [],
-        "value": []
-    },
-    "rougail.general.leader.follower2": {
-        "owner": [],
-        "value": []
-    }
-}

tests/dictionaries/10leadership_familyaccent/tiramisu/base.py

@@ -1,21 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_5 = StrOption(name="leader", doc="leader", multi=True)
-option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
-option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"}))
-option_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"}))
-option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4], properties=frozenset({"normal"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/10load_disabled_if_inaccent_family/makedict/after.json

@@ -1,18 +0,0 @@
-{
-    "rougail.general.condition": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general.mode_conteneur_actif2": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general2.mode_conteneur_actif3": {
-        "owner": "default",
-        "value": "non"
-    }
-}

tests/dictionaries/10load_disabled_if_inaccent_family/makedict/base.json

@@ -1,6 +0,0 @@
-{
-    "rougail.general.condition": "non",
-    "rougail.general.mode_conteneur_actif": "non",
-    "rougail.general.mode_conteneur_actif2": "non",
-    "rougail.general2.mode_conteneur_actif3": "non"
-}

tests/dictionaries/10load_disabled_if_inaccent_family/makedict/before.json

@@ -1,18 +0,0 @@
-{
-    "rougail.general.condition": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general.mode_conteneur_actif2": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general2.mode_conteneur_actif3": {
-        "owner": "default",
-        "value": "non"
-    }
-}

tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py

@@ -1,21 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
-option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
-option_7 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_6 = OptionDescription(name="general2", doc="Général2", children=[option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_6])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="Général">
+        <family name="general" description="Général">
             <variable name="condition" type="string" description="No change">
                 <value>non</value>
             </variable>
@@ -12,7 +12,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <family name="Général2">
+        <family name="general2" description="Général2">
         </family>
     </variables>
 
@@ -21,7 +21,7 @@
             <param>oui</param>
             <target type="variable">mode_conteneur_actif</target>
             <target type="variable">mode_conteneur_actif2</target>
-            <target type="family">Général2</target>
+            <target type="family">general2</target>
         </condition>
     </constraints>
 </rougail>

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="Général">
+        <family name="general" description="Général">
             <variable name="condition" type="string" description="No change">
                 <value>non</value>
             </variable>
@@ -12,7 +12,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <family name="Général2">
+        <family name="general2" description="Général2">
             <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
@@ -24,7 +24,7 @@
             <param>oui</param>
             <target type="variable">mode_conteneur_actif</target>
             <target type="variable">mode_conteneur_actif2</target>
-            <target type="family">Général2</target>
+            <target type="family">general2</target>
         </condition>
     </constraints>
 </rougail>

tests/dictionaries/10load_leadership_normalize_family/makedict/after.json

@@ -1,18 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general_1.leader.leader": {
-        "owner": "default",
-        "value": []
-    },
-    "rougail.general_1.leader.follower1": {
-        "owner": [],
-        "value": []
-    },
-    "rougail.general_1.leader.follower2": {
-        "owner": [],
-        "value": []
-    }
-}

tests/dictionaries/10load_leadership_normalize_family/makedict/base.json

@@ -1,4 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": "non",
-    "rougail.general_1.leader.leader": []
-}

tests/dictionaries/10load_leadership_normalize_family/makedict/before.json

@@ -1,18 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general_1.leader.leader": {
-        "owner": "default",
-        "value": []
-    },
-    "rougail.general_1.leader.follower1": {
-        "owner": [],
-        "value": []
-    },
-    "rougail.general_1.leader.follower2": {
-        "owner": [],
-        "value": []
-    }
-}

tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py

@@ -1,22 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
-option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"mandatory"}))
-option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"}))
-option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"}))
-option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"basic"}))
-option_4 = OptionDescription(name="general_1", doc="general-1", children=[option_5], properties=frozenset({"basic"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/20family_appendaccent/makedict/after.json

@@ -1,14 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif1": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general.mode_conteneur_actif2": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.other.mode_conteneur_actif3": {
-        "owner": "default",
-        "value": "non"
-    }
-}

tests/dictionaries/20family_appendaccent/makedict/base.json

@@ -1,5 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif1": "non",
-    "rougail.general.mode_conteneur_actif2": "non",
-    "rougail.other.mode_conteneur_actif3": "non"
-}

tests/dictionaries/20family_appendaccent/makedict/before.json

@@ -1,14 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif1": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.general.mode_conteneur_actif2": {
-        "owner": "default",
-        "value": "non"
-    },
-    "rougail.other.mode_conteneur_actif3": {
-        "owner": "default",
-        "value": "non"
-    }
-}

tests/dictionaries/20family_appendaccent/tiramisu/base.py

@@ -1,21 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_7 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
-option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
-option_6 = OptionDescription(name="other", doc="Other", children=[option_7], properties=frozenset({"normal"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_6])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/40empty_param/00_base.xml

@@ -3,7 +3,7 @@
     <services/>
 
     <variables>
-        <family name="proxy authentifié">
+        <family name="proxy_authentifie" description="proxy authentifié">
             <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
             <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">

tests/dictionaries/40empty_param2/00_base.xml

@@ -3,7 +3,7 @@
     <services/>
 
     <variables>
-        <family name="proxy authentifié">
+        <family name="proxy_authentifie" description="proxy authentifié">
             <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
             <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">

tests/dictionaries/60action_external/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/60extra_externalspacecondition/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="my_var" auto_freeze="True">
                 <value>no</value>
             </variable>

tests/dictionaries/60extra_group/00-base.xml

@@ -7,7 +7,7 @@
         </service>
     </services>
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/60extra_help/00-base.xml

@@ -8,7 +8,7 @@
     </services>
 
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/60extra_load/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/60extra_mandatory/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/60extra_no_condition/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>

tests/dictionaries/60extra_redefine/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/60extra_variable_name_extra/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/60familyaction/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/60familyaction_accent/makedict/after.json

@@ -1,10 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "extra.test.delay": {
-        "owner": "default",
-        "value": 0
-    }
-}

tests/dictionaries/60familyaction_accent/makedict/base.json

@@ -1,4 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": "non",
-    "extra.test.delay": 0
-}

tests/dictionaries/60familyaction_accent/makedict/before.json

@@ -1,10 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": {
-        "owner": "default",
-        "value": "non"
-    },
-    "extra.test.delay": {
-        "owner": "default",
-        "value": 0
-    }
-}

tests/dictionaries/60familyaction_accent/tiramisu/base.py

@@ -1,20 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_6 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"}))
-option_5 = OptionDescription(name="test", doc="test", children=[option_6], properties=frozenset({"normal"}))
-option_4 = OptionDescription(name="extra", doc="extra", children=[option_5])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

tests/dictionaries/60familyaction_mandatory/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/61extra_auto_freeze/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="server_deployed" type="boolean" description="No change"/>
             <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
                 <value>non</value>

tests/dictionaries/61extra_dyn/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="varname" type="string" description="No change" multi="True">
                 <value>a</value>
             </variable>

tests/dictionaries/61extra_dyn_extra/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="varname" type="string" description="No change" multi="True">
                 <value>a</value>
             </variable>

tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml

@@ -2,7 +2,7 @@
 
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="varname" type="string" description="No change" multi="True">
                 <value>a</value>
             </variable>

tests/dictionaries/70container_files/00-base.xml

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <rougail version="0.9">
-
     <services> 
         <service name='test'>
             <file>/etc/mailname</file>
             <file>/rougail.conf</file>
         </service>
     </services>
-
-
     <variables>
-        <family name='général'>
+        <family name="general" description="général">
             <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/70container_files_twice/00-base.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <rougail version="0.9">
-
     <services> 
         <service name='test'>
             <file>/etc/mailname</file>
@@ -9,10 +7,8 @@
             <file>/rougail.conf</file>
         </service>
     </services>
-
-
     <variables>
-        <family name='général'>
+        <family name="general" description="général">
             <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/70container_filesmulti/00-base.xml

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <rougail version="0.9">
-
     <services> 
         <service name='test'>
             <file>/etc/mailname</file>
             <file>/etc/mailname2</file>
         </service>
     </services>
-
-
     <variables>
-        <family name='général'>
+        <family name="general" description="général">
             <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/70container_filesredefine/00-base.xml

@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <rougail version="0.9">
-
     <services> 
         <service name='test'>
             <file>/etc/mailname</file>
         </service>
     </services>
-
-
     <variables>
-        <family name='général'>
+        <family name="general" description="général">
             <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/70container_new/00-base.xml

@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <rougail version="0.9">
-
     <services> 
         <service name='test'>
         </service>
     </services>
-
-
     <variables>
-        <family name='général'>
+        <family name="general" description="général">
             <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/70container_newnocont/00-base.xml

@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <rougail version="0.9">
-
     <services> 
         <service name='test'>
         </service>
     </services>
-
-
     <variables>
-        <family name='général'>
+        <family name="general" description="général">
             <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/70container_newwithip/00-base.xml

@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <rougail version="0.9">
-
     <services> 
         <service name='test'>
         </service>
     </services>
-
-
     <variables>
-        <family name='général'>
+        <family name="general" description="général">
             <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/70container_save/00-base.xml

@@ -2,7 +2,7 @@
 
 <rougail version="0.9">
     <variables>
-        <family name='général'>
+        <family name="general" description="général">
             <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/70service_base/00-base.xml

@@ -7,7 +7,7 @@
         </service>
     </services>
     <variables>
-        <family name='général'>
+        <family name="general" description="général">
             <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/70services_ip_leadership/00-base.xml

@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <rougail version="0.9">
-
     <services>
         <service name='ntp'>
             <ip netmask='nut_monitor_netmask'>nut_monitor_host</ip>
         </service>
     </services>
-
     <variables>
-        <family name='général'>
+        <family name="general" description="général">
             <variable name="nut_monitor_netmask" type="netmask" mandatory='True' multi="True">
                 <value>255.255.255.0</value>
             </variable>
@@ -18,7 +15,6 @@
             </variable>
         </family>
     </variables>
-
     <constraints>
         <group leader="nut_monitor_netmask">
             <follower>nut_monitor_host</follower>

tests/dictionaries/80condition_itself/00-base.xml

@@ -2,11 +2,11 @@
 <rougail version="0.9">
     <variables>
         <family name="test">
-            <variable name="replicationType"/>
+            <variable name="replicationtype" description="replicationType"/>
         </family>
     </variables>
     <constraints>
-        <condition name="disabled_if_in" source="replicationType">
+        <condition name="disabled_if_in" source="replicationtype">
             <param>leader-leader</param>
             <target type="variable">replicationType</target>
         </condition>

tests/dictionaries/80container_files_symlink_without_source/00-base.xml

@@ -6,7 +6,7 @@
         </service>
     </services>
     <variables>
-        <family name='général'>
+        <family name='general' description="général">
             <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/80container_filesredefine_error/00-base.xml

@@ -1,15 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
     <services> 
         <service name="test">
             <file>/etc/mailname</file>
         </service>
     </services>
-
-
     <variables>
-        <family name="général">
+        <family name='general' description="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/80empty_param_number/00_base.xml

@@ -1,9 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services/>
-
     <variables>
-        <family name="proxy authentifié">
+        <family name="general">
             <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
             <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
@@ -11,7 +9,6 @@
             </variable>
         </family>
     </variables>
-
     <constraints>
         <fill name="calc_multi_condition">
 	    <param name="value" type="number"/>

tests/dictionaries/80empty_typeeole_eole/00_base.xml

@@ -3,7 +3,7 @@
     <services/>
 
     <variables>
-        <family name="proxy authentifié">
+        <family name="general">
             <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
             <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">

tests/dictionaries/80empty_typeeole_number/00_base.xml

@@ -1,25 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services/>
-
     <variables>
-        <family name="proxy authentifié">
+        <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
-            <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+        </variable>
-            </variable>
+        <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
-            <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+            <value>3127</value>
-                <value>3127</value>
+        </variable>
-            </variable>
-        </family>
     </variables>
-
     <constraints>
         <fill name="calc_multi_condition">
             <param>non</param>
             <param type="number" name="condition_2" propertyerror="True"/>
             <param name="match">3128</param>
             <param name="mismatch" type="variable" propertyerror="True">toto2</param>
-	    <target>toto1</target>
+            <target>toto1</target>
         </fill>
     </constraints>
-
 </rougail>

tests/dictionaries/80extra_externalspaceauto/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/80extra_externalspacecondition2/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/80extra_externalspacecondition3/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general" description="général">
             <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/80extra_rougail/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

tests/dictionaries/80extra_services/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="général">
+        <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>