metanorma 1.3.8 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b82f79d4ce3a18564bd84c137faeca4daf763e2284464f390476fb881a0996
-  data.tar.gz: f6a33995af907243fd0ae9ebff3676467455f21cd502089da6599783b4ba4e86
+  metadata.gz: f054752f3bb51d3e1cfe983beaca06c817275d214d5652503a42325d93403a42
+  data.tar.gz: 212a35305289d4286539dcdb008bf799fac028e87a84aab0a33b8137c73d84d5
 SHA512:
-  metadata.gz: 484b71a094f6e23f5e512ffcbc8eac5bed0cd6d5b3fc6e952a28ce05e0e9eef3b64bff995692fd43f36b0c7888814b20318559aeeb0d9dee7900baf0847d95b8
-  data.tar.gz: 508757811e5a63b30b91d4353fdc2a983bfe269da85f39b9be50d0c6a904113965ae53c40052cd43fb38ee740c350b9922d114bfd21833383a525782d278f95c
+  metadata.gz: c23014599c6a03a04b0dfa4fe93c6b300b0311ff55e552a5f1bd79a2d55220789c94916a9c6b694a044cd9247dcd95d1ab6dde05e0e7d949a29bcaedb07d8807
+  data.tar.gz: 98da695a8d3cd9b93f244161b8e0874b7851bb6426fd686cabcafe493f8088b0af2923a216b2741d34a2532b8f76adc3ac377af1caa8a639fdd27ba4c1866ef7

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

@@ -52,7 +52,7 @@ module Metanorma
     def options_extract(filename, options)
       content = read_file(filename)
       o = Metanorma::Input::Asciidoc.new.extract_metanorma_options(content)
-      o = o.merge(xml_options_extract(content))
+        .merge(xml_options_extract(content))
       options[:type] ||= o[:type]&.to_sym
       t = @registry.alias(options[:type]) and options[:type] = t
       dir = filename.sub(%r(/[^/]+$), "/")
@@ -130,9 +130,7 @@ module Metanorma
 
     def clean_sourcecode(xml)
       xml.xpath(".//callout | .//annotation | .//xmlns:callout | "\
-                ".//xmlns:annotation").each do |x|
-        x.remove
-      end
+                ".//xmlns:annotation").each(&:remove)
       xml.xpath(".//br | .//xmlns:br").each { |x| x.replace("\n") }
       HTMLEntities.new.decode(xml.children.to_xml)
     end
@@ -177,8 +175,8 @@ module Metanorma
     end
 
     REQUIREMENT_XPATH = "//requirement | //xmlns:requirement | "\
-      "//recommendation | //xmlns:recommendation | //permission | "\
-      "//xmlns:permission".freeze
+                        "//recommendation | //xmlns:recommendation | //permission | "\
+                        "//xmlns:permission".freeze
 
     def requirement_export(xml, dirname)
       xml.at(REQUIREMENT_XPATH) or return
@@ -218,9 +216,11 @@ module Metanorma
         else
           begin
             if @processor.use_presentation_xml(ext)
-              @processor.output(nil, presentationxml_name, outfilename, ext, isodoc_options)
+              @processor.output(nil, presentationxml_name, outfilename, ext,
+                                isodoc_options)
             else
-              @processor.output(isodoc, xml_name, outfilename, ext, isodoc_options)
+              @processor.output(isodoc, xml_name, outfilename, ext,
+                                isodoc_options)
             end
           rescue StandardError => e
             isodoc_error_process(e)
@@ -245,7 +245,7 @@ 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).each do |x|
         isodoc_options[x] ||= options[x]
       end
       if ext == :pdf

data/lib/metanorma/input/asciidoc.rb

@@ -60,7 +60,7 @@ 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
 
@@ -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,6 +85,7 @@ 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,

data/lib/metanorma/sectionsplit.rb

@@ -46,8 +46,7 @@ module Metanorma
 
     def coll_cover
       <<~COVER
-        <html>
-          <head/>
+        <html><head/>
             <body>
               <h1>{{ doctitle }}</h1>
               <h2>{{ docnumber }}</h2>
@@ -102,17 +101,6 @@ module Metanorma
       outname
     end
 
-    #     def xref_preprocess(xml)
-    #       svg_preprocess(xml)
-    #       key = (0...8).map { rand(65..90).chr }.join # random string
-    #       xml.root["type"] = key # to force recognition of internal refs
-    #       refs = eref_to_internal_eref(xml, key)
-    #       refs += xref_to_internal_eref(xml, key)
-    #       ins = new_hidden_ref(xml)
-    #       copy_repo_items_biblio(ins, xml)
-    #       insert_indirect_biblio(ins, refs, key)
-    #     end
-
     def xref_preprocess(xml)
       svg_preprocess(xml)
       key = (0...8).map { rand(65..90).chr }.join # random string
@@ -136,7 +124,7 @@ module Metanorma
 
           a["href"] = a["href"].sub(/^#/, "")
           m << "<target href='#{a['href']}'>"\
-            "<xref target='#{a['href']}'/></target>"
+               "<xref target='#{a['href']}'/></target>"
         end
       end
     end
@@ -224,9 +212,7 @@ module Metanorma
 
     def recursive_string_keys(hash)
       case hash
-      when Hash then Hash[
-        hash.map { |k, v| [k.to_s, recursive_string_keys(v)] }
-      ]
+      when Hash then hash.map { |k, v| [k.to_s, recursive_string_keys(v)] }.to_h
       when Enumerable then hash.map { |v| recursive_string_keys(v) }
       else
         hash
@@ -246,9 +232,8 @@ module Metanorma
         directives: ["presentation-xml", "bare-after-first"],
         bibdata: {
           title: {
-            type: "title-main",
-            language: @lang,
-            content: xml.at(ns("//bibdata/title")).text,
+            type: "title-main", language: @lang,
+            content: xml.at(ns("//bibdata/title")).text
           },
           type: "collection",
           docid: {
@@ -257,11 +242,10 @@ module Metanorma
           },
         },
         manifest: {
-          level: "collection",
-          title: "Collection",
+          level: "collection", title: "Collection",
           docref: files.sort_by { |f| f[:order] }.each.map do |f|
             { fileref: f[:url], identifier: f[:title] }
-          end,
+          end
         },
       }
       recursive_string_keys(ret).to_yaml

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.3.8".freeze
+  VERSION = "1.3.11".freeze
 end

data/metanorma.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.5.0"
 
   spec.add_runtime_dependency "asciidoctor"
-  spec.add_runtime_dependency "fontist", "~> 1.9.0"
+  spec.add_runtime_dependency "fontist", "~> 1.11"
   spec.add_runtime_dependency "htmlentities"
   spec.add_runtime_dependency "metanorma-utils", "~> 1.2.0"
   spec.add_runtime_dependency "mn2pdf", "~> 1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement