fix: better display of path

2026-04-01 17:01:24 +02:00 · 2026-04-01 17:01:24 +02:00 · cce4447390
commit cce4447390
parent 316af5cb3f
3122 changed files with 15123 additions and 11987 deletions
--- a/src/rougail/output_doc/annotator.py
+++ b/src/rougail/output_doc/annotator.py
@ -260,7 +260,7 @@ class Annotator(Walk):
                    values.xmlfiles,
                )
                if variable:
-                    description = description.replace(f'"{r_path}"', f'"{{{index}}}"')
+                    description = description.replace(f'"{r_path}"', f'{{{index}}}')
                    v = {"path": variable.path, "description": variable.description}
                    if identifiers:
                        v["identifiers"] = identifiers
--- a/src/rougail/output_doc/collect.py
+++ b/src/rougail/output_doc/collect.py
@ -88,8 +88,11 @@ class _ToString:
            values = self._calculation_variable_to_string(
                child, calculation, attribute_type
            )
-            if isinstance(values, str) and not inside_list:
-                values = add_dot(values)
+            if not inside_list:
+                if isinstance(values, str):
+                    values = add_dot(values)
+                elif isinstance(values, dict) and "message" in values:
+                    values["message"] = add_dot(values["message"])
        elif calculation["type"] == "identifier":
            values = self._calculation_identifier_to_string(
                child, calculation, attribute_type
@ -98,16 +101,19 @@ class _ToString:
                values = add_dot(values)
        elif calculation["type"] == "information":
            if "path" in calculation:
-                variable_path = self.doc_path(calculation["path"])
-                values = _(
-                    'the value of the information "{0}" of the variable "{1}"'
-                ).format(calculation["information"], variable_path)
+                msg = _(
+                    'the value of the information "{0}" of the variable {{0}}'
+                ).format(calculation["information"])
+                if not inside_list:
+                    msg = add_dot(msg)
+                variable = self.true_config.unrestraint.option(calculation["path"])
+                values = self._calculation_with_variable(variable, calculation, msg)
            else:
                values = _('the value of the global information "{0}"').format(
                    calculation["information"]
                )
-            if not inside_list:
-                values = add_dot(values)
+                if not inside_list:
+                    values = add_dot(values)
        else:
            values = _("the value of the {0}").format(calculation["type"])
            if not inside_list:
@ -216,7 +222,7 @@ class _ToString:
                    submsg = display_list(
                        [_("is {0}").format(prop), submsg], separator="or", sort=False
                    )
-            msg = _('when the variable "{{0}}" {0}.').format(submsg)
+            msg = _('when the variable {{0}} {0}.').format(submsg)
            path_obj = {
                "path": self.doc_path(variable_path),
            }
@ -243,19 +249,22 @@ class _ToString:
                variable.get()
            except AttributeError:
                return None
-            true_msg = _('the value of the variable "{0}" if it is defined')
+            true_msg = _('the value of the variable {0} if it is defined')
        else:
-            true_msg = _('the value of the variable "{0}"')
-        if not variable.isdynamic():
-            func = self._calculation_normal_variable_to_string_not_properties
-        else:
-            func = self._calculation_dynamic_variable_to_string_not_properties
-        return func(variable, calculation["value"], true_msg)
+            true_msg = _('the value of the variable {0}')
+        return self._calculation_with_variable(variable, calculation["value"], true_msg)

-    def _calculation_normal_variable_to_string_not_properties(
-        self, child, obj, true_msg
+    def _calculation_with_variable(self, child, calculation, msg):
+        if not child.isdynamic():
+            func = self._calculation_normal_with_variable
+        else:
+            func = self._calculation_dynamic_variable_with_variable
+        return func(child, calculation, msg)
+
+    def _calculation_normal_with_variable(
+        self, child, obj, msg
    ):
-        isfollower = child.isfollower()
+        isfollower = not child.isoptiondescription() and child.isfollower()
        if not isfollower and self.is_inaccessible_user_data(child):
            uncalculated = child.value.default(uncalculated=True)
            if uncalculated and not isinstance(uncalculated, Calculation):
@ -267,38 +276,37 @@ class _ToString:
                else:
                    if not isinstance(uncalculated, str):
                        uncalculated = dump(uncalculated)
-                    true_msg = _("{0} (from an undocumented variable)").format(
+                    msg = _("{0} (from an undocumented variable)").format(
                        uncalculated
                    )
            else:
-                true_msg = _("the value of an undocumented variable")
+                msg = _("the value of an undocumented variable")
        try:
            description = child.description(uncalculated=True)
        except AttributeError:
            description = path
        return {
-            "message": true_msg,
+            "message": msg,
            "path": obj,
            "description": description,
        }

-    def _calculation_dynamic_variable_to_string_not_properties(
-        self, child, obj, true_msg
+    def _calculation_dynamic_variable_with_variable(
+        self, child, obj, msg
    ):
        values = []
        for path, description, identifiers in self._get_annotation_variable(
            child, obj.get("identifiers")
        ):
-            cpath = calc_path(path, identifiers=identifiers)
-            variable = self.true_config.option(cpath)
+            variable = self.true_config.option(path)
            path_obj = {
                "path": self.doc_path(path),
            }
            if identifiers:
                path_obj["identifiers"] = identifiers
            values.append(
-                self._calculation_normal_variable_to_string_not_properties(
-                    variable, path_obj, true_msg
+                self._calculation_normal_with_variable(
+                    variable, path_obj, msg
                )
            )
        return values
--- a/src/rougail/output_doc/output/console.py
+++ b/src/rougail/output_doc/output/console.py
@ -19,7 +19,41 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from typing import List

 from ..i18n import _
+from rougail.error import ExtensionError
 from ..utils import dump, CommonFormatter
+try:
+    from rich.jupyter import JupyterMixin
+    from rich.segment import Segment
+    from rich.style import Style
+    from rich.console import Console, ConsoleOptions, RenderResult
+    from rich.table import Table
+    from rich.theme import Theme
+    from rich.syntax import Syntax
+except ModuleNotFoundError:
+    Console = None
+
+
+if Console:
+    class BlockQuote(JupyterMixin):
+        def __init__(
+            self,
+            elements: str,
+        ) -> None:
+            self.elements = elements
+            self.border_style = Style(color="blue")
+
+        def __rich_console__(
+            self, console: Console, options: ConsoleOptions
+        ) -> RenderResult:
+            """Render blockquote to the console."""
+            render_options = options.update(width=options.max_width - 4)
+            lines = console.render_lines(self.elements, render_options)
+            new_line = Segment("\n")
+            padding = Segment("▌ ", style=self.border_style)
+            for line in lines:
+                yield padding
+                yield from line
+                yield new_line


 class Formatter(CommonFormatter):
@ -37,14 +71,8 @@ class Formatter(CommonFormatter):
    }

    def __init__(self, rougailconfig, **kwargs) -> None:
-        from rich.table import Table
-        from rich.theme import Theme
-        from rich.console import Console
-        from rich.syntax import Syntax
-
-        self.rich_table = Table
-        self.rich_console = Console
-        self.rich_syntaxt = Syntax
+        if not Console:
+            raise ExtensionError(_("cannot find python module rich, please install it!"))
        self.custom_theme = Theme(self.titles_color)
        self.max_line = 0
        super().__init__(rougailconfig, **kwargs)
@ -59,7 +87,7 @@ class Formatter(CommonFormatter):
            force_terminal = "xterm-256color"
        else:
            force_terminal = None
-        console = self.rich_console(
+        console = Console(
            theme=self.custom_theme, force_terminal=force_terminal
        )
        with console.capture() as capture:
@ -135,7 +163,7 @@ class Formatter(CommonFormatter):
                first_char = "• "
                char = f"{self.enter_tabular}{first_char}"
        else:
-            char = first_char = f"\n{self.family_informations_starts_line()} • "
+            char = first_char = f"\n • "
        ret = ""
        for idx, choice in enumerate(choices):
            if not isinstance(choice, str):
@ -166,7 +194,7 @@ class Formatter(CommonFormatter):

    def yaml(self, _dump):
        """Dump yaml part of documentation"""
-        return self.rich_syntaxt(f"---\n{_dump}", "yaml")
+        return Syntax(f"---\n{_dump}", "yaml")

    def link(
        self,
@ -189,7 +217,7 @@ class Formatter(CommonFormatter):

    def tabular(self, with_header: bool = True) -> str:
        """Transform list to a tabular in string format"""
-        tabular = self.rich_table(show_lines=True)
+        tabular = Table(show_lines=True)
        if with_header:
            for column in self.tabular_datas.headers():
                tabular.add_column(column, width=self.max_line)
@ -197,16 +225,12 @@ class Formatter(CommonFormatter):
            tabular.add_row(*data)
        return tabular

-    def family_informations(self) -> str:
-        info = "[blue]" + self.bold(f"🛈 {_('Informations')}") + "[/blue]"
-        starts_line = self.family_informations_starts_line()
-        return starts_line + info + "\n" + starts_line
-
-    def family_informations_starts_line(self) -> str:
-        return "[blue]▌ [/blue]"
-
    def family_informations_ends_line(self) -> str:
        return "\n"

    def end_family_informations(self) -> str:
-        return "\n"
+        return ""
+
+    def display_family_informations(self, msg) -> str:
+        msg = ["[blue]" + self.bold(f"🛈 {_('Informations')}") + "\n" + "[/blue]"] + msg
+        return BlockQuote(self.family_informations_ends_line().join(msg))
--- a/src/rougail/output_doc/output/github.py
+++ b/src/rougail/output_doc/output/github.py
@ -163,7 +163,7 @@ class Formatter(CommonFormatter):
            link = f"{filename}#{name}"
        else:
            link = f"#{name}"
-        return f"[{description}]({link})"
+        return f'"[{description}]({link})" ({path})'

    def anchor(
        self,
@ -196,24 +196,18 @@ class Formatter(CommonFormatter):
    def to_phrase(self, text: str) -> str:
        return escape(text)

-    def family_informations(self) -> str:
-        starts_line = self.family_informations_starts_line()
-        return starts_line + "[!NOTE]" + "\n" + starts_line + "\n"
-
-    def family_informations_starts_line(self) -> str:
-        return "> "
+    def family_informations(self):
+        start = self.family_informations_starts_line()
+        return [start + "[!NOTE]", start]

    def family_informations_ends_line(self) -> str:
        return "\\\n"

+    def family_informations_starts_line(self) -> str:
+        return "> "

-#
-#    def family_to_string(self, *args, **kwargs) -> List[str]:
-#        lst = super().family_to_string(*args, **kwargs)
-#        if self.name != 'github':
-#            return lst
-#        # remove the title
-#        ret = lst.pop(0)
-#        if lst:
-#            ret = "\n> ".join([l.strip() for l in lst]).strip() + "\n\n"
-#        return [ret]
+    def display_family_informations(self, msg) -> str:
+        start = self.family_informations_starts_line()
+        end = self.family_informations_ends_line()
+        msg = self.family_informations() + [end.join([start + m for m in msg])]
+        return "\n".join(msg)
--- a/src/rougail/output_doc/output/gitlab.py
+++ b/src/rougail/output_doc/output/gitlab.py
@ -41,7 +41,7 @@ class Formatter(GithubFormatter):
        pass

    def family_informations(self) -> str:
-        return f"> [!note] 🛈 {_('Informations')}\n"
+        return [f"> [!note] 🛈 {_('Informations')}"]

    def table_header(self, lst):
        """Manage the header of a table"""
--- a/src/rougail/output_doc/utils.py
+++ b/src/rougail/output_doc/utils.py
@ -334,7 +334,8 @@ class CommonFormatter:
        filename: Optional[str],
    ) -> str:
        """Set a text link to variable anchor"""
-        return description
+#        return f'"{description}"'
+        return f'"{description}" ({path})'

    def stripped(
        self,
@ -375,9 +376,6 @@ class CommonFormatter:

    ##################

-    def family_informations(self) -> str:
-        return ""
-
    def end_family_informations(self) -> str:
        return ENTER

@ -541,22 +539,19 @@ class CommonFormatter:
                self.section(
                    _("Identifiers"), informations["identifier"], type_="family"
                )
-
-
            )
-        starts_line = self.family_informations_starts_line()
        if msg:
-            fam_info = self.family_informations()
-            if fam_info:
-                ret.append(fam_info)
-            ret.append(
-                self.family_informations_ends_line().join(
-                    [starts_line + m for m in msg]
-                )
-                + self.end_family_informations()
-            )
+            ret.append(self.display_family_informations(msg))
+            ret.append(self.end_family_informations())
        return ret

+    def display_family_informations(self, msg) -> str:
+        fam_info = self.family_informations()
+        return fam_info + self.family_informations_ends_line().join(msg)
+
+    def family_informations(self) -> str:
+        return ""
+
    def family_informations_starts_line(self) -> str:
        return ""

@ -1067,7 +1062,7 @@ class CommonFormatter:
        )
        return msg

-    def message_to_string(self, msg, ret, identifiers=[]):
+    def message_to_string(self, msg, ret, *, identifiers=[]):
        if isinstance(msg, dict):
            if "submessage" in msg:
                ret += msg["submessage"]
--- a/tests/changelog/00add_family/result.adoc
+++ b/tests/changelog/00add_family/result.adoc
@ -5,7 +5,7 @@
 | Variable   | Description   
 | **family2.var2** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory`            | A variable2. +
-**Default**: the value of the variable "a second variable"               
+**Default**: the value of the variable "a second variable" (family.var2).               
 | **family2.var3** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory`            | A third variable. +
 **Default**: string4 +
@ -14,8 +14,8 @@
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `multiple` `standard` `mandatory` `unique`            | Fourth variable. +
 **Default**: 

-* the value of the variable "first variable"
-* the value of the variable "a second variable"
-* the value of the variable "a third variable"               
+* the value of the variable "first variable" (var1)
+* the value of the variable "a second variable" (family.var2)
+* the value of the variable "a third variable" (family2.var3)               
 |====

--- a/tests/changelog/00add_family/result.gitlab.md
+++ b/tests/changelog/00add_family/result.gitlab.md
@ -1,10 +1,10 @@
 <details><summary>New variables</summary>

-| Variable                                                                                                                                                                                                                                  | Description                                                                                                                                                                                                                                         |
-|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="family2.var2" name="family2.var2">family2.var2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                               | A variable2.<br/>**Default**: the value of the variable "[a second variable](#family.var2)"                                                                                                                                                         |
-| **<a id="family2.var3" name="family2.var3">family2.var3</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                               | A third variable.<br/>**Default**: string4<br/>**Example**: string5                                                                                                                                                                                 |
-| **<a id="family2.subfamily.variable" name="family2.subfamily.variable">family2.subfamily.variable</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | Fourth variable.<br/>**Default**: <br/>•&nbsp;the value of the variable "[first variable](#var1)"<br/>•&nbsp;the value of the variable "[a second variable](#family.var2)"<br/>•&nbsp;the value of the variable "[a third variable](#family2.var3)" |
+| Variable                                                                                                                                                                                                                                  | Description                                                                                                                                                                                                                                                                             |
+|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="family2.var2" name="family2.var2">family2.var2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                               | A variable2.<br/>**Default**: the value of the variable "[a second variable](#family.var2)" (family.var2).                                                                                                                                                                              |
+| **<a id="family2.var3" name="family2.var3">family2.var3</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                               | A third variable.<br/>**Default**: string4<br/>**Example**: string5                                                                                                                                                                                                                     |
+| **<a id="family2.subfamily.variable" name="family2.subfamily.variable">family2.subfamily.variable</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | Fourth variable.<br/>**Default**: <br/>•&nbsp;the value of the variable "[first variable](#var1)" (var1)<br/>•&nbsp;the value of the variable "[a second variable](#family.var2)" (family.var2)<br/>•&nbsp;the value of the variable "[a third variable](#family2.var3)" (family2.var3) |

 </details>

--- a/tests/changelog/00add_family/result.html
+++ b/tests/changelog/00add_family/result.html
@ -2,14 +2,14 @@

 <table>
 <thead>
-<tr><th>Variable                                                                                                                                                                                                                             </th><th>Description                                                                   </th></tr>
+<tr><th>Variable                                                                                                                                                                                                                             </th><th>Description                                                                                  </th></tr>
 </thead>
 <tbody>
-<tr><td><b>family2.var2</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>standard</mark> <mark>mandatory</mark>                                                        </td><td>A variable2.<br/><b>Default</b>: the value of the variable "a second variable"</td></tr>
-<tr><td><b>family2.var3</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>standard</mark> <mark>mandatory</mark>                                                        </td><td>A third variable.<br/><b>Default</b>: string4<br/><b>Example</b>: string5     </td></tr>
-<tr><td><b>family2.subfamily.variable</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>multiple</mark> <mark>standard</mark> <mark>mandatory</mark> <mark>unique</mark></td><td>Fourth variable.<br/><b>Default</b>: <ul><li>the value of the variable "first variable"</li>
-<li>the value of the variable "a second variable"</li>
-<li>the value of the variable "a third variable"</li></ul>                                                                               </td></tr>
+<tr><td><b>family2.var2</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>standard</mark> <mark>mandatory</mark>                                                        </td><td>A variable2.<br/><b>Default</b>: the value of the variable "a second variable" (family.var2).</td></tr>
+<tr><td><b>family2.var3</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>standard</mark> <mark>mandatory</mark>                                                        </td><td>A third variable.<br/><b>Default</b>: string4<br/><b>Example</b>: string5                    </td></tr>
+<tr><td><b>family2.subfamily.variable</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>multiple</mark> <mark>standard</mark> <mark>mandatory</mark> <mark>unique</mark></td><td>Fourth variable.<br/><b>Default</b>: <ul><li>the value of the variable "first variable" (var1)</li>
+<li>the value of the variable "a second variable" (family.var2)</li>
+<li>the value of the variable "a third variable" (family2.var3)</li></ul>                                                                                              </td></tr>
 </tbody>
 </table>

--- a/tests/changelog/00add_family/result.md
+++ b/tests/changelog/00add_family/result.md
@ -1,8 +1,8 @@
 # New variables

-| Variable                                                                                                                                                                                                                                  | Description                                                                                                                                                                                                                                         |
-|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="family2.var2" name="family2.var2">family2.var2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                               | A variable2.<br/>**Default**: the value of the variable "[a second variable](#family.var2)"                                                                                                                                                         |
-| **<a id="family2.var3" name="family2.var3">family2.var3</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                               | A third variable.<br/>**Default**: string4<br/>**Example**: string5                                                                                                                                                                                 |
-| **<a id="family2.subfamily.variable" name="family2.subfamily.variable">family2.subfamily.variable</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | Fourth variable.<br/>**Default**: <br/>•&nbsp;the value of the variable "[first variable](#var1)"<br/>•&nbsp;the value of the variable "[a second variable](#family.var2)"<br/>•&nbsp;the value of the variable "[a third variable](#family2.var3)" |
+| Variable                                                                                                                                                                                                                                  | Description                                                                                                                                                                                                                                                                             |
+|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="family2.var2" name="family2.var2">family2.var2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                               | A variable2.<br/>**Default**: the value of the variable "[a second variable](#family.var2)" (family.var2).                                                                                                                                                                              |
+| **<a id="family2.var3" name="family2.var3">family2.var3</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                               | A third variable.<br/>**Default**: string4<br/>**Example**: string5                                                                                                                                                                                                                     |
+| **<a id="family2.subfamily.variable" name="family2.subfamily.variable">family2.subfamily.variable</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | Fourth variable.<br/>**Default**: <br/>•&nbsp;the value of the variable "[first variable](#var1)" (var1)<br/>•&nbsp;the value of the variable "[a second variable](#family.var2)" (family.var2)<br/>•&nbsp;the value of the variable "[a third variable](#family2.var3)" (family2.var3) |

--- a/tests/changelog/00add_family/result.sh
+++ b/tests/changelog/00add_family/result.sh
@ -5,7 +5,7 @@
 ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
 │ [1mfamily2.var2[0m                          │ A variable2.                         │
 │ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m       │ [1mDefault[0m: the value of the variable   │
-│                                       │ "a second variable"                  │
+│                                       │ "a second variable" (family.var2).   │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mfamily2.var3[0m                          │ A third variable.                    │
 │ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m       │ [1mDefault[0m: string4                     │
@ -14,10 +14,10 @@
 │ [1mfamily2.subfamily.variable[0m            │ Fourth variable.                     │
 │ [1;7m string [0m [1;7m multiple [0m [1;7m standard [0m [1;7m [0m      │ [1mDefault[0m:                             │
 │ [1;7mmandatory [0m [1;7m unique [0m                   │ • the value of the variable "first   │
-│                                       │ variable"                            │
+│                                       │ variable" (var1)                     │
 │                                       │ • the value of the variable "a       │
-│                                       │ second variable"                     │
+│                                       │ second variable" (family.var2)       │
 │                                       │ • the value of the variable "a third │
-│                                       │ variable"                            │
+│                                       │ variable" (family2.var3)             │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/changelog/11mod_variable_choices10/result.adoc
+++ b/tests/changelog/11mod_variable_choices10/result.adoc
@ -9,7 +9,7 @@

 * +++val1 ← (default)+++
 * +++val2+++
-* the value of the variable "the first source variable" **← (default)**
-* the value of the variable "the second source variable"               
+* the value of the variable "the first source variable" (source_variable_1) **← (default)**
+* the value of the variable "the second source variable" (source_variable_2)               
 |====

--- a/tests/changelog/11mod_variable_choices10/result.gitlab.md
+++ b/tests/changelog/11mod_variable_choices10/result.gitlab.md
@ -1,8 +1,8 @@
 <details><summary>Modified variable</summary>

-| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                      |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1 ← (default)~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)" **← (default)**<br/>•&nbsp;the value of the variable "[the second source variable](#source_variable_2)" |
+| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                                                              |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1 ← (default)~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)" (source_variable_1) **← (default)**<br/>•&nbsp;the value of the variable "[the second source variable](#source_variable_2)" (source_variable_2) |

 </details>

--- a/tests/changelog/11mod_variable_choices10/result.html
+++ b/tests/changelog/11mod_variable_choices10/result.html
@ -7,8 +7,8 @@
 <tbody>
 <tr><td><b>my_variable</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>choice</a></mark> <mark>standard</mark> <mark>mandatory</mark></td><td>A variable.<br/><b>Choices</b>: <ul><li><del>val1 ← (default)</del></li>
 <li><del>val2</del></li>
-<li>the value of the variable "the first source variable" <b>← (default)</b></li>
-<li>the value of the variable "the second source variable"</li></ul>              </td></tr>
+<li>the value of the variable "the first source variable" (source_variable_1) <b>← (default)</b></li>
+<li>the value of the variable "the second source variable" (source_variable_2)</li></ul>              </td></tr>
 </tbody>
 </table>

--- a/tests/changelog/11mod_variable_choices10/result.md
+++ b/tests/changelog/11mod_variable_choices10/result.md
@ -1,6 +1,6 @@
 # Modified variable

-| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                      |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1 ← (default)~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)" **← (default)**<br/>•&nbsp;the value of the variable "[the second source variable](#source_variable_2)" |
+| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                                                              |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1 ← (default)~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)" (source_variable_1) **← (default)**<br/>•&nbsp;the value of the variable "[the second source variable](#source_variable_2)" (source_variable_2) |

--- a/tests/changelog/11mod_variable_choices10/result.sh
+++ b/tests/changelog/11mod_variable_choices10/result.sh
@ -8,8 +8,10 @@
 │                                       │ • [9mval1 ← (default)[0m                   │
 │                                       │ • [9mval2[0m                               │
 │                                       │ • the value of the variable "the     │
-│                                       │ first source variable" [1m← (default)[0m   │
+│                                       │ first source variable"               │
+│                                       │ (source_variable_1) [1m← (default)[0m      │
 │                                       │ • the value of the variable "the     │
 │                                       │ second source variable"              │
+│                                       │ (source_variable_2)                  │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/changelog/11mod_variable_choices11/result.adoc
+++ b/tests/changelog/11mod_variable_choices11/result.adoc
@ -7,8 +7,8 @@
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[choice]` `standard` `mandatory`            | A variable. +
 **Choices**: 

-* +++the value of the variable "the first source variable"+++
-* +++the value of the variable "the second source variable"+++
+* +++the value of the variable "the first source variable" (source_variable_1)+++
+* +++the value of the variable "the second source variable" (source_variable_2)+++
 * '#val1 **← (default)**#'
 * '#val2#'               
 |====
--- a/tests/changelog/11mod_variable_choices11/result.gitlab.md
+++ b/tests/changelog/11mod_variable_choices11/result.gitlab.md
@ -1,8 +1,8 @@
 <details><summary>Modified variable</summary>

-| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                                |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~the value of the variable "[the first source variable](#source_variable_1)"~~<br/>•&nbsp;~~the value of the variable "[the second source variable](#source_variable_2)"~~<br/>•&nbsp;<ins>val1 **← (default)**</ins><br/>•&nbsp;<ins>val2</ins> |
+| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                                                                        |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~the value of the variable "[the first source variable](#source_variable_1)" (source_variable_1)~~<br/>•&nbsp;~~the value of the variable "[the second source variable](#source_variable_2)" (source_variable_2)~~<br/>•&nbsp;<ins>val1 **← (default)**</ins><br/>•&nbsp;<ins>val2</ins> |

 </details>

--- a/tests/changelog/11mod_variable_choices11/result.html
+++ b/tests/changelog/11mod_variable_choices11/result.html
@ -5,8 +5,8 @@
 <tr><th>Variable                                                                                                                                                                    </th><th>Description  </th></tr>
 </thead>
 <tbody>
-<tr><td><b>my_variable</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>choice</a></mark> <mark>standard</mark> <mark>mandatory</mark></td><td>A variable.<br/><b>Choices</b>: <ul><li><del>the value of the variable "the first source variable"</del></li>
-<li><del>the value of the variable "the second source variable"</del></li>
+<tr><td><b>my_variable</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>choice</a></mark> <mark>standard</mark> <mark>mandatory</mark></td><td>A variable.<br/><b>Choices</b>: <ul><li><del>the value of the variable "the first source variable" (source_variable_1)</del></li>
+<li><del>the value of the variable "the second source variable" (source_variable_2)</del></li>
 <li><ins>val1 <b>← (default)</b></ins></li>
 <li><ins>val2</ins></li></ul>              </td></tr>
 </tbody>
--- a/tests/changelog/11mod_variable_choices11/result.md
+++ b/tests/changelog/11mod_variable_choices11/result.md
@ -1,6 +1,6 @@
 # Modified variable

-| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                                |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~the value of the variable "[the first source variable](#source_variable_1)"~~<br/>•&nbsp;~~the value of the variable "[the second source variable](#source_variable_2)"~~<br/>•&nbsp;<ins>val1 **← (default)**</ins><br/>•&nbsp;<ins>val2</ins> |
+| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                                                                        |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~the value of the variable "[the first source variable](#source_variable_1)" (source_variable_1)~~<br/>•&nbsp;~~the value of the variable "[the second source variable](#source_variable_2)" (source_variable_2)~~<br/>•&nbsp;<ins>val1 **← (default)**</ins><br/>•&nbsp;<ins>val2</ins> |

--- a/tests/changelog/11mod_variable_choices11/result.sh
+++ b/tests/changelog/11mod_variable_choices11/result.sh
@ -6,9 +6,11 @@
 │ [1mmy_variable[0m                           │ A variable.                          │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m       │ [1mChoices[0m:                             │
 │                                       │ • [9mthe value of the variable "the [0m    │
-│                                       │ [9mfirst source variable"[0m               │
+│                                       │ [9mfirst source variable" [0m              │
+│                                       │ [9m(source_variable_1)[0m                  │
 │                                       │ • [9mthe value of the variable "the [0m    │
-│                                       │ [9msecond source variable"[0m              │
+│                                       │ [9msecond source variable" [0m             │
+│                                       │ [9m(source_variable_2)[0m                  │
 │                                       │ • [4mval1 [0m[1;4m← (default)[0m                   │
 │                                       │ • [4mval2[0m                               │
 └───────────────────────────────────────┴──────────────────────────────────────┘
--- a/tests/changelog/11mod_variable_choices12/result.adoc
+++ b/tests/changelog/11mod_variable_choices12/result.adoc
@ -9,6 +9,6 @@

 * +++val1+++
 * +++val2+++
-* the value of the variable "the first source variable"               
+* the value of the variable "the first source variable" (source_variable_1).               
 |====

--- a/tests/changelog/11mod_variable_choices12/result.gitlab.md
+++ b/tests/changelog/11mod_variable_choices12/result.gitlab.md
@ -1,8 +1,8 @@
 <details><summary>Modified variable</summary>

-| Variable                                                                                                                                                              | Description                                                                                                                                                  |
-|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)" |
+| Variable                                                                                                                                                              | Description                                                                                                                                                                       |
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)" (source_variable_1). |

 </details>

--- a/tests/changelog/11mod_variable_choices12/result.html
+++ b/tests/changelog/11mod_variable_choices12/result.html
@ -7,7 +7,7 @@
 <tbody>
 <tr><td><b>my_variable</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>choice</a></mark> <mark>basic</mark> <mark>mandatory</mark></td><td>A variable.<br/><b>Choices</b>: <ul><li><del>val1</del></li>
 <li><del>val2</del></li>
-<li>the value of the variable "the first source variable"</li></ul>              </td></tr>
+<li>the value of the variable "the first source variable" (source_variable_1).</li></ul>              </td></tr>
 </tbody>
 </table>

--- a/tests/changelog/11mod_variable_choices12/result.md
+++ b/tests/changelog/11mod_variable_choices12/result.md
@ -1,6 +1,6 @@
 # Modified variable

-| Variable                                                                                                                                                              | Description                                                                                                                                                  |
-|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)" |
+| Variable                                                                                                                                                              | Description                                                                                                                                                                       |
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)" (source_variable_1). |

--- a/tests/changelog/11mod_variable_choices12/result.sh
+++ b/tests/changelog/11mod_variable_choices12/result.sh
@ -9,5 +9,6 @@
 │                                       │ • [9mval2[0m                               │
 │                                       │ • the value of the variable "the     │
 │                                       │ first source variable"               │
+│                                       │ (source_variable_1).                 │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/changelog/11mod_variable_choices13/result.adoc
+++ b/tests/changelog/11mod_variable_choices13/result.adoc
@ -7,7 +7,7 @@
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[choice]` `basic` `mandatory`            | A variable. +
 **Choices**: 

-* +++the value of the variable "the first source variable"+++
+* +++the value of the variable "the first source variable" (source_variable_1).+++
 * '#val1#'
 * '#val2#'               
 |====
--- a/tests/changelog/11mod_variable_choices13/result.gitlab.md
+++ b/tests/changelog/11mod_variable_choices13/result.gitlab.md
@ -1,8 +1,8 @@
 <details><summary>Modified variable</summary>

-| Variable                                                                                                                                                              | Description                                                                                                                                                                    |
-|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~the value of the variable "[the first source variable](#source_variable_1)"~~<br/>•&nbsp;<ins>val1</ins><br/>•&nbsp;<ins>val2</ins> |
+| Variable                                                                                                                                                              | Description                                                                                                                                                                                         |
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~the value of the variable "[the first source variable](#source_variable_1)" (source_variable_1).~~<br/>•&nbsp;<ins>val1</ins><br/>•&nbsp;<ins>val2</ins> |

 </details>

--- a/tests/changelog/11mod_variable_choices13/result.html
+++ b/tests/changelog/11mod_variable_choices13/result.html
@ -5,7 +5,7 @@
 <tr><th>Variable                                                                                                                                                                 </th><th>Description  </th></tr>
 </thead>
 <tbody>
-<tr><td><b>my_variable</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>choice</a></mark> <mark>basic</mark> <mark>mandatory</mark></td><td>A variable.<br/><b>Choices</b>: <ul><li><del>the value of the variable "the first source variable"</del></li>
+<tr><td><b>my_variable</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>choice</a></mark> <mark>basic</mark> <mark>mandatory</mark></td><td>A variable.<br/><b>Choices</b>: <ul><li><del>the value of the variable "the first source variable" (source_variable_1).</del></li>
 <li><ins>val1</ins></li>
 <li><ins>val2</ins></li></ul>              </td></tr>
 </tbody>
--- a/tests/changelog/11mod_variable_choices13/result.md
+++ b/tests/changelog/11mod_variable_choices13/result.md
@ -1,6 +1,6 @@
 # Modified variable

-| Variable                                                                                                                                                              | Description                                                                                                                                                                    |
-|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~the value of the variable "[the first source variable](#source_variable_1)"~~<br/>•&nbsp;<ins>val1</ins><br/>•&nbsp;<ins>val2</ins> |
+| Variable                                                                                                                                                              | Description                                                                                                                                                                                         |
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~the value of the variable "[the first source variable](#source_variable_1)" (source_variable_1).~~<br/>•&nbsp;<ins>val1</ins><br/>•&nbsp;<ins>val2</ins> |

--- a/tests/changelog/11mod_variable_choices13/result.sh
+++ b/tests/changelog/11mod_variable_choices13/result.sh
@ -6,7 +6,8 @@
 │ [1mmy_variable[0m                           │ A variable.                          │
 │ [1;7m choice [0m [1;7m basic [0m [1;7m mandatory [0m          │ [1mChoices[0m:                             │
 │                                       │ • [9mthe value of the variable "the [0m    │
-│                                       │ [9mfirst source variable"[0m               │
+│                                       │ [9mfirst source variable" [0m              │
+│                                       │ [9m(source_variable_1).[0m                 │
 │                                       │ • [4mval1[0m                               │
 │                                       │ • [4mval2[0m                               │
 └───────────────────────────────────────┴──────────────────────────────────────┘
--- a/tests/changelog/11mod_variable_choices9/result.adoc
+++ b/tests/changelog/11mod_variable_choices9/result.adoc
@ -9,8 +9,8 @@

 * +++val1+++
 * +++val2+++
-* the value of the variable "the first source variable"
-* the value of the variable "the second source variable"
+* the value of the variable "the first source variable" (source_variable_1)
+* the value of the variable "the second source variable" (source_variable_2)

 **Default**: val1               
 |====
--- a/tests/changelog/11mod_variable_choices9/result.gitlab.md
+++ b/tests/changelog/11mod_variable_choices9/result.gitlab.md
@ -1,8 +1,8 @@
 <details><summary>Modified variable</summary>

-| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)"<br/>•&nbsp;the value of the variable "[the second source variable](#source_variable_2)"<br/>**Default**: val1 |
+| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                                                        |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)" (source_variable_1)<br/>•&nbsp;the value of the variable "[the second source variable](#source_variable_2)" (source_variable_2)<br/>**Default**: val1 |

 </details>

--- a/tests/changelog/11mod_variable_choices9/result.html
+++ b/tests/changelog/11mod_variable_choices9/result.html
@ -7,8 +7,8 @@
 <tbody>
 <tr><td><b>my_variable</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>choice</a></mark> <mark>standard</mark> <mark>mandatory</mark></td><td>A variable.<br/><b>Choices</b>: <ul><li><del>val1</del></li>
 <li><del>val2</del></li>
-<li>the value of the variable "the first source variable"</li>
-<li>the value of the variable "the second source variable"</li></ul><br/><b>Default</b>: val1              </td></tr>
+<li>the value of the variable "the first source variable" (source_variable_1)</li>
+<li>the value of the variable "the second source variable" (source_variable_2)</li></ul><br/><b>Default</b>: val1              </td></tr>
 </tbody>
 </table>

--- a/tests/changelog/11mod_variable_choices9/result.md
+++ b/tests/changelog/11mod_variable_choices9/result.md
@ -1,6 +1,6 @@
 # Modified variable

-| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)"<br/>•&nbsp;the value of the variable "[the second source variable](#source_variable_2)"<br/>**Default**: val1 |
+| Variable                                                                                                                                                                 | Description                                                                                                                                                                                                                                                                                                        |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="my_variable" name="my_variable">my_variable</a>**<br/>[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.<br/>**Choices**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;~~val2~~<br/>•&nbsp;the value of the variable "[the first source variable](#source_variable_1)" (source_variable_1)<br/>•&nbsp;the value of the variable "[the second source variable](#source_variable_2)" (source_variable_2)<br/>**Default**: val1 |

--- a/tests/changelog/11mod_variable_choices9/result.sh
+++ b/tests/changelog/11mod_variable_choices9/result.sh
@ -9,8 +9,10 @@
 │                                       │ • [9mval2[0m                               │
 │                                       │ • the value of the variable "the     │
 │                                       │ first source variable"               │
+│                                       │ (source_variable_1)                  │
 │                                       │ • the value of the variable "the     │
 │                                       │ second source variable"              │
+│                                       │ (source_variable_2)                  │
 │                                       │ [1mDefault[0m: val1                        │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/changelog/12mod_default_value4/result.adoc
+++ b/tests/changelog/12mod_default_value4/result.adoc
@ -6,6 +6,6 @@
 | **variable_2** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory`            | The second variable. +
 **Default**: +++val1+++ +
-#the value of the variable "the first variable"#               
+#the value of the variable "the first variable" (variable_1).#               
 |====

--- a/tests/changelog/12mod_default_value4/result.gitlab.md
+++ b/tests/changelog/12mod_default_value4/result.gitlab.md
@ -1,8 +1,8 @@
 <details><summary>Modified variable</summary>

-| Variable                                                                                                                                                              | Description                                                                                                                 |
-|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
-| **<a id="variable_2" name="variable_2">variable_2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.<br/>**Default**: ~~val1~~<br/><ins>the value of the variable "[the first variable](#variable_1)"</ins> |
+| Variable                                                                                                                                                              | Description                                                                                                                               |
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="variable_2" name="variable_2">variable_2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.<br/>**Default**: ~~val1~~<br/><ins>the value of the variable "[the first variable](#variable_1)" (variable_1).</ins> |

 </details>

--- a/tests/changelog/12mod_default_value4/result.html
+++ b/tests/changelog/12mod_default_value4/result.html
@ -2,10 +2,10 @@

 <table>
 <thead>
-<tr><th>Variable                                                                                                                                                                   </th><th>Description                                                                                                           </th></tr>
+<tr><th>Variable                                                                                                                                                                   </th><th>Description                                                                                                                         </th></tr>
 </thead>
 <tbody>
-<tr><td><b>variable_2</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>standard</mark> <mark>mandatory</mark></td><td>The second variable.<br/><b>Default</b>: <del>val1</del><br/><ins>the value of the variable "the first variable"</ins></td></tr>
+<tr><td><b>variable_2</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>standard</mark> <mark>mandatory</mark></td><td>The second variable.<br/><b>Default</b>: <del>val1</del><br/><ins>the value of the variable "the first variable" (variable_1).</ins></td></tr>
 </tbody>
 </table>

--- a/tests/changelog/12mod_default_value4/result.md
+++ b/tests/changelog/12mod_default_value4/result.md
@ -1,6 +1,6 @@
 # Modified variable

-| Variable                                                                                                                                                              | Description                                                                                                                 |
-|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
-| **<a id="variable_2" name="variable_2">variable_2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.<br/>**Default**: ~~val1~~<br/><ins>the value of the variable "[the first variable](#variable_1)"</ins> |
+| Variable                                                                                                                                                              | Description                                                                                                                               |
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="variable_2" name="variable_2">variable_2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.<br/>**Default**: ~~val1~~<br/><ins>the value of the variable "[the first variable](#variable_1)" (variable_1).</ins> |

--- a/tests/changelog/12mod_default_value4/result.sh
+++ b/tests/changelog/12mod_default_value4/result.sh
@ -6,6 +6,6 @@
 │ [1mvariable_2[0m                            │ The second variable.                 │
 │ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m       │ [1mDefault[0m: [9mval1[0m                        │
 │                                       │ [4mthe value of the variable "the first[0m │
-│                                       │ [4mvariable"[0m                            │
+│                                       │ [4mvariable" (variable_1).[0m              │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/changelog/12mod_default_value5/result.adoc
+++ b/tests/changelog/12mod_default_value5/result.adoc
@ -8,6 +8,6 @@
 **Default**: 

 * +++val1+++
-* '#the value of the variable "the first variable"#'               
+* '#the value of the variable "the first variable" (variable_1)#'               
 |====

--- a/tests/changelog/12mod_default_value5/result.gitlab.md
+++ b/tests/changelog/12mod_default_value5/result.gitlab.md
@ -1,8 +1,8 @@
 <details><summary>Modified variable</summary>

-| Variable                                                                                                                                                                                             | Description                                                                                                                                    |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="variable_2" name="variable_2">variable_2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` <ins>`unique`</ins> | The second variable.<br/>**Default**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;<ins>the value of the variable "[the first variable](#variable_1)"</ins> |
+| Variable                                                                                                                                                                                             | Description                                                                                                                                                 |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="variable_2" name="variable_2">variable_2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` <ins>`unique`</ins> | The second variable.<br/>**Default**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;<ins>the value of the variable "[the first variable](#variable_1)" (variable_1)</ins> |

 </details>

--- a/tests/changelog/12mod_default_value5/result.html
+++ b/tests/changelog/12mod_default_value5/result.html
@ -6,7 +6,7 @@
 </thead>
 <tbody>
 <tr><td><b>variable_2</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>multiple</mark> <mark>standard</mark> <mark>mandatory</mark> <mark><ins>unique</ins></mark></td><td>The second variable.<br/><b>Default</b>: <ul><li><del>val1</del></li>
-<li><ins>the value of the variable "the first variable"</ins></li></ul>              </td></tr>
+<li><ins>the value of the variable "the first variable" (variable_1)</ins></li></ul>              </td></tr>
 </tbody>
 </table>

--- a/tests/changelog/12mod_default_value5/result.md
+++ b/tests/changelog/12mod_default_value5/result.md
@ -1,6 +1,6 @@
 # Modified variable

-| Variable                                                                                                                                                                                             | Description                                                                                                                                    |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id="variable_2" name="variable_2">variable_2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` <ins>`unique`</ins> | The second variable.<br/>**Default**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;<ins>the value of the variable "[the first variable](#variable_1)"</ins> |
+| Variable                                                                                                                                                                                             | Description                                                                                                                                                 |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id="variable_2" name="variable_2">variable_2</a>**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` <ins>`unique`</ins> | The second variable.<br/>**Default**: <br/>•&nbsp;~~val1~~<br/>•&nbsp;<ins>the value of the variable "[the first variable](#variable_1)" (variable_1)</ins> |

--- a/tests/changelog/12mod_default_value5/result.sh
+++ b/tests/changelog/12mod_default_value5/result.sh
@ -7,6 +7,6 @@
 │ [1;7m string [0m [1;7m multiple [0m [1;7m standard [0m [1;7m [0m      │ [1mDefault[0m:                             │
 │ [1;7mmandatory [0m [1;7m [0m[1;4;7munique[0m[1;7m [0m                   │ • [9mval1[0m                               │
 │                                       │ • [4mthe value of the variable "the [0m    │
-│                                       │ [4mfirst variable"[0m                      │
+│                                       │ [4mfirst variable" (variable_1)[0m         │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/changelog/40_dynamic_mod_default1/result.adoc
+++ b/tests/changelog/40_dynamic_mod_default1/result.adoc
@ -6,8 +6,8 @@
 | **__val1___dyn.var2** +
 **__val2___dyn.var2** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory`            | A second variable. +
-**Default**: +++the value of the variable "a first variable"+++ +
-+++the value of the variable "a first variable"+++ +
+**Default**: +++the value of the variable "a first variable" (__val1___dyn.var1)+++ +
+++the value of the variable "a first variable" (__val2___dyn.var1)+++ +
 #val#               
 |====

--- a/tests/changelog/40_dynamic_mod_default1/result.gitlab.md
+++ b/tests/changelog/40_dynamic_mod_default1/result.gitlab.md
@ -1,8 +1,8 @@
 <details><summary>Modified variable</summary>

-| Variable                                                                                                                                                                                                                         | Description                                                                                                                                                                                                              |
-|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id=":::identifier:::_dyn.var2" name=":::identifier:::_dyn.var2">*val1*_dyn.var2</a>**<br/>***val2*_dyn.var2**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.<br/>**Default**: ~~the value of the variable "[a first variable](#:::identifier:::_dyn.var1)"~~<br/>~~the value of the variable "[a first variable](#:::identifier:::_dyn.var1)"~~<br/><ins>val</ins> |
+| Variable                                                                                                                                                                                                                         | Description                                                                                                                                                                                                                                                  |
+|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id=":::identifier:::_dyn.var2" name=":::identifier:::_dyn.var2">*val1*_dyn.var2</a>**<br/>***val2*_dyn.var2**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.<br/>**Default**: ~~the value of the variable "[a first variable](#:::identifier:::_dyn.var1)" (*val1*_dyn.var1)~~<br/>~~the value of the variable "[a first variable](#:::identifier:::_dyn.var1)" (*val2*_dyn.var1)~~<br/><ins>val</ins> |

 </details>

--- a/tests/changelog/40_dynamic_mod_default1/result.html
+++ b/tests/changelog/40_dynamic_mod_default1/result.html
@ -2,10 +2,10 @@

 <table>
 <thead>
-<tr><th>Variable                                                                                                                                                                                                             </th><th>Description                                                                                                                                                                  </th></tr>
+<tr><th>Variable                                                                                                                                                                                                             </th><th>Description                                                                                                                                                                                                                </th></tr>
 </thead>
 <tbody>
-<tr><td><b><i>val1</i>_dyn.var2</b><br/><b><i>val2</i>_dyn.var2</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>standard</mark> <mark>mandatory</mark></td><td>A second variable.<br/><b>Default</b>: <del>the value of the variable "a first variable"</del><br/><del>the value of the variable "a first variable"</del><br/><ins>val</ins></td></tr>
+<tr><td><b><i>val1</i>_dyn.var2</b><br/><b><i>val2</i>_dyn.var2</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>standard</mark> <mark>mandatory</mark></td><td>A second variable.<br/><b>Default</b>: <del>the value of the variable "a first variable" (<i>val1</i>_dyn.var1)</del><br/><del>the value of the variable "a first variable" (<i>val2</i>_dyn.var1)</del><br/><ins>val</ins></td></tr>
 </tbody>
 </table>

--- a/tests/changelog/40_dynamic_mod_default1/result.md
+++ b/tests/changelog/40_dynamic_mod_default1/result.md
@ -1,6 +1,6 @@
 # Modified variable

-| Variable                                                                                                                                                                                                                         | Description                                                                                                                                                                                                              |
-|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id=":::identifier:::_dyn.var2" name=":::identifier:::_dyn.var2">*val1*_dyn.var2</a>**<br/>***val2*_dyn.var2**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.<br/>**Default**: ~~the value of the variable "[a first variable](#:::identifier:::_dyn.var1)"~~<br/>~~the value of the variable "[a first variable](#:::identifier:::_dyn.var1)"~~<br/><ins>val</ins> |
+| Variable                                                                                                                                                                                                                         | Description                                                                                                                                                                                                                                                  |
+|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id=":::identifier:::_dyn.var2" name=":::identifier:::_dyn.var2">*val1*_dyn.var2</a>**<br/>***val2*_dyn.var2**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.<br/>**Default**: ~~the value of the variable "[a first variable](#:::identifier:::_dyn.var1)" (*val1*_dyn.var1)~~<br/>~~the value of the variable "[a first variable](#:::identifier:::_dyn.var1)" (*val2*_dyn.var1)~~<br/><ins>val</ins> |

--- a/tests/changelog/40_dynamic_mod_default1/result.sh
+++ b/tests/changelog/40_dynamic_mod_default1/result.sh
@ -5,9 +5,9 @@
 ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
 │ [1;3mval1[0m[1m_dyn.var2[0m                         │ A second variable.                   │
 │ [1;3mval2[0m[1m_dyn.var2[0m                         │ [1mDefault[0m: [9mthe value of the variable [0m  │
-│ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m       │ [9m"a first variable"[0m                   │
+│ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m       │ [9m"a first variable" ([0m[3;9mval1[0m[9m_dyn.var1)[0m   │
 │                                       │ [9mthe value of the variable "a first [0m  │
-│                                       │ [9mvariable"[0m                            │
+│                                       │ [9mvariable" ([0m[3;9mval2[0m[9m_dyn.var1)[0m            │
 │                                       │ [4mval[0m                                  │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/changelog/40_dynamic_mod_default2/result.adoc
+++ b/tests/changelog/40_dynamic_mod_default2/result.adoc
@ -9,7 +9,7 @@
 **Default**: 

 * +++val+++
-* '#the value of the variable "a first variable"#'
-* '#the value of the variable "a first variable"#'               
+* '#the value of the variable "a first variable" (__val1___dyn.var1)#'
+* '#the value of the variable "a first variable" (__val2___dyn.var1)#'               
 |====

--- a/tests/changelog/40_dynamic_mod_default2/result.gitlab.md
+++ b/tests/changelog/40_dynamic_mod_default2/result.gitlab.md
@ -1,8 +1,8 @@
 <details><summary>Modified variable</summary>

-| Variable                                                                                                                                                                                                                         | Description                                                                                                                                                                                                                                               |
-|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id=":::identifier:::_dyn.var2" name=":::identifier:::_dyn.var2">*val1*_dyn.var2</a>**<br/>***val2*_dyn.var2**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.<br/>**Default**: <br/>•&nbsp;~~val~~<br/>•&nbsp;<ins>the value of the variable "[a first variable](#:::identifier:::_dyn.var1)"</ins><br/>•&nbsp;<ins>the value of the variable "[a first variable](#:::identifier:::_dyn.var1)"</ins> |
+| Variable                                                                                                                                                                                                                         | Description                                                                                                                                                                                                                                                                                   |
+|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id=":::identifier:::_dyn.var2" name=":::identifier:::_dyn.var2">*val1*_dyn.var2</a>**<br/>***val2*_dyn.var2**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.<br/>**Default**: <br/>•&nbsp;~~val~~<br/>•&nbsp;<ins>the value of the variable "[a first variable](#:::identifier:::_dyn.var1)" (*val1*_dyn.var1)</ins><br/>•&nbsp;<ins>the value of the variable "[a first variable](#:::identifier:::_dyn.var1)" (*val2*_dyn.var1)</ins> |

 </details>

--- a/tests/changelog/40_dynamic_mod_default2/result.html
+++ b/tests/changelog/40_dynamic_mod_default2/result.html
@ -6,8 +6,8 @@
 </thead>
 <tbody>
 <tr><td><b><i>val1</i>_dyn.var2</b><br/><b><i>val2</i>_dyn.var2</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>standard</mark> <mark>mandatory</mark></td><td>A second variable.<br/><b>Default</b>: <ul><li><del>val</del></li>
-<li><ins>the value of the variable "a first variable"</ins></li>
-<li><ins>the value of the variable "a first variable"</ins></li></ul>              </td></tr>
+<li><ins>the value of the variable "a first variable" (<i>val1</i>_dyn.var1)</ins></li>
+<li><ins>the value of the variable "a first variable" (<i>val2</i>_dyn.var1)</ins></li></ul>              </td></tr>
 </tbody>
 </table>

--- a/tests/changelog/40_dynamic_mod_default2/result.md
+++ b/tests/changelog/40_dynamic_mod_default2/result.md
@ -1,6 +1,6 @@
 # Modified variable

-| Variable                                                                                                                                                                                                                         | Description                                                                                                                                                                                                                                               |
-|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **<a id=":::identifier:::_dyn.var2" name=":::identifier:::_dyn.var2">*val1*_dyn.var2</a>**<br/>***val2*_dyn.var2**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.<br/>**Default**: <br/>•&nbsp;~~val~~<br/>•&nbsp;<ins>the value of the variable "[a first variable](#:::identifier:::_dyn.var1)"</ins><br/>•&nbsp;<ins>the value of the variable "[a first variable](#:::identifier:::_dyn.var1)"</ins> |
+| Variable                                                                                                                                                                                                                         | Description                                                                                                                                                                                                                                                                                   |
+|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **<a id=":::identifier:::_dyn.var2" name=":::identifier:::_dyn.var2">*val1*_dyn.var2</a>**<br/>***val2*_dyn.var2**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.<br/>**Default**: <br/>•&nbsp;~~val~~<br/>•&nbsp;<ins>the value of the variable "[a first variable](#:::identifier:::_dyn.var1)" (*val1*_dyn.var1)</ins><br/>•&nbsp;<ins>the value of the variable "[a first variable](#:::identifier:::_dyn.var1)" (*val2*_dyn.var1)</ins> |

--- a/tests/changelog/40_dynamic_mod_default2/result.sh
+++ b/tests/changelog/40_dynamic_mod_default2/result.sh
@ -7,8 +7,8 @@
 │ [1;3mval2[0m[1m_dyn.var2[0m                         │ [1mDefault[0m:                             │
 │ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m       │ • [9mval[0m                                │
 │                                       │ • [4mthe value of the variable "a first[0m │
-│                                       │ [4mvariable"[0m                            │
+│                                       │ [4mvariable" ([0m[3;4mval1[0m[4m_dyn.var1)[0m            │
 │                                       │ • [4mthe value of the variable "a first[0m │
-│                                       │ [4mvariable"[0m                            │
+│                                       │ [4mvariable" ([0m[3;4mval2[0m[4m_dyn.var1)[0m            │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/mode_advanced.adoc
+++ b/tests/mode_advanced.adoc
@ -5,6 +5,6 @@
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory`            | My var1.      
 | **var2** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory`            | My var2. +
-**Default**: the value of the variable "my var1"               
+**Default**: the value of the variable "my var1" (var1).               
 |====

--- a/tests/mode_basic.adoc
+++ b/tests/mode_basic.adoc
@ -3,7 +3,7 @@
 | Variable   | Description   
 | **var2** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory`            | My var2. +
-**Default**: the value of an undocumented variable               
+**Default**: the value of an undocumented variable.               
 | **var3** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `advanced` `mandatory` `__hidden__`            | My var3. +
 **Hidden**: var could be hidden.               
--- a/tests/mode_basic_advanced.adoc
+++ b/tests/mode_basic_advanced.adoc
@ -3,6 +3,6 @@
 | Variable   | Description   
 | **var2** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory`            | My var2. +
-**Default**: the value of an undocumented variable               
+**Default**: the value of an undocumented variable.               
 |====

--- a/tests/result_tutorial/041/doc.json
+++ b/tests/result_tutorial/041/doc.json
@ -149,7 +149,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -183,7 +183,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
--- a/tests/result_tutorial/041/doc.sh
+++ b/tests/result_tutorial/041/doc.sh
@ -66,6 +66,7 @@
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ HTTPS Port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -77,6 +78,7 @@
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘


--- a/tests/result_tutorial/041/doc_changelog.sh
+++ b/tests/result_tutorial/041/doc_changelog.sh
@ -8,7 +8,8 @@
 │ [1;7mstandard [0m [1;7m mandatory [0m                 │ • type domainname                    │
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: [4mthe value of the variable [0m  │
-│                                       │ [4m"HTTP address"[0m                       │
+│                                       │ [4m"HTTP address" [0m                      │
+│                                       │ [4m(manual.http_proxy.address).[0m         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ HTTPS Port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -20,6 +21,6 @@
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: [9m8080[0m                        │
 │                                       │ [4mthe value of the variable "HTTP [0m     │
-│                                       │ [4mPort"[0m                                │
+│                                       │ [4mPort" (manual.http_proxy.port).[0m      │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/result_tutorial/051/doc.json
+++ b/tests/result_tutorial/051/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -163,7 +163,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -197,7 +197,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
--- a/tests/result_tutorial/051/doc.sh
+++ b/tests/result_tutorial/051/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -68,6 +68,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ HTTPS Port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -79,6 +80,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘


--- a/tests/result_tutorial/051/doc_changelog.sh
+++ b/tests/result_tutorial/051/doc_changelog.sh
@ -27,6 +27,7 @@
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ HTTPS Port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -38,5 +39,6 @@
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/result_tutorial/052/doc.json
+++ b/tests/result_tutorial/052/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
--- a/tests/result_tutorial/052/doc.sh
+++ b/tests/result_tutorial/052/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

--- a/tests/result_tutorial/053/doc.json
+++ b/tests/result_tutorial/053/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "message": "when the variable \"{0}\" has the value \"true\".",
+                "message": "when the variable {0} has the value \"true\".",
                "path": {
                  "path": "manual.use_for_https"
                },
@ -177,7 +177,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -211,7 +211,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
--- a/tests/result_tutorial/053/doc.sh
+++ b/tests/result_tutorial/053/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -58,8 +58,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual.https_proxy                                                    
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m has the value 
-[32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m                   
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m has the value [32m"true"[0m.                                

 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃[1m [0m[1mVariable                             [0m[1m [0m┃[1m [0m[1mDescription                         [0m[1m [0m┃
@ -70,6 +70,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ HTTPS Port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -81,6 +82,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘


--- a/tests/result_tutorial/053/doc_changelog.sh
+++ b/tests/result_tutorial/053/doc_changelog.sh
@ -9,6 +9,7 @@
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ HTTPS Port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -20,5 +21,6 @@
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/result_tutorial/060/doc.json
+++ b/tests/result_tutorial/060/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "message": "when the variable \"{0}\" has the value \"true\".",
+                "message": "when the variable {0} has the value \"true\".",
                "path": {
                  "path": "manual.use_for_https"
                },
@ -200,7 +200,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -242,7 +242,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
--- a/tests/result_tutorial/060/doc.sh
+++ b/tests/result_tutorial/060/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -61,8 +61,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m • manual.[3mhttps[0m_proxy                                                       
 [34m▌ [0m • manual.[3msocks[0m_proxy                                                       
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m has the value 
-[32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m                   
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m has the value [32m"true"[0m.                                
 [34m▌ [0m[1mIdentifiers[0m:                                                                
 [34m▌ [0m • HTTPS                                                                    
 [34m▌ [0m • SOCKS                                                                    
@ -76,6 +76,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3mhttps[0m[1m_proxy.port[0m               │ [3mHTTPS[0m or [3mSOCKS[0m port.                 │
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.port[0m               │ [1mValidators[0m:                          │
@ -87,6 +88,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘


--- a/tests/result_tutorial/060/doc_changelog.sh
+++ b/tests/result_tutorial/060/doc_changelog.sh
@ -9,6 +9,7 @@
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3mhttps[0m[1m_proxy.port[0m               │ [3mHTTPS[0m or [3mSOCKS[0m port.                 │
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.port[0m               │ [1mValidators[0m:                          │
@ -20,6 +21,7 @@
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘

 [1;4;96mDeleted variables[0m
--- a/tests/result_tutorial/061/doc.json
+++ b/tests/result_tutorial/061/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "message": "when the variable \"{0}\" has the value \"true\".",
+                "message": "when the variable {0} has the value \"true\".",
                "path": {
                  "path": "manual.use_for_https"
                },
@ -200,7 +200,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -242,7 +242,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
--- a/tests/result_tutorial/061/doc.sh
+++ b/tests/result_tutorial/061/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -61,8 +61,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m • manual.[3mhttps[0m_proxy                                                       
 [34m▌ [0m • manual.[3msocks[0m_proxy                                                       
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m has the value 
-[32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m                   
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m has the value [32m"true"[0m.                                
 [34m▌ [0m[1mIdentifiers[0m:                                                                
 [34m▌ [0m • HTTPS                                                                    
 [34m▌ [0m • SOCKS                                                                    
@ -76,6 +76,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3mhttps[0m[1m_proxy.port[0m               │ [3mHTTPS[0m or [3mSOCKS[0m port.                 │
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.port[0m               │ [1mValidators[0m:                          │
@ -87,6 +88,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m     │ [1mChoices[0m:                             │
--- a/tests/result_tutorial/070/doc.json
+++ b/tests/result_tutorial/070/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -194,7 +194,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -236,7 +236,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
--- a/tests/result_tutorial/070/doc.sh
+++ b/tests/result_tutorial/070/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -75,6 +75,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3mhttps[0m[1m_proxy.port[0m               │ [3mHTTPS[0m or [3mSOCKS[0m port.                 │
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.port[0m               │ [1mValidators[0m:                          │
@ -86,6 +87,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m     │ [1mChoices[0m:                             │
--- a/tests/result_tutorial/071/doc.json
+++ b/tests/result_tutorial/071/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "description": "in HTTPS case if \"{0}\" is set to \"true\".",
+                "description": "in HTTPS case if {0} is set to \"true\".",
                "variables": [
                  {
                    "path": "manual.use_for_https",
@ -202,7 +202,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -244,7 +244,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
--- a/tests/result_tutorial/071/doc.sh
+++ b/tests/result_tutorial/071/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -61,7 +61,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m • manual.[3mhttps[0m_proxy                                                       
 [34m▌ [0m • manual.[3msocks[0m_proxy                                                       
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: in HTTPS case if [32m"Also use this proxy for HTTPS"[0m is set to [32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: in HTTPS case if [32m"Also use this proxy for HTTPS"[0m                    
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m is set to [32m"true"[0m.                                    
 [34m▌ [0m[1mIdentifiers[0m:                                                                
 [34m▌ [0m • HTTPS                                                                    
 [34m▌ [0m • SOCKS                                                                    
@ -75,6 +76,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3mhttps[0m[1m_proxy.port[0m               │ [3mHTTPS[0m or [3mSOCKS[0m port.                 │
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.port[0m               │ [1mValidators[0m:                          │
@ -86,6 +88,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m     │ [1mChoices[0m:                             │
--- a/tests/result_tutorial/072/doc.json
+++ b/tests/result_tutorial/072/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "description": "in HTTPS case if \"{0}\" is set to \"true\".",
+                "description": "in HTTPS case if {0} is set to \"true\".",
                "variables": [
                  {
                    "path": "manual.use_for_https",
@ -202,7 +202,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -244,7 +244,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
--- a/tests/result_tutorial/072/doc.sh
+++ b/tests/result_tutorial/072/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -61,7 +61,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m • manual.[3mhttps[0m_proxy                                                       
 [34m▌ [0m • manual.[3msocks[0m_proxy                                                       
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: in HTTPS case if [32m"Also use this proxy for HTTPS"[0m is set to [32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: in HTTPS case if [32m"Also use this proxy for HTTPS"[0m                    
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m is set to [32m"true"[0m.                                    
 [34m▌ [0m[1mIdentifiers[0m:                                                                
 [34m▌ [0m • HTTPS                                                                    
 [34m▌ [0m • SOCKS                                                                    
@ -75,6 +76,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3mhttps[0m[1m_proxy.port[0m               │ [3mHTTPS[0m or [3mSOCKS[0m port.                 │
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.port[0m               │ [1mValidators[0m:                          │
@ -86,6 +88,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m     │ [1mChoices[0m:                             │
--- a/tests/result_tutorial/073/doc.json
+++ b/tests/result_tutorial/073/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "description": "in HTTPS case if \"{0}\" is set to \"true\".",
+                "description": "in HTTPS case if {0} is set to \"true\".",
                "variables": [
                  {
                    "path": "manual.use_for_https",
@ -202,7 +202,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -244,7 +244,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
--- a/tests/result_tutorial/073/doc.sh
+++ b/tests/result_tutorial/073/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -61,7 +61,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m • manual.[3mhttps[0m_proxy                                                       
 [34m▌ [0m • manual.[3msocks[0m_proxy                                                       
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: in HTTPS case if [32m"Also use this proxy for HTTPS"[0m is set to [32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: in HTTPS case if [32m"Also use this proxy for HTTPS"[0m                    
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m is set to [32m"true"[0m.                                    
 [34m▌ [0m[1mIdentifiers[0m:                                                                
 [34m▌ [0m • HTTPS                                                                    
 [34m▌ [0m • SOCKS                                                                    
@ -75,6 +76,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP address"                       │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3mhttps[0m[1m_proxy.port[0m               │ [3mHTTPS[0m or [3mSOCKS[0m port.                 │
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.port[0m               │ [1mValidators[0m:                          │
@ -86,6 +88,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "HTTP Port"                          │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m     │ [1mChoices[0m:                             │
--- a/tests/result_tutorial/080/doc.json
+++ b/tests/result_tutorial/080/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "description": "in HTTPS case if \"{0}\" is set to \"true\".",
+                "description": "in HTTPS case if {0} is set to \"true\".",
                "variables": [
                  {
                    "path": "manual.use_for_https",
@ -202,7 +202,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -244,7 +244,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
--- a/tests/result_tutorial/080/doc.sh
+++ b/tests/result_tutorial/080/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -61,7 +61,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m • manual.[3mhttps[0m_proxy                                                       
 [34m▌ [0m • manual.[3msocks[0m_proxy                                                       
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: in HTTPS case if [32m"Also use this proxy for HTTPS"[0m is set to [32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: in HTTPS case if [32m"Also use this proxy for HTTPS"[0m                    
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m is set to [32m"true"[0m.                                    
 [34m▌ [0m[1mIdentifiers[0m:                                                                
 [34m▌ [0m • HTTPS                                                                    
 [34m▌ [0m • SOCKS                                                                    
@ -75,6 +76,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3mhttps[0m[1m_proxy.port[0m               │ [3mHTTPS[0m or [3mSOCKS[0m port.                 │
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.port[0m               │ [1mValidators[0m:                          │
@ -86,6 +88,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m     │ [1mChoices[0m:                             │
--- a/tests/result_tutorial/080/doc_changelog.sh
+++ b/tests/result_tutorial/080/doc_changelog.sh
@ -25,9 +25,11 @@
 │ [1;7m domainname [0m [1;7m standard [0m [1;7m mandatory [0m   │ • type domainname                    │
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: [9mthe value of the variable [0m  │
-│                                       │ [9m"HTTP address"[0m                       │
+│                                       │ [9m"HTTP address" [0m                      │
+│                                       │ [9m(manual.http_proxy.address).[0m         │
 │                                       │ [4mthe value of the variable "Proxy [0m    │
-│                                       │ [4maddress"[0m                             │
+│                                       │ [4maddress" [0m                            │
+│                                       │ [4m(manual.http_proxy.address).[0m         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.[0m[1;3mhttps[0m[1m_proxy.port[0m               │ [3mHTTPS[0m or [3mSOCKS[0m port.                 │
 │ [1mmanual.[0m[1;3msocks[0m[1m_proxy.port[0m               │ [1mValidators[0m:                          │
@ -38,8 +40,9 @@
 │                                       │ • private ports (greater than 49152) │
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: [9mthe value of the variable [0m  │
-│                                       │ [9m"HTTP Port"[0m                          │
+│                                       │ [9m"HTTP Port" [0m                         │
+│                                       │ [9m(manual.http_proxy.port).[0m            │
 │                                       │ [4mthe value of the variable "Proxy [0m    │
-│                                       │ [4mport"[0m                                │
+│                                       │ [4mport" (manual.http_proxy.port).[0m      │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/result_tutorial/081/doc.json
+++ b/tests/result_tutorial/081/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "message": "when the variable \"{0}\" has the value \"true\".",
+                "message": "when the variable {0} has the value \"true\".",
                "path": {
                  "path": "manual.use_for_https"
                },
@ -177,7 +177,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -211,7 +211,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
@ -258,7 +258,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -292,7 +292,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
--- a/tests/result_tutorial/081/doc.sh
+++ b/tests/result_tutorial/081/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -58,8 +58,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual.https_proxy                                                    
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m has the value 
-[32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m                   
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m has the value [32m"true"[0m.                                

 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃[1m [0m[1mVariable                             [0m[1m [0m┃[1m [0m[1mDescription                         [0m[1m [0m┃
@ -70,6 +70,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -81,6 +82,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘

  [1;4;92mSOCKS Proxy[0m
@ -99,6 +101,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -110,6 +113,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m       │ [1mChoices[0m:                             │
--- a/tests/result_tutorial/081/doc_changelog.sh
+++ b/tests/result_tutorial/081/doc_changelog.sh
@ -9,6 +9,7 @@
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -20,6 +21,7 @@
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.address[0m            │ Proxy address.                       │
 │ [1;7m domainname [0m [1;7m standard [0m [1;7m mandatory [0m   │ [1mValidators[0m:                          │
@ -27,6 +29,7 @@
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -38,6 +41,7 @@
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m       │ [1mChoices[0m:                             │
--- a/tests/result_tutorial/090/doc.json
+++ b/tests/result_tutorial/090/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "message": "when the variable \"{0}\" has the value \"true\".",
+                "message": "when the variable {0} has the value \"true\".",
                "path": {
                  "path": "manual.use_for_https"
                },
@ -177,7 +177,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -211,7 +211,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
@ -258,7 +258,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -292,7 +292,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
@ -358,7 +358,7 @@
        "ori_name": "disabled",
        "access_control": true,
        "annotation": {
-          "message": "when the variable \"{0}\" hasn't the value \"Automatic proxy configuration URL\".",
+          "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".",
          "path": {
            "path": "proxy_mode"
          },
--- a/tests/result_tutorial/090/doc.sh
+++ b/tests/result_tutorial/090/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -58,8 +58,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual.https_proxy                                                    
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m has the value 
-[32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m                   
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m has the value [32m"true"[0m.                                

 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃[1m [0m[1mVariable                             [0m[1m [0m┃[1m [0m[1mDescription                         [0m[1m [0m┃
@ -70,6 +70,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -81,6 +82,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘

  [1;4;92mSOCKS Proxy[0m
@ -99,6 +101,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -110,6 +113,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m       │ [1mChoices[0m:                             │
@ -131,6 +135,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be a hostname  │
 │                                       │ [1mDisabled[0m: when the variable          │
 │                                       │ "Configure Proxy Access to the       │
-│                                       │ Internet" hasn't the value           │
-│                                       │ "Automatic proxy configuration URL". │
+│                                       │ Internet" (proxy_mode) hasn't the    │
+│                                       │ value "Automatic proxy configuration │
+│                                       │ URL".                                │
 └───────────────────────────────────────┴──────────────────────────────────────┘
--- a/tests/result_tutorial/090/doc_changelog.sh
+++ b/tests/result_tutorial/090/doc_changelog.sh
@ -13,7 +13,8 @@
 │                                       │ • the domain name can be a hostname  │
 │                                       │ [1mDisabled[0m: when the variable          │
 │                                       │ "Configure Proxy Access to the       │
-│                                       │ Internet" hasn't the value           │
-│                                       │ "Automatic proxy configuration URL". │
+│                                       │ Internet" (proxy_mode) hasn't the    │
+│                                       │ value "Automatic proxy configuration │
+│                                       │ URL".                                │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/result_tutorial/100/doc.json
+++ b/tests/result_tutorial/100/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "message": "when the variable \"{0}\" has the value \"true\".",
+                "message": "when the variable {0} has the value \"true\".",
                "path": {
                  "path": "manual.use_for_https"
                },
@ -177,7 +177,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -211,7 +211,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
@ -258,7 +258,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -292,7 +292,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
@ -358,7 +358,7 @@
        "ori_name": "disabled",
        "access_control": true,
        "annotation": {
-          "message": "when the variable \"{0}\" hasn't the value \"Automatic proxy configuration URL\".",
+          "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".",
          "path": {
            "path": "proxy_mode"
          },
@ -396,7 +396,7 @@
        "ori_name": "disabled",
        "access_control": true,
        "annotation": {
-          "message": "when the variable \"{0}\" has the value \"No proxy\".",
+          "message": "when the variable {0} has the value \"No proxy\".",
          "path": {
            "path": "proxy_mode"
          },
--- a/tests/result_tutorial/100/doc.sh
+++ b/tests/result_tutorial/100/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -58,8 +58,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual.https_proxy                                                    
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m has the value 
-[32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m                   
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m has the value [32m"true"[0m.                                

 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃[1m [0m[1mVariable                             [0m[1m [0m┃[1m [0m[1mDescription                         [0m[1m [0m┃
@ -70,6 +70,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -81,6 +82,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘

  [1;4;92mSOCKS Proxy[0m
@ -99,6 +101,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -110,6 +113,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m       │ [1mChoices[0m:                             │
@ -131,8 +135,9 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be a hostname  │
 │                                       │ [1mDisabled[0m: when the variable          │
 │                                       │ "Configure Proxy Access to the       │
-│                                       │ Internet" hasn't the value           │
-│                                       │ "Automatic proxy configuration URL". │
+│                                       │ Internet" (proxy_mode) hasn't the    │
+│                                       │ value "Automatic proxy configuration │
+│                                       │ URL".                                │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mno_proxy[0m                              │ Address for which proxy will be      │
 │ [1;7m domainname [0m [1;7m basic [0m [1;7m mandatory [0m [1;7m [0m    │ desactivated.                        │
@ -146,5 +151,6 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ CIDR format                          │
 │                                       │ [1mDisabled[0m: when the variable          │
 │                                       │ "Configure Proxy Access to the       │
-│                                       │ Internet" has the value "No proxy".  │
+│                                       │ Internet" (proxy_mode) has the value │
+│                                       │ "No proxy".                          │
 └───────────────────────────────────────┴──────────────────────────────────────┘
--- a/tests/result_tutorial/100/doc_changelog.sh
+++ b/tests/result_tutorial/100/doc_changelog.sh
@ -15,6 +15,7 @@
 │                                       │ CIDR format                          │
 │                                       │ [1mDisabled[0m: when the variable          │
 │                                       │ "Configure Proxy Access to the       │
-│                                       │ Internet" has the value "No proxy".  │
+│                                       │ Internet" (proxy_mode) has the value │
+│                                       │ "No proxy".                          │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/result_tutorial/101/doc.json
+++ b/tests/result_tutorial/101/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "message": "when the variable \"{0}\" has the value \"true\".",
+                "message": "when the variable {0} has the value \"true\".",
                "path": {
                  "path": "manual.use_for_https"
                },
@ -177,7 +177,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -211,7 +211,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
@ -258,7 +258,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -292,7 +292,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
@ -358,7 +358,7 @@
        "ori_name": "disabled",
        "access_control": true,
        "annotation": {
-          "message": "when the variable \"{0}\" hasn't the value \"Automatic proxy configuration URL\".",
+          "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".",
          "path": {
            "path": "proxy_mode"
          },
@ -396,7 +396,7 @@
        "ori_name": "disabled",
        "access_control": true,
        "annotation": {
-          "message": "when the variable \"{0}\" has the value \"No proxy\".",
+          "message": "when the variable {0} has the value \"No proxy\".",
          "path": {
            "path": "proxy_mode"
          },
--- a/tests/result_tutorial/101/doc.sh
+++ b/tests/result_tutorial/101/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -58,8 +58,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual.https_proxy                                                    
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m has the value 
-[32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m                   
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m has the value [32m"true"[0m.                                

 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃[1m [0m[1mVariable                             [0m[1m [0m┃[1m [0m[1mDescription                         [0m[1m [0m┃
@ -70,6 +70,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -81,6 +82,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘

  [1;4;92mSOCKS Proxy[0m
@ -99,6 +101,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -110,6 +113,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m       │ [1mChoices[0m:                             │
@ -131,8 +135,9 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be a hostname  │
 │                                       │ [1mDisabled[0m: when the variable          │
 │                                       │ "Configure Proxy Access to the       │
-│                                       │ Internet" hasn't the value           │
-│                                       │ "Automatic proxy configuration URL". │
+│                                       │ Internet" (proxy_mode) hasn't the    │
+│                                       │ value "Automatic proxy configuration │
+│                                       │ URL".                                │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mno_proxy[0m                              │ Address for which proxy will be      │
 │ [1;7m domainname [0m [1;7m multiple [0m [1;7m basic [0m [1;7m [0m     │ desactivated.                        │
@ -146,5 +151,6 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ CIDR format                          │
 │                                       │ [1mDisabled[0m: when the variable          │
 │                                       │ "Configure Proxy Access to the       │
-│                                       │ Internet" has the value "No proxy".  │
+│                                       │ Internet" (proxy_mode) has the value │
+│                                       │ "No proxy".                          │
 └───────────────────────────────────────┴──────────────────────────────────────┘
--- a/tests/result_tutorial/101/doc_changelog.sh
+++ b/tests/result_tutorial/101/doc_changelog.sh
@ -15,6 +15,7 @@
 │                                       │ CIDR format                          │
 │                                       │ [1mDisabled[0m: when the variable          │
 │                                       │ "Configure Proxy Access to the       │
-│                                       │ Internet" has the value "No proxy".  │
+│                                       │ Internet" (proxy_mode) has the value │
+│                                       │ "No proxy".                          │
 └───────────────────────────────────────┴──────────────────────────────────────┘

--- a/tests/result_tutorial/102/doc.json
+++ b/tests/result_tutorial/102/doc.json
@ -42,7 +42,7 @@
          "ori_name": "disabled",
          "access_control": true,
          "annotation": {
-            "message": "when the variable \"{0}\" hasn't the value \"Manual proxy configuration\".",
+            "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".",
            "path": {
              "path": "proxy_mode"
            },
@ -149,7 +149,7 @@
              "ori_name": "hidden",
              "access_control": true,
              "annotation": {
-                "message": "when the variable \"{0}\" has the value \"true\".",
+                "message": "when the variable {0} has the value \"true\".",
                "path": {
                  "path": "manual.use_for_https"
                },
@ -177,7 +177,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -211,7 +211,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
@ -258,7 +258,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.address",
                  "type": "variable"
@ -292,7 +292,7 @@
            "default": {
              "name": "Default",
              "values": {
-                "message": "the value of the variable \"{0}\"",
+                "message": "the value of the variable {0}.",
                "path": {
                  "path": "manual.http_proxy.port",
                  "type": "variable"
@ -358,7 +358,7 @@
        "ori_name": "disabled",
        "access_control": true,
        "annotation": {
-          "message": "when the variable \"{0}\" hasn't the value \"Automatic proxy configuration URL\".",
+          "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".",
          "path": {
            "path": "proxy_mode"
          },
@ -390,7 +390,7 @@
        "ori_name": "disabled",
        "access_control": true,
        "annotation": {
-          "message": "when the variable \"{0}\" has the value \"No proxy\".",
+          "message": "when the variable {0} has the value \"No proxy\".",
          "path": {
            "path": "proxy_mode"
          },
--- a/tests/result_tutorial/102/doc.sh
+++ b/tests/result_tutorial/102/doc.sh
@ -17,8 +17,8 @@
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual                                                                
 [34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m                                                          
-[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m hasn't 
-the value [32m"Manual proxy configuration"[0m.
+[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m        
+[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m.                 

  [1;4;92mHTTP Proxy[0m

@ -58,8 +58,8 @@ the value [32m"Manual proxy configuration"[0m.
 [34m▌ [0m                                                                            
 [34m▌ [0m[1mPath[0m: manual.https_proxy                                                    
 [34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m                                                         
-[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m has the value 
-[32m"true"[0m.
+[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m                   
+[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m has the value [32m"true"[0m.                                

 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃[1m [0m[1mVariable                             [0m[1m [0m┃[1m [0m[1mDescription                         [0m[1m [0m┃
@ -70,6 +70,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.https_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -81,6 +82,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 └───────────────────────────────────────┴──────────────────────────────────────┘

  [1;4;92mSOCKS Proxy[0m
@ -99,6 +101,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be an IP       │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy address"                      │
+│                                       │ (manual.http_proxy.address).         │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.port[0m               │ Proxy port.                          │
 │ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m         │ [1mValidators[0m:                          │
@ -110,6 +113,7 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ are allowed                          │
 │                                       │ [1mDefault[0m: the value of the variable   │
 │                                       │ "Proxy port"                         │
+│                                       │ (manual.http_proxy.port).            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mmanual.socks_proxy.version[0m            │ SOCKS host version used by proxy.    │
 │ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m       │ [1mChoices[0m:                             │
@ -131,8 +135,9 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ • the domain name can be a hostname  │
 │                                       │ [1mDisabled[0m: when the variable          │
 │                                       │ "Configure Proxy Access to the       │
-│                                       │ Internet" hasn't the value           │
-│                                       │ "Automatic proxy configuration URL". │
+│                                       │ Internet" (proxy_mode) hasn't the    │
+│                                       │ value "Automatic proxy configuration │
+│                                       │ URL".                                │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ [1mno_proxy[0m                              │ Address for which proxy will be      │
 │ [1;7m domainname [0m [1;7m multiple [0m [1;7m standard [0m [1;7m [0m  │ desactivated.                        │
@ -146,5 +151,6 @@ the value [32m"Manual proxy configuration"[0m.
 │                                       │ CIDR format                          │
 │                                       │ [1mDisabled[0m: when the variable          │
 │                                       │ "Configure Proxy Access to the       │
-│                                       │ Internet" has the value "No proxy".  │
+│                                       │ Internet" (proxy_mode) has the value │
+│                                       │ "No proxy".                          │
 └───────────────────────────────────────┴──────────────────────────────────────┘
--- a/Show more
+++ b/Show more