metanorma 1.2.6pre → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f44605746ed08329b51fabc943ab3e0587e7e4cf07645fcd20505121a1f7544
-  data.tar.gz: 7531752fd6c7b2d1c3f7e13deee84d54276a2dc7ed7bd2e05cab02ce83ce6b9b
+  metadata.gz: e4552898da027404dc0a7556a0c3b97d8c55c014c8ef397dff1d421f495a748d
+  data.tar.gz: a9a7f45f7e35f5a06bdc05c367a8ff3f25369251f5de1993fdbd166604a9349e
 SHA512:
-  metadata.gz: a1d8fc5ab61a03b0b2600bbf75f9d9945fefc463e0003f41b7534887c9c88826ed7dfa6cf264e852ac40493d4ced15fb639b3ee304bf0286328543ca119de296
-  data.tar.gz: 4ce326412a2248432450bd9fbe08c431bc5369bffa623e02895f8ce7d814ff000c50344bf7fa6653a55ac19deacebe31b9d07887ada84436a940db14a412712d
+  metadata.gz: 9be3cea69411bf8f1b48dde44a432353f9b93741ff13ce388312386817e6a8a90a2290dafa222013b7397838cd948b40228882e329bb2d89270924c1b0a08469
+  data.tar.gz: 1eff396a38c708948620c489664f8d9713ac0b76e7df72d1631e60e31f1bda0d2aea93ac7015a6a6f7863b9ed466eac731db6ec90fd42ca831d6ffead3f0ecfc

data/lib/metanorma/collection_fileprocess.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "isodoc"
+require "metanorma-utils"
 
 module Metanorma
   # XML collection renderer
@@ -131,12 +132,33 @@ module Metanorma
       update_indirect_refs_to_docs(docxml, internal_refs)
       add_document_suffix(identifier, docxml)
       update_direct_refs_to_docs(docxml, identifier)
+      svgmap_resolve(datauri_encode(docxml))
       docxml.xpath(ns("//references[not(./bibitem[not(@hidden) or @hidden = 'false'])]")).each do |f|
         f["hidden"] = "true"
       end
       docxml.to_xml
     end
 
+    def datauri_encode(docxml)
+      docxml.xpath(ns("//image")).each { |i| i["src"] = Metanorma::Utils::datauri(i["src"]) }
+      docxml
+    end
+
+    def svgmap_resolve(docxml)
+      isodoc = IsoDoc::Convert.new({})
+      docxml.xpath(ns("//svgmap//eref")).each do |e|
+        href = isodoc.eref_target(e)
+        next if href == "#" + e["bibitemid"]
+        if href.match(/^#/)
+          next unless docxml.at("//*[@id = '#{href.sub(/^#/, '')}']")
+        end
+        e["target"] = href.strip
+        e.name = "link"
+        e&.elements&.remove
+      end
+      Metanorma::Utils::svgmap_rewrite(docxml, "")
+    end
+
     # repo(current-metanorma-collection/ISO 17301-1:2016)
     # replaced by bibdata of "ISO 17301-1:2016" in situ as bibitem.
     # Any erefs to that bibitem id are replaced with relative URL

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.2.6pre"
+  VERSION = "1.2.6"
 end

data/metanorma.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'htmlentities'
   spec.add_runtime_dependency 'nokogiri'
   spec.add_runtime_dependency 'mn2pdf', "~> 1"
-  spec.add_runtime_dependency 'metanorma-utils', "~> 1"
+  spec.add_runtime_dependency 'metanorma-utils', "~> 1.0.3"
   spec.add_runtime_dependency 'pry'
   spec.add_runtime_dependency 'fontist', '~> 1.8'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.2.6pre
+  version: 1.2.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -272,11 +272,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create