diff --git a/src/rougail/output_doc/config.py b/src/rougail/output_doc/config.py index 29ad2ec53..e7ca14836 100644 --- a/src/rougail/output_doc/config.py +++ b/src/rougail/output_doc/config.py @@ -105,9 +105,9 @@ doc: default: false disabled: jinja: |- - {{{{ "variables" not in _.contents and "changelog" not in _.contents and _.output_format != "json" }}}} + {{{{ _.output_format == "json" or ("variables" not in _.contents and "changelog" not in _.contents) }}}} return_type: boolean - description: {_('variables is not selected in "_.contents"')} + description: {_('if "_.output_format" is json or "_.contents" hasn\'t variable or changelog')} root: description: {_('Document the variables from this family')} @@ -118,18 +118,18 @@ doc: default: false disabled: jinja: |- - {{{{ _.output_format == "json" or "variables" not in _.contents }}}} + {{{{ _.output_format == "json" or ("variables" not in _.contents and "changelog" not in _.contents) }}}} return_type: boolean - description: {_('if "_.output_format" is json or variables is not selected in "_.contents"')} + description: {_('if "_.output_format" is json or "_.contents" hasn\'t variable or changelog')} with_environment: description: {_('Add environment variable informations in documentation')} default: false disabled: jinja: |- - {{{{ _.output_format == "json" or "variables" not in _.contents }}}} + {{{{ _.output_format == "json" or ("variables" not in _.contents and "changelog" not in _.contents) }}}} return_type: boolean - description: {_('if "_.output_format" is json or variables is not selected in "_.contents"')} + description: {_('if "_.output_format" is json or "_.contents" hasn\'t variable or changelog')} environment_default_environment_name: description: {_("Name of the default environment prefix")} diff --git a/src/rougail/output_doc/doc.py b/src/rougail/output_doc/doc.py index 6e7f9f194..d0770bf47 100644 --- a/src/rougail/output_doc/doc.py +++ b/src/rougail/output_doc/doc.py @@ -29,7 +29,7 @@ from rougail.error import VariableCalculationDependencyError, RougailWarning from .config import OutPuts from .i18n import _ -from .utils import DocTypes, dump, to_phrase, calc_path +from .utils import dump, to_phrase, calc_path from .example import Examples from .changelog import Changelog @@ -50,7 +50,7 @@ class RougailOutputDoc(Examples, Changelog): config: "Config", *, rougailconfig: "RougailConfig" = None, - **kwarg, + **kwargs, ): # Import here to avoid circular import from rougail.tiramisu import CONVERT_OPTION @@ -406,7 +406,7 @@ class RougailOutputDoc(Examples, Changelog): informations: dict, type_: str, ): - need_disabled, properties = self._parse_properties(child) + need_disabled, properties = self._parse_properties(child, informations) if not need_disabled: return False name = child.name(uncalculated=True) @@ -525,7 +525,7 @@ class RougailOutputDoc(Examples, Changelog): informations, ): variable_type = child.information.get("type") - doc_type = DocTypes.get(variable_type, {"params": {}}) + doc_type = self.convert_option.get(variable_type, {"params": {}}) informations["properties"] = [ { "type": "type", @@ -535,16 +535,20 @@ class RougailOutputDoc(Examples, Changelog): # extra parameters for types option = child.get() validators = [] - for param, msg in doc_type["params"].items(): - value = option.impl_get_extra(f"_{param}") - if value is None: - value = option.impl_get_extra(param) - if value is not None and value is not False: - if isinstance(value, set): - value = list(value) - if isinstance(value, list): - value = display_list(value, add_quote=True) - validators.append(msg.format(value)) + if "params" in doc_type: + for param, msg in doc_type["params"].items(): + value = option.impl_get_extra(f"_{param}") + if value is None: + value = option.impl_get_extra(param) + if value is not None and value is not False: + if isinstance(value, set): + value = list(value) + if isinstance(value, list): + value = display_list(value, add_quote=True) + if "doc" in msg: + validators.append(msg['doc'].format(value)) + else: + validators.append(msg['description'].format(value)) # get validation information from annotator for name in child.information.list(): @@ -580,6 +584,7 @@ class RougailOutputDoc(Examples, Changelog): def _parse_properties( self, child, + child_informations, ): informations = [] properties = child.property.get(uncalculated=True) @@ -594,6 +599,9 @@ class RougailOutputDoc(Examples, Changelog): ) break for prop, translated_prop in self.property_to_string: + if "not_for_commandline" in properties: + child_informations["not_for_commandline"] = True + continue if prop in properties: prop_obj = { "type": "property", diff --git a/src/rougail/output_doc/output/ojson.py b/src/rougail/output_doc/output/ojson.py index ca3e0361a..a82538abb 100644 --- a/src/rougail/output_doc/output/ojson.py +++ b/src/rougail/output_doc/output/ojson.py @@ -26,7 +26,7 @@ class Formatter: name = "json" level = 90 - def __init__(self, rougailconfig): + def __init__(self, rougailconfig, **kwargs): self.rougailconfig = rougailconfig def run(self, informations: dict, *args) -> str: # pylint: disable=unused-argument diff --git a/src/rougail/output_doc/utils.py b/src/rougail/output_doc/utils.py index 7ff59dd44..b8fda9910 100644 --- a/src/rougail/output_doc/utils.py +++ b/src/rougail/output_doc/utils.py @@ -42,80 +42,6 @@ ROUGAIL_VARIABLE_TYPE = ( ENTER = "\n\n" -DocTypes = { - "domainname": { - "params": { - "allow_startswith_dot": _("the domain name can starts by a dot"), - "allow_without_dot": _("the domain name can be a hostname"), - "allow_ip": _("the domain name can be an IP"), - "allow_cidr_network": _("the domain name can be network in CIDR format"), - }, - }, - "number": { - "params": { - "min_number": _("the minimum value is {0}"), - "max_number": _("the maximum value is {0}"), - }, - }, - "integer": { - "params": { - "min_integer": _("the minimum value is {0}"), - "max_integer": _("the maximum value is {0}"), - }, - }, - "ip": { - "msg": "IP", - "params": { - "cidr": _("IP must be in CIDR format"), - "private_only": _("private IP are allowed"), - "allow_reserved": _("reserved IP are allowed"), - }, - }, - "network": { - "params": { - "cidr": _("network must be in CIDR format"), - }, - }, - "hostname": { - "params": { - "allow_ip": _("the host name can be an IP"), - }, - }, - "web_address": { - "params": { - "allow_ip": _("the domain name in web address can be an IP"), - "allow_without_dot": _( - "the domain name in web address can be only a hostname" - ), - }, - }, - "port": { - "params": { - "allow_range": _("can be range of port"), - "allow_protocol": _("can have the protocol"), - "allow_zero": _("port 0 is allowed"), - "allow_wellknown": _("well-known ports (1 to 1023) are allowed"), - "allow_registred": _("registred ports (1024 to 49151) are allowed"), - "allow_private": _("private ports (greater than 49152) are allowed"), - }, - }, - "secret": { - "params": { - "min_len": _("minimum length for the secret is {0} characters"), - "max_len": _("maximum length for the secret is {0} characters"), - "forbidden_char": _("forbidden characters: {0}"), - }, - }, - "unix_filename": { - "params": { - "allow_relative": _("this filename could be a relative path"), - "test_existence": _("this file must exists"), - "types": _("file type allowed: {0}"), - }, - }, -} - - _yaml = YAML() _yaml.indent(mapping=2, sequence=4, offset=2) @@ -156,7 +82,7 @@ class CommonFormatter: # tabulate module name name = None - def __init__(self, rougailconfig, support_namespace, **kwarg): + def __init__(self, rougailconfig, support_namespace, **kwargs): tabulate_module.PRESERVE_WHITESPACE = True self.header_setted = False self.rougailconfig = rougailconfig @@ -564,12 +490,12 @@ class CommonFormatter: self.join(paths), properties, ] - if self.with_commandline: + if self.with_commandline and not informations.get('not_for_commandline', False): paths = self.display_paths(informations, modified_attributes, force_identifiers, is_variable=True, is_bold=False, variable_prefix="--") variable_type = informations["properties"][0]["name"] if variable_type == 'boolean': for path in list(paths): - paths.append(gen_argument_name(path, False, True, False)) + paths.append("--" + gen_argument_name(path[2:], False, True, False)) if "alternative_name" in informations: alternative_name = informations["alternative_name"] paths[0] += f", -{alternative_name}" @@ -723,7 +649,7 @@ class CommonFormatter: if "default" in informations: default = informations["default"]["values"] else: - default = [] + default = [None] if not isinstance(default, list): default = [default] for idx, value in enumerate(default.copy()): diff --git a/tests/results/test/00_2default_calculated_variable.adoc b/tests/results/test/00_2default_calculated_variable.adoc index 2938f600b..06407f4b5 100644 --- a/tests/results/test/00_2default_calculated_variable.adoc +++ b/tests/results/test/00_2default_calculated_variable.adoc @@ -3,9 +3,13 @@ | Variable | Description | **var1** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[domainname]` `basic` `mandatory` `unique` `multiple` | A first variable. + -**Validator**: the domain name can be an IP +**Validators**: + +* type domainname +* the domain name can be an IP | **var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[domainname]` `standard` `mandatory` `unique` `multiple` | A second variable. + +**Validator**: type domainname + **Default**: the value of the variable "var1" |==== diff --git a/tests/results/test/00_2default_calculated_variable.gitlab.md b/tests/results/test/00_2default_calculated_variable.gitlab.md index 965ac468b..0fddba662 100644 --- a/tests/results/test/00_2default_calculated_variable.gitlab.md +++ b/tests/results/test/00_2default_calculated_variable.gitlab.md @@ -1,5 +1,5 @@ -| Variable | Description | -|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------| -| **var1**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` `unique` `multiple` | A first variable.
**Validator**: the domain name can be an IP | -| **var2**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Default**: the value of the variable "[A first variable](#var1)" | +| Variable | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------| +| **var1**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` `unique` `multiple` | A first variable.
**Validators**:
• type domainname
• the domain name can be an IP | +| **var2**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Validator**: type domainname
**Default**: the value of the variable "[A first variable](#var1)" | diff --git a/tests/results/test/00_2default_calculated_variable.html b/tests/results/test/00_2default_calculated_variable.html index 4274baea2..d56b336d8 100644 --- a/tests/results/test/00_2default_calculated_variable.html +++ b/tests/results/test/00_2default_calculated_variable.html @@ -1,10 +1,11 @@ - + - - + +
Variable Description
Variable Description
var1
domainname basic mandatory unique multiple 		A first variable.
Validator: the domain name can be an IP
var2
domainname standard mandatory unique multiple		A second variable.
Default: the value of the variable "var1"
var1
domainname basic mandatory unique multiple 		A first variable.
Validators:
  • type domainname
    • +
  • the domain name can be an IP
var2
domainname standard mandatory unique multiple		A second variable.
Validator: type domainname
Default: the value of the variable "var1"
diff --git a/tests/results/test/00_2default_calculated_variable.json b/tests/results/test/00_2default_calculated_variable.json index e888dbcb3..26260a0c5 100644 --- a/tests/results/test/00_2default_calculated_variable.json +++ b/tests/results/test/00_2default_calculated_variable.json @@ -24,8 +24,11 @@ } ], "validators": { - "name": "Validator", - "values": "the domain name can be an IP" + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] }, "path": "var1", "names": [ @@ -73,6 +76,10 @@ "name": "multiple" } ], + "validators": { + "name": "Validator", + "values": "type domainname" + }, "path": "var2", "names": [ "var2" diff --git a/tests/results/test/00_2default_calculated_variable.md b/tests/results/test/00_2default_calculated_variable.md index 4f3b10d51..38278aeb8 100644 --- a/tests/results/test/00_2default_calculated_variable.md +++ b/tests/results/test/00_2default_calculated_variable.md @@ -1,5 +1,5 @@ | Variable                                                                                                                           | Description                                                                                                                        | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **var1**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` `unique` `multiple` | A first variable.
**Validator**: the domain name can be an IP | -| **var2**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Default**: the value of the variable "[A first variable](#var1)" | +| **var1**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` `unique` `multiple` | A first variable.
**Validators**:
• type domainname
• the domain name can be an IP | +| **var2**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Validator**: type domainname
**Default**: the value of the variable "[A first variable](#var1)" | diff --git a/tests/results/test/00_2default_calculated_variable.sh b/tests/results/test/00_2default_calculated_variable.sh index caf41a016..df85bb20a 100644 --- a/tests/results/test/00_2default_calculated_variable.sh +++ b/tests/results/test/00_2default_calculated_variable.sh @@ -2,10 +2,12 @@ ┃ Variable  ┃ Description  ┃ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ │ var1 │ A first variable. │ -│  domainname   basic   mandatory    │ Validator: the domain name can be an │ -│ unique   multiple  │ IP │ +│  domainname   basic   mandatory    │ Validators: │ +│ unique   multiple  │ • type domainname │ +│ │ • the domain name can be an IP │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ var2 │ A second variable. │ -│  domainname   standard   mandatory    │ Default: the value of the variable │ -│ unique   multiple  │ "var1" │ +│  domainname   standard   mandatory    │ Validator: type domainname │ +│ unique   multiple  │ Default: the value of the variable │ +│ │ "var1" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test/00_2default_calculated_variable_transitive.adoc b/tests/results/test/00_2default_calculated_variable_transitive.adoc index d70667412..a8bbd908d 100644 --- a/tests/results/test/00_2default_calculated_variable_transitive.adoc +++ b/tests/results/test/00_2default_calculated_variable_transitive.adoc @@ -3,10 +3,17 @@ | Variable | Description | **var1** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[domainname]` `basic` `mandatory` `unique` `multiple` | A first variable. + -**Validator**: the domain name can be an IP +**Validators**: + +* type domainname +* the domain name can be an IP | **var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[domainname]` `standard` `mandatory` `unique` `multiple` | A second variable. + -**Validator**: the domain name can be an IP + +**Validators**: + +* type domainname +* the domain name can be an IP + **Default**: the value of the variable "var1" |==== diff --git a/tests/results/test/00_2default_calculated_variable_transitive.gitlab.md b/tests/results/test/00_2default_calculated_variable_transitive.gitlab.md index 853ab5182..f95200189 100644 --- a/tests/results/test/00_2default_calculated_variable_transitive.gitlab.md +++ b/tests/results/test/00_2default_calculated_variable_transitive.gitlab.md @@ -1,5 +1,5 @@ -| Variable | Description | -|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------| -| **var1**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` `unique` `multiple` | A first variable.
**Validator**: the domain name can be an IP | -| **var2**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Validator**: the domain name can be an IP
**Default**: the value of the variable "[A first variable](#var1)" | +| Variable | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **var1**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` `unique` `multiple` | A first variable.
**Validators**:
• type domainname
• the domain name can be an IP | +| **var2**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Validators**:
• type domainname
• the domain name can be an IP
**Default**: the value of the variable "[A first variable](#var1)" | diff --git a/tests/results/test/00_2default_calculated_variable_transitive.html b/tests/results/test/00_2default_calculated_variable_transitive.html index f36c5d3c5..0cd436cc9 100644 --- a/tests/results/test/00_2default_calculated_variable_transitive.html +++ b/tests/results/test/00_2default_calculated_variable_transitive.html @@ -1,10 +1,12 @@ - + - - + +
Variable Description
Variable Description
var1
domainname basic mandatory unique multiple 		A first variable.
Validator: the domain name can be an IP
var2
domainname standard mandatory unique multiple		A second variable.
Validator: the domain name can be an IP
Default: the value of the variable "var1"
var1
domainname basic mandatory unique multiple 		A first variable.
Validators:
  • type domainname
    • +
  • the domain name can be an IP
var2
domainname standard mandatory unique multiple		A second variable.
Validators:
  • type domainname
    • +
  • the domain name can be an IP

Default: the value of the variable "var1"
diff --git a/tests/results/test/00_2default_calculated_variable_transitive.json b/tests/results/test/00_2default_calculated_variable_transitive.json index 67037a777..c695f1945 100644 --- a/tests/results/test/00_2default_calculated_variable_transitive.json +++ b/tests/results/test/00_2default_calculated_variable_transitive.json @@ -24,8 +24,11 @@ } ], "validators": { - "name": "Validator", - "values": "the domain name can be an IP" + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] }, "path": "var1", "names": [ @@ -74,8 +77,11 @@ } ], "validators": { - "name": "Validator", - "values": "the domain name can be an IP" + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] }, "path": "var2", "names": [ diff --git a/tests/results/test/00_2default_calculated_variable_transitive.md b/tests/results/test/00_2default_calculated_variable_transitive.md index ae6e815be..85f195af5 100644 --- a/tests/results/test/00_2default_calculated_variable_transitive.md +++ b/tests/results/test/00_2default_calculated_variable_transitive.md @@ -1,5 +1,5 @@ | Variable                                                                                                                           | Description                                                                                                                        | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **var1**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` `unique` `multiple` | A first variable.
**Validator**: the domain name can be an IP | -| **var2**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Validator**: the domain name can be an IP
**Default**: the value of the variable "[A first variable](#var1)" | +| **var1**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` `unique` `multiple` | A first variable.
**Validators**:
• type domainname
• the domain name can be an IP | +| **var2**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Validators**:
• type domainname
• the domain name can be an IP
**Default**: the value of the variable "[A first variable](#var1)" | diff --git a/tests/results/test/00_2default_calculated_variable_transitive.sh b/tests/results/test/00_2default_calculated_variable_transitive.sh index 2b3756db0..b54b2e830 100644 --- a/tests/results/test/00_2default_calculated_variable_transitive.sh +++ b/tests/results/test/00_2default_calculated_variable_transitive.sh @@ -2,12 +2,14 @@ ┃ Variable  ┃ Description  ┃ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ │ var1 │ A first variable. │ -│  domainname   basic   mandatory    │ Validator: the domain name can be an │ -│ unique   multiple  │ IP │ +│  domainname   basic   mandatory    │ Validators: │ +│ unique   multiple  │ • type domainname │ +│ │ • the domain name can be an IP │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ var2 │ A second variable. │ -│  domainname   standard   mandatory    │ Validator: the domain name can be an │ -│ unique   multiple  │ IP │ +│  domainname   standard   mandatory    │ Validators: │ +│ unique   multiple  │ • type domainname │ +│ │ • the domain name can be an IP │ │ │ Default: the value of the variable │ │ │ "var1" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test/00_6choice.adoc b/tests/results/test/00_6choice.adoc index 08757104d..06a35bb24 100644 --- a/tests/results/test/00_6choice.adoc +++ b/tests/results/test/00_6choice.adoc @@ -22,12 +22,12 @@ * a * b * c -* null +* null **← (default)** | **var4** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[choice]` `standard` | The forth variable. + **Choices**: -* null +* null **← (default)** * b * c | **var5** + diff --git a/tests/results/test/00_6choice.gitlab.md b/tests/results/test/00_6choice.gitlab.md index 6a9a47490..d98dc319f 100644 --- a/tests/results/test/00_6choice.gitlab.md +++ b/tests/results/test/00_6choice.gitlab.md @@ -1,9 +1,9 @@ -| Variable | Description | -|-----------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------| -| **var1**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
**Choices**:
• a
• b
• c | -| **var2**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The second variable.
**Choices**:
• a
• b
• c | -| **var3**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` | The third variable.
**Choices**:
• a
• b
• c
• null | -| **var4**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` | The forth variable.
**Choices**:
• null
• b
• c | -| **var5**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The fifth variable.
**Choices**:
• a **← (default)**
• b
• c | -| **var6**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The sixth variable.
**Choices**:
• 1 **← (default)**
• 2
• 3 | +| Variable | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------| +| **var1**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
**Choices**:
• a
• b
• c | +| **var2**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The second variable.
**Choices**:
• a
• b
• c | +| **var3**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` | The third variable.
**Choices**:
• a
• b
• c
• null **← (default)** | +| **var4**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` | The forth variable.
**Choices**:
• null **← (default)**
• b
• c | +| **var5**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The fifth variable.
**Choices**:
• a **← (default)**
• b
• c | +| **var6**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The sixth variable.
**Choices**:
• 1 **← (default)**
• 2
• 3 | diff --git a/tests/results/test/00_6choice.html b/tests/results/test/00_6choice.html index bac6e7013..b5369b4a0 100644 --- a/tests/results/test/00_6choice.html +++ b/tests/results/test/00_6choice.html @@ -12,8 +12,8 @@ var3
choice standard The third variable.
Choices: -var4
choice standard The forth variable.
Choices: +var4
choice standard The forth variable.
Choices: var5
choice standard mandatoryThe fifth variable.
Choices: