metanorma-standoc 1.8.5 → 1.9.1

data/lib/asciidoctor/standoc/ref_date_id.rb

@@ -0,0 +1,62 @@
+module Asciidoctor
+  module Standoc
+    module Refs
+      def set_date_range(date, text)
+        matched = /^(?<from>[0-9]+)(-+(?<to>[0-9]+))?$/.match text
+        return unless matched[:from]
+
+        if matched[:to]
+          date.from matched[:from]
+          date.to matched[:to]
+        else
+          date.on matched[:from]
+        end
+      end
+
+      def id_and_year(id, year)
+        year ? "#{id}:#{year}" : id
+      end
+
+      def norm_year(year)
+        /^&\#821[12];$/.match(year) and return "--"
+        /^\d\d\d\d-\d\d\d\d$/.match(year) and return year
+        year&.sub(/(?<=[0-9])-.*$/, "")
+      end
+
+      def conditional_date(bib, match, noyr)
+        if match.names.include?("year") && !match[:year].nil?
+          bib.date(**{ type: "published" }) do |d|
+            noyr and d.on "--" or set_date_range(d, norm_year(match[:year]))
+          end
+        end
+      end
+
+      def use_my_anchor(ref, id)
+        ref.parent.elements.last["id"] = id
+        ref
+      end
+
+      def docid(bib, code)
+        type, code1 = if /^\[\d+\]$|^\([^)]+\).*$/.match?(code)
+                        ["metanorma", mn_code(code)]
+                      else
+                        @bibdb&.docid_type(code) || [nil, code]
+                      end
+        code1.sub!(/^nofetch\((.+)\)$/, "\\1")
+        bib.docidentifier **attr_code(type: type) do |d|
+          d << code1
+        end
+      end
+
+      def docnumber(bib, code)
+        bib.docnumber do |d|
+          d << HTMLEntities.new.decode(code).sub(/^[^\d]*/, "")
+        end
+      end
+
+      def mn_code(code)
+        code.sub(/^\(/, "[").sub(/\).*$/, "]").sub(/^nofetch\((.+)\)$/, "\\1")
+      end
+    end
+  end
+end

data/lib/asciidoctor/standoc/ref_sect.rb

@@ -20,12 +20,12 @@ module Asciidoctor
         node.attr("style") == "bibliography" or
           @log.add("AsciiDoc Input", node, "Section not marked up as [bibliography]!")
         @biblio = true
-        xml.references **attr_code(attrs.merge(normative: false)) do |xml_section|
-          #title = node.level == 1 ? "Bibliography" : node.title
-          xml_section.title { |t| t << node.title }
-          xml_section << node.content
-        end
-        @biblio = false
+        xml.references **attr_code(attrs.merge(
+          normative: node.attr("normative") || false)) do |xml_section|
+            xml_section.title { |t| t << node.title }
+            xml_section << node.content
+          end
+          @biblio = false
       end
 
       def bibitem_parse(attrs, xml, node)
@@ -43,12 +43,12 @@ module Asciidoctor
         node.attr("style") == "bibliography" or
           @log.add("AsciiDoc Input", node, "Section not marked up as [bibliography]!")
         @norm_ref = true
-        xml.references **attr_code(attrs.merge(normative: true)) do |xml_section|
-          #xml_section.title { |t| t << "Normative References" }
-          xml_section.title { |t| t << node.title }
-          xml_section << node.content
-        end
-        @norm_ref = false
+        xml.references **attr_code(attrs.merge(
+          normative: node.attr("normative") || true)) do |xml_section|
+            xml_section.title { |t| t << node.title }
+            xml_section << node.content
+          end
+          @norm_ref = false
       end
 
       def global_ievcache_name

data/lib/asciidoctor/standoc/terms.rb

@@ -79,16 +79,20 @@ module Asciidoctor
         end
       end
 
-      def term_source_attrs(seen_xref)
-        { bibitemid: seen_xref.children[0]["target"],
-          format: seen_xref.children[0]["format"], type: "inline" }
+      def term_source_attrs(node, seen_xref)
+          { case: seen_xref.children[0]["case"],
+            droploc: seen_xref.children[0]["droploc"],
+            bibitemid: seen_xref.children[0]["target"],
+            format: seen_xref.children[0]["format"], type: "inline" }
       end
 
