fix: update

TITLE

@@ -0,0 +1 @@
+[init] Discover Rougail

build.py

@@ -7,8 +7,8 @@ from ansi2html import Ansi2HTMLConverter
 
 from rougail import Rougail
 from rougail.config import get_rougail_config
-from rougail.output_exporter import RougailOutputExporter
+from rougail.output_console import RougailOutputConsole
-from rougail.user_data_file import RougailUserDataFile
+from rougail.user_data_yaml import RougailUserDataYaml
 from rougail.output_doc import RougailOutputDoc
 
 
@@ -16,8 +16,8 @@ if __name__ == "__main__":
     version = sys.argv[1]
 #    rougailconfig = RougailConfig.copy()
     rougailconfig = get_rougail_config(backward_compatibility=False, add_extra_options=False)
-    rougailconfig['main_dictionaries'] = ['firefox']
+    rougailconfig['main_structural_directories'] = ['firefox']
-    rougailconfig['default_dictionary_format_version'] = version
+    rougailconfig['default_structural_format_version'] = version
     if Path('config/namespace').is_file():
         has_namespace = True
         has_foxyproxy = False
@@ -25,26 +25,26 @@ if __name__ == "__main__":
         has_foxyproxy = True
         has_namespace = True
         rougailconfig['main_namespace'] = 'Firefox'
-        rougailconfig['extra_dictionaries'] = {'FoxyProxy': ['foxyproxy']}
+        rougailconfig['extra_namespaces'] = {'FoxyProxy': ['foxyproxy']}
     else:
         has_foxyproxy = False
         has_namespace = False
         rougailconfig['main_namespace'] = None
 #    rougailconfig['tiramisu_cache'] = "cache.py"
-#    rougail = Rougail(rougailconfig)
-#    config = rougail.get_config()
-#    print(config.value.get())
-    rougailconfig['step.output'] = 'doc'
-    rougailconfig['doc.output_format'] = 'github'
-    rougailconfig['doc.title_level'] = 3
     if Path('mode').is_file():
         rougailconfig['modes_level'] = ['basic', 'standard', 'advanced']
         has_mode = True
     else:
         has_mode = False
-    inventory = RougailOutputDoc(rougailconfig=rougailconfig.copy())
+    rougail = Rougail(rougailconfig)
-    rougailconfig['step.output'] = 'exporter'
+    config = rougail.run()
-    header = inventory.formater.header()
+#    print(config.value.get())
+    rougailconfig['step.output'] = 'doc'
+    rougailconfig['doc.output_format'] = 'github'
+    rougailconfig['doc.title_level'] = 3
+    inventory = RougailOutputDoc(config, rougailconfig=rougailconfig.copy())
+    inventory.load_formatter()
+    rougailconfig['step.output'] = 'console'
     summary = Path('summary_before.md')
     if summary.is_file():
         with summary.open('r') as sfh:
@@ -55,32 +55,36 @@ if __name__ == "__main__":
     namespace = 'firefox'
     file_found = False
     if rougailconfig['main_namespace']:
-        all_dirs = [[rougailconfig['main_dictionaries']], rougailconfig['extra_dictionaries'].values()]
+        all_dirs = [[rougailconfig['main_structural_directories']], [['foxyproxy']]]
     else:
-        all_dirs = [[rougailconfig['main_dictionaries']]]
+        all_dirs = [[rougailconfig['main_structural_directories']]]
 
-    doc += inventory.formater.title('Screenshot', 2) + '\n'
+    doc += inventory.formatter.title('Screenshot', 2) + '\n'
     doc += f'<img src="{namespace}.png" width=50% height=50% alt="{namespace.capitalize()} Proxy setting"/>\n\n'
 #    with doc_file.open('r') as docfh:
 #        doc += docfh.read()
-    doc += '\n' + inventory.formater.title('Structure', 2) + '\n'
+    doc += '\n' + inventory.formatter.title('Structure', 2) + '\n'
+    print(all_dirs)
     for r in all_dirs:
         for dirs in r:
             for d in dirs:
+                print(d)
                 files = list(Path(d).iterdir())
                 files.sort()
                 for f in files:
                     namespace = f.parent.name
                     file_found = True
                     if f.name.endswith('.yml') or f.name.endswith('.yaml'):
-                        doc += inventory.formater.title(str(f), 3)
+                        doc += inventory.formatter.title(str(f), 3)
                         doc += '\n```yml\n'
                         with f.open(encoding="utf8") as file_fh:
                             doc += file_fh.read()
                         doc += '\n```\n'
-    inv_doc = inventory.gen_doc()
+    rougailconfig['step.output'] = 'doc'
+    inv_doc = inventory.run()[1]
+    rougailconfig['step.output'] = 'console'
     if file_found and inv_doc:
-        doc += inventory.formater.title('Generated documentation', 3)
+        doc += inventory.formatter.title('Generated documentation', 3)
         CMD = f"foo@bar:~$ rougail -v {version} -m firefox/ "
         if has_namespace:
             CMD += "-s Firefox "
@@ -94,7 +98,7 @@ if __name__ == "__main__":
     #
     config = Path('config')
     if config.is_dir():
-        doc += inventory.formater.title('User data', 2)
+        doc += inventory.formatter.title('User data', 2)
         configs = list(config.iterdir())
         configs.sort()
         for idx, dirname in enumerate(configs):
@@ -102,58 +106,54 @@ if __name__ == "__main__":
                 continue
             for filename in dirname.iterdir():
                 if filename.name.endswith('.yml') or filename.name.endswith('.yaml'):
-                    doc += inventory.formater.title(f'Example {idx + 1}', 3)
+                    doc += inventory.formatter.title(f'Example {idx + 1}', 3)
-                    doc += inventory.formater.title(str(filename), 4)
+                    doc += inventory.formatter.title(str(filename), 4)
                     doc += '\n```yml\n'
                     with filename.open(encoding="utf8") as file_fh:
                         doc += file_fh.read()
                     doc += '\n```\n'
 #                    with filename.open(encoding="utf8") as file_fh:
 #                        objects = yaml.load(file_fh)
-#                    doc += inventory.formater.yaml(objects)
+#                    doc += inventory.formatter.yaml(objects)
                     #readme = dirname / 'README.md'
                     #if readme.is_file():
-                    #    doc += inventory.formater.title('Description', 4)
+                    #    doc += inventory.formatter.title('Description', 4)
                     #    with readme.open() as fh:
                     #        doc += fh.read() + '\n\n'
                     rougail = Rougail(rougailconfig)
-                    tiramisu_config = rougail.get_config()
+                    tiramisu_config = rougail.run()
-                    rougailconfig['step.user_data'] = ['file']
+                    rougailconfig['step.user_data'] = ['yaml']
-                    rougailconfig['file.filename'] = [str(filename.absolute())]
+                    rougailconfig['yaml.filename'] = [str(filename.absolute())]
-                    data = RougailUserDataFile(tiramisu_config, rougailconfig=rougailconfig)
+                    data = RougailUserDataYaml(tiramisu_config, rougailconfig=rougailconfig)
                     ret = data.run()
                     errors = rougail.user_datas(ret)
-                    export = RougailOutputExporter(tiramisu_config,
+                    export = RougailOutputConsole(tiramisu_config,
-                                                   rougailconfig=rougailconfig,
+                                                  rougailconfig=rougailconfig,
-                                                   user_data_errors=errors['errors'],
+                                                  user_data_errors=errors['errors'],
-                                                   user_data_warnings=errors['warnings'],
+                                                  user_data_warnings=errors['warnings'],
-                                                   )
+                                                  )
-                    export.exporter()
+                    console = export.run()[1]
-                    with export.formater.console.capture() as capture:
-                        export.print()
                     conv = Ansi2HTMLConverter(inline=True)
-                    doc += inventory.formater.title('Output', 4)
+                    doc += inventory.formatter.title('Output', 4)
-                    cmd = CMD + f"-u file -ff {filename}"
+                    cmd = CMD + f"-u yaml -ff {filename}"
                     doc += f"```console\n{cmd}\n```\n"
-                    conv_data = '<pre>' + conv.convert(capture.get(), full=False) + "</pre>\n"
+                    conv_data = '<pre>' + conv.convert(console, full=False) + "</pre>\n"
                     doc += conv_data
                     with open(dirname / 'output_ro.html', 'w') as fh_output:
                         fh_output.write(conv_data)
                     if (config / 'read_write').is_file():
-                        rougailconfig['exporter.read_write'] = True
+                        tiramisu_config.property.read_write
-                        export = RougailOutputExporter(tiramisu_config,
+                        export = RougailOutputConsole(tiramisu_config,
-                                                       rougailconfig=rougailconfig,
+                                                      rougailconfig=rougailconfig,
-                                                       user_data_errors=data.errors,
+                                                      user_data_errors=data.errors,
-                                                       user_data_warnings=data.warnings,
+                                                      user_data_warnings=data.warnings,
-                                                       )
+                                                      )
-                        export.exporter()
+                        console = export.run()[1]
-                        with export.formater.console.capture() as capture:
-                            export.print()
                         conv = Ansi2HTMLConverter(inline=True)
-                        doc += inventory.formater.title('Output in read write mode', 4)
+                        doc += inventory.formatter.title('Output in read write mode', 4)
-                        cmd = cmd + " --exporter.read_write"
+                        cmd = cmd + " --cli.read_write"
                         doc += f"```console\n{cmd}\n```\n"
-                        conv_data = '<pre>' + conv.convert(capture.get(), full=False) + "</pre>\n"
+                        conv_data = '<pre>' + conv.convert(console, full=False) + "</pre>\n"
                         doc += '<pre>' + conv_data + "</pre>\n"
                         with open(dirname / 'output_rw.html', 'w') as fh_output:
                             fh_output.write(conv_data)

build.sh

@@ -61,7 +61,7 @@ for i in $(ls -d "examples"/* | sort); do
         diff_url="https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/${commit_id}~1..$commit_id"
         echo "    - [$summary](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/$commit_id/README.md) ([diff]($diff_url))" >> summary.md
         cp "summary_total.md" "$DEST"
-        cd "$i/dictionaries"
+        cd "$i/structural_files"
         if [ -d firefox ]; then
             for j in $(ls firefox/*.yml 2>/dev/null); do
                 cp "$j" "$DEST/$j"

examples/000/structural_files/firefox/00-proxy.yml

@@ -1,2 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
+...

examples/001/dictionaries/firefox/00-proxy.yml

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

examples/001/structural_files/firefox/00-proxy.yml

@@ -0,0 +1,4 @@
+%YAML 1.2
+---
+version: 1.1
+...

examples/010/structural_files/firefox/00-proxy.yml

@@ -1,4 +1,6 @@
 %YAML 1.2
 ---
+version: 1.1
+
 proxy_mode:
 ...

examples/011/README.md

@@ -6,4 +6,4 @@ This information is useful for:
 
 - documentation
 - error message
-- help user to known which value to set to this variable (for example with [the user data plugin Questionary](https://forge.cloud.silique.fr/gnunux/rougail-user-data-questionary)).
+- help user to known which value to set to this variable (for example with [the user data plugin Questionary](https://forge.cloud.silique.fr/stove/rougail-user-data-questionary)).

examples/011/dictionaries/firefox/00-proxy.yml

@@ -1,5 +0,0 @@
-%YAML 1.2
----
-proxy_mode:
-  description: Configure Proxy Access to the Internet
-...

examples/011/structural_files/firefox/00-proxy.yml

@@ -0,0 +1,6 @@
+%YAML 1.2
+---
+version: 1.1
+
+proxy_mode:  # Configure Proxy Access to the Internet
+...

examples/012/dictionaries/firefox/00-proxy.yml

@@ -1,6 +0,0 @@
-%YAML 1.2
----
-proxy_mode:
-  description: Configure Proxy Access to the Internet
-  default: No proxy
-...

examples/012/structural_files/firefox/00-proxy.yml

@@ -0,0 +1,6 @@
+%YAML 1.2
+---
+version: 1.1
+
+proxy_mode: No proxy  # Configure Proxy Access to the Internet
+...

examples/013/structural_files/firefox/00-proxy.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 proxy_mode:
   description: Configure Proxy Access to the Internet
   type: choice

examples/014/structural_files/firefox/00-proxy.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 proxy_mode:
   description: Configure Proxy Access to the Internet
   choices:

examples/020/structural_files/firefox/10-manual.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
   description: Manual proxy configuration
   type: family

examples/021/README.md

@@ -3,5 +3,6 @@ A sub family
 Inside a family, we can have variables or families.
 
 The "type" for family "manual" became unecessary because container an other family, so it's not a variable.
+The description can now be has family comment.
 
 In disabled attribute, it's better tu use relative path (we will see the reason in an other slide).

examples/021/structural_files/firefox/10-manual.yml

@@ -1,8 +1,8 @@
 %YAML 1.2
 ---
-manual:
+version: 1.1
-  description: Manual proxy configuration
+
-  type: family
+manual:  # Manual proxy configuration
 
   http_proxy:
     description: HTTP Proxy

examples/022/dictionaries/firefox/10-manual.yml

@@ -1,13 +0,0 @@
-%YAML 1.2
----
-manual:
-  description: Manual proxy configuration
-  type: family
-
-  http_proxy:
-    description: HTTP Proxy
-    type: family
-
-    address:
-      description: HTTP address
-...

examples/022/structural_files/firefox/10-manual.yml

@@ -0,0 +1,10 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:  # Manual proxy configuration
+
+  http_proxy:  # HTTP Proxy
+
+    address:  # HTTP address
+...

examples/023/README.md

@@ -1 +1 @@
-Family type is optional
+A variable with type "domainname"

examples/023/config

@@ -1 +0,0 @@
-../010/config

examples/023/dictionaries/firefox/10-manual.yml

@@ -1,11 +0,0 @@
-%YAML 1.2
----
-manual:
-  description: Manual proxy configuration
-
-  http_proxy:
-    description: HTTP Proxy
-
-    address:
-      description: HTTP address
-...

examples/023/structural_files/firefox/10-manual.yml

@@ -0,0 +1,12 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:  # Manual proxy configuration
+
+  http_proxy:  # HTTP Proxy
+
+    address:
+      description: HTTP address
+      type: domainname
+...

examples/024/README.md

@@ -1 +1 @@
-A variable with type "domainname"
+A variable with type's parameters

examples/024/dictionaries/firefox/10-manual.yml

@@ -1,12 +0,0 @@
-%YAML 1.2
----
-manual:
-  description: Manual proxy configuration
-
-  http_proxy:
-    description: HTTP Proxy
-
-    address:
-      description: HTTP address
-      type: domainname
-...

examples/024/structural_files/firefox/10-manual.yml

@@ -1,10 +1,10 @@
 %YAML 1.2
 ---
-manual:
+version: 1.1
-  description: Manual proxy configuration
 
-  http_proxy:
+manual:  # Manual proxy configuration
-    description: HTTP Proxy
+
+  http_proxy:  # HTTP Proxy
 
     address:
       description: HTTP address

examples/025/README.md

@@ -1 +1 @@
-A variable with type's parameters
+A variable with type "port"

examples/025/structural_files/firefox/10-manual.yml

@@ -1,10 +1,10 @@
 %YAML 1.2
 ---
-manual:
+version: 1.1
-  description: Manual proxy configuration
 
-  http_proxy:
+manual:  # Manual proxy configuration
-    description: HTTP Proxy
+
+  http_proxy:  # HTTP Proxy
 
     address:
       description: HTTP address

examples/026/README.md

@@ -1 +1 @@
-A variable with type "port"
+A disabled family

examples/026/structural_files/firefox/10-manual.yml

@@ -1,11 +1,12 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
   description: Manual proxy configuration
   disabled: true
 
-  http_proxy:
+  http_proxy:  # HTTP Proxy
-    description: HTTP Proxy
 
     address:
       description: HTTP address

examples/027/README.md

@@ -1 +1 @@
-A disabled family
+A conditional disabled family with a variable

examples/027/structural_files/firefox/10-manual.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
   description: Manual proxy configuration
   disabled:

examples/028/README.md

@@ -1 +1 @@
-A conditional disabled family with a variable
+Type variable is optional

examples/028/dictionaries/firefox/10-manual.yml

@@ -1,23 +0,0 @@
-%YAML 1.2
----
-manual:
-  description: Manual proxy configuration
-  disabled:
-    type: variable
-    variable: proxy_mode
-    when_not: 'Manual proxy configuration'
-
-  http_proxy:
-    description: HTTP Proxy
-
-    address:
-      description: HTTP address
-      type: domainname
-      params:
-        allow_ip: true
-
-    port:
-      description: HTTP Port
-      type: port
-      default: 8080
-...

examples/028/structural_files/firefox/10-manual.yml

@@ -1,9 +1,11 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
   description: Manual proxy configuration
   disabled:
-    variable: proxy_mode
+    variable: _.proxy_mode
     when_not: Manual proxy configuration
 
   http_proxy:  # HTTP Proxy

examples/029/README.md

@@ -1 +0,0 @@
-Type variable is optional

examples/030/dictionaries/firefox/20-manual.yml

@@ -1,9 +0,0 @@
-%YAML 1.2
----
-manual:
-
-  use_for_https:
-    description: Also use this proxy for HTTPS
-    type: boolean
-    default: true
-...

examples/030/structural_files/firefox/20-manual.yml

@@ -0,0 +1,8 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+
+  use_for_https: true  # Also use this proxy for HTTPS
+...

examples/031/dictionaries/firefox/20-manual.yml

@@ -1,8 +0,0 @@
-%YAML 1.2
----
-manual:
-
-  use_for_https:
-    description: Also use this proxy for HTTPS
-    default: true
-...

examples/031/structural_files/firefox/20-manual.yml

@@ -0,0 +1,8 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+
+  use_for_https: true  # Also use this proxy for HTTPS
+...

examples/032/structural_files/firefox/20-manual.yml

@@ -1,15 +1,12 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
 
-  use_for_https:
+  use_for_https: true  # Also use this proxy for HTTPS
-    description: Also use this proxy for HTTPS
-    default: true
 
-  https_proxy:
+  https_proxy:  # HTTPS Proxy
-    description: HTTPS Proxy
-    hidden:
-      variable: manual.use_for_https
 
     address:
       description: HTTPS address

examples/033/structural_files/firefox/20-manual.yml

@@ -1,10 +1,10 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
 
-  use_for_https:
+  use_for_https: true  # Also use this proxy for HTTPS
-    description: Also use this proxy for HTTPS
-    default: true
 
   https_proxy:
     description: HTTPS Proxy

examples/034/structural_files/firefox/20-manual.yml

@@ -1,13 +1,15 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
 
-  use_for_https:
+  use_for_https: true  # Also use this proxy for HTTPS
-    description: Also use this proxy for HTTPS
-    default: true
 
   https_proxy:
     description: HTTPS Proxy
+    hidden:
+      variable: _.use_for_https
 
     address:
       description: HTTPS address

examples/035/structural_files/firefox/20-manual.yml

@@ -1,15 +1,15 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
 
-  use_for_https:
+  use_for_https: true  # Also use this proxy for HTTPS
-    description: Also use this proxy for HTTPS
-    default: true
 
   https_proxy:
     description: HTTPS Proxy
     hidden:
-      variable: manual.use_for_https
+      variable: _.use_for_https
 
     address:
       description: HTTPS address
@@ -17,11 +17,11 @@ manual:
       params:
         allow_ip: true
       default:
-        variable: manual.http_proxy.address
+        variable: __.http_proxy.address
 
     port:
       description: HTTPS Port
       type: port
       default:
-        variable: manual.http_proxy.port
+        variable: __.http_proxy.port
 ...

examples/036/dictionaries/firefox/20-manual.yml

@@ -1,23 +0,0 @@
-%YAML 1.2
----
-manual:
-
-  use_for_https:
-    description: Also use this proxy for HTTPS
-    default: true
-
-  https_proxy:
-    description: HTTPS Proxy
-    hidden:
-      variable: manual.use_for_https
-
-    address:
-      description: HTTPS address
-      default:
-        variable: manual.http_proxy.address
-
-    port:
-      description: HTTPS Port
-      default:
-        variable: manual.http_proxy.port
-...

examples/036/structural_files/firefox/20-manual.yml

@@ -0,0 +1,23 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+
+  use_for_https: true  # Also use this proxy for HTTPS
+
+  https_proxy:
+    description: HTTPS Proxy
+    hidden:
+      variable: _.use_for_https
+
+    address:
+      description: HTTPS address
+      default:
+        variable: __.http_proxy.address
+
+    port:
+      description: HTTPS Port
+      default:
+        variable: __.http_proxy.port
+...

examples/040/dictionaries/firefox/20-manual.yml

@@ -1,26 +0,0 @@
-%YAML 1.2
----
-manual:
-
-  use_for_https:
-    description: Also use this proxy for HTTPS
-    default: true
-
-  "{{ identifier }}_proxy":
-    description: "{{ identifier }} Proxy"
-    dynamic:
-      - HTTPS
-      - SOCKS
-    hidden:
-      variable: manual.use_for_https
-
-    address:
-      description: "{{ identifier }} address"
-      default:
-        variable: manual.http_proxy.address
-
-    port:
-      description: "{{ identifier }} port"
-      default:
-        variable: manual.http_proxy.port
-...

examples/040/structural_files/firefox/20-manual.yml

@@ -0,0 +1,26 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+
+  use_for_https: true  # Also use this proxy for HTTPS
+
+  '{{ identifier }}_proxy':
+    description: '{{ identifier }} Proxy'
+    hidden:
+      variable: _.use_for_https
+    dynamic:
+      - HTTPS
+      - SOCKS
+
+    address:
+      description: '{{ identifier }} address'
+      default:
+        variable: __.http_proxy.address
+
+    port:
+      description: '{{ identifier }} port'
+      default:
+        variable: __.http_proxy.port
+...

examples/041/dictionaries/firefox/20-manual.yml

@@ -1,29 +0,0 @@
-%YAML 1.2
----
-manual:
-
-  use_for_https:
-    description: Also use this proxy for HTTPS
-    default: true
-
-  "{{ identifier }}_proxy":
-    description: "{{ identifier }} Proxy"
-    dynamic:
-      - HTTPS
-      - SOCKS
-    hidden:
-      jinja: |
-        {% if manual.use_for_https %}
-        HTTPS is same has HTTP
-        {% endif %}
-
-    address:
-      description: "{{ identifier }} address"
-      default:
-        variable: manual.http_proxy.address
-
-    port:
-      description: "{{ identifier }} port"
-      default:
-        variable: manual.http_proxy.port
-...

examples/041/structural_files/firefox/20-manual.yml

@@ -0,0 +1,29 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+
+  use_for_https: true  # Also use this proxy for HTTPS
+
+  '{{ identifier }}_proxy':
+    description: '{{ identifier }} Proxy'
+    hidden:
+      jinja: |-
+        {% if manual.use_for_https %}
+          HTTPS is same has HTTP
+        {% endif %}
+    dynamic:
+      - HTTPS
+      - SOCKS
+
+    address:
+      description: '{{ identifier }} address'
+      default:
+        variable: __.http_proxy.address
+
+    port:
+      description: '{{ identifier }} port'
+      default:
+        variable: __.http_proxy.port
+...

examples/042/dictionaries/firefox/20-manual.yml

@@ -1,32 +0,0 @@
-%YAML 1.2
----
-manual:
-
-  use_for_https:
-    description: Also use this proxy for HTTPS
-    default: true
-
-  "{{ identifier }}_proxy":
-    description: "{{ identifier }} Proxy"
-    dynamic:
-      - HTTPS
-      - SOCKS
-    hidden:
-      jinja: |
-        {% if my_identifier == 'HTTPS' and manual.use_for_https %}
-        HTTPS is same has HTTP
-        {% endif %}
-      params:
-        my_identifier:
-          type: identifier
-
-    address:
-      description: "{{ identifier }} address"
-      default:
-        variable: manual.http_proxy.address
-
-    port:
-      description: "{{ identifier }} port"
-      default:
-        variable: manual.http_proxy.port
-...

examples/042/structural_files/firefox/20-manual.yml

@@ -0,0 +1,32 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+
+  use_for_https: true  # Also use this proxy for HTTPS
+
+  '{{ identifier }}_proxy':
+    description: '{{ identifier }} Proxy'
+    hidden:
+      jinja: |-
+        {% if my_identifier == 'HTTPS' and manual.use_for_https %}
+          HTTPS is same has HTTP
+        {% endif %}
+      params:
+        my_identifier:
+          type: identifier
+    dynamic:
+      - HTTPS
+      - SOCKS
+
+    address:
+      description: '{{ identifier }} address'
+      default:
+        variable: __.http_proxy.address
+
+    port:
+      description: '{{ identifier }} port'
+      default:
+        variable: __.http_proxy.port
+...

examples/043/dictionaries/firefox/20-manual.yml

@@ -1,34 +0,0 @@
-%YAML 1.2
----
-manual:
-
-  use_for_https:
-    description: Also use this proxy for HTTPS
-    default: true
-
-  "{{ identifier }}_proxy":
-    description: "{{ identifier }} Proxy"
-    dynamic:
-      - HTTPS
-      - SOCKS
-    hidden:
-      jinja: |
-        {% if my_identifier == 'HTTPS' and manual.use_for_https %}
-        HTTPS is same has HTTP
-        {% endif %}
-      params:
-        my_identifier:
-          type: identifier
-      description: |
-        in HTTPS case if "manual.use_for_https" is set to True
-
-    address:
-      description: "{{ identifier }} address"
-      default:
-        variable: manual.http_proxy.address
-
-    port:
-      description: "{{ identifier }} port"
-      default:
-        variable: manual.http_proxy.port
-...

examples/043/structural_files/firefox/20-manual.yml

@@ -0,0 +1,33 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+
+  use_for_https: true  # Also use this proxy for HTTPS
+
+  '{{ identifier }}_proxy':
+    description: '{{ identifier }} Proxy'
+    hidden:
+      jinja: |-
+        {% if my_identifier == 'HTTPS' and manual.use_for_https %}
+          HTTPS is same has HTTP
+        {% endif %}
+      description: in HTTPS case if "manual.use_for_https" is set to True
+      params:
+        my_identifier:
+          type: identifier
+    dynamic:
+      - HTTPS
+      - SOCKS
+
+    address:
+      description: '{{ identifier }} address'
+      default:
+        variable: __.http_proxy.address
+
+    port:
+      description: '{{ identifier }} port'
+      default:
+        variable: __.http_proxy.port
+...

examples/044/dictionaries/firefox/20-manual.yml

@@ -1,44 +0,0 @@
-%YAML 1.2
----
-manual:
-
-  use_for_https:
-    description: Also use this proxy for HTTPS
-    default: true
-
-  "{{ identifier }}_proxy":
-    description: "{{ identifier }} Proxy"
-    dynamic:
-      - HTTPS
-      - SOCKS
-    hidden:
-      jinja: |
-        {% if my_identifier == 'HTTPS' and manual.use_for_https %}
-        HTTPS is same has HTTP
-        {% endif %}
-      params:
-        my_identifier:
-          type: identifier
-      description: |
-        in HTTPS case if "manual.use_for_https" is set to True
-
-    address:
-      description: "{{ identifier }} address"
-      default:
-        variable: manual.http_proxy.address
-
-    port:
-      description: "{{ identifier }} port"
-      default:
-        variable: manual.http_proxy.port
-
-    version:
-      description: SOCKS host version used by proxy
-      choices:
-        - v4
-        - v5
-      default: v5
-      disabled:
-        type: identifier
-        when: 'HTTPS'
-...

examples/044/structural_files/firefox/20-manual.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
 
   use_for_https: true  # Also use this proxy for HTTPS
@@ -11,8 +13,7 @@ manual:
         {% if my_identifier == 'HTTPS' and manual.use_for_https %}
           HTTPS is same has HTTP
         {% endif %}
-      description: |
+      description: in HTTPS case if "manual.use_for_https" is set to True
-        in HTTPS case if "manual.use_for_https" is set to True
       params:
         my_identifier:
           type: identifier
@@ -23,12 +24,12 @@ manual:
     address:
       description: '{{ identifier }} address'
       default:
-        variable: manual.http_proxy.address
+        variable: __.http_proxy.address
 
     port:
       description: '{{ identifier }} port'
       default:
-        variable: manual.http_proxy.port
+        variable: __.http_proxy.port
 
     version:
       description: SOCKS host version used by proxy

examples/050/structural_files/firefox/10-manual.yml

@@ -1,13 +1,14 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
   description: Manual proxy configuration
   disabled:
-    variable: proxy_mode
+    variable: _.proxy_mode
-    when_not: 'Manual proxy configuration'
+    when_not: Manual proxy configuration
 
-  http_proxy:
+  http_proxy:  # HTTP Proxy
-    description: HTTP Proxy
 
     address:
       description: HTTP address

examples/051/structural_files/firefox/20-manual.yml

@@ -0,0 +1,43 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+
+  use_for_https: true  # Also use this proxy for HTTPS
+
+  '{{ identifier }}_proxy':
+    description: '{{ identifier }} Proxy'
+    hidden:
+      jinja: |-
+        {% if my_identifier == 'HTTPS' and manual.use_for_https %}
+          HTTPS is same has HTTP
+        {% endif %}
+      description: in HTTPS case if "manual.use_for_https" is set to True
+      params:
+        my_identifier:
+          type: identifier
+    dynamic:
+      - HTTPS
+      - SOCKS
+
+    address:
+      description: '{{ identifier }} address'
+      default:
+        variable: __.http_proxy.address
+
+    port:
+      description: '{{ identifier }} port'
+      default:
+        variable: __.http_proxy.port
+
+    version:
+      description: SOCKS host version used by proxy
+      choices:
+        - v4
+        - v5
+      default: v5
+      disabled:
+        type: identifier
+        when: HTTPS
+...

examples/060/structural_files/firefox/30-auto.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 auto:
   description: Automatic proxy configuration URL
   type: web_address

examples/061/structural_files/firefox/30-auto.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 auto:
   description: Automatic proxy configuration URL
   type: web_address

examples/070/structural_files/firefox/40-no_proxy.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 no_proxy:
   description: Address for which proxy will be desactivated
   type: domainname
@@ -9,6 +11,6 @@ no_proxy:
     allow_without_dot: true
     allow_startswith_dot: true
   disabled:
-    variable: proxy_mode
+    variable: _.proxy_mode
     when: No proxy
 ...

examples/071/structural_files/firefox/40-no_proxy.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 no_proxy:
   description: Address for which proxy will be desactivated
   type: domainname
@@ -10,6 +12,6 @@ no_proxy:
     allow_startswith_dot: true
   multi: true
   disabled:
-    variable: proxy_mode
+    variable: _.proxy_mode
     when: No proxy
 ...

examples/072/structural_files/firefox/40-no_proxy.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 no_proxy:
   description: Address for which proxy will be desactivated
   type: domainname
@@ -11,6 +13,6 @@ no_proxy:
   multi: true
   mandatory: false
   disabled:
-    variable: proxy_mode
+    variable: _.proxy_mode
     when: No proxy
 ...

examples/073/structural_files/firefox/40-no_proxy.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 no_proxy:
   description: Address for which proxy will be desactivated
   examples:
@@ -15,6 +17,6 @@ no_proxy:
   multi: true
   mandatory: false
   disabled:
-    variable: proxy_mode
+    variable: _.proxy_mode
     when: No proxy
 ...

examples/074/structural_files/firefox/40-no_proxy.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 no_proxy:
   description: Address for which proxy will be desactivated
   help: Connections to localhost, 127.0.0.1/8 and ::1 are never proxied

examples/075/structural_files/firefox/50-prompt_authentication.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 prompt_authentication:
   description: Prompt for authentication if password is saved
   default: true

examples/076/dictionaries/firefox/55-proxy_dns_socks5.yml

@@ -1,6 +0,0 @@
-%YAML 1.2
----
-proxy_dns_socks5:
-  description: Use proxy DNS when using SOCKS v5
-  default: false
-...

examples/076/structural_files/firefox/55-proxy_dns_socks5.yml

@@ -0,0 +1,6 @@
+%YAML 1.2
+---
+version: 1.1
+
+proxy_dns_socks5: false  # Use proxy DNS when using SOCKS v5
+...

examples/077/structural_files/firefox/55-proxy_dns_socks5.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 proxy_dns_socks5:
   description: Use proxy DNS when using SOCKS v5
   default: false
@@ -10,7 +12,7 @@ proxy_dns_socks5:
       {% elif manual.socks_proxy.version == 'v4' %}
         socks version is v4
       {% endif %}
-    description: |
+    description: |-
       if "firefox.proxy_mode" is not "Manual proxy configuration"
       or "firefox.manual.socks_proxy.version" is "v4"
 ...

examples/078/structural_files/firefox/55-proxy_dns_socks5.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 proxy_dns_socks5:
   description: Use proxy DNS when using SOCKS v5
   mode: advanced
@@ -11,7 +13,7 @@ proxy_dns_socks5:
       {% elif manual.socks_proxy.version == 'v4' %}
         socks version is v4
       {% endif %}
-    description: |
+    description: |-
       if "firefox.proxy_mode" is not "Manual proxy configuration"
       or "firefox.manual.socks_proxy.version" is "v4"
 ...

examples/080/structural_files/firefox/60-dns_over_https.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 dns_over_https:  # DNS over HTTPS
 
   enable_dns_over_https: false  # Enable DNS over HTTPS

examples/081/structural_files/firefox/60-dns_over_https.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 dns_over_https:  # DNS over HTTPS
 
   enable_dns_over_https: false  # Enable DNS over HTTPS
@@ -12,6 +14,6 @@ dns_over_https:  # DNS over HTTPS
       - Custom
     default: Cloudflare
     disabled:
-      variable: dns_over_https.enable_dns_over_https
+      variable: _.enable_dns_over_https
       when: false
 ...

examples/082/structural_files/firefox/60-dns_over_https.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 dns_over_https:  # DNS over HTTPS
 
   enable_dns_over_https: false  # Enable DNS over HTTPS
@@ -12,7 +14,7 @@ dns_over_https:  # DNS over HTTPS
       - Custom
     default: Cloudflare
     disabled:
-      variable: dns_over_https.enable_dns_over_https
+      variable: _.enable_dns_over_https
       when: false
 
   custom_dns_url:

examples/083/structural_files/firefox/60-dns_over_https.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 dns_over_https:  # DNS over HTTPS
 
   enable_dns_over_https: false  # Enable DNS over HTTPS
@@ -12,7 +14,7 @@ dns_over_https:  # DNS over HTTPS
       - Custom
     default: Cloudflare
     disabled:
-      variable: dns_over_https.enable_dns_over_https
+      variable: _.enable_dns_over_https
       when: false
 
   custom_dns_url:

examples/090/structural_files/firefox/00-proxy.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 proxy_mode:
   description: Configure Proxy Access to the Internet
   choices:

examples/090/structural_files/firefox/10-manual.yml

@@ -0,0 +1,23 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+  description: Manual proxy configuration
+  disabled:
+    variable: _.proxy_mode
+    when_not: Manual proxy configuration
+
+  http_proxy:  # HTTP Proxy
+
+    address:
+      description: HTTP address
+      type: domainname
+      params:
+        allow_ip: true
+
+    port:
+      description: HTTP Port
+      type: port
+      default: 8080
+...

examples/090/structural_files/firefox/20-manual.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
 
   use_for_https: true  # Also use this proxy for HTTPS
@@ -11,8 +13,7 @@ manual:
         {% if my_identifier == 'HTTPS' and _.use_for_https %}
           HTTPS is same has HTTP
         {% endif %}
-      description: |
+      description: in HTTPS case if "manual.use_for_https" is set to True
-        in HTTPS case if "manual.use_for_https" is set to True
       params:
         my_identifier:
           type: identifier

examples/090/structural_files/firefox/30-auto.yml

@@ -1,9 +1,11 @@
 %YAML 1.2
 ---
+version: 1.1
+
 auto:
   description: Automatic proxy configuration URL
   type: web_address
   disabled:
-    variable: proxy_mode
+    variable: _.proxy_mode
     when_not: Automatic proxy configuration URL
 ...

examples/090/structural_files/firefox/40-no_proxy.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 no_proxy:
   description: Address for which proxy will be desactivated
   help: Connections to localhost, 127.0.0.1/8 and ::1 are never proxied
@@ -16,6 +18,6 @@ no_proxy:
   multi: true
   mandatory: false
   disabled:
-    variable: proxy_mode
+    variable: _.proxy_mode
     when: No proxy
 ...

examples/090/structural_files/firefox/50-prompt_authentication.yml

@@ -1,9 +1,11 @@
 %YAML 1.2
 ---
+version: 1.1
+
 prompt_authentication:
   description: Prompt for authentication if password is saved
   default: true
   disabled:
-    variable: proxy_mode
+    variable: _.proxy_mode
     when: No proxy
 ...

examples/090/structural_files/firefox/55-proxy_dns_socks5.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 proxy_dns_socks5:
   description: Use proxy DNS when using SOCKS v5
   mode: advanced
@@ -11,7 +13,7 @@ proxy_dns_socks5:
       {% elif _.manual.socks_proxy.version == 'v4' %}
         socks version is v4
       {% endif %}
-    description: |
+    description: |-
       if "firefox.proxy_mode" is not "Manual proxy configuration"
       or "firefox.manual.socks_proxy.version" is "v4"
 ...

examples/090/structural_files/firefox/60-dns_over_https.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 dns_over_https:  # DNS over HTTPS
 
   enable_dns_over_https: false  # Enable DNS over HTTPS

examples/091/structural_files/firefox/20-manual.yml

@@ -1,34 +1,35 @@
 %YAML 1.2
 ---
+version: 1.1
+
 manual:
 
   use_for_https: true  # Also use this proxy for HTTPS
 
-  "{{ identifier }}_proxy":
+  '{{ identifier }}_proxy':
-    description: "{{ identifier }} Proxy"
+    description: '{{ identifier }} Proxy'
-    dynamic:
-      - HTTPS
-      - SOCKS
     hidden:
-      jinja: |
+      jinja: |-
         {% if my_identifier == 'HTTPS' and _.use_for_https %}
-        HTTPS is same has HTTP
+          HTTPS is same has HTTP
         {% endif %}
+      description: in HTTPS case if "manual.use_for_https" is set to True
       params:
         my_identifier:
           type: identifier
-      description: |
+    dynamic:
-        in HTTPS case if "manual.use_for_https" is set to True
+      - HTTPS
+      - SOCKS
 
     address:
-      description: "{{ identifier }} address"
+      description: '{{ identifier }} address'
       default:
-        variable: manual.http_proxy.address
+        variable: __.http_proxy.address
 
     port:
-      description: "{{ identifier }} port"
+      description: '{{ identifier }} port'
       default:
-        variable: manual.http_proxy.port
+        variable: __.http_proxy.port
 
     version:
       description: SOCKS host version used by proxy
@@ -38,5 +39,5 @@ manual:
       default: v5
       disabled:
         type: identifier
-        when: 'HTTPS'
+        when: HTTPS
 ...

examples/092/structural_files/firefox/empty.yml

@@ -0,0 +1,4 @@
+%YAML 1.2
+---
+version: 1.1
+...

examples/100/dictionaries/foxyproxy/00-foxyproxy.yml

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

examples/100/structural_files/foxyproxy/00-foxyproxy.yml

@@ -0,0 +1,4 @@
+%YAML 1.2
+---
+version: 1.1
+...

examples/101/structural_files/foxyproxy/00-foxyproxy.yml

@@ -1,5 +1,7 @@
 %YAML 1.2
 ---
+version: 1.1
+
 proxies:
   description: Proxy configuration
   type: leadership