glossarist 2.8.15 → 2.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2265855682bc867f2ea15fc26c9a2329cf651cb8b34b71634aed79de302565db
-  data.tar.gz: a9b2a8c2df61b61bc9587834448c001286688462eeaa673d48a40afca992abf0
+  metadata.gz: 3dff1f025f20e6cfad5028acb99816984ddef4cd4a231991345a633c42ae5794
+  data.tar.gz: 7eed6c0df552c7206225460f212500fac6e4c7f3bc47d04bf75bb11acd53af7d
 SHA512:
-  metadata.gz: 3544b511f83935f75a5ee1e0535f3c2333b914a792fb5c2fe15744f7d5f631d55a8a501a84a4614acf53f676d760e164acd29ed788d85c5b31f8628fc0f4b46c
-  data.tar.gz: 7ca97c724f07c1abaab2198a2f6710e8d477d24a13b933896e928eb0d7be2d24b3644062b46a342642a683f646cc990cc3136564d5bbd30093545e62527f9114
+  metadata.gz: 01bda07bdfcff32b5526b33e19bd38074f0eeeab585bdf739593c95f9edacdd85cff549ce7430b53a027b18b1cd011a99a33454f71fdb2163c57be6bb1a1affb
+  data.tar.gz: f9e036c52fa7fa63dab55c8623bd47bc46af544d1fa3660368c8f41ef9c9155373ca92ac91116c8f8d7ff18b1ca9e093fde4f6e25ce0ca7b8194c9724b2df75d

data/CLAUDE.md

@@ -71,6 +71,31 @@ Designation inheritance hierarchy (MECE):
 - Supports both camelCase and snake_case keys in YAML (e.g., `localizedConcepts` / `localized_concepts`) using `%i[key1 key2]` mapping syntax.
 - Also supports V1 format (`concept-*.yaml` files at root level).
 
+### V3 Dataset Syntax (collection files are single-key mappings)
+
+A dataset collection file — `bibliography.yaml`, `images.yaml`, and any future
+equivalent — is the *V3 glossarist dataset syntax*: a YAML **mapping with a
+single wrapper key** whose value is an **array of typed items**. No keyed maps
+(indexing items by an out-of-band reference string), and no stray top-level
+arrays — the array is always grouped under one named key. Each item carries its
+own `id` field. (A keyed bibliography was tried and rejected as wrong — a
+bibliography is an ordered collection, not a map, and keying forced the entry to
+degenerate into `citation_key` + an untyped `data` hash. A bare top-level array
+was also rejected — the user does not want stray arrays at the document root.)
+
+Canonical models: `BibliographyData` + typed `BibliographyEntry`;
+`V3::ImageFile` + `V3::ImageEntry`. `bibliography.yaml` wraps its entries under a
+single `bibliography:` key. Because the root is a mapping, one `key_value` map
+(`map "bibliography", to: :entries`) drives both the file (`to_yaml`/`from_yaml`)
+and the in-memory store (`to_hash`/`from_hash`) — no overrides, no nested
+Collection, no `YAML.safe_load`. `BibliographyData#shortname` is the
+PackageStore record key only — never serialized. Documentation lives in
+`README.adoc` (`== Bibliography`); this note is internal guidance, not user docs.
+
+The remaining `map nil` keyed patterns live only in the **V1 legacy adapters**
+(`v1/register.rb`, `v1/concept.rb`), which are intentional passthroughs for old
+IEV-format datasets — do not "fix" them; that would break reading V1 data.
+
 ### Configuration & Extensibility
 
 - **`Config`** (`config.rb`) — singleton that holds registered classes for `:localized_concept` and `:managed_concept`. Allows swapping implementations via `register_class`.

data/README.adoc

@@ -911,23 +911,35 @@ result.diffs            # Array of ConceptDiff with similarity scores
 
 === NonVerbRep
 
-Non-verbal representations are associated resources (images, tables, formulas) used to help define a concept (ISO 10241-1 §6.5). They live outside the concept model and are referenced by URI. Resources can be shared across concepts and belong either to the dataset package (relative path) or are externally referenced (URL/URN).
+Non-verbal representations are associated resources (images, tables, formulas) used to help define a concept (ISO 10241-1 §6.5). NonVerbRep is the concept-local form — attached directly to a concept's data; the dataset-shared form is xref:figure[Figure] / Table / Formula. Both share the same accessibility payload via `NonVerbalEntity`.
 
-type:: String — the type of representation: `image`, `table`, or `formula`.
-ref:: String — URI reference to the resource (relative path within the GCR package, URN, or URL).
-text:: String — optional text description or alt text.
+type:: String — the kind of representation: `image`, `table`, or `formula`.
+images:: Collection of `FigureImage` variants (responsive, format fallbacks, dark/light). Used when `type: image`.
+caption:: Localized hash — short title keyed by ISO 639 code (e.g. `{ eng: "..." }`).
+description:: Localized hash — long description for accessibility.
+alt:: Localized hash — short alternative text for screen readers.
 sources:: Collection of <<concept-source,ConceptSource>> entries — bibliographic sources for the representation.
 
 Example:
 +
 [,yaml]
 ----
-non_verbal_rep:
+non_verb_rep:
   - type: image
-    ref: assets/images/figure-1.svg
-    text: Diagram showing the concept hierarchy
+    images:
+      - src: assets/images/figure-1.svg
+        format: svg
+        role: vector
+      - src: assets/images/figure-1.png
+        format: png
+        role: raster
+    caption:
+      eng: Concept hierarchy
+    alt:
+      eng: Diagram showing the concept hierarchy
   - type: formula
-    ref: urn:gcr:assets:formula-eq1
+    images:
+      - src: urn:gcr:assets:formula-eq1
     sources:
       - type: authoritative
         status: identical
@@ -996,6 +1008,48 @@ register.concept_section_ids(concept)  # => ["3.1", "3"]
 When a concept has no explicit `domains[]` entry with `ref_type: section`, section membership is derived from the concept's identifier using the longest registered section prefix (e.g. `103-01-01` → section `103`).
 
 
+[[bibliography,Bibliography]]
+== Bibliography
+
+A dataset directory may contain a `bibliography.yaml` — the dataset's bibliography, an ordered collection of the bibliographic references cited by its concepts. It is a YAML *mapping with a single key*, `bibliography`, whose value is an array of typed entries. This is the **V3 glossarist dataset syntax** for a collection file: a typed list grouped under one wrapper key, never a keyed map and never a stray top-level array. Each entry carries its own `id` — the identifier is a field on the item, not an out-of-band hash key.
+
+[,yaml]
+----
+bibliography:
+- id: ref_1
+  reference: ISO 704
+  title: Terminology work — Principles and methods
+- id: ref_23
+  reference: UNECE TRANS/WP29/1045
+  title: Common definitions of vehicle categories, masses and dimensions
+  link: https://www.unece.org/fileadmin/DAM/trans/doc/2005/wp29/TRANS-WP29-1045e.pdf
+- id: iso_std_iso_15704_en
+  reference: ISO 15704
+----
+
+`BibliographyEntry` fields:
+
+[cols="1,4"]
+|===
+|Field |Description
+
+|`id` |Entry identifier, dataset-unique. Cited from concept sources and inline `{{cite:...}}` mentions.
+|`reference` |Publication reference string (e.g. `ISO 704`, `IEC 60050`).
+|`title` |Title of the referenced document.
+|`link` |Optional URL to the referenced document.
+|`type` |Optional document type (e.g. `standard`).
+|===
+
+[,ruby]
+----
+bib = Glossarist::BibliographyData.from_file("path/to/bibliography.yaml")
+bib.entries            # => [#<BibliographyEntry id: "ref_1", ...>, ...]
+bib.find("ref_1")      # => #<BibliographyEntry ...>
+bib.keys               # => ["ref_1", "ref_23", ...]
+----
+
+The same single-key convention applies to every dataset collection file (`images.yaml`, and any future equivalent): the collection is an array of typed items grouped under one wrapper key.
+
 == Commands
 
 === generate_latex

