isodoc 2.8.5 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d547300e7f76850fa217db351b29144bdaaefe7cdb92db2a1d7a23850dee4064
-  data.tar.gz: 164441fd4b80aaf212b4faf44049aa6808d986fb8cf2182b6fa495a6e9cc8c53
+  metadata.gz: '0149f799d8ea0aa613aa3544453d23ddd0a0451a2b3e3efa047772e16cf2db46'
+  data.tar.gz: 606b9ababc9d0ebb5b7c1b11d225a752440379ae093d09f208f45ec0f9d3f4b5
 SHA512:
-  metadata.gz: d37f5c48e5ff29b62be1fbf333b21d7d0122848ce118d88da0459d2cf71e6d83e2bb4590d6c83aff54c013bc972d6241265b76e2988fa5dde2fab9b290ab3eb6
-  data.tar.gz: 3e4db6e54b3f7879bdb89a90744105abba3ef2f489504234e2b9c0a6206524d412bb09a4e01a8841cc4580f46f8eb06afc854b45ebabb93df0de6934e432d7d7
+  metadata.gz: 5aa94e7ae2178b5ae01b3f55a6f7209439fb6dc82b001531ccc799352e06d711fd63ee589a657e50022cde1b1b27ba8df857ef078ee2f187a41ad77f1abcca65
+  data.tar.gz: 2922340ef73f00c1b5d48e45fd28371da9e10dc55d4e4858ea67db1ed01189c6f4555386ed8e26e8f1951e41504d1ec3da39b9aee1b154b4f99df617185152ea

data/isodoc.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mn2pdf"
   spec.add_dependency "mn-requirements", "~> 0.3.4"
 
-  spec.add_dependency "relaton-render", "~> 0.7.0"
+  spec.add_dependency "relaton-render", "~> 0.7.1"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   spec.add_dependency "thread_safe"

data/lib/isodoc/convert.rb

@@ -84,6 +84,11 @@ module IsoDoc
       Metanorma::Requirements
     end
 
+    def bibrenderer(options = {})
+      ::Relaton::Render::IsoDoc::General.new(options.merge(language: @lang,
+                                                          i18nhash: @i18n.get))
+    end
+
     def convert1(docxml, filename, dir)
       @xrefs.parse docxml
       noko do |xml|

data/lib/isodoc/function/references.rb

@@ -29,15 +29,23 @@ module IsoDoc
       SKIP_DOCID = <<~XPATH.strip.freeze
         @type = 'DOI' or @type = 'doi' or @type = 'ISSN' or @type = 'issn' or @type = 'ISBN' or @type = 'isbn' or starts-with(@type, 'ISSN.') or starts-with(@type, 'ISBN.') or starts-with(@type, 'issn.') or starts-with(@type, 'isbn.')
       XPATH
-
+=begin
       SKIP_DOC1 = <<~XPATH.strip.freeze
         #{SKIP_DOCID} or @type = 'metanorma-ordinal' or @type = 'metanorma'
       XPATH
 
       PRIMARY_ID = "docidentifier[@primary = 'true']".freeze
-
+=end
       def pref_ref_code(bib)
         bib["suppress_identifier"] == "true" and return nil
+        @bibrenderer ||= bibrenderer
+        data, = @bibrenderer.parse(bib)
+        ret = data[:authoritative_identifier]
+        ret.empty? and return nil
+        ret
+      end
+=begin
+      def pref_ref_code1(bib)
         lang = "[@language = '#{@lang}']"
         ret = bib.xpath(ns("./#{PRIMARY_ID}[not(#{SKIP_DOCID})]#{lang}"))
         ret.empty? and
@@ -47,7 +55,7 @@ module IsoDoc
             bib.at(ns("./docidentifier[not(#{SKIP_DOC1})]"))
         ret
       end
-
+=end
       # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
       def bibitem_ref_code(bib)
         id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
@@ -72,7 +80,9 @@ module IsoDoc
       end
 
       def unbracket1(ident)
-        ident&.text&.sub(/^\[/, "")&.sub(/\]$/, "")
+        ident.nil? and return nil
+        ident.is_a?(String) or ident = ident.text
+        ident.sub(/^\[/, "").sub(/\]$/, "")
       end
 
       def unbracket(ident)

data/lib/isodoc/presentation_function/refs.rb

@@ -37,7 +37,7 @@ module IsoDoc
         prep_for_rendering(b)
         m << to_xml(b)
       end.join
-      bibrenderer.render_all("<references>#{refs}</references>",
+      @xrefs.klass.bibrenderer.render_all("<references>#{refs}</references>",
                              type: citestyle)
     end
 
@@ -68,10 +68,6 @@ module IsoDoc
       xml.children = "#{f}#{x.to_xml}"
     end
 
-    def bibrenderer
-      ::Relaton::Render::IsoDoc::General.new(language: @lang)
-    end
-
     def citestyle
       nil
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.8.5".freeze
+  VERSION = "2.9.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement