metanorma-plugin-glossarist 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c239554930b872ac67bfa16144dbc77cabd558ff26f623c0b4cdfe53d56541c1
-  data.tar.gz: 03a9282d88ea2ed4087d70bc23d4cd41d2e31327890d0c427ca48d4e403a3a65
+  metadata.gz: b7f273c4d3190131198e62d21b17f06ba86cba920e649b148f6eb5b739382b5b
+  data.tar.gz: 9d6341ea4819346714bc9bd8432f4a43f308a6b66fbb16e1783a9c19a3280fbe
 SHA512:
-  metadata.gz: e1fcb83d207dfc99e857e4648cc69033c22072661d60081e9f001399666aad2534b84a9efafc95f3cdd324bcaa8446de37bb19ad2b9efb364c107a349d7cb27b
-  data.tar.gz: ebb50f86f097af9e82c93fc8f4112971ba407b66a793e9ed662ea9151eca3e91105e62fbded44a42a9d8cf86b6d738bd57e5331be84f1f2a2a657bb992cc77e7
+  metadata.gz: 4432be1f049b3c52f6ae6473189adac86b65f9d14c2b20929b0974016398bc7e8032a4e82649c4dcbbbb9e16b88e943d999f14441c1fbca2a0e4b34e4ceb32c5
+  data.tar.gz: 10a9aa8898e1e7d0cef5af135a515c0b3c53c1edbe97844adb9446c253293d24d6540be35460edc46f64167b06b86fc75a85e876f7dfa424b31ff559ce046a33

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-06-13 04:20:36 UTC using RuboCop version 1.86.1.
+# on 2026-07-05 06:01:54 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,106 +11,41 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'metanorma-plugin-glossarist.gemspec'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
-    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
-  Exclude:
-    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/BlockEndNewline:
-  Exclude:
-    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Width, EnforcedStyleAlignWith, AllowedPatterns.
-# SupportedStylesAlignWith: start_of_line, relative_to_receiver
-Layout/IndentationWidth:
-  Exclude:
-    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
-
-# Offense count: 32
+# Offense count: 37
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
-  Exclude:
-    - 'lib/metanorma-plugin-glossarist.rb'
-    - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
-    - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
-    - 'lib/metanorma/plugin/glossarist/liquid.rb'
-    - 'lib/metanorma/plugin/glossarist/liquid/custom_blocks/with_glossarist_context.rb'
-    - 'lib/metanorma/plugin/glossarist/liquid/drop_bracket_access.rb'
-    - 'lib/metanorma/plugin/glossarist/liquid/drops/managed_concept_data_drop.rb'
-    - 'lib/metanorma/plugin/glossarist/section_filter.rb'
-    - 'spec/metanorma/plugin/glossarist/bibliography_renderer_spec.rb'
-    - 'spec/metanorma/plugin/glossarist/bibliography_scope_spec.rb'
-    - 'spec/metanorma/plugin/glossarist/concept_filter_spec.rb'
-    - 'spec/metanorma/plugin/glossarist/concept_path_resolver_spec.rb'
-    - 'spec/metanorma/plugin/glossarist/liquid/drops/localization_collection_drop_spec.rb'
-    - 'spec/metanorma/plugin/glossarist/liquid/with_glossarist_context_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/MultilineBlockLayout:
-  Exclude:
-    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
+  Enabled: false
 
 # Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
+Lint/ConstantDefinitionInBlock:
   Exclude:
-    - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
-    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
+    - 'lib/metanorma/plugin/glossarist/field_filter.rb'
+    - 'spec/metanorma/plugin/glossarist/field_filter_spec.rb'
 
 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
-# NotImplementedExceptions: NotImplementedError
-Lint/UnusedMethodArgument:
+Lint/StructNewOverride:
   Exclude:
-    - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
+    - 'spec/metanorma/plugin/glossarist/field_filter_spec.rb'
 
 # Offense count: 1
 Lint/UselessConstantScoping:
   Exclude:
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
 
-# Offense count: 11
+# Offense count: 10
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
     - 'lib/metanorma/plugin/glossarist/bibliography_renderer.rb'
     - 'lib/metanorma/plugin/glossarist/concept_filter.rb'
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
-    - 'lib/metanorma/plugin/glossarist/liquid/custom_blocks/with_glossarist_context.rb'
     - 'lib/metanorma/plugin/glossarist/template_renderer.rb'
 
-# Offense count: 6
+# Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
@@ -119,12 +54,12 @@ Metrics/CyclomaticComplexity:
     - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
 
-# Offense count: 14
+# Offense count: 15
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 24
+  Max: 17
 
-# Offense count: 5
+# Offense count: 4
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
@@ -132,7 +67,7 @@ Metrics/PerceivedComplexity:
     - 'lib/metanorma/plugin/glossarist/concept_filter.rb'
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
 
-# Offense count: 19
+# Offense count: 25
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -145,23 +80,28 @@ RSpec/DescribeClass:
   Exclude:
     - 'spec/metanorma/plugin/glossarist/bibliography_scope_spec.rb'
 
-# Offense count: 27
+# Offense count: 45
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 35
 
-# Offense count: 31
+# Offense count: 1
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/metanorma/plugin/glossarist/field_filter_spec.rb'
+
+# Offense count: 66
 RSpec/MultipleExpectations:
   Max: 4
 
-# Offense count: 33
+# Offense count: 38
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Exclude:
     - 'spec/metanorma/plugin/glossarist/dataset_preprocessor_spec.rb'
 
-# Offense count: 30
+# Offense count: 34
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 6
@@ -171,45 +111,21 @@ RSpec/RepeatedExample:
   Exclude:
     - 'spec/metanorma/plugin/glossarist/concept_path_resolver_spec.rb'
 
-# Offense count: 3
+# Offense count: 5
 # Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
 # SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
   Exclude:
+    - 'spec/metanorma/plugin/glossarist/liquid/custom_filters_spec.rb'
+    - 'spec/metanorma/plugin/glossarist/liquid/drop_bracket_access_spec.rb'
     - 'spec/metanorma/plugin/glossarist/liquid/drops/localization_collection_drop_spec.rb'
     - 'spec/metanorma/plugin/glossarist/liquid/drops/managed_concept_data_drop_spec.rb'
     - 'spec/metanorma/plugin/glossarist/liquid/drops/managed_concept_drop_spec.rb'
 
 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# AllowedMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowComments.
-# SupportedStyles: empty, nil, both
-Style/EmptyElse:
-  Exclude:
-    - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/MultilineIfModifier:
-  Exclude:
-    - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
-
-# Offense count: 2
 # Configuration parameters: Max.
 Style/SafeNavigationChainLength:
   Exclude:
-    - 'lib/metanorma/plugin/glossarist/dataset_registry.rb'
     - 'lib/metanorma/plugin/glossarist/template_renderer.rb'
 
 # Offense count: 1

data/Gemfile

@@ -12,8 +12,11 @@ gem "rubocop-rspec"
 
 gemspec
 
-group :test do
-  gem "metanorma"
-  gem "metanorma-plugin-lutaml"
-  gem "metanorma-standoc"
-end
+# metanorma / metanorma-standoc / metanorma-plugin-lutaml are needed by
+# spec_helper.rb at test time, but live in the default group (not :test)
+# so the release workflow's `bundle install --without development test`
+# still installs them. Bundler otherwise fails `bundle exec rake release`
+# with GemNotFound when the resolver walks the Gemfile.
+gem "metanorma"
+gem "metanorma-plugin-lutaml"
+gem "metanorma-standoc"

data/lib/metanorma/plugin/glossarist/bibliography_renderer.rb

@@ -111,7 +111,7 @@ module Metanorma
           l10n.examples&.each { |e| parts << e.content.to_s }
           return [] if parts.empty?
 
-          Sanitize.extract_xrefs(parts.join(" "))
+          MentionExtractor.new(parts.join(" ")).bibliography_ids
         end
       end
     end

