metanorma 1.3.9 → 1.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ea9a7ce8316d94001c40043488f3472bcf639264e446bfb5bfaad88b6bed70
-  data.tar.gz: 7e4bfc4c4346c518d845052fd2dbb0b1f51f63e2951a317c18d938f9663cdea3
+  metadata.gz: 6e0318ba6a8281b9d412916b46fa57cc2de00a2738dd7703425c3f3736d92ae8
+  data.tar.gz: 03d43c3e079517e202ba7e6d48f67ba792741db08ad026392169d19ffdc5a5d5
 SHA512:
-  metadata.gz: fdb777c1e35bbeeac65f3e5b0654ead9633a196340017da8cd4bd84342a9500a891a14ac19d83cc0cda0e5301728afdddf367fa3871eece62b389d93d0144238
-  data.tar.gz: c264222db4c7e2cbd7342aac8da9c5480a1d48f277ce2c5ef23000443d618379abb0769d111a8846733d60a53364706a65edd1a14de7ada03b94d16182c479bb
+  metadata.gz: 3cc705935cee37831ad02b8ca85f556f9d2ec8cec8c341a045f34d96621b20e79455533a22262004b363d6f10a1523505cea14bc489fa1d47d9406870e1acc7f
+  data.tar.gz: a9d55375a16afb0ed0ee9e392dc2cc134f9a0e424fbadbb8f7b9f5fe940d944867c9d5e32e39f79fcf6d594381a7f2c90a9d70502b5108668c181e628e32f83e

data/lib/metanorma/collection_fileparse.rb

@@ -44,7 +44,7 @@ module Metanorma
       newbib = dup_bibitem(docid, bib)
       bib.replace(newbib)
       _file, url = targetfile(@files[docid], relative: true, read: false,
-                              doc: !@files[docid][:attachment])
+                                             doc: !@files[docid][:attachment])
       uri_node = Nokogiri::XML::Node.new "uri", newbib
       uri_node[:type] = "citation"
       uri_node.content = url
@@ -53,7 +53,7 @@ module Metanorma
 
     def fail_update_bibitem(docid, identifier)
       error = "[metanorma] Cannot find crossreference to document #{docid} "\
-        "in document #{identifier}."
+              "in document #{identifier}."
       @log.add("Cross-References", nil, error)
       Util.log(error, :warning)
     end
@@ -78,6 +78,7 @@ module Metanorma
     # @return [String] XML content
     def update_xrefs(file, identifier, internal_refs)
       docxml = Nokogiri::XML(file) { |config| config.huge }
+      supply_repo_ids(docxml)
       update_indirect_refs_to_docs(docxml, internal_refs)
       add_document_suffix(identifier, docxml)
       update_direct_refs_to_docs(docxml, identifier)
@@ -89,6 +90,18 @@ module Metanorma
       docxml.to_xml
     end
 
+    def supply_repo_ids(docxml)
+      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}"
+        end
+      end
+    end
+
     def datauri_encode(docxml)
       docxml.xpath(ns("//image")).each do |i|
         i["src"] = Metanorma::Utils::datauri(i["src"])
@@ -161,7 +174,7 @@ module Metanorma
         if @files[docid] then update_anchor_loc(bib, e, docid)
         else
           e << "<strong>** Unresolved reference to document #{docid} "\
-            "from eref</strong>"
+               "from eref</strong>"
         end
       end
     end
@@ -188,7 +201,7 @@ module Metanorma
       ref = ins&.at(ns("./locality/referenceFrom"))&.text
       anchor = @files[docid][:anchors].dig(type, ref) or return
       ins << "<locality type='anchor'><referenceFrom>#{anchor.sub(/^_/, '')}"\
-        "</referenceFrom></locality>"
+             "</referenceFrom></locality>"
     end
 
     # gather internal bibitem references

data/lib/metanorma/collection_fileprocess.rb

@@ -49,7 +49,7 @@ module Metanorma
     end
 
     def add_section_split_cover(files, manifest, ident)
-      cover = section_split_cover(manifest, ident)
+      cover = section_split_cover(manifest, dir_name_cleanse(ident))
       files[ident][:out_path] = cover
       { attachment: true, index: false, out_path: cover,
         ref: File.join(File.dirname(manifest.file), cover) }

data/lib/metanorma/collection_renderer.rb

@@ -33,7 +33,7 @@ module Metanorma
       # output processor for flavour
       @isodoc = isodoc
 
-      @outdir = options[:output_folder]
+      @outdir = dir_name_cleanse(options[:output_folder])
       @coverpage = options[:coverpage]
       @format = Util.sort_extensions_execution(options[:format])
       @compile_options = options[:compile] || {}
@@ -51,6 +51,10 @@ module Metanorma
       FileUtils.mkdir_p @outdir
     end
 
+    def dir_name_cleanse(name)
+      name.gsub(/[<>:"|?*]/, "_")
+    end
+
     # @param col [Metanorma::Collection] XML collection
     # @param options [Hash]
     # @option options [String] :coverpage cover page HTML (Liquid template)

data/lib/metanorma/compile.rb

@@ -214,6 +214,10 @@ module Metanorma
         elsif ext == :html && options[:sectionsplit]
           sectionsplit_convert(xml_name, isodoc, outfilename, isodoc_options)
         else
+          if ext == :pdf
+            floc = FontistUtils.fontist_font_locations(@processor, options)
+            isodoc_options[:mn2pdf] = { font_manifest_file: floc.path } if floc
+          end
           begin
             if @processor.use_presentation_xml(ext)
               @processor.output(nil, presentationxml_name, outfilename, ext,
@@ -245,13 +249,10 @@ module Metanorma
       isodoc_options = @processor.extract_options(file)
       isodoc_options[:datauriimage] = true if options[:datauriimage]
       isodoc_options[:sourcefilename] = options[:filename]
-      %i(bare sectionsplit no_install_fonts).each do |x|
+      %i(bare sectionsplit no_install_fonts baseassetpath aligncrosselements)
+        .each do |x|
         isodoc_options[x] ||= options[x]
       end
-      if ext == :pdf
-        floc = FontistUtils.fontist_font_locations(@processor, options) and
-          isodoc_options[:mn2pdf] = { font_manifest_file: floc.path }
-      end
       isodoc_options
     end
 

data/lib/metanorma/input/asciidoc.rb

@@ -49,7 +49,7 @@ module Metanorma
           extensions: defined?(extensions) ? extensions : nil,
           relaton: defined?(relaton) ? relaton : nil,
           asciimath: asciimath,
-        }.reject { |_, val| val.nil? }
+        }.compact
       end
 
       def empty_attr(attr, name)
@@ -60,9 +60,9 @@ module Metanorma
                         scripts-override scripts-pdf wordstylesheet i18nyaml
                         standardstylesheet header wordcoverpage wordintropage
                         ulstyle olstyle htmlstylesheet-override bare
-                        htmltoclevels doctoclevels sectionsplit
+                        htmltoclevels doctoclevels sectionsplit base-asset-path
                         body-font header-font monospace-font title-font
-                        wordstylesheet-override).freeze
+                        align-cross-elements wordstylesheet-override).freeze
 
       def extract_options(file)
         header = file.sub(/\n\n.*$/m, "\n")
@@ -75,6 +75,7 @@ module Metanorma
         /\n:(?<hier_assets>hierarchical-assets:[^\n]*)\n/ =~ header
         /\n:(?<use_xinclude>use-xinclude:[^\n]*)\n/ =~ header
         /\n:(?<break_up>break-up-urls-in-tables:[^\n]*)\n/ =~ header
+        /\n:suppress-asciimath-dup: (?<suppress_asciimath_dup>[^\n]+)\n/ =~ header
 
         defined?(hier_assets) and
           hier_assets = empty_attr(hier_assets, "hierarchical-assets")
@@ -84,10 +85,11 @@ module Metanorma
           break_up = empty_attr(break_up, "break-up-urls-in-tables")
         ret.merge(
           datauriimage: defined?(datauriimage) ? datauriimage != "false" : nil,
+          suppressasciimathdup: defined?(suppress_asciimath_dup) ? suppress_asciimath_dup != "false" : nil,
           hierarchical_assets: defined?(hier_assets) ? hier_assets : nil,
           use_xinclude: defined?(use_xinclude) ? use_xinclude : nil,
           break_up_urls_in_tables: defined?(break_up) ? break_up : nil,
-        ).reject { |_, val| val.nil? }
+        ).compact
       end
     end
   end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.3.9".freeze
+  VERSION = "1.3.12".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor