metanorma-iso 1.5.12 → 1.7.0

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/metadata_spec.rb

@@ -64,6 +64,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
   <keyword>kw1</keyword>
   <ext>
   <doctype>international-standard</doctype>
+  <horizontal>true</horizontal>
   <editorialgroup>
     <technical-committee number="34">Food products</technical-committee>
     <subcommittee number="4">Cereals and pulses</subcommittee>
@@ -106,6 +107,7 @@ INPUT
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :editorialgroup=>["TC 34", "SC 4", "WG 3"],
+:horizontal=>"true",
 :implementeddate=>"XXX",
 :issueddate=>"XXX",
 :keywords=>["kw2", "kw1"],

data/spec/isodoc/section_spec.rb

@@ -55,6 +55,9 @@ RSpec.describe IsoDoc do
        </clause>
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
+         <clause id='Q2a' inline-header='false' obligation='normative'>
+  <title>Appendix subclause</title>
+</clause>
        </appendix>
        <references id="Q3" normative="false"><title>Annex Bibliography</title></references>
        </annex><bibliography><references id="R" obligation="informative" normative="true">
@@ -140,6 +143,13 @@ RSpec.describe IsoDoc do
      </clause>
      <appendix id='Q2' inline-header='false' obligation='normative'>
      <title depth='2'>Appendix 1<tab/>An Appendix</title>
+     <clause id='Q2a' inline-header='false' obligation='normative'>
+  <title depth='3'>
+    Appendix 1.1
+    <tab/>
+    Appendix subclause
+  </title>
+</clause>
      </appendix>
      <references id='Q3' normative='false'>
        <title depth='2'>A.2<tab/>Annex Bibliography</title>
@@ -222,6 +232,9 @@ RSpec.describe IsoDoc do
          </div>
                   <div id="Q2">
                 <h2>Appendix 1&#160; An Appendix</h2>
+                <div id='Q2a'>
+  <h3> Appendix 1.1 &#160; Appendix subclause </h3>
+</div>
                 </div>
                  <div>
                 <h2 class="Section3">A.2&#160; Annex Bibliography</h2>
@@ -318,6 +331,13 @@ OUTPUT
         </div>
                  <div id="Q2">
           <h2>Appendix 1<span style="mso-tab-count:1">&#160; </span>An Appendix</h2>
+          <div id='Q2a'>
+  <h3>
+     Appendix 1.1
+    <span style='mso-tab-count:1'>&#160; </span>
+     Appendix subclause
+  </h3>
+</div>
           </div>
 <div>
   <h2 class='Section3'>

data/spec/isodoc/xref_spec.rb

@@ -936,6 +936,7 @@ RSpec.describe IsoDoc do
          <xref target="Q"/>
          <xref target="Q1"/>
          <xref target="Q2"/>
+         <xref target="Q3"/>
          <xref target="R"/>
          </p>
        </foreword>
@@ -985,6 +986,9 @@ RSpec.describe IsoDoc do
        </clause>
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
+         <clause id='Q3' inline-header='false' obligation='normative'>
+  <title>Appendix subclause</title>
+</clause>
        </appendix>
        </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
@@ -1019,6 +1023,7 @@ RSpec.describe IsoDoc do
                 <xref target='Q'>A.1</xref>
                 <xref target='Q1'>A.1.1</xref>
                 <xref target='Q2'>Annex A, Appendix 1</xref>
+                <xref target='Q3'>Annex A, Appendix 1.1</xref>
                 <xref target='R'>Clause 2</xref>
               </p>
             </foreword>
@@ -1126,6 +1131,13 @@ RSpec.describe IsoDoc do
   <tab/>
    An Appendix
 </title>
+<clause id='Q3' inline-header='false' obligation='normative'>
+  <title depth='3'>
+    Appendix 1.1
+    <tab/>
+    Appendix subclause
+  </title>
+</clause>
             </appendix>
           </annex>
           <bibliography>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-01-25 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.2.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.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
@@ -261,10 +261,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
-- ".github/workflows/macos.yml"
 - ".github/workflows/rake.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
@@ -295,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
@@ -348,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

data/.github/workflows/macos.yml

@@ -1,49 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Cache gems
-        uses: actions/cache@preview
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-${{ matrix.ruby }}-gem-${{ hashFiles('Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.ruby }}-gem-
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Install PlantUML
-        run: |
-          brew install plantuml
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,53 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Cache gems
-        uses: actions/cache@preview
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-${{ matrix.ruby }}-gem-${{ hashFiles('Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.ruby }}-gem-
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Install PlantUML
-        uses: nick-invision/retry@v1
-        with:
-          polling_interval_seconds: 5
-          timeout_minutes: 5
-          max_attempts: 3
-          command: sudo apt-get update -y && 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

@@ -1,50 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/ubuntu.yml
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Cache gems
-        uses: actions/cache@preview
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-${{ matrix.ruby }}-gem-${{ hashFiles('Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.ruby }}-gem-
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Install PlantUML
-        run: |
-          cinst -y plantuml
-      - name: Run specs
-        run: |
-          bundle exec rake

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