isodoc 3.7.10 → 3.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a7597a26426151a8787b78a912f38cf36a045e1ae765dbb77a2673b5f577249
-  data.tar.gz: 8621b28dbc2ddc8ec42e37fffed352da1077a37c69057c3dc5c7aebceedc2c2f
+  metadata.gz: 7ff06e0cc7960c3c125d068e085f3d56973a3591c530fdaa096f70d47a2e574d
+  data.tar.gz: e04d4ceda3b6f90fed711df3a4d9c1e47b033282f28e70b550fdecff79a97f66
 SHA512:
-  metadata.gz: 88275943d498d1122cb092bb12e6005531ba4d090aaf12cbeaefed250582cc74220a7dc5d62c9ee22efec34bbfb852890204a57cc0819f06ebbaab102a03036b
-  data.tar.gz: 0cdbc74ec5a65f07efabb297b3a533f1d1faebfb3f3520cb4289ebe78b93b0de1922a6d49e531c1797857504f536b42dbfe277c3d88860abe0b70e49ecd1b9ad
+  metadata.gz: 14dba4914e496487f29f48349e1086a96fc8a3e92c7a28f9d4e83e1f174761cc7dac42611d605eb1feac25b18ebde9d0e28996d5c4ec3fbadd21729cfebf9ba9
+  data.tar.gz: f9b1da627369b9febc2730287a5227cbdccc28fed3e7ed72d132986a743eb49700d853a038ded173ec5470b000e036e5ecb26a6dd41ae92bc1de864a83339709

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", "~> 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/css.rb

@@ -100,10 +100,30 @@ module IsoDoc
        File.dirname(filename)]
     end
 
+    def sassc_available?
+      require "sassc-embedded"
+      true
+    rescue LoadError
+      false
+    end
+
     # stripwordcss if HTML stylesheet, !stripwordcss if DOC stylesheet
     def generate_css(filename, stripwordcss)
       filename.nil? and return nil
       filename = precompiled_style_or_original(filename)
+      # The release's precompiled .css twins bake in the DEFAULT font
+      # variables, so a flavor overriding default_fonts would be silently
+      # dropped when its stylesheet is consumed as precompiled
+      # (metanorma-un, metanorma-m3aawg font regressions). When the scss
+      # source is present and the consumer bundle carries the optional
+      # sassc-embedded toolchain, compile at runtime so the flavor's
+      # fonts template in; plain installs without the toolchain keep the
+      # precompiled fallback.
+      scss = filename.sub(/\.css\z/, ".scss")
+      if File.extname(filename) == ".css" && File.file?(scss) &&
+          sassc_available?
+        filename = scss
+      end
       stylesheet = File.read(filename, encoding: "UTF-8")
       stylesheet = preprocess_css(stylesheet, stripwordcss)
       File.extname(filename) == ".scss" and

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.10".freeze
+  VERSION = "3.7.12".freeze
 end

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.10
+  version: 3.7.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-11-05 00:00:00.000000000 Z
+date: 2026-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -58,14 +58,14 @@ dependencies:
     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