data/lib/metanorma/plugin/glossarist/concept_filter.rb

@@ -20,6 +20,7 @@ module Metanorma
         def initialize(filters)
           @filters = filters || {}
           @resolver = ConceptPathResolver.new
+          @field_filters = build_field_filters
         end
 
         # Applies all configured filters in canonical order.
@@ -38,15 +39,18 @@ module Metanorma
                                        register)
           end
           result = filter_by_tag(result) if @filters.key?("tag")
-          result = filter_by_field(result) if field_filters?
+          result = filter_by_field(result) unless @field_filters.empty?
           result = sort(result) if @filters.key?("sort_by")
           result
         end
 
         private
 
-        def field_filters?
-          (@filters.keys - COLLECTION_FILTERS).any?
+        def build_field_filters
+          field_keys = @filters.keys - COLLECTION_FILTERS
+          field_keys.map do |key|
+            FieldFilter.from_options_entry(key, @filters[key])
+          end
         end
 
         def filter_by_lang(collection)
@@ -103,33 +107,10 @@ module Metanorma
         end
 
         def filter_by_field(collection)
-          path, value, start_with = field_filter_spec
-          start_with_match_value = extract_start_with_value(path, value)
-          path, match_value = if start_with_match_value
-                                [start_with_match_value[:path],
-                                 start_with_match_value[:value]]
-                              else
-                                [path, value]
-                              end
-
           collection.select do |concept|
-            actual = @resolver.resolve(concept, path)
-            start_with ? actual&.start_with?(match_value) : actual == value
+            @field_filters.all? { |filter| filter.match?(@resolver, concept) }
           end
         end
-
-        def field_filter_spec
-          path = (@filters.keys - COLLECTION_FILTERS).first
-          start_with = path.include?(".start_with(")
-          [path, @filters[path], start_with]
-        end
-
-        def extract_start_with_value(path, _value)
-          match = path.match(/^([^.]+(?:\.[^.]+)*)\.start_with\(([^)]+)\)$/)
-          return nil unless match
-
-          { path: match[1], value: match[2] }
-        end
       end
     end
   end

data/lib/metanorma/plugin/glossarist/dataset_preprocessor.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "asciidoctor"
 require "asciidoctor/reader"
-require "glossarist"
 
 module Metanorma
   module Plugin
@@ -15,6 +13,7 @@ module Metanorma
         BLOCK_REGEX = /^\[glossarist,(.+?),(.+?)\]$/m
         BIBLIOGRAPHY_REGEX = /^glossarist::render_bibliography\[(.*?)\]$/m
         BIBLIOGRAPHY_ENTRY_REGEX = /^glossarist::render_bibliography_entry\[(.*?)\]$/m
+        NON_VERBAL_REGEX = /^glossarist::render_(figures|tables|formulas)\[(.*?)\]$/m
 
         BIB_ANCHOR_REGEX = /^\*\s*\[\[\[([^,]+)/
 
@@ -69,37 +68,51 @@ module Metanorma
         end
 
         def process_line(document, input_lines, current_line, liquid_doc)
-          if (match = current_line.match(DATASET_ATTR_REGEX))
-            process_dataset_tag(document, input_lines, liquid_doc, match)
-          elsif (match = current_line.match(RENDER_REGEX))
-            process_render_tag(liquid_doc, match)
-          elsif (match = current_line.match(IMPORT_SECTIONS_REGEX))
-            process_import_sections_tag(document, liquid_doc, match)
-          elsif (match = current_line.match(IMPORT_REGEX))
-            process_import_tag(liquid_doc, match)
-          elsif (match = current_line.match(BIBLIOGRAPHY_REGEX))
-            process_bibliography(document, liquid_doc, match)
-          elsif (match = current_line.match(BIBLIOGRAPHY_ENTRY_REGEX))
-            process_bibliography_entry(document, liquid_doc, match)
-          elsif (match = current_line.match(BLOCK_REGEX))
-            process_glossarist_block(document, liquid_doc, input_lines, match)
+          handler = directive_handler(current_line)
+          if handler
+            handler.call(document, input_lines, liquid_doc)
           else
-            if /^==+ \S/.match?(current_line)
-              @title_depth = current_line.sub(/ .*$/,
-                                              "").size
-            end
-            if (match = current_line.match(BIB_ANCHOR_REGEX))
-              @existing_bib_anchors << match[1]
-            end
-            liquid_doc.add_content(current_line)
+            handle_plain_line(current_line, liquid_doc)
+          end
+        end
+
+        # Returns a callable that handles the directive on +line+, or nil
+        # for plain content. Keeping the dispatch table small (regex →
+        # block) lets us add a new directive by appending one entry.
+        def directive_handler(line)
+          if (m = line.match(DATASET_ATTR_REGEX))
+            ->(doc, lines, ldoc) { process_dataset_tag(doc, lines, ldoc, m) }
+          elsif (m = line.match(RENDER_REGEX))
+            ->(_, _, ldoc) { process_render_tag(ldoc, m) }
+          elsif (m = line.match(IMPORT_SECTIONS_REGEX))
+            ->(doc, _, ldoc) { process_import_sections_tag(doc, ldoc, m) }
+          elsif (m = line.match(IMPORT_REGEX))
+            ->(_, _, ldoc) { process_import_tag(ldoc, m) }
+          elsif (m = line.match(BIBLIOGRAPHY_REGEX))
+            ->(doc, _, ldoc) { process_bibliography(doc, ldoc, m) }
+          elsif (m = line.match(BIBLIOGRAPHY_ENTRY_REGEX))
+            ->(doc, _, ldoc) { process_bibliography_entry(doc, ldoc, m) }
+          elsif (m = line.match(NON_VERBAL_REGEX))
+            ->(_, _, ldoc) { process_non_verbal(ldoc, m) }
+          elsif (m = line.match(BLOCK_REGEX))
+            ->(doc, lines, ldoc) { process_glossarist_block(doc, ldoc, lines, m) }
+          end
+        end
+
+        def handle_plain_line(current_line, liquid_doc)
+          if /^==+ \S/.match?(current_line)
+            @title_depth = current_line.sub(/ .*$/, "").size
+          end
+          if (match = current_line.match(BIB_ANCHOR_REGEX))
+            @existing_bib_anchors << match[1]
           end
+          liquid_doc.add_raw(current_line)
         end
 
         def process_dataset_tag(document, input_lines, liquid_doc, match)
           @seen_glossarist = true
           @registry.register(document, match[1])
-          liquid_doc.add_content(prepare_document(document, input_lines).to_s,
-                                 render: false)
+          liquid_doc.add_raw(prepare_document(document, input_lines).to_s)
         end
 
         def process_glossarist_block(document, liquid_doc, input_lines, match)
@@ -113,9 +126,11 @@ module Metanorma
             {% endwith_glossarist_context %}
           SECTION
 
-          options = { render: true }
-          options[:template] = template if template
-          liquid_doc.add_content(section, options)
+          if template
+            liquid_doc.add_rendered(section, template: template)
+          else
+            liquid_doc.add_rendered(section)
+          end
         end
 
         def prepare_glossarist_block_params(document, match)
@@ -157,8 +172,9 @@ module Metanorma
           renderer = @renderer
           rendered = renderer.render_concept(concept,
                                              depth: @title_depth,
-                                             anchor_prefix: options["anchor-prefix"])
-          liquid_doc.add_content("\n#{rendered}")
+                                             anchor_prefix: options["anchor-prefix"],
+                                             non_verbal: non_verbal_for(context_name))
+          liquid_doc.add_raw("\n#{rendered}")
         end
 
         RENDER_OPTIONS = %w[anchor-prefix].freeze
@@ -179,8 +195,9 @@ module Metanorma
           renderer = @renderer
           rendered = renderer.render_concepts(concepts,
                                               depth: @title_depth,
-                                              anchor_prefix: options["anchor-prefix"])
-          liquid_doc.add_content("\n#{rendered}")
+                                              anchor_prefix: options["anchor-prefix"],
+                                              non_verbal: non_verbal_for(context_name))
+          liquid_doc.add_raw("\n#{rendered}")
         end
 
         def process_import_sections_tag(_document, liquid_doc, match)
@@ -196,11 +213,11 @@ module Metanorma
           dataset = @registry.resolve_dataset(nil, context_name)
           return unless dataset
 
-          parts = render_sections(dataset, register, sections, options)
-          liquid_doc.add_content("\n#{parts.join("\n\n")}")
+          parts = render_sections(dataset, register, sections, context_name, options)
+          liquid_doc.add_raw("\n#{parts.join("\n\n")}")
         end
 
-        def render_sections(dataset, register, sections, options)
+        def render_sections(dataset, register, sections, context_name, options)
           section_filter = SectionFilter.new(
             exclude: (options["section_exclude"] || "").split("|"),
             include: (options["section_include"] || "").split("|"),
@@ -213,12 +230,25 @@ module Metanorma
             depth: @title_depth,
             sort_by: options["sort_by"] || SectionRenderer::DEFAULT_SORT_BY,
             anchor_prefix: options["anchor-prefix"],
+            non_verbal: non_verbal_for(context_name),
           )
           renderer.render(filtered) do |concepts|
             @rendered_concepts.concat(concepts)
           end
         end
 
+        # Builds a NonVerbalRenderer scoped to a dataset context, or
+        # returns nil if the dataset has no figures/tables/formulas. The
+        # resulting renderer is passed through to TemplateRenderer and
+        # SectionRenderer so concept-attached refs render as AsciiDoc
+        # blocks alongside the concept body.
+        def non_verbal_for(context_name)
+          collections = @registry.non_verbal_collections(context_name)
+          return nil if collections.empty?
+
+          NonVerbalRenderer.new(collections: collections)
+        end
+
         def process_bibliography(document, liquid_doc, match)
           @seen_glossarist = true
           dataset_name = match[1].strip
@@ -235,7 +265,7 @@ module Metanorma
             existing_anchors: @existing_bib_anchors,
             bibliography: @registry.bibliography_for(dataset_name),
           )
-          liquid_doc.add_content(renderer.render_all(concepts))
+          liquid_doc.add_raw(renderer.render_all(concepts))
         end
 
         def process_bibliography_entry(document, liquid_doc, match)
@@ -249,7 +279,22 @@ module Metanorma
             bibliography: @registry.bibliography_for(dataset_name),
           )
           entry = renderer.render_entry(concept)
-          liquid_doc.add_content(entry) if entry
+          liquid_doc.add_raw(entry) if entry
+        end
+
+        # Renders all dataset-level entities of a non-verbal kind
+        # (figures, tables, formulas) as AsciiDoc blocks. The directive
+        # shape is +glossarist::render_<kind>[dataset]+.
+        def process_non_verbal(liquid_doc, match)
+          @seen_glossarist = true
+          kind = :"#{match[1]}"
+          dataset_name = match[2].strip
+          collection = @registry.non_verbal_collection(dataset_name, kind)
+          return unless collection
+
+          renderer = NonVerbalRenderer.new(collections: { kind => collection })
+          rendered = renderer.render_kind(kind)
+          liquid_doc.add_raw("\n#{rendered}") unless rendered.empty?
         end
 
         def relative_file_path(document, file_path)

data/lib/metanorma/plugin/glossarist/dataset_registry.rb

@@ -1,24 +1,33 @@
 # frozen_string_literal: true
 
-require "glossarist"
-
 module Metanorma
   module Plugin
     module Glossarist
       # Resolves, caches, and exposes dataset models for a document.
       #
       # Single source of truth for everything the preprocessor needs from a
