metanorma 2.0.0 → 2.1.2

data/lib/metanorma/collection/xrefprocess/xrefprocess.rb

@@ -5,14 +5,16 @@ module Metanorma
         # xml.root["type"] = key # to force recognition of internal refs
         # bookmarks etc as new id elements introduced in Presentation XML:
         # add doc suffix
+        # Run on Semantic XML
         def xref_preprocess(xml, isodoc)
           @isodoc = isodoc
           key = (0...8).map { rand(65..90).chr }.join # random string
           xml.root["type"] = key
           Metanorma::Utils::anchor_attributes
-            .each do |(tag_name, attribute_name)|
-            ::Metanorma::Collection::Util::add_suffix_to_attributes(
-              xml, xml.root["document_suffix"], tag_name, attribute_name, isodoc
+            .each do |(tag_name, attr_name)|
+              #tag_name == "xref" and tag_name = "fmt-xref"
+            ::Metanorma::Collection::Util::add_suffix_to_attrs(
+              xml, xml.root["document_suffix"], tag_name, attr_name, isodoc
             )
           end
           key
@@ -22,21 +24,21 @@ module Metanorma
           @isodoc.ns(xpath)
         end
 
-        def xref_process(section, xml, key, ident, isodoc)
+        def xref_process(section, xml, key, ident, isodoc, presxml)
           @isodoc ||= isodoc
-          svg_preprocess(section, Metanorma::Utils::to_ncname(ident))
-          refs = eref_to_internal_eref(section, xml, key)
-          refs += xref_to_internal_eref(section, xml, key)
+          svg_preprocess(section, Metanorma::Utils::to_ncname(ident), presxml)
+          refs = eref_to_internal_eref(section, xml, key, presxml)
+          refs += xref_to_internal_eref(section, xml, key, presxml)
           ins = new_hidden_ref(section)
           copied_refs = copy_repo_items_biblio(ins, section, xml)
           insert_indirect_biblio(ins, refs - copied_refs, key, xml)
         end
 
-        def svg_preprocess(xml, doc_suffix)
+        def svg_preprocess(xml, doc_suffix, presxml)
           suffix = doc_suffix.nil? || doc_suffix.blank? ? "" : "_#{doc_suffix}"
           xml.xpath("//m:svg", "m" => "http://www.w3.org/2000/svg").each do |s|
             m = svgmap_wrap(s)
-            svg_xrefs(s, m, suffix)
+            svg_xrefs(s, m, suffix, presxml)
           end
           xml
         end
@@ -48,12 +50,13 @@ module Metanorma
           svg.at("./ancestor::xmlns:svgmap")
         end
 
-        def svg_xrefs(svg, svgmap, suffix)
+        def svg_xrefs(svg, svgmap, suffix, presxml)
+          tag = presxml ? "fmt-xref" : "xref"
           svg.xpath(".//m:a", "m" => "http://www.w3.org/2000/svg").each do |a|
             /^#/.match? a["href"] or next
             a["href"] = a["href"].sub(/^#/, "")
             svgmap << "<target href='#{a['href']}'>" \
-              "<xref target='#{a['href']}#{suffix}'/></target>"
+              "<#{tag} target='#{a['href']}#{suffix}'/></target>"
           end
         end
 
@@ -65,15 +68,16 @@ module Metanorma
               "#{anchor}</referenceFrom></locality></localityStack>"
         end
 
-        def xref_to_internal_eref(section, xml, key)
+        def xref_to_internal_eref(section, xml, key, presxml)
           key or return [] # no sectionsplit, no playing with xrefs
           bibitems, indirect = xref_to_internal_eref_prep(section, xml)
-          section.xpath(ns("//xref")).each_with_object({}) do |x, m|
+          tag = presxml ? "fmt-xref" : "xref"
+          section.xpath(ns("//#{tag}")).each_with_object({}) do |x, m|
             xref_prefix_key(x, key, indirect)
             x["bibitemid"] = x["target"]
             m[x["bibitemid"]] = true
             xref_to_internal_eref_anchor(x, key, bibitems,
-                                         xml.root["document_suffix"])
+                                         xml.root["document_suffix"], presxml)
           end.keys
         end
 
@@ -84,7 +88,7 @@ module Metanorma
           [bibitems, indirect_bibitems]
         end
 
-        def xref_to_internal_eref_anchor(xref, key, bibitems, document_suffix)
+        def xref_to_internal_eref_anchor(xref, key, bibitems, document_suffix, presxml)
           t = xref["target"]
           if d = bibitems[t]&.at(ns("./docidentifier[@type = 'repository']"))
             m = %r{^([^/]+)}.match(d.text) and
@@ -93,7 +97,7 @@ module Metanorma
           key and t.sub!(%r{^#{key}_}, "")
           make_anchor(xref, t.sub(%r(_#{document_suffix}$), ""))
           xref.delete("target")
-          xref.name = "eref"
+          xref.name = presxml ? "fmt-eref" : "eref"
         end
 
         def xref_prefix_key(xref, key, indirect)
@@ -106,30 +110,40 @@ module Metanorma
           end
         end
 
-        def eref_to_internal_eref(section, xml, key)
-          bibitems, indirect, bibids = eref_to_internal_eref_prep(section, xml)
-          eref_to_internal_eref_select(section, xml, bibitems)
+        def select_citation_uri(bib, lang)
+          bib or return
+          url = bib.at(ns("./uri[@type = 'citation']" \
+                          "[@language = '#{lang}']")) ||
+            bib.at(ns("./uri[@type = 'citation']"))
+          url&.text
+        end
+
+        def eref_to_internal_eref(section, xml, key, presxml)
+          bibitems, indirect, bibids, lang =
+            eref_to_internal_eref_prep(section, xml, presxml)
+          eref_to_internal_eref_select(section, xml, bibitems, presxml)
             .each_with_object([]) do |x, m|
-              url = bibitems[x]&.at(ns("./uri[@type = 'citation']"))&.text
+              url = select_citation_uri(bibitems[x], lang)
               bibids[x]&.each do |e|
                 e.at(ns("./localityStack | ./locality")) and next
-                id = eref_to_internal_eref1(e, key, url, indirect) and m << id
+                id = eref_to_internal_eref1(e, key, url, indirect, presxml) and m << id
               end
             end
         end
 
-        def eref_to_internal_eref_prep(section, xml)
+        def eref_to_internal_eref_prep(section, xml, presxml)
           bibitems = ::Metanorma::Collection::Util::gather_bibitems(xml)
             .delete_if { |_, v| internal_bib?(v) }
           indirect = ::Metanorma::Collection::Util::gather_bibitems(xml)
             .select { |_, v| indirect_bib?(v) }
-          bibitemids = ::Metanorma::Collection::Util::gather_bibitemids(section)
-          [bibitems, indirect, bibitemids]
+          bibitemids = ::Metanorma::Collection::Util::gather_bibitemids(section, presxml)
+          lang = xml.at(ns("//bibdata/language"))&.text || "en"
+          [bibitems, indirect, bibitemids, lang]
         end
 
-        def eref_to_internal_eref1(elem, key, url, indirect)
+        def eref_to_internal_eref1(elem, key, url, indirect, presxml)
           if url
-            elem.name = "link"
+            elem.name = presxml ? "fmt-link" : "link"
             elem["target"] = url
             nil
           elsif !indirect[elem["bibitemid"]]
@@ -152,8 +166,8 @@ module Metanorma
           elem["bibitemid"]
         end
 
-        def eref_to_internal_eref_select(section, _xml, bibitems)
-          refs = ::Metanorma::Collection::Util::gather_bibitemids(section).keys
+        def eref_to_internal_eref_select(section, _xml, bibitems, presxml)
+          refs = ::Metanorma::Collection::Util::gather_bibitemids(section, presxml).keys
           refs.uniq.reject do |x|
             b = bibitems[x] and (indirect_bib?(b) || internal_bib?(b))
           end

data/lib/metanorma/compile/compile.rb

@@ -28,11 +28,12 @@ module Metanorma
     def compile(filename, options = {})
       options_process(filename, options)
       @processor = @registry.find_processor(options[:type].to_sym)
-      extensions = get_extensions(options) or return nil
       (file, isodoc = process_input(filename, options)) or return nil
+      extensions = get_extensions(options) or return nil
       relaton_export(isodoc, options)
       extract(isodoc, options[:extract], options[:extract_type])
       process_exts(filename, extensions, file, isodoc, options)
+    ensure
       clean_exit(options)
     end
 
@@ -113,6 +114,14 @@ module Metanorma
       fnames = { xml: f.sub(/\.[^.]+$/, ".xml"), f: f,
                  orig_filename: File.expand_path(filename),
                  presentationxml: f.sub(/\.[^.]+$/, ".presentation.xml") }
+      if extensions == %i(presentation)
+        process_ext(:presentation, file, isodoc, fnames, options)
+      else
+      process_exts_queue(fnames, extensions, file, isodoc, options)
+      end
+    end
+
+    def process_exts_queue(fnames, extensions, file, isodoc, options)
       @queue = ::Metanorma::Util::WorkersPool
         .new(ENV["METANORMA_PARALLEL"]&.to_i || 3)
       gather_and_install_fonts(file, options.dup, extensions)
@@ -149,7 +158,8 @@ module Metanorma
       if ext == :rxl
         relaton_export(isodoc, options.merge(relaton: fnames[:out]))
       elsif options[:passthrough_presentation_xml] && ext == :presentation
-        f = File.exist?(fnames[:f]) ? fnames[:f] : fnames[:orig_filename]
+        #f = File.exist?(fnames[:f]) ? fnames[:f] : fnames[:orig_filename]
+        f = File.exist?(fnames[:orig_filename]) ? fnames[:orig_filename] : fnames[:f]
         FileUtils.cp f, fnames[:presentationxml]
       elsif ext == :html && options[:sectionsplit]
         sectionsplit_convert(fnames[:xml], isodoc, fnames[:out],

data/lib/metanorma/compile/compile_options.rb

@@ -73,6 +73,8 @@ module Metanorma
 
     def get_isodoc_options(file, options, ext)
       ret = @processor.extract_options(file)
+      dir = options[:filename].sub(%r(/[^/]+$), "/")
+      ret[:i18nyaml] &&= File.join(dir, ret[:i18nyaml])
       copy_isodoc_options_attrs(options, ret)
       font_manifest_mn2pdf(options, ret, ext)
       ret[:output_formats]&.select! do |k, _|

data/lib/metanorma/compile/compile_validate.rb

@@ -33,15 +33,15 @@ module Metanorma
                  "support the standard type #{stdtype}. Exiting.", :fatal)
     end
 
-    private
-
-    STDTYPE2FLAVOR = {}.freeze
-
     def stdtype2flavor(stdtype)
       flavor = STDTYPE2FLAVOR[stdtype] || stdtype
       "metanorma-#{flavor}"
     end
 
+    private
+
+    STDTYPE2FLAVOR = {}.freeze
+
     def require_flavor(flavor)
       require flavor
       Util.log("[metanorma] Info: gem `#{flavor}` loaded.", :info)

data/lib/metanorma/compile/extract.rb

@@ -1,8 +1,7 @@
 module Metanorma
   class Compile
     def relaton_export(isodoc, options)
-      return unless options[:relaton]
-
+      options[:relaton] or return
       xml = Nokogiri::XML(isodoc, &:huge)
       bibdata = xml.at("//bibdata") || xml.at("//xmlns:bibdata")
       # docid = bibdata&.at("./xmlns:docidentifier")&.text || options[:filename]
@@ -18,8 +17,7 @@ module Metanorma
     end
 
     def extract(isodoc, dirname, extract_types)
-      return unless dirname
-
+      dirname or return
       extract_types.nil? || extract_types.empty? and
         extract_types = %i[sourcecode image requirement]
       FileUtils.rm_rf dirname

data/lib/metanorma/input/asciidoc.rb

@@ -10,39 +10,20 @@ module Metanorma
                      novalid: options[:novalid],
                      attributes: ["nodoc", "stem", "docfile=#{filename}",
                                   "output_dir=#{options[:output_dir]}"] }
-        unless asciidoctor_validate(file, filename, out_opts)
-          warn "Cannot continue compiling Asciidoctor document"
-          abort
-        end
         ::Asciidoctor.convert(file, out_opts)
       end
 
-      def asciidoctor_validate(file, filename, options)
-        err = nil
-        begin
-          previous_stderr = $stderr
-          $stderr = StringIO.new
-          ::Asciidoctor.load(file, options)
-          %r{(\n|^)asciidoctor: ERROR: ['"]?#{Regexp.escape(filename ||
-            '<empty>')}['"]?: line \d+: include file not found: }
-            .match($stderr.string) and err = $stderr.string
-        ensure
-          $stderr = previous_stderr
-        end
-        warn err unless err.nil?
-        err.nil?
-      end
-
       def extract_metanorma_options(file)
-        headerextract = file.sub(/\n\n.*$/m, "\n")
-        /\n:mn-document-class:\s+(?<type>\S[^\n]*)\n/ =~ headerextract
-        /\n:mn-output-extensions:\s+(?<extensions>\S[^\n]*)\n/ =~ headerextract
-        /\n:mn-relaton-output-file:\s+(?<relaton>\S[^\n]*)\n/ =~ headerextract
-        /\n(?<asciimath>:mn-keep-asciimath:[^\n]*)\n/ =~ headerextract
-        /\n(?<novalid>:novalid:[^\n]*)\n/ =~ headerextract
-        asciimath = if defined?(asciimath)
-                      !asciimath.nil? && asciimath != ":mn-keep-asciimath: false"
-                    end
+        hdr = file.sub(/\n\n.*$/m, "\n")
+        /\n:(?:mn-)?(?:document-class|flavor):\s+(?<type>\S[^\n]*)\n/ =~ hdr
+        /\n:(?:mn-)?output-extensions:\s+(?<extensions>\S[^\n]*)\n/ =~ hdr
+        /\n:(?:mn-)?relaton-output-file:\s+(?<relaton>\S[^\n]*)\n/ =~ hdr
+        /\n(?<asciimath>:(?:mn-)?keep-asciimath:[^\n]*)\n/ =~ hdr
+        /\n(?<novalid>:novalid:[^\n]*)\n/ =~ hdr
+        if defined?(asciimath)
+          asciimath =
+            !asciimath.nil? && !/keep-asciimath: false/.match?(asciimath)
+        end
         asciimath = nil if asciimath == false
         {
           type: defined?(type) ? type&.strip : nil,
@@ -82,7 +63,7 @@ module Metanorma
            toc-tables toc-recommendations).freeze
 
       def attr_name_normalise(name)
-        name.gsub("-", "").sub(/override$/, "_override").sub(/pdf$/, "_pdf")
+        name.delete("-").sub(/override$/, "_override").sub(/pdf$/, "_pdf")
           .to_sym
       end
 

data/lib/metanorma/registry/registry.rb

@@ -16,8 +16,8 @@ module Metanorma
       @aliases = { csd: :cc, m3d: :m3aawg, mpfd: :mpfa, csand: :csa }
     end
 
-    def alias(x)
-      @aliases[x]
+    def alias(flavour)
+      @aliases[flavour]
     end
 
     def register(processor)

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.0.0".freeze
+  VERSION = "2.1.2".freeze
 end

data/metanorma.gemspec

@@ -21,15 +21,15 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   spec.add_runtime_dependency "asciidoctor"
+  spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "fontist", ">= 1.14.3"
   spec.add_runtime_dependency "htmlentities"
-  spec.add_runtime_dependency "isodoc", ">= 2.6.3"
-  spec.add_runtime_dependency "mn2pdf", "~> 1"
+  spec.add_runtime_dependency "isodoc", ">= 3.0.0"
+  spec.add_runtime_dependency "mn2pdf", "~> 2"
   spec.add_runtime_dependency "nokogiri"
-  spec.add_runtime_dependency "shale"
 
   # get relaton-cli to avoid circular reference with metanorma-standoc
   # spec.add_dependency "relaton-cli"
@@ -46,4 +46,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "sassc", "~> 2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
+  spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fontist
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +72,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shale
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -296,12 +310,15 @@ files:
 - lib/metanorma/collection/filelookup/filelookup.rb
 - lib/metanorma/collection/filelookup/filelookup_sectionsplit.rb
 - lib/metanorma/collection/manifest/manifest.rb
+- lib/metanorma/collection/multilingual/multilingual.rb
 - lib/metanorma/collection/renderer/fileparse.rb
 - lib/metanorma/collection/renderer/fileprocess.rb
 - lib/metanorma/collection/renderer/navigation.rb
 - lib/metanorma/collection/renderer/render_word.rb
 - lib/metanorma/collection/renderer/renderer.rb
+- lib/metanorma/collection/renderer/svg.rb
 - lib/metanorma/collection/renderer/utils.rb
+- lib/metanorma/collection/sectionsplit/collection.rb
 - lib/metanorma/collection/sectionsplit/sectionsplit.rb
 - lib/metanorma/collection/util/disambig_files.rb
 - lib/metanorma/collection/util/util.rb
@@ -317,7 +334,6 @@ files:
 - lib/metanorma/processor.rb
 - lib/metanorma/processor/processor.rb
 - lib/metanorma/registry/registry.rb
-- lib/metanorma/shale_monkeypatch.rb
 - lib/metanorma/util/fontist_helper.rb
 - lib/metanorma/util/util.rb
 - lib/metanorma/util/worker_pool.rb
@@ -327,7 +343,7 @@ homepage: https://github.com/metanorma/metanorma
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -335,7 +351,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -343,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create
   any standard document type supported by Metanorma.

data/lib/metanorma/shale_monkeypatch.rb

@@ -1,15 +0,0 @@
-module Shale
-  module Adapter
-    module Nokogiri
-      class Node
-        def content
-          @node
-        end
-
-        def to_xml
-          @node.to_xml
-        end
-      end
-    end
-  end
-end