-      def add_term_source(xml_t, seen_xref, m)
+      def add_term_source(node, xml_t, seen_xref, m)
         if seen_xref.children[0].name == "concept"
           xml_t.origin { |o| o << seen_xref.children[0].to_xml }
         else
-          xml_t.origin seen_xref.children[0].content, **attr_code(term_source_attrs(seen_xref))
+          attrs = term_source_attrs(node, seen_xref)
+          attrs.delete(:text)
+          xml_t.origin seen_xref.children[0].content, **attr_code(attrs)
         end
         m[:text] && xml_t.modification do |mod|
           mod.p { |p| p << m[:text].sub(/^\s+/, "") }
@@ -116,7 +120,7 @@ module Asciidoctor
           attrs = { status: matched[:text] ? "modified" : "identical" }
           xml.termsource **attrs do |xml_t|
             seen_xref = Nokogiri::XML.fragment(matched[:xref])
-            add_term_source(xml_t, seen_xref, matched)
+            add_term_source(node, xml_t, seen_xref, matched)
           end
         end.join("\n")
       end

data/lib/asciidoctor/standoc/utils.rb

@@ -19,11 +19,11 @@ module Asciidoctor
       end
 
       NOKOHEAD = <<~HERE.freeze
-          <!DOCTYPE html SYSTEM
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-          <html xmlns="http://www.w3.org/1999/xhtml">
-          <head> <title></title> <meta charset="UTF-8" /> </head>
-          <body> </body> </html>
+        <!DOCTYPE html SYSTEM
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml">
+        <head> <title></title> <meta charset="UTF-8" /> </head>
+        <body> </body> </html>
       HERE
 
       # block for processing XML document fragments as XHTML,
@@ -66,10 +66,36 @@ module Asciidoctor
         conv
       end
 
+      def default_script(lang)
+        case lang
+        when "ar", "fa"
+          "Arab"
+        when "ur"
+          "Aran"
+        when "ru", "bg"
+          "Cyrl"
+        when "hi"
+          "Deva"
+        when "el"
+          "Grek"
+        when "zh"
+          "Hans"
+        when "ko"
+          "Kore"
+        when "he"
+          "Hebr"
+        when "ja"
+          "Jpan"
+        else
+          "Latn"
+        end
+      end
+
       class EmptyAttr
-        def attr(_x)
+        def attr(_any_attribute)
           nil
         end
+
         def attributes
           {}
         end

data/lib/asciidoctor/standoc/validate.rb

@@ -1,5 +1,5 @@
 require "asciidoctor/standoc/utils"
-require_relative "./validate_section.rb"
+require_relative "./validate_section"
 require "nokogiri"
 require "jing"
 require "iev"
@@ -14,6 +14,7 @@ module Asciidoctor
       def init_iev
         return nil if @no_isobib
         return @iev if @iev
+
         @iev = Iev::Db.new(@iev_globalname, @iev_localname) unless @no_isobib
         @iev
       end
@@ -44,14 +45,14 @@ module Asciidoctor
         found = false
         doc.xpath("//references[@normative = 'true']/bibitem").each do |b|
           next unless docid = b.at("./docidentifier[@type = 'metanorma']")
-          next unless  /^\[\d+\]$/.match(docid.text)
-          @log.add("Bibliography", b, "Numeric reference in normative references")
+          next unless /^\[\d+\]$/.match?(docid.text)
+
+          @log.add("Bibliography", b,
+                   "Numeric reference in normative references")
           found = true
         end
-        if found
-          clean_exit
-          abort("Numeric reference in normative references")
-        end
+        found and
+          clean_abort("Numeric reference in normative references", doc.to_xml)
       end
 
       def repeat_id_validate1(ids, x)
@@ -72,8 +73,7 @@ module Asciidoctor
             ids = repeat_id_validate1(ids, x)
           end
         rescue StandardError => e
-          clean_exit
-          abort(e.message)
+          clean_abort(e.message, doc.to_xml)
         end
       end
 
@@ -90,8 +90,7 @@ module Asciidoctor
                        e[:message])
             end
           rescue Jing::Error => e
-            clean_exit
-            abort "Jing failed with error: #{e}"
+            clean_abort("Jing failed with error: #{e}", doc.to_xml)
           ensure
             f.close!
           end
