metanorma-plugin-lutaml 0.4.6 → 0.4.10

data/lib/metanorma/plugin/lutaml/liquid/custom_filters.rb

@@ -8,6 +8,15 @@ module Metanorma
           def html2adoc(input)
             ReverseAdoc.convert(input)
           end
+
+          def interpolate(input)
+            sub = ::Liquid::Template.parse(input)
+            sub.render(@context)
+          end
+
+          def identify(input)
+            input.split(/(?=[A-Z])/).map(&:downcase).join('-')
+          end
         end
       end
     end

data/lib/metanorma/plugin/lutaml/liquid_templates/_diagrams_block.liquid

@@ -3,7 +3,7 @@
 {% for diagram in package.diagrams %}
 [[figure-{{ diagram.xmi_id }}]]
 .{{ diagram.name }}
-image::{{ image_base_path }}/{{ diagram.xmi_id }}.png[]
+image::{{ image_base_path }}/{{ diagram.xmi_id }}.{{ format | default: 'png' }}[]
 
 {% if diagram.definition %}
 {{ diagram.definition | html2adoc }}

data/lib/metanorma/plugin/lutaml/liquid_templates/_packages.liquid

@@ -2,7 +2,14 @@
 {% assign package_name = package.name | downcase | replace: ":", "" | replace: " ", "_" %}
 {% if additional_context.before and additional_context.before.size > 0 %}
 {% for before in additional_context.before %}
+{% if before.text %}
+
+{% if before.liquid %}
+{{ before.text | interpolate }}
+{% else %}
 {{ before.text }}
+{% endif %}
+{% endif %}
 {% endfor %}
 {% endif %}
 {% assign is_package_spare = package.name | slice: 0,5 %}
@@ -11,24 +18,67 @@
 {% endif %}
 
 {% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}{{equalsigns}} {{ package.name }} package
+[[section-{{ package.xmi_id }}]]
 {{equalsigns}}= {{ package.name }} overview
 
+{% if additional_context.all_macros.size > 0 %}
+{% assign sorted_all_macros = additional_context.all_macros | where: "position", "before" | sort: 'index' %}
+{% for block in sorted_all_macros %}
+{% case block.type %}
+{% when 'include_block' %}
+{% unless block.package and block.package != package.name %}
+{% capture block_filename %}{{ block.base_path }}{{ package_name }}{% endcapture %}
+{% capture block_content %}{% include block_filename %}{% endcapture %}
+{% unless block_content contains "Liquid error" %}
+{% if block.text %}
+
+{% if block.liquid %}
+{{ block.text | interpolate }}
+{% else %}
+{{ block.text }}
+{% endif %}
+{% endif %}
+
+{{ block_content }}
+{% endunless %}
+{% endunless %}
+{% when 'package_text' %}
+{% unless block.package and block.package != package.name %}
+
+{% if block.liquid %}
+{{ block.text | interpolate }}
+{% else %}
+{{ block.text }}
+{% endif %}
+{% endunless %}
+{% else %}
+{% endcase %}
+{% endfor %}
+{% endif %}
+
 {% assign before_package_key = 'before;' | append: package.name %}
 {% if additional_context[before_package_key] and additional_context[before_package_key].size > 0 %}
 {% for before in additional_context[before_package_key] %}
+{% if before.text %}
+
+{% if before.liquid %}
+{{ before.text | interpolate }}
+{% else %}
 {{ before.text }}
+{% endif %}
+{% endif %}
 {% endfor %}
 {% endif %}
 {% if additional_context.diagram_include_block %}
 {% for diagram_include_block in additional_context.diagram_include_block %}
-{% include "diagrams_block", package_name: package_name, image_base_path: diagram_include_block.base_path, text: diagram_include_block.text %}
+{% include "diagrams_block", package_name: package_name, image_base_path: diagram_include_block.base_path, text: diagram_include_block.text, format: diagram_include_block.format %}
 {% endfor %}
 {% endif %}
 
 {% if package.packages.size > 0 %}The {{ package.name }} package is organized into
 {{ package.packages.size }} packages{% assign modules_nested_size = 0 %}{% for module in package.packages %}{% assign modules_nested_size = modules_nested_size | plus: module.packages.size %}{% endfor %}{% if modules_nested_size > 0 %} with {{modules_nested_size}} modules{% endif %}:
 {% endif %}
-[arabic]
+
 {% for module in package.packages %}
 {% if module.packages.length > 0 %}
 . {{ module.name }} package comprises:
@@ -44,14 +94,14 @@
 
 {{equalsigns}}= Defining tables
 
-[arabic]
 {% for klass in package.classes %}
 {% assign is_klass_spare = klass.name | slice: 0,5 %}
 {% if is_klass_spare == 'old: ' %}{% continue %}
 {% elsif is_klass_spare == 'Spare' %}{% continue %}
 {% endif %}
 {% assign klass_name = klass.name | downcase | replace: ':', '' | replace: ' ', '_' %}
-.<<tab-P-{{ package_name }}-C-{{ klass_name }}>> -- Elements of {{ package.name }}::{{ klass.name }}
+[[section-{{ klass.xmi_id }}]]
+.Elements of &#8220;{{ package.name }}::{{ klass.name }}&#8221; ({{ klass.stereotype }})
 
 {% endfor %}
 {% for enum in package.enums %}
@@ -60,7 +110,8 @@
 {% elsif is_enum_spare == 'Spare' %}{% continue %}
 {% endif %}
 {% assign enum_name = enum.name | downcase | replace: ':', '' | replace: ' ', '_' %}
-.<<tab-P-{{ package_name }}-E-{{ enum_name }}>> -- Elements of {{ package.name }}::{{ enum.name }}
+[[section-{{ enum.xmi_id }}]]
+.Elements of &#8220;{{ package.name }}::{{ enum.name }}&#8221; ({{ enum.stereotype }})
 
 {% endfor %}
 {% for data_type in package.data_types %}
@@ -69,7 +120,8 @@
 {% elsif is_data_type_spare == 'Spare' %}{% continue %}
 {% endif %}
 {% assign data_type_name = data_type.name | downcase | replace: ':', '' | replace: ' ', '_' %}
-.<<tab-P-{{ package_name }}-DT-{{ data_type_name }}>> -- Elements of {{ package.name }}::{{ data_type.name }}
+[[section-{{ data_type.xmi_id }}]]
+.Elements of &#8220;{{ package.name }}::{{ data_type.name }}&#8221; ({{ data_type.stereotype }})
 
 {% endfor %}
 
@@ -107,18 +159,65 @@
 {% capture block_content %}{% include block_filename %}{% endcapture %}
 {% unless block_content contains "Liquid error" %}
 {% if block.text %}
+
+{% if block.liquid %}
+{{ block.text | interpolate }}
+{% else %}
+{{ block.text }}
+{% endif %}
+{% endif %}
+{{ block_content }}
+{% endunless %}
+{% endfor %}
+{% endif %}
+
+{% if additional_context.all_macros.size > 0 %}
+{% assign sorted_all_macros = additional_context.all_macros | where: "position", "after" | sort: 'index' %}
+{% for block in sorted_all_macros %}
+{% case block.type %}
+{% when 'include_block' %}
+{% unless block.package and block.package != package.name %}
+{% capture block_filename %}{{ block.base_path }}{{ package_name }}{% endcapture %}
+{% capture block_content %}{% include block_filename %}{% endcapture %}
+{% unless block_content contains "Liquid error" %}
+{% if block.text %}
+
+{% if block.liquid %}
+{{ block.text | interpolate }}
+{% else %}
 {{ block.text }}
 {% endif %}
+{% endif %}
+
 {{ block_content }}
 {% endunless %}
+{% endunless %}
+{% when 'package_text' %}
+{% unless block.package and block.package != package.name %}
+
+{% if block.liquid %}
+{{ block.text | interpolate }}
+{% else %}
+{{ block.text }}
+{% endif %}
+{% endunless %}
+{% else %}
+{% endcase %}
 {% endfor %}
 {% endif %}
 
 {% assign after_package_key = 'after;' | append: package.name %}
 {% if additional_context[after_package_key] %}
-{{equalsigns}}= Additional Information
+{{equalsigns}}= Additional information
 {% for after in additional_context[after_package_key] %}
+{% if after.text %}
+
+{% if after.liquid %}
+{{ after.text | interpolate }}
+{% else %}
 {{ after.text }}
+{% endif %}
+{% endif %}
 {% endfor %}
 {% endif %}
 {% if package.packages.size > 0 and render_nested_packages %}
@@ -128,6 +227,13 @@
 
 {% if additional_context.after and additional_context.after.size > 0 %}
 {% for after in additional_context.after %}
+{% if after.text %}
+
+{% if after.liquid %}
+{{ after.text | interpolate }}
+{% else %}
 {{ after.text }}
+{% endif %}
+{% endif %}
 {% endfor %}
 {% endif %}

data/lib/metanorma/plugin/lutaml/liquid_templates/_packages_class.liquid

@@ -3,8 +3,8 @@
 {% elsif is_klass_spare == 'Spare' %}{% continue %}
 {% endif %}
 {% assign klass_name = klass.name | downcase | replace: ':', '' | replace: ' ', '_' %}
-[[tab-P-{{ package_name }}-C-{{ klass_name }}]]
-.Elements of {{ package.name }}::{{ klass.name }}
+[[section-{{ klass.xmi_id }}]]
+.Elements of “{{ package.name }}::{{ klass.name }}” ({{ klass.stereotype }})
 [width="100%",cols="a,a,a,a,a,a,a,a"]
 |===
 
@@ -24,14 +24,14 @@ h|Inheritance from: 7+| {{ inherited | map: 'member_end' | join: ", " }}
 h|Generalization of: 7+| {{ generalizations | map: 'member_end' | join: ", " }}
 {% endif %}
 
-h|Abstract: 7+| {{ klass.is_abstract }}
+h|Abstract: 7+| {% if klass.is_abstract %}True{% else %}False{% endif %}
 {% assign aggregations = klass.associations | where: "member_end_type", "aggregation" %}
 {% if aggregations.size > 0 %}
 .{{aggregations.size | plus: 1}}+h|Associations:
-4+|_Association with:_
-|_Obligation_
+4+| _Association with_
+| _Obligation_
 | _Maximum occurrence_
-|_Provides:_
+| _Provides_
 
 {% for assoc in aggregations %}
 4+| {{assoc.member_end}}
@@ -41,9 +41,9 @@ h|Abstract: 7+| {{ klass.is_abstract }}
 
 {% endfor %}
 {% else %}
-
-.1+h|Associations: 7+| (none)
+h| Associations: 7+| (none)
 {% endif %}
+
 {% if klass.attributes.size > 0 %}
 .{{klass.attributes.size | plus: 1}}+h|Public attributes:
 | _Name_
@@ -63,14 +63,14 @@ h|Abstract: 7+| {{ klass.is_abstract }}
 
 {% endfor %}
 {% else %}
-.1+h|Public attributes:
+h| Public attributes:
 7+| (none)
 {% endif %}
 
 {% if klass.constraints.size > 0 %}
-.{{ klass.constraints.size }}+|*Constraints:*
-{% for constr in klass.constraints %}
-7+| `{{ constr.body }}`
+.{{ klass.constraints.size }}+h| Constraints:
+{% for constraint in klass.constraints %}
+7+| `{{ constraint.body }}`: `{{ constraint.definition | replace: '|', '\|' }}`
 
 {% endfor %}
 {% else %}

data/lib/metanorma/plugin/lutaml/liquid_templates/_packages_data_dictionary.liquid

@@ -1,134 +1,250 @@
 {% for package in context.packages %}
 {% assign package_name = package.name | downcase | replace: ":", "" | replace: " ", "_" %}
+{% assign nested_depth = depth | plus: 1 %}
 {% if additional_context.before and additional_context.before.size > 0 %}
 {% for before in additional_context.before %}
+{% if before.text %}
+
+{% if before.liquid %}
+{{ before.text | interpolate }}
+{% else %}
 {{ before.text }}
+{% endif %}
+{% endif %}
+{% endfor %}
+{% endif %}
+
+{% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}
+{{equalsigns}} {{ package.name }}
+{%comment%}(package: depth is {{ depth }}, nested_depth is {{ nested_depth }}){%endcomment%}
+
+{% if additional_context.all_macros.size > 0 %}
+{% assign sorted_all_macros = additional_context.all_macros | where: "position", "before" | sort: 'index' %}
+{% for block in sorted_all_macros %}
+{% case block.type %}
+{% when 'include_block' %}
+{% unless block.package and block.package != package.name %}
+{% capture block_filename %}{{ block.base_path }}{{ package_name }}{% endcapture %}
+{% capture block_content %}{% include block_filename %}{% endcapture %}
+{% unless block_content contains "Liquid error" %}
+{% if block.text %}
+
+{% if block.liquid %}
+{{ block.text | interpolate }}
+{% else %}
+{{ block.text }}
+{% endif %}
+{% endif %}
+
+{{ block_content }}
+{% endunless %}
+{% endunless %}
+{% when 'package_text' %}
+{% unless block.package and block.package != package.name %}
+
+{% if block.liquid %}
+{{ block.text | interpolate }}
+{% else %}
+{{ block.text }}
+{% endif %}
+{% endunless %}
+{% else %}
+{% endcase %}
 {% endfor %}
 {% endif %}
-{% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}{{equalsigns}} {{ package.name }}
-{{equalsigns}}= {{ package.name }}
 
 {% assign before_package_key = 'before;' | append: package.name %}
 {% if additional_context[before_package_key] and additional_context[before_package_key].size > 0 %}
 {% for before in additional_context[before_package_key] %}
+{% if before.text %}
+
+{% if before.liquid %}
+{{ before.text | interpolate }}
+{% else %}
 {{ before.text }}
+{% endif %}
+{% endif %}
 {% endfor %}
 {% endif %}
 
+.Metadata of {{ package.name }} ({{ package.stereotype }})
 [cols="1a,4a"]
 |===
 
-h|Description:    | {{ package.definition }}
-h|Parent Package: | {{ context.name }}
+h|Description:    | {{ package.definition | replace: '|', '\|' }}
+h|Parent package: | {{ context.name }}
 h|Stereotype:     | «{{ package.stereotype }}»
 
 |===
 
-{% assign feature_types = package.classes | where: "stereotype", "FeatureType" %}
-{% assign object_types = package.classes | where: "stereotype", "ObjectType" %}
+{% assign inner_depth = depth | plus: 2 %}
 {% assign basic_types = package.classes | where: "stereotype", "BasicType" %}
-{% assign unions = package.classes | where: "stereotype", "Union" %}
+{% assign unions = package.data_types | where: "stereotype", "Union" %}
 {% assign code_lists = package.classes | where: "stereotype", "CodeList" %}
-{% if feature_types.size > 0 or object_types.size > 0 %}
+{% assign not_classes_length = basic_types.size | plus: code_lists.size %}
+{% assign not_classes_stereotypes = 'DataType,BasicType,Enumeration,CodeList' | split: ','%}
+{% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}
 {{equalsigns}}= Classes
+{%comment%}(class: depth is {{ depth }}, nested_depth is {{ nested_depth }}){%endcomment%}
 
-{% include "packages_data_dictionary_classes", classes: feature_types %}
-{% include "packages_data_dictionary_classes", classes: object_types %}
-{% endif %}
+{% unless not_classes_length == package.classes.size %}
 
-{% if basic_types.size > 0 %}
-{{equalsigns}}= Basic Types
+{% for klass in package.classes %}
+{% unless not_classes_stereotypes contains klass.stereotype  %}
+{% include "packages_data_dictionary_class", depth: inner_depth %}
+{% endunless %}
+{% endfor %}
+{% else %}
+None.
+{% endunless %}
+
+{% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}
+{{equalsigns}}= Basic types
+{%comment%}(class: depth is {{ depth }}, inner_depth is {{ inner_depth }}){%endcomment%}
 
-{% include "packages_data_dictionary_classes", classes: basic_types %}
+{% if basic_types.size > 0 %}
+{% include "packages_data_dictionary_classes", classes: basic_types, depth: inner_depth %}
+{% else %}
+None.
 {% endif %}
 
-{% if unions.size > 0 %}
+{% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}
 {{equalsigns}}= Unions
+{%comment%}(class: depth is {{ depth }}, inner_depth is {{ inner_depth }}){%endcomment%}
 
-{% include "packages_data_dictionary_classes", classes: unions %}
+{% if unions.size > 0 %}
+{% include "packages_data_dictionary_classes", classes: unions, depth: inner_depth %}
+{% else %}
+None.
 {% endif %}
 
-{% if code_lists.size > 0 %}
-{{equalsigns}}= Code Lists
+{% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}
+{{equalsigns}}= Code lists
+{%comment%}(class: depth is {{ depth }}, inner_depth is {{ inner_depth }}){%endcomment%}
 
-{% include "packages_data_dictionary_classes", classes: code_lists %}
+{% if code_lists.size > 0 %}
+{% include "packages_data_dictionary_classes", classes: code_lists, depth: inner_depth %}
+{% else %}
+None.
 {% endif %}
 
-{% if package.data_types.size > 0 %}
-{{equalsigns}}= Data Types
+{% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}
+{{equalsigns}}= Data types
+{%comment%}(class: depth is {{ depth }}, inner_depth is {{ inner_depth }}){%endcomment%}
 
-{% for data_type in package.data_types %}
-{% capture generalizations %}{% for assoc in data_type.associations | where: "member_end_type", "generalization" %}{{ assoc.member_end }} {% endfor %}{% endcapture %}
+{% assign non_unions = package.data_types | where: "stereotype", "DataType"  %}
+{% if non_unions.size > 0 %}
+{% for data_type in non_unions %}
+{% capture generalizations %}{% assign inheritance = klass.associations | where: "member_end_type", "inheritance" %}{% for assoc in inheritance %}<<{{ assoc.member_end }}-section,{{ assoc.member_end }}>>{% endfor %}{% endcapture %}
 [[{{ data_type.name }}-section]]
-[cols="1a"]
+{{equalsigns}}== {{ data_type.name }}
+
+.Metadata of {{ data_type.name }} ({{ data_type.stereotype }})
+[cols="1a,4a"]
+|===
+h|Definition:  | {{ data_type.definition | replace: '|', '\|' }}
+h|Subclass of: | {% if generalizations.size > 0 %}{{ generalizations }}{% else %}None{% endif %}
+h|Stereotype:  | «{{ data_type.stereotype }}»
+
+{% if data_type.constraints.size > 0 %}
+{% for constraint in data_type.constraints %}
+h| Constraint:
+| `{{ constraint.body }}`:
+
+[source,ocl,%unnumbered]
+------
+{{ constraint.definition | replace: '|', '\|' }}
+------
+{% endfor %}
+{% endif %}
+
 |===
-|*{{ data_type.name }}*
-|[cols="1,4",frame=none,grid=none]
-!===
-!{nbsp}{nbsp}{nbsp}{nbsp}Definition: ! {{ data_type.definition }}
-!{nbsp}{nbsp}{nbsp}{nbsp}Subclass of: ! {{ generalizations }}
-!{nbsp}{nbsp}{nbsp}{nbsp}Stereotype: !  «DataType»
-!===
+
 {% if data_type.associations.size > 0 %}
 {% capture rendered_associations %}
 {% for assoc in data_type.associations %}
 {% if assoc.member_end_attribute_name.size > 0 %}
-{% capture cardinality %}{% if assoc.member_end_cardinality.min == 'C' %}[0..{{ assoc.member_end_cardinality.max }}]{% elsif assoc.member_end_cardinality.min == 'M' and assoc.member_end_cardinality.max == '1' %}[1..1]{% else %}[{{ assoc.member_end_cardinality.max }}]{% endif %}{% endcapture %}
-!{set:cellbgcolor:#FFFFFF} {{ assoc.member_end_attribute_name }}  !<<{{assoc.member_end}}-section,{{assoc.member_end}}>> {{ cardinality }} ! {{ assoc.definition }}
+{% capture cardinality %}&#91;{% case assoc.member_end_cardinality.min %}{% when "C" %}0{% when "M" %}1{% else %}{{assoc.member_end_cardinality.min}}{% endcase %}..{{ assoc.member_end_cardinality.max }}&#93;{% endcapture %}
+| {{ assoc.member_end_attribute_name }}
+| <<{{assoc.member_end}}-section,{{assoc.member_end}}>> {{ cardinality }}
+| {{ assoc.definition | replace: '|', '\|' }}
 {% endif %}
 {% endfor %}
 {% endcapture %}
-{% if rendered_associations.size > 0 %}
-|[cols="15,20,60",frame=none,grid=none,options="header"]
-!===
-!{set:cellbgcolor:#DDDDDD} *Role name* !*Target class and multiplicity*  !*Definition*
+
+{% assign associations_stripped = rendered_associations | strip_newlines | strip %}
+
+{% if associations_stripped.size > 0 %}
+.Associations of {{ data_type.name }} ({{ data_type.stereotype }})
+[cols="15a,20a,60a",options="header"]
+|===
+| Role name | Target class and multiplicity | Definition
+
 {{ rendered_associations }}
-!===
+
+|===
 {% endif %}
 {% endif %}
+
 {% if data_type.attributes.size > 0 %}
-|[cols="15,20,60",frame=none,grid=none,options="header"]
-!===
-!{set:cellbgcolor:#DDDDDD} *Attribute* !*Value type and multiplicity* !*Definition*
+.Attributes of {{ data_type.name }} ({{ data_type.stereotype }})
+[cols="15a,20a,60a",options="header"]
+|===
+| Attribute | Value type and multiplicity | Definition
+
 {% for attr in data_type.attributes %}
-{% capture cardinality %}{% if attr.cardinality.min == 'C' %}[0..{{ attr.cardinality.max }}]{% elsif assoc.member_end_cardinality.min == 'M' and assoc.member_end_cardinality.max == '1' %}[1..1]{% else %}[{{ attr.cardinality.max }}]{% endif %}{% endcapture %}
-!{set:cellbgcolor:#FFFFFF} {{ attr.name }}  !<<{{ attr.type }}-section,{{ attr.name }}>>  {{ cardinality }} !{{ attr.definition }}
+{% capture cardinality %}&#91;{% case attr.cardinality.min %}{% when 'C' %}0{% when 'M' %}1{% else %}{{ attr.cardinality.min }}{% endcase %}..{{ attr.cardinality.max }}&#93;{% endcapture %}
+| {{ attr.name }}
+| <<{{ attr.type }}-section,{{ attr.type }}>> {{ cardinality }}
+| {{ attr.definition | replace: '|', '\|' }}
+
 {% endfor %}
-!===
-|{set:cellbgcolor:#FFFFFF} Note: Unless otherwise specified, all attributes and role names have the stereotype «Property».
-{% endif %}
 |===
 
+[NOTE,keep-separate=true]
+====
+Unless otherwise specified, all attributes and role names have the stereotype
+«Property».
+====
+{% endif %}
+
 {% endfor %}
+{% else %}
+None.
 {% endif %}
 
-{% if package.enums.size > 0 %}
 {{equalsigns}}= Enumerations
 
+{% if package.enums.size > 0 %}
 {% for enum in package.enums %}
-{% capture generalizations %}{% for assoc in enum.associations | where: "member_end_type", "generalization" %}{{ assoc.member_end }} {% endfor %}{% endcapture %}
 [[{{ enum.name }}-section]]
-[cols="1a"]
+{{equalsigns}}== {{ enum.name }}
+
+.Metadata of {{ enum.name }} (Enumeration)
+[cols="1a,4a"]
 |===
-|*{{ enum.name }}*
-|[cols="1,4",frame=none,grid=none]
-!===
-!{nbsp}{nbsp}{nbsp}{nbsp}Definition: ! {{ enum.definition }}
-!{nbsp}{nbsp}{nbsp}{nbsp}Stereotype: ! «Enumeration»
-!===
+h|Definition: | {{ enum.definition | replace: '|', '\|' }}
+h|Stereotype: | «Enumeration»
+|===
+
 {% if enum.values.size > 0 %}
-|[cols="1,4",frame=none,grid=none,options="header"]
-!===
-^!{set:cellbgcolor:#DDDDDD} *Literal value* !*Definition*
+.Values of {{ enum.name }} (Enumeration)
+[cols="1a,4a",options="header"]
+|===
+| Literal value | Definition
 
 {% for val in enum.values %}
-^!{set:cellbgcolor:#FFFFFF} {{ val.name }}  !{{ val.definition }}
+| {{ val.name }}
+| {{ val.definition | replace: '|', '\|' }}
+
 {% endfor %}
-!===
-{% endif %}
+
 |===
+{% endif %}
 
 {% endfor %}
+{% else %}
+None.
 {% endif %}
 
 {% if additional_context.include_block and additional_context.include_block.size > 0 %}
@@ -151,27 +267,83 @@ h|Stereotype:     | «{{ package.stereotype }}»
 {% capture block_content %}{% include block_filename %}{% endcapture %}
 {% unless block_content contains "Liquid error" %}
 {% if block.text %}
+
+{% if block.liquid %}
+{{ block.text | interpolate }}
+{% else %}
 {{ block.text }}
 {% endif %}
+{% endif %}
 {{ block_content }}
 {% endunless %}
 {% endfor %}
 {% endif %}
 
+{% if additional_context.all_macros.size > 0 %}
+{% assign sorted_all_macros = additional_context.all_macros | where: "position", "after" | sort: 'index' %}
+{% for block in sorted_all_macros %}
+{% case block.type %}
+{% when 'include_block' %}
+{% unless block.package and block.package != package.name %}
+{% capture block_filename %}{{ block.base_path }}{{ package_name }}{% endcapture %}
+{% capture block_content %}{% include block_filename %}{% endcapture %}
+{% unless block_content contains "Liquid error" %}
+{% if block.text %}
+
+{% if block.liquid %}
+{{ block.text | interpolate }}
+{% else %}
+{{ block.text }}
+{% endif %}
+{% endif %}
+
+{{ block_content }}
+{% endunless %}
+{% endunless %}
+{% when 'package_text' %}
+{% unless block.package and block.package != package.name %}
+
+{% if block.liquid %}
+{{ block.text | interpolate }}
+{% else %}
+{{ block.text }}
+{% endif %}
+{% endunless %}
+{% else %}
+{% endcase %}
+{% endfor %}
+{% endif %}
+
+
 {% assign after_package_key = 'after;' | append: package.name %}
 {% if additional_context[after_package_key] %}
-{{equalsigns}}= Additional Information
+{{equalsigns}}= Additional information
 {% for after in additional_context[after_package_key] %}
+{% if after.text %}
+
+{% if after.liquid %}
+{{ after.text | interpolate }}
+{% else %}
 {{ after.text }}
+{% endif %}
+{% endif %}
 {% endfor %}
 {% endif %}
+
 {% if package.packages.size > 0 and render_nested_packages %}
-{% assign nested_depth = depth | plus: 1 %}{% include "packages_data_dictionary", depth: nested_depth, context: package %}
+{% include "packages_data_dictionary", depth: nested_depth, context: package %}
 {% endif %}
 {% endfor %}
 
 {% if additional_context.after and additional_context.after.size > 0 %}
 {% for after in additional_context.after %}
+{% if after.text %}
+
+{% if after.liquid %}
+{{ after.text | interpolate }}
+{% else %}
 {{ after.text }}
+{% endif %}
+{% endif %}
 {% endfor %}
 {% endif %}