metanorma-plugin-lutaml 0.7.61 → 0.7.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e10152f9146a2100063d02e244208ed4acc105b8a105b6a15604a14e8522e9ab
-  data.tar.gz: 8c453ee0ba82bc78d20c78e7bf31d34c048874301a12bbd13a63810791db3a8e
+  metadata.gz: 102085caacd4951ba78acd47b10eecec2fd50c6646270bd15c70444d4a54bb3e
+  data.tar.gz: 42939df5ca71fe3e838277864054f215d5b3432310792d75384983eb4a35b7cb
 SHA512:
-  metadata.gz: aa862500cb613b0cfab7ce3816f197a23cab52a44d778fc6cc1945b0e7e48c3a466cec55a1d7601e439256deb9b327e15e840368174896371dadbd457aeb3fb3
-  data.tar.gz: 5cdcea37e490d21fcf555a952c836350570ab8e60499f2a1b98ed54a754af497832a2b749c052a2048a86c0be689f1c2be173e5f0ad74612d1363a4e6ada2cba
+  metadata.gz: 550a516ed78801a0a5359a114edac8258bc1c94e0f72384a2d0f338ab38c8476f729de6fb2d4876c21729569badbdfdce17b13e7a6bd0d4164a1a860b319c388
+  data.tar.gz: a641b9efc125a5fce7432c43dd1e49fd673abef9f8991e73a3e182f5a44e7a987e40a741164e8be75f9198497d9063e29d44972a1a500f9cc1c90573d7fe9472

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

@@ -17,43 +17,25 @@ 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
           # (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 decorator joins it
-          # as written rather than expanding it.
-          #
-          # The render resolves image targets against the imagesdir joined
-          # onto the docfile directory, not the bare docfile: a target
-          # relative to the bare docfile is re-anchored through the
-          # imagesdir prefix and every decorated diagram misses by its
-          # depth (metanorma/iso-10303 smol-all FATAL: emitted
-          # `../schemas/…`, resolved as `images/../schemas/…`). Compute the
-          # prefix against the directory the render resolves from.
+          # 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(image_resolve_base(document, docfile_directory)),
-            )
+            .relative_path_from(Pathname.new(File.expand_path(docfile_directory)))
             .to_s
         end
 
-        # The directory image targets resolve against: the docfile
-        # directory with the imagesdir joined on. A web or absolute
-        # imagesdir bypasses the join; the bare docfile directory is the
-        # closest approximation.
-        def self.image_resolve_base(document, docfile_directory)
-          base = File.expand_path(docfile_directory)
-          imagesdir = document.attributes["imagesdir"]
-          return base if imagesdir.nil? || imagesdir.empty?
-          return base if imagesdir.match?(%r{\A(?:[a-z]+:|/)})
-
-          File.expand_path(imagesdir, base)
-        end
-
         def self.for(model)
           case model
           when Expressir::Model::Cache

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

@@ -68,15 +68,19 @@ module Metanorma
           return line if path_prefix && line.include?(path_prefix)
 
           line.gsub(RELATIVE_PREFIX_MACRO_REGEXP) do |_match|
-            # The prefix is already docfile-relative (see
-            # ExpressRemarkAdapter.relative_path_prefix), so joining it
-            # keeps the emitted path relative to the docfile too. Expanding
-            # to an absolute path embedded the build directory in the
-            # output, making semantic XML, presentation XML and HTML differ
-            # between two builds of the same tree (#325). Resolution is the
-            # renderer's job: a relative target joined with imagesdir still
-            # resolves against the docfile at render time.
-            "#{$1}#{$2}#{File.join(path_prefix, $3.strip)}#{$4}"
+            # 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
       end

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.7.61".freeze
+      VERSION = "0.7.62".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.61
+  version: 0.7.62
 platform: ruby
 authors:
 - Ribose Inc.