metanorma 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 539ee4d965aaed56cda517046d0a920d4ddebeba3844bac78107269c2cf5413e
-  data.tar.gz: 86dcc77ca4ced164f69bab210e004f02a3d4d23cecb9803c8a3d341deaf1964d
+  metadata.gz: d977a50a2b1b4c0a016439be744d32ef51fad6a4f0e5869f0ea31654065bb584
+  data.tar.gz: 3da646653cdea95e20f7e0c5ee07a9ccf301b4f73506d1f65059e03b71c064de
 SHA512:
-  metadata.gz: ac4a4d6372d7c76fa7013443d45e7ef21d503147ce16592041d041ce7015351a88af7fa28dd1b9e5db315ddf5d684389026f8a90d51ece750fc8e232b46c1d8c
-  data.tar.gz: 7a090eea1ff61230a291fe434f4a41ac882c51a51045404ab03010903799f8f666c7fab678b86e8fda062cfb0699a0c0f667dbad632f0682f4361b5b4acfd586
+  metadata.gz: be99d0c2c11598c9e5dcd05df5da7a1bcdf49a161a56928ef8c1873bae349b401823d5f112b2aa4e0350bc20511125921c626fbd4c7ef862f6291476a409281c
+  data.tar.gz: aaba4884d254314d5f3436d6f709503a34810398f093e1010cb4186c2bb1fcd7ebc1b41725dc0542db3ce4a7896f151b826a146332d3a4a2fffb0be47f9a3482

data/Gemfile

@@ -9,3 +9,4 @@ gemspec
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
+

data/lib/metanorma/collection.rb

@@ -91,12 +91,9 @@ module Metanorma
       private
 
       def parse_xml(file)
-        xml = Nokogiri::XML File.read(file, encoding: "UTF-8") do |config|
-          config.huge
-        end
-        if (b = xml.at("/xmlns:metanorma-collection/xmlns:bibdata"))
-          bd = Relaton::Cli.parse_xml b
-        end
+        xml = Nokogiri::XML File.read(file, encoding: "UTF-8") { |c| c.huge }
+        (b = xml.at("/xmlns:metanorma-collection/xmlns:bibdata")) and
+          bd = Relaton::Cli.parse_xml(b)
         mnf_xml = xml.at("/xmlns:metanorma-collection/xmlns:manifest")
         mnf = CollectionManifest.from_xml mnf_xml
         pref = pref_final_content xml.at("//xmlns:prefatory-content")

data/lib/metanorma/collection_fileparse.rb

@@ -83,11 +83,15 @@ module Metanorma
       add_document_suffix(identifier, docxml)
       update_direct_refs_to_docs(docxml, identifier)
       svgmap_resolve(datauri_encode(docxml))
+      hide_refs(docxml)
+      docxml.to_xml
+    end
+
+    def hide_refs(docxml)
       docxml.xpath(ns("//references[bibitem][not(./bibitem[not(@hidden) or "\
                       "@hidden = 'false'])]")).each do |f|
         f["hidden"] = "true"
       end
-      docxml.to_xml
     end
 
     def supply_repo_ids(docxml)
@@ -97,7 +101,8 @@ module Metanorma
         b.xpath(ns("./docidentifier")).each do |d|
           next unless @files[d.text]
 
-          d.next = "<docidentifier type='repository'>current-metanorma-collection/#{d.text}"
+          d.next = "<docidentifier type='repository'>"\
+                   "current-metanorma-collection/#{d.text}"
         end
       end
     end
@@ -111,29 +116,30 @@ module Metanorma
 
     def svgmap_resolve(docxml)
       isodoc = IsoDoc::Convert.new({})
+      isodoc.bibitem_lookup(docxml)
       docxml.xpath(ns("//svgmap//eref")).each do |e|
-        href = isodoc.eref_target(e)
-        next if href == "##{e['bibitemid']}" ||
-          href =~ /^#/ && !docxml.at("//*[@id = '#{href.sub(/^#/, '')}']")
-
-        e["target"] = href.strip
-        e.name = "link"
-        e&.elements&.remove
+        svgmap_resolve1(e, isodoc)
       end
       Metanorma::Utils::svgmap_rewrite(docxml, "")
     end
 
+    def svgmap_resolve1(eref, isodoc)
+      href = isodoc.eref_target(eref)
+      return if href == "##{eref['bibitemid']}" ||
+        (href =~ /^#/ && !docxml.at("//*[@id = '#{href.sub(/^#/, '')}']"))
+
+      eref["target"] = href.strip
+      eref.name = "link"
+      eref&.elements&.remove
+    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
     # Preferably with anchor, and is a job to realise dynamic lookup
     # of localities.
     def update_direct_refs_to_docs(docxml, identifier)
-      erefs = docxml.xpath(ns("//eref"))
-        .each_with_object({ citeas: {}, bibitemid: {} }) do |i, m|
-        m[:citeas][i["citeas"]] = true
-        m[:bibitemid][i["bibitemid"]] = true
-      end
+      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)
@@ -144,6 +150,14 @@ module Metanorma
       end
     end
 
+    def collect_erefs(docxml)
+      docxml.xpath(ns("//eref"))
+        .each_with_object({ citeas: {}, bibitemid: {} }) do |i, m|
+        m[:citeas][i["citeas"]] = true
+        m[:bibitemid][i["bibitemid"]] = true
+      end
+    end
+
     # Resolve erefs to a container of ids in another doc,
     # to an anchor eref (direct link)
     def update_indirect_refs_to_docs(docxml, internal_refs)

data/lib/metanorma/collection_fileprocess.rb

@@ -99,17 +99,15 @@ module Metanorma
       out = ref["attachment"] ? ref["fileref"] : File.basename(ref["fileref"])
       ret = if ref["fileref"]
               { type: "fileref", ref: @documents[identifier].file,
-                rel_path: ref["fileref"],
-                out_path: out }
-            else
-              { type: "id", ref: ref["id"] }
+                rel_path: ref["fileref"], out_path: out }
+            else { type: "id", ref: ref["id"] }
             end
       %i(attachment sectionsplit index).each do |s|
         ret[s] = ref[s.to_s] if ref[s.to_s]
       end
-      ret[:presentationxml] = ref["presentation-xml"] if ref["presentation-xml"]
-      ret[:bareafterfirst] = ref["bare-after-first"] if ref["bare-after-first"]
-      ret
+      ret[:presentationxml] = ref["presentation-xml"]
+      ret[:bareafterfirst] = ref["bare-after-first"]
+      ret.compact
     end
 
     def add_suffix_to_attributes(doc, suffix, tag_name, attribute_name)
@@ -189,6 +187,7 @@ module Metanorma
 
     def file_compile_formats(filename, identifier)
       file_id = @files[identifier]
+      @format << :presentation if @format.include?(:pdf)
       @format.each do |e|
         ext = @compile.processor.output_formats[e]
         fn = File.basename(filename).sub(/(?<=\.)[^.]+$/, ext.to_s)

data/lib/metanorma/collection_renderer.rb

@@ -62,7 +62,6 @@ module Metanorma
     # @option options [Strong] :ourput_folder output directory
     def self.render(col, options = {})
       folder = File.dirname col.file
-      # require "byebug"; byebug
       warn "\n\n\n\n\nRender Init: #{DateTime.now.strftime('%H:%M:%S')}"
       cr = new(col, folder, options)
       warn "\n\n\n\n\nRender Files: #{DateTime.now.strftime('%H:%M:%S')}"

data/lib/metanorma/compile.rb

@@ -8,6 +8,7 @@ require_relative "compile_validate"
 require_relative "fontist_utils"
 require_relative "util"
 require_relative "sectionsplit"
+require_relative "extract"
 
 module Metanorma
   class Compile
@@ -118,75 +119,9 @@ module Metanorma
       File.read(filename, encoding: "utf-8").gsub("\r\n", "\n")
     end
 