@@ -104,7 +103,8 @@ module Asciidoctor
       def formattedstr_strip(doc)
         doc.xpath("//*[@format] | //stem | //bibdata//description | "\
                   "//formattedref | //bibdata//note | //bibdata/abstract | "\
-                  "//bibitem/abstract | //bibitem/note | //misc-container").each do |n|
+                  "//bibitem/abstract | //bibitem/note | //misc-container")
+          .each do |n|
           n.elements.each do |e|
             e.traverse do |e1|
               e1.element? and e1.each { |k, _v| e1.delete(k) }

data/lib/metanorma/standoc/version.rb

@@ -8,17 +8,17 @@ module Metanorma
 
     def all_modules(mod)
       [mod] + mod.constants.map { |c| mod.const_get(c) }
-        .select {|c| c.is_a?(Module) && parent_of(c) == mod }
-        .flat_map {|m| all_modules(m) }
+        .select { |c| c.is_a?(Module) && parent_of(c) == mod }
+        .flat_map { |m| all_modules(m) }
     end
 
     def versioned(mod, flavour)
-      all_modules(mod).select {|c| defined? c::VERSION}.
-        select {|c| c.name =~ /::#{flavour}$/ }
+      all_modules(mod).select { |c| defined? c::VERSION }
+        .select { |c| c.name =~ /::#{flavour}$/ }
     end
   end
 
   module Standoc
-    VERSION= "1.8.5".freeze
+    VERSION = "1.9.1".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "metanorma/standoc/version"
 
@@ -27,29 +27,29 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
-  spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.5.0"
   spec.add_dependency "iev", "~> 0.2.1"
+  spec.add_dependency "isodoc", "~> 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct"
-  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.2.1"
+  spec.add_dependency "metanorma-plugin-lutaml"
+  spec.add_dependency "ruby-jing"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
+  spec.add_dependency "asciimath2unitsml", "~> 0.3.0"
+  spec.add_dependency "concurrent-ruby"
+  spec.add_dependency "latexmath"
+  spec.add_dependency "mathml2asciimath"
+  spec.add_dependency "metanorma-utils", "~> 1.2.0"
   spec.add_dependency "relaton-cli", "~> 1.7.0"
   spec.add_dependency "relaton-iev", "~> 1.1.0"
-  spec.add_dependency "concurrent-ruby"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
-  spec.add_dependency "metanorma-utils", "~> 1.0.2"
-  spec.add_dependency "mathml2asciimath"
-  spec.add_dependency "latexmath"
-  spec.add_dependency "asciimath2unitsml", "~> 0.2.0"
 
   spec.add_development_dependency "byebug"
-  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "= 0.54.0"
+  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 "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 5.0.0"

data/spec/asciidoctor/base_spec.rb

@@ -240,6 +240,7 @@ OUTPUT
       :pub-uri: http://www.example.com
       :isbn: ISBN-13
       :isbn10: ISBN-10
+      :classification: a:b, c
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
 <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic" version="#{Metanorma::Standoc::VERSION}">
@@ -361,18 +362,51 @@ OUTPUT
   <role type="publisher"/>
   <organization>
     <name>Hanna Barbera</name>
+    <address>
+  <formattedAddress>
+    1 Infinity Loop
+    <br/>
+    California
+  </formattedAddress>
+</address>
+<phone>3333333</phone>
+<phone type='fax'>4444444</phone>
+<email>x@example.com</email>
+<uri>http://www.example.com</uri>
   </organization>
 </contributor>
 <contributor>
   <role type="publisher"/>
   <organization>
     <name>Cartoon Network</name>
+    <address>
+  <formattedAddress>
+    1 Infinity Loop
+    <br/>
+    California
+  </formattedAddress>
+</address>
+<phone>3333333</phone>
+<phone type='fax'>4444444</phone>
+<email>x@example.com</email>
+<uri>http://www.example.com</uri>
   </organization>
 </contributor>
 <contributor>
   <role type="publisher"/>
   <organization>
     <name>Ribose, Inc.</name>
+    <address>
+  <formattedAddress>
+    1 Infinity Loop
+    <br/>
+    California
+  </formattedAddress>
+</address>
+<phone>3333333</phone>
+<phone type='fax'>4444444</phone>
+<email>x@example.com</email>
+<uri>http://www.example.com</uri>
   </organization>
 </contributor>
 <edition>2</edition>
@@ -392,6 +426,17 @@ OUTPUT
        <owner>
      <organization>
        <name>Ribose, Inc.</name>
+        <address>
+   <formattedAddress>
+     1 Infinity Loop
+     <br/>
+     California
+   </formattedAddress>
+ </address>
+ <phone>3333333</phone>
+ <phone type='fax'>4444444</phone>
+ <email>x@example.com</email>
+ <uri>http://www.example.com</uri>
      </organization>
    </owner>
  </copyright>
@@ -400,6 +445,17 @@ OUTPUT
    <owner>
      <organization>
        <name>Hanna Barbera</name>
+        <address>
+   <formattedAddress>
+     1 Infinity Loop
+     <br/>
+     California
+   </formattedAddress>
+ </address>
+ <phone>3333333</phone>
+ <phone type='fax'>4444444</phone>
+ <email>x@example.com</email>
+ <uri>http://www.example.com</uri>
      </organization>
    </owner>
   </copyright>
@@ -421,6 +477,8 @@ OUTPUT
              <docidentifier>JKL MNO</docidentifier>
            </bibitem>
          </relation>
+         <classification type='a'>b</classification>
+         <classification type='default'>c</classification>
 <keyword>a</keyword>
 <keyword>b</keyword>
 <keyword>c</keyword>
@@ -469,6 +527,7 @@ OUTPUT
       :relaton-uri: F
       :title-eo: Dokumenttitolo
       :doctype: This is a DocType
+      :docsubtype: This is a DocSubType
       :subdivision: Subdivision
       :subdivision-abbr: SD
 
@@ -567,6 +626,7 @@ OUTPUT
          </copyright>
          <ext>
          <doctype>this-is-a-doctype</doctype>
+         <subdoctype>This is a DocSubType</subdoctype>
          </ext>
        </bibdata>
          <preface>
@@ -625,13 +685,6 @@ OUTPUT
         <name>International Standards Organization</name>
         <subdivision>Subdivision</subdivision>
         <abbreviation>SD</abbreviation>
-        <address>
-  <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
-</address>
-<phone>3333333</phone>
-<phone type='fax'>4444444</phone>
-<email>x@example.com</email>
-<uri>http://www.example.com</uri>
       </organization>
     </contributor>
     <contributor>
@@ -709,6 +762,7 @@ OUTPUT
       :header-font: Comic Sans
       :monospace-font: Andale Mono
       :htmlstylesheet: spec/assets/html.scss
+      :htmlstylesheet-override: spec/assets/html-override.css
       :htmlcoverpage: spec/assets/htmlcover.html
       :htmlintropage: spec/assets/htmlintro.html
       :scripts: spec/assets/scripts.html
@@ -727,6 +781,7 @@ OUTPUT
     expect(html).to match(%r[an empty html cover page])
     expect(html).to match(%r[an empty html intro page])
     expect(html).to match(%r[This is > a script])
+    expect(html).to match(%r[html-override])
   end
 
   it "uses specified fonts and assets in Word" do
@@ -741,6 +796,7 @@ OUTPUT
       :header-font: Comic Sans
       :monospace-font: Andale Mono
       :wordstylesheet: spec/assets/word.scss
+      :wordstylesheet-override: spec/assets/word-override.css
       :wordcoverpage: spec/assets/wordcover.html
       :wordintropage: spec/assets/wordintro.html
       :header: spec/assets/header.html
@@ -758,8 +814,10 @@ OUTPUT
     expect(html).to match(%r[h1[^{]+\{[^{]+font-family: Comic Sans;]m)
     expect(html).to match(%r[an empty word cover page])
     expect(html).to match(%r[an empty word intro page])
+    expect(html).to match(%r[word-override])
     expect(html).to include('\o "1-3"')
-    expect(html).to include(%[Content-Location: file:///C:/Doc/test_files/header.html
+    expect(html).to include(%[Content-ID: <header.html>
+Content-Disposition: inline; filename="header.html"
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
 
@@ -783,6 +841,18 @@ QU1FOiB0ZXN0Cgo=
     expect(File.exist?("test.doc")).to be true
   end
 
+  it "process mn2pdf attributes" do
+    node = Nokogiri::XML("<fake/>").at("fake")
+    node["mn2pdf-font-manifest-file"] = "passed/as/font/manifest/to/mn2pdf.jar"
+
+    options = Asciidoctor::Standoc::Converter
+      .new(:standoc, header_footer: true)
+      .doc_extract_attributes(node)
+
+    expect(options.dig(:mn2pdf, :font_manifest_file))
+      .to eq(node["mn2pdf-font-manifest-file"])
+  end
+
   private
 
   def mock_org_abbrevs