metanorma-plugin-lutaml 0.7.25 → 0.7.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f52cc174af4c2cd486067a47ca4c2d48093f2bc9a4030ddbc55d9bd0629b60c
-  data.tar.gz: f657c5a57479b998913adce1a8147cbd53cdfe10b52d97d7a2a9dfc4198b21af
+  metadata.gz: 11c7ed6c66e1e49c97e462af575998e21c1fbac9290b110e6be6a39df00c5aa7
+  data.tar.gz: 7c082ce22cd9acd3236c2f1c3bd604108efb7df89ae271babf3413b0e6e93750
 SHA512:
-  metadata.gz: 3677d003d961777f01889f4d7db189d43f236aa8a8fd0a29dfd29fbb765bb79dd101aa9fb00bc844986f1f09d23a8b3746f3c8eca88d4da5b9ed4532c3314605
-  data.tar.gz: 6f2562fa121c7b33e699412bdd70a3b68eb56916254c83b6baba1ab8cac4e286079f21b65b34213774eff761989c0d01c1e2e158a3b54ce3b0387df455c99dbf
+  metadata.gz: cf4d394563023fd9c0e22992b408dd7c042e9c8aed11939b0fbfa00c229f28c10e941c0262704eddeeee63640e567ae1f3ccb97b51916a6a218f3f881da3dea4
+  data.tar.gz: 281e3c374a832537e697f9bc012286bfca4ff2cd1ab937ec871fc0fa5127ea4fe124c834262908bbfd1048df7dec5263485e5766840bb6020e9ea518d38b4193

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Plugin
+    module Lutaml
+      class ExpressRemarksDecorator
+        RELATIVE_PREFIX_MACRO_REGEXP = /^(link|image|video|audio|include)(:+)?(?![^\/:]+:\/\/|[A-Z]:\/|\/)([^:\[]+)(\[.*\])?$/.freeze
+
+        attr_reader :remark, :options
+
+        def self.call(remark, options)
+          new(remark, options).call
+        end
+
+        def initialize(remark, options)
+          @remark = remark
+          @options = options
+        end
+
+        def call
+          result = remark
+          if options["relative_path_prefix"]
+            result = update_relative_paths(result,
+                                          options["relative_path_prefix"])
+          end
+          result
+        end
+
+        private
+
+        def update_relative_paths(string, path_prefix)
+          string
+            .split("\n")
+            .map do |line|
+              if line.match?(RELATIVE_PREFIX_MACRO_REGEXP)
+                prefix_relative_paths(line, path_prefix)
+              else
+                line
+              end
+            end
+            .join("\n")
+        end
+
+        def prefix_relative_paths(line, path_prefix)
+          line.gsub(RELATIVE_PREFIX_MACRO_REGEXP) do |_match|
+            prefixed_path = File.join(path_prefix, $3.strip)
+            # When we are dealing with a relative path of a template:
+            # ../path/to/file we need to transform it into
+            # the absolute one because `image::` macro wont understand it other way
+            prefixed_path = File.absolute_path(prefixed_path) if prefixed_path.start_with?("../")
+            full_path = File.expand_path(prefixed_path)
+            "#{$1}#{$2}#{full_path}#{$4}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ require "asciidoctor/reader"
 require "lutaml"
 require "metanorma/plugin/lutaml/utils"
 require "metanorma/plugin/lutaml/asciidoctor/preprocessor"
+require "metanorma/plugin/lutaml/express_remarks_decorator"
 
 module Metanorma
   module Plugin
@@ -139,7 +140,7 @@ module Metanorma
             update_schema_selection(schema, options)
             options["relative_path_prefix"] =
               relative_path_prefix(options, schema)
-            update_schema_remarks(schema, options)
+            update_remarks(schema, options)
           end
 
           repo
@@ -152,16 +153,17 @@ module Metanorma
             options["selected_schemas"].include?(schema.id)
         end
 
-        def update_schema_remarks(schema, options)
-          # Update schema-level remarks
-          schema.remarks = decorate_remarks(options, schema.remarks)
-
-          # Update remark items
-          return unless schema.remark_items
-
-          schema.remark_items.each do |ri|
+        def update_remarks(model, options)
+          model.remarks = decorate_remarks(options, model.remarks)
+          model.remark_items&.each do |ri|
             ri.remarks = decorate_remarks(options, ri.remarks)
           end
+
+          model.children.each do |child|
+            if child.respond_to?(:remarks) && child.respond_to?(:remark_items)
+              update_remarks(child, options)
+            end
+          end
         end
 
         def relative_path_prefix(options, model)
@@ -181,7 +183,7 @@ module Metanorma
           return [] unless remarks
 
           remarks.map do |remark|
-            ::Expressir::Express::ExpressRemarksDecorator
+            ::Metanorma::Plugin::Lutaml::ExpressRemarksDecorator
               .call(remark, options)
           end
         end

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.7.25".freeze
+      VERSION = "0.7.26".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.25
+  version: 0.7.26
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-02 00:00:00.000000000 Z
+date: 2025-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -135,6 +135,7 @@ files:
 - lib/metanorma/plugin/lutaml/config/guidance_klass.rb
 - lib/metanorma/plugin/lutaml/config/package.rb
 - lib/metanorma/plugin/lutaml/config/root.rb
+- lib/metanorma/plugin/lutaml/express_remarks_decorator.rb
 - lib/metanorma/plugin/lutaml/liquid/custom_filters.rb
 - lib/metanorma/plugin/lutaml/liquid/multiply_local_file_system.rb
 - lib/metanorma/plugin/lutaml/liquid_drops/gml_dictionary_drop.rb