metanorma-standoc 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3fe7b42105c2a89fb897699fde276f7b4cee0602de41f6edcd2f81ad5cbd2a3
-  data.tar.gz: 442a50e5a3633c41b95cd9ac223976448c5f7ee5c4932034ddf81a939cfa1f80
+  metadata.gz: ac225a257c1a5c42ce296ee87ef1d95e378111a82875211969771f7d1756bcf2
+  data.tar.gz: 30ff55c905559089be61b2752cb84c8274a121b4e5359a8cdf547528296a09be
 SHA512:
-  metadata.gz: b11e454cf7ffdb63e00a2a2df8ae8a2fec586546a35363c3b64cdb32dca70717f50462ee29ee0c3b292bf07f6ff5bad80611160a91dd9f22f7d776b39ab01134
-  data.tar.gz: 1c0fc47083cc3d87e467d94a648f6deed8e2a79ca8eec87ec25ab8c62728fe2c85a809b991acd7776172e484a5886697f046451d79535d967cc0dd2dcfafe2a6
+  metadata.gz: e66997f17221a04e57e213a66e16ce0061060c5ffd0708bc9196b2b75ec8081673475890b8745086341196bb30a7832ca7f3c1d5615bd80063e31f6f9e243534
+  data.tar.gz: 1a1e23d189dbb0ef46552e5953cd8568c83b6380d239a68cfab95e8a1cb975583e7697bc6d11babb509ca5a21f9f3c7d4d06e225f8faef39f2c7f3d9d8087f9c

data/.github/workflows/macos.yml

@@ -29,10 +29,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '10.x'
       - name: Install LaTeXML
         run: |
           brew install libxml2 cpanminus
@@ -41,9 +37,6 @@ jobs:
       - name: Install PlantUML
         run: |
           brew install plantuml
-      - name: Install puppeteer
-        run: |
-          npm -g i puppeteer
       - name: Update gems
         run: |
           sudo gem install bundler --force

data/.github/workflows/ubuntu.yml

@@ -29,10 +29,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '10.x'
       - name: Update gems
         run: |
           gem install bundler
@@ -42,13 +38,12 @@ jobs:
           sudo snap install latexml --edge
           echo "::add-path::/snap/bin"
       - name: Install PlantUML
-        run: |
-          curl -L https://raw.githubusercontent.com/metanorma/plantuml-install/master/ubuntu.sh | sudo bash
-      - name: Install puppeteer
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgbm1
-          npm install -g puppeteer@3.0.1
+        uses: nick-invision/retry@v1
+        with:
+          polling_interval_seconds: 5
+          timeout_minutes: 5
+          max_attempts: 3
+          command: sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/windows.yml

@@ -29,10 +29,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '10.x'
       - name: Install MN Windows dependencies
         shell: pwsh
         run: |
@@ -50,10 +46,6 @@ jobs:
           refreshenv
           set PATH=C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;%PATH%
           where latexmlmath
-      - name: Install puppeteer
-        shell: pwsh
-        run: |
-          npm -g i puppeteer
       - name: Run specs
         shell: pwsh
         run: |

data/lib/asciidoctor/standoc/base.rb

@@ -14,22 +14,6 @@ module Asciidoctor
       XML_ROOT_TAG = "standard-document".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/standoc".freeze
 
-      Asciidoctor::Extensions.register do
-        preprocessor Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor
-        preprocessor Asciidoctor::Standoc::Datamodel::DiagramPreprocessor
-        preprocessor Asciidoctor::Standoc::Yaml2TextPreprocessor
-        inline_macro Asciidoctor::Standoc::AltTermInlineMacro
-        inline_macro Asciidoctor::Standoc::DeprecatedTermInlineMacro
-        inline_macro Asciidoctor::Standoc::DomainTermInlineMacro
-        inline_macro Asciidoctor::Standoc::InheritInlineMacro
-        inline_macro Asciidoctor::Standoc::HTML5RubyMacro
-        inline_macro Asciidoctor::Standoc::ConceptInlineMacro
-        block Asciidoctor::Standoc::ToDoAdmonitionBlock
-        treeprocessor Asciidoctor::Standoc::ToDoInlineAdmonitionBlock
-        block Asciidoctor::Standoc::PlantUMLBlockMacro
-        block Asciidoctor::Standoc::PseudocodeBlockMacro
-      end
-
       def xml_root_tag
         self.class::XML_ROOT_TAG
       end
@@ -117,6 +101,7 @@ module Asciidoctor
         @filename = node.attr("docfile") ?
           File.basename(node.attr("docfile")).gsub(/\.adoc$/, "") : ""
         @localdir = Utils::localdir(node)
+        @output_dir = outputdir node
         @no_isobib_cache = node.attr("no-isobib-cache")
         @no_isobib = node.attr("no-isobib")
         @bibdb = nil
@@ -158,7 +143,7 @@ module Asciidoctor
       end
 
       def clean_exit
-        @log.write(@localdir + @filename + ".err") unless @novalid
+        @log.write(@output_dir + @filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
       end
 
@@ -243,6 +228,14 @@ module Asciidoctor
           end
         end.join("\n")
       end
+
+      private
+
+      def outputdir(node)
+        if node.attr("output_dir").nil_or_empty? then Utils::localdir(node)
+        else File.join(node.attr("output_dir"), "")
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -50,7 +50,8 @@ module Asciidoctor
       # only numeric references are renumbered
       def biblio_renumber(xmldoc)
         r = xmldoc.at("//references[@normative = 'false'] | "\
-                      "//clause[.//references[@normative = 'false']]") or return
+                      "//clause[.//references[@normative = 'false']] | "\
+                      "//annex[.//references[@normative = 'false']]") or return
         r.xpath(".//bibitem[not(ancestor::bibitem)]").each_with_index do |b, i|
           next unless docid = b.at("./docidentifier[@type = 'metanorma']")
           next unless  /^\[\d+\]$/.match(docid.text)
@@ -134,13 +135,13 @@ module Asciidoctor
       def validate_ref_dl(bib, c)
         unless bib["id"]
           @log.add("Anchors", c, "The following reference is missing "\
-                              "an anchor:\n" + c.to_xml)
+                   "an anchor:\n" + c.to_xml)
           return
         end
         bib["title"] or @log.add("Bibliography", c, "Reference #{bib['id']} "\
-                                "is missing a title")
+                                 "is missing a title")
         bib["docid"] or @log.add("Bibliography", c, "Reference #{bib['id']} "\
-                                "is missing a document identifier (docid)")
+                                 "is missing a document identifier (docid)")
       end
 
       def extract_from_p(tag, bib, key)

data/lib/asciidoctor/standoc/converter.rb

@@ -21,6 +21,22 @@ module Asciidoctor
     # A {Converter} implementation that generates Standoc output, and a document
     # schema encapsulation of the document for validation
     class Converter
+      Asciidoctor::Extensions.register do
+        preprocessor Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor
+        preprocessor Asciidoctor::Standoc::Datamodel::DiagramPreprocessor
+        preprocessor Asciidoctor::Standoc::Yaml2TextPreprocessor
+        inline_macro Asciidoctor::Standoc::AltTermInlineMacro
+        inline_macro Asciidoctor::Standoc::DeprecatedTermInlineMacro
+        inline_macro Asciidoctor::Standoc::DomainTermInlineMacro
+        inline_macro Asciidoctor::Standoc::InheritInlineMacro
+        inline_macro Asciidoctor::Standoc::HTML5RubyMacro
+        inline_macro Asciidoctor::Standoc::ConceptInlineMacro
+        block Asciidoctor::Standoc::ToDoAdmonitionBlock
+        treeprocessor Asciidoctor::Standoc::ToDoInlineAdmonitionBlock
+        block Asciidoctor::Standoc::PlantUMLBlockMacro
+        block Asciidoctor::Standoc::PseudocodeBlockMacro
+      end
+
       include ::Asciidoctor::Converter
       include ::Asciidoctor::Writer
 

data/lib/asciidoctor/standoc/inline.rb

@@ -135,7 +135,7 @@ module Asciidoctor
         results.nil? and
           @log.add('Math', nil,
                    "latexmlmath failed to process equation:\n#{lxm_input}")
-        results
+        results&.sub(%r{<math ([^>]+ )?display="block"}, "<math \\1")
       end
 
       def stem_parse(text, xml, style)

data/lib/metanorma/standoc/processor.rb

@@ -21,10 +21,6 @@ module Metanorma
         "Metanorma::Standoc #{Metanorma::Standoc::VERSION}/IsoDoc #{IsoDoc::VERSION}"
       end
 
-      def input_to_isodoc(file, filename)
-        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
-      end
-
       def output(isodoc_node, inname, outname, format, options={})
         case format
         when :html

data/lib/metanorma/standoc/version.rb

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

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -96,7 +96,7 @@ RSpec.describe Asciidoctor::Standoc do
        </formula>
               <formula id="_" subsequence="A">
          <stem type="MathML">
-       <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
+       <math xmlns="http://www.w3.org/1998/Math/MathML">
          <mrow>
            <mi>M</mi>
            <mo>=</mo>

data/spec/asciidoctor-standoc/inline_spec.rb

@@ -88,7 +88,7 @@ text, including nested markup.
       <sections>
       <p id="_">
           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>n</mi><mo>&lt;</mo><mn>1</mn></math></stem><br/>
-          <stem type="MathML"> <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">   <mrow>     <mi>n</mi>     <mo>&lt;</mo>     <mn>1</mn>   </mrow> </math></stem>
+          <stem type="MathML"> <math xmlns="http://www.w3.org/1998/Math/MathML">   <mrow>     <mi>n</mi>     <mo>&lt;</mo>     <mn>1</mn>   </mrow> </math></stem>
         </p>
       </sections>
        </standard-document>
@@ -106,7 +106,7 @@ text, including nested markup.
       <sections>
       <p id="_">
           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>n</mi><mo>&lt;</mo><mn>1</mn></math></stem>
-          <stem type="MathML"> <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">   <mrow>     <mi>n</mi>     <mo>&lt;</mo>     <mn>1</mn>   </mrow> </math></stem>
+          <stem type="MathML"> <math xmlns="http://www.w3.org/1998/Math/MathML">   <mrow>     <mi>n</mi>     <mo>&lt;</mo>     <mn>1</mn>   </mrow> </math></stem>
         </p>
       </sections>
        </standard-document>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor