metanorma-standoc 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ca3aedd38f18114d3fb4c86c797294a3f1fb4fced3dbe22141980ad899df051
-  data.tar.gz: b885be1a706d741781853f85df50fe988b9ed93d31f15f6458c3f8debe8ab704
+  metadata.gz: e30bd97d527914e60d6dfcd537620ba7d2d5ae82d9d9c07e24d5a535dd9ec8ee
+  data.tar.gz: b8774965fcb7e698288f1793460fd67b982085e8d0951b35cfa6c4f102157e9a
 SHA512:
-  metadata.gz: b679c9834b6a85dcbbb743a50f4fe4cae499cf6bc8f6bebe2c58545bc09b282fe2c529068fa8db2a3027023f983f6b589a1b1883b356f18710d34cbdf8e13ce4
-  data.tar.gz: 583bc49e6a03656378f097a2acfa91578699d04be365bd92e3515b0252a940104efddf778ef79784fa27e06997345505a8527c530a86cdeaf3d13c78cc644e1f
+  metadata.gz: 74e250a48b25dd82c3174b78b515e57fe11bc3f4f8767d6942048bb3ef01ddf6937a6c2ff24ddb5e17d8f747eeb582b77248b28bdf50bc120a3fcfafd6f78221
+  data.tar.gz: a0fe35b39a730d18afe1cc7463b166377adb2137c4cfd9c650844e3a593e1a2312fa8242a8991a1508aaed44b7b7525a54cad7f747a177ea2848b27720cf644d

data/.github/workflows/rake.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
         with:
           path: vendor/bundle
           key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}

data/lib/asciidoctor/standoc/cleanup_footnotes.rb

@@ -82,7 +82,21 @@ module Asciidoctor
         end
       end
 
+      def footnote_block_cleanup(xmldoc)
+        xmldoc.xpath("//footnoteblock").each do |f|
+          f.name = 'fn'
+          if id = xmldoc.at("//*[@id = '#{f.text}']")
+            f.children = id.remove.children
+          else
+            @log.add("Crossreferences", f,
+                     "Could not resolve footnoteblock:[#{f.text}]")
+            f.children = "[ERROR]"
+          end
+        end
+      end
+
       def footnote_cleanup(xmldoc)
+        footnote_block_cleanup(xmldoc)
         title_footnote_move(xmldoc)
         table_footnote_renumber(xmldoc)
         other_footnote_renumber(xmldoc)

data/lib/asciidoctor/standoc/converter.rb

@@ -1,4 +1,7 @@
 require "asciidoctor"
+require "fontist"
+require "fontist/manifest/install"
+require "metanorma/util"
 require "metanorma/standoc/version"
 require "asciidoctor/standoc/base"
 require "asciidoctor/standoc/front"
@@ -26,6 +29,7 @@ module Asciidoctor
         preprocessor Metanorma::Plugin::Datastruct::Json2TextPreprocessor
         preprocessor Metanorma::Plugin::Datastruct::Yaml2TextPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlPreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::LutamlUmlAttributesTablePreprocessor
         inline_macro Asciidoctor::Standoc::AltTermInlineMacro
         inline_macro Asciidoctor::Standoc::DeprecatedTermInlineMacro
         inline_macro Asciidoctor::Standoc::DomainTermInlineMacro
@@ -34,9 +38,11 @@ module Asciidoctor
         inline_macro Asciidoctor::Standoc::ConceptInlineMacro
         inline_macro Asciidoctor::Standoc::AutonumberInlineMacro
         inline_macro Asciidoctor::Standoc::VariantInlineMacro
+        inline_macro Asciidoctor::Standoc::FootnoteBlockInlineMacro
         block Asciidoctor::Standoc::ToDoAdmonitionBlock
         treeprocessor Asciidoctor::Standoc::ToDoInlineAdmonitionBlock
         block Asciidoctor::Standoc::PlantUMLBlockMacro
+        block Metanorma::Plugin::Lutaml::LutamlDiagramBlock
         block Asciidoctor::Standoc::PseudocodeBlockMacro
       end
 
@@ -63,6 +69,8 @@ module Asciidoctor
         basebackend "html"
         outfilesuffix ".xml"
         @libdir = File.dirname(self.class::_file || __FILE__)
+
+        install_fonts(opts)
       end
 
       class << self
@@ -75,7 +83,52 @@ module Asciidoctor
 
       # path to isodoc assets in child gems
       def html_doc_path(file)
-        File.join(@libdir, File.join("../../isodoc/html", file))
+        File.join(@libdir, "../../isodoc/html", file)
+      end
+
+      def flavor_name
+        self.class.name.split("::")&.[](-2).downcase
+      end
+
+      def fonts_manifest
+        File.expand_path(File.join(@libdir, "../../metanorma/", flavor_name, "fonts_manifest.yaml"))
+      end
+
+      def install_fonts(options={})
+        if options[:no_install_fonts]
+          Metanorma::Util.log("[fontist] Skip font installation because" \
+            " --no-install-fonts argument passed", :debug)
+          return
+        end
+
+        if fonts_manifest.nil? || !File.exist?(fonts_manifest)
+          Metanorma::Util.log("[fontist] Skip font installation because" \
+            " font manifest file doesn't exists/defined", :debug)
+          return
+        end
+
+        begin
+          Fontist::Manifest::Install.call(
+            fonts_manifest,
+            confirmation: options[:agree_to_terms] ? "yes" : "no"
+          )
+        rescue Fontist::Errors::LicensingError
+          if !options[:agree_to_terms]
+            Metanorma::Util.log("[fontist] --agree-to-terms option missing." \
+              " You must accept font licenses to install fonts.", :debug)
+          elsif options[:continue_without_fonts]
+            Metanorma::Util.log("[fontist] Processing will continue without" \
+              " fonts installed", :debug)
+          else
+            Metanorma::Util.log("[fontist] Aborting without proper fonts" \
+              " installed", :fatal)
+          end
+        rescue Fontist::Errors::NonSupportedFontError
+          flavor = flavor_name || "cli"
+          Metanorma::Util.log("[fontist] '#{font}' font is not supported. " \
+            "Please go to github.com/metanorma/metanorma-#{flavor}/issues" \
+            " to report this issue.", :info)
+        end
       end
 
       alias_method :embedded, :content

data/lib/asciidoctor/standoc/macros.rb

@@ -201,5 +201,17 @@ module Asciidoctor
         %{<variant lang=#{lang}>#{out}</variant>}
       end
     end
+
+    class FootnoteBlockInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :footnoteblock
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<footnoteblock>#{out}</footnoteblock>}
+      end
+    end
   end
 end

data/lib/asciidoctor/standoc/ref.rb

@@ -56,7 +56,9 @@ module Asciidoctor
       end
 
       def norm_year(yr)
-        /^\&\#821[12];$/.match(yr) ? "--" : yr
+        /^\&\#821[12];$/.match(yr) and return "--" 
+        /^\d\d\d\d-\d\d\d\d$/.match(yr) and return yr
+        yr&.sub(/(?<=[0-9])-.*$/, "")
       end
 
       def isorefrender1(t, m, yr, allp = "")
@@ -164,8 +166,9 @@ module Asciidoctor
 
       def analyse_ref_repo_path(ret)
         return ret unless m =
-          /^(?<type>repo|path):\((?<key>[^,]+),(?<id>.+)\)$/.match(ret[:id])
-        ret.merge(id: m[:id], type: m[:type], key: m[:key], nofetch: true)
+          /^(?<type>repo|path):\((?<key>[^,]+),?(?<id>.*)\)$/.match(ret[:id])
+        id = m[:id].empty? ? m[:key].sub(%r{^[^/]+/}, "")  : m[:id]
+        ret.merge(id: id, type: m[:type], key: m[:key], nofetch: true)
       end
 
       def analyse_ref_numeric(ret)
@@ -225,7 +228,7 @@ module Asciidoctor
 
           NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
         \[(?<usrlbl>\([^)]+\))?(?<code>[^\]]+?)
-        ([:-](?<year>(19|20)[0-9][0-9]))?\]</ref>,?\s*(?<text>.*)$}xm
+        ([:-](?<year>(19|20)[0-9][0-9][0-9-]*))?\]</ref>,?\s*(?<text>.*)$}xm
 
         def reference1_matches(item)
           matched = ISO_REF.match item

data/lib/asciidoctor/standoc/ref_sect.rb

@@ -21,8 +21,8 @@ module Asciidoctor
           @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 << title }
+          #title = node.level == 1 ? "Bibliography" : node.title
+          xml_section.title { |t| t << node.title }
           xml_section << node.content
         end
         @biblio = false
@@ -44,7 +44,8 @@ module Asciidoctor
           @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 << "Normative References" }
+          xml_section.title { |t| t << node.title }
           xml_section << node.content
         end
         @norm_ref = false

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "1.6.3".freeze
+    VERSION = "1.6.4".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -28,19 +28,20 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 1.3.0"
   spec.add_dependency "iev", "~> 0.2.1"
   spec.add_dependency "metanorma-plugin-datastruct"
-  spec.add_dependency "metanorma-plugin-lutaml"
+  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.2.1"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
-  spec.add_dependency "relaton-cli", "~> 1.5.0"
-  spec.add_dependency "relaton-iev", "~> 1.0.0"
+  spec.add_dependency "relaton-cli", "~> 1.7.0"
+  spec.add_dependency "relaton-iev", "~> 1.1.0"
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
   spec.add_dependency "mimemagic"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "latexmath"
+  spec.add_dependency "fontist", "~> 1.5.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"

data/spec/asciidoctor-standoc/cleanup_sections_spec.rb

@@ -548,17 +548,33 @@ INPUT
          </annex>
          <bibliography>
            <references id='_' normative='true' obligation='informative'>
-             <title>Normative references</title>
+             <title>Normative references
+<fn reference='1'>
+  <p id='_'>A</p>
+</fn>
+</title>
              <p id='_'>There are no normative references in this document.</p>
            </references>
            <references id='_' normative='false' obligation='informative'>
-             <title>Bibliography</title>
+             <title>Bibliography
+<fn reference='1'>
+  <p id='_'>A</p>
+</fn>
+</title>
            </references>
            <references id='_' normative='false' obligation='informative'>
-             <title>Bibliography</title>
+             <title>Bibliography.
+<fn reference='1'>
+  <p id='_'>A</p>
+</fn>
+</title>
            </references>
            <clause id='_' obligation='informative'>
-             <title>Bibliography</title>
+             <title>Bibliography 2.
+<fn reference='1'>
+  <p id='_'>A</p>
+</fn>
+</title>
              <references id='_' normative='false' obligation='informative'>
                <title>Bibliography Subsection</title>
              </references>
@@ -789,7 +805,7 @@ INPUT
               <title>Bibliography</title>
             </references>
             <clause id='_' obligation='informative'>
-              <title>Bibliography</title>
+              <title>Bibliography 2</title>
               <references id='_' normative='false' obligation='informative'>
                 <title>Bibliography Subsection</title>
               </references>
@@ -1023,7 +1039,7 @@ INPUT
               <title>Bibliography</title>
             </references>
             <clause id='_' obligation='informative'>
-              <title>Bibliography</title>
+              <title>Bibliography 2</title>
               <references id='_' normative='false' obligation='informative'>
                 <title>Bibliography Subsection</title>
               </references>
@@ -1254,7 +1270,7 @@ INPUT
               <title>Bibliography</title>
             </references>
             <clause id='_' obligation='informative'>
-              <title>Bibliography</title>
+              <title>Bibliography 2</title>
               <references id='_' normative='false' obligation='informative'>
                 <title>Bibliography Subsection</title>
               </references>
@@ -1485,7 +1501,7 @@ INPUT
               <title>Bibliography</title>
             </references>
             <clause id='_' obligation='informative'>
-              <title>Bibliography</title>
+              <title>Bibliography 2</title>
               <references id='_' normative='false' obligation='informative'>
                 <title>Bibliography Subsection</title>
               </references>

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -1165,7 +1165,7 @@ RSpec.describe Asciidoctor::Standoc do
           <docidentifier type="IEC">IEC 60050-102:2007</docidentifier>
           <docidentifier type='URN'>urn:iec:std:iec:60050-102:2007:::en</docidentifier>
           <date type="published">
-            <on>2007</on>
+            <on>2007-08-27</on>
           </date>
           <contributor>
             <role type="publisher"/>
@@ -1204,7 +1204,7 @@ RSpec.describe Asciidoctor::Standoc do
           <docidentifier type="IEC">IEC 60050-103:2009</docidentifier>
           <docidentifier type='URN'>urn:iec:std:iec:60050-103:2009:::en</docidentifier>
           <date type="published">
-            <on>2009</on>
+            <on>2009-12-14</on>
           </date>
           <contributor>
             <role type="publisher"/>

data/spec/asciidoctor-standoc/isobib_cache_spec.rb

@@ -55,7 +55,7 @@ EOS
          <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7:en</docidentifier>
          <docnumber>124</docnumber>
          <date type="published">
-           <on>2014</on>
+           <on>2014-03</on>
          </date>
          <contributor>
            <role type="publisher"/>
@@ -214,7 +214,7 @@ EOS
          <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
          <docnumber>123</docnumber>
          <date type="published">
-           <on>2001</on>
+           <on>2001-05</on>
          </date>
          <contributor>
            <role type="publisher"/>
@@ -227,6 +227,13 @@ EOS
          <edition>3</edition>
          <language>en</language>
          <script>Latn</script>
+         <abstract format='text/plain' language='en' script='Latn'>
+  This International Standard specifies procedures for sampling natural rubber
+  latex concentrate and for sampling syntheticrubber latices and artificial
+  latices. It is also suitable for sampling rubber latex contained in drums,
+  tank cars ortanks. The procedures may also be used for sampling plastics
+  dispersions.
+</abstract>
          <status>
            <stage>90</stage>
            <substage>93</substage>

data/spec/asciidoctor-standoc/macros_lutaml_spec.rb

@@ -44,27 +44,27 @@ RSpec.describe 'Lutaml macros' do
         <clause id="_" inline-header="false" obligation="normative">
         <title>a3m_data_quality_criterion</title>
         <p id="_">supertypes →
-        explicit → assessment_specification</p>
+        explicit → </p>
         </clause>
         <clause id="_" inline-header="false" obligation="normative">
         <title>a3m_data_quality_criterion_specific_applied_value</title>
         <p id="_">supertypes →
-        explicit → criterion_to_assign_the_value</p>
+        explicit → </p>
         </clause>
         <clause id="_" inline-header="false" obligation="normative">
         <title>a3m_data_quality_target_accuracy_association</title>
         <p id="_">supertypes →
-        explicit → id</p>
+        explicit → </p>
         </clause>
         <clause id="_" inline-header="false" obligation="normative">
         <title>a3m_detailed_report_request</title>
         <p id="_">supertypes →
-        explicit → value_type_requested</p>
+        explicit → </p>
         </clause>
         <clause id="_" inline-header="false" obligation="normative">
         <title>a3m_summary_report_request_with_representative_value</title>
         <p id="_">supertypes →
-        explicit → value_type_requested</p>
+        explicit → </p>
         </clause></clause>
         </sections>
         </standard-document>

data/spec/asciidoctor-standoc/macros_spec.rb

@@ -395,6 +395,119 @@ OUTPUT
     OUTPUT
   end
 
+  it "processes the footnoteblock macro" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+
+      footnoteblock:[id1]
+
+      [[id1]]
+      [NOTE]
+      --
+      |===
+      |a |b
+
+      |c |d
+      |===
+
+      * A
+      * B
+      * C
+      --
+    INPUT
+            #{BLANK_HDR}
+            <sections>
+              <p id="_">
+              <fn reference='1'>
+  <table id='_'>
+    <thead>
+      <tr>
+        <th valign='top' align='left'>a</th>
+        <th valign='top' align='left'>b</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td valign='top' align='left'>c</td>
+        <td valign='top' align='left'>d</td>
+      </tr>
+    </tbody>
+  </table>
+  <ul id='_'>
+    <li>
+      <p id='_'>A</p>
+    </li>
+    <li>
+      <p id='_'>B</p>
+    </li>
+    <li>
+      <p id='_'>C</p>
+    </li>
+  </ul>
+</fn>
+            </p>
+            </sections>
+       </standard-document>
+    OUTPUT
+  end
+
+    it "processes the footnoteblock macro with failed reference" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+
+      footnoteblock:[id1]
+
+      [[id2]]
+      [NOTE]
+      --
+      |===
+      |a |b
+
+      |c |d
+      |===
+
+      * A
+      * B
+      * C
+      --
+    INPUT
+            #{BLANK_HDR}
+        <sections>
+           <p id='_'>
+             <fn reference='1'>[ERROR]</fn>
+           </p>
+           <note id='id2'>
+             <table id='_'>
+               <thead>
+                 <tr>
+                   <th valign='top' align='left'>a</th>
+                   <th valign='top' align='left'>b</th>
+                 </tr>
+               </thead>
+               <tbody>
+                 <tr>
+                   <td valign='top' align='left'>c</td>
+                   <td valign='top' align='left'>d</td>
+                 </tr>
+               </tbody>
+             </table>
+             <ul id='_'>
+               <li>
+                 <p id='_'>A</p>
+               </li>
+               <li>
+                 <p id='_'>B</p>
+               </li>
+               <li>
+                 <p id='_'>C</p>
+               </li>
+             </ul>
+           </note>
+         </sections>
+       </standard-document>
+    OUTPUT
+  end
+
   it "processes the PlantUML macro" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).gsub(%r{plantuml/plantuml[^./]+\.}, "plantuml/_."))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -477,6 +590,117 @@ OUTPUT
 OUTPUT
     end
 
+  context 'when lutaml_diagram' do
+    let(:input) do
+      <<~"OUTPUT"
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+        :novalid:
+        :no-isobib:
+        :imagesdir: spec/assets
+
+        [lutaml_diagram]
+        ....
+        diagram MyView {
+          fontname "Arial"
+          title "my diagram"
+          class Foo {}
+        }
+        ....
+      OUTPUT
+    end
+    let(:output) do
+      <<~"OUTPUT"
+      #{BLANK_HDR}
+        <sections>
+        <figure id="_">
+        <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+        </figure>
+        </sections>
+        </standard-document>
+      OUTPUT
+    end
+
+    it "processes the lutaml_diagram" do
+      expect(
+        xmlpp(
+          strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))
+                      .gsub(%r{".+spec\/assets\/lutaml\/[^.\/]+\.}, %q("spec/assets/_.))))
+        .to(be_equivalent_to xmlpp(output))
+    end
+  end
+
+=begin
+  context 'when lutaml_uml_attributes_table' do
+    let(:example_file) { fixtures_path("diagram_definitions.lutaml") }
+    let(:input) do
+      <<~"OUTPUT"
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+        :novalid:
+        :no-isobib:
+        :imagesdir: spec/assets
+
+        [lutaml_uml_attributes_table,#{example_file},AttributeProfile]
+      OUTPUT
+    end
+    let(:output) do
+      <<~"OUTPUT"
+      #{BLANK_HDR}
+        <sections>
+          <clause id='_' inline-header='false' obligation='normative'>
+            <title>AttributeProfile</title>
+            <table id='_'>
+              <name>AttributeProfile attributes</name>
+              <thead>
+                <tr>
+                  <th valign='top' align='left'>Name</th>
+                  <th valign='top' align='left'>Definition</th>
+                  <th valign='top' align='left'>Mandatory/ Optional/ Conditional</th>
+                  <th valign='top' align='left'>Max Occur</th>
+                  <th valign='top' align='left'>Data Type</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td valign='top' align='left'>addressClassProfile</td>
+                  <td valign='top' align='left'>TODO: enum ‘s definition</td>
+                  <td valign='top' align='left'>M</td>
+                  <td valign='top' align='left'>1</td>
+                  <td valign='top' align='left'>
+                    <tt>CharacterString</tt>
+                  </td>
+                </tr>
+                <tr>
+                  <td valign='top' align='left'>imlicistAttributeProfile</td>
+                  <td valign='top' align='left'>this is attribute definition with multiply lines</td>
+                  <td valign='top' align='left'>M</td>
+                  <td valign='top' align='left'>1</td>
+                  <td valign='top' align='left'>
+                    <tt>CharacterString</tt>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </clause>
+        </sections>
+        </standard-document>
+      OUTPUT
+    end
+
+    it "processes the lutaml_diagram" do
+      expect(
+        xmlpp(
+          strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+        .to(be_equivalent_to(xmlpp(output)))
+    end
+  end
+=end
+
   it "processes the PlantUML macro with PlantUML disabled" do
     mock_plantuml_disabled
     expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(%r{PlantUML not installed}).to_stderr