isodoc 3.7.9 → 3.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5416c33293635ef2ffe86ffc7bce147cb134b3e14351d34a9db58da7ee7ea2e8
-  data.tar.gz: 27e71f5da5054d3d4ce5bb3cfcead403431b46c9905c842e91db702324c0061d
+  metadata.gz: 270dafea0a539bced4411ce5c5c3963c4b24745e4727cecef7f716a7a1c8df7a
+  data.tar.gz: d1d8ab2d4848e53f6e74946a2d8de4ec6ac9d05e7fc620f00719e0ebec93bd3f
 SHA512:
-  metadata.gz: 2e07d640b30d683cd54d6a061e33dba1e472d64a65c39d8e46fc9b7f4c1630195bf48d4b1c8b65971134021f79b78d718888d2a89d93654fa5e2ae1cd025416d
-  data.tar.gz: 74e8eae6ceb68593355e1ec1f148d549eb9c20f420c53b697fd0df300a772ff8e230b6708f9dd3714a1d5bc35702c8301c9839a54bda25e466c753de26ff01d6
+  metadata.gz: e816079e77f5c2075d02e7a16f27c3118c907d0ba4ce2198435b5241d28f75e8eb4892f883e067852aa42c059ed8e2448efd1f5351d3ae3d877ff21f5604ba3c
+  data.tar.gz: 1464929049db640fe3c5258f5cf8b89dbf4d3f8712c3f3ab882d399f93e63320344b946acca3cadad5a132c757fe5fb31da017cad64a2ff7fd9c7ab29490d07b

data/isodoc.gemspec

@@ -31,20 +31,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "base64", ">= 0.1.0"
   spec.add_dependency "bigdecimal"
   spec.add_dependency "html2doc", "~> 1.12"
-  # spec.add_dependency "isodoc-i18n", "~> 1.5" # already in relaton-render and mn-requirements
-  spec.add_dependency "relaton-cli", "~> 3.0"
+  # spec.add_dependency "isodoc-i18n", "~> 1.5" # already in mn-requirements
+  spec.add_dependency "relaton", "~> 3.1.1"
   # std_docid_semantic parses through the pubid monogem's flavor
   # registry (Pubid.eager_load_flavors!) — 2.x API, no per-flavor gems
   spec.add_dependency "pubid", "~> 2.0.3"
   # spec.add_dependency "metanorma-utils", "~> 2.0" # already in isodoc-i18n
   spec.add_dependency "mn2pdf", ">= 2.13"
   spec.add_dependency "mn-requirements", "~> 0.5.0"
-  # Allowance for the relaton 3.0 family (mirrors the relaton-cli
-  # allowance in #824): relaton-render 3.0.0 joins the family's
-  # versioning and restores the 1.x leaves as deprecated shims, so
-  # flavor stacks boot against it.
-  # Released isodoc lines keep resolving relaton-render 1.3.0; only a
-  # stack on this floor co-resolves the relaton 3.0 line.
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   # lib/isodoc/css.rb requires sassc-embedded (SassC::Engine) at

data/lib/isodoc/metadata_bibdata.rb

@@ -1,4 +1,6 @@
-require "relaton-cli"
+require "relaton"
+require "relaton/bib"
+require "relaton/cli"
 
 module IsoDoc
   class BibdataConfig < ::Lutaml::Model::Serializable

data/lib/isodoc/presentation_function/inline.rb

@@ -19,6 +19,9 @@ module IsoDoc
                               link, node)
       non_locality_elems(node).each(&:remove)
       node.add_child(cleanup_entities(link))
+      # citation capsules embed bibitem reference markup, links included;
+      # links inserted after fmt_ref ran need the fmt treatment explicitly
+      fmt_ref_links(node)
       unnest_linkend(node)
     end
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">

data/lib/isodoc/presentation_function/xrefs.rb

@@ -3,13 +3,29 @@ module IsoDoc
     def fmt_ref(docxml)
       docxml.xpath(ns("//xref | //eref | //origin | //link")).each do |x|
         sem_xml_descendant?(x) and next
-        tag = x.name
-        y = Nokogiri::XML::Node.new("fmt-#{tag}", x.document)
-        x.attributes.keys.reject { |a| a == "id" }.each { |a| y[a] = x[a] }
-        n = semx_fmt_dup(x) # semx/fmt-xref for ease of processing
-        n.children.each { |c| y << c }
-        n << y
-        x.next = n
+        fmt_ref_elem(x)
+      end
+    end
+
+    def fmt_ref_elem(x)
+      tag = x.name
+      y = Nokogiri::XML::Node.new("fmt-#{tag}", x.document)
+      x.attributes.keys.reject { |a| a == "id" }.each { |a| y[a] = x[a] }
+      n = semx_fmt_dup(x) # semx/fmt-xref for ease of processing
+      n.children.each { |c| y << c }
+      n << y
+      x.next = n
+    end
+
+    # Links arriving in markup that is inserted after fmt_ref has run —
+    # the styled eref citation capsules, which embed the reference
+    # rendering of a bibitem (including its availability link) — get the
+    # same semx/fmt-link treatment as document links, or the HTML and DOC
+    # renderers drop them along with the source element
+    def fmt_ref_links(node)
+      node.xpath(ns(".//link")).each do |x|
+        sem_xml_descendant?(x) and next
+        fmt_ref_elem(x)
       end
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.7.9".freeze
+  VERSION = "3.7.11".freeze
 end

data/lib/isodoc.rb

@@ -7,7 +7,7 @@ require "image_size"
 require "html2doc"
 require "liquid"
 require "htmlentities"
-require "relaton-render"
+require "relaton/render"
 
 require "isodoc/common"
 require "isodoc/convert"

data/lib/relaton/render-isodoc/general.rb

@@ -1,4 +1,4 @@
-require "relaton-render"
+require "relaton/render"
 require "metanorma-utils"
 
 module Relaton

data/lib/relaton/render-isodoc/styles/isodoc.yml

@@ -5,12 +5,22 @@
 # (b) no authoritative identifier in the reference composition: the
 # identifier renders as the biblio-tag ahead of the formattedref
 # ("ISO 712, _Cereals_ ..."), never duplicated inside it. Patents
-# keep theirs: the patent number is the citation itself.
+# keep theirs: the patent number is the citation itself. And (c) the
+# availability (location) slot renders as the unresolved entries do:
+# "Available at: <link>...</link>" — the PresentationXML link is what
+# the HTML and DOC renderers turn into the citation's anchor. Without
+# the uri template the resolved bibitem's <uri> renders as bare text,
+# and the reader loses the link exactly when the reference is
+# authoritative enough to be machine-resolved (isodoc#882).
 name: "IsoDoc (ISO 690, presentation markup)"
 extends: author-date
+scheme:
+  locale:
+    availableAt: "Available at:"
 templates:
   titleOpen: "<em>"
   titleClose: "</em>"
+  uri: '<link target="{{uri}}">{{uri}}</link>'
   reference: "{{creator}}. {{title}}. {{medium}}. {{edition}}. {{series}}. {{production}}, {{date}}. {{location}}."
 perType:
   - type: monograph

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.7.9
+  version: 3.7.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-11-03 00:00:00.000000000 Z
+date: 2026-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: relaton-cli
+  name: relaton
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement