metanorma-iso 1.5.8 → 1.5.13

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">
@@ -70,7 +73,7 @@ RSpec.describe IsoDoc do
     INPUT
 
     presxml = <<~OUTPUT
-     <iso-standard xmlns='http://riboseinc.com/isoxml'>
+     <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
    <preface>
      <foreword obligation='informative'>
        <title>Foreword</title>
@@ -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'>
@@ -361,7 +381,7 @@ OUTPUT
 INPUT
 
 presxml = <<~OUTPUT
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <clause id='D' obligation='normative'>
       <title depth='1'>1<tab/>Scope</title>

data/spec/isodoc/table_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe IsoDoc do
 </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <table id='tableD-1' alt='tool tip' summary='long desc'>

data/spec/isodoc/terms_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe IsoDoc do
 </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <terms id='_terms_and_definitions' obligation='normative'>
     <title depth='1'>1<tab/>Terms and Definitions</title>

data/spec/isodoc/xref_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
            <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <preface>
             <foreword>
               <p>
@@ -202,7 +202,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
      <?xml version='1.0'?>
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
    <preface>
      <foreword id='fwd'>
        <p>
@@ -322,7 +322,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
       <?xml version='1.0'?>
-  <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
     <preface>
       <foreword id='fwd'>
         <p>
@@ -435,7 +435,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
 <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -568,7 +568,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
            <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -729,7 +729,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
        <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <preface>
             <foreword>
               <p>
@@ -863,7 +863,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
            <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -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>
@@ -998,7 +1002,7 @@ RSpec.describe IsoDoc do
        </iso-standard>
     INPUT
      <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <preface>
             <foreword obligation='informative'>
               <title>Foreword</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>
@@ -1198,7 +1210,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
            <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <preface>
             <foreword>
               <p>
@@ -1318,7 +1330,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
             <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <preface>
             <foreword>
               <p>
@@ -1422,7 +1434,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
         <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>

data/spec/metanorma/processor_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Metanorma::Iso::Processor do
 
   it "registers output formats against metanorma" do
     expect(processor.output_formats.sort.to_s).to be_equivalent_to <<~"OUTPUT"
-    [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:isosts, "sts.xml"], [:pdf, "pdf"], [:presentation, "presentation.xml"], [:rxl, "rxl"], [:sts, "sts.xml"], [:xml, "xml"]]
+    [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:isosts, "iso.sts.xml"], [:pdf, "pdf"], [:presentation, "presentation.xml"], [:rxl, "rxl"], [:sts, "sts.xml"], [:xml, "xml"]]
     OUTPUT
   end
 

data/spec/spec_helper.rb

@@ -29,6 +29,10 @@ def strip_guid(x)
   x.gsub(%r{ id="_[^"]+"}, ' id="_"').gsub(%r{ target="_[^"]+"}, ' target="_"')
 end
 
+def metadata(x)
+  Hash[x.sort].delete_if{ |k, v| v.nil? || v.respond_to?(:empty?) && v.empty? }
+end
+
 def xmlpp(x)
   s = ""
   f = REXML::Formatters::Pretty.new(2)
@@ -114,10 +118,17 @@ 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">
+<iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
 <bibdata type="standard">
   <contributor>
     <role type="author"/>
@@ -158,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.8
+  version: 1.5.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-11-30 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.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.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
@@ -337,6 +336,7 @@ 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
@@ -364,6 +364,7 @@ files:
 - spec/assets/word.css
 - spec/assets/wordcover.html
 - spec/assets/wordintro.html
+- spec/assets/xref_error.adoc
 - spec/examples/103_01_02.html
 - spec/examples/english.yaml
 - spec/examples/iso_123_.xml

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