data/lib/glossarist/bibliography_data.rb

@@ -1,41 +1,49 @@
 # frozen_string_literal: true
 
 module Glossarist
+  # The bibliography of a dataset, persisted as bibliography.yaml.
+  #
+  # The file is the *V3 glossarist dataset syntax* for a collection: a YAML
+  # mapping with a single key, +bibliography+, whose value is an array of typed
+  # BibliographyEntry items. A bibliography is an ordered collection of
+  # references, not a keyed map, so each item carries its own +id+ field rather
+  # than being indexed by an out-of-band reference string. The single wrapper
+  # key keeps the document root a mapping (no stray top-level array).
+  #
+  # Because the root is a mapping, a single +key_value+ mapping drives both the
+  # file (#to_yaml / .from_yaml) and the in-memory store (#to_hash /
+  # .from_hash) — no special-case serialization.
+  #
+  # +shortname+ is internal bookkeeping only: lutaml-store's PackageStore needs
+  # a key field to store the bibliography as a single record. It is never
+  # serialized — only the +bibliography+ key appears in the file.
   class BibliographyData < Lutaml::Model::Serializable
     attribute :shortname, :string, default: -> { "bibliography" }
     attribute :entries, BibliographyEntry, collection: true,
                                            initialize_empty: true
 
     key_value do
-      map nil, to: :entries,
-               with: { from: :entries_from_hash, to: :entries_to_hash }
+      map "bibliography", to: :entries
     end
 
-    def find(citation_key)
-      entries.find { |e| e.citation_key == citation_key }
-    end
+    class << self
+      def from_file(path)
+        return nil unless File.exist?(path)
 
-    def keys
-      entries.map(&:citation_key)
+        from_yaml(File.read(path, encoding: "utf-8"))
+      end
     end
 
-    def [](citation_key)
-      entry = find(citation_key)
-      entry&.data
+    def find(id)
+      entries.find { |e| e.id == id.to_s }
     end
 
-    def entries_from_hash(model, value)
-      return unless value.is_a?(Hash)
-
-      model.entries = value.map do |key, data|
-        BibliographyEntry.new(citation_key: key, data: data || {})
-      end
+    def keys
+      entries.map(&:id)
     end
 
-    def entries_to_hash(model, doc)
-      model.entries.each do |entry|
-        doc[entry.citation_key] = entry.data
-      end
+    def [](id)
+      find(id)
     end
   end
 end

data/lib/glossarist/bibliography_entry.rb

@@ -1,13 +1,24 @@
 # frozen_string_literal: true
 
 module Glossarist
+  # A single bibliographic item in a dataset's bibliography.
+  #
+  # A bibliography is an ordered collection of references, so bibliography.yaml
+  # is a YAML sequence (array) of these typed entries. The entry's identifier is
+  # the +id+ field on each item — never an out-of-band hash key.
   class BibliographyEntry < Lutaml::Model::Serializable
-    attribute :citation_key, :string
-    attribute :data, :hash, default: -> { {} }
+    attribute :id, :string
+    attribute :reference, :string
+    attribute :title, :string
+    attribute :link, :string
+    attribute :type, :string
 
     key_value do
-      map "citation_key", to: :citation_key
-      map "data", to: :data
+      map :id, to: :id
+      map :reference, to: :reference
+      map :title, to: :title
+      map :link, to: :link
+      map :type, to: :type
     end
   end
 end

data/lib/glossarist/figure.rb

@@ -13,25 +13,15 @@ module Glossarist
   # subfigures.
   #
   # Caption, description, and alt are localized (hash keyed by ISO 639 code).
-  class Figure < NonVerbalEntity
+  class Figure < SharedNonVerbalEntity
     attribute :images, FigureImage, collection: true
     attribute :subfigures, Figure, collection: true
 
     key_value do
-      map :id, to: :id
-      map :identifier, to: :identifier
-      map :caption, to: :caption
-      map :description, to: :description
-      map :alt, to: :alt
       map :images, to: :images
-      map :sources, to: :sources
       map :subfigures, to: :subfigures
     end
 
-    # Recursively search for a subfigure (or self) by ID.
-    #
-    # @param target_id [String] the figure or subfigure ID
-    # @return [Figure, nil]
     def find_by_id(target_id)
       return self if id == target_id
 
@@ -42,9 +32,6 @@ module Glossarist
       nil
     end
 
-    # Collect this figure's ID and all descendant subfigure IDs.
-    #
-    # @return [Array<String>]
     def all_ids
       [id] + Array(subfigures).flat_map(&:all_ids)
     end

data/lib/glossarist/formula.rb

@@ -7,19 +7,13 @@ module Glossarist
   # shared across concepts. The mathematical expression is stored in a
   # notation format (LaTeX, MathML, AsciiMath). Caption, description, and
   # alt are localized for accessibility.
-  class Formula < NonVerbalEntity
+  class Formula < SharedNonVerbalEntity
     attribute :expression, :hash
     attribute :notation, :string
 
     key_value do
-      map :id, to: :id
-      map :identifier, to: :identifier
-      map :caption, to: :caption
-      map :description, to: :description
-      map :alt, to: :alt
       map :expression, to: :expression
       map :notation, to: :notation
-      map :sources, to: :sources
     end
   end
 end

data/lib/glossarist/non_verb_rep.rb

@@ -1,36 +1,26 @@
 # frozen_string_literal: true
 
 module Glossarist
-  # A non-verbal representation used to help define a concept, following
-  # ISO 10241-1 §6.5.
+  # A concept-local non-verbal representation (ISO 10241-1 §6.5).
   #
-  # Non-verbal representations are associated resources (images, tables,
-  # formulas) that live outside the concept model. They are referenced by URI
-  # and can be shared across concepts. The resource belongs either to the
-  # dataset package (relative path) or is externally referenced (URL/URN).
+  # NonVerbRep is the inline form attached directly to a concept's data.
+  # The dataset-shared form is Figure / Table / Formula. The two share the
+  # same a11y + provenance payload via NonVerbalEntity; NonVerbRep differs
+  # only in that it has no dataset-wide identity (no +id+, no +identifier+)
+  # — its identity is its position inside the parent concept.
   #
-  # Each non-verbal representation specifies:
-  # - +type+: one of "image", "table", "formula"
-  # - +ref+: URI reference to the resource (relative path, URN, or URL)
-  # - +text+: optional text description or alt text
-  # - +caption+: localized title/caption (accessibility)
-  # - +description+: localized long description (accessibility)
-  # - +sources+: bibliographic sources for the representation
-  class NonVerbRep < Lutaml::Model::Serializable
+  # +type+ discriminates the kind of non-verbal content: "image", "table",
+  # or "formula". When +type+ is "image", +images+ carries one or more
+  # FigureImage variants (responsive, format fallback, dark/light). The
+  # caption/description/alt fields are localized (hash keyed by ISO 639
+  # code) for accessibility.
+  class NonVerbRep < NonVerbalEntity
     attribute :type, :string
-    attribute :ref, :string
-    attribute :text, :string
-    attribute :caption, :hash
-    attribute :description, :hash
-    attribute :sources, ConceptSource, collection: true
+    attribute :images, FigureImage, collection: true, initialize_empty: true
 
     key_value do
       map :type, to: :type
-      map :ref, to: :ref
-      map :text, to: :text
-      map :caption, to: :caption
-      map :description, to: :description
-      map :sources, to: :sources
+      map :images, to: :images
     end
   end
 end

data/lib/glossarist/non_verbal_entity.rb

@@ -1,47 +1,39 @@
 # frozen_string_literal: true
 
 module Glossarist
-  # Abstract base for dataset-level non-verbal representation entities.
+  # Shared payload for every non-verbal representation, whether it lives
+  # inline on a concept (NonVerbRep) or as a dataset-shared file
+  # (Figure / Table / Formula).
   #
-  # Figures, Tables, and Formulas share common metadata: stable identity,
-  # localized caption/description (accessibility), and provenance sources.
-  # Each is authored once at the dataset level and referenced by any number
-  # of concepts — the same pattern as bibliography entries.
+  # The four attributes here are the common a11y + provenance payload every
+  # non-verbal entity carries, regardless of content type or scope:
   #
-  # This is the dataset-level counterpart to NonVerbRep (ISO 10241-1 §6.5),
-  # which remains the concept-owned inline form.
+  # - +caption+: localized short title (a11y / indexing).
+  # - +description+: localized long description (a11y screen readers).
+  # - +alt+: localized alternative text (a11y short screen-reader label).
+  # - +sources+: bibliographic sources for the representation.
   #
-  # Subclasses (Figure, Table, Formula) add type-specific content fields.
+  # Identity (+id+, +identifier+) belongs on subclasses that have it; see
+  # SharedNonVerbalEntity for the dataset-shared variant.
   class NonVerbalEntity < Lutaml::Model::Serializable
-    attribute :id, :string
-    attribute :identifier, :string
     attribute :caption, :hash
     attribute :description, :hash
     attribute :alt, :hash
     attribute :sources, ConceptSource, collection: true
 
     key_value do
-      map :id, to: :id
-      map :identifier, to: :identifier
       map :caption, to: :caption
       map :description, to: :description
       map :alt, to: :alt
       map :sources, to: :sources
     end
 
-    # Find self by ID. Figure overrides for recursive subfigure search.
-    #
-    # @param target_id [String]
-    # @return [NonVerbalEntity, nil]
-    def find_by_id(target_id)
-      id == target_id ? self : nil
+    def find_by_id(_target_id)
+      nil
     end
 
-    # This entity's IDs. Figure overrides to include subfigure IDs.
-    #
-    # @return [Array<String>]
     def all_ids
-      [id]
+      []
     end
 
     def self.from_file(path)

data/lib/glossarist/reference_extractor.rb

@@ -170,9 +170,14 @@ module Glossarist
 
       concept.localizations.each do |l10n|
         Array(l10n.non_verb_rep).each do |nvr|
-          next unless nvr.is_a?(NonVerbRep) && nvr.ref && !nvr.ref.strip.empty?
+          next unless nvr.is_a?(NonVerbRep)
 
-          refs << AssetReference.new(path: nvr.ref.strip)
+          Array(nvr.images).each do |image|
+            next unless image.is_a?(FigureImage)
+            next if image.src.nil? || image.src.strip.empty?
+
+            refs << AssetReference.new(path: image.src.strip)
+          end
         end
 
         (l10n.data&.terms || []).each do |term|

data/lib/glossarist/shared_non_verbal_entity.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Glossarist
+  # Dataset-shared non-verbal entity — a NonVerbalEntity with a stable
+  # identity. Figure, Table, and Formula inherit from this; NonVerbRep
+  # (concept-local, positional) inherits from NonVerbalEntity directly.
+  #
+  # The +id+ is the stable identifier used for cross-referencing
+  # (e.g. +figures/fig_A.23.yaml+ → +id: fig_A.23+). The +identifier+ is
+  # the human-readable label (e.g. +"A.23"+) used for display and AsciiDoc
+  # xref targets like +<<fig_A.23>>+.
+  class SharedNonVerbalEntity < NonVerbalEntity
+    attribute :id, :string
+    attribute :identifier, :string
+
+    key_value do
+      map :id, to: :id
+      map :identifier, to: :identifier
+    end
+
+    def find_by_id(target_id)
+      id == target_id ? self : nil
+    end
+
+    def all_ids
+      [id].compact
+    end
+  end
+end

data/lib/glossarist/table.rb

@@ -7,19 +7,13 @@ module Glossarist
   # across concepts. The content is stored as structured data (rows/columns)
   # or as a markup string (HTML, Markdown, AsciiDoc). Caption, description,
   # and alt are localized for accessibility.
-  class Table < NonVerbalEntity
+  class Table < SharedNonVerbalEntity
     attribute :content, :hash
     attribute :format, :string
 
     key_value do
-      map :id, to: :id
-      map :identifier, to: :identifier
-      map :caption, to: :caption
-      map :description, to: :description
-      map :alt, to: :alt
       map :content, to: :content
       map :format, to: :format
-      map :sources, to: :sources
     end
   end
 end

data/lib/glossarist/transforms/concept_to_gloss_transform.rb

@@ -303,8 +303,8 @@ desig_index)
         Array(non_verb_reps).each_with_index.map do |nvr, idx|
           Rdf::GlossNonVerbalRep.new(
             representation_type: nvr.type,
-            representation_ref: nvr.ref,
-            representation_text: nvr.text,
+            representation_ref: nvr.images.first&.src,
+            representation_text: localized_alt_for(nvr.alt, lang),
             sources: build_gloss_sources(nvr.sources),
             concept_id: concept_id.to_s,
             lang_code: lang.to_s,
@@ -313,6 +313,12 @@ desig_index)
         end
       end
 
+      def localized_alt_for(alt, lang)
+        return nil unless alt.is_a?(Hash) && !alt.empty?
+
+        alt[lang.to_s] || alt[lang.to_sym] || alt.values.first
+      end
+
       def build_gloss_domains(domains, concept_id)
         Array(domains).map do |ref|
           Rdf::GlossConceptReference.new(

data/lib/glossarist/v3.rb

@@ -13,10 +13,6 @@ module Glossarist
     autoload :ManagedConceptData, "glossarist/v3/managed_concept_data"
     autoload :ManagedConcept, "glossarist/v3/managed_concept"
     autoload :ConceptDocument, "glossarist/v3/concept_document"
-    autoload :BibliographyEntry, "glossarist/v3/bibliography_entry"
-    autoload :BibliographyFile, "glossarist/v3/bibliography_file"
-    autoload :ImageEntry, "glossarist/v3/image_entry"
-    autoload :ImageFile, "glossarist/v3/image_file"
 
     Configuration.register_model(Citation, id: :citation)
     Configuration.register_model(ConceptSource, id: :concept_source)
@@ -28,9 +24,5 @@ module Glossarist
     Configuration.register_model(ManagedConceptData, id: :managed_concept_data)
     Configuration.register_model(ManagedConcept, id: :managed_concept)
     Configuration.register_model(ConceptDocument, id: :concept_document)
-    Configuration.register_model(BibliographyEntry, id: :bibliography_entry)
-    Configuration.register_model(BibliographyFile, id: :bibliography_file)
-    Configuration.register_model(ImageEntry, id: :image_entry)
-    Configuration.register_model(ImageFile, id: :image_file)
   end
 end

data/lib/glossarist/validation/asset_index.rb

@@ -95,9 +95,14 @@ module Glossarist
 
         def register_non_verb_rep(index, l10n)
           Array(l10n.non_verb_rep).each do |nvr|
-            next unless nvr.is_a?(NonVerbRep) && nvr.ref && !nvr.ref.strip.empty?
+            next unless nvr.is_a?(NonVerbRep)
 
-            index.register(nvr.ref.strip)
+            Array(nvr.images).each do |image|
+              next unless image.is_a?(FigureImage)
+              next if image.src.nil? || image.src.strip.empty?
+
+              index.register(image.src.strip)
+            end
           end
         end
 

data/lib/glossarist/validation/bibliography_index.rb

@@ -30,18 +30,15 @@ module Glossarist
 
         concepts.each { |concept| index_concept_sources(index, concept) }
         index_bibliography_file(index, dataset_path)
-        index_images_file(index, dataset_path)
 
         index
       end
 
-      def self.build_from_yaml(concepts, bibliography_yaml: nil,
-images_yaml: nil)
+      def self.build_from_yaml(concepts, bibliography_yaml: nil)
         index = new
 
         concepts.each { |concept| index_concept_sources(index, concept) }
         index_bib_from_yaml_string(index, bibliography_yaml)
-        index_images_from_yaml_string(index, images_yaml)
 
         index
       end
@@ -103,7 +100,7 @@ images_yaml: nil)
         def index_bibliography_file(index, dataset_path)
           return unless dataset_path
 
-          bib = V3::BibliographyFile.from_file(
+          bib = BibliographyData.from_file(
             File.join(dataset_path, "bibliography.yaml"),
           )
           return unless bib
@@ -118,27 +115,10 @@ images_yaml: nil)
           nil
         end
 
-        def index_images_file(index, dataset_path)
-          return unless dataset_path
-
-          images = V3::ImageFile.from_file(
-            File.join(dataset_path, "images.yaml"),
-          )
-          return unless images
-
-          Array(images.entries).each do |entry|
-            next unless entry&.id
-
-            index.register(entry.id, entry)
-          end
-        rescue StandardError
-          nil
-        end
-
         def index_bib_from_yaml_string(index, yaml_content)
           return unless yaml_content
 
-          bib = V3::BibliographyFile.from_yaml(yaml_content)
+          bib = BibliographyData.from_yaml(yaml_content)
           bib.entries.each do |entry|
             index.register(entry.id, entry)
             index.register(entry.reference, entry) if entry.reference
@@ -146,15 +126,6 @@ images_yaml: nil)
         rescue StandardError
           nil
         end
-
-        def index_images_from_yaml_string(index, yaml_content)
-          return unless yaml_content
-
-          images = V3::ImageFile.from_yaml(yaml_content)
-          images.entries.each { |entry| index.register(entry.id, entry) }
-        rescue StandardError
-          nil
-        end
       end
     end
   end

data/lib/glossarist/validation/rules/bibliography_yaml_rule.rb

@@ -18,7 +18,7 @@ module Glossarist
           return [] unless bib_content
 
           begin
-            V3::BibliographyFile.from_yaml(bib_content)
+            BibliographyData.from_yaml(bib_content)
           rescue StandardError => e
             return [issue(
               "bibliography.yaml is invalid YAML: #{e.message}",

data/lib/glossarist/validation/rules/gcr_context.rb

@@ -43,7 +43,6 @@ module Glossarist
           @bibliography_index ||= BibliographyIndex.build_from_yaml(
             concepts,
             bibliography_yaml: read_zip_file("bibliography.yaml"),
-            images_yaml: read_zip_file("images.yaml"),
           )
         end
 

data/lib/glossarist/validation/rules/orphaned_images_rule.rb

@@ -23,9 +23,7 @@ module Glossarist
                 next unless text
 
                 extractor.extract_from_text(text).each do |ref|
-                  if ref.is_a?(AssetReference)
-                    referenced_paths.add(ref.path)
-                  end
+                  referenced_paths.add(ref.path) if ref.is_a?(AssetReference)
                 end
               end
             end
@@ -35,16 +33,6 @@ module Glossarist
             end
           end
 
-          images_file = load_images_file(context)
-          if images_file
-            context.bibliography_index.entries.each_value do |entry|
-              next unless entry[:source].is_a?(V3::ImageEntry)
-
-              path = entry[:source].path
-              referenced_paths.add(path) if path
-            end
-          end
-
           issues = []
           context.asset_index.each_path do |path|
             next if referenced_paths.include?(path)
@@ -59,16 +47,6 @@ module Glossarist
 
           issues
         end
-
-        private
-
-        def load_images_file(context)
-          return @load_images_file if defined?(@load_images_file)
-
-          @load_images_file = V3::ImageFile.from_file(
-            File.join(context.path, "images.yaml"),
-          )
-        end
       end
     end
   end

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.8.15"
+  VERSION = "2.8.16"
 end

data/lib/glossarist.rb

@@ -40,6 +40,7 @@ module Glossarist
   autoload :Config,                   "glossarist/config"
   autoload :LocalizedString,          "glossarist/localized_string"
   autoload :NonVerbalEntity,          "glossarist/non_verbal_entity"
+  autoload :SharedNonVerbalEntity,    "glossarist/shared_non_verbal_entity"
   autoload :NonVerbalReference,       "glossarist/non_verbal_reference"
   autoload :Figure,                   "glossarist/figure"
   autoload :FigureImage,              "glossarist/figure_image"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.8.15
+  version: 2.8.16
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-17 00:00:00.000000000 Z
+date: 2026-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -302,6 +302,7 @@ files:
 - lib/glossarist/schema_migration/v0_to_v1.rb
 - lib/glossarist/schema_migration/v2_to_v3.rb
 - lib/glossarist/section.rb
+- lib/glossarist/shared_non_verbal_entity.rb
 - lib/glossarist/sts.rb
 - lib/glossarist/sts/extracted_designation.rb
 - lib/glossarist/sts/extracted_lang_set.rb
@@ -336,8 +337,6 @@ files:
 - lib/glossarist/v2/managed_concept_data.rb
 - lib/glossarist/v2/related_concept.rb
 - lib/glossarist/v3.rb
-- lib/glossarist/v3/bibliography_entry.rb
-- lib/glossarist/v3/bibliography_file.rb
 - lib/glossarist/v3/citation.rb
 - lib/glossarist/v3/concept_data.rb
 - lib/glossarist/v3/concept_document.rb
@@ -345,8 +344,6 @@ files:
 - lib/glossarist/v3/concept_source.rb
 - lib/glossarist/v3/configuration.rb
 - lib/glossarist/v3/detailed_definition.rb
-- lib/glossarist/v3/image_entry.rb
-- lib/glossarist/v3/image_file.rb
 - lib/glossarist/v3/localized_concept.rb
 - lib/glossarist/v3/managed_concept.rb
 - lib/glossarist/v3/managed_concept_data.rb

data/lib/glossarist/v3/bibliography_entry.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Glossarist
-  module V3
-    class BibliographyEntry < Lutaml::Model::Serializable
-      attribute :id, :string
-      attribute :reference, :string
-      attribute :title, :string
-      attribute :link, :string
-
-      key_value do
-        map :id, to: :id
-        map :reference, to: :reference
-        map :title, to: :title
-        map :link, to: :link
-      end
-    end
-  end
-end

data/lib/glossarist/v3/bibliography_file.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Glossarist
-  module V3
-    class BibliographyFile < Lutaml::Model::Collection
-      instances :entries, BibliographyEntry
-
-      key_value do
-        map_instances to: :entries
-      end
-
-      def self.from_file(path)
-        return nil unless File.exist?(path)
-
-        from_yaml(File.read(path))
-      end
-
-      def resolve?(anchor)
-        entries.any? { |e| e.id == anchor.to_s }
-      end
-
-      def [](key)
-        entries.find { |e| e.id == key.to_s }
-      end
-    end
-  end
-end

data/lib/glossarist/v3/image_entry.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Glossarist
-  module V3
-    class ImageEntry < Lutaml::Model::Serializable
-      attribute :id, :string
-      attribute :path, :string
-      attribute :type, :string, default: -> { "image" }
-      attribute :title, :string
-      attribute :alt, :string
-
-      key_value do
-        map :id, to: :id
-        map :path, to: :path
-        map :type, to: :type
-        map :title, to: :title
-        map :alt, to: :alt
-      end
-    end
-  end
-end

data/lib/glossarist/v3/image_file.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Glossarist
-  module V3
-    class ImageFile < Lutaml::Model::Collection
-      instances :entries, ImageEntry
-
-      key_value do
-        map_instances to: :entries
-      end
-
-      def self.from_file(path)
-        return nil unless File.exist?(path)
-
-        from_yaml(File.read(path))
-      end
-
-      def path_for_anchor(anchor)
-        entries.find { |e| e.id == anchor.to_s }&.path
-      end
-
-      def anchor_for_path(path)
-        entries.find { |e| e.path == path }&.id
-      end
-
-      def path?(path)
-        entries.any? { |e| e.path == path }
-      end
-    end
-  end
-end