metanorma-plugin-lutaml 0.7.56 → 0.7.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '082818d3c08e139aaf8f7e51fbc3187bdff832c7ff79020ca3a8057e497c0f0e'
-  data.tar.gz: 8524c16a1c751a3a9b03b9e9e0e77ce9040ccd455d6c7cb4c9bd2ae862b5b1c5
+  metadata.gz: eb9c176145db89f41f691658a755ce2f94cd8a1f1f302dd328deb4ec0286c5b0
+  data.tar.gz: '0309da4d8a37de8b907e77b7ab46b27f7e6d67269a1dc9ce37fb2150b9f887d6'
 SHA512:
-  metadata.gz: 96178a219154034173db6621b51a70821c7c97ca0826db593d8bd9aa38a417156460601db83319f9ee4994451eb16575ab2a1f58befc72fbbf4f6b1bf70809c3
-  data.tar.gz: c61b1123f75491be102bc38c90f1f361c169a8cdf3227cc7ee0f87e236119efc506d1145e30ac891be37641e15ca1b7a1be401b97d6dd47606d262373abfcfd9
+  metadata.gz: a4884c1d32422983d9c5ab5388c63c7a0937526a561a6b4ba5c1043f0250d389efeee2d475d750c3f1f90983caae66aa3b156beeb4551dc093ea1e63a44e95b4
+  data.tar.gz: cc10688b5530b8068fa25176e84dceb950e29a355781be749e9a6f6709b5331f64391466db046cd58013f30911ec0ac68d7cd25ee938a51e5e6c04d0b89c4ab1

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

@@ -17,6 +17,12 @@ module Metanorma
           )
           resolved = document.path_resolver
             .system_path(file_path, docfile_directory)
+          # The decorator expands emitted paths against this base: relative
+          # prefixes alone get re-anchored by asciidoctor's imagesdir
+          # handling (images/../../schemas collapses a level), so the
+          # decoration must produce paths that resolve from the docfile.
+          options["relative_path_base"] =
+            File.expand_path(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

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

@@ -60,13 +60,26 @@ module Metanorma
         end
 
         def prefix_relative_paths(line, path_prefix)
+          # Decorated remarks live on models shared across documents and
+          # preprocess passes: a second pass over an already-decorated line
+          # would stack the prefix again (paths like
+          # ../schemas/schemas/schemas/... rendered unusable). Idempotent:
+          # a line that carries this prefix is left alone.
+          return line if path_prefix && line.include?(path_prefix)
+
           line.gsub(RELATIVE_PREFIX_MACRO_REGEXP) do |_match|
-            # The prefix is docfile-relative (metanorma-plugin-lutaml#325):
-            # expanding it against the process CWD produced absolute image
-            # paths under whatever directory the build was launched from
-            # (e.g. <repo>/../../schemas/...), which then failed to resolve
-            # at render time. An absolute prefix passes through unchanged.
-            full_path = File.join(path_prefix, $3.strip)
+            # Expand against the docfile directory (passed by the adapter
+            # as relative_path_base), NOT the process CWD: a CWD expansion
+            # produced absolute image paths under whatever directory the
+            # build was launched from (e.g. <repo>/../../schemas/...).
+            # The absolute result is deliberate: relative targets are
+            # re-anchored by asciidoctor's imagesdir handling
+            # (images/../../schemas collapses a level), which made every
+            # decorated diagram unresolvable at render time.
+            full_path = File.expand_path(
+              File.join(path_prefix, $3.strip),
+              options["relative_path_base"] || Dir.pwd,
+            )
             "#{$1}#{$2}#{full_path}#{$4}"
           end
         end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.7.56
+  version: 0.7.57
 platform: ruby
 authors:
 - Ribose Inc.