metanorma-plugin-lutaml 0.4.4 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 213cd8b2ecaa1b45360480fc2de787f6708b625f5370b7e7617317d77b703ee6
-  data.tar.gz: 396fd04d0ac3f979a6a9ee3b425988fc17af5a267b8e140438a92b73ac41dd5f
+  metadata.gz: 202335c2a56ade17a5bdfedd489b6c39363b256ebbaa2e2cbfe812a6bb6995e5
+  data.tar.gz: 9637bc5a68bbbe8cda105e74a537ae7e41d5676f584e64e907ad26ba6cf50082
 SHA512:
-  metadata.gz: 37ad00c2a5bed4ddd9314ad99883545b526ed461e92d99de045072e900592c09798d82dc6119017a5e7656d891c1ea0cc331c844801ec2c0b4d2aae8784775aa
-  data.tar.gz: b8b6cb960be27fc5612c7a987250cd607ea0ae3f07dec61e44334765a64f7d5c22d245a108f2bbfdd4ec6fdc34e3b822b87fb801f70a3406611639d887ea00a9
+  metadata.gz: 7e183219067f431d7b839d59ab3e5c8a8b3f54b335cb1e232297f1fa997e7f7abafa4a0858d5398a034c2a025d46feef240f3e71b14db7730fb1789b2dd11afb
+  data.tar.gz: 400132cae1b7b1b3f03414f4c4ab8b16edde68ab285cd192bd0894d913bee26985182aaf880c2a4ddac1935541bac62913679424e433d88bacc8242c7fcabede

data/README.adoc

@@ -1,21 +1,36 @@
-= metanorma-plugin-lutaml
+= Metanorma LutaML plugin (metanorma-plugin-lutaml)
 
 image:https://github.com/metanorma/metanorma-plugin-lutaml/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-plugin-lutaml/actions?workflow=rake"]
 
-== Functionality
+== Purpose
 
-Metanorma plugin that allows you to access lutaml objects from a Metanorma document
+LutaML is a data model accessor that supports various data model formats,
+including:
 
-=== Installation
+* EXPRESS (`*.exp` files)
+* OMG UML in XMI format (`*.xmi` files)
+
+This plugin allows you to access LutaML models from within a Metanorma document.
+
+== Installation
 
 [source,console]
 ----
 $ gem install metanorma-plugin-lutaml
 ----
 
-=== Usage, `lutaml` macro
 
-Given `example.exp` file with the content:
+== Usage with EXPRESS
+
+=== General
+
+LutaML supports accessing EXPRESS models via the
+https://github.com/lutaml/expressir[Expressir] parser.
+
+
+=== Usage of the `lutaml_express` EXPRESS macro
+
+Given an `example.exp` EXPRESS file with the content:
 
 [source,exp]
 ----
@@ -42,11 +57,11 @@ SCHEMA test_schema 'test';
 END_SCHEMA;
 ----
 
-And the `lutaml` macro block:
+And the `lutaml_express` macro block:
 
 [source,adoc]
 -----
-[lutaml,example.exp,my_context]
+[lutaml_express,example.exp,my_context]
 ----
 
 {% for schema in my_context.schemas %}
@@ -67,13 +82,15 @@ Where:
 * `{example.exp}` is the location of the EXPRESS schema file (`*.exp`) that
 contains data to be loaded. Location of the file is computed relative to the
 source directory that `[lutaml]` is used (e.g., if
-`[lutaml,example.exp,my_context]` is invoked in an `.adoc` file located at
+`[lutaml_express,example.exp,my_context]` is invoked in an `.adoc` file located at
 `/foo/bar/doc.adoc`, the data file is expected to be found at
 `/foo/bar/example.exp`);
 
-* `{my_context}` is the name where the EXPRESS Repository read from the .exp
-file can be accessed with. Context object is a serialized
-`Expressir::Model::Repository` object with all variable names available. See
+* `{my_context}` is the name where the EXPRESS Repository read from the `.exp`
+file can be accessed with.
+
+** The `context` object is a serialized `Expressir::Model::Repository` object
+with all variable names available. See
 https://github.com/lutaml/expressir[Expressir] docs for reference.
 `{my_context}` has `schemas` method to access Expressir
 https://github.com/lutaml/expressir/blob/master/lib/expressir/model/schema.rb[schemas]
@@ -121,7 +138,7 @@ Example of usage:
 = Document title
 Author
 :lutaml-express-index: my_custom_name; /path/to/express_files; cache=/path/to/cache_file.yaml
-[lutaml,my_custom_name,my_context]
+[lutaml_express,my_custom_name,my_context]
 ----
 {% for schema in my_context.schemas %}
 == {{schema.id}}
@@ -142,7 +159,7 @@ diagram MyView {
   enum AddressClassProfile {
     imlicistAttributeProfile: CharacterString [0..1] {
       definition
-        this is multiline with `ascidoc`
+        this is multiline with `asciidoc`
       end definition
     }
   }
@@ -193,7 +210,7 @@ diagram MyView {
 ----
 
 
-=== Usage, `lutaml_uml_attributes_table` macro
+=== Usage of `lutaml_uml_attributes_table` macro
 
 This macro allows to quickly render data model attributes/values tables.
 
@@ -246,7 +263,7 @@ Will produce this output:
 |===
 -----
 
-In case of "enumeration"(AddressClassProfile) entity:
+In case of "enumeration" (AddressClassProfile) entity:
 
 [source,adoc]
 -----
@@ -264,12 +281,12 @@ Will produce this output:
 |===
 |Name |Definition
 
-|imlicistAttributeProfile |this is multiline with `ascidoc`
+|imlicistAttributeProfile |this is multiline with `asciidoc`
 
 |===
 -----
 
-=== Usage, `lutaml_uml_datamodel_description` macro
+=== Usage of `lutaml_uml_datamodel_description` macro
 
 This macro allows to quickly render data model packages and its dependent
 objects for supplied XMI file.
@@ -286,44 +303,44 @@ The `lutaml_uml_datamodel_description` macro can be used:
 [lutaml_uml_datamodel_description, path/to/example.xmi]
 --
 [.before]
-...
+....
 my text
-...
+....
 
-[.diagram_include_block, base_path="requirements/"]
-...
+[.diagram_include_block, base_path="requirements/", format="emf"]
+....
 Diagram text
-...
+....
 
 [.include_block, package="Another", base_path="spec/fixtures"]
-...
+....
 my text
-...
+....
 
 [.include_block, base_path="spec/fixtures"]
-...
+....
 my text
-...
+....
 
 [.before, package="Another"]
-...
+....
 text before Another package
-...
+....
 
 [.after, package="Another"]
-...
+....
 text after Another package
-...
+....
 
 [.after, package="CityGML"]
-...
+....
 text after CityGML package
-...
+....
 
 [.after]
-...
+....
 footer text
-...
+....
 --
 --
 -----
@@ -332,33 +349,42 @@ Where:
 
 * `path/to/example.xmi` - required, path to the XMI file to render
 
-* `[.before]` - macro to add additional text before the rendered output, can be used only once, additional occurrences of macro will overwrite text
+* `[.before]` - macro to add additional text before the rendered output, can be used only once, additional occurrences of macro will overwrite text, not that `literal` block style must be used in there(eg `....`)
 
 * `[.after]` - macro to add additional text after the rendered output, can be used only once, additional occurrences of macro will overwrite text
 
 * `[.after, package="Another"]` - macro with text to be inserted before(after in case of `.before` name) the package
 
-* `[.diagram_include_block]` - macro to automatically include diagram images. Attribute `base_path` is a required attribute to supply path prefix where to look for a digram image. The logic is as follows:
+* `[.diagram_include_block]` - macro to automatically include diagram images. Attribute `base_path` is a required attribute to supply path prefix where to look for a diagram image. `format` is an optional attribute that tells what file extension to use when including diagram file. The logic is as follows:
 [source,adoc]
 -----
 {% 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 }}
 {% endif %}
 {% endfor %}
 -----
-Eg: script will take package diagrams supplied in xmi file and will try to include `image` with the name equal to diagram' xmi_id attribute plus `.png`. Also one can add any text to the macro text, it will be added as paragraph before each image include.
+
+For instance, the script will take package diagrams supplied in the XMI file and will try to include `image` with the name equal to diagram' xmi_id attribute plus `.png`. Also one can add any text to the macro text, it will be added as paragraph before each image include.
 
 * `[.diagram_include_block, package="Another"]` - same as above, but diagram will be included only for supplied package name
 
-* `[.include_block, base_path="spec/fixtures"]` - macro to inlude files(adoc/liquid) for each package name. Attribute `base_path` is a required attribute to supply path prefix where to look for file to include. Macro will look for a file called `base_path` + `/` `_package_name`(downcase, replace : -> '', ' ' -> '_') + `.adoc`[`.liquid`], eg for package 'My Package name' and `base_path` eq to `my/path`, macro will look for the following file path: `my/path/_my_package_name.adoc`.
+* `[.include_block, base_path="spec/fixtures"]` - macro to include files (`*.adoc` or `*.liquid`) for each package name. Attribute `base_path` is a required attribute to supply path prefix where to look for file to include. Macro will look for a file called `base_path` + `/` `_package_name`(downcase, replace : -> '', ' ' -> '_') + `.adoc`[`.liquid`], eg for package 'My Package name' and `base_path` eq to `my/path`, macro will look for the following file path: `my/path/_my_package_name.adoc`.
 
 * `[.include_block, package="Another", base_path="spec/fixtures"]` - same as above, but include block will be included only for supplied package name
 
+In addition to the macros listed above that can be used only inside `lutaml_uml_datamodel_description` macro there is another macro called `lutaml_figure`. `lutaml_figure` is used to lookup and reference xmi package diagrams. The syntax is as follows:
+
+[source,adoc]
+-----
+This is lutaml_figure::[package="Wrapper root package", name="Fig B1 Full model"] figure
+-----
+
+This code will be transformed into `<<figure-{diagram.xmi_id}>>` and will point to diagram figure. One can only use this macro when document rendered `lutaml_uml_datamodel_description` macro as it needs diagram lookup table in order to reference package diagram.
 
 Will produce this output:
 
@@ -372,18 +398,17 @@ Diagram text
 
 [[figure-EAID_ACBB5EE3_3428_40f5_9C7C_E41923419F29]]
 .CityGML Package Diagram
-image::requirements//EAID_ACBB5EE3_3428_40f5_9C7C_E41923419F29.png[]
+image::requirements/EAID_ACBB5EE3_3428_40f5_9C7C_E41923419F29.png[]
 
 BuildingFurnitureFunctionValue is a code list that enumerates the different purposes of a BuildingFurniture.
 
 [[figure-EAID_938AE961_1C57_4052_B964_997D1894A58D]]
 .Use of ISO and OASIS standards in CityGML
-image::requirements//EAID_938AE961_1C57_4052_B964_997D1894A58D.png[]
+image::requirements/EAID_938AE961_1C57_4052_B964_997D1894A58D.png[]
 
 The CityGML package is organized into
 2 packages with 1 modules:
 
-[arabic]
 . Another package
 . CityTML package
 
@@ -393,18 +418,17 @@ Content for CityGML package
 
 ==== Defining tables
 
-[arabic]
-.<<tab-P-another-C-abstractatomictimeseries>> -- Elements of Another::AbstractAtomicTimeseries
+.<<tab-P-another-C-{XMI_ID}>> -- Elements of &#8220;Another::AbstractAtomicTimeseries&#8221; (class)
 
-[[tab-P-another-C-abstractatomictimeseries]]
-.Elements of Another::AbstractAtomicTimeseries
+[[tab-P-another-C-{XMI_ID}]]
+.Elements of &#8220;Another::AbstractAtomicTimeseries&#8221; (class)
 [width="100%",cols="a,a,a,a,a,a,a,a"]
 |===
 h|Name: 7+| AbstractAtomicTimeseries
 h|Definition: 7+|
 h|Stereotype: 7+| interface
 h|Abstract: 7+|
-.1+h|Associations: 7+| (none)
+h|Associations: 7+| (none)
 .4+h|Public attributes:
 | _Name_
 2+| _Definition_
@@ -438,7 +462,7 @@ h|Constraints: 7+| (none)
 text after CityGML package
 -----
 
-In addition to just supplying XMI file, this macro also supports YAML
+In addition to just supplying an XMI file, this macro also supports a YAML
 configuration file.
 
 The format for using YAML is this:
@@ -453,26 +477,33 @@ packages:
   - three
   # skips these packages
   - skip: four
+render_style: entity_list|data_dictionary|default
+section_depth: 2
 -----
 
 Where:
 
 * `packages` - required, root element with the list of strings or objects
-
 * `Package *` - pattern matching, specifies lookup condition for packages to
 render.
 +
 NOTE: In this example, it is equal to the following regular expression: `/^Package.*$/`
 
 * `skip: four` - object with package name to skip
+* `render_style` - what template to use to render packages, can be: entity_list, data_dictionary or default
+* `section_depth` - what package to use as root package for render, eg `section_depth` equal to 2 tells processor to use first nested package of the first root packages in xmi file. Example: if xmi file has this package structure: [{ name: 'One', packages: [{ name: 'one-1' }, { name: 'one-2' }] }, { name: 'Two', packages: [{ name: 'two-1' }, { name: 'two-2' }] }] and we have `section_depth` equal to 2, root package will be `one-1`
 
 Usage with macro:
 
 [source,adoc]
------
+--
 [lutaml_uml_datamodel_description, path/to/example.xmi, path/to/config.yml]
-....
------
+----
+[.diagram_include_block, base_path="models/Images", format="png"]
+...
+...
+----
+--
 
 The macro processor will read supplied YAML file and arrange packages according
 to the order supplied in the config file, also all packages supplied as `skip`

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

@@ -1,28 +1,38 @@
 {% for package in context.packages %}
 {% assign package_name = package.name | downcase | replace: ":", "" | replace: " ", "_" %}
-{% if additional_context.before %}
-{{ additional_context.before.text }}
-{% endif %}
-{% assign before_package_key = 'before;' | append: package.name %}
-{% if additional_context[before_package_key] %}
-{{ additional_context[before_package_key].text }}
+{% if additional_context.before and additional_context.before.size > 0 %}
+{% for before in additional_context.before %}
+{{ before.text }}
+{% endfor %}
 {% endif %}
 {% assign is_package_spare = package.name | slice: 0,5 %}
 {% if is_package_spare == 'old: ' %}{% continue %}
 {% elsif is_package_spare == 'Spare' %}{% continue %}
 {% endif %}
 
-{% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}{{equalsigns}} {{ package.name }} package
+{% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}
+
+[[lutaml-section-{{ package_name }}]]
+{{equalsigns}} {{ package.name }} package
+
 {{equalsigns}}= {{ package.name }} overview
 
+{% 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] %}
+{{ before.text }}
+{% endfor %}
+{% endif %}
 {% if additional_context.diagram_include_block %}
-{% include "diagrams_block", package_name: package_name, image_base_path: additional_context.diagram_include_block.base_path, text: additional_context.diagram_include_block.text %}
+{% 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, 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:
@@ -38,14 +48,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 }}
+{% assign klass_xid = klass.xmi_id %}
+.<<tab-P-{{ package_name }}-C-{{ klass_xid }}>> -- Elements of "{{ package.name }}::{{ klass.name }}"
 
 {% endfor %}
 {% for enum in package.enums %}
@@ -54,7 +64,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 }}
+{% assign enum_xid = enum.xmi_id %}
+.<<tab-P-{{ package_name }}-E-{{ enum_xid }}>> -- Elements of "{{ package.name }}::{{ enum.name }}"
 
 {% endfor %}
 {% for data_type in package.data_types %}
@@ -63,7 +74,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 }}
+{% assign data_type_xid = data_type.xmi_id %}
+.<<tab-P-{{ package_name }}-DT-{{ data_type_xid }}>> -- Elements of "{{ package.name }}::{{ data_type.name }}"
 
 {% endfor %}
 
@@ -81,9 +93,9 @@
 
 {% endif %}
 
-{% if additional_context.include_block %}
-{% assign block = additional_context.include_block %}
-{% capture block_filename %}{{ block.base_path }}/{{ package_name }}{% endcapture %}
+{% if additional_context.include_block and additional_context.include_block.size > 0 %}
+{% for block in additional_context.include_block %}
+{% 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 %}
@@ -91,12 +103,13 @@
 {% endif %}
 {{ block_content }}
 {% endunless %}
+{% endfor %}
 {% endif %}
 
 {% assign include_block_package_key = 'include_block;' | append: package.name %}
-{% assign block = additional_context[include_block_package_key] %}
-{% if block %}
-{% capture block_filename %}{{ block.base_path }}/{{ package_name }}{% endcapture %}
+{% if additional_context[include_block_package_key] and additional_context[include_block_package_key].size > 0 %}
+{% for block in additional_context[include_block_package_key] %}
+{% 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 %}
@@ -104,16 +117,23 @@
 {% endif %}
 {{ block_content }}
 {% endunless %}
+{% endfor %}
 {% endif %}
 
 {% assign after_package_key = 'after;' | append: package.name %}
-{{equalsigns}}= Additional Information
 {% if additional_context[after_package_key] %}
-{{ additional_context[after_package_key].text }}
+{{equalsigns}}= Additional information
+{% for after in additional_context[after_package_key] %}
+{{ after.text }}
+{% endfor %}
+{% endif %}
+{% if package.packages.size > 0 and render_nested_packages %}
+{% assign nested_depth = depth | plus: 1 %}{% include "packages", depth: nested_depth, context: package %}
 {% endif %}
-{% if package.packages.size > 0 and render_nested_packages %}{% assign nested_depth = depth | plus: 1 %}{% include "packages", depth: nested_depth, context: package %}{% endif %}
 {% endfor %}
 
-{% if additional_context.after %}
-{{ additional_context.after.text }}
+{% if additional_context.after and additional_context.after.size > 0 %}
+{% for after in additional_context.after %}
+{{ after.text }}
+{% endfor %}
 {% endif %}

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

@@ -3,8 +3,9 @@
 {% 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 }}
+{% assign klass_xid = klass.xmi_id %}
+[[tab-P-{{ package_name }}-C-{{ klass_xid }}]]
+.Elements of "{{ package.name }}::{{ klass.name }}" (class)
 [width="100%",cols="a,a,a,a,a,a,a,a"]
 |===
 
@@ -24,14 +25,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 +42,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,12 +64,12 @@ 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:*
+.{{ klass.constraints.size }}+h| Constraints:
 {% for constr in klass.constraints %}
 7+| `{{ constr.body }}`
 

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

@@ -0,0 +1,181 @@
+{% for package in context.packages %}
+{% assign package_name = package.name | downcase | replace: ":", "" | replace: " ", "_" %}
+{% if additional_context.before and additional_context.before.size > 0 %}
+{% for before in additional_context.before %}
+{{ before.text }}
+{% 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] %}
+{{ before.text }}
+{% endfor %}
+{% endif %}
+
+[cols="1a,4a"]
+|===
+
+h|Description:    | {{ package.definition }}
+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 basic_types = package.classes | where: "stereotype", "BasicType" %}
+{% assign unions = package.classes | where: "stereotype", "Union" %}
+{% assign code_lists = package.classes | where: "stereotype", "CodeList" %}
+{% if feature_types.size > 0 or object_types.size > 0 %}
+{{equalsigns}}= Classes
+
+{% include "packages_data_dictionary_classes", classes: feature_types %}
+{% include "packages_data_dictionary_classes", classes: object_types %}
+{% endif %}
+
+{% if basic_types.size > 0 %}
+{{equalsigns}}= Basic types
+
+{% include "packages_data_dictionary_classes", classes: basic_types %}
+{% endif %}
+
+{% if unions.size > 0 %}
+{{equalsigns}}= Unions
+
+{% include "packages_data_dictionary_classes", classes: unions %}
+{% endif %}
+
+{% if code_lists.size > 0 %}
+{{equalsigns}}= Code lists
+
+{% include "packages_data_dictionary_classes", classes: code_lists %}
+{% endif %}
+
+{% if package.data_types.size > 0 %}
+{{equalsigns}}= Data types
+
+{% 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 %}
+[[{{ data_type.name }}-section]]
+[cols="1a"]
+|===
+|*{{ data_type.name }}*
+|[cols="1,4"]
+!===
+!Definition:  ! {{ data_type.definition }}
+!Subclass of: ! {{ generalizations }}
+!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 %}
+! {{ assoc.member_end_attribute_name }}  !<<{{assoc.member_end}}-section,{{assoc.member_end}}>> {{ cardinality }} ! {{ assoc.definition }}
+{% endif %}
+{% endfor %}
+{% endcapture %}
+{% if rendered_associations.size > 0 %}
+|
+[cols="15,20,60",options="header"]
+!===
+! Role name !Target class and multiplicity !Definition
+{{ rendered_associations }}
+!===
+{% endif %}
+{% endif %}
+{% if data_type.attributes.size > 0 %}
+|
+[cols="15,20,60",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 %}
+! {{ attr.name }}  !<<{{ attr.type }}-section,{{ attr.name }}>>  {{ cardinality }} !{{ attr.definition }}
+{% endfor %}
+!===
+| NOTE: Unless otherwise specified, all attributes and role names have the stereotype «Property».
+{% endif %}
+|===
+
+{% endfor %}
+{% endif %}
+
+{% if package.enums.size > 0 %}
+{{equalsigns}}= Enumerations
+
+{% 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"]
+|===
+|*{{ enum.name }}*
+|
+[cols="1,4"]
+!===
+!Definition: ! {{ enum.definition }}
+!Stereotype: ! «Enumeration»
+!===
+{% if enum.values.size > 0 %}
+|
+[cols="1,4",options="header"]
+!===
+! Literal value !Definition
+
+{% for val in enum.values %}
+! {{ val.name }}  !{{ val.definition }}
+{% endfor %}
+!===
+{% endif %}
+|===
+
+{% endfor %}
+{% endif %}
+
+{% if additional_context.include_block and additional_context.include_block.size > 0 %}
+{% for block in additional_context.include_block %}
+{% 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 %}
+{{ block.text }}
+{% endif %}
+{{ block_content }}
+{% endunless %}
+{% endfor %}
+{% endif %}
+
+{% assign include_block_package_key = 'include_block;' | append: package.name %}
+{% if additional_context[include_block_package_key] and additional_context[include_block_package_key].size > 0 %}
+{% for block in additional_context[include_block_package_key] %}
+{% 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 %}
+{{ block.text }}
+{% endif %}
+{{ block_content }}
+{% endunless %}
+{% endfor %}
+{% endif %}
+
+{% assign after_package_key = 'after;' | append: package.name %}
+{% if additional_context[after_package_key] %}
+{{equalsigns}}= Additional information
+{% for after in additional_context[after_package_key] %}
+{{ after.text }}
+{% 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 %}
+{% endif %}
+{% endfor %}
+
+{% if additional_context.after and additional_context.after.size > 0 %}
+{% for after in additional_context.after %}
+{{ after.text }}
+{% endfor %}
+{% endif %}

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

@@ -0,0 +1,65 @@
+{% for klass in classes %}
+{% capture generalizations %}{% for assoc in klass.associations | where: "member_end_type", "generalization" %}{{ assoc.member_end }} {% endfor %}{% endcapture %}
+[[{{ klass.name }}-section]]
+[cols="1a"]
+|===
+|*{{ klass.name }}*
+|
+[cols="1,4"]
+!===
+! Definition:  ! {{ klass.definition }}
+! Subclass of: ! {{ generalizations }}
+! Stereotype:  ! «{{ klass.stereotype }}»
+!===
+
+{% if klass.associations.size > 0 %}
+{% capture rendered_associations %}
+{% for assoc in klass.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 %}
+
+! {{ assoc.member_end_attribute_name }}
+! <<{{assoc.member_end}}-section,{{assoc.member_end}}>> {{ cardinality }}
+! {{ assoc.definition }}
+
+{% endif %}
+{% endfor %}
+{% endcapture %}
+
+{% if rendered_associations.size > 0 %}
+|
+[cols="15,20,60",options="header"]
+!===
+! *Role name*
+! *Target class and multiplicity*
+! *Definition*
+{{ rendered_associations }}
+!===
+{% endif %}
+
+{% endif %}
+{% if klass.attributes.size > 0 %}
+|
+[cols="15,20,60",options="header"]
+!===
+! *Attribute*
+! *Value type and multiplicity*
+! *Definition*
+{% for attr in klass.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 %}
+
+! {{ attr.name }}
+!<<{{ attr.type }}-section,{{ attr.name }}>> {{ cardinality }}
+!{{ attr.definition }}
+
+{% endfor %}
+!===
+
+| NOTE: Unless otherwise specified, all attributes and role names have the stereotype «Property».
+{% endif %}
+|===
+
+{% endfor %}

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

@@ -3,8 +3,9 @@
 {% elsif is_klass_spare == 'Spare' %}{% continue %}
 {% endif %}
 {% assign klass_name = klass.name | downcase | replace: ':', '' | replace: ' ', '_' %}
-[[tab-P-{{ package_name }}-DT-{{ klass_name }}]]
-.Elements of {{ package.name }}::{{ klass.name }}
+{% assign klass_xid = klass.xmi_id %}
+[[tab-P-{{ package_name }}-DT-{{ klass_xid }}]]
+.Elements of "{{ package.name }}::{{ klass.name }}" (data type)
 [width="100%",cols="a,a,a,a,a,a,a,a"]
 |===
 
@@ -24,14 +25,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,12 +42,11 @@ 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|Values:
+.{{klass.attributes.size | plus: 1}}+h| Values:
 | _Name_
 6+| _Definition_
 
@@ -56,7 +56,7 @@ h|Abstract: 7+| {{ klass.is_abstract }}
 
 {% endfor %}
 {% else %}
-.1+h|Values:
+h| Values:
 7+| (none)
 {% endif %}
 

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

@@ -0,0 +1,113 @@
+{% for package in context.packages %}
+{% assign package_name = package.name | downcase | replace: ":", "" | replace: " ", "_" %}
+{% if additional_context.before and additional_context.before.size > 0 %}
+{% for before in additional_context.before %}
+{{ before.text }}
+{% endfor %}
+{% endif %}
+{% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}{{equalsigns}} {{ package.name }}
+
+[[rc_{{ package_name }}-model_section]]
+{{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] %}
+{{ before.text }}
+{% 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 %}
+{% endfor %}
+{% endif %}
+
+{% if additional_context.include_block and additional_context.include_block.size > 0 %}
+{% for block in additional_context.include_block %}
+{% 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 %}
+{{ block.text }}
+{% endif %}
+{{ block_content }}
+{% endunless %}
+{% endfor %}
+{% endif %}
+
+{% assign include_block_package_key = 'include_block;' | append: package.name %}
+{% if additional_context[include_block_package_key] and additional_context[include_block_package_key].size > 0 %}
+{% for block in additional_context[include_block_package_key] %}
+{% 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 %}
+{{ block.text }}
+{% endif %}
+{{ block_content }}
+{% endunless %}
+{% endfor %}
+{% endif %}
+
+{{equalsigns}}= Class definitions
+{% if package.classes.size > 0 %}
+.Classes used in {{ package.name }}
+[cols="2a,6a",options="header"]
+|===
+|Class |Description
+
+{% for klass in package.classes %}
+|<<{{ klass.name }}-section,{{ klass.name }}>> «{{ klass.stereotype }}»
+|{{ klass.definition }}
+
+{% endfor %}
+|===
+{% endif %}
+
+{% if package.data_types.size > 0 %}
+.Data types used in {{ package.name }}
+[cols="2,6",options="header"]
+|===
+|Name |Description
+
+{% for klass in package.data_types %}
+|<<{{ klass.name }}-section,{{ klass.name }}>> «{{ klass.stereotype }}»
+|{{ klass.definition }}
+
+{% endfor %}
+
+|===
+{% endif %}
+
+{% if package.enums.size > 0 %}
+.Enumerated Classes used in {{ package.name }}
+[cols="2a,6a",options="header"]
+|===
+|Name |Description
+
+{% for klass in package.enums %}
+|<<{{ klass.name }}-section,{{ klass.name }}>> «{{ klass.stereotype }}»
+|{{ klass.definition }}
+
+{% endfor %}
+
+|===
+{% endif %}
+
+{% assign after_package_key = 'after;' | append: package.name %}
+{% if additional_context[after_package_key] %}
+{{equalsigns}}= Additional information
+{% for after in additional_context[after_package_key] %}
+{{ after.text }}
+{% endfor %}
+{% endif %}
+{% if package.packages.size > 0 and render_nested_packages %}
+{% assign nested_depth = depth | plus: 1 %}{% include "packages_entity_list", depth: nested_depth, context: package %}
+{% endif %}
+{% endfor %}
+
+{% if additional_context.after and additional_context.after.size > 0 %}
+{% for after in additional_context.after %}
+{{ after.text }}
+{% endfor %}
+{% endif %}

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

@@ -3,8 +3,9 @@
 {% elsif is_klass_spare == 'Spare' %}{% continue %}
 {% endif %}
 {% assign klass_name = klass.name | downcase | replace: ':', '' | replace: ' ', '_' %}
-[[tab-P-{{ package_name }}-E-{{ klass_name }}]]
-.Elements of {{ package.name }}::{{ klass.name }}
+{% assign klass_xid = klass.xmi_id %}
+[[tab-P-{{ package_name }}-E-{{ klass_xid }}]]
+.Elements of "{{ package.name }}::{{ klass.name }}" (enumeration)
 [width="100%",cols="a,a,a,a,a,a,a,a"]
 |===
 
@@ -24,14 +25,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,11 +42,11 @@ h|Abstract: 7+| {{ klass.is_abstract }}
 
 {% endfor %}
 {% else %}
-
-.1+h|Associations: 7+| (none)
+h| Associations: 7+| (none)
 {% endif %}
+
 {% if klass.values.size > 0 %}
-.{{klass.values.size | plus: 1}}+h|Values:
+.{{klass.values.size | plus: 1}}+h| Values:
 | _Name_
 6+| _Definition_
 
@@ -55,7 +56,7 @@ h|Abstract: 7+| {{ klass.is_abstract }}
 
 {% endfor %}
 {% else %}
-.1+h|Values:
+h| Values:
 7+| (none)
 {% endif %}
 

data/lib/metanorma/plugin/lutaml/lutaml_figure_inline_macro.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Plugin
+    module Lutaml
+      class LutamlFigureInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+        include LutamlDiagramBase
+
+        use_dsl
+        named :lutaml_figure
+
+        def process(parent, _target, attrs)
+          diagram_key = [attrs["package"], attrs["name"]].compact.join(":")
+          return if parent.document.attributes['lutaml_figure_id'].nil?
+          xmi_id = parent.document.attributes['lutaml_figure_id'][diagram_key]
+          return unless xmi_id
+
+          %Q(<xref target="figure-#{xmi_id}"></xref>)
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/plugin/lutaml/lutaml_preprocessor.rb

@@ -52,7 +52,7 @@ module Metanorma
 
         def process_text_blocks(document, input_lines, express_indexes)
           line = input_lines.next
-          block_match = line.match(/^\[lutaml,([^,]+)?,?([^,]+)?,?([^,]+)?\]/)
+          block_match = line.match(/^\[lutaml_express,([^,]+)?,?([^,]+)?,?([^,]+)?\]/)
           return [line] if block_match.nil?
 
           end_mark = input_lines.next

data/lib/metanorma/plugin/lutaml/lutaml_uml_attributes_table_preprocessor.rb

@@ -14,7 +14,7 @@ module Metanorma
       #  @example [lutaml_uml_attributes_table,path/to/lutaml,EntityName]
       class LutamlUmlAttributesTablePreprocessor < Asciidoctor::Extensions::Preprocessor
         MARCO_REGEXP =
-          /\[lutaml_uml_attributes_table,([^,]+),?(.+)?,([^,]+),?(.+)?\]/
+          /\[lutaml_uml_attributes_table,([^,]+),?([^,]+),?(.+?)?\]/
         # search document for block `datamodel_attributes_table`
         #  read include derectives that goes after that in block and transform
         #  into yaml2text blocks
@@ -36,15 +36,16 @@ module Metanorma
           input_lines.each_with_object([]) do |line, result|
             if match = line.match(MARCO_REGEXP)
               lutaml_path = match[1]
-              entity_name = match[3]
-              result.push(*parse_marco(lutaml_path, entity_name, document))
+              entity_name = match[2]
+              skip_headers = match[3]
+              result.push(*parse_marco(lutaml_path, entity_name, document, skip_headers))
             else
               result.push(line)
             end
           end
         end
 
-        def parse_marco(lutaml_path, entity_name, document)
+        def parse_marco(lutaml_path, entity_name, document, skip_headers)
           lutaml_document = lutaml_document_from_file(document, lutaml_path)
             .serialized_document
           entities = [lutaml_document["classes"], lutaml_document["enums"]]
@@ -53,12 +54,12 @@ module Metanorma
           entity_definition = entities.detect do |klass|
             klass["name"] == entity_name.strip
           end
-          model_representation(entity_definition, document)
+          model_representation(entity_definition, document, skip_headers)
         end
 
-        def model_representation(entity_definition, document)
+        def model_representation(entity_definition, document, skip_headers)
           render_result, errors = Utils.render_liquid_string(
-            template_string: table_template,
+            template_string: table_template(skip_headers),
             context_items: entity_definition,
             context_name: "definition",
             document: document
@@ -68,9 +69,9 @@ module Metanorma
         end
 
         # rubocop:disable Layout/IndentHeredoc
-        def table_template
+        def table_template(skip_headers)
           <<~TEMPLATE
-          === {{ definition.name }}
+          #{"=== {{ definition.name }}" unless skip_headers}
           {{ definition.definition }}
 
           {% if definition.attributes %}

data/lib/metanorma/plugin/lutaml/lutaml_uml_datamodel_description_preprocessor.rb

@@ -20,6 +20,14 @@ module Metanorma
           Gem.loaded_specs["metanorma-plugin-lutaml"].full_gem_path,
           "lib", "metanorma", "plugin", "lutaml", "liquid_templates"
         )
+        DEFAULT_RENDER_INCLUDE = 'packages'.freeze
+        RENDER_STYLES_INCLUDES = {
+          'default' => 'packages',
+          'entity_list' => 'packages_entity_list',
+          'data_dictionary' => 'packages_data_dictionary'
+        }.freeze
+        SUPPORTED_NESTED_MACRO = %w[
+          before diagram_include_block after include_block].freeze
         # search document for block `lutaml_uml_datamodel_description`
         #  read include derectives that goes after that in block and transform
         #  into yaml2text blocks
@@ -57,40 +65,63 @@ module Metanorma
           block_match = line.match(MARCO_REGEXP)
           return [line] if block_match.nil?
 
+          lutaml_document = lutaml_document_from_file(document, block_match[1])
+          fill_in_diagrams_attributes(document, lutaml_document)
           model_representation(
-            lutaml_document_from_file(document, block_match[1]),
+            lutaml_document,
             document,
             collect_additional_context(input_lines, input_lines.next),
             parse_yaml_config_file(document, block_match[2]))
         end
 
+        def fill_in_diagrams_attributes(document, lutaml_document_wrapper)
+          lutaml_document = lutaml_document_wrapper.original_document
+          package_flat_diagrams = lambda do |pks|
+            pks.each_with_object({}) do |package, res|
+              package.diagrams.map { |diag| res["#{package.name}:#{diag.name}"] = diag.xmi_id }
+            end
+          end
+          children_pks_daigs = package_flat_diagrams.call(lutaml_document.packages.map(&:children_packages).flatten)
+          document.attributes['lutaml_figure_id'] = package_flat_diagrams.call(lutaml_document.packages)
+                                                      .merge(children_pks_daigs)
+        end
+
         def collect_additional_context(input_lines, end_mark)
-          additional_context = {}
+          additional_context = Hash.new { |hash, key| hash[key] = [] }
           block_lines = []
           while (block_line = input_lines.next) != end_mark
             block_lines.push(block_line)
           end
           block_document = (Asciidoctor::Document.new(block_lines, {})).parse
           block_document.blocks.each do |block|
+            next unless SUPPORTED_NESTED_MACRO.include?(block.attributes['role'])
+
             attrs = block.attributes
             name = attrs.delete('role')
             package = attrs.delete('package')
             macro_keyword = [name, package].compact.join(";")
-            additional_context[macro_keyword] = { 'text' => block.lines[1..-2].join("\n") }.merge(attrs)
+            block_text = block.lines.length > 0 ? block.lines[1..-2].join("\n") : ''
+            additional_context[macro_keyword].push({ 'text' => block_text }.merge(attrs))
           end
           additional_context
         end
 
+        def package_level(lutaml_document, level)
+          return lutaml_document if level <= 0
+
+          package_level(lutaml_document['packages'].first, level - 1)
+        end
+
         def create_context_object(lutaml_document, additional_context, options)
-          if options.length.zero?
+          root_package = package_level(lutaml_document.to_liquid, options['package_root_level'] || 1)
+          if options.length.zero? || options['packages'].nil?
             return {
               'render_nested_packages' => true,
-              "packages" => lutaml_document.to_liquid['packages'].first['packages'].first['packages'],
+              "packages" => root_package['packages'],
               "additional_context" => additional_context
             }
           end
 
-          root_package = lutaml_document.to_liquid['packages'].first
           all_packages = [root_package, *root_package['children_packages']]
           {
             "packages" => sort_and_filter_out_packages(all_packages, options),
@@ -133,7 +164,7 @@ module Metanorma
 
         def model_representation(lutaml_document, document, additional_context, options)
           render_result, errors = Utils.render_liquid_string(
-            template_string: table_template,
+            template_string: table_template(options['section_depth'] || 2, options['render_style']),
             context_items: create_context_object(lutaml_document,
                               additional_context,
                               options),
@@ -145,9 +176,10 @@ module Metanorma
           render_result.split("\n")
         end
 
-        def table_template
+        def table_template(section_depth, render_style)
+          include_name = RENDER_STYLES_INCLUDES.fetch(render_style, DEFAULT_RENDER_INCLUDE)
           <<~LIQUID
-            {% include "packages", depth: 2, context: context, additional_context: context.additional_context, render_nested_packages: context.render_nested_packages %}
+            {% include "#{include_name}", depth: #{section_depth}, context: context, additional_context: context.additional_context, render_nested_packages: context.render_nested_packages %}
           LIQUID
         end
       end

data/lib/metanorma/plugin/lutaml/version.rb

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.4.4".freeze
+      VERSION = "0.4.8".freeze
     end
   end
 end

data/lib/metanorma-plugin-lutaml.rb

@@ -4,6 +4,7 @@ require "metanorma/plugin/lutaml/lutaml_uml_attributes_table_preprocessor"
 require "metanorma/plugin/lutaml/lutaml_uml_datamodel_description_preprocessor"
 require "metanorma/plugin/lutaml/lutaml_diagram_block"
 require "metanorma/plugin/lutaml/lutaml_diagram_block_macro"
+require "metanorma/plugin/lutaml/lutaml_figure_inline_macro"
 
 module Metanorma
   module Plugin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -261,11 +261,15 @@ files:
 - lib/metanorma/plugin/lutaml/liquid_templates/_diagrams_block.liquid
 - lib/metanorma/plugin/lutaml/liquid_templates/_packages.liquid
 - lib/metanorma/plugin/lutaml/liquid_templates/_packages_class.liquid
+- lib/metanorma/plugin/lutaml/liquid_templates/_packages_data_dictionary.liquid
+- lib/metanorma/plugin/lutaml/liquid_templates/_packages_data_dictionary_classes.liquid
 - lib/metanorma/plugin/lutaml/liquid_templates/_packages_data_type.liquid
+- lib/metanorma/plugin/lutaml/liquid_templates/_packages_entity_list.liquid
 - lib/metanorma/plugin/lutaml/liquid_templates/_packages_enum.liquid
 - lib/metanorma/plugin/lutaml/lutaml_diagram_base.rb
 - lib/metanorma/plugin/lutaml/lutaml_diagram_block.rb
 - lib/metanorma/plugin/lutaml/lutaml_diagram_block_macro.rb
+- lib/metanorma/plugin/lutaml/lutaml_figure_inline_macro.rb
 - lib/metanorma/plugin/lutaml/lutaml_preprocessor.rb
 - lib/metanorma/plugin/lutaml/lutaml_uml_attributes_table_preprocessor.rb
 - lib/metanorma/plugin/lutaml/lutaml_uml_datamodel_description_preprocessor.rb
@@ -292,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Metanorma plugin for LutaML