-    def relaton_export(isodoc, options)
-      return unless options[:relaton]
-
-      xml = Nokogiri::XML(isodoc) { |config| config.huge }
-      bibdata = xml.at("//bibdata") || xml.at("//xmlns:bibdata")
-      # docid = bibdata&.at("./xmlns:docidentifier")&.text || options[:filename]
-      # outname = docid.sub(/^\s+/, "").sub(/\s+$/, "").gsub(/\s+/, "-") + ".xml"
-      File.open(options[:relaton], "w:UTF-8") { |f| f.write bibdata.to_xml }
-    end
-
-    def clean_sourcecode(xml)
-      xml.xpath(".//callout | .//annotation | .//xmlns:callout | "\
-                ".//xmlns:annotation").each(&:remove)
-      xml.xpath(".//br | .//xmlns:br").each { |x| x.replace("\n") }
-      HTMLEntities.new.decode(xml.children.to_xml)
-    end
-
-    def extract(isodoc, dirname, extract_types)
-      return unless dirname
-
-      if extract_types.nil? || extract_types.empty?
-        extract_types = %i[sourcecode image requirement]
-      end
-      FileUtils.rm_rf dirname
-      FileUtils.mkdir_p dirname
-      xml = Nokogiri::XML(isodoc) { |config| config.huge }
-      sourcecode_export(xml, dirname) if extract_types.include? :sourcecode
-      image_export(xml, dirname) if extract_types.include? :image
-      requirement_export(xml, dirname) if extract_types.include? :requirement
-    end
-
-    def sourcecode_export(xml, dirname)
-      xml.at("//sourcecode | //xmlns:sourcecode") or return
-      FileUtils.mkdir_p "#{dirname}/sourcecode"
-      xml.xpath("//sourcecode | //xmlns:sourcecode").each_with_index do |s, i|
-        filename = s["filename"] || sprintf("sourcecode-%04d.txt", i)
-        File.open("#{dirname}/sourcecode/#{filename}", "w:UTF-8") do |f|
-          f.write clean_sourcecode(s.dup)
-        end
-      end
-    end
-
-    def image_export(xml, dirname)
-      xml.at("//image | //xmlns:image") or return
-      FileUtils.mkdir_p "#{dirname}/image"
-      xml.xpath("//image | //xmlns:image").each_with_index do |s, i|
-        next unless /^data:image/.match? s["src"]
-
-        %r{^data:image/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ s["src"]
-        filename = s["filename"] || sprintf("image-%04d.%s", i, imgtype)
-        File.open("#{dirname}/image/#{filename}", "wb") do |f|
-          f.write(Base64.strict_decode64(imgdata))
-        end
-      end
-    end
-
-    REQUIREMENT_XPATH = "//requirement | //xmlns:requirement | "\
-                        "//recommendation | //xmlns:recommendation | //permission | "\
-                        "//xmlns:permission".freeze
-
-    def requirement_export(xml, dirname)
-      xml.at(REQUIREMENT_XPATH) or return
-      FileUtils.mkdir_p "#{dirname}/requirement"
-      xml.xpath(REQUIREMENT_XPATH).each_with_index do |s, i|
-        filename = s["filename"] || sprintf("%s-%04d.xml", s.name, i)
-        File.open("#{dirname}/requirement/#{filename}", "w:UTF-8") do |f|
-          f.write s
-        end
-      end
+    def export_output(fname, content, **options)
+      mode = options[:binary] ? "wb" : "w:UTF-8"
+      File.open(fname, mode) { |f| f.write content }
     end
 
     def wrap_html(options, file_extension, outfilename)
@@ -201,18 +136,18 @@ module Metanorma
     # isodoc is Raw Metanorma XML
     def process_extensions(filename, extensions, file, isodoc, options)
       f = change_output_dir options
-      xml_name = f.sub(/\.[^.]+$/, ".xml")
-      presentationxml_name = f.sub(/\.[^.]+$/, ".presentation.xml")
+      name = { xml: f.sub(/\.[^.]+$/, ".xml"),
+               presentationxml: f.sub(/\.[^.]+$/, ".presentation.xml") }
       Util.sort_extensions_execution(extensions).each do |ext|
         file_extension = @processor.output_formats[ext]
-        outfilename = f.sub(/\.[^.]+$/, ".#{file_extension}")
+        name[:out] = f.sub(/\.[^.]+$/, ".#{file_extension}")
         isodoc_options = get_isodoc_options(file, options, ext)
         if ext == :rxl
-          relaton_export(isodoc, options.merge(relaton: outfilename))
+          relaton_export(isodoc, options.merge(relaton: name[:out]))
         elsif options[:passthrough_presentation_xml] && ext == :presentation
-          FileUtils.cp filename, presentationxml_name
+          FileUtils.cp filename, name[:presentationxml]
         elsif ext == :html && options[:sectionsplit]
-          sectionsplit_convert(xml_name, isodoc, outfilename, isodoc_options)
+          sectionsplit_convert(name[:xml], isodoc, name[:out], isodoc_options)
         else
           if ext == :pdf && FontistUtils.has_fonts_manifest?(@processor,
                                                              options)
@@ -220,20 +155,22 @@ module Metanorma
               font_manifest: FontistUtils.location_manifest(@processor),
             }
           end
-          begin
-            if @processor.use_presentation_xml(ext)
-              @processor.output(nil, presentationxml_name, outfilename, ext,
-                                isodoc_options)
-            else
-              @processor.output(isodoc, xml_name, outfilename, ext,
-                                isodoc_options)
-            end
-          rescue StandardError => e
-            isodoc_error_process(e)
-          end
+          process_extensions1(ext, name, isodoc, isodoc_options)
         end
-        wrap_html(options, file_extension, outfilename)
+        wrap_html(options, file_extension, name[:out])
+      end
+    end
+
+    def process_extensions1(ext, fnames, isodoc, isodoc_options)
+      if @processor.use_presentation_xml(ext)
+        @processor.output(nil, fnames[:presentationxml], fnames[:out], ext,
+                          isodoc_options)
+      else
+        @processor.output(isodoc, fnames[:xml], fnames[:out], ext,
+                          isodoc_options)
       end
+    rescue StandardError => e
+      isodoc_error_process(e)
     end
 
     private
@@ -247,7 +184,7 @@ module Metanorma
       end
     end
 
-    def get_isodoc_options(file, options, ext)
+    def get_isodoc_options(file, options, _ext)
       isodoc_options = @processor.extract_options(file)
       isodoc_options[:datauriimage] = true if options[:datauriimage]
       isodoc_options[:sourcefilename] = options[:filename]

data/lib/metanorma/extract.rb

@@ -0,0 +1,72 @@
+module Metanorma
+  class Compile
+    def relaton_export(isodoc, options)
+      return unless options[:relaton]
+
+      xml = Nokogiri::XML(isodoc) { |config| config.huge }
+      bibdata = xml.at("//bibdata") || xml.at("//xmlns:bibdata")
+      # docid = bibdata&.at("./xmlns:docidentifier")&.text || options[:filename]
+      # outname = docid.sub(/^\s+/, "").sub(/\s+$/, "").gsub(/\s+/, "-") + ".xml"
+      File.open(options[:relaton], "w:UTF-8") { |f| f.write bibdata.to_xml }
+    end
+
+    def clean_sourcecode(xml)
+      xml.xpath(".//callout | .//annotation | .//xmlns:callout | "\
+                ".//xmlns:annotation").each(&:remove)
+      xml.xpath(".//br | .//xmlns:br").each { |x| x.replace("\n") }
+      HTMLEntities.new.decode(xml.children.to_xml)
+    end
+
+    def extract(isodoc, dirname, extract_types)
+      return unless dirname
+
+      extract_types.nil? || extract_types.empty? and
+        extract_types = %i[sourcecode image requirement]
+      FileUtils.rm_rf dirname
+      FileUtils.mkdir_p dirname
+      xml = Nokogiri::XML(isodoc) { |config| config.huge }
+      sourcecode_export(xml, dirname) if extract_types.include? :sourcecode
+      image_export(xml, dirname) if extract_types.include? :image
+      extract_types.include?(:requirement) and
+        requirement_export(xml, dirname)
+    end
+
+    def sourcecode_export(xml, dirname)
+      xml.at("//sourcecode | //xmlns:sourcecode") or return
+      FileUtils.mkdir_p "#{dirname}/sourcecode"
+      xml.xpath("//sourcecode | //xmlns:sourcecode").each_with_index do |s, i|
+        filename = s["filename"] || sprintf("sourcecode-%04d.txt", i)
+        export_output("#{dirname}/sourcecode/#{filename}",
+                      clean_sourcecode(s.dup))
+      end
+    end
+
+    def image_export(xml, dirname)
+      xml.at("//image | //xmlns:image") or return
+      FileUtils.mkdir_p "#{dirname}/image"
+      xml.xpath("//image | //xmlns:image").each_with_index do |s, i|
+        next unless /^data:image/.match? s["src"]
+
+        %r{^data:image/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ s["src"]
+        fn = s["filename"] || sprintf("image-%<num>04d.%<name>s",
+                                      num: i, name: imgtype)
+        export_output("#{dirname}/image/#{fn}", Base64.strict_decode64(imgdata),
+                      binary: true)
+      end
+    end
+
+    REQUIREMENT_XPATH =
+      "//requirement | //xmlns:requirement | //recommendation | "\
+      "//xmlns:recommendation | //permission | //xmlns:permission".freeze
+
+    def requirement_export(xml, dirname)
+      xml.at(REQUIREMENT_XPATH) or return
+      FileUtils.mkdir_p "#{dirname}/requirement"
+      xml.xpath(REQUIREMENT_XPATH).each_with_index do |s, i|
+        fn = s["filename"] ||
+          sprintf("%<name>s-%<num>04d.xml", name: s.name, num: i)
+        export_output("#{dirname}/requirement/#{fn}", s)
+      end
+    end
+  end
+end

data/lib/metanorma/input/asciidoc.rb

@@ -56,13 +56,19 @@ module Metanorma
         attr&.sub(/^#{name}:\s*$/, "#{name}: true")&.sub(/^#{name}:\s+/, "")
       end
 
-      ADOC_OPTIONS = %w(htmlstylesheet htmlcoverpage htmlintropage scripts
-                        scripts-override scripts-pdf wordstylesheet i18nyaml
-                        standardstylesheet header wordcoverpage wordintropage
-                        ulstyle olstyle htmlstylesheet-override bare
-                        htmltoclevels doctoclevels sectionsplit base-asset-path
-                        body-font header-font monospace-font title-font
-                        align-cross-elements wordstylesheet-override).freeze
+      ADOC_OPTIONS =
+        %w(htmlstylesheet htmlcoverpage htmlintropage scripts
+           scripts-override scripts-pdf wordstylesheet i18nyaml
+           standardstylesheet header wordcoverpage wordintropage
+           ulstyle olstyle htmlstylesheet-override bare
+           htmltoclevels doctoclevels sectionsplit base-asset-path
+           body-font header-font monospace-font title-font
+           align-cross-elements wordstylesheet-override
+           pdf-encrypt pdf-encryption-length pdf-user-password
+           pdf-owner-password pdf-allow-copy-content pdf-allow-edit-content
+           pdf-allow-assemble-document pdf-allow-edit-annotations
+           pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
+           pdf-allow-access-content pdf-encrypt-metadata).freeze
 
       def extract_options(file)
         header = file.sub(/\n\n.*$/m, "\n")

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.4.2".freeze
+  VERSION = "1.4.3".freeze
 end

data/metanorma.gemspec

@@ -36,11 +36,12 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "metanorma-iso", "~> 1.9.0"
+  spec.add_development_dependency "metanorma-iso", "~> 1.10"
   spec.add_development_dependency "mnconvert"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-command", "~> 1.0"
   spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "sassc", "~> 2.4.0"
+  spec.add_development_dependency "reline", "~> 0.2.8.pre.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: reline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.8.pre.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.8.pre.11
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -274,6 +288,7 @@ files:
 - lib/metanorma/compile_validate.rb
 - lib/metanorma/config.rb
 - lib/metanorma/document.rb
+- lib/metanorma/extract.rb
 - lib/metanorma/fontist_utils.rb
 - lib/metanorma/input.rb
 - lib/metanorma/input/asciidoc.rb
@@ -303,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create