-      # glossarist dataset: concepts, section hierarchy, and bibliography.
+      # glossarist dataset: concepts, section hierarchy, bibliography, and
+      # dataset-level non-verbal entities (figures, tables, formulas).
       # Each is exposed as the typed Glossarist model object so callers
       # never poke at raw YAML hashes.
       class DatasetRegistry
         BIBLIOGRAPHY_FILENAME = "bibliography.yaml"
         REGISTER_FILENAME = "register.yaml"
 
+        # Map of plural kind symbol → (collection class, subdirectory name).
+        # Adding a new non-verbal kind = adding one entry here. The accessor
+        # `{kind}_for` and loader are derived from this table.
+        NON_VERBAL_KINDS = {
+          figures: [::Glossarist::Collections::FigureCollection, "figures"],
+          tables: [::Glossarist::Collections::TableCollection, "tables"],
+          formulas: [::Glossarist::Collections::FormulaCollection, "formulas"],
+        }.freeze
+
         def initialize
           @stores = {}
           @registers = {}
           @bibliographies = {}
+          @non_verbal = {}
           @context_paths = {}
         end
 
@@ -81,6 +90,38 @@ module Metanorma
           store_for(path).concepts
         end
 
+        # Returns the typed NonVerbalCollection for a registered context
+        # (e.g. FigureCollection), or nil if the dataset has no such
+        # subdirectory. +kind+ is one of the keys of NON_VERBAL_KINDS.
+        def non_verbal_collection(context_name, kind)
+          unless NON_VERBAL_KINDS.key?(kind)
+            raise ArgumentError, "unknown non-verbal kind: #{kind.inspect}"
+          end
+
+          path = @context_paths[context_name]
+          return nil unless path
+
+          collection_class, subdir = NON_VERBAL_KINDS.fetch(kind)
+          non_verbal_at(path, kind, subdir, collection_class)
+        end
+
+        NON_VERBAL_KINDS.each_key do |kind|
+          define_method("#{kind}_for") do |context_name|
+            non_verbal_collection(context_name, kind)
+          end
+        end
+
+        # Returns all available non-verbal collections for a context as a
+        # hash keyed by kind symbol (e.g. +{ figures: FigureCollection }+).
+        # Kinds whose subdirectory doesn't exist are omitted. Convenient
+        # for building a NonVerbalRenderer in one call.
+        def non_verbal_collections(context_name)
+          NON_VERBAL_KINDS.each_with_object({}) do |(kind, _), memo|
+            collection = non_verbal_collection(context_name, kind)
+            memo[kind] = collection if collection
+          end
+        end
+
         private
 
         def concepts_for(context_name)
@@ -108,6 +149,14 @@ module Metanorma
           end
         end
 
+        def non_verbal_at(path, kind, subdir, collection_class)
+          dir = File.join(path, subdir)
+          return nil unless File.directory?(dir)
+
+          @non_verbal[path] ||= {}
+          @non_verbal[path][kind] ||= collection_class.from_directory(dir)
+        end
+
         def relative_file_path(document, file_path)
           return file_path if File.absolute_path?(file_path)
 

data/lib/metanorma/plugin/glossarist/document.rb

@@ -10,19 +10,18 @@ module Metanorma
           @content = []
         end
 
-        def add_content(content, options = {})
-          @content << if options[:render]
-                        LiquidRendering.render(
-                          content,
-                          include_paths: [file_system,
-                                          TEMPLATES_DIR,
-                                          options[:template]].compact,
-                          patterns: LiquidRendering::DOCUMENT_PATTERNS,
-                          registry: registry,
-                        )
-                      else
-                        content
-                      end
+        def add_raw(content)
+          @content << content
+        end
+
+        def add_rendered(content, template: nil)
+          include_paths = [file_system, TEMPLATES_DIR, template].compact
+          @content << LiquidRendering.render(
+            content,
+            include_paths: include_paths,
+            patterns: LiquidRendering::DOCUMENT_PATTERNS,
+            registry: registry,
+          )
         end
 
         def to_s