metanorma-standoc 2.1.5 → 2.2.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: metanorma-plugin-datastruct
   requirement: !ruby/object:Gem::Requirement
@@ -151,33 +151,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: metanorma-utils
+  name: mn-requirements
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement
@@ -477,6 +477,7 @@ files:
 - lib/metanorma/standoc/blocks_notes.rb
 - lib/metanorma/standoc/cleanup.rb
 - lib/metanorma/standoc/cleanup_amend.rb
+- lib/metanorma/standoc/cleanup_biblio.rb
 - lib/metanorma/standoc/cleanup_block.rb
 - lib/metanorma/standoc/cleanup_boilerplate.rb
 - lib/metanorma/standoc/cleanup_footnotes.rb
@@ -484,7 +485,6 @@ files:
 - lib/metanorma/standoc/cleanup_inline.rb
 - lib/metanorma/standoc/cleanup_maths.rb
 - lib/metanorma/standoc/cleanup_ref.rb
-- lib/metanorma/standoc/cleanup_ref_dl.rb
 - lib/metanorma/standoc/cleanup_reqt.rb
 - lib/metanorma/standoc/cleanup_section.rb
 - lib/metanorma/standoc/cleanup_section_names.rb
@@ -507,6 +507,7 @@ files:
 - lib/metanorma/standoc/macros.rb
 - lib/metanorma/standoc/macros_embed.rb
 - lib/metanorma/standoc/macros_form.rb
+- lib/metanorma/standoc/macros_inline.rb
 - lib/metanorma/standoc/macros_note.rb
 - lib/metanorma/standoc/macros_plantuml.rb
 - lib/metanorma/standoc/macros_terms.rb
@@ -524,6 +525,7 @@ files:
 - lib/metanorma/standoc/utils.rb
 - lib/metanorma/standoc/validate.rb
 - lib/metanorma/standoc/validate_section.rb
+- lib/metanorma/standoc/validate_table.rb
 - lib/metanorma/standoc/version.rb
 - lib/metanorma/standoc/views/datamodel/model_representation.adoc.erb
 - lib/metanorma/standoc/views/datamodel/plantuml_representation.adoc.erb
@@ -607,6 +609,7 @@ files:
 - spec/fixtures/test.exp
 - spec/fixtures/test.xmi
 - spec/metanorma/base_spec.rb
+- spec/metanorma/biblio_spec.rb
 - spec/metanorma/blank_spec.rb
 - spec/metanorma/blocks_spec.rb
 - spec/metanorma/cleanup_blocks_spec.rb
@@ -618,13 +621,14 @@ files:
 - spec/metanorma/inline_spec.rb
 - spec/metanorma/isobib_cache_spec.rb
 - spec/metanorma/lists_spec.rb
+- spec/metanorma/macros_concept_spec.rb
 - spec/metanorma/macros_json2text_spec.rb
 - spec/metanorma/macros_plantuml_spec.rb
 - spec/metanorma/macros_spec.rb
 - spec/metanorma/macros_yaml2text_spec.rb
 - spec/metanorma/processor_spec.rb
-- spec/metanorma/refs_dl_spec.rb
 - spec/metanorma/refs_spec.rb
+- spec/metanorma/reqt_spec.rb
 - spec/metanorma/section_spec.rb
 - spec/metanorma/table_spec.rb
 - spec/metanorma/validate_spec.rb

data/lib/metanorma/standoc/cleanup_ref_dl.rb

@@ -1,113 +0,0 @@
-require "set"
-require "relaton_bib"
-
-module Metanorma
-  module Standoc
-    module Cleanup
-      def ref_dl_cleanup(xmldoc)
-        xmldoc.xpath("//clause[@bibitem = 'true']").each do |c|
-          bib = dl_bib_extract(c) or next
-          validate_ref_dl(bib, c)
-          bibitemxml = RelatonBib::BibliographicItem.from_hash(bib).to_xml or next
-          bibitem = Nokogiri::XML(bibitemxml)
-          bibitem.root["id"] = c["id"] if c["id"] && !/^_/.match(c["id"])
-          c.replace(bibitem.root)
-        end
-      end
-
-      # do not accept implicit id
-      def validate_ref_dl(bib, clause)
-        id = bib["id"]
-        id ||= clause["id"] unless /^_/.match?(clause["id"])
-        unless id
-          @log.add("Anchors", clause,
-                   "The following reference is missing an anchor:\n"\
-                   "#{clause.to_xml}")
-          return
-        end
-        @refids << id
-        validate_ref_dl1(bib, id, clause)
-      end
-
-      def validate_ref_dl1(bib, id, clause)
-        bib["title"] or
-          @log.add("Bibliography", clause, "Reference #{id} is missing a title")
-        bib["docid"] or
-          @log.add("Bibliography", clause,
-                   "Reference #{id} is missing a document identifier (docid)")
-      end
-
-      def extract_from_p(tag, bib, key)
-        return unless bib[tag]
-
-        "<#{key}>#{bib[tag].at('p').children}</#{key}>"
-      end
-
-      # if the content is a single paragraph, replace it with its children
-      # single links replaced with uri
-      def p_unwrap(para)
-        elems = para.elements
-        if elems.size == 1 && elems[0].name == "p"
-          link_unwrap(elems[0]).children.to_xml.strip
-        else
-          para.to_xml.strip
-        end
-      end
-
-      def link_unwrap(para)
-        elems = para.elements
-        if elems.size == 1 && elems[0].name == "link"
-          para.at("./link").replace(elems[0]["target"].strip)
-        end
-        para
-      end
-
-      def dd_bib_extract(dtd)
-        return nil if dtd.children.empty?
-
-        dtd.at("./dl") and return dl_bib_extract(dtd)
-        elems = dtd.remove.elements
-        return p_unwrap(dtd) unless elems.size == 1 &&
-          %w(ol ul).include?(elems[0].name)
-
-        ret = []
-        elems[0].xpath("./li").each do |li|
-          ret << p_unwrap(li)
-        end
-        ret
-      end
-
-      def add_to_hash(bib, key, val)
-        Metanorma::Utils::set_nested_value(bib, key.split("."), val)
-      end
-
-      # definition list, with at most one level of unordered lists
-      def dl_bib_extract(clause, nested = false)
-        dl = clause.at("./dl") or return
-        bib = {}
-        key = ""
-        dl.xpath("./dt | ./dd").each do |dtd|
-          (dtd.name == "dt" and key = dtd.text.sub(/:+$/, "")) or
-            add_to_hash(bib, key, dd_bib_extract(dtd))
-        end
-        clause.xpath("./clause").each do |c1|
-          key = c1&.at("./title")&.text&.downcase&.strip
-          next unless %w(contributor relation series).include? key
-
-          add_to_hash(bib, key, dl_bib_extract(c1, true))
-        end
-        dl_bib_extract_title(bib, clause, nested)
-      end
-
-      def dl_bib_extract_title(bib, clause, nested)
-        (!nested && clause.at("./title")) or return bib
-        title = clause.at("./title").remove.children.to_xml
-        bib["title"] = [bib["title"]] if bib["title"].is_a?(Hash) ||
-          bib["title"].is_a?(String)
-        bib["title"] = [] unless bib["title"]
-        bib["title"] << title if !title.empty?
-        bib
-      end
-    end
-  end
-end