metanorma-iso 1.5.13 → 1.7.1

data/spec/isodoc/amd_spec.rb

@@ -66,9 +66,9 @@ RSpec.describe IsoDoc do
   <preface>
     <foreword>
       <p>
-        <xref target='N'>[scope], Note</xref>
-<xref target='note1'>[widgets1], Note 1</xref>
-<xref target='note2'>[widgets1], Note 2</xref>
+        <xref target='N'>Scope, Note</xref>
+<xref target='note1'>Widgets, 1, Note 1</xref>
+<xref target='note2'>Widgets, 1, Note 2</xref>
 <xref target='AN'>A.1, Note</xref>
 <xref target='Anote1'>A.2, Note 1</xref>
 <xref target='Anote2'>A.2, Note 2</xref>
@@ -231,15 +231,15 @@ RSpec.describe IsoDoc do
                This is a preamble
                <xref target='C'>0.1</xref>
                <xref target='C1'>0.2</xref>
-               <xref target='D'>[D]</xref>
+               <xref target='D'>Scope</xref>
                <xref target='H'>[H]</xref>
                <xref target='I'>[I]</xref>
                <xref target='J'>[J]</xref>
                <xref target='K'>[K]</xref>
                <xref target='L'>[L]</xref>
-               <xref target='M'>[M]</xref>
-               <xref target='N'>[N]</xref>
-               <xref target='O'>[O]</xref>
+               <xref target='M'>Clause 4</xref>
+               <xref target='N'>Introduction</xref>
+               <xref target='O'>Clause 4.2</xref>
                <xref target='P'>Annex A</xref>
                <xref target='Q'>A.1</xref>
                <xref target='Q1'>A.1.1</xref>
@@ -263,10 +263,10 @@ RSpec.describe IsoDoc do
            <clause id='M' inline-header='false' obligation='normative'>
              <title depth="1">Clause 4</title>
              <clause id='N' inline-header='false' obligation='normative'>
-               <title depth="1">Introduction</title>
+               <title depth="2">Introduction</title>
              </clause>
              <clause id='O' inline-header='false' obligation='normative'>
-               <title depth="1">Clause 4.2</title>
+               <title depth="2">Clause 4.2</title>
              </clause>
            </clause>
          </sections>
@@ -452,10 +452,10 @@ RSpec.describe IsoDoc do
            <clause id='M' inline-header='false' obligation='normative'>
              <title depth='1'>Clause 4</title>
              <clause id='N' inline-header='false' obligation='normative'>
-               <title depth='1'>Introduction</title>
+               <title depth='2'>Introduction</title>
              </clause>
              <clause id='O' inline-header='false' obligation='normative'>
-               <title depth='1'>Clause 4.2</title>
+               <title depth='2'>Clause 4.2</title>
              </clause>
              <clause id='O1' inline-header='true' obligation='normative'> </clause>
            </clause>
@@ -570,10 +570,10 @@ RSpec.describe IsoDoc do
       <div id='M'>
         <h1>Clause 4</h1>
         <div id='N'>
-          <h1>Introduction</h1>
+          <h2>Introduction</h2>
         </div>
         <div id='O'>
-          <h1>Clause 4.2</h1>
+          <h2>Clause 4.2</h2>
         </div>
         <div id='O1'>
         </div>

data/spec/isodoc/iso_spec.rb

@@ -49,8 +49,8 @@ RSpec.describe IsoDoc::Iso do
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "SimSun", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "SimHei", sans-serif;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
   end
 
   it "processes isodoc as ISO: user nominated fonts" do

data/spec/isodoc/postproc_spec.rb

@@ -94,6 +94,7 @@ RSpec.describe IsoDoc do
 
     it "generates Pdf output docs with null configuration from file" do
     FileUtils.rm_f "spec/assets/iso.pdf"
+    mock_pdf
     IsoDoc::Iso::PdfConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.pdf")).to be true
   end

data/spec/spec_helper.rb

@@ -259,6 +259,18 @@ def stub_fetch_ref(**opts)
   end.at_least :once
 end
 
+def mock_pdf
+  allow(::Mn2pdf).to receive(:convert) do |url, output, c, d|
+    FileUtils.cp(url.gsub(/"/, ""), output.gsub(/"/, ""))
+  end
+end
+
+def mock_sts
+  allow(::Mn2sts).to receive(:convert) do |url, output, c, d|
+    FileUtils.cp(url.gsub(/"/, ""), output.gsub(/"/, ""))
+  end
+end
+
 private
 
 def get_xml(search, code, opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: tokenizer
   requirement: !ruby/object:Gem::Requirement
@@ -292,10 +292,8 @@ files:
 - lib/asciidoctor/iso/isostandard-amd.rng
 - lib/asciidoctor/iso/isostandard.rnc
 - lib/asciidoctor/iso/isostandard.rng
-- lib/asciidoctor/iso/macros.rb
 - lib/asciidoctor/iso/reqt.rng
 - lib/asciidoctor/iso/section.rb
-- lib/asciidoctor/iso/term_lookup_cleanup.rb
 - lib/asciidoctor/iso/validate.rb
 - lib/asciidoctor/iso/validate_requirements.rb
 - lib/asciidoctor/iso/validate_section.rb
@@ -336,7 +334,6 @@ files:
 - lib/isodoc/iso/xref.rb
 - lib/metanorma-iso.rb
 - lib/metanorma/iso.rb
-- lib/metanorma/iso/fonts_manifest.yaml
 - lib/metanorma/iso/processor.rb
 - lib/metanorma/iso/version.rb
 - metanorma-iso.gemspec
@@ -346,7 +343,6 @@ files:
 - spec/asciidoctor-iso/cleanup_spec.rb
 - spec/asciidoctor-iso/inline_spec.rb
 - spec/asciidoctor-iso/lists_spec.rb
-- spec/asciidoctor-iso/macros_spec.rb
 - spec/asciidoctor-iso/refs_spec.rb
 - spec/asciidoctor-iso/section_spec.rb
 - spec/asciidoctor-iso/table_spec.rb
@@ -414,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: metanorma-iso lets you write ISO standards in AsciiDoc.

data/lib/asciidoctor/iso/macros.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'asciidoctor/extensions'
-
-module Asciidoctor
-  module Iso
-    # Macro to transform `term[X,Y]` into em, termxref xml
-    class TermRefInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
-      use_dsl
-
-      named :term
-      name_positional_attributes 'name', 'termxref'
-      using_format :short
-
-      def process(_parent, _target, attrs)
-        termref = attrs['termxref'] || attrs['name']
-        "<em>#{attrs['name']}</em> (<termxref>#{termref}</termxref>)"
-      end
-    end
-  end
-end

data/lib/asciidoctor/iso/term_lookup_cleanup.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true.
-
-module Asciidoctor
-  module ISO
-    # Intelligent term lookup xml modifier
-    # Lookup all `term` and `calause` tags and replace `termxref` tags with
-    # `xref`:target tag
-    class TermLookupCleanup
-      AUTOMATIC_GENERATED_ID_REGEXP = /\A_/
-      EXISTING_TERM_REGEXP = /\Aterm-/
-
-      attr_reader :xmldoc, :termlookup, :log
-
-      def initialize(xmldoc, log)
-        @xmldoc = xmldoc
-        @log = log
-        @termlookup = {}
-      end
-
-      def call
-        @termlookup = replace_automatic_generated_ids_terms
-        set_termxref_tags_target
-      end
-
-      private
-
-      def set_termxref_tags_target
-        xmldoc.xpath('//termxref').each do |node|
-          target = normalize_ref_id(node.text)
-          if termlookup[target].nil?
-            remove_missing_ref(node, target)
-            next
-          end
-          modify_ref_node(node, target)
-        end
-      end
-
-      def remove_missing_ref(node, target)
-        log.add('AsciiDoc Input', node,
-                %(Error: Term reference in `term[#{target}]` missing: \
-                "#{target}" is not defined in document))
-        term_name_node = node.previous.previous
-        term_name_node.remove
-        term_name_node.name = "strong"
-        term_name_node.children.first.content =
-          %(term "#{term_name_node.text}" not resolved)
-        node.add_previous_sibling(term_name_node)
-        node.remove
-      end
-
-      def modify_ref_node(node, target)
-        node.name = 'xref'
-        node['target'] = termlookup[target]
-        node.children.remove
-        node.remove_attribute('defaultref')
-      end
-
-      def replace_automatic_generated_ids_terms
-        xmldoc.xpath('//term').each.with_object({}) do |term_node, res|
-          normalize_id_and_memorize(term_node, res, './preferred')
-        end
-      end
-
-      def normalize_id_and_memorize(term_node, res_table, text_selector)
-        term_text = normalize_ref_id(term_node.at(text_selector).text)
-                  unless AUTOMATIC_GENERATED_ID_REGEXP.match(term_node['id']).nil?
-        term_node['id'] = unique_text_id(term_text)
-                  end
-        res_table[term_text] = term_node['id']
-      end
-
-      def normalize_ref_id(text)
-        text.downcase.gsub(/[[:space:]]/, '-')
-      end
-
-      def unique_text_id(text)
-        return "term-#{text}" if xmldoc.at("//*[@id = 'term-#{text}']").nil?
-        (1..Float::INFINITY).lazy.each do |index|
-          if xmldoc.at("//*[@id = 'term-#{text}-#{index}']").nil?
-            break("term-#{text}-#{index}")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/metanorma/iso/fonts_manifest.yaml

@@ -1,6 +0,0 @@
----
-Cambria:
-Cambria Math:
-Times New Roman:
-Source Han Sans:
-Courier New:

data/spec/asciidoctor-iso/macros_spec.rb

@@ -1,310 +0,0 @@
-require "spec_helper"
-
-RSpec.describe Asciidoctor::ISO do
-  it "processes the Asciidoctor::ISO inline macros" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{ASCIIDOC_BLANK_HDR}
-      alt:[term1]
-      deprecated:[term1]
-      domain:[term1]
-    INPUT
-    #{BLANK_HDR}
-       <sections>
-         <admitted>term1</admitted>
-       <deprecates>term1</deprecates>
-       <domain>term1</domain>
-       </sections>
-       </iso-standard>
-    OUTPUT
-  end
-
-  describe 'term inline macros' do
-    subject(:convert) do
-      xmlpp(
-        strip_guid(
-          Asciidoctor.convert(
-            input, backend: :iso, header_footer: true)))
-    end
-    let(:input) do
-      <<~XML
-        #{ASCIIDOC_BLANK_HDR}
-        == Terms and Definitions
-
-        === name2
-
-        == Main
-
-        term:[name,name2] is a term
-      XML
-    end
-    let(:output) do
-      <<~XML
-        #{BLANK_HDR}
-        <sections>
-          <terms id='_' obligation='normative'>
-            <title>Terms and definitions</title>
-            <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-            <p id='_'>
-              ISO and IEC maintain terminological databases for use in standardization
-              at the following addresses:
-            </p>
-            <ul id='_'>
-              <li>
-                <p id='_'>
-                  ISO Online browsing platform: available at
-                  <link target='http://www.iso.org/obp'/>
-                </p>
-              </li>
-              <li>
-                <p id='_'>
-                  IEC Electropedia: available at
-                  <link target='http://www.electropedia.org'/>
-                </p>
-              </li>
-            </ul>
-            <term id='term-name2'>
-              <preferred>name2</preferred>
-            </term>
-          </terms>
-          <clause id='_' inline-header='false' obligation='normative'>
-            <title>Main</title>
-            <p id='_'>
-              <em>name</em>
-              (
-              <xref target='term-name2'/>
-              ) is a term
-            </p>
-          </clause>
-        </sections>
-        </iso-standard>
-      XML
-    end
-
-    it 'converts macro into the correct xml' do
-      expect(convert).to(be_equivalent_to(xmlpp(output)))
-    end
-
-    context 'default params' do
-      let(:input) do
-        <<~XML
-          #{ASCIIDOC_BLANK_HDR}
-
-          == Terms and Definitions
-
-          === name
-
-          == Main
-
-          term:[name] is a term
-        XML
-      end
-      let(:output) do
-        <<~XML
-          #{BLANK_HDR}
-          <sections>
-            <terms id='_' obligation='normative'>
-              <title>Terms and definitions</title>
-              <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-              <p id='_'>
-                ISO and IEC maintain terminological databases for use in standardization
-                at the following addresses:
-              </p>
-              <ul id='_'>
-                <li>
-                  <p id='_'>
-                    ISO Online browsing platform: available at
-                    <link target='http://www.iso.org/obp' />
-                  </p>
-                </li>
-                <li>
-                  <p id='_'>
-                    IEC Electropedia: available at
-                    <link target='http://www.electropedia.org' />
-                  </p>
-                </li>
-              </ul>
-              <term id='term-name'>
-                <preferred>name</preferred>
-              </term>
-            </terms>
-            <clause id='_' inline-header='false' obligation='normative'>
-              <title>Main</title>
-              <p id='_'>
-                <em>name</em>
-                (
-                <xref target='term-name' />
-                ) is a term
-              </p>
-            </clause>
-          </sections>
-          </iso-standard>
-        XML
-      end
-
-      it 'uses `name` as termref name' do
-        expect(convert).to(be_equivalent_to(xmlpp(output)))
-      end
-    end
-
-    context 'multiply exising ids in document' do
-      let(:input) do
-        <<~XML
-          #{ASCIIDOC_BLANK_HDR}
-
-          == Terms and Definitions
-
-          === name
-          === name2
-
-          [[term-name]]
-          == Main
-
-          paragraph
-
-          [[term-name2]]
-          == Second
-
-          term:[name] is a term
-          term:[name2] is a term
-        XML
-      end
-      let(:output) do
-        <<~XML
-          #{BLANK_HDR}
-          <sections>
-            <terms id='_' obligation='normative'>
-              <title>Terms and definitions</title>
-              <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-              <p id='_'>
-                ISO and IEC maintain terminological databases for use in standardization
-                at the following addresses:
-              </p>
-              <ul id='_'>
-                <li>
-                  <p id='_'>
-                    ISO Online browsing platform: available at
-                    <link target='http://www.iso.org/obp' />
-                  </p>
-                </li>
-                <li>
-                  <p id='_'>
-                    IEC Electropedia: available at
-                    <link target='http://www.electropedia.org' />
-                  </p>
-                </li>
-              </ul>
-              <term id='term-name-1'>
-                <preferred>name</preferred>
-              </term>
-              <term id='term-name2-1'>
-                <preferred>name2</preferred>
-              </term>
-            </terms>
-            <clause id='term-name' inline-header='false' obligation='normative'>
-              <title>Main</title>
-              <p id='_'>paragraph</p>
-            </clause>
-            <clause id='term-name2' inline-header='false' obligation='normative'>
-              <title>Second</title>
-              <p id='_'>
-                <em>name</em>
-                (
-                <xref target='term-name-1' />
-                ) is a term
-                <em>name2</em>
-                  (
-                <xref target='term-name2-1' />
-                ) is a term
-              </p>
-            </clause>
-          </sections>
-          </iso-standard>
-        XML
-      end
-
-      it 'generates unique ids which dont match existing ids' do
-        expect(convert).to(be_equivalent_to(xmlpp(output)))
-      end
-    end
-
-    context 'when missing actual ref' do
-      let(:input) do
-        <<~XML
-          #{ASCIIDOC_BLANK_HDR}
-
-          == Terms and Definitions
-
-          === name identity
-
-          [[name-check]]
-          === name check
-
-          paragraph
-
-          term:[name check] is a term
-
-          term:[name identity] is a term
-
-          Moreover, term:[missing] is a term
-        XML
-      end
-      let(:output) do
-        <<~XML
-          #{BLANK_HDR}
-            <sections>
-              <terms id='_' obligation='normative'>
-                <title>Terms and definitions</title>
-                <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-                <p id='_'>
-                  ISO and IEC maintain terminological databases for use in standardization
-                  at the following addresses:
-                </p>
-                <ul id='_'>
-                  <li>
-                    <p id='_'>
-                      ISO Online browsing platform: available at
-                      <link target='http://www.iso.org/obp'/>
-                    </p>
-                  </li>
-                  <li>
-                    <p id='_'>
-                      IEC Electropedia: available at
-                      <link target='http://www.electropedia.org'/>
-                    </p>
-                  </li>
-                </ul>
-                <term id='term-name-identity'>
-  <preferred>name identity</preferred>
-</term>
-                <term id='name-check'>
-                  <preferred>name check</preferred>
-                  <definition>
-                    <p id='_'>paragraph</p>
-                    <p id='_'>
-                      <em>name check</em> 
-                       (
-                      <xref target='name-check'/>
-                      ) is a term
-                      </p>
-                      <p id='_'>
-                      <em>name identity</em>
-                       (
-                      <xref target='term-name-identity'/>
-                      ) is a term
-                      </p>
-                      <p id="_">Moreover, (<strong>term “missing” not resolved</strong>) is a term
-                    </p>
-                  </definition>
-                </term>
-              </terms>
-            </sections>
-          </iso-standard>
-        XML
-      end
-
-      it 'generates unique ids which dont match existing ids' do
-        expect(convert).to(be_equivalent_to(xmlpp(output)))
-      end
-    end
-  end
-end