diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index 8612f48d..d22f6f98 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -38,7 +38,7 @@
-
+
@@ -83,6 +83,7 @@
+
@@ -107,7 +108,7 @@
-
+
@@ -132,9 +133,4 @@
-
-
-
-
-
diff --git a/src/rougail/update.py b/src/rougail/update.py
index 19076048..63c0f511 100644
--- a/src/rougail/update.py
+++ b/src/rougail/update.py
@@ -84,6 +84,7 @@ class RougailUpgrade:
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
@@ -101,7 +102,6 @@ class RougailUpgrade:
) -> 'Element':
# rename root
root.tag = 'rougail'
- root.attrib['version'] = '0.9'
variables_auto_valid_enum = {}
variables_help = {}
families_help = {}
diff --git a/tests/dictionaries/00empty/00_base.xml b/tests/dictionaries/00empty/00_base.xml
index ea43804d..78227d6f 100644
--- a/tests/dictionaries/00empty/00_base.xml
+++ b/tests/dictionaries/00empty/00_base.xml
@@ -1,7 +1,7 @@
-
-
+
+
-
+
diff --git a/tests/dictionaries/00load_autofreeze/00-base.xml b/tests/dictionaries/00load_autofreeze/00-base.xml
index 119c729b..92f639a1 100644
--- a/tests/dictionaries/00load_autofreeze/00-base.xml
+++ b/tests/dictionaries/00load_autofreeze/00-base.xml
@@ -1,13 +1,11 @@
-
-
- no
-
-
- False
-
-
+
+
+ no
+
+
+ False
+
+
-
diff --git a/tests/dictionaries/00load_autofreezeexpert/00-base.xml b/tests/dictionaries/00load_autofreezeexpert/00-base.xml
index d4f59f6e..5c1546e2 100644
--- a/tests/dictionaries/00load_autofreezeexpert/00-base.xml
+++ b/tests/dictionaries/00load_autofreezeexpert/00-base.xml
@@ -1,13 +1,11 @@
-
-
- no
-
-
- False
-
-
+
+
+ no
+
+
+ False
+
+
-
diff --git a/tests/dictionaries/00load_autosave/00-base.xml b/tests/dictionaries/00load_autosave/00-base.xml
index 28d7d0cf..647c823d 100644
--- a/tests/dictionaries/00load_autosave/00-base.xml
+++ b/tests/dictionaries/00load_autosave/00-base.xml
@@ -1,13 +1,11 @@
-
-
-
-
- non
-
-
-
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/00load_autosaveexpert/00-base.xml b/tests/dictionaries/00load_autosaveexpert/00-base.xml
index 63b1dd76..2959c5c3 100644
--- a/tests/dictionaries/00load_autosaveexpert/00-base.xml
+++ b/tests/dictionaries/00load_autosaveexpert/00-base.xml
@@ -1,13 +1,11 @@
-
-
-
-
- non
-
-
-
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/00load_comment/00-base.xml b/tests/dictionaries/00load_comment/00-base.xml
index e781b9f8..7ff4428f 100644
--- a/tests/dictionaries/00load_comment/00-base.xml
+++ b/tests/dictionaries/00load_comment/00-base.xml
@@ -1,13 +1,11 @@
-
-
-
-
- non
-
-
-
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/00load_notype/00-base.xml b/tests/dictionaries/00load_notype/00-base.xml
index fddb62b3..14c82f1c 100644
--- a/tests/dictionaries/00load_notype/00-base.xml
+++ b/tests/dictionaries/00load_notype/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/00load_save/00-base.xml b/tests/dictionaries/00load_save/00-base.xml
index 46d87131..84913090 100644
--- a/tests/dictionaries/00load_save/00-base.xml
+++ b/tests/dictionaries/00load_save/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/00load_subfolder/99-base.xml b/tests/dictionaries/00load_subfolder/99-base.xml
index 46d87131..84913090 100644
--- a/tests/dictionaries/00load_subfolder/99-base.xml
+++ b/tests/dictionaries/00load_subfolder/99-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/00load_subfolder/subfolder/00-base.xml b/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
index d6b12510..27c7f0b7 100644
--- a/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
+++ b/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
@@ -1,13 +1,10 @@
-
-
+
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01auto_autofreeze/00-base.xml b/tests/dictionaries/01auto_autofreeze/00-base.xml
index 7ce63e7d..db10997f 100644
--- a/tests/dictionaries/01auto_autofreeze/00-base.xml
+++ b/tests/dictionaries/01auto_autofreeze/00-base.xml
@@ -1,19 +1,17 @@
-
-
- no
-
-
- no
-
-
-
-
- yes
- my_variable
-
-
+
+
+ no
+
+
+ no
+
+
+
+
+ yes
+ my_variable
+
+
-
diff --git a/tests/dictionaries/01auto_base/00-base.xml b/tests/dictionaries/01auto_base/00-base.xml
index b8e98b89..4db9eed3 100644
--- a/tests/dictionaries/01auto_base/00-base.xml
+++ b/tests/dictionaries/01auto_base/00-base.xml
@@ -1,22 +1,19 @@
-
-
-
- non
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/01auto_withoutparam/00-base.xml b/tests/dictionaries/01auto_withoutparam/00-base.xml
index 3647b4bd..7c346837 100644
--- a/tests/dictionaries/01auto_withoutparam/00-base.xml
+++ b/tests/dictionaries/01auto_withoutparam/00-base.xml
@@ -1,21 +1,18 @@
-
-
-
- non
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/01base_domainname/00-base.xml b/tests/dictionaries/01base_domainname/00-base.xml
index 343c76d1..1376bc79 100644
--- a/tests/dictionaries/01base_domainname/00-base.xml
+++ b/tests/dictionaries/01base_domainname/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- my.domain.name
-
-
-
+
+
+
+ my.domain.name
+
+
+
-
diff --git a/tests/dictionaries/01base_file/00-base.xml b/tests/dictionaries/01base_file/00-base.xml
index 5e1ac5f7..2bc1f68d 100644
--- a/tests/dictionaries/01base_file/00-base.xml
+++ b/tests/dictionaries/01base_file/00-base.xml
@@ -1,20 +1,16 @@
-
-
-
- /etc/file
- /etc/file2
-
-
-
-
-
-
- non
-
-
-
+
+
+ /etc/file
+ /etc/file2
+
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01base_file_include/00-base.xml b/tests/dictionaries/01base_file_include/00-base.xml
index 5e1ac5f7..2bc1f68d 100644
--- a/tests/dictionaries/01base_file_include/00-base.xml
+++ b/tests/dictionaries/01base_file_include/00-base.xml
@@ -1,20 +1,16 @@
-
-
-
- /etc/file
- /etc/file2
-
-
-
-
-
-
- non
-
-
-
+
+
+ /etc/file
+ /etc/file2
+
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01base_file_include_content/00-base.xml b/tests/dictionaries/01base_file_include_content/00-base.xml
index 5f361ea7..6632ee17 100644
--- a/tests/dictionaries/01base_file_include_content/00-base.xml
+++ b/tests/dictionaries/01base_file_include_content/00-base.xml
@@ -1,21 +1,17 @@
-
-
-
- /etc/file
- /etc/file2
- /etc/dir/incfile
-
-
-
-
-
-
- non
-
-
-
+
+
+ /etc/file
+ /etc/file2
+ /etc/dir/incfile
+
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01base_file_include_name/00-base.xml b/tests/dictionaries/01base_file_include_name/00-base.xml
index ad7b470a..eff8650e 100644
--- a/tests/dictionaries/01base_file_include_name/00-base.xml
+++ b/tests/dictionaries/01base_file_include_name/00-base.xml
@@ -1,21 +1,17 @@
-
-
-
- /etc/file
- /etc/file2
- /etc/dir/incfile
-
-
-
-
-
-
- non
-
-
-
+
+
+ /etc/file
+ /etc/file2
+ /etc/dir/incfile
+
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01base_file_patch/00-base.xml b/tests/dictionaries/01base_file_patch/00-base.xml
index 5e1ac5f7..2bc1f68d 100644
--- a/tests/dictionaries/01base_file_patch/00-base.xml
+++ b/tests/dictionaries/01base_file_patch/00-base.xml
@@ -1,20 +1,16 @@
-
-
-
- /etc/file
- /etc/file2
-
-
-
-
-
-
- non
-
-
-
+
+
+ /etc/file
+ /etc/file2
+
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01base_file_utfchar/00-base.xml b/tests/dictionaries/01base_file_utfchar/00-base.xml
index 63bce895..5954ca3b 100644
--- a/tests/dictionaries/01base_file_utfchar/00-base.xml
+++ b/tests/dictionaries/01base_file_utfchar/00-base.xml
@@ -1,20 +1,16 @@
-
-
-
- /etc/systemd-makefs@dev-disk-by\x2dpartlabel
- /etc/systemd-makefs@dev-disk-by\x2dpartlabel2
-
-
-
-
-
-
- non
-
-
-
+
+
+ /etc/systemd-makefs@dev-disk-by\x2dpartlabel
+ /etc/systemd-makefs@dev-disk-by\x2dpartlabel2
+
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01base_float/00-base.xml b/tests/dictionaries/01base_float/00-base.xml
index 617d04c8..e775553e 100644
--- a/tests/dictionaries/01base_float/00-base.xml
+++ b/tests/dictionaries/01base_float/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- 0.527
-
-
- 0.527
-
-
-
+
+
+
+ 0.527
+
+
+ 0.527
+
+
+
-
diff --git a/tests/dictionaries/01base_help_quote/00-base.xml b/tests/dictionaries/01base_help_quote/00-base.xml
index a748eec1..43c3fdae 100644
--- a/tests/dictionaries/01base_help_quote/00-base.xml
+++ b/tests/dictionaries/01base_help_quote/00-base.xml
@@ -1,11 +1,9 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/01base_multi/00-base.xml b/tests/dictionaries/01base_multi/00-base.xml
index 8d78cb86..67ec9b79 100644
--- a/tests/dictionaries/01base_multi/00-base.xml
+++ b/tests/dictionaries/01base_multi/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01base_value_doublequote/00-base.xml b/tests/dictionaries/01base_value_doublequote/00-base.xml
index a4e1ad39..df1c54f3 100644
--- a/tests/dictionaries/01base_value_doublequote/00-base.xml
+++ b/tests/dictionaries/01base_value_doublequote/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- quote"
-
-
-
+
+
+
+ quote"
+
+
+
-
diff --git a/tests/dictionaries/01base_value_doublequote2/00-base.xml b/tests/dictionaries/01base_value_doublequote2/00-base.xml
index 64811b2a..8f2faae9 100644
--- a/tests/dictionaries/01base_value_doublequote2/00-base.xml
+++ b/tests/dictionaries/01base_value_doublequote2/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- quote'"
-
-
-
+
+
+
+ quote'"
+
+
+
-
diff --git a/tests/dictionaries/01base_value_doublequote3/00-base.xml b/tests/dictionaries/01base_value_doublequote3/00-base.xml
index 649311a8..97070d9f 100644
--- a/tests/dictionaries/01base_value_doublequote3/00-base.xml
+++ b/tests/dictionaries/01base_value_doublequote3/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- quote\"\'
-
-
-
+
+
+
+ quote\"\'
+
+
+
-
diff --git a/tests/dictionaries/01base_value_multi_doublequote/00-base.xml b/tests/dictionaries/01base_value_multi_doublequote/00-base.xml
index 89f83e69..6f8b0f9b 100644
--- a/tests/dictionaries/01base_value_multi_doublequote/00-base.xml
+++ b/tests/dictionaries/01base_value_multi_doublequote/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- quote"
-
-
-
+
+
+
+ quote"
+
+
+
-
diff --git a/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml b/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml
index 2a5957c4..cc6ed95e 100644
--- a/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml
+++ b/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- quote'"
-
-
-
+
+
+
+ quote'"
+
+
+
-
diff --git a/tests/dictionaries/01base_value_multi_quote/00-base.xml b/tests/dictionaries/01base_value_multi_quote/00-base.xml
index 99054901..a2a33d6d 100644
--- a/tests/dictionaries/01base_value_multi_quote/00-base.xml
+++ b/tests/dictionaries/01base_value_multi_quote/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- quote'
-
-
-
+
+
+
+ quote'
+
+
+
-
diff --git a/tests/dictionaries/01base_value_quote/00-base.xml b/tests/dictionaries/01base_value_quote/00-base.xml
index a30582af..1b8d7272 100644
--- a/tests/dictionaries/01base_value_quote/00-base.xml
+++ b/tests/dictionaries/01base_value_quote/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- quote'
-
-
-
+
+
+
+ quote'
+
+
+
-
diff --git a/tests/dictionaries/01base_var_name_same_family/00-base.xml b/tests/dictionaries/01base_var_name_same_family/00-base.xml
index 780a0417..7d8e62da 100644
--- a/tests/dictionaries/01base_var_name_same_family/00-base.xml
+++ b/tests/dictionaries/01base_var_name_same_family/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01boolean_no_mandatory/00-base.xml b/tests/dictionaries/01boolean_no_mandatory/00-base.xml
index 663cb3b9..f17d73cd 100644
--- a/tests/dictionaries/01boolean_no_mandatory/00-base.xml
+++ b/tests/dictionaries/01boolean_no_mandatory/00-base.xml
@@ -1,8 +1,6 @@
-
-
-
+
+
+
-
diff --git a/tests/dictionaries/01family_description/00-base.xml b/tests/dictionaries/01family_description/00-base.xml
index fb5dd3f0..d4389823 100644
--- a/tests/dictionaries/01family_description/00-base.xml
+++ b/tests/dictionaries/01family_description/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01fill_autofreeze/00-base.xml b/tests/dictionaries/01fill_autofreeze/00-base.xml
index ac1d1926..a1f99cde 100644
--- a/tests/dictionaries/01fill_autofreeze/00-base.xml
+++ b/tests/dictionaries/01fill_autofreeze/00-base.xml
@@ -1,23 +1,20 @@
-
-
- no
-
-
- no
-
-
- False
-
-
-
-
-
- my_var2
- my_var1
-
-
+
+
+ no
+
+
+ no
+
+
+ False
+
+
+
+
+ my_var2
+ my_var1
+
+
-
diff --git a/tests/dictionaries/01fill_autosave/00-base.xml b/tests/dictionaries/01fill_autosave/00-base.xml
index 823d4187..b5bbda90 100644
--- a/tests/dictionaries/01fill_autosave/00-base.xml
+++ b/tests/dictionaries/01fill_autosave/00-base.xml
@@ -1,23 +1,20 @@
-
-
-
-
- non
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif
-
-
+
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/01fill_base/00-base.xml b/tests/dictionaries/01fill_base/00-base.xml
index e2635058..a8241336 100644
--- a/tests/dictionaries/01fill_base/00-base.xml
+++ b/tests/dictionaries/01fill_base/00-base.xml
@@ -1,20 +1,17 @@
-
-
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif
-
-
+
+
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/01fill_mandatory/00-base.xml b/tests/dictionaries/01fill_mandatory/00-base.xml
index dbeacf98..ac83f20e 100644
--- a/tests/dictionaries/01fill_mandatory/00-base.xml
+++ b/tests/dictionaries/01fill_mandatory/00-base.xml
@@ -1,20 +1,17 @@
-
-
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif
-
-
+
+
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/01fill_number/00-base.xml b/tests/dictionaries/01fill_number/00-base.xml
index 60d6ed6c..ee2e4094 100644
--- a/tests/dictionaries/01fill_number/00-base.xml
+++ b/tests/dictionaries/01fill_number/00-base.xml
@@ -1,20 +1,17 @@
-
-
-
-
- non
-
-
-
-
-
-
- 3
- mode_conteneur_actif
-
-
+
+
+
+
+ non
+
+
+
+
+
+ 3
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/01fill_only_optional/00-base.xml b/tests/dictionaries/01fill_only_optional/00-base.xml
index 5e6dc7bc..10fef306 100644
--- a/tests/dictionaries/01fill_only_optional/00-base.xml
+++ b/tests/dictionaries/01fill_only_optional/00-base.xml
@@ -1,22 +1,19 @@
-
-
-
- non
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif4
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif4
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/01fill_optional/00-base.xml b/tests/dictionaries/01fill_optional/00-base.xml
index 3fe145b6..6382ce45 100644
--- a/tests/dictionaries/01fill_optional/00-base.xml
+++ b/tests/dictionaries/01fill_optional/00-base.xml
@@ -1,24 +1,21 @@
-
-
-
- non
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif4
- mode_conteneur_actif1
- mode_conteneur_actif3
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif4
+ mode_conteneur_actif1
+ mode_conteneur_actif3
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/01fill_quote/00-base.xml b/tests/dictionaries/01fill_quote/00-base.xml
index ccf03093..155af270 100644
--- a/tests/dictionaries/01fill_quote/00-base.xml
+++ b/tests/dictionaries/01fill_quote/00-base.xml
@@ -1,32 +1,29 @@
-
-
-
-
-
-
-
-
-
-
-
- quote'
- mode_conteneur_actif
-
-
- quote"
- mode_conteneur_actif1
-
-
- quote"'
- mode_conteneur_actif2
-
-
- quote"\'
- mode_conteneur_actif3
-
-
+
+
+
+
+
+
+
+
+
+
+ quote'
+ mode_conteneur_actif
+
+
+ quote"
+ mode_conteneur_actif1
+
+
+ quote"'
+ mode_conteneur_actif2
+
+
+ quote"\'
+ mode_conteneur_actif3
+
+
-
diff --git a/tests/dictionaries/01fill_target_optional/00-base.xml b/tests/dictionaries/01fill_target_optional/00-base.xml
index 1003d6d5..d2421162 100644
--- a/tests/dictionaries/01fill_target_optional/00-base.xml
+++ b/tests/dictionaries/01fill_target_optional/00-base.xml
@@ -1,19 +1,16 @@
-
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml b/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
index c8e9e8be..2626d61c 100644
--- a/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
+++ b/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
@@ -1,23 +1,21 @@
-
-
- False
-
-
- no
-
-
-
-
- yes
- my_var
-
-
- True
- my_var
-
-
+
+
+ False
+
+
+ no
+
+
+
+
+ yes
+ my_var
+
+
+ True
+ my_var
+
+
-
diff --git a/tests/dictionaries/01test/00-base.xml b/tests/dictionaries/01test/00-base.xml
index 4499bdd4..a3d9a16c 100644
--- a/tests/dictionaries/01test/00-base.xml
+++ b/tests/dictionaries/01test/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01test_multi/00-base.xml b/tests/dictionaries/01test_multi/00-base.xml
index 976d6fa6..3fbe4b85 100644
--- a/tests/dictionaries/01test_multi/00-base.xml
+++ b/tests/dictionaries/01test_multi/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01test_multi_none/00-base.xml b/tests/dictionaries/01test_multi_none/00-base.xml
index d703f1df..eef0cf6e 100644
--- a/tests/dictionaries/01test_multi_none/00-base.xml
+++ b/tests/dictionaries/01test_multi_none/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01test_redefine/00-base.xml b/tests/dictionaries/01test_redefine/00-base.xml
index 4499bdd4..a3d9a16c 100644
--- a/tests/dictionaries/01test_redefine/00-base.xml
+++ b/tests/dictionaries/01test_redefine/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01test_redefine/10-base.xml b/tests/dictionaries/01test_redefine/10-base.xml
index 7910620e..131db74e 100644
--- a/tests/dictionaries/01test_redefine/10-base.xml
+++ b/tests/dictionaries/01test_redefine/10-base.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
diff --git a/tests/dictionaries/01test_redefine_base/00-base.xml b/tests/dictionaries/01test_redefine_base/00-base.xml
index 9047130c..51e932bf 100644
--- a/tests/dictionaries/01test_redefine_base/00-base.xml
+++ b/tests/dictionaries/01test_redefine_base/00-base.xml
@@ -1,8 +1,6 @@
-
-
-
+
+
+
-
diff --git a/tests/dictionaries/01test_redefine_base/10-base.xml b/tests/dictionaries/01test_redefine_base/10-base.xml
index a99cbf1f..ca929f57 100644
--- a/tests/dictionaries/01test_redefine_base/10-base.xml
+++ b/tests/dictionaries/01test_redefine_base/10-base.xml
@@ -1,8 +1,6 @@
-
-
-
+
+
+
-
diff --git a/tests/dictionaries/01test_redefine_remove/00-base.xml b/tests/dictionaries/01test_redefine_remove/00-base.xml
index 4499bdd4..a3d9a16c 100644
--- a/tests/dictionaries/01test_redefine_remove/00-base.xml
+++ b/tests/dictionaries/01test_redefine_remove/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/01test_redefine_remove/10-base.xml b/tests/dictionaries/01test_redefine_remove/10-base.xml
index 5f7099f3..b1c12995 100644
--- a/tests/dictionaries/01test_redefine_remove/10-base.xml
+++ b/tests/dictionaries/01test_redefine_remove/10-base.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
diff --git a/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml b/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml
index 23223e08..6f811c34 100644
--- a/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml
+++ b/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml
@@ -1,24 +1,22 @@
-
-
-
-
- non
-
-
-
-
-
-
- oui
- autosavevar
-
-
- oui
- autosavevar
-
-
+
+
+
+
+ non
+
+
+
+
+
+
+ oui
+ autosavevar
+
+
+ oui
+ autosavevar
+
+
-
diff --git a/tests/dictionaries/02fill_multi_calc_val/00-base.xml b/tests/dictionaries/02fill_multi_calc_val/00-base.xml
index f12a5cfe..66876828 100644
--- a/tests/dictionaries/02fill_multi_calc_val/00-base.xml
+++ b/tests/dictionaries/02fill_multi_calc_val/00-base.xml
@@ -1,19 +1,16 @@
-
-
- no
-
-
-
-
-
-
- var1
- True
- var2
-
-
+
+
+ no
+
+
+
+
+
+ var1
+ True
+ var2
+
+
-
diff --git a/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml b/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml
index ac1e413d..f260758a 100644
--- a/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml
+++ b/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml
@@ -1,20 +1,17 @@
-
-
- no
- yes
- maybe
-
-
-
-
-
-
- var1
- var2
-
-
+
+
+ no
+ yes
+ maybe
+
+
+
+
+
+ var1
+ var2
+
+
-
diff --git a/tests/dictionaries/10autosave_hidden/00-base.xml b/tests/dictionaries/10autosave_hidden/00-base.xml
index 1785ae34..f3248ec3 100644
--- a/tests/dictionaries/10autosave_hidden/00-base.xml
+++ b/tests/dictionaries/10autosave_hidden/00-base.xml
@@ -1,21 +1,18 @@
-
-
-
-
- non
-
-
-
-
-
-
-
- oui
- autosavevar
-
-
+
+
+
+
+ non
+
+
+
+
+
+
+ oui
+ autosavevar
+
+
-
diff --git a/tests/dictionaries/10check_base/00-base.xml b/tests/dictionaries/10check_base/00-base.xml
index af218790..ca0c8803 100644
--- a/tests/dictionaries/10check_base/00-base.xml
+++ b/tests/dictionaries/10check_base/00-base.xml
@@ -1,20 +1,18 @@
-
-
-
- b
-
-
-
-
-
-
- 0
- 100
- int
-
-
+
+
+
+ b
+
+
+
+
+
+
+ 0
+ 100
+ int
+
+
-
diff --git a/tests/dictionaries/10check_base_target_optional/00-base.xml b/tests/dictionaries/10check_base_target_optional/00-base.xml
index 5bd88212..ff050721 100644
--- a/tests/dictionaries/10check_base_target_optional/00-base.xml
+++ b/tests/dictionaries/10check_base_target_optional/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
-
-
- 0
- 100
- int
-
-
+
+
+
+
+
+ 0
+ 100
+ int
+
+
-
diff --git a/tests/dictionaries/10check_no_param/00-base.xml b/tests/dictionaries/10check_no_param/00-base.xml
index 8042b729..dbc7ff3d 100644
--- a/tests/dictionaries/10check_no_param/00-base.xml
+++ b/tests/dictionaries/10check_no_param/00-base.xml
@@ -1,19 +1,16 @@
-
-
-
- b
-
-
-
-
-
-
-
- int
-
-
+
+
+
+ b
+
+
+
+
+
+
+ int
+
+
-
diff --git a/tests/dictionaries/10check_option/00-base.xml b/tests/dictionaries/10check_option/00-base.xml
index a48d9e40..90decd5f 100644
--- a/tests/dictionaries/10check_option/00-base.xml
+++ b/tests/dictionaries/10check_option/00-base.xml
@@ -1,24 +1,21 @@
-
-
-
- b
-
-
- 100
-
-
-
-
-
-
-
- 0
- int2
- int
-
-
+
+
+
+ b
+
+
+ 100
+
+
+
+
+
+
+ 0
+ int2
+ int
+
+
-
diff --git a/tests/dictionaries/10check_optional/00-base.xml b/tests/dictionaries/10check_optional/00-base.xml
index 230ff007..2492a5b8 100644
--- a/tests/dictionaries/10check_optional/00-base.xml
+++ b/tests/dictionaries/10check_optional/00-base.xml
@@ -1,25 +1,22 @@
-
-
-
- b
-
-
-
-
-
-
-
-
- int2
- int
-
-
- int3
- int
-
-
+
+
+
+ b
+
+
+
+
+
+
+
+ int2
+ int
+
+
+ int3
+ int
+
+
-
diff --git a/tests/dictionaries/10check_valid_differ/00-base.xml b/tests/dictionaries/10check_valid_differ/00-base.xml
index 263d8457..66c5cdb2 100644
--- a/tests/dictionaries/10check_valid_differ/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ/00-base.xml
@@ -1,22 +1,19 @@
-
-
-
- oui
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif
-
-
+
+
+
+ oui
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/10check_valid_differ_add/00-base.xml b/tests/dictionaries/10check_valid_differ_add/00-base.xml
index e8eaac33..8f7d0d62 100644
--- a/tests/dictionaries/10check_valid_differ_add/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ_add/00-base.xml
@@ -1,28 +1,25 @@
-
-
-
- oui
-
-
- non
-
-
- non
-
-
- oui
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif3
-
-
+
+
+
+ oui
+
+
+ non
+
+
+ non
+
+
+ oui
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif3
+
+
-
diff --git a/tests/dictionaries/10check_valid_differ_add/01-base.xml b/tests/dictionaries/10check_valid_differ_add/01-base.xml
index 514abfab..cb008e7c 100644
--- a/tests/dictionaries/10check_valid_differ_add/01-base.xml
+++ b/tests/dictionaries/10check_valid_differ_add/01-base.xml
@@ -1,21 +1,18 @@
-
-
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif3
-
-
- mode_conteneur_actif2
- mode_conteneur_actif3
-
-
+
+
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif3
+
+
+ mode_conteneur_actif2
+ mode_conteneur_actif3
+
+
-
diff --git a/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml b/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
index e8eaac33..8f7d0d62 100644
--- a/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
@@ -1,28 +1,25 @@
-
-
-
- oui
-
-
- non
-
-
- non
-
-
- oui
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif3
-
-
+
+
+
+ oui
+
+
+ non
+
+
+ non
+
+
+ oui
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif3
+
+
-
diff --git a/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml b/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
index 589d86f5..f60d9d42 100644
--- a/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
+++ b/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
@@ -1,23 +1,20 @@
-
-
-
- oui
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif3
-
-
- mode_conteneur_actif2
- mode_conteneur_actif3
-
-
+
+
+
+ oui
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif3
+
+
+ mode_conteneur_actif2
+ mode_conteneur_actif3
+
+
-
diff --git a/tests/dictionaries/10check_valid_in_network/00-base.xml b/tests/dictionaries/10check_valid_in_network/00-base.xml
index 35bce26e..5b807fc8 100644
--- a/tests/dictionaries/10check_valid_in_network/00-base.xml
+++ b/tests/dictionaries/10check_valid_in_network/00-base.xml
@@ -1,23 +1,20 @@
-
-
-
- oui
-
-
-
-
-
-
-
-
-
- adresse_ip_eth0
- adresse_netmask_eth0
- adresse_ip
-
-
+
+
+
+ oui
+
+
+
+
+
+
+
+
+ adresse_ip_eth0
+ adresse_netmask_eth0
+ adresse_ip
+
+
-
diff --git a/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml b/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
index 5e6e2fcc..b46fc733 100644
--- a/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
+++ b/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
@@ -1,21 +1,18 @@
-
-
-
- oui
-
-
-
-
-
-
-
-
- adresse_ip_eth0
- adresse_ip
-
-
+
+
+
+ oui
+
+
+
+
+
+
+
+ adresse_ip_eth0
+ adresse_ip
+
+
-
diff --git a/tests/dictionaries/10check_valid_ipnetmask/00-base.xml b/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
index 0c0a913c..62e76c06 100644
--- a/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
+++ b/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
@@ -1,21 +1,18 @@
-
-
-
- oui
-
-
-
-
-
-
-
-
- adresse_ip_eth0
- adresse_netmask_eth0
-
-
+
+
+
+ oui
+
+
+
+
+
+
+
+ adresse_ip_eth0
+ adresse_netmask_eth0
+
+
-
diff --git a/tests/dictionaries/10fill_information/00-base.xml b/tests/dictionaries/10fill_information/00-base.xml
index 1b46fd3b..a8bdb066 100644
--- a/tests/dictionaries/10fill_information/00-base.xml
+++ b/tests/dictionaries/10fill_information/00-base.xml
@@ -1,17 +1,14 @@
-
-
-
-
-
-
-
-
- test_information
- mode_conteneur_actif
-
-
+
+
+
+
+
+
+
+ test_information
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml
index 3ae689fd..96e87d8f 100644
--- a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml
+++ b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml
@@ -1,30 +1,26 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
- 1
- 2
- 3
- enumvar
-
-
- 4
- test_variable
-
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+ 1
+ 2
+ 3
+ enumvar
+
+
+ 4
+ test_variable
+
+
-
diff --git a/tests/dictionaries/10leadership_append/00-base.xml b/tests/dictionaries/10leadership_append/00-base.xml
index a1c29b99..2b7726a5 100644
--- a/tests/dictionaries/10leadership_append/00-base.xml
+++ b/tests/dictionaries/10leadership_append/00-base.xml
@@ -1,30 +1,29 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10leadership_append/01-base.xml b/tests/dictionaries/10leadership_append/01-base.xml
index 84510a9a..b271772b 100644
--- a/tests/dictionaries/10leadership_append/01-base.xml
+++ b/tests/dictionaries/10leadership_append/01-base.xml
@@ -1,14 +1,13 @@
-
-
-
-
-
-
-
-
- follower3
-
-
+
+
+
+
+
+
+
+ follower3
+
+
diff --git a/tests/dictionaries/10leadership_append_hidden/00-base.xml b/tests/dictionaries/10leadership_append_hidden/00-base.xml
index ad4f4862..605a5b15 100644
--- a/tests/dictionaries/10leadership_append_hidden/00-base.xml
+++ b/tests/dictionaries/10leadership_append_hidden/00-base.xml
@@ -1,30 +1,29 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10leadership_append_hidden/01-base.xml b/tests/dictionaries/10leadership_append_hidden/01-base.xml
index 84510a9a..b271772b 100644
--- a/tests/dictionaries/10leadership_append_hidden/01-base.xml
+++ b/tests/dictionaries/10leadership_append_hidden/01-base.xml
@@ -1,14 +1,13 @@
-
-
-
-
-
-
-
-
- follower3
-
-
+
+
+
+
+
+
+
+ follower3
+
+
diff --git a/tests/dictionaries/10leadership_append_name/00-base.xml b/tests/dictionaries/10leadership_append_name/00-base.xml
index 94969b2d..8dc3f441 100644
--- a/tests/dictionaries/10leadership_append_name/00-base.xml
+++ b/tests/dictionaries/10leadership_append_name/00-base.xml
@@ -1,30 +1,29 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10leadership_append_name/01-base.xml b/tests/dictionaries/10leadership_append_name/01-base.xml
index 84510a9a..b271772b 100644
--- a/tests/dictionaries/10leadership_append_name/01-base.xml
+++ b/tests/dictionaries/10leadership_append_name/01-base.xml
@@ -1,14 +1,13 @@
-
-
-
-
-
-
-
-
- follower3
-
-
+
+
+
+
+
+
+
+ follower3
+
+
diff --git a/tests/dictionaries/10leadership_auto/00-base.xml b/tests/dictionaries/10leadership_auto/00-base.xml
index cf529b26..abdc42df 100644
--- a/tests/dictionaries/10leadership_auto/00-base.xml
+++ b/tests/dictionaries/10leadership_auto/00-base.xml
@@ -1,34 +1,33 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- leader
- follower3
-
-
- follower1
- follower2
- follower3
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ leader
+ follower3
+
+
+ follower1
+ follower2
+ follower3
+
+
diff --git a/tests/dictionaries/10leadership_auto_index/00-base.xml b/tests/dictionaries/10leadership_auto_index/00-base.xml
index ef54c49b..cd8979cb 100644
--- a/tests/dictionaries/10leadership_auto_index/00-base.xml
+++ b/tests/dictionaries/10leadership_auto_index/00-base.xml
@@ -1,21 +1,20 @@
-
-
- a
- b
- c
-
-
-
-
-
-
-
- follower1
-
-
- follower1
-
-
+
+
+ a
+ b
+ c
+
+
+
+
+
+
+ follower1
+
+
+ follower1
+
+
diff --git a/tests/dictionaries/10leadership_autoleader/00-base.xml b/tests/dictionaries/10leadership_autoleader/00-base.xml
index c7d93e40..08f97723 100644
--- a/tests/dictionaries/10leadership_autoleader/00-base.xml
+++ b/tests/dictionaries/10leadership_autoleader/00-base.xml
@@ -1,28 +1,27 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- leader
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ leader
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10leadership_autoleader_expert/00-base.xml b/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
index 9492e422..231c29f3 100644
--- a/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
+++ b/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
@@ -1,26 +1,25 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- leader
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ leader
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10leadership_autosaveexpert/00-base.xml b/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
index aed0bc94..fab4877d 100644
--- a/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
+++ b/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
@@ -1,28 +1,27 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10leadership_leader_hidden/00-base.xml b/tests/dictionaries/10leadership_leader_hidden/00-base.xml
index 2833833f..baa6de82 100644
--- a/tests/dictionaries/10leadership_leader_hidden/00-base.xml
+++ b/tests/dictionaries/10leadership_leader_hidden/00-base.xml
@@ -1,26 +1,25 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- leader
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ leader
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml b/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
index 1e1913b8..0b344865 100644
--- a/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
+++ b/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
@@ -1,26 +1,25 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- follower1
- follower2
-
-
- non
- leader
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ follower1
+ follower2
+
+
+ non
+ leader
+
+
diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml b/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml
index e969f76f..9a5818a5 100644
--- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml
+++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml
@@ -1,26 +1,25 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- follower1
- follower2
-
-
- non
- leader
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ follower1
+ follower2
+
+
+ non
+ leader
+
+
diff --git a/tests/dictionaries/10leadership_leadermandatory/00-base.xml b/tests/dictionaries/10leadership_leadermandatory/00-base.xml
index 6cca43c9..b8d1b813 100644
--- a/tests/dictionaries/10leadership_leadermandatory/00-base.xml
+++ b/tests/dictionaries/10leadership_leadermandatory/00-base.xml
@@ -1,28 +1,27 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10leadership_mandatory/00-base.xml b/tests/dictionaries/10leadership_mandatory/00-base.xml
index b6c3b8ef..07d8f068 100644
--- a/tests/dictionaries/10leadership_mandatory/00-base.xml
+++ b/tests/dictionaries/10leadership_mandatory/00-base.xml
@@ -1,28 +1,27 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml b/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
index 8af3a1bc..6865c331 100644
--- a/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
+++ b/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
@@ -1,20 +1,17 @@
-
-
-
- oui
-
-
-
-
-
-
-
-
- nut_monitor_host
-
-
+
+
+
+ oui
+
+
+
+
+
+
+
+ nut_monitor_host
+
+
-
diff --git a/tests/dictionaries/10leadership_multi/00-base.xml b/tests/dictionaries/10leadership_multi/00-base.xml
index b24f297c..8bb071cf 100644
--- a/tests/dictionaries/10leadership_multi/00-base.xml
+++ b/tests/dictionaries/10leadership_multi/00-base.xml
@@ -1,37 +1,36 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
- follower11
- follower21
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
+ follower11
+ follower21
+
+
diff --git a/tests/dictionaries/10load_disabled_if_in/00-base.xml b/tests/dictionaries/10load_disabled_if_in/00-base.xml
index 08ed72c2..b9d71687 100644
--- a/tests/dictionaries/10load_disabled_if_in/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml b/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml
index 306d2409..4488de32 100644
--- a/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml
@@ -1,25 +1,22 @@
-
-
-
- no
-
-
-
-
-
-
-
-
- no
- variable1
-
-
- variable1
- variable2
-
-
+
+
+
+ no
+
+
+
+
+
+
+
+ no
+ variable1
+
+
+ variable1
+ variable2
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml b/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml
index d1201d36..51927ae8 100644
--- a/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml
@@ -1,15 +1,12 @@
-
-
-
-
-
-
- True
- unknown
-
-
+
+
+
+
+
+ True
+ unknown
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
index 6ed6397a..e2481205 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
@@ -1,33 +1,30 @@
-
-
- /tmp/file1
-
-
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- maybe
- mode_conteneur_actif
- mode_conteneur_actif2
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ maybe
+ mode_conteneur_actif
+ mode_conteneur_actif2
+ afilllist
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
index a395156f..484e1917 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
@@ -1,38 +1,35 @@
-
-
- /tmp/file1
-
-
-
-
-
- no
-
-
- no
-
-
- no
-
-
-
-
-
-
- yes
- maybe
- test_variable
- afilllist
-
-
- yes
- maybe
- test_variable
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+ no
+
+
+ no
+
+
+ no
+
+
+
+
+
+ yes
+ maybe
+ test_variable
+ afilllist
+
+
+ yes
+ maybe
+ test_variable
+ afilllist
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
index ae7b9888..6162a26e 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
@@ -1,38 +1,35 @@
-
-
- /tmp/file1
-
-
-
-
-
- no
-
-
- no
-
-
- no
-
-
-
-
-
-
- yes
- maybe
- test_variable
- afilllist
-
-
- yes
- maybe
- test_variable
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+ no
+
+
+ no
+
+
+ no
+
+
+
+
+
+ yes
+ maybe
+ test_variable
+ afilllist
+
+
+ yes
+ maybe
+ test_variable
+ afilllist
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
index 13d996be..efd763d3 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
@@ -1,38 +1,35 @@
-
-
- /tmp/file1
-
-
-
-
-
- yes
-
-
- no
-
-
- no
-
-
-
-
-
-
- yes
- maybe
- test_variable
- afilllist
-
-
- yes
- maybe
- test_variable
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+ yes
+
+
+ no
+
+
+ no
+
+
+
+
+
+ yes
+ maybe
+ test_variable
+ afilllist
+
+
+ yes
+ maybe
+ test_variable
+ afilllist
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
index e84d34d9..927f5011 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
@@ -1,38 +1,35 @@
-
-
- /tmp/file1
-
-
-
-
-
- yes
-
-
- yes
-
-
- no
-
-
-
-
-
-
- yes
- maybe
- test_variable
- afilllist
-
-
- yes
- maybe
- test_variable
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+ yes
+
+
+ yes
+
+
+ no
+
+
+
+
+
+ yes
+ maybe
+ test_variable
+ afilllist
+
+
+ yes
+ maybe
+ test_variable
+ afilllist
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
index ccd8dc9d..260193cd 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
@@ -1,38 +1,35 @@
-
-
- /tmp/file1
-
-
-
-
-
- no
-
-
- yes
-
-
- no
-
-
-
-
-
-
- yes
- maybe
- test_variable
- afilllist
-
-
- yes
- maybe
- test_variable
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+ no
+
+
+ yes
+
+
+ no
+
+
+
+
+
+ yes
+ maybe
+ test_variable
+ afilllist
+
+
+ yes
+ maybe
+ test_variable
+ afilllist
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
index 66ba77d2..08b06a1a 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
@@ -1,33 +1,30 @@
-
-
- /tmp/file1
-
-
-
-
-
- oui
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- maybe
- mode_conteneur_actif
- mode_conteneur_actif2
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+ oui
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ maybe
+ mode_conteneur_actif
+ mode_conteneur_actif2
+ afilllist
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_none/00-base.xml b/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
index f173c854..800f3a57 100644
--- a/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
-
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml b/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml
index 1eb5e706..62b61a96 100644
--- a/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml
@@ -1,27 +1,24 @@
-
-
- no
-
-
- no
-
-
- no
-
-
-
-
-
- no
- my_var2
-
-
- no
- my_var3
-
-
+
+
+ no
+
+
+ no
+
+
+ no
+
+
+
+
+ no
+ my_var2
+
+
+ no
+ my_var3
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml b/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml
index 91654996..72bcbb58 100644
--- a/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml
@@ -1,34 +1,28 @@
-
-
+
-
-
-
-
- tous
-
-
- tous
-
-
- non
-
-
-
-
-
-
- tous
- authentifié
- aucun
- condition
-
-
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
-
+
+
+
+ tous
+
+
+ tous
+
+
+ non
+
+
+
+
+
+ tous
+ authentifié
+ aucun
+ condition
+
+
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml b/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml
index 6c6468ab..8ffd2b0f 100644
--- a/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml
@@ -1,34 +1,28 @@
-
-
+
-
-
-
-
- tous
-
-
- aucun
-
-
- non
-
-
-
-
-
-
- tous
- authentifié
- aucun
- condition
-
-
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
-
+
+
+
+ tous
+
+
+ aucun
+
+
+ non
+
+
+
+
+
+ tous
+ authentifié
+ aucun
+ condition
+
+
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
index 481a4738..71ba8102 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
@@ -1,27 +1,25 @@
-
-
- /tmp/file1
-
-
-
-
-
- no
-
-
- no
-
-
-
-
-
- no
- disable_variable
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+ no
+
+
+ no
+
+
+
+
+
+ no
+ disable_variable
+ afilllist
+
+
-
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
index ea27633e..9946d579 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
@@ -1,31 +1,28 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
- afilllist
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+ afilllist
+
+
+ non
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/10load_disabledifin_fallback/00-base.xml b/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
index 2c0b1d3e..8a051838 100644
--- a/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
@@ -1,30 +1,27 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
+ non
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml b/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
index 9cf6a79f..16602a40 100644
--- a/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
@@ -1,30 +1,27 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
+ non
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml b/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
index a2c40282..c94d3949 100644
--- a/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_emptyvalue/00-base.xml b/tests/dictionaries/10load_emptyvalue/00-base.xml
index 121dd396..8e7d9ed6 100644
--- a/tests/dictionaries/10load_emptyvalue/00-base.xml
+++ b/tests/dictionaries/10load_emptyvalue/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/10load_frozenifin/00-base.xml b/tests/dictionaries/10load_frozenifin/00-base.xml
index 5d9bde1a..7e7959f6 100644
--- a/tests/dictionaries/10load_frozenifin/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_frozenifin_auto/00-base.xml b/tests/dictionaries/10load_frozenifin_auto/00-base.xml
index 8b18838a..1d11682a 100644
--- a/tests/dictionaries/10load_frozenifin_auto/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_auto/00-base.xml
@@ -1,30 +1,27 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
+ non
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml b/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
index e41ba0a4..8a2d5d83 100644
--- a/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
@@ -1,33 +1,30 @@
-
-
-
- tous
-
-
- non
-
-
- non
-
-
-
-
-
-
- tous
- authentifié
- aucun
- condition
-
-
- tous
- authentifié
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
+
+
+
+ tous
+
+
+ non
+
+
+ non
+
+
+
+
+
+ tous
+ authentifié
+ aucun
+ condition
+
+
+ tous
+ authentifié
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_frozenifin_noexist/00-base.xml b/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
index 28f16410..83cac4d6 100644
--- a/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
@@ -1,36 +1,30 @@
-
-
+
-
-
-
-
- tous
-
-
- non
-
-
- non
-
-
-
-
-
-
- tous
- authentifié
- aucun
- condition
-
-
- oui
- non
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
-
+
+
+
+ tous
+
+
+ non
+
+
+ non
+
+
+
+
+
+ tous
+ authentifié
+ aucun
+ condition
+
+
+ oui
+ non
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_frozenifin_variable/00-base.xml b/tests/dictionaries/10load_frozenifin_variable/00-base.xml
index fd053cf3..907f6450 100644
--- a/tests/dictionaries/10load_frozenifin_variable/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_variable/00-base.xml
@@ -1,34 +1,28 @@
-
-
+
-
-
-
-
- tous
-
-
- tous
-
-
- non
-
-
-
-
-
-
- tous
- authentifié
- aucun
- condition
-
-
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
-
+
+
+
+ tous
+
+
+ tous
+
+
+ non
+
+
+
+
+
+ tous
+ authentifié
+ aucun
+ condition
+
+
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_frozenifnotin/00-base.xml b/tests/dictionaries/10load_frozenifnotin/00-base.xml
index 1758e16b..cbd3f7f2 100644
--- a/tests/dictionaries/10load_frozenifnotin/00-base.xml
+++ b/tests/dictionaries/10load_frozenifnotin/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml b/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
index 8fa44115..931722a4 100644
--- a/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
@@ -1,36 +1,30 @@
-
-
+
-
-
-
-
- tous
-
-
- non
-
-
- non
-
-
-
-
-
-
- tous
- authentifié
- aucun
- condition
-
-
- oui
- non
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
-
+
+
+
+ tous
+
+
+ non
+
+
+ non
+
+
+
+
+
+ tous
+ authentifié
+ aucun
+ condition
+
+
+ oui
+ non
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml b/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml
index 77f84247..d1cdaf06 100644
--- a/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml
+++ b/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml
@@ -1,29 +1,26 @@
-
-
-
- non
-
-
- non
-
-
- non
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
- general2
-
-
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+ general2
+
+
-
diff --git a/tests/dictionaries/10load_hidden_if_family/00-base.xml b/tests/dictionaries/10load_hidden_if_family/00-base.xml
index 85ea05f1..8442dc85 100644
--- a/tests/dictionaries/10load_hidden_if_family/00-base.xml
+++ b/tests/dictionaries/10load_hidden_if_family/00-base.xml
@@ -1,32 +1,29 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
- general2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+ general2
+
+
-
diff --git a/tests/dictionaries/10load_leadership/00-base.xml b/tests/dictionaries/10load_leadership/00-base.xml
index a1c29b99..2b7726a5 100644
--- a/tests/dictionaries/10load_leadership/00-base.xml
+++ b/tests/dictionaries/10load_leadership/00-base.xml
@@ -1,30 +1,29 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10load_leadership_default_multi/00-base.xml b/tests/dictionaries/10load_leadership_default_multi/00-base.xml
index de492d17..f8403754 100644
--- a/tests/dictionaries/10load_leadership_default_multi/00-base.xml
+++ b/tests/dictionaries/10load_leadership_default_multi/00-base.xml
@@ -1,22 +1,21 @@
-
-
-
- non
-
-
-
- value
-
-
-
-
-
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+ value
+
+
+
+
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10load_leadership_default_submulti/00-base.xml b/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
index 81d84182..13ff6f10 100644
--- a/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
+++ b/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
@@ -1,27 +1,26 @@
-
-
-
- non
-
-
- leader
-
-
- value
-
-
- value1
- value2
-
-
-
-
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+ leader
+
+
+ value
+
+
+ value1
+ value2
+
+
+
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml b/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
index e2fb8c4f..921e2ad6 100644
--- a/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
+++ b/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
@@ -1,22 +1,21 @@
-
-
-
- non
-
-
- value
-
-
-
-
-
-
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+ value
+
+
+
+
+
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10load_leadership_description/00-base.xml b/tests/dictionaries/10load_leadership_description/00-base.xml
index f27ad339..87b47617 100644
--- a/tests/dictionaries/10load_leadership_description/00-base.xml
+++ b/tests/dictionaries/10load_leadership_description/00-base.xml
@@ -1,29 +1,29 @@
-
+
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10load_leadership_name/00-base.xml b/tests/dictionaries/10load_leadership_name/00-base.xml
index 9d75b178..2af2d0d4 100644
--- a/tests/dictionaries/10load_leadership_name/00-base.xml
+++ b/tests/dictionaries/10load_leadership_name/00-base.xml
@@ -1,29 +1,29 @@
-
+
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10load_leadership_submulti/00-base.xml b/tests/dictionaries/10load_leadership_submulti/00-base.xml
index 35dca241..caa3dbee 100644
--- a/tests/dictionaries/10load_leadership_submulti/00-base.xml
+++ b/tests/dictionaries/10load_leadership_submulti/00-base.xml
@@ -1,30 +1,29 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/10load_mandatoryifin/00-base.xml b/tests/dictionaries/10load_mandatoryifin/00-base.xml
index 1ba37c14..810f14f7 100644
--- a/tests/dictionaries/10load_mandatoryifin/00-base.xml
+++ b/tests/dictionaries/10load_mandatoryifin/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml b/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
index 36588ca9..c1bc13ee 100644
--- a/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
@@ -1,36 +1,30 @@
-
-
+
-
-
-
-
- tous
-
-
- non
-
-
- non
-
-
-
-
-
-
- tous
- authentifié
- aucun
- condition
-
-
- oui
- non
- mode_conteneur_actif
- mode_conteneur_actif2
-
-
-
+
+
+
+ tous
+
+
+ non
+
+
+ non
+
+
+
+
+
+ tous
+ authentifié
+ aucun
+ condition
+
+
+ oui
+ non
+ mode_conteneur_actif
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/10load_multivalue/00-base.xml b/tests/dictionaries/10load_multivalue/00-base.xml
index 938a8ac9..298d9292 100644
--- a/tests/dictionaries/10load_multivalue/00-base.xml
+++ b/tests/dictionaries/10load_multivalue/00-base.xml
@@ -1,13 +1,11 @@
-
-
-
- non
- oui
-
-
-
+
+
+
+ non
+ oui
+
+
+
-
diff --git a/tests/dictionaries/10valid_enum_accent/00-base.xml b/tests/dictionaries/10valid_enum_accent/00-base.xml
index f9982b36..1731282d 100644
--- a/tests/dictionaries/10valid_enum_accent/00-base.xml
+++ b/tests/dictionaries/10valid_enum_accent/00-base.xml
@@ -1,27 +1,24 @@
-
-
-
- non
-
-
-
-
- c
-
-
-
-
-
-
- a
- b
- c
- é
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+ c
+
+
+
+
+
+ a
+ b
+ c
+ é
+ enumvar
+
+
-
diff --git a/tests/dictionaries/10valid_enum_base/00-base.xml b/tests/dictionaries/10valid_enum_base/00-base.xml
index 307b21ce..070b9df4 100644
--- a/tests/dictionaries/10valid_enum_base/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
-
-
- c
-
-
-
-
-
-
- a
- b
- c
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+ c
+
+
+
+
+
+ a
+ b
+ c
+ enumvar
+
+
-
diff --git a/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml b/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml
index 275d9f18..2727a946 100644
--- a/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
-
-
- c
-
-
-
-
-
-
- a
- b
- c
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+ c
+
+
+
+
+
+ a
+ b
+ c
+ enumvar
+
+
-
diff --git a/tests/dictionaries/10valid_enum_base_redefine/00-base.xml b/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
index 45f6e437..a38f6a0d 100644
--- a/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
@@ -1,35 +1,32 @@
-
-
-
- non
-
-
-
-
- c
-
-
- c
-
-
-
-
-
-
- a
- b
- c
- enumvar
-
-
- a
- b
- c
- enumvar2
-
-
+
+
+
+ non
+
+
+
+
+ c
+
+
+ c
+
+
+
+
+
+ a
+ b
+ c
+ enumvar
+
+
+ a
+ b
+ c
+ enumvar2
+
+
-
diff --git a/tests/dictionaries/10valid_enum_base_redefine/01-base.xml b/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
index 9d572c95..c542d3c6 100644
--- a/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
+++ b/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
@@ -1,20 +1,17 @@
-
-
-
- c
-
-
-
-
-
-
- a
- c
- enumvar
-
-
+
+
+
+ c
+
+
+
+
+
+ a
+ c
+ enumvar
+
+
-
diff --git a/tests/dictionaries/10valid_enum_leader/00-base.xml b/tests/dictionaries/10valid_enum_leader/00-base.xml
index c90911fe..d0b5a369 100644
--- a/tests/dictionaries/10valid_enum_leader/00-base.xml
+++ b/tests/dictionaries/10valid_enum_leader/00-base.xml
@@ -1,28 +1,25 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
- a
- b
- c
- follower1
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+ a
+ b
+ c
+ follower1
+
+
+ follower1
+ follower2
+
+
-
diff --git a/tests/dictionaries/10valid_enum_mandatory/00-base.xml b/tests/dictionaries/10valid_enum_mandatory/00-base.xml
index 595c9149..89daeab9 100644
--- a/tests/dictionaries/10valid_enum_mandatory/00-base.xml
+++ b/tests/dictionaries/10valid_enum_mandatory/00-base.xml
@@ -1,25 +1,22 @@
-
-
-
-
- non
-
-
-
-
-
-
-
-
-
- a
- b
- c
- enumvar
-
-
+
+
+
+
+ non
+
+
+
+
+
+
+
+
+ a
+ b
+ c
+ enumvar
+
+
-
diff --git a/tests/dictionaries/10valid_enum_multi/00-base.xml b/tests/dictionaries/10valid_enum_multi/00-base.xml
index 8e75b7ba..d3bdd736 100644
--- a/tests/dictionaries/10valid_enum_multi/00-base.xml
+++ b/tests/dictionaries/10valid_enum_multi/00-base.xml
@@ -1,22 +1,19 @@
-
-
-
- non
-
-
-
-
-
-
-
- a
- b
- c
- multi
-
-
+
+
+
+ non
+
+
+
+
+
+
+ a
+ b
+ c
+ multi
+
+
-
diff --git a/tests/dictionaries/10valid_enum_none/00-base.xml b/tests/dictionaries/10valid_enum_none/00-base.xml
index 289af701..e8d46327 100644
--- a/tests/dictionaries/10valid_enum_none/00-base.xml
+++ b/tests/dictionaries/10valid_enum_none/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
-
-
- b
-
-
-
-
-
-
- a
- b
-
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+ b
+
+
+
+
+
+ a
+ b
+
+ enumvar
+
+
-
diff --git a/tests/dictionaries/10valid_enum_number/00-base.xml b/tests/dictionaries/10valid_enum_number/00-base.xml
index 58d54d99..fb8b66d9 100644
--- a/tests/dictionaries/10valid_enum_number/00-base.xml
+++ b/tests/dictionaries/10valid_enum_number/00-base.xml
@@ -1,25 +1,21 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
- 1
- 2
- 3
- enumvar
-
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+ 1
+ 2
+ 3
+ enumvar
+
+
-
diff --git a/tests/dictionaries/10valid_enum_numberdefault/00-base.xml b/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
index 3975516d..a02d91bf 100644
--- a/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
+++ b/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
-
-
- 3
-
-
-
-
-
-
- 1
- 2
- 3
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+ 3
+
+
+
+
+
+ 1
+ 2
+ 3
+ enumvar
+
+
-
diff --git a/tests/dictionaries/10valid_enum_param_empty/00-base.xml b/tests/dictionaries/10valid_enum_param_empty/00-base.xml
index 1e2cd8ed..23831823 100644
--- a/tests/dictionaries/10valid_enum_param_empty/00-base.xml
+++ b/tests/dictionaries/10valid_enum_param_empty/00-base.xml
@@ -1,22 +1,19 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+ enumvar
+
+
-
diff --git a/tests/dictionaries/10valid_enum_param_empty2/00-base.xml b/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
index 2bfd69bf..23831823 100644
--- a/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
+++ b/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
@@ -1,22 +1,19 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+ enumvar
+
+
-
diff --git a/tests/dictionaries/10valid_enum_quote/00-base.xml b/tests/dictionaries/10valid_enum_quote/00-base.xml
index 1614931b..d8e1f824 100644
--- a/tests/dictionaries/10valid_enum_quote/00-base.xml
+++ b/tests/dictionaries/10valid_enum_quote/00-base.xml
@@ -1,24 +1,21 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
- quote'
- quote"
- quote"'
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+ quote'
+ quote"
+ quote"'
+ enumvar
+
+
-
diff --git a/tests/dictionaries/10valid_enum_value/00-base.xml b/tests/dictionaries/10valid_enum_value/00-base.xml
index a55be036..4ace1891 100644
--- a/tests/dictionaries/10valid_enum_value/00-base.xml
+++ b/tests/dictionaries/10valid_enum_value/00-base.xml
@@ -1,21 +1,18 @@
-
-
-
- b
-
-
-
-
-
-
- a
- b
- c
- mode_conteneur_actif
-
-
+
+
+
+ b
+
+
+
+
+
+ a
+ b
+ c
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/11disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
index 8a0fb898..dc6be191 100644
--- a/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
@@ -1,32 +1,27 @@
-
-
-
- /etc/file
-
-
-
-
-
-
- non
-
-
- non
-
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
- afilllist
-
-
+
+
+ /etc/file
+
+
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+ afilllist
+
+
-
diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
index 1898469e..a74e5331 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
@@ -1,22 +1,19 @@
-
-
- /tmp/file1
-
-
-
-
-
-
-
-
-
-
- True
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+
+
+
+
+ True
+ afilllist
+
+
-
diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
index b7868809..a3f20117 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
@@ -1,24 +1,21 @@
-
-
- /tmp/file1
-
-
-
-
-
- False
-
-
-
-
-
-
- True
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+ False
+
+
+
+
+
+ True
+ afilllist
+
+
-
diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
index 950d9a77..c9283603 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
@@ -1,34 +1,29 @@
-
-
-
- /etc/file
-
-
-
-
-
-
- oui
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
- afilllist
-
-
+
+
+ /etc/file
+
+
+
+
+
+ oui
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+ afilllist
+
+
-
diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
index fdca7b2a..43a9b82b 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
@@ -1,35 +1,30 @@
-
-
-
- /tmp/file1
- /tmp/file2
-
-
-
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
- afilllist
-
-
+
+
+ /tmp/file1
+ /tmp/file2
+
+
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+ afilllist
+
+
-
diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
index ccc7fa12..373e6cfc 100644
--- a/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
+++ b/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
@@ -1,32 +1,27 @@
-
-
-
- /tmp/file
-
-
-
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- unpossible
- afilllist
-
-
+
+
+ /tmp/file
+
+
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ unpossible
+ afilllist
+
+
-
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
index ce128737..373e6cfc 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
@@ -1,31 +1,27 @@
-
-
-
- /tmp/file
-
-
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- unpossible
- afilllist
-
-
+
+
+ /tmp/file
+
+
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ unpossible
+ afilllist
+
+
-
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
index fe5b9ef6..9d8e3356 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
@@ -1,36 +1,31 @@
-
-
-
- /tmp/file
-
-
-
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- unpossible
- afilllist
-
-
- oui
- afilllist
-
-
+
+
+ /tmp/file
+
+
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ unpossible
+ afilllist
+
+
+ oui
+ afilllist
+
+
-
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
index 0f614bfa..e82e5b27 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
@@ -1,35 +1,32 @@
-
-
-
- /tmp/file
-
-
-
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- non
- statique
- condition
-
-
- statique
- afilllist
-
-
+
+
+ /tmp/file
+
+
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ non
+ statique
+ condition
+
+
+ statique
+ afilllist
+
+
diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
index 71af616d..52a2c945 100644
--- a/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
@@ -1,33 +1,28 @@
-
-
-
- /tmp/file1
-
-
-
-
-
-
- non
-
-
- non
-
-
-
-
-
-
- non
- afilllist
-
-
- non
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+ non
+ afilllist
+
+
+ non
+ afilllist
+
+
-
diff --git a/tests/dictionaries/11valid_enum_function/00-base.xml b/tests/dictionaries/11valid_enum_function/00-base.xml
index 81bbe2fa..8d022f33 100644
--- a/tests/dictionaries/11valid_enum_function/00-base.xml
+++ b/tests/dictionaries/11valid_enum_function/00-base.xml
@@ -1,20 +1,18 @@
-
-
-
- 9
-
-
-
-
-
- trange
- 0
- 10
- var
-
-
+
+
+
+ 9
+
+
+
+
+
+ trange
+ 0
+ 10
+ var
+
+
-
diff --git a/tests/dictionaries/11valid_enum_variable/00-base.xml b/tests/dictionaries/11valid_enum_variable/00-base.xml
index 046adf76..aacb3e1e 100644
--- a/tests/dictionaries/11valid_enum_variable/00-base.xml
+++ b/tests/dictionaries/11valid_enum_variable/00-base.xml
@@ -1,23 +1,21 @@
-
-
-
- a
-
-
- a
- b
- c
-
-
-
-
-
- var
- mode_conteneur_actif
-
-
+
+
+
+ a
+
+
+ a
+ b
+ c
+
+
+
+
+
+ var
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/20family_append/00-base.xml b/tests/dictionaries/20family_append/00-base.xml
index 0e6d4337..ccf8e4dd 100644
--- a/tests/dictionaries/20family_append/00-base.xml
+++ b/tests/dictionaries/20family_append/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/20family_append/01-base.xml b/tests/dictionaries/20family_append/01-base.xml
index ce4a2ad3..8bd81834 100644
--- a/tests/dictionaries/20family_append/01-base.xml
+++ b/tests/dictionaries/20family_append/01-base.xml
@@ -1,10 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
diff --git a/tests/dictionaries/20family_dynamic/00-base.xml b/tests/dictionaries/20family_dynamic/00-base.xml
index 243f828a..ca18543d 100644
--- a/tests/dictionaries/20family_dynamic/00-base.xml
+++ b/tests/dictionaries/20family_dynamic/00-base.xml
@@ -1,15 +1,14 @@
-
-
+
-
-
-
- val1
- val2
-
-
-
-
-
-
+
+
+
+ val1
+ val2
+
+
+
+
+
+
diff --git a/tests/dictionaries/20family_dynamic_calc/00-base.xml b/tests/dictionaries/20family_dynamic_calc/00-base.xml
index 74053acb..81390f86 100644
--- a/tests/dictionaries/20family_dynamic_calc/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_calc/00-base.xml
@@ -1,26 +1,25 @@
-
-
+
-
-
-
- val1
- val2
-
-
-
-
- val
-
-
-
-
-
-
-
-
- vardynval1
- newvar
-
-
+
+
+
+ val1
+ val2
+
+
+
+
+ val
+
+
+
+
+
+
+
+
+ vardynval1
+ newvar
+
+
diff --git a/tests/dictionaries/20family_dynamic_calc2/00-base.xml b/tests/dictionaries/20family_dynamic_calc2/00-base.xml
index e12821b2..b7438884 100644
--- a/tests/dictionaries/20family_dynamic_calc2/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_calc2/00-base.xml
@@ -1,26 +1,25 @@
-
-
+
-
-
-
- val1
- val2
-
-
-
-
- val
-
-
-
-
-
-
-
-
- non
- dyn
-
-
+
+
+
+ val1
+ val2
+
+
+
+
+ val
+
+
+
+
+
+
+
+
+ non
+ dyn
+
+
diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml b/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml
index 123a6ed5..f0dcaf6a 100644
--- a/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml
@@ -1,26 +1,25 @@
-
-
+
-
-
-
- val1
- val2
-
-
-
-
- val
-
-
-
-
-
-
-
-
-
- vardyn
-
-
+
+
+
+ val1
+ val2
+
+
+
+
+ val
+
+
+
+
+
+
+
+
+
+ vardyn
+
+
diff --git a/tests/dictionaries/20family_dynamic_description/00-base.xml b/tests/dictionaries/20family_dynamic_description/00-base.xml
index a342a028..39c22332 100644
--- a/tests/dictionaries/20family_dynamic_description/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_description/00-base.xml
@@ -1,15 +1,14 @@
-
-
+
-
-
-
- val1
- val2
-
-
-
-
-
-
+
+
+
+ val1
+ val2
+
+
+
+
+
+
diff --git a/tests/dictionaries/20family_dynamic_number/00-base.xml b/tests/dictionaries/20family_dynamic_number/00-base.xml
index d13b3552..80703470 100644
--- a/tests/dictionaries/20family_dynamic_number/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_number/00-base.xml
@@ -1,26 +1,25 @@
-
-
+
-
-
-
- 1
- 2
-
-
-
-
- val
-
-
-
-
-
-
-
-
- vardyn1
- newvar
-
-
+
+
+
+ 1
+ 2
+
+
+
+
+ val
+
+
+
+
+
+
+
+
+ vardyn1
+ newvar
+
+
diff --git a/tests/dictionaries/20family_empty/00-base.xml b/tests/dictionaries/20family_empty/00-base.xml
index ee74f399..2611894b 100644
--- a/tests/dictionaries/20family_empty/00-base.xml
+++ b/tests/dictionaries/20family_empty/00-base.xml
@@ -1,13 +1,11 @@
-
-
-
- non
-
-
-
-
+
+
+
+ non
+
+
+
+
-
diff --git a/tests/dictionaries/20family_hidden/00-base.xml b/tests/dictionaries/20family_hidden/00-base.xml
index 0e6d4337..ccf8e4dd 100644
--- a/tests/dictionaries/20family_hidden/00-base.xml
+++ b/tests/dictionaries/20family_hidden/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/20family_hidden/01-base.xml b/tests/dictionaries/20family_hidden/01-base.xml
index f8ae611f..8556985b 100644
--- a/tests/dictionaries/20family_hidden/01-base.xml
+++ b/tests/dictionaries/20family_hidden/01-base.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
diff --git a/tests/dictionaries/20family_mode/00-base.xml b/tests/dictionaries/20family_mode/00-base.xml
index 20053c69..adc550df 100644
--- a/tests/dictionaries/20family_mode/00-base.xml
+++ b/tests/dictionaries/20family_mode/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/20family_modeleadership/00-base.xml b/tests/dictionaries/20family_modeleadership/00-base.xml
index 890996b4..43e72976 100644
--- a/tests/dictionaries/20family_modeleadership/00-base.xml
+++ b/tests/dictionaries/20family_modeleadership/00-base.xml
@@ -1,22 +1,19 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+ follower1
+ follower2
+
+
-
diff --git a/tests/dictionaries/20notemplating/00-base.xml b/tests/dictionaries/20notemplating/00-base.xml
index 67637a50..df71ebe2 100644
--- a/tests/dictionaries/20notemplating/00-base.xml
+++ b/tests/dictionaries/20notemplating/00-base.xml
@@ -1,19 +1,15 @@
-
-
-
- /etc/file
-
-
-
-
-
-
- non
-
-
-
+
+
+ /etc/file
+
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/20override/00-base.xml b/tests/dictionaries/20override/00-base.xml
index 010e2021..3b380b57 100644
--- a/tests/dictionaries/20override/00-base.xml
+++ b/tests/dictionaries/20override/00-base.xml
@@ -1,22 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- non
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/20override_no_templating/00-base.xml b/tests/dictionaries/20override_no_templating/00-base.xml
index ed5be665..8348d11a 100644
--- a/tests/dictionaries/20override_no_templating/00-base.xml
+++ b/tests/dictionaries/20override_no_templating/00-base.xml
@@ -1,19 +1,15 @@
-
-
-
-
-
-
-
-
-
-
- non
-
-
-
+
+
+
+
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/20override_source/00-base.xml b/tests/dictionaries/20override_source/00-base.xml
index 50ada9d0..acf3748b 100644
--- a/tests/dictionaries/20override_source/00-base.xml
+++ b/tests/dictionaries/20override_source/00-base.xml
@@ -1,19 +1,15 @@
-
-
-
-
-
-
-
-
-
-
- non
-
-
-
+
+
+
+
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/21family_empty/00-base.xml b/tests/dictionaries/21family_empty/00-base.xml
index 64d577b0..b628e39b 100644
--- a/tests/dictionaries/21family_empty/00-base.xml
+++ b/tests/dictionaries/21family_empty/00-base.xml
@@ -1,14 +1,12 @@
-
-
-
- non
-
+
+
+
+ non
+
+
+
-
-
-
+
-
diff --git a/tests/dictionaries/30mandatory_withoutvalue/00-base.xml b/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
index 301f4e9f..dd8cc45f 100644
--- a/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
+++ b/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml b/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml
index cff37ba5..74ac4379 100644
--- a/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml
+++ b/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml
@@ -1,16 +1,14 @@
-
-
-
-
-
-
-
- value
- mode_conteneur_actif
-
-
+
+
+
+
+
+
+
+ value
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/30mandatory_withvalue/00-base.xml b/tests/dictionaries/30mandatory_withvalue/00-base.xml
index 8cb1d841..cfbe7ed0 100644
--- a/tests/dictionaries/30mandatory_withvalue/00-base.xml
+++ b/tests/dictionaries/30mandatory_withvalue/00-base.xml
@@ -1,10 +1,10 @@
-
-
-
- value
-
-
-
+
+
+
+ value
+
+
+
diff --git a/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml b/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml
index 49605379..899ce4dd 100644
--- a/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml
+++ b/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
- value
- mode_conteneur_actif
-
-
+
+
+
+
+
+
+
+ value
+ mode_conteneur_actif
+
+
diff --git a/tests/dictionaries/40condition_base/00-base.xml b/tests/dictionaries/40condition_base/00-base.xml
index 3136dfdb..c4aa968a 100644
--- a/tests/dictionaries/40condition_base/00-base.xml
+++ b/tests/dictionaries/40condition_base/00-base.xml
@@ -1,29 +1,26 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif1
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif1
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/40condition_base_add/00-base.xml b/tests/dictionaries/40condition_base_add/00-base.xml
index 3136dfdb..c4aa968a 100644
--- a/tests/dictionaries/40condition_base_add/00-base.xml
+++ b/tests/dictionaries/40condition_base_add/00-base.xml
@@ -1,29 +1,26 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif1
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif1
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/40condition_base_add/01-base.xml b/tests/dictionaries/40condition_base_add/01-base.xml
index 3218d12b..cca063ed 100644
--- a/tests/dictionaries/40condition_base_add/01-base.xml
+++ b/tests/dictionaries/40condition_base_add/01-base.xml
@@ -1,19 +1,15 @@
-
-
-
-
-
-
-
-
- oui
- mode_conteneur_actif1
- mode_conteneur_actif2
-
-
-
+
+
+
+
+
+
+
+ oui
+ mode_conteneur_actif1
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/40condition_fallback/00-base.xml b/tests/dictionaries/40condition_fallback/00-base.xml
index 8c7ae0ba..4b3dcbb5 100644
--- a/tests/dictionaries/40condition_fallback/00-base.xml
+++ b/tests/dictionaries/40condition_fallback/00-base.xml
@@ -1,32 +1,29 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif1
- mode_conteneur_actif2
- disabled_family
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif1
+ mode_conteneur_actif2
+ disabled_family
+
+
-
diff --git a/tests/dictionaries/40condition_optional/00-base.xml b/tests/dictionaries/40condition_optional/00-base.xml
index 99522be3..3190d07a 100644
--- a/tests/dictionaries/40condition_optional/00-base.xml
+++ b/tests/dictionaries/40condition_optional/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif1
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif1
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/40condition_optional_empty/00-base.xml b/tests/dictionaries/40condition_optional_empty/00-base.xml
index da22f00b..15197d24 100644
--- a/tests/dictionaries/40condition_optional_empty/00-base.xml
+++ b/tests/dictionaries/40condition_optional_empty/00-base.xml
@@ -1,25 +1,22 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/40condition_optional_family/00-base.xml b/tests/dictionaries/40condition_optional_family/00-base.xml
index 880841b0..8e67c7e3 100644
--- a/tests/dictionaries/40condition_optional_family/00-base.xml
+++ b/tests/dictionaries/40condition_optional_family/00-base.xml
@@ -1,19 +1,16 @@
-
-
-
-
-
-
-
-
-
- True
- general
- general2
-
-
+
+
+
+
+
+
+
+
+ True
+ general
+ general2
+
+
-
diff --git a/tests/dictionaries/40empty_param/00_base.xml b/tests/dictionaries/40empty_param/00_base.xml
index 155081f5..43c59f4b 100644
--- a/tests/dictionaries/40empty_param/00_base.xml
+++ b/tests/dictionaries/40empty_param/00_base.xml
@@ -1,22 +1,19 @@
-
-
-
-
-
+
+
+
+
-
- 3127
-
-
-
-
-
-
-
- toto1
-
-
-
+
+ 3127
+
+
+
+
+
+
+ toto1
+
+
diff --git a/tests/dictionaries/40empty_param2/00_base.xml b/tests/dictionaries/40empty_param2/00_base.xml
index dd301fda..93d7575b 100644
--- a/tests/dictionaries/40empty_param2/00_base.xml
+++ b/tests/dictionaries/40empty_param2/00_base.xml
@@ -1,22 +1,19 @@
-
-
-
-
-
+
+
+
+
-
- 3127
-
-
-
-
-
-
-
- toto1
-
-
-
+
+ 3127
+
+
+
+
+
+
+ toto1
+
+
diff --git a/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml b/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
index 8fad142b..b12f6df9 100644
--- a/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
+++ b/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
@@ -1,28 +1,25 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif1
-
-
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif1
+
+
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/40ifin_leadership/00-base.xml b/tests/dictionaries/40ifin_leadership/00-base.xml
index f2c75550..1e5ef63d 100644
--- a/tests/dictionaries/40ifin_leadership/00-base.xml
+++ b/tests/dictionaries/40ifin_leadership/00-base.xml
@@ -1,27 +1,26 @@
-
-
-
- non
-
-
- oui
-
-
-
-
-
-
-
-
-
- follower1
- follower2
-
-
- oui
- follower1
-
-
+
+
+
+ non
+
+
+ oui
+
+
+
+
+
+
+
+
+ follower1
+ follower2
+
+
+ oui
+ follower1
+
+
diff --git a/tests/dictionaries/40ifin_leadershipauto/00-base.xml b/tests/dictionaries/40ifin_leadershipauto/00-base.xml
index 326da930..a65384b6 100644
--- a/tests/dictionaries/40ifin_leadershipauto/00-base.xml
+++ b/tests/dictionaries/40ifin_leadershipauto/00-base.xml
@@ -1,37 +1,37 @@
-
-
- /etc/mailname
-
-
-
-
-
- non
-
-
- oui
-
-
- a
-
-
-
-
-
-
-
- follower1
- follower2
-
-
- valfill
- follower1
-
-
- oui
- follower1
-
-
+
+
+ /etc/mailname
+
+
+
+
+
+ non
+
+
+ oui
+
+
+ a
+
+
+
+
+
+
+
+ follower1
+ follower2
+
+
+ valfill
+ follower1
+
+
+ oui
+ follower1
+
+
diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml b/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
index b7db4590..5de130d6 100644
--- a/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
+++ b/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
@@ -1,39 +1,39 @@
-
-
- /etc/mailname
- /etc/mailname2
-
-
-
-
-
- non
-
-
- oui
-
-
- a
- b
-
-
-
-
-
-
-
- follower1
- follower2
-
-
- valfill
- follower1
-
-
- a
- follower1
-
-
+
+
+ /etc/mailname
+ /etc/mailname2
+
+
+
+
+
+ non
+
+
+ oui
+
+
+ a
+ b
+
+
+
+
+
+
+
+ follower1
+ follower2
+
+
+ valfill
+ follower1
+
+
+ a
+ follower1
+
+
diff --git a/tests/dictionaries/40ifin_multi/00-base.xml b/tests/dictionaries/40ifin_multi/00-base.xml
index a4a6d391..4b95acc8 100644
--- a/tests/dictionaries/40ifin_multi/00-base.xml
+++ b/tests/dictionaries/40ifin_multi/00-base.xml
@@ -1,31 +1,28 @@
-
-
-
- non
-
-
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif3
-
-
- oui
- mode_conteneur_actif3
-
-
+
+
+
+ non
+
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif3
+
+
+ oui
+ mode_conteneur_actif3
+
+
-
diff --git a/tests/dictionaries/40ifin_multi2/00-base.xml b/tests/dictionaries/40ifin_multi2/00-base.xml
index 498b2c08..035c1c1b 100644
--- a/tests/dictionaries/40ifin_multi2/00-base.xml
+++ b/tests/dictionaries/40ifin_multi2/00-base.xml
@@ -1,31 +1,28 @@
-
-
-
- non
-
-
-
-
- oui
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif3
-
-
- oui
- mode_conteneur_actif3
-
-
+
+
+
+ non
+
+
+
+
+ oui
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif3
+
+
+ oui
+ mode_conteneur_actif3
+
+
-
diff --git a/tests/dictionaries/40ifin_validenum/00-base.xml b/tests/dictionaries/40ifin_validenum/00-base.xml
index 5311ee9d..6754639b 100644
--- a/tests/dictionaries/40ifin_validenum/00-base.xml
+++ b/tests/dictionaries/40ifin_validenum/00-base.xml
@@ -1,34 +1,32 @@
-
-
-
- non
-
-
-
-
- non
-
-
-
-
-
-
- a
- b
- c
- mode_conteneur_actif3
-
-
- d
- mode_conteneur_actif
-
-
- d
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+
+
+ non
+
+
+
+
+
+
+ a
+ b
+ c
+ mode_conteneur_actif3
+
+
+ d
+ mode_conteneur_actif
+
+
+ d
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/45extra_without_family/00-base.xml b/tests/dictionaries/45extra_without_family/00-base.xml
index 5a64ea26..2d0b52c9 100644
--- a/tests/dictionaries/45extra_without_family/00-base.xml
+++ b/tests/dictionaries/45extra_without_family/00-base.xml
@@ -1,15 +1,13 @@
-
-
- /etc/file
-
-
-
-
- rougail
-
-
+
+
+ /etc/file
+
+
+
+
+ rougail
+
+
-
diff --git a/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml b/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml
index 120d11a2..73fe8060 100644
--- a/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml
@@ -1,13 +1,12 @@
-
-
+
-
-
-
-
-
- non
- extra.my_var
-
-
+
+
+
+
+
+ non
+ extra.my_var
+
+
diff --git a/tests/dictionaries/45multi_family/00-base.xml b/tests/dictionaries/45multi_family/00-base.xml
index dfe14720..4f5d86b6 100644
--- a/tests/dictionaries/45multi_family/00-base.xml
+++ b/tests/dictionaries/45multi_family/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/45multi_family_basic/00-base.xml b/tests/dictionaries/45multi_family_basic/00-base.xml
index 8b009a15..831c0436 100644
--- a/tests/dictionaries/45multi_family_basic/00-base.xml
+++ b/tests/dictionaries/45multi_family_basic/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/45multi_family_expert/00-base.xml b/tests/dictionaries/45multi_family_expert/00-base.xml
index 72c06f5e..307757d2 100644
--- a/tests/dictionaries/45multi_family_expert/00-base.xml
+++ b/tests/dictionaries/45multi_family_expert/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/45multi_family_order/00-base.xml b/tests/dictionaries/45multi_family_order/00-base.xml
index cd0c86e4..b04d9937 100644
--- a/tests/dictionaries/45multi_family_order/00-base.xml
+++ b/tests/dictionaries/45multi_family_order/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/45without_family/00-base.xml b/tests/dictionaries/45without_family/00-base.xml
index f35c3861..4d3f2715 100644
--- a/tests/dictionaries/45without_family/00-base.xml
+++ b/tests/dictionaries/45without_family/00-base.xml
@@ -1,8 +1,6 @@
-
-
-
+
+
+
-
diff --git a/tests/dictionaries/50exists_exists/00-base.xml b/tests/dictionaries/50exists_exists/00-base.xml
index 10cb29e4..8d03cb4e 100644
--- a/tests/dictionaries/50exists_exists/00-base.xml
+++ b/tests/dictionaries/50exists_exists/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/50exists_exists/01-base.xml b/tests/dictionaries/50exists_exists/01-base.xml
index 00c05dad..518de756 100644
--- a/tests/dictionaries/50exists_exists/01-base.xml
+++ b/tests/dictionaries/50exists_exists/01-base.xml
@@ -1,12 +1,10 @@
-
-
-
- oui
-
-
-
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/50redefine_description/00-base.xml b/tests/dictionaries/50redefine_description/00-base.xml
index 9ea33030..8c9d801f 100644
--- a/tests/dictionaries/50redefine_description/00-base.xml
+++ b/tests/dictionaries/50redefine_description/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/50redefine_description/01-redefine.xml b/tests/dictionaries/50redefine_description/01-redefine.xml
index 0ee2789b..758bd2f2 100644
--- a/tests/dictionaries/50redefine_description/01-redefine.xml
+++ b/tests/dictionaries/50redefine_description/01-redefine.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
diff --git a/tests/dictionaries/51exists_nonexists/00-base.xml b/tests/dictionaries/51exists_nonexists/00-base.xml
index 68826787..6d475995 100644
--- a/tests/dictionaries/51exists_nonexists/00-base.xml
+++ b/tests/dictionaries/51exists_nonexists/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/51exists_nonexists/01-base.xml b/tests/dictionaries/51exists_nonexists/01-base.xml
index fd4dd26d..59583fe1 100644
--- a/tests/dictionaries/51exists_nonexists/01-base.xml
+++ b/tests/dictionaries/51exists_nonexists/01-base.xml
@@ -1,12 +1,10 @@
-
-
-
- oui
-
-
-
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/51exists_redefine/00-base.xml b/tests/dictionaries/51exists_redefine/00-base.xml
index 10cb29e4..8d03cb4e 100644
--- a/tests/dictionaries/51exists_redefine/00-base.xml
+++ b/tests/dictionaries/51exists_redefine/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/51exists_redefine/01-base.xml b/tests/dictionaries/51exists_redefine/01-base.xml
index 73028b97..61c05429 100644
--- a/tests/dictionaries/51exists_redefine/01-base.xml
+++ b/tests/dictionaries/51exists_redefine/01-base.xml
@@ -1,15 +1,13 @@
-
-
-
- oui
-
-
- oui
-
-
-
+
+
+
+ oui
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/51redefine_auto/00-base.xml b/tests/dictionaries/51redefine_auto/00-base.xml
index 9155e418..1195d9fe 100644
--- a/tests/dictionaries/51redefine_auto/00-base.xml
+++ b/tests/dictionaries/51redefine_auto/00-base.xml
@@ -1,19 +1,16 @@
-
-
-
- non
-
-
-
-
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+
+
+
+ non
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/51redefine_auto/01-base.xml b/tests/dictionaries/51redefine_auto/01-base.xml
index c45f1e0a..698aed49 100644
--- a/tests/dictionaries/51redefine_auto/01-base.xml
+++ b/tests/dictionaries/51redefine_auto/01-base.xml
@@ -1,15 +1,14 @@
-
-
-
-
-
-
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+
+
+
+
+ non
+ mode_conteneur_actif
+
+
diff --git a/tests/dictionaries/51redefine_autofill/00-base.xml b/tests/dictionaries/51redefine_autofill/00-base.xml
index e34cc1cb..0da7cab1 100644
--- a/tests/dictionaries/51redefine_autofill/00-base.xml
+++ b/tests/dictionaries/51redefine_autofill/00-base.xml
@@ -1,19 +1,16 @@
-
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/51redefine_autofill/01-base.xml b/tests/dictionaries/51redefine_autofill/01-base.xml
index 741e0d31..28881d84 100644
--- a/tests/dictionaries/51redefine_autofill/01-base.xml
+++ b/tests/dictionaries/51redefine_autofill/01-base.xml
@@ -1,15 +1,14 @@
-
-
-
-
-
-
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+
+
+
+
+ non
+ mode_conteneur_actif
+
+
diff --git a/tests/dictionaries/51redefine_family/00-base.xml b/tests/dictionaries/51redefine_family/00-base.xml
index 5eeb4f94..458057f2 100644
--- a/tests/dictionaries/51redefine_family/00-base.xml
+++ b/tests/dictionaries/51redefine_family/00-base.xml
@@ -1,24 +1,21 @@
-
-
-
- non
-
-
-
-
- non
-
-
-
-
-
-
- oui
- general2
-
-
+
+
+
+ non
+
+
+
+
+ non
+
+
+
+
+
+ oui
+ general2
+
+
-
diff --git a/tests/dictionaries/51redefine_family/01-base.xml b/tests/dictionaries/51redefine_family/01-base.xml
index a7d68103..dc45e35e 100644
--- a/tests/dictionaries/51redefine_family/01-base.xml
+++ b/tests/dictionaries/51redefine_family/01-base.xml
@@ -1,10 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
diff --git a/tests/dictionaries/51redefine_fill/00-base.xml b/tests/dictionaries/51redefine_fill/00-base.xml
index e34cc1cb..0da7cab1 100644
--- a/tests/dictionaries/51redefine_fill/00-base.xml
+++ b/tests/dictionaries/51redefine_fill/00-base.xml
@@ -1,19 +1,16 @@
-
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/51redefine_fill/01-base.xml b/tests/dictionaries/51redefine_fill/01-base.xml
index c45f1e0a..698aed49 100644
--- a/tests/dictionaries/51redefine_fill/01-base.xml
+++ b/tests/dictionaries/51redefine_fill/01-base.xml
@@ -1,15 +1,14 @@
-
-
-
-
-
-
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+
+
+
+
+ non
+ mode_conteneur_actif
+
+
diff --git a/tests/dictionaries/51redefine_fillauto/00-base.xml b/tests/dictionaries/51redefine_fillauto/00-base.xml
index 75cf7960..9373d517 100644
--- a/tests/dictionaries/51redefine_fillauto/00-base.xml
+++ b/tests/dictionaries/51redefine_fillauto/00-base.xml
@@ -1,19 +1,16 @@
-
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/51redefine_fillauto/01-base.xml b/tests/dictionaries/51redefine_fillauto/01-base.xml
index 6e85da2f..f295968d 100644
--- a/tests/dictionaries/51redefine_fillauto/01-base.xml
+++ b/tests/dictionaries/51redefine_fillauto/01-base.xml
@@ -1,15 +1,14 @@
-
-
-
-
-
-
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+
+
+
+
+ non
+ mode_conteneur_actif
+
+
diff --git a/tests/dictionaries/51redefine_help/00-base.xml b/tests/dictionaries/51redefine_help/00-base.xml
index 7d3c5409..c39693ee 100644
--- a/tests/dictionaries/51redefine_help/00-base.xml
+++ b/tests/dictionaries/51redefine_help/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/51redefine_help/01-base.xml b/tests/dictionaries/51redefine_help/01-base.xml
index 9a3aab1e..f6ea9844 100644
--- a/tests/dictionaries/51redefine_help/01-base.xml
+++ b/tests/dictionaries/51redefine_help/01-base.xml
@@ -1,10 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
diff --git a/tests/dictionaries/51redefine_hidden/00-base.xml b/tests/dictionaries/51redefine_hidden/00-base.xml
index 4708db54..ccab2d18 100644
--- a/tests/dictionaries/51redefine_hidden/00-base.xml
+++ b/tests/dictionaries/51redefine_hidden/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/51redefine_hidden/01-redefine.xml b/tests/dictionaries/51redefine_hidden/01-redefine.xml
index 07359c71..31eef053 100644
--- a/tests/dictionaries/51redefine_hidden/01-redefine.xml
+++ b/tests/dictionaries/51redefine_hidden/01-redefine.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
diff --git a/tests/dictionaries/51redefine_multi/00-base.xml b/tests/dictionaries/51redefine_multi/00-base.xml
index 9ea33030..8c9d801f 100644
--- a/tests/dictionaries/51redefine_multi/00-base.xml
+++ b/tests/dictionaries/51redefine_multi/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/51redefine_multi/01-redefine.xml b/tests/dictionaries/51redefine_multi/01-redefine.xml
index fee1b09c..df4f28e5 100644
--- a/tests/dictionaries/51redefine_multi/01-redefine.xml
+++ b/tests/dictionaries/51redefine_multi/01-redefine.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
diff --git a/tests/dictionaries/51redefine_remove_check/00-base.xml b/tests/dictionaries/51redefine_remove_check/00-base.xml
index d6301851..9dc96e51 100644
--- a/tests/dictionaries/51redefine_remove_check/00-base.xml
+++ b/tests/dictionaries/51redefine_remove_check/00-base.xml
@@ -1,19 +1,16 @@
-
-
-
-
-
-
-
-
- a
- b
- c
- mode_conteneur_actif
-
-
+
+
+
+
+
+
+
+ a
+ b
+ c
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/51redefine_remove_check/01-base.xml b/tests/dictionaries/51redefine_remove_check/01-base.xml
index 1d0aa09e..5ef05ee9 100644
--- a/tests/dictionaries/51redefine_remove_check/01-base.xml
+++ b/tests/dictionaries/51redefine_remove_check/01-base.xml
@@ -1,10 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
diff --git a/tests/dictionaries/51redefine_remove_condition/00-base.xml b/tests/dictionaries/51redefine_remove_condition/00-base.xml
index ff3f67bd..4d3a9bce 100644
--- a/tests/dictionaries/51redefine_remove_condition/00-base.xml
+++ b/tests/dictionaries/51redefine_remove_condition/00-base.xml
@@ -1,29 +1,26 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif1
- mode_conteneur_actif2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif1
+ mode_conteneur_actif2
+
+
-
diff --git a/tests/dictionaries/51redefine_remove_condition/01-base.xml b/tests/dictionaries/51redefine_remove_condition/01-base.xml
index be01a6ec..5b96406b 100644
--- a/tests/dictionaries/51redefine_remove_condition/01-base.xml
+++ b/tests/dictionaries/51redefine_remove_condition/01-base.xml
@@ -1,8 +1,8 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
index 3b1f3b45..a3471e44 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
@@ -1,30 +1,27 @@
-
-
- no
-
-
- no
-
-
- no
-
-
- no
-
-
- False
-
-
-
-
-
- yes
- my_var1
- my_var2
-
-
+
+
+ no
+
+
+ no
+
+
+ no
+
+
+ no
+
+
+ False
+
+
+
+
+ yes
+ my_var1
+ my_var2
+
+
-
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
index e9ee2115..2798de04 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
diff --git a/tests/dictionaries/51redefine_type/00-base.xml b/tests/dictionaries/51redefine_type/00-base.xml
index 9ea33030..8c9d801f 100644
--- a/tests/dictionaries/51redefine_type/00-base.xml
+++ b/tests/dictionaries/51redefine_type/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/51redefine_type/01-redefine.xml b/tests/dictionaries/51redefine_type/01-redefine.xml
index 930995cc..cf1a2adb 100644
--- a/tests/dictionaries/51redefine_type/01-redefine.xml
+++ b/tests/dictionaries/51redefine_type/01-redefine.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
diff --git a/tests/dictionaries/51redefine_validenum/00-base.xml b/tests/dictionaries/51redefine_validenum/00-base.xml
index b2933fe2..9d3c5cf0 100644
--- a/tests/dictionaries/51redefine_validenum/00-base.xml
+++ b/tests/dictionaries/51redefine_validenum/00-base.xml
@@ -1,18 +1,16 @@
-
-
-
-
-
-
-
- a
- b
- c
- mode_conteneur_actif
-
-
+
+
+
+
+
+
+
+ a
+ b
+ c
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/51redefine_validenum/01-redefine.xml b/tests/dictionaries/51redefine_validenum/01-redefine.xml
index fce1d510..1e5e2109 100644
--- a/tests/dictionaries/51redefine_validenum/01-redefine.xml
+++ b/tests/dictionaries/51redefine_validenum/01-redefine.xml
@@ -1,17 +1,15 @@
-
-
-
-
-
-
-
- a
- b
- mode_conteneur_actif
-
-
+
+
+
+
+
+
+
+ a
+ b
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/51redefine_value/00-base.xml b/tests/dictionaries/51redefine_value/00-base.xml
index 305b1d08..e1bf475e 100644
--- a/tests/dictionaries/51redefine_value/00-base.xml
+++ b/tests/dictionaries/51redefine_value/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/51redefine_value/01-redefine.xml b/tests/dictionaries/51redefine_value/01-redefine.xml
index 2d384c41..4fe7dc59 100644
--- a/tests/dictionaries/51redefine_value/01-redefine.xml
+++ b/tests/dictionaries/51redefine_value/01-redefine.xml
@@ -1,12 +1,10 @@
-
-
-
- oui
-
-
-
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/51remove_fill/00-base.xml b/tests/dictionaries/51remove_fill/00-base.xml
index 725d6f15..d99bdfb0 100644
--- a/tests/dictionaries/51remove_fill/00-base.xml
+++ b/tests/dictionaries/51remove_fill/00-base.xml
@@ -1,22 +1,19 @@
-
-
-
- oui
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif
-
-
+
+
+
+ oui
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/51remove_fill/01-base.xml b/tests/dictionaries/51remove_fill/01-base.xml
index f607fb19..f404ec78 100644
--- a/tests/dictionaries/51remove_fill/01-base.xml
+++ b/tests/dictionaries/51remove_fill/01-base.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
diff --git a/tests/dictionaries/52exists_redefine/00-base.xml b/tests/dictionaries/52exists_redefine/00-base.xml
index 39bc3a7b..192bba8a 100644
--- a/tests/dictionaries/52exists_redefine/00-base.xml
+++ b/tests/dictionaries/52exists_redefine/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- oui
-
-
-
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/52exists_redefine/01-base.xml b/tests/dictionaries/52exists_redefine/01-base.xml
index 1dbe1da7..793e4d2e 100644
--- a/tests/dictionaries/52exists_redefine/01-base.xml
+++ b/tests/dictionaries/52exists_redefine/01-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/60action_external/00-base.xml b/tests/dictionaries/60action_external/00-base.xml
index 46d87131..84913090 100644
--- a/tests/dictionaries/60action_external/00-base.xml
+++ b/tests/dictionaries/60action_external/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml b/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
index f547fc6e..5beae659 100644
--- a/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
@@ -1,18 +1,19 @@
+
-
-
-
- 0
-
-
- 0
-
-
-
-
-
- http://localhost/
- extra.test.calc_url
-
-
+
+
+
+ 0
+
+
+ 0
+
+
+
+
+
+ http://localhost/
+ extra.test.calc_url
+
+
diff --git a/tests/dictionaries/60extra_externalspacecondition/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/00-base.xml
index a525e91a..cd3769c6 100644
--- a/tests/dictionaries/60extra_externalspacecondition/00-base.xml
+++ b/tests/dictionaries/60extra_externalspacecondition/00-base.xml
@@ -1,18 +1,16 @@
-
-
-
- no
-
-
- no
-
-
- False
-
-
-
+
+
+
+ no
+
+
+ no
+
+
+ False
+
+
+
-
diff --git a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml
index 26e4174a..52089bf3 100644
--- a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml
@@ -1,15 +1,14 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
diff --git a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml
index 87424efa..f5a5d709 100644
--- a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml
@@ -1,17 +1,16 @@
-
-
+
-
-
-
- test
-
-
-
-
-
- non
- extra1.external
-
-
+
+
+
+ test
+
+
+
+
+
+ non
+ extra1.external
+
+
diff --git a/tests/dictionaries/60extra_group/00-base.xml b/tests/dictionaries/60extra_group/00-base.xml
index 268c2024..22be2589 100644
--- a/tests/dictionaries/60extra_group/00-base.xml
+++ b/tests/dictionaries/60extra_group/00-base.xml
@@ -1,19 +1,19 @@
-
-
- /etc/mailname
- /etc/mailname2
-
-
-
-
-
- non
-
-
- non
-
-
-
+
+
+ /etc/mailname
+ /etc/mailname2
+
+
+
+
+
+ non
+
+
+ non
+
+
+
diff --git a/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml
index 080fdf12..91f69946 100644
--- a/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml
@@ -1,19 +1,18 @@
-
-
+
-
-
-
- test
-
-
- pre
-
-
-
-
-
- mode
-
-
+
+
+
+ test
+
+
+ pre
+
+
+
+
+
+ mode
+
+
diff --git a/tests/dictionaries/60extra_group_name/00-base.xml b/tests/dictionaries/60extra_group_name/00-base.xml
index 268c2024..22be2589 100644
--- a/tests/dictionaries/60extra_group_name/00-base.xml
+++ b/tests/dictionaries/60extra_group_name/00-base.xml
@@ -1,19 +1,19 @@
-
-
- /etc/mailname
- /etc/mailname2
-
-
-
-
-
- non
-
-
- non
-
-
-
+
+
+ /etc/mailname
+ /etc/mailname2
+
+
+
+
+
+ non
+
+
+ non
+
+
+
diff --git a/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml
index 6a507abe..8b03d076 100644
--- a/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml
@@ -1,19 +1,18 @@
-
-
+
-
-
-
- test
-
-
- pre
-
-
-
-
-
- mode
-
-
+
+
+
+ test
+
+
+ pre
+
+
+
+
+
+ mode
+
+
diff --git a/tests/dictionaries/60extra_help/00-base.xml b/tests/dictionaries/60extra_help/00-base.xml
index d8156c27..5299dde1 100644
--- a/tests/dictionaries/60extra_help/00-base.xml
+++ b/tests/dictionaries/60extra_help/00-base.xml
@@ -1,22 +1,18 @@
-
-
-
- /etc/mailname
-
-
-
-
-
-
- non
-
-
- non
-
-
-
+
+
+ /etc/mailname
+
+
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
index e49575c3..dff47ea3 100644
--- a/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
-
-
- non
- activer_ejabberd
- none
- daily
- extra.ejabberd.day
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
+
+
+ non
+ activer_ejabberd
+ none
+ daily
+ extra.ejabberd.day
+
+
diff --git a/tests/dictionaries/60extra_load/00-base.xml b/tests/dictionaries/60extra_load/00-base.xml
index 32dae3d3..8c0f3365 100644
--- a/tests/dictionaries/60extra_load/00-base.xml
+++ b/tests/dictionaries/60extra_load/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml
index ac0557b0..a11e423b 100644
--- a/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
-
-
- non
- activer_ejabberd
- none
- daily
- extra.ejabberd.day
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
+
+
+ non
+ activer_ejabberd
+ none
+ daily
+ extra.ejabberd.day
+
+
diff --git a/tests/dictionaries/60extra_mandatory/00-base.xml b/tests/dictionaries/60extra_mandatory/00-base.xml
index 32dae3d3..8c0f3365 100644
--- a/tests/dictionaries/60extra_mandatory/00-base.xml
+++ b/tests/dictionaries/60extra_mandatory/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml
index c1429053..fd6e7405 100644
--- a/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml
@@ -1,23 +1,22 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
-
-
-
-
-
- non
- activer_ejabberd
- none
- daily
- extra.ejabberd.day
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+
+
+
+
+
+ non
+ activer_ejabberd
+ none
+ daily
+ extra.ejabberd.day
+
+
diff --git a/tests/dictionaries/60extra_name_family/00-base.xml b/tests/dictionaries/60extra_name_family/00-base.xml
index 5f321110..2279aa8d 100644
--- a/tests/dictionaries/60extra_name_family/00-base.xml
+++ b/tests/dictionaries/60extra_name_family/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml
index ac0557b0..a11e423b 100644
--- a/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
-
-
- non
- activer_ejabberd
- none
- daily
- extra.ejabberd.day
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
+
+
+ non
+ activer_ejabberd
+ none
+ daily
+ extra.ejabberd.day
+
+
diff --git a/tests/dictionaries/60extra_no_condition/00-base.xml b/tests/dictionaries/60extra_no_condition/00-base.xml
index 4e809b8b..791dcd42 100644
--- a/tests/dictionaries/60extra_no_condition/00-base.xml
+++ b/tests/dictionaries/60extra_no_condition/00-base.xml
@@ -1,18 +1,16 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml
index 26e4174a..52089bf3 100644
--- a/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml
@@ -1,15 +1,14 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
diff --git a/tests/dictionaries/60extra_redefine/00-base.xml b/tests/dictionaries/60extra_redefine/00-base.xml
index 32dae3d3..8c0f3365 100644
--- a/tests/dictionaries/60extra_redefine/00-base.xml
+++ b/tests/dictionaries/60extra_redefine/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml
index ac0557b0..a11e423b 100644
--- a/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
-
-
- non
- activer_ejabberd
- none
- daily
- extra.ejabberd.day
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
+
+
+ non
+ activer_ejabberd
+ none
+ daily
+ extra.ejabberd.day
+
+
diff --git a/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml b/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml
index e1760cca..9103416e 100644
--- a/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml
+++ b/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml
@@ -1,9 +1,8 @@
-
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/tests/dictionaries/60extra_variable_name_extra/00-base.xml b/tests/dictionaries/60extra_variable_name_extra/00-base.xml
index 32dae3d3..8c0f3365 100644
--- a/tests/dictionaries/60extra_variable_name_extra/00-base.xml
+++ b/tests/dictionaries/60extra_variable_name_extra/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml
index 0ba12c01..1b43cfb7 100644
--- a/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml
@@ -1,7 +1,6 @@
-
-
+
-
-
-
+
+
+
diff --git a/tests/dictionaries/60familyaction/00-base.xml b/tests/dictionaries/60familyaction/00-base.xml
index 46d87131..84913090 100644
--- a/tests/dictionaries/60familyaction/00-base.xml
+++ b/tests/dictionaries/60familyaction/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
index 03e2ed73..9fcc6478 100644
--- a/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
@@ -1,9 +1,10 @@
+
-
-
-
- 0
-
-
-
+
+
+
+ 0
+
+
+
diff --git a/tests/dictionaries/60familyaction_mandatory/00-base.xml b/tests/dictionaries/60familyaction_mandatory/00-base.xml
index 46d87131..84913090 100644
--- a/tests/dictionaries/60familyaction_mandatory/00-base.xml
+++ b/tests/dictionaries/60familyaction_mandatory/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
index 1692f0fc..35fecda4 100644
--- a/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
@@ -1,10 +1,11 @@
+
-
-
-
- 0
-
-
-
-
+
+
+
+ 0
+
+
+
+
diff --git a/tests/dictionaries/61extra_auto_freeze/00-base.xml b/tests/dictionaries/61extra_auto_freeze/00-base.xml
index a41f67c6..0ab77a36 100644
--- a/tests/dictionaries/61extra_auto_freeze/00-base.xml
+++ b/tests/dictionaries/61extra_auto_freeze/00-base.xml
@@ -1,13 +1,11 @@
-
-
-
-
- non
-
-
-
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml b/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml
index 1c1559f5..3d92c2c9 100644
--- a/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml
@@ -1,11 +1,10 @@
-
-
+
-
-
-
- pre
-
-
-
+
+
+
+ pre
+
+
+
diff --git a/tests/dictionaries/61extra_dyn/00-base.xml b/tests/dictionaries/61extra_dyn/00-base.xml
index 81f68781..95b53406 100644
--- a/tests/dictionaries/61extra_dyn/00-base.xml
+++ b/tests/dictionaries/61extra_dyn/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- a
-
-
-
+
+
+
+ a
+
+
+
-
diff --git a/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml b/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml
index e60a1bd8..84709bfe 100644
--- a/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml
@@ -1,9 +1,8 @@
-
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/tests/dictionaries/61extra_dyn_extra/00-base.xml b/tests/dictionaries/61extra_dyn_extra/00-base.xml
index 81f68781..95b53406 100644
--- a/tests/dictionaries/61extra_dyn_extra/00-base.xml
+++ b/tests/dictionaries/61extra_dyn_extra/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- a
-
-
-
+
+
+
+ a
+
+
+
-
diff --git a/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml
index eb77f2df..96ab370d 100644
--- a/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml
@@ -1,14 +1,13 @@
-
-
+
-
-
-
- a
-
-
-
-
-
-
+
+
+
+ a
+
+
+
+
+
+
diff --git a/tests/dictionaries/70container_files/00-base.xml b/tests/dictionaries/70container_files/00-base.xml
index 182a35e7..48ce7ce0 100644
--- a/tests/dictionaries/70container_files/00-base.xml
+++ b/tests/dictionaries/70container_files/00-base.xml
@@ -1,18 +1,16 @@
-
+
-
-
- /etc/mailname
- /rougail.conf
-
-
-
-
-
- oui
-
-
-
+
+
+ /etc/mailname
+ /rougail.conf
+
+
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/70container_files_symlink_multi/00-base.xml b/tests/dictionaries/70container_files_symlink_multi/00-base.xml
index 94c9cb9d..6cdab522 100644
--- a/tests/dictionaries/70container_files_symlink_multi/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi/00-base.xml
@@ -1,19 +1,19 @@
-
+
-
-
- file_name
- file_name2
-
-
-
-
- /etc/mailname
- /etc/mailname2
-
-
- /etc/mailname3
- /etc/mailname4
-
-
+
+
+ file_name
+ file_name2
+
+
+
+
+ /etc/mailname
+ /etc/mailname2
+
+
+ /etc/mailname3
+ /etc/mailname4
+
+
diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml b/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
index 4e29e1bf..3270dc10 100644
--- a/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
@@ -1,23 +1,23 @@
-
+
-
-
- file_name
- file_name2
-
-
-
-
- /etc/mailname
- /etc/mailname2
-
-
- /etc/mailname3
- /etc/mailname4
-
-
- mailname
- mailname2
-
-
+
+
+ file_name
+ file_name2
+
+
+
+
+ /etc/mailname
+ /etc/mailname2
+
+
+ /etc/mailname3
+ /etc/mailname4
+
+
+ mailname
+ mailname2
+
+
diff --git a/tests/dictionaries/70container_files_symlink_variable/00-base.xml b/tests/dictionaries/70container_files_symlink_variable/00-base.xml
index e765c5cc..19f77a67 100644
--- a/tests/dictionaries/70container_files_symlink_variable/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_variable/00-base.xml
@@ -1,16 +1,16 @@
-
+
-
-
- file_name
-
-
-
-
- /etc/mailname
-
-
- mailname
-
-
+
+
+ file_name
+
+
+
+
+ /etc/mailname
+
+
+ mailname
+
+
diff --git a/tests/dictionaries/70container_files_twice/00-base.xml b/tests/dictionaries/70container_files_twice/00-base.xml
index 3e49ccf9..b817d912 100644
--- a/tests/dictionaries/70container_files_twice/00-base.xml
+++ b/tests/dictionaries/70container_files_twice/00-base.xml
@@ -1,19 +1,17 @@
-
+
-
-
- /etc/mailname
- /etc/eole/mailname
- /rougail.conf
-
-
-
-
-
- oui
-
-
-
+
+
+ /etc/mailname
+ /etc/eole/mailname
+ /rougail.conf
+
+
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/70container_filesmulti/00-base.xml b/tests/dictionaries/70container_filesmulti/00-base.xml
index aa0e9ec6..517f4d9d 100644
--- a/tests/dictionaries/70container_filesmulti/00-base.xml
+++ b/tests/dictionaries/70container_filesmulti/00-base.xml
@@ -1,18 +1,16 @@
-
+
-
-
- /etc/mailname
- /etc/mailname2
-
-
-
-
-
- oui
-
-
-
+
+
+ /etc/mailname
+ /etc/mailname2
+
+
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/70container_filesredefine/00-base.xml b/tests/dictionaries/70container_filesredefine/00-base.xml
index 33b6a9c4..7a9c4c73 100644
--- a/tests/dictionaries/70container_filesredefine/00-base.xml
+++ b/tests/dictionaries/70container_filesredefine/00-base.xml
@@ -1,17 +1,15 @@
-
+
-
-
- /etc/mailname
-
-
-
-
-
- oui
-
-
-
+
+
+ /etc/mailname
+
+
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/70container_filesredefine/01-base.xml b/tests/dictionaries/70container_filesredefine/01-base.xml
index dd33c357..185b44d0 100644
--- a/tests/dictionaries/70container_filesredefine/01-base.xml
+++ b/tests/dictionaries/70container_filesredefine/01-base.xml
@@ -1,12 +1,8 @@
-
-
+
-
-
- /etc/mailname
-
-
+
+
+ /etc/mailname
+
+
-
-
diff --git a/tests/dictionaries/70container_new/00-base.xml b/tests/dictionaries/70container_new/00-base.xml
index 1c386e7a..8e6a7e36 100644
--- a/tests/dictionaries/70container_new/00-base.xml
+++ b/tests/dictionaries/70container_new/00-base.xml
@@ -1,16 +1,14 @@
-
+
-
-
+
+
-
-
-
-
- oui
-
-
-
+
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/70container_newnocont/00-base.xml b/tests/dictionaries/70container_newnocont/00-base.xml
index d3a94b62..3cd49c19 100644
--- a/tests/dictionaries/70container_newnocont/00-base.xml
+++ b/tests/dictionaries/70container_newnocont/00-base.xml
@@ -1,16 +1,14 @@
-
+
-
-
+
+
-
-
-
-
- non
-
-
-
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/70container_newwithip/00-base.xml b/tests/dictionaries/70container_newwithip/00-base.xml
index 309151e6..20d12315 100644
--- a/tests/dictionaries/70container_newwithip/00-base.xml
+++ b/tests/dictionaries/70container_newwithip/00-base.xml
@@ -1,17 +1,15 @@
-
+
-
-
+
+
-
-
-
-
- oui
-
-
-
-
+
+
+
+
+ oui
+
+
+
+
-
diff --git a/tests/dictionaries/70container_save/00-base.xml b/tests/dictionaries/70container_save/00-base.xml
index e4f3b05c..ffcda883 100644
--- a/tests/dictionaries/70container_save/00-base.xml
+++ b/tests/dictionaries/70container_save/00-base.xml
@@ -1,13 +1,10 @@
-
-
+
-
-
-
- oui
-
-
-
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/70service_base/00-base.xml b/tests/dictionaries/70service_base/00-base.xml
index e8475d9e..d82671d7 100644
--- a/tests/dictionaries/70service_base/00-base.xml
+++ b/tests/dictionaries/70service_base/00-base.xml
@@ -1,18 +1,14 @@
-
-
+
-
-
-
+
+
-
-
-
-
- oui
-
-
-
+
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/70service_not_managed/00-base.xml b/tests/dictionaries/70service_not_managed/00-base.xml
index 8b00831f..cb3e5b5a 100644
--- a/tests/dictionaries/70service_not_managed/00-base.xml
+++ b/tests/dictionaries/70service_not_managed/00-base.xml
@@ -1,13 +1,13 @@
-
+
-
-
- /tmp/test
-
-
-
-
- mailname
-
-
+
+
+ /tmp/test
+
+
+
+
+ mailname
+
+
diff --git a/tests/dictionaries/70service_servicelist/00-base.xml b/tests/dictionaries/70service_servicelist/00-base.xml
index e06cbe6b..800cad3c 100644
--- a/tests/dictionaries/70service_servicelist/00-base.xml
+++ b/tests/dictionaries/70service_servicelist/00-base.xml
@@ -1,22 +1,18 @@
-
-
+
-
-
-
+
+
-
-
-
- no
-
-
-
-
- yes
- test
-
-
+
+
+
+ no
+
+
+
+
+ yes
+ test
+
+
-
diff --git a/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml b/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml
index 0e21a232..8a68f585 100644
--- a/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml
@@ -1,29 +1,25 @@
-
-
+
-
-
-
+
+
-
-
-
- no
-
-
- no
-
-
-
-
- no
- condition2
-
-
- yes
- test
-
-
+
+
+
+ no
+
+
+ no
+
+
+
+
+ no
+ condition2
+
+
+ yes
+ test
+
+
-
diff --git a/tests/dictionaries/70service_servicelist_file/00-base.xml b/tests/dictionaries/70service_servicelist_file/00-base.xml
index 8136e01d..b74620b4 100644
--- a/tests/dictionaries/70service_servicelist_file/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_file/00-base.xml
@@ -1,24 +1,22 @@
-
+
-
-
- /etc/file
-
-
-
-
- no
-
-
- 192.168.0.1
-
-
-
-
- no
- test
-
-
+
+
+ /etc/file
+
+
+
+
+ no
+
+
+ 192.168.0.1
+
+
+
+
+ no
+ test
+
+
-
diff --git a/tests/dictionaries/70service_servicelist_ip/00-base.xml b/tests/dictionaries/70service_servicelist_ip/00-base.xml
index 0eee58a5..fe7fe748 100644
--- a/tests/dictionaries/70service_servicelist_ip/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_ip/00-base.xml
@@ -1,24 +1,22 @@
-
+
-
-
- nut_monitor_host
-
-
-
-
- no
-
-
- 192.168.0.1
-
-
-
-
- no
- test
-
-
+
+
+ nut_monitor_host
+
+
+
+
+ no
+
+
+ 192.168.0.1
+
+
+
+
+ no
+ test
+
+
-
diff --git a/tests/dictionaries/70service_servicelist_not_managed/00-base.xml b/tests/dictionaries/70service_servicelist_not_managed/00-base.xml
index f9fc0eb5..88e0e411 100644
--- a/tests/dictionaries/70service_servicelist_not_managed/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_not_managed/00-base.xml
@@ -1,22 +1,18 @@
-
-
+
-
-
-
+
+
-
-
-
- no
-
-
-
-
- yes
- test
-
-
+
+
+
+ no
+
+
+
+
+ yes
+ test
+
+
-
diff --git a/tests/dictionaries/70services_ip/00-base.xml b/tests/dictionaries/70services_ip/00-base.xml
index 6c06e3c6..69c6c09f 100644
--- a/tests/dictionaries/70services_ip/00-base.xml
+++ b/tests/dictionaries/70services_ip/00-base.xml
@@ -1,18 +1,13 @@
-
-
+
-
-
-
- nut_monitor_host
-
-
-
-
-
- 192.168.0.1
-
-
+
+
+ nut_monitor_host
+
+
+
+
+ 192.168.0.1
+
+
-
diff --git a/tests/dictionaries/70services_ip_cidr/00-base.xml b/tests/dictionaries/70services_ip_cidr/00-base.xml
index 079b8bb1..05fe7012 100644
--- a/tests/dictionaries/70services_ip_cidr/00-base.xml
+++ b/tests/dictionaries/70services_ip_cidr/00-base.xml
@@ -1,15 +1,13 @@
-
+
-
-
- nut_monitor_host
-
-
-
-
- 192.168.0.0/24
-
-
+
+
+ nut_monitor_host
+
+
+
+
+ 192.168.0.0/24
+
+
-
diff --git a/tests/dictionaries/70services_ip_disabled/00-base.xml b/tests/dictionaries/70services_ip_disabled/00-base.xml
index 6167071b..5e39f5f0 100644
--- a/tests/dictionaries/70services_ip_disabled/00-base.xml
+++ b/tests/dictionaries/70services_ip_disabled/00-base.xml
@@ -1,18 +1,13 @@
-
-
+
-
-
-
- nut_monitor_host
-
-
-
-
-
- 192.168.0.1
-
-
+
+
+ nut_monitor_host
+
+
+
+
+ 192.168.0.1
+
+
-
diff --git a/tests/dictionaries/70services_ip_iplist/00-base.xml b/tests/dictionaries/70services_ip_iplist/00-base.xml
index 7e6bcd5a..d3c5f4bc 100644
--- a/tests/dictionaries/70services_ip_iplist/00-base.xml
+++ b/tests/dictionaries/70services_ip_iplist/00-base.xml
@@ -1,27 +1,23 @@
-
-
+
-
-
- nut_monitor_host
-
-
-
-
- no
-
-
- 192.168.0.0/24
-
-
-
-
-
- yes
- example
- nut_monitor_host
-
-
+
+
+ nut_monitor_host
+
+
+
+
+ no
+
+
+ 192.168.0.0/24
+
+
+
+
+ yes
+ example
+ nut_monitor_host
+
+
-
diff --git a/tests/dictionaries/70services_ip_iplist2/00-base.xml b/tests/dictionaries/70services_ip_iplist2/00-base.xml
index f8376053..b98a7836 100644
--- a/tests/dictionaries/70services_ip_iplist2/00-base.xml
+++ b/tests/dictionaries/70services_ip_iplist2/00-base.xml
@@ -1,26 +1,22 @@
-
-
+
-
-
- nut_monitor_host
-
-
-
-
- yes
-
-
- 192.168.0.0/24
-
-
-
-
-
- yes
- example
-
-
+
+
+ nut_monitor_host
+
+
+
+
+ yes
+
+
+ 192.168.0.0/24
+
+
+
+
+ yes
+ example
+
+
-
diff --git a/tests/dictionaries/70services_ip_leadership/00-base.xml b/tests/dictionaries/70services_ip_leadership/00-base.xml
index db5f119e..3e45a5a3 100644
--- a/tests/dictionaries/70services_ip_leadership/00-base.xml
+++ b/tests/dictionaries/70services_ip_leadership/00-base.xml
@@ -1,25 +1,23 @@
-
+
-
-
- nut_monitor_host
-
-
-
-
-
- 255.255.255.0
-
-
- 192.168.1.0
-
-
-
-
-
- nut_monitor_host
-
-
+
+
+ nut_monitor_host
+
+
+
+
+
+ 255.255.255.0
+
+
+ 192.168.1.0
+
+
+
+
+
+ nut_monitor_host
+
+
-
diff --git a/tests/dictionaries/70services_ip_multi/00-base.xml b/tests/dictionaries/70services_ip_multi/00-base.xml
index a3b5735b..0861344e 100644
--- a/tests/dictionaries/70services_ip_multi/00-base.xml
+++ b/tests/dictionaries/70services_ip_multi/00-base.xml
@@ -1,19 +1,14 @@
-
-
+
-
-
-
- nut_monitor_host
-
-
-
-
-
- 192.168.0.1
- 192.168.0.2
-
-
+
+
+ nut_monitor_host
+
+
+
+
+ 192.168.0.1
+ 192.168.0.2
+
+
-
diff --git a/tests/dictionaries/70services_ip_network/00-base.xml b/tests/dictionaries/70services_ip_network/00-base.xml
index ebe0e8dd..b0c23c63 100644
--- a/tests/dictionaries/70services_ip_network/00-base.xml
+++ b/tests/dictionaries/70services_ip_network/00-base.xml
@@ -1,21 +1,16 @@
-
-
+
-
-
-
- nut_monitor_host
-
-
-
-
-
- 255.255.255.0
-
-
- 192.168.0.0
-
-
+
+
+ nut_monitor_host
+
+
+
+
+ 255.255.255.0
+
+
+ 192.168.0.0
+
+
-
diff --git a/tests/dictionaries/70services_ip_not_mandatory/00-base.xml b/tests/dictionaries/70services_ip_not_mandatory/00-base.xml
index 2f243aee..1fc47a1f 100644
--- a/tests/dictionaries/70services_ip_not_mandatory/00-base.xml
+++ b/tests/dictionaries/70services_ip_not_mandatory/00-base.xml
@@ -1,14 +1,11 @@
-
-
+
-
-
- nut_monitor_host
-
-
-
-
-
+
+
+ nut_monitor_host
+
+
+
+
+
-
diff --git a/tests/dictionaries/70services_ip_twice/00-base.xml b/tests/dictionaries/70services_ip_twice/00-base.xml
index 16d6c77c..94685e2f 100644
--- a/tests/dictionaries/70services_ip_twice/00-base.xml
+++ b/tests/dictionaries/70services_ip_twice/00-base.xml
@@ -1,22 +1,17 @@
-
-
+
-
-
-
- nut_monitor_host
- nut_monitor_host2
-
-
-
-
-
- 192.168.0.1
-
-
- 192.168.0.2
-
-
+
+
+ nut_monitor_host
+ nut_monitor_host2
+
+
+
+
+ 192.168.0.1
+
+
+ 192.168.0.2
+
+
-
diff --git a/tests/dictionaries/80auto_family/00-base.xml b/tests/dictionaries/80auto_family/00-base.xml
index 3a4dcc7e..d0783207 100644
--- a/tests/dictionaries/80auto_family/00-base.xml
+++ b/tests/dictionaries/80auto_family/00-base.xml
@@ -1,18 +1,16 @@
-
-
-
- no
-
-
-
-
-
- oui
- general
-
-
+
+
+
+ no
+
+
+
+
+
+ oui
+ general
+
+
-
diff --git a/tests/dictionaries/80check_unknown/00-base.xml b/tests/dictionaries/80check_unknown/00-base.xml
index 56c314c1..6dec73cf 100644
--- a/tests/dictionaries/80check_unknown/00-base.xml
+++ b/tests/dictionaries/80check_unknown/00-base.xml
@@ -1,21 +1,18 @@
-
-
-
- b
-
-
-
-
-
-
-
- 0
- 100
- int
-
-
+
+
+
+ b
+
+
+
+
+
+
+ 0
+ 100
+ int
+
+
-
diff --git a/tests/dictionaries/80check_unknown_var/00-base.xml b/tests/dictionaries/80check_unknown_var/00-base.xml
index 0ee17772..3f55a489 100644
--- a/tests/dictionaries/80check_unknown_var/00-base.xml
+++ b/tests/dictionaries/80check_unknown_var/00-base.xml
@@ -1,20 +1,16 @@
-
-
-
- b
-
-
-
-
-
-
- int3
- mode_conteneur_actif
-
-
-
+
+
+
+ b
+
+
+
+
+
+ int3
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80check_without_target/00-base.xml b/tests/dictionaries/80check_without_target/00-base.xml
index 32dbf847..26737bf7 100644
--- a/tests/dictionaries/80check_without_target/00-base.xml
+++ b/tests/dictionaries/80check_without_target/00-base.xml
@@ -1,20 +1,17 @@
-
-
-
- b
-
-
-
-
-
-
-
- 0
- 100
-
-
+
+
+
+ b
+
+
+
+
+
+
+ 0
+ 100
+
+
-
diff --git a/tests/dictionaries/80condition_itself/00-base.xml b/tests/dictionaries/80condition_itself/00-base.xml
index cec7d54f..63ca1d57 100644
--- a/tests/dictionaries/80condition_itself/00-base.xml
+++ b/tests/dictionaries/80condition_itself/00-base.xml
@@ -1,16 +1,14 @@
-
-
-
-
-
-
-
- leader-leader
- replicationType
-
-
+
+
+
+
+
+
+
+ leader-leader
+ replicationType
+
+
-
diff --git a/tests/dictionaries/80condition_not_exists_error/00-base.xml b/tests/dictionaries/80condition_not_exists_error/00-base.xml
index 68ee4856..16c72b8c 100644
--- a/tests/dictionaries/80condition_not_exists_error/00-base.xml
+++ b/tests/dictionaries/80condition_not_exists_error/00-base.xml
@@ -1,19 +1,16 @@
-
-
-
- non
-
-
-
-
-
-
- oui
- notexists
-
-
+
+
+
+ non
+
+
+
+
+
+ oui
+ notexists
+
+
-
diff --git a/tests/dictionaries/80condition_not_exists_error_var/00-base.xml b/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
index 0780b037..1062bfdd 100644
--- a/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
+++ b/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
@@ -1,19 +1,16 @@
-
-
-
- non
-
-
-
-
-
-
- oui
- notexists
-
-
+
+
+
+ non
+
+
+
+
+
+ oui
+ notexists
+
+
-
diff --git a/tests/dictionaries/80condition_without_target/00-base.xml b/tests/dictionaries/80condition_without_target/00-base.xml
index cea03270..e8f86ab8 100644
--- a/tests/dictionaries/80condition_without_target/00-base.xml
+++ b/tests/dictionaries/80condition_without_target/00-base.xml
@@ -1,27 +1,24 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- oui
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ oui
+
+
-
diff --git a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
index 2b582d74..bffa2f11 100644
--- a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
+++ b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
@@ -1,18 +1,18 @@
-
+
-
-
- file_name
-
-
-
-
-
- oui
-
-
- /etc/mailname
-
-
-
+
+
+ file_name
+
+
+
+
+
+ oui
+
+
+ /etc/mailname
+
+
+
diff --git a/tests/dictionaries/80container_filesredefine_error/00-base.xml b/tests/dictionaries/80container_filesredefine_error/00-base.xml
index 2bdfa029..7a9c4c73 100644
--- a/tests/dictionaries/80container_filesredefine_error/00-base.xml
+++ b/tests/dictionaries/80container_filesredefine_error/00-base.xml
@@ -1,17 +1,15 @@
-
-
- /etc/mailname
-
-
-
-
-
- oui
-
-
-
+
+
+ /etc/mailname
+
+
+
+
+
+ oui
+
+
+
-
diff --git a/tests/dictionaries/80container_filesredefine_error/01-base.xml b/tests/dictionaries/80container_filesredefine_error/01-base.xml
index da88e950..439c8509 100644
--- a/tests/dictionaries/80container_filesredefine_error/01-base.xml
+++ b/tests/dictionaries/80container_filesredefine_error/01-base.xml
@@ -1,10 +1,8 @@
-
-
- /etc/mailname
-
-
+
+
+ /etc/mailname
+
+
-
diff --git a/tests/dictionaries/80empty_param_number/00_base.xml b/tests/dictionaries/80empty_param_number/00_base.xml
index ec51ecd9..94e1bed4 100644
--- a/tests/dictionaries/80empty_param_number/00_base.xml
+++ b/tests/dictionaries/80empty_param_number/00_base.xml
@@ -1,19 +1,18 @@
-
-
-
+
+
+
-
- 3127
-
-
-
-
-
-
- toto1
-
-
-
+
+ 3127
+
+
+
+
+
+
+ toto1
+
+
diff --git a/tests/dictionaries/80empty_typeeole_eole/00_base.xml b/tests/dictionaries/80empty_typeeole_eole/00_base.xml
index 306c2d0b..af5b8f67 100644
--- a/tests/dictionaries/80empty_typeeole_eole/00_base.xml
+++ b/tests/dictionaries/80empty_typeeole_eole/00_base.xml
@@ -1,25 +1,22 @@
-
-
-
-
-
+
+
+
+
-
- 3127
-
-
-
-
-
-
- non
-
- 3128
- toto2
- toto1
-
-
-
+
+ 3127
+
+
+
+
+
+ non
+
+ 3128
+ toto2
+ toto1
+
+
diff --git a/tests/dictionaries/80empty_typeeole_number/00_base.xml b/tests/dictionaries/80empty_typeeole_number/00_base.xml
index 41cc206a..66f4a224 100644
--- a/tests/dictionaries/80empty_typeeole_number/00_base.xml
+++ b/tests/dictionaries/80empty_typeeole_number/00_base.xml
@@ -1,19 +1,19 @@
-
-
+
+
-
- 3127
-
-
-
-
- non
-
- 3128
- toto2
- toto1
-
-
+
+ 3127
+
+
+
+
+ non
+
+ 3128
+ toto2
+ toto1
+
+
diff --git a/tests/dictionaries/80extra_externalspaceauto/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/00-base.xml
index 0217e0ff..172b7463 100644
--- a/tests/dictionaries/80extra_externalspaceauto/00-base.xml
+++ b/tests/dictionaries/80extra_externalspaceauto/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml
index 2f0455bf..e5eb20f0 100644
--- a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
+
diff --git a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml
index a45c3442..3fe35d76 100644
--- a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml
@@ -1,20 +1,19 @@
-
-
+
-
-
-
- test
-
-
-
-
-
- non
- extra.ejabberd.day
- none
- daily
- extra1.external.description
-
-
+
+
+
+ test
+
+
+
+
+
+ non
+ extra.ejabberd.day
+ none
+ daily
+ extra1.external.description
+
+
diff --git a/tests/dictionaries/80extra_externalspacecondition2/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/00-base.xml
index 0217e0ff..172b7463 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition2/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml
index 2f0455bf..e5eb20f0 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
+
diff --git a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml
index ece8e1a7..e51651d3 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml
@@ -1,17 +1,16 @@
-
-
+
-
-
-
- test
-
-
-
-
-
- non
- extra.ejabberd
-
-
+
+
+
+ test
+
+
+
+
+
+ non
+ extra.ejabberd
+
+
diff --git a/tests/dictionaries/80extra_externalspacecondition3/00-base.xml b/tests/dictionaries/80extra_externalspacecondition3/00-base.xml
index 0217e0ff..172b7463 100644
--- a/tests/dictionaries/80extra_externalspacecondition3/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition3/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml
index b02206e1..a8fe29c8 100644
--- a/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-
-
+
-
-
-
- test
-
-
-
-
-
- non
- general
-
-
+
+
+
+ test
+
+
+
+
+
+ non
+ general
+
+
diff --git a/tests/dictionaries/80extra_rougail/00-base.xml b/tests/dictionaries/80extra_rougail/00-base.xml
index d8b5f8f0..88bab8ca 100644
--- a/tests/dictionaries/80extra_rougail/00-base.xml
+++ b/tests/dictionaries/80extra_rougail/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml b/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml
index cae3048d..c9397191 100644
--- a/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml
+++ b/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml
@@ -1,24 +1,23 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
-
-
- non
- activer_ejabberd
- none
- daily
- extra.ejabberd.day
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
+
+
+ non
+ activer_ejabberd
+ none
+ daily
+ extra.ejabberd.day
+
+
diff --git a/tests/dictionaries/80extra_services/00-base.xml b/tests/dictionaries/80extra_services/00-base.xml
index d8b5f8f0..88bab8ca 100644
--- a/tests/dictionaries/80extra_services/00-base.xml
+++ b/tests/dictionaries/80extra_services/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml b/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml
index ac0557b0..a11e423b 100644
--- a/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml
+++ b/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml
@@ -1,24 +1,23 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
-
-
- non
- activer_ejabberd
- none
- daily
- extra.ejabberd.day
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
+
+
+ non
+ activer_ejabberd
+ none
+ daily
+ extra.ejabberd.day
+
+
diff --git a/tests/dictionaries/80family_appendaccent/00-base.xml b/tests/dictionaries/80family_appendaccent/00-base.xml
index eea45200..4d4f6bda 100644
--- a/tests/dictionaries/80family_appendaccent/00-base.xml
+++ b/tests/dictionaries/80family_appendaccent/00-base.xml
@@ -1,24 +1,21 @@
-
-
-
- non
-
-
-
-
- non
-
-
-
-
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+
+
+ non
+
+
+
+
+
+ non
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80family_appendaccent/01-base.xml b/tests/dictionaries/80family_appendaccent/01-base.xml
index b31afe12..470481fb 100644
--- a/tests/dictionaries/80family_appendaccent/01-base.xml
+++ b/tests/dictionaries/80family_appendaccent/01-base.xml
@@ -1,10 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
diff --git a/tests/dictionaries/80family_appendaccent/02-base.xml b/tests/dictionaries/80family_appendaccent/02-base.xml
index 81155361..a5fa78a9 100644
--- a/tests/dictionaries/80family_appendaccent/02-base.xml
+++ b/tests/dictionaries/80family_appendaccent/02-base.xml
@@ -1,10 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
diff --git a/tests/dictionaries/80family_change/00-base.xml b/tests/dictionaries/80family_change/00-base.xml
index 2c7fbada..b9812764 100644
--- a/tests/dictionaries/80family_change/00-base.xml
+++ b/tests/dictionaries/80family_change/00-base.xml
@@ -1,15 +1,13 @@
-
-
-
- non
-
-
- non
-
-
-
+
+
+
+ non
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80family_change/01-base.xml b/tests/dictionaries/80family_change/01-base.xml
index 330752a1..362cc6b4 100644
--- a/tests/dictionaries/80family_change/01-base.xml
+++ b/tests/dictionaries/80family_change/01-base.xml
@@ -1,10 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
diff --git a/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml b/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml
index 7fbdd546..776efdf4 100644
--- a/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml
@@ -1,26 +1,25 @@
-
-
+
-
-
-
- val1
- val2
-
-
-
-
- val
-
-
-
-
-
-
-
-
- unknown
- vardyn
-
-
+
+
+
+ val1
+ val2
+
+
+
+
+ val
+
+
+
+
+
+
+
+
+ unknown
+ vardyn
+
+
diff --git a/tests/dictionaries/80family_dynamic_check/00-base.xml b/tests/dictionaries/80family_dynamic_check/00-base.xml
index 5136eadf..d27806e9 100644
--- a/tests/dictionaries/80family_dynamic_check/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_check/00-base.xml
@@ -1,22 +1,21 @@
-
-
+
-
-
-
- val1
- val2
-
-
-
-
-
-
-
-
- 0
- 100
- vardynval1
-
-
+
+
+
+ val1
+ val2
+
+
+
+
+
+
+
+
+ 0
+ 100
+ vardynval1
+
+
diff --git a/tests/dictionaries/80family_dynamic_not_multi/00-base.xml b/tests/dictionaries/80family_dynamic_not_multi/00-base.xml
index fa524864..2c2f7f2e 100644
--- a/tests/dictionaries/80family_dynamic_not_multi/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_not_multi/00-base.xml
@@ -1,14 +1,13 @@
-
-
+
-
-
-
- val1
-
-
-
-
-
-
+
+
+
+ val1
+
+
+
+
+
+
diff --git a/tests/dictionaries/80family_dynamic_with_family/00-base.xml b/tests/dictionaries/80family_dynamic_with_family/00-base.xml
index b5de9b92..bd2842d6 100644
--- a/tests/dictionaries/80family_dynamic_with_family/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_with_family/00-base.xml
@@ -1,16 +1,15 @@
-
-
+
-
-
-
- val1
- val2
-
-
-
-
-
-
-
+
+
+
+ val1
+ val2
+
+
+
+
+
+
+
diff --git a/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml b/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml
index 4e9f0861..25cc4f33 100644
--- a/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml
+++ b/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml
@@ -1,26 +1,25 @@
-
-
+
-
-
-
- val1
- val2
-
-
-
-
- val
-
-
-
-
-
-
-
-
-
- newvar
-
-
+
+
+
+ val1
+ val2
+
+
+
+
+ val
+
+
+
+
+
+
+
+
+
+ newvar
+
+
diff --git a/tests/dictionaries/80family_only_on_suffix/00-base.xml b/tests/dictionaries/80family_only_on_suffix/00-base.xml
index 65816e5f..7c16afab 100644
--- a/tests/dictionaries/80family_only_on_suffix/00-base.xml
+++ b/tests/dictionaries/80family_only_on_suffix/00-base.xml
@@ -1,21 +1,20 @@
-
-
+
-
-
-
- val1
- val2
-
-
-
-
-
-
-
-
- value
- vardynval1
-
-
+
+
+
+ val1
+ val2
+
+
+
+
+
+
+
+
+ value
+ vardynval1
+
+
diff --git a/tests/dictionaries/80family_several/00-base.xml b/tests/dictionaries/80family_several/00-base.xml
index d53f2304..f2d390cd 100644
--- a/tests/dictionaries/80family_several/00-base.xml
+++ b/tests/dictionaries/80family_several/00-base.xml
@@ -1,30 +1,29 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/80family_unique/00-base.xml b/tests/dictionaries/80family_unique/00-base.xml
index d4a6768c..6c84ee8b 100644
--- a/tests/dictionaries/80family_unique/00-base.xml
+++ b/tests/dictionaries/80family_unique/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/80family_variable_not_same_name/00-base.xml b/tests/dictionaries/80family_variable_not_same_name/00-base.xml
index 6d300ef6..1e3b5135 100644
--- a/tests/dictionaries/80family_variable_not_same_name/00-base.xml
+++ b/tests/dictionaries/80family_variable_not_same_name/00-base.xml
@@ -1,11 +1,9 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/80familyaction_accent/00-base.xml b/tests/dictionaries/80familyaction_accent/00-base.xml
index fe0ee547..af8b3e8b 100644
--- a/tests/dictionaries/80familyaction_accent/00-base.xml
+++ b/tests/dictionaries/80familyaction_accent/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml b/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml
index 03e2ed73..9fcc6478 100644
--- a/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml
@@ -1,9 +1,10 @@
+
-
-
-
- 0
-
-
-
+
+
+
+ 0
+
+
+
diff --git a/tests/dictionaries/80file_wrong_type/00-base.xml b/tests/dictionaries/80file_wrong_type/00-base.xml
index 41f2f638..951c7b55 100644
--- a/tests/dictionaries/80file_wrong_type/00-base.xml
+++ b/tests/dictionaries/80file_wrong_type/00-base.xml
@@ -1,13 +1,13 @@
-
+
-
-
- file_name
-
-
-
-
- /etc/mailname
-
-
+
+
+ file_name
+
+
+
+
+ /etc/mailname
+
+
diff --git a/tests/dictionaries/80fill_baseaccent/00-base.xml b/tests/dictionaries/80fill_baseaccent/00-base.xml
index 03c8dd40..c7e307fb 100644
--- a/tests/dictionaries/80fill_baseaccent/00-base.xml
+++ b/tests/dictionaries/80fill_baseaccent/00-base.xml
@@ -1,22 +1,19 @@
-
-
-
- non
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80fill_error/00-base.xml b/tests/dictionaries/80fill_error/00-base.xml
index def2932e..211dd395 100644
--- a/tests/dictionaries/80fill_error/00-base.xml
+++ b/tests/dictionaries/80fill_error/00-base.xml
@@ -1,24 +1,20 @@
-
-
-
-
- non
-
-
-
-
-
-
- valeur
- mode_conteneur_actif
-
-
- valeur2
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+
+
+
+ valeur
+ mode_conteneur_actif
+
+
+ valeur2
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80fill_multi/00-base.xml b/tests/dictionaries/80fill_multi/00-base.xml
index 9606cc8c..64dc527a 100644
--- a/tests/dictionaries/80fill_multi/00-base.xml
+++ b/tests/dictionaries/80fill_multi/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
- non
-
-
-
-
-
-
- value
- mode_conteneur_actif
-
-
- mode_conteneur_actif1
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+ value
+ mode_conteneur_actif
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80fill_not_exists/00-base.xml b/tests/dictionaries/80fill_not_exists/00-base.xml
index 131e69d6..fdbb6938 100644
--- a/tests/dictionaries/80fill_not_exists/00-base.xml
+++ b/tests/dictionaries/80fill_not_exists/00-base.xml
@@ -1,24 +1,21 @@
-
-
-
- non
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif4
- mode_conteneur_actif1
- mode_conteneur_actif3
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif4
+ mode_conteneur_actif1
+ mode_conteneur_actif3
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80fill_unknown_function/00-base.xml b/tests/dictionaries/80fill_unknown_function/00-base.xml
index 652dfb87..be0452e3 100644
--- a/tests/dictionaries/80fill_unknown_function/00-base.xml
+++ b/tests/dictionaries/80fill_unknown_function/00-base.xml
@@ -1,20 +1,17 @@
-
-
-
-
- non
-
-
-
-
-
-
- mode_conteneur_actif1
- mode_conteneur_actif
-
-
+
+
+
+
+ non
+
+
+
+
+
+ mode_conteneur_actif1
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80frozenifin_unknown/00-base.xml b/tests/dictionaries/80frozenifin_unknown/00-base.xml
index 399abe46..c0ffcee9 100644
--- a/tests/dictionaries/80frozenifin_unknown/00-base.xml
+++ b/tests/dictionaries/80frozenifin_unknown/00-base.xml
@@ -1,30 +1,26 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
- 1
- 2
- 3
- enumvar
-
-
- 4
- test_variable
-
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+ 1
+ 2
+ 3
+ enumvar
+
+
+ 4
+ test_variable
+
+
-
diff --git a/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml b/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml
index a547bdc3..dd21c18b 100644
--- a/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml
+++ b/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml
@@ -1,26 +1,25 @@
-
-
+
-
-
-
- val1
- val2
-
-
-
-
- val
-
-
-
-
-
-
-
-
- non
- new
-
-
+
+
+
+ val1
+ val2
+
+
+
+
+ val
+
+
+
+
+
+
+
+
+ non
+ new
+
+
diff --git a/tests/dictionaries/80hidden_if_in_filelist/00-base.xml b/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
index 7aaf14d7..c7bd8f78 100644
--- a/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
@@ -1,26 +1,24 @@
-
-
- /tmp/file1
-
-
-
-
-
- non
-
-
- non
-
-
-
-
-
- non
- afilllist
-
-
+
+
+ /tmp/file1
+
+
+
+
+
+ non
+
+
+ non
+
+
+
+
+
+ non
+ afilllist
+
+
-
diff --git a/tests/dictionaries/80invalid_dtd/00_base.xml b/tests/dictionaries/80invalid_dtd/00_base.xml
index 01935505..9ffb9dee 100644
--- a/tests/dictionaries/80invalid_dtd/00_base.xml
+++ b/tests/dictionaries/80invalid_dtd/00_base.xml
@@ -1,7 +1,7 @@
-
-
+
+
-
+
diff --git a/tests/dictionaries/80leadership_accent/00-base.xml b/tests/dictionaries/80leadership_accent/00-base.xml
index b38a223d..c529e7c0 100644
--- a/tests/dictionaries/80leadership_accent/00-base.xml
+++ b/tests/dictionaries/80leadership_accent/00-base.xml
@@ -1,30 +1,29 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- Followér1
- follower2
-
-
- Followér1
- Followér2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ Followér1
+ follower2
+
+
+ Followér1
+ Followér2
+
+
diff --git a/tests/dictionaries/80leadership_accent_leader/00-base.xml b/tests/dictionaries/80leadership_accent_leader/00-base.xml
index 59013e03..6f2d7f4c 100644
--- a/tests/dictionaries/80leadership_accent_leader/00-base.xml
+++ b/tests/dictionaries/80leadership_accent_leader/00-base.xml
@@ -1,30 +1,29 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/80leadership_auto_save/00-base.xml b/tests/dictionaries/80leadership_auto_save/00-base.xml
index be9f75ad..ac6ebb0b 100644
--- a/tests/dictionaries/80leadership_auto_save/00-base.xml
+++ b/tests/dictionaries/80leadership_auto_save/00-base.xml
@@ -1,29 +1,28 @@
-
-
-
-
- non
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+
+ non
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/80leadership_autofreeze/00-base.xml b/tests/dictionaries/80leadership_autofreeze/00-base.xml
index 41349632..c56dc7ad 100644
--- a/tests/dictionaries/80leadership_autofreeze/00-base.xml
+++ b/tests/dictionaries/80leadership_autofreeze/00-base.xml
@@ -1,26 +1,25 @@
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/80leadership_familyaccent/00-base.xml b/tests/dictionaries/80leadership_familyaccent/00-base.xml
index e0dfdd9c..59563c88 100644
--- a/tests/dictionaries/80leadership_familyaccent/00-base.xml
+++ b/tests/dictionaries/80leadership_familyaccent/00-base.xml
@@ -1,28 +1,27 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/80leadership_leader_not_multi/00-base.xml b/tests/dictionaries/80leadership_leader_not_multi/00-base.xml
index 5e04647a..c666b05d 100644
--- a/tests/dictionaries/80leadership_leader_not_multi/00-base.xml
+++ b/tests/dictionaries/80leadership_leader_not_multi/00-base.xml
@@ -1,22 +1,21 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml b/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml
index f09a21fe..c47c63bf 100644
--- a/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml
+++ b/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml
@@ -1,28 +1,27 @@
-
-
-
-
- non
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+
+ non
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/80leadership_not_ordered/00-base.xml b/tests/dictionaries/80leadership_not_ordered/00-base.xml
index 9c5b0541..a81750ae 100644
--- a/tests/dictionaries/80leadership_not_ordered/00-base.xml
+++ b/tests/dictionaries/80leadership_not_ordered/00-base.xml
@@ -1,30 +1,29 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower2
- follower1
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower2
+ follower1
+
+
diff --git a/tests/dictionaries/80leadership_not_same_family/00-base.xml b/tests/dictionaries/80leadership_not_same_family/00-base.xml
index 1b7c1d2a..17f58ac8 100644
--- a/tests/dictionaries/80leadership_not_same_family/00-base.xml
+++ b/tests/dictionaries/80leadership_not_same_family/00-base.xml
@@ -1,32 +1,31 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/80leadership_notexists/00-base.xml b/tests/dictionaries/80leadership_notexists/00-base.xml
index aae9b700..677c35ce 100644
--- a/tests/dictionaries/80leadership_notexists/00-base.xml
+++ b/tests/dictionaries/80leadership_notexists/00-base.xml
@@ -1,32 +1,31 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
- valfill
- follower1
-
-
- follower1
- follower2
-
-
- follower1
- follower2
-
-
- follower3
- follower4
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+ valfill
+ follower1
+
+
+ follower1
+ follower2
+
+
+ follower1
+ follower2
+
+
+ follower3
+ follower4
+
+
diff --git a/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml b/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml
index ce569d65..80b22b7d 100644
--- a/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml
+++ b/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml
@@ -1,32 +1,29 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
- non
-
-
-
-
-
-
- oui
- mode_conteneur_actif
- mode_conteneur_actif2
- Général2
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+ non
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+ Général2
+
+
-
diff --git a/tests/dictionaries/80load_leadership_normalize_family/00-base.xml b/tests/dictionaries/80load_leadership_normalize_family/00-base.xml
index fed57268..bfd56a01 100644
--- a/tests/dictionaries/80load_leadership_normalize_family/00-base.xml
+++ b/tests/dictionaries/80load_leadership_normalize_family/00-base.xml
@@ -1,21 +1,21 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/80load_leadership_normalize_family/01-base.xml b/tests/dictionaries/80load_leadership_normalize_family/01-base.xml
index 3641da10..568a8bc3 100644
--- a/tests/dictionaries/80load_leadership_normalize_family/01-base.xml
+++ b/tests/dictionaries/80load_leadership_normalize_family/01-base.xml
@@ -1,8 +1,8 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/tests/dictionaries/80load_mandatoryifin_family/00-base.xml b/tests/dictionaries/80load_mandatoryifin_family/00-base.xml
index 2be2b27e..f0098ec1 100644
--- a/tests/dictionaries/80load_mandatoryifin_family/00-base.xml
+++ b/tests/dictionaries/80load_mandatoryifin_family/00-base.xml
@@ -1,20 +1,17 @@
-
-
-
-
-
-
-
-
-
-
-
- oui
- general2
-
-
+
+
+
+
+
+
+
+
+
+
+ oui
+ general2
+
+
-
diff --git a/tests/dictionaries/80mode_conflict/00-base.xml b/tests/dictionaries/80mode_conflict/00-base.xml
index b13b1ea0..be7c99e0 100644
--- a/tests/dictionaries/80mode_conflict/00-base.xml
+++ b/tests/dictionaries/80mode_conflict/00-base.xml
@@ -1,13 +1,11 @@
-
-
-
-
- non
-
-
-
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80mode_leadership_conflict/00-base.xml b/tests/dictionaries/80mode_leadership_conflict/00-base.xml
index 84623be4..cc72e7b4 100644
--- a/tests/dictionaries/80mode_leadership_conflict/00-base.xml
+++ b/tests/dictionaries/80mode_leadership_conflict/00-base.xml
@@ -1,26 +1,25 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
- leader
-
-
- follower1
- follower2
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+ leader
+
+
+ follower1
+ follower2
+
+
diff --git a/tests/dictionaries/80multi_family_mode_conflict/00-base.xml b/tests/dictionaries/80multi_family_mode_conflict/00-base.xml
index ddfc0f87..1ef22d25 100644
--- a/tests/dictionaries/80multi_family_mode_conflict/00-base.xml
+++ b/tests/dictionaries/80multi_family_mode_conflict/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/80nil_with_value/00-base.xml b/tests/dictionaries/80nil_with_value/00-base.xml
index b6c20a82..0d361343 100644
--- a/tests/dictionaries/80nil_with_value/00-base.xml
+++ b/tests/dictionaries/80nil_with_value/00-base.xml
@@ -1,27 +1,24 @@
-
-
-
- non
-
-
- non
-
-
- non
-
-
-
-
-
-
- value
- mode_conteneur_actif
- mode_conteneur_actif2
- afilllist
-
-
+
+
+
+ non
+
+
+ non
+
+
+ non
+
+
+
+
+
+ value
+ mode_conteneur_actif
+ mode_conteneur_actif2
+ afilllist
+
+
-
diff --git a/tests/dictionaries/80no_leadership_index/00-base.xml b/tests/dictionaries/80no_leadership_index/00-base.xml
index 4804f80f..3f0131b1 100644
--- a/tests/dictionaries/80no_leadership_index/00-base.xml
+++ b/tests/dictionaries/80no_leadership_index/00-base.xml
@@ -1,13 +1,12 @@
-
-
-
-
-
-
-
- my_variable
-
-
+
+
+
+
+
+
+ my_variable
+
+
diff --git a/tests/dictionaries/80override_twice/00-base.xml b/tests/dictionaries/80override_twice/00-base.xml
index 8345c642..5114fca2 100644
--- a/tests/dictionaries/80override_twice/00-base.xml
+++ b/tests/dictionaries/80override_twice/00-base.xml
@@ -1,20 +1,16 @@
-
-
-
-
-
-
-
-
-
-
-
- non
-
-
-
+
+
+
+
+
+
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80redefine_double_error/00-base.xml b/tests/dictionaries/80redefine_double_error/00-base.xml
index 9ea33030..8c9d801f 100644
--- a/tests/dictionaries/80redefine_double_error/00-base.xml
+++ b/tests/dictionaries/80redefine_double_error/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80redefine_double_error/01-base.xml b/tests/dictionaries/80redefine_double_error/01-base.xml
index 7fa2b135..9488593c 100644
--- a/tests/dictionaries/80redefine_double_error/01-base.xml
+++ b/tests/dictionaries/80redefine_double_error/01-base.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
diff --git a/tests/dictionaries/80redefine_double_error/02-base.xml b/tests/dictionaries/80redefine_double_error/02-base.xml
index 098b70bc..5f50358e 100644
--- a/tests/dictionaries/80redefine_double_error/02-base.xml
+++ b/tests/dictionaries/80redefine_double_error/02-base.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
diff --git a/tests/dictionaries/80redefine_error/00-base.xml b/tests/dictionaries/80redefine_error/00-base.xml
index 9ea33030..8c9d801f 100644
--- a/tests/dictionaries/80redefine_error/00-base.xml
+++ b/tests/dictionaries/80redefine_error/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80redefine_error/01-redefine.xml b/tests/dictionaries/80redefine_error/01-redefine.xml
index 9ea33030..8c9d801f 100644
--- a/tests/dictionaries/80redefine_error/01-redefine.xml
+++ b/tests/dictionaries/80redefine_error/01-redefine.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80redefine_fillerror/00-base.xml b/tests/dictionaries/80redefine_fillerror/00-base.xml
index 7b67be9a..474e7756 100644
--- a/tests/dictionaries/80redefine_fillerror/00-base.xml
+++ b/tests/dictionaries/80redefine_fillerror/00-base.xml
@@ -1,20 +1,16 @@
-
-
-
- non
-
-
-
-
-
-
- valeur
- mode_conteneur_actif
-
-
-
+
+
+
+ non
+
+
+
+
+
+ valeur
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80redefine_fillerror/01-base.xml b/tests/dictionaries/80redefine_fillerror/01-base.xml
index 98edd8f6..bc69cd75 100644
--- a/tests/dictionaries/80redefine_fillerror/01-base.xml
+++ b/tests/dictionaries/80redefine_fillerror/01-base.xml
@@ -1,9 +1,9 @@
-
-
- valeur
- mode_conteneur_actif
-
-
+
+
+ valeur
+ mode_conteneur_actif
+
+
diff --git a/tests/dictionaries/80redefine_notexists/00-base.xml b/tests/dictionaries/80redefine_notexists/00-base.xml
index 9ea33030..8c9d801f 100644
--- a/tests/dictionaries/80redefine_notexists/00-base.xml
+++ b/tests/dictionaries/80redefine_notexists/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80redefine_notexists/01-redefine.xml b/tests/dictionaries/80redefine_notexists/01-redefine.xml
index f6dc3434..88750884 100644
--- a/tests/dictionaries/80redefine_notexists/01-redefine.xml
+++ b/tests/dictionaries/80redefine_notexists/01-redefine.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/80service_not_managed_overrides/00-base.xml b/tests/dictionaries/80service_not_managed_overrides/00-base.xml
index 923a828b..4ab31bf6 100644
--- a/tests/dictionaries/80service_not_managed_overrides/00-base.xml
+++ b/tests/dictionaries/80service_not_managed_overrides/00-base.xml
@@ -1,13 +1,13 @@
-
+
-
-
-
-
-
-
-
- mailname
-
-
+
+
+
+
+
+
+
+ mailname
+
+
diff --git a/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml b/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml
index 538e7bee..7bb0cce0 100644
--- a/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml
@@ -1,14 +1,12 @@
-
+
-
-
- nut_monitor_host
-
-
-
-
-
-
+
+
+ nut_monitor_host
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/80services_ip_netmask/00-base.xml b/tests/dictionaries/80services_ip_netmask/00-base.xml
index 5b5a7a71..cc58453f 100644
--- a/tests/dictionaries/80services_ip_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_netmask/00-base.xml
@@ -1,17 +1,12 @@
-
-
+
-
-
-
- nut_monitor_host
-
-
-
-
-
-
-
+
+
+ nut_monitor_host
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml b/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml
index 3cdd5971..4d7db961 100644
--- a/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml
@@ -1,16 +1,11 @@
-
-
+
-
-
-
- nut_monitor_host
-
-
-
-
-
-
+
+
+ nut_monitor_host
+
+
+
+
+
-
diff --git a/tests/dictionaries/80services_ip_not_netmask/00-base.xml b/tests/dictionaries/80services_ip_not_netmask/00-base.xml
index 8a6c7f86..fb6c6dda 100644
--- a/tests/dictionaries/80services_ip_not_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_not_netmask/00-base.xml
@@ -1,17 +1,12 @@
-
-
+
-
-
-
- nut_monitor_host
-
-
-
-
-
-
-
+
+
+ nut_monitor_host
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/80services_ip_wrong_type/00-base.xml b/tests/dictionaries/80services_ip_wrong_type/00-base.xml
index 9d94e645..4a32f9bd 100644
--- a/tests/dictionaries/80services_ip_wrong_type/00-base.xml
+++ b/tests/dictionaries/80services_ip_wrong_type/00-base.xml
@@ -1,18 +1,13 @@
-
-
+
-
-
-
- nut_monitor_host
-
-
-
-
-
- 192.168.0.1
-
-
+
+
+ nut_monitor_host
+
+
+
+
+ 192.168.0.1
+
+
-
diff --git a/tests/dictionaries/80target_list_unknown/00-base.xml b/tests/dictionaries/80target_list_unknown/00-base.xml
index f1145b5b..16a3d95a 100644
--- a/tests/dictionaries/80target_list_unknown/00-base.xml
+++ b/tests/dictionaries/80target_list_unknown/00-base.xml
@@ -1,15 +1,12 @@
-
-
-
-
-
-
- True
- unknown
-
-
+
+
+
+
+
+ True
+ unknown
+
+
-
diff --git a/tests/dictionaries/80unknown_type/00-base.xml b/tests/dictionaries/80unknown_type/00-base.xml
index 20491818..cb8d20a5 100644
--- a/tests/dictionaries/80unknown_type/00-base.xml
+++ b/tests/dictionaries/80unknown_type/00-base.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
diff --git a/tests/dictionaries/80valid_entier_invalid_param/00-base.xml b/tests/dictionaries/80valid_entier_invalid_param/00-base.xml
index e7a71186..7a308656 100644
--- a/tests/dictionaries/80valid_entier_invalid_param/00-base.xml
+++ b/tests/dictionaries/80valid_entier_invalid_param/00-base.xml
@@ -1,20 +1,17 @@
-
-
-
- b
-
-
-
-
-
-
-
- 0
- int
-
-
+
+
+
+ b
+
+
+
+
+
+
+ 0
+ int
+
+
-
diff --git a/tests/dictionaries/80valid_entier_not_number/00-base.xml b/tests/dictionaries/80valid_entier_not_number/00-base.xml
index f3693fca..90129a8e 100644
--- a/tests/dictionaries/80valid_entier_not_number/00-base.xml
+++ b/tests/dictionaries/80valid_entier_not_number/00-base.xml
@@ -1,21 +1,18 @@
-
-
-
- b
-
-
-
-
-
-
-
- 0
- 100
- int
-
-
+
+
+
+ b
+
+
+
+
+
+
+ 0
+ 100
+ int
+
+
-
diff --git a/tests/dictionaries/80valid_entier_without_param/00-base.xml b/tests/dictionaries/80valid_entier_without_param/00-base.xml
index d636ae03..c059b410 100644
--- a/tests/dictionaries/80valid_entier_without_param/00-base.xml
+++ b/tests/dictionaries/80valid_entier_without_param/00-base.xml
@@ -1,19 +1,16 @@
-
-
-
- b
-
-
-
-
-
-
-
- int
-
-
+
+
+
+ b
+
+
+
+
+
+
+ int
+
+
-
diff --git a/tests/dictionaries/80valid_enum_base_redefine/00-base.xml b/tests/dictionaries/80valid_enum_base_redefine/00-base.xml
index 120c5a4f..2f2b57b9 100644
--- a/tests/dictionaries/80valid_enum_base_redefine/00-base.xml
+++ b/tests/dictionaries/80valid_enum_base_redefine/00-base.xml
@@ -1,35 +1,32 @@
-
-
-
- non
-
-
-
-
- c
-
-
- c
-
-
-
-
-
-
- a
- b
- c
- enumvar
-
-
- a
- b
- c
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+ c
+
+
+ c
+
+
+
+
+
+ a
+ b
+ c
+ enumvar
+
+
+ a
+ b
+ c
+ enumvar
+
+
-
diff --git a/tests/dictionaries/80valid_enum_base_redefine/01-base.xml b/tests/dictionaries/80valid_enum_base_redefine/01-base.xml
index d220950b..64ff8015 100644
--- a/tests/dictionaries/80valid_enum_base_redefine/01-base.xml
+++ b/tests/dictionaries/80valid_enum_base_redefine/01-base.xml
@@ -1,20 +1,17 @@
-
-
-
- c
-
-
-
-
-
-
- a
- c
- enumvar
-
-
+
+
+
+ c
+
+
+
+
+
+ a
+ c
+ enumvar
+
+
-
diff --git a/tests/dictionaries/80valid_enum_multi_param/00-base.xml b/tests/dictionaries/80valid_enum_multi_param/00-base.xml
index 2078e776..c427f211 100644
--- a/tests/dictionaries/80valid_enum_multi_param/00-base.xml
+++ b/tests/dictionaries/80valid_enum_multi_param/00-base.xml
@@ -1,24 +1,22 @@
-
-
-
- a
-
-
- a
- b
- c
-
-
-
-
-
- var
- d
- mode_conteneur_actif
-
-
+
+
+
+ a
+
+
+ a
+ b
+ c
+
+
+
+
+
+ var
+ d
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80valid_enum_multi_variable/00-base.xml b/tests/dictionaries/80valid_enum_multi_variable/00-base.xml
index c0b9e69a..292c6026 100644
--- a/tests/dictionaries/80valid_enum_multi_variable/00-base.xml
+++ b/tests/dictionaries/80valid_enum_multi_variable/00-base.xml
@@ -1,29 +1,27 @@
-
-
-
- a
-
-
- a
- b
- c
-
-
- a
- b
- c
-
-
-
-
-
- var
- var2
- mode_conteneur_actif
-
-
+
+
+
+ a
+
+
+ a
+ b
+ c
+
+
+ a
+ b
+ c
+
+
+
+
+
+ var
+ var2
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80valid_enum_no_param/00-base.xml b/tests/dictionaries/80valid_enum_no_param/00-base.xml
index d5209327..6a067d77 100644
--- a/tests/dictionaries/80valid_enum_no_param/00-base.xml
+++ b/tests/dictionaries/80valid_enum_no_param/00-base.xml
@@ -1,23 +1,20 @@
-
-
-
- non
-
-
-
-
- c
-
-
-
-
-
-
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+ c
+
+
+
+
+
+ enumvar
+
+
-
diff --git a/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml b/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml
index b7031f48..76c6a85e 100644
--- a/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml
+++ b/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml
@@ -1,21 +1,19 @@
-
-
-
- a
-
-
- a
-
-
-
-
-
- var
- mode_conteneur_actif
-
-
+
+
+
+ a
+
+
+ a
+
+
+
+
+
+ var
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80valid_enum_number_without_value/00-base.xml b/tests/dictionaries/80valid_enum_number_without_value/00-base.xml
index cf929804..d0ed36d9 100644
--- a/tests/dictionaries/80valid_enum_number_without_value/00-base.xml
+++ b/tests/dictionaries/80valid_enum_number_without_value/00-base.xml
@@ -1,23 +1,19 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
- enumvar
-
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+ enumvar
+
+
-
diff --git a/tests/dictionaries/80value_not_multi/00-base.xml b/tests/dictionaries/80value_not_multi/00-base.xml
index 288ee61e..2e3d57be 100644
--- a/tests/dictionaries/80value_not_multi/00-base.xml
+++ b/tests/dictionaries/80value_not_multi/00-base.xml
@@ -1,12 +1,9 @@
-
-
+
-
-
- 192.168.0.1
- 192.168.0.2
-
-
+
+
+ 192.168.0.1
+ 192.168.0.2
+
+
-
diff --git a/tests/dictionaries/80variable_accent/00-base.xml b/tests/dictionaries/80variable_accent/00-base.xml
index ac4a4ffe..91c184e7 100644
--- a/tests/dictionaries/80variable_accent/00-base.xml
+++ b/tests/dictionaries/80variable_accent/00-base.xml
@@ -1,23 +1,21 @@
-
-
-
- non
-
-
-
-
- non
-
-
-
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+
+
+ non
+
+
+
+
+
+ non
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/80variable_accent/01-base.xml b/tests/dictionaries/80variable_accent/01-base.xml
index b31afe12..470481fb 100644
--- a/tests/dictionaries/80variable_accent/01-base.xml
+++ b/tests/dictionaries/80variable_accent/01-base.xml
@@ -1,10 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
diff --git a/tests/dictionaries/80variable_accent/02-base.xml b/tests/dictionaries/80variable_accent/02-base.xml
index 81155361..a5fa78a9 100644
--- a/tests/dictionaries/80variable_accent/02-base.xml
+++ b/tests/dictionaries/80variable_accent/02-base.xml
@@ -1,10 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
diff --git a/tests/dictionaries/80variable_extra/00-base.xml b/tests/dictionaries/80variable_extra/00-base.xml
index c7f7a65e..1b43cfb7 100644
--- a/tests/dictionaries/80variable_extra/00-base.xml
+++ b/tests/dictionaries/80variable_extra/00-base.xml
@@ -1,8 +1,6 @@
-
-
-
+
+
+
-
diff --git a/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml
index 28e8e579..01bb0521 100644
--- a/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml
@@ -1,7 +1,6 @@
-
-
+
-
-
-
+
+
+
diff --git a/tests/dictionaries/80variable_family_not_same_name/00-base.xml b/tests/dictionaries/80variable_family_not_same_name/00-base.xml
index c2433b7a..699d2292 100644
--- a/tests/dictionaries/80variable_family_not_same_name/00-base.xml
+++ b/tests/dictionaries/80variable_family_not_same_name/00-base.xml
@@ -1,11 +1,9 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
diff --git a/tests/dictionaries/80variable_rougail/00-base.xml b/tests/dictionaries/80variable_rougail/00-base.xml
index f5bbbd5b..821d6eec 100644
--- a/tests/dictionaries/80variable_rougail/00-base.xml
+++ b/tests/dictionaries/80variable_rougail/00-base.xml
@@ -1,8 +1,6 @@
-
-
-
+
+
+
-
diff --git a/tests/dictionaries/80variable_up/00-base.xml b/tests/dictionaries/80variable_up/00-base.xml
index 443f4139..6a17ac95 100644
--- a/tests/dictionaries/80variable_up/00-base.xml
+++ b/tests/dictionaries/80variable_up/00-base.xml
@@ -1,23 +1,21 @@
-
-
-
- non
-
-
-
-
- non
-
-
-
-
-
- non
- mode_conteneur_actif
-
-
+
+
+
+ non
+
+
+
+
+ non
+
+
+
+
+
+ non
+ mode_conteneur_actif
+
+
-
diff --git a/tests/dictionaries/81extra_externalspace/00-base.xml b/tests/dictionaries/81extra_externalspace/00-base.xml
index 5249b01e..0747d4f4 100644
--- a/tests/dictionaries/81extra_externalspace/00-base.xml
+++ b/tests/dictionaries/81extra_externalspace/00-base.xml
@@ -1,12 +1,10 @@
-
-
-
- non
-
-
-
+
+
+
+ non
+
+
+
-
diff --git a/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml b/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml
index 2f0455bf..e5eb20f0 100644
--- a/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-
-
+
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
-
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
+
diff --git a/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml b/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml
index 9ce009bc..50b1055a 100644
--- a/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml
@@ -1,20 +1,19 @@
-
-
+
-
-
-
- test
-
-
-
-
-
- non
- activer_ejabberd
- none
- daily
- extra.ejabberd.day
-
-
+
+
+
+ test
+
+
+
+
+
+ non
+ activer_ejabberd
+ none
+ daily
+ extra.ejabberd.day
+
+
diff --git a/tests/dictionaries/88valid_enum_not_number/00-base.xml b/tests/dictionaries/88valid_enum_not_number/00-base.xml
index 38cdcf1a..7e12737a 100644
--- a/tests/dictionaries/88valid_enum_not_number/00-base.xml
+++ b/tests/dictionaries/88valid_enum_not_number/00-base.xml
@@ -1,24 +1,21 @@
-
-
-
- non
-
-
-
-
-
-
-
-
-
- a
- b
- c
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+
+
+
+
+ a
+ b
+ c
+ enumvar
+
+
-
diff --git a/tests/dictionaries/88valid_enum_not_number2/00-base.xml b/tests/dictionaries/88valid_enum_not_number2/00-base.xml
index 93c2180a..48645ca0 100644
--- a/tests/dictionaries/88valid_enum_not_number2/00-base.xml
+++ b/tests/dictionaries/88valid_enum_not_number2/00-base.xml
@@ -1,24 +1,21 @@
-
-
-
- non
-
-
-
-
- non
-
-
-
-
-
-
- 1
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+ non
+
+
+
+
+
+ 1
+ enumvar
+
+
-
diff --git a/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml b/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml
index c583fa32..b5bd5401 100644
--- a/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml
+++ b/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml
@@ -1,18 +1,15 @@
-
-
-
-
-
-
-
-
-
- str
- enumvar
-
-
+
+
+
+
+
+
+
+
+ str
+ enumvar
+
+
-
diff --git a/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml b/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml
index a4ae867f..b8921bb4 100644
--- a/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml
+++ b/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml
@@ -1,26 +1,23 @@
-
-
-
- non
-
-
-
-
- a
-
-
-
-
-
-
- 1
- 2
- 3
- enumvar
-
-
+
+
+
+ non
+
+
+
+
+ a
+
+
+
+
+
+ 1
+ 2
+ 3
+ enumvar
+
+
-
diff --git a/tests/dictionaries/88valid_enum_variable_optional/00-base.xml b/tests/dictionaries/88valid_enum_variable_optional/00-base.xml
index f259c710..456c870f 100644
--- a/tests/dictionaries/88valid_enum_variable_optional/00-base.xml
+++ b/tests/dictionaries/88valid_enum_variable_optional/00-base.xml
@@ -1,23 +1,21 @@
-
-
-
- a
-
-
- a
- b
- c
-
-
-
-
-
- var
- mode_conteneur_actif
-
-
+
+
+
+ a
+
+
+ a
+ b
+ c
+
+
+
+
+
+ var
+ mode_conteneur_actif
+
+
-