metanorma 1.5.6 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8def7cdd4a8b5e3605736563382599b2d820b2c18e7305d6567c89b667c89d90
-  data.tar.gz: 75b2d6a77b20a782ace64f18f112cae4bb5b5643172c4df31e05e3a4eb817f20
+  metadata.gz: 60d785729d89d29168d707378d2d987ea9c46a98425070ec4ef2e629261a0c46
+  data.tar.gz: a8dafe26e2cbc0188ab5e2604bcab6d7804b6a2f94abf38034c65220507fd69d
 SHA512:
-  metadata.gz: 5a95ed1b168dc0a1ce689a2d169f8664fdb087b35332f645836072ee3e13b8be63513ba585210c2f8f5e69d70161b3b1036dc34cc77a0659f14340caaf22d2e4
-  data.tar.gz: 2cab73d708c92443edb99dcb7d761169de3fda2dca2fb40e364f374d085e34c1c7cc317ba3f192bbb98309c699719f97fc10552143c235642a610941189580a5
+  metadata.gz: 8fbdcec59406b3429e6ac7d0d98f4e8e510d71c5643dd309d6230e8ebb5455786c34e90a7817ab6ec3ac9ffb21aa481d8a7ae3646c9341d0a76c813cb311744b
+  data.tar.gz: '09c25e7b81abff7aa85a8f62dc69020c8ac9e8b559513f49ac09abb4e3d6ead367e548d3eaf3d0500c075c9bd56ffda1d9ea3b4218227cb93ec3968d7c05b4df'

data/lib/metanorma/collection.rb

@@ -17,7 +17,7 @@ module Metanorma
     attr_accessor :directives
 
     # @return [Hash<String, Metanorma::Document>]
-    attr_accessor :documents, :bibdatas
+    attr_accessor :documents, :bibdatas, :coverpage
 
     attr_accessor :disambig, :manifest
 
@@ -28,6 +28,7 @@ module Metanorma
     # @param manifest [Metanorma::CollectionManifest]
     # @param documents [Hash<String, Metanorma::Document>]
     # @param prefatory [String]
+    # @param coverpage [String]
     # @param final [String]
     # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
     def initialize(**args)
@@ -36,6 +37,10 @@ module Metanorma
       @bibdata = args[:bibdata]
       @manifest = args[:manifest]
       @manifest.collection = self
+      c = @directives.detect { |x| x.is_a?(Hash) && x["coverpage"] }
+      c and @coverpage = c["coverpage"]
+      c = @directives.detect { |x| x.is_a?(Hash) && x["coverpage-style"] }
+      c and @coverpage_style = c["coverpage-style"]
       @documents = args[:documents] || {}
       @bibdatas = args[:documents] || {}
       if @documents.any? && !@directives.include?("documents-inline")
@@ -68,12 +73,29 @@ module Metanorma
 
     def collection_body(coll)
       coll << @bibdata.to_xml(bibdata: true, date_format: :full)
+      @directives.each do |d|
+        coll << "<directives>#{obj_to_xml(d)}</directives>"
+      end
       @manifest.to_xml coll
       content_to_xml "prefatory", coll
       doccontainer coll
       content_to_xml "final", coll
     end
 
+    def obj_to_xml(elem)
+      case elem
+      when ::Array
+        elem.each_with_object([]) do |v, m|
+          m << "<value>#{obj_to_xml(v)}</value>"
+        end.join
+      when ::Hash
+        elem.each_with_object([]) do |(k, v), m|
+          m << "<#{k}>#{obj_to_xml(v)}</#{k}>"
+        end.join
+      else elem
+      end
+    end
+
     def render(opts)
       CollectionRenderer.render self, opts.merge(log: @log)
       clean_exit
@@ -100,10 +122,27 @@ module Metanorma
         mnf = CollectionManifest.from_xml mnf_xml
         pref = pref_final_content xml.at("//xmlns:prefatory-content")
         fnl = pref_final_content xml.at("//xmlns:final-content")
+        cov = pref_final_content xml.at("//xmlns:coverpage")
         new(file: file, bibdata: bd, manifest: mnf,
+            directives: directives_from_xml(xml.xpath("//xmlns:directives")),
             documents: docs_from_xml(xml, mnf),
             bibdatas: docs_from_xml(xml, mnf),
-            prefatory: pref, final: fnl)
+            prefatory: pref, final: fnl, coverpage: cov)
+      end
+
+      # TODO refine
+      def directives_from_xml(dir)
+        dir.each_with_object([]) do |d, m|
+          if d.at("./xmlns:value")
+            m << x.xpath("./xmlns:value").map(&:text)
+          elsif d.at("./*")
+            out = d.elements.each_with_object({}) do |e, ret|
+              ret[e.name] = e.children.to_xml
+            end
+            m << out
+          else m << d.children.to_xml
+          end
+        end
       end
 
       def parse_yaml(file)

data/lib/metanorma/collection_fileparse.rb

@@ -54,9 +54,9 @@ module Metanorma
       # IDs for repo references are untyped by default
       docid = bib.at(ns("./docidentifier[not(@type)]")) ||
         bib.at(ns("./docidentifier"))
-      docid &&= docid.children.to_xml
-      if @files[docid]
-        docid
+      docid &&= @c.decode(@isodoc
+          .docid_prefix(docid["type"], docid.children.to_xml))
+      if @files[docid] then docid
       else
         fail_update_bibitem(docid, identifier)
         nil
@@ -111,11 +111,12 @@ module Metanorma
       docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |b|
         next if b&.at(ns("./docidentifier[@type = 'repository']"))
 
-        b.xpath(ns("./docidentifier")).each do |d|
-          next unless @files[d.text]
-
-          d.next = "<docidentifier type='repository'>" \
-                   "current-metanorma-collection/#{d.text}"
+        b.xpath(ns("./docidentifier")).each do |docid|
+          id = @c.decode(@isodoc
+          .docid_prefix(docid["type"], docid.children.to_xml))
+          @files[id] or next
+          docid.next = "<docidentifier type='repository'>" \
+                       "current-metanorma-collection/#{id}"
         end
       end
     end
@@ -154,16 +155,21 @@ module Metanorma
     def update_direct_refs_to_docs(docxml, identifier)
       erefs = collect_erefs(docxml)
       docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |b|
-        docid = b.at(ns("./docidentifier[@type = 'repository']"))&.text
-        next unless docid && %r{^current-metanorma-collection/}.match(docid)
-
+        docid = b.at(ns("./docidentifier[@type = 'repository']"))
+        (docid && %r{^current-metanorma-collection/}.match(docid.text)) or next
         update_bibitem(b, identifier)
-        docid = b.at(ns("./docidentifier")) or next
-        docid = docid.children.to_xml
+        docid = docid_to_citeas(b) or next
         erefs[:citeas][docid] and update_anchors(b, docxml, docid)
       end
     end
 
+    def docid_to_citeas(bib)
+      docid = bib.at(ns("./docidentifier[@primary = 'true']")) ||
+        bib.at(ns("./docidentifier")) or return
+      @c.decode(@isodoc
+          .docid_prefix(docid["type"], docid.children.to_xml))
+    end
+
     def collect_erefs(docxml)
       docxml.xpath(ns("//eref"))
         .each_with_object({ citeas: {}, bibitemid: {} }) do |i, m|
@@ -211,7 +217,7 @@ module Metanorma
       loc = eref.at(ns(".//locality[@type = 'anchor']")) or
         return update_anchor_create_loc(bib, eref, docid)
       document_suffix = Metanorma::Utils::to_ncname(docid)
-      ref = loc.at(ns("./referenceFrom")) || return
+      ref = loc.at(ns("./referenceFrom")) or return
       anchor = "#{ref.text}_#{document_suffix}"
       return unless @files[docid][:anchors].inject([]) do |m, (_, x)|
         m += x.values
@@ -235,8 +241,7 @@ module Metanorma
     # gather internal bibitem references
     def gather_internal_refs
       @files.each_with_object({}) do |(_, x), refs|
-        next if x[:attachment]
-
+        x[:attachment] and next
         file, = targetfile(x, read: true)
         Nokogiri::XML(file)
           .xpath(ns("//bibitem[@type = 'internal']/" \
@@ -253,7 +258,8 @@ module Metanorma
     def locate_internal_refs
       refs = gather_internal_refs
       @files.keys.reject { |k| @files[k][:attachment] }.each do |identifier|
-        locate_internal_refs1(refs, identifier, @files[identifier])
+        id = @c.decode(@isodoc.docid_prefix("", identifier.dup))
+        locate_internal_refs1(refs, identifier, @files[id])
       end
       refs.each do |schema, ids|
         ids.each do |id, key|

data/lib/metanorma/collection_fileprocess.rb

@@ -15,8 +15,10 @@ module Metanorma
     def read_files(path) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       files = {}
       @xml.xpath(ns("//docref")).each do |d|
-        identifier = d.at(ns("./identifier")).children.to_xml
-        files[identifier] = file_entry(d, identifier, path)
+        orig_id = d.at(ns("./identifier"))
+        identifier = @c.decode(@isodoc
+                  .docid_prefix(orig_id["type"], orig_id.children.to_xml))
+        files[identifier] = file_entry(d, orig_id.children.to_xml, path)
         if files[identifier][:attachment]
           files[identifier][:bibdata] = Metanorma::Document
             .attachment_bibitem(identifier).root
@@ -95,6 +97,7 @@ module Metanorma
     # rel_path is the source file address, determined relative to the YAML.
     # out_path is the destination file address, with any references outside
     # the working directory (../../...) truncated
+    # identifier is the id with only spaces, no nbsp
     def file_entry(ref, identifier, _path)
       out = ref["attachment"] ? ref["fileref"] : File.basename(ref["fileref"])
       ret = if ref["fileref"]
@@ -122,6 +125,15 @@ module Metanorma
       Metanorma::Utils::anchor_attributes.each do |(tag_name, attribute_name)|
         add_suffix_to_attributes(doc, document_suffix, tag_name, attribute_name)
       end
+      url_in_css_styles(doc, document_suffix)
+    end
+
+    # update relative URLs, url(#...), in CSS in @style attrs (including SVG)
+    def url_in_css_styles(doc, document_suffix)
+      doc.xpath("//*[@style]").each do |s|
+        s["style"] = s["style"]
+          .gsub(%r{url\(#([^)]+)\)}, "url(#\\1_#{document_suffix})")
+      end
     end
 
     # return file contents + output filename for each file in the collection,

data/lib/metanorma/collection_renderer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "isodoc"
+require "htmlentities"
 require_relative "collection_fileprocess"
 require_relative "fontist_utils"
 require_relative "util"
@@ -35,7 +36,7 @@ module Metanorma
 
       @isodoc = isodoc_create # output processor for flavour
       @outdir = dir_name_cleanse(options[:output_folder])
-      @coverpage = options[:coverpage]
+      @coverpage = options[:coverpage] || collection.coverpage
       @format = Util.sort_extensions_execution(options[:format])
       @compile_options = options[:compile] || {}
       @compile_options[:no_install_fonts] = true if options[:no_install_fonts]
@@ -45,6 +46,7 @@ module Metanorma
       @directives = collection.directives
       @disambig = Util::DisambigFiles.new
       @compile = Compile.new
+      @c = HTMLEntities.new
 
       # list of files in the collection
       @files = read_files folder
@@ -97,7 +99,8 @@ module Metanorma
 
     def concatenate1(out, ext)
       out.directives << "documents-inline"
-      out.bibdatas.each_key do |id|
+      out.bibdatas.each_key do |ident|
+        id = @c.decode(@isodoc.docid_prefix(nil, ident.dup))
         @files[id][:attachment] || @files[id][:outputs].nil? and next
 
         out.documents[id] =
@@ -148,7 +151,8 @@ module Metanorma
       isodoc.meta.set(:navigation, indexfile(@xml.at(ns("//manifest"))))
       isodoc.meta.set(:docrefs, liquid_docrefs)
       isodoc.meta.set(:"prefatory-content",
-                      isodoc_builder(isodoc, @xml.at(ns("//prefatory-content"))))
+                      isodoc_builder(isodoc,
+                                     @xml.at(ns("//prefatory-content"))))
       isodoc.meta.set(:"final-content",
                       isodoc_builder(isodoc, @xml.at(ns("//final-content"))))
       isodoc.info(@xml, nil)
@@ -156,7 +160,7 @@ module Metanorma
     end
 
     def isodoc_builder(isodoc, node)
-      Nokogiri::HTML::Builder.new do |b|
+      Nokogiri::HTML::Builder.new(encoding: "UTF-8") do |b|
         b.div do |div|
           node&.children&.each { |n| isodoc.parse(n, div) }
         end
@@ -212,9 +216,12 @@ module Metanorma
     def docrefs(elm, builder)
       elm.xpath(ns("./docref[@index = 'true']")).each do |d|
         ident = d.at(ns("./identifier")).children.to_xml
+        ident = @c.decode(@isodoc.docid_prefix(nil, ident))
         builder.li do |li|
           li.a href: index_link(d, ident) do |a|
-            a << ident
+            a << ident.split(/([<>&])/).map do |x|
+              /[<>&]/.match?(x) ? x : @c.encode(x, :hexadecimal)
+            end.join
           end
         end
       end
@@ -250,6 +257,7 @@ module Metanorma
     def liquid_docrefs
       @xml.xpath(ns("//docref[@index = 'true']")).each_with_object([]) do |d, m|
         ident = d.at(ns("./identifier")).children.to_xml
+        ident = @c.decode(@isodoc.docid_prefix(nil, ident))
         title = d.at(ns("./bibdata/title[@type = 'main']")) ||
           d.at(ns("./bibdata/title")) || d.at(ns("./title"))
         m << { "identifier" => ident, "file" => index_link(d, ident),

data/lib/metanorma/document.rb

@@ -47,10 +47,27 @@ module Metanorma
 
       private
 
+      def mn2relaton_parser(tag)
+        case tag.sub(/-standard/, "")
+        when "bipm" then RelatonBipm::XMLParser
+        when "bsi" then RelatonBsi::XMLParser
+        when "ietf" then RelatonIetf::XMLParser
+        when "iho" then RelatonIho::XMLParser
+        when "itu" then RelatonItu::XMLParser
+        when "iec" then RelatonIec::XMLParser
+        when "iso" then RelatonIsoBib::XMLParser
+        when "nist" then RelatonNist::XMLParser
+        when "ogc" then RelatonOgc::XMLParser
+        else RelatonBib::XMLParser
+        end
+      end
+
       # #param xml [Nokogiri::XML::Document, Nokogiri::XML::Element]
       # @return [RelatonBib::BibliographicItem,RelatonIso::IsoBibliographicItem]
       def from_xml(xml)
-        Relaton::Cli.parse_xml xml.at("//xmlns:bibitem|//xmlns:bibdata")
+        b = xml.at("//xmlns:bibitem|//xmlns:bibdata")
+        r = mn2relaton_parser(xml.root.name)
+        r.from_xml(b.to_xml)
       end
 
       # @param file [String]

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.5.6".freeze
+  VERSION = "1.5.8".freeze
 end

data/metanorma.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "fontist", ">= 1.14.3"
   spec.add_runtime_dependency "htmlentities"
   spec.add_runtime_dependency "isodoc", ">= 2.3.1"
-  spec.add_runtime_dependency "metanorma-utils", "~> 1.4.0"
   spec.add_runtime_dependency "mn2pdf", "~> 1"
   spec.add_runtime_dependency "nokogiri"
   spec.add_runtime_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.1
-- !ruby/object:Gem::Dependency
-  name: metanorma-utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement