metanorma-iso 1.5.10 → 1.6.0

data/spec/isodoc/postproc_spec.rb

@@ -613,11 +613,8 @@ documentation.</p>
     presxml = <<~OUTPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
                <bibdata type="standard">
-               <status><stage>30</stage></status>
+               <status><stage language="">30</stage></status>
                </bibdata>
-               <local_bibdata type="standard">
-               <status><stage>30</stage></status>
-               </local_bibdata>
            <boilerplate>
          <copyright-statement>
            <clause inline-header="true">
@@ -664,7 +661,7 @@ documentation.</p>
 
      FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-expect((IsoDoc::Iso::PresentationXMLConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", presxml, false)
     word = File.read("test.html", encoding: "UTF-8")
     expect((word)).to include '<h1 class="IntroTitle">Warning for Stuff</h1>'

data/spec/isodoc/ref_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe IsoDoc do
       <abbreviation>ISO</abbreviation>
     </organization>
   </contributor>
-  <note format="text/plain" reference="1" type="ISO DATE">Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+  <note format="text/plain" reference="1" type="Unpublished-Status">Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
   <extent type="part">
   <referenceFrom>all</referenceFrom>
   </extent>
@@ -123,11 +123,8 @@ RSpec.describe IsoDoc do
     presxml = <<~OUTPUT
        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>en</language>
+           <language current="true">en</language>
          </bibdata>
-         <local_bibdata>
-    <language>en</language>
-    </local_bibdata>
          <preface>
            <foreword>
              <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
@@ -178,7 +175,7 @@ RSpec.describe IsoDoc do
                    <abbreviation>ISO</abbreviation>
                  </organization>
                </contributor>
-               <note format='text/plain' reference='1' type='ISO DATE'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+               <note format='text/plain' reference='1' type='Unpublished-Status'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
                <extent type='part'>
                  <referenceFrom>all</referenceFrom>
                </extent>
@@ -342,7 +339,7 @@ html = <<~OUTPUT
          </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 

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>

data/spec/spec_helper.rb

@@ -118,8 +118,15 @@ BOILERPLATE =
   gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’")
 )
 
+BOILERPLATE_FR =
+  HTMLEntities.new.decode(
+  File.read(File.join(File.dirname(__FILE__), "..", "lib", "asciidoctor", "iso", "boilerplate-fr.xml"), encoding: "utf-8").
+  gsub(/\{\{ agency \}\}/, "ISO").gsub(/\{\{ docyear \}\}/, Date.today.year.to_s).
+  gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "").
+  gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’")
+)
 
-BLANK_HDR = <<~"HDR"
+BLANK_HDR1 = <<~"HDR"
 <?xml version="1.0" encoding="UTF-8"?>
 <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
 <bibdata type="standard">
@@ -162,9 +169,18 @@ BLANK_HDR = <<~"HDR"
   <stagename>International standard</stagename>
   </ext>
 </bibdata>
+HDR
+
+BLANK_HDR = <<~"HDR"
+#{BLANK_HDR1}
 #{BOILERPLATE}
 HDR
 
+BLANK_HDR_FR = <<~"HDR"
+#{BLANK_HDR1.sub(%r{<language>en</language>}, "<language>fr</language>")}
+#{BOILERPLATE_FR}
+HDR
+
 TERM_BOILERPLATE = <<~END
   <p id="_">For the purposes of this document,
     the following terms and definitions apply.</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-12-27 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.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: tokenizer
   requirement: !ruby/object:Gem::Requirement
@@ -261,9 +261,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
@@ -284,6 +282,7 @@ files:
 - lib/asciidoctor/iso/base.rb
 - lib/asciidoctor/iso/basicdoc.rng
 - lib/asciidoctor/iso/biblio.rng
+- lib/asciidoctor/iso/boilerplate-fr.xml
 - lib/asciidoctor/iso/boilerplate.xml
 - lib/asciidoctor/iso/cleanup.rb
 - lib/asciidoctor/iso/converter.rb
@@ -293,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
@@ -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

data/.github/workflows/macos.yml

@@ -1,41 +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: Update gems
-        run: |
-          sudo gem install bundler --force
-          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,45 +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: Update gems
-        run: |
-          gem install bundler
-          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,43 +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: 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