metanorma-plugin-lutaml 0.7.55.pre.alpha.1 → 0.7.55.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08e2206e64a9c020c1059501939d9a44cfa5e0412368b84e9702442ed38e5ca
-  data.tar.gz: 3d1bc9fbb60c1a750ab70d2ffcd98e61257e4a7d21f44886cb485456b56af81c
+  metadata.gz: 4df1a140d2fef0dd3a780ac070ab6f6a3906191da12c6d72b30883ad0217bf25
+  data.tar.gz: ad4569a0ce6ae86577978e7358de9e98c1955227755efa699a7182aca38ab428
 SHA512:
-  metadata.gz: 8777cde7a2a1379e9cabb417192d3bc026786cb04739e10578c2eede1764bdffe2b113be22837f376957c7ba6525ba831fd78192c1c381fc5c70a0ec0151d661
-  data.tar.gz: 6ac5da62726d19874eceeb0c39710ad034e890e78402f41f516d1f00b5954aed441b9176ec403c97cd228d7537e6e8e3cd710495e2bee3c2927ae598d39d84a1
+  metadata.gz: 31f6b4b4a670f661412cedc5cdb5538b074054f6618a35e06bfa15080af2dedba5075b237f163e4ba63e8ab99d95b92dc1ed8b99c35111a8abf588616fa62c37
+  data.tar.gz: 3edd282734af0e5b2d3f6e74daa6e5b9a310e51b022baca413ab00aac448a186a76d22ffb8e5924bacdf0c9c4aaf08b50ce877e2f63a22f83c3d536b68219258

data/Gemfile

@@ -37,9 +37,6 @@ gem "leptris", "~> 1.9.361.1"
 gem "isodoc", github: "metanorma/isodoc", branch: "main"
 gem "metanorma-standoc", github: "metanorma/metanorma-standoc", branch: "main"
 gem "suma", github: "metanorma/suma", branch: "main"
-# standoc main's block_attributes reference
-# Metanorma::Document::Components::AncillaryBlocks::SvgmapElement, which
-# the released metanorma-document 0.5.1 predates; ref-pinned to the
-# document main tree the suite is green against
-gem "metanorma-document", github: "metanorma/metanorma-document",
-                          ref: "ca4eb4b26f7ab0d2994a4710d0cf158607a832b4"
+# standoc main (>= 3.5.1.pre.alpha.2) floors metanorma-document at
+# 0.5.2.pre.alpha.1 (SvgmapElement, metanorma-standoc#1303); main carries it
+gem "metanorma-document", github: "metanorma/metanorma-document", branch: "main"

data/Rakefile

@@ -10,6 +10,7 @@ XMI_HEAVY_SPEC_FILES = %w[
 ].freeze
 
 XMI_SPEC_FILES = %w[
+  spec/metanorma/plugin/lutaml/lutaml_ea_uml_preprocessor_spec.rb
   spec/metanorma/plugin/lutaml/lutaml_klass_table_block_macro_spec.rb
   spec/metanorma/plugin/lutaml/lutaml_enum_table_block_macro_spec.rb
   spec/metanorma/plugin/lutaml/lutaml_xmi_index_spec.rb

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "expressir"
+require "pathname"
 
 module Metanorma
   module Plugin
@@ -16,7 +17,17 @@ module Metanorma
           )
           resolved = document.path_resolver
             .system_path(file_path, docfile_directory)
-          File.expand_path(resolved, docfile_directory)
+          # The prefix lands inside emitted image macros, so it must not
+          # carry the absolute build path: two builds of the same tree in
+          # two directories produced different image/@src values
+          # (metanorma/metanorma-plugin-lutaml#325). A path relative to the
+          # docfile resolves to the same schema file at render time and is
+          # byte-identical across build directories.
+          # The docfile directory may be relative ("."): relative_path_from
+          # refuses mixed prefixes, so both sides expand first
+          Pathname.new(File.expand_path(resolved))
+            .relative_path_from(Pathname.new(File.expand_path(docfile_directory)))
+            .to_s
         end
 
         def self.for(model)
@@ -47,6 +58,7 @@ module Metanorma
           end
 
           def decorate_remarks(options)
+            promote_schema_prose
             decorate_own_remarks(options)
             decorate_child_remark_items(options)
             traverse_children(options)
@@ -54,7 +66,29 @@ module Metanorma
 
           private
 
+          # A bare (*"Schema_name" ...*) remark is the schema-level prose:
+          # expressir models it in Schema#remarks, not as a RemarkItem, so
+          # renders that walk remark_items (every clause-4 template) drop
+          # it (iso-10303#720). Promote it to a leading RemarkItem keyed
+          # by the schema path, the same way an entity-tagged remark names
+          # its target. The prose stays in Schema#remarks too; templates
+          # that already render it there keep working unchanged.
+          def promote_schema_prose
+            return unless @model.is_a?(Expressir::Model::Declarations::Schema)
+            return if @model.remarks.to_a.empty?
+
+            items = @model.remark_items.to_a
+            return if items.any? { |ri| ri.id == @model.id }
+
+            prose = Expressir::Model::Declarations::RemarkItem.new(
+              id: @model.id,
+              remarks: @model.remarks.dup,
+            )
+            @model.remark_items = [prose] + items
+          end
+
           def decorate_own_remarks(options)
+
             @model.remarks = ExpressRemarksDecorator.decorate_array(
               @model.remarks, options
             )

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.7.55.pre.alpha.1".freeze
+      VERSION = "0.7.55.pre.alpha.2".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.7.55.pre.alpha.1
+  version: 0.7.55.pre.alpha.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-22 00:00:00.000000000 Z
+date: 